Merge branch 'master' of github.com:DOCGroup/ACE_TAO into thread_safe_eval

author: Knut Petter Svendsen <knut@altuma.no> 2020-03-06 10:08:19 +0100
committer: Knut Petter Svendsen <knut@altuma.no> 2020-03-06 10:08:19 +0100
commit: 4e9b0a57acf3a313af273143650ca0871ec9866d (patch)
tree: 51cf15ff6482c8dc9367aa734c94a3ee6dad2bdb
parent: 91785b820aeefe3642db06833e17ca936382a2f7 (diff)
parent: 9985d758f81608d988b2ff45165521b099e97f0c (diff)
download: ATCD-4e9b0a57acf3a313af273143650ca0871ec9866d.tar.gz
201 files changed, 1725 insertions, 553 deletions
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index e0c57bfce46..96a231ff07f 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -1,6 +1,10 @@
 name: C/C++ CI
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 7 * * SUN'
 
 jobs:
   build:
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
new file mode 100644
index 00000000000..011e9b82074
--- /dev/null
+++ b/.github/workflows/fuzz.yml
@@ -0,0 +1,22 @@
+name: fuzz
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 7 * * SUN'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      ACE_ROOT: ${{ github.workspace }}/ACE
+      TAO_ROOT: ${{ github.workspace }}/TAO
+
+    steps:
+    - name: checkout ACE/TAO
+      uses: actions/checkout@v1
+    - name: Run fuzz
+      run: |
+        perl ${env:ACE_ROOT}/bin/fuzz.pl
+      shell: pwsh
diff --git a/.travis.yml b/.travis.yml
index 6a5badede77..97032d274a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ compiler:
 
 env:
   matrix:
-    - FUZZ=1
     - CORBAEMICRO=1 ACEFORTAO=0 TAO=1
     - CORBAECOMPACT=1 ACEFORTAO=0 TAO=1
     - ACEFORTAO=1 TAO=1
@@ -83,7 +82,6 @@ before_script:
   - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
 
 script:
-  - if [ "$FUZZ" == "1" ]; then exec perl $ACE_ROOT/bin/fuzz.pl; fi
   - 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 23137b84d0a..2cd45ae6a09 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -17,13 +17,16 @@ table, th, td {
 }
 .boxed {
   border: 1px solid black;
-  margin: .5em;
-  padding: .5em;
+  border-radius: 0.3em;
+  padding-right: 0.5em;
+  padding-left: 0.5em;
+  margin: 0.5em;
 }
 pre, code {
   background-color: #e3e3e3;
-  padding: .1em;
-  margin: .1em;
+  border-radius: 0.2em;
+  padding-right: 0.2em;
+  padding-left: 0.2em;
 }
 </style>
 </head>
@@ -60,20 +63,20 @@ report process</a>.<p>
 </p><h2>Document Index</h2>
 
 <ul>
-  <li><a href="#platforms">Platforms, C++ Compilers, and Support</a>
-  </li><li><a href="#installpre">Installation prerequisites</a>
-  </li><li><a href="#aceinstall">Building and Installing ACE</a>
-  </li><li><a href="#svcsinstall">Building and Installing ACE Network Services</a>
-  </li><li><a href="#sslinstall">Building and Installing The ACE_SSL Library</a>
-  </li><li><a href="#guireactor_install">Building and Using GUI Reactors Libraries</a>
-  </li><li><a href="#installnotes">Installation Notes</a>
-  </li><li><a href="#g++">Compiling ACE with GNU g++</a>
-  </li><li><a href="#minimum_build">What Do I Need to Build for TAO?</a>
-  </li><li><a href="#resource_requirements">System Resource Requirements</a>
-  </li><li><a href="#MPC">General MPC Information</a>
-  </li><li><a href="#eclipse">Working with ACE in Eclipse</a>
-  </li><li><a href="#advanced">Advanced Topics</a>
-  </li><li><a href="#power">Building from Subversion</a>
+  <li><a href="#platforms">Platforms, C++ Compilers, and Support</a></li>
+  <li><a href="#installpre">Installation prerequisites</a></li>
+  <li><a href="#aceinstall">Building and Installing ACE</a></li>
+  <li><a href="#svcsinstall">Building and Installing ACE Network Services</a></li>
+  <li><a href="#sslinstall">Building and Installing The ACE_SSL Library</a></li>
+  <li><a href="#guireactor_install">Building and Using GUI Reactors Libraries</a></li>
+  <li><a href="#installnotes">Installation Notes</a></li>
+  <li><a href="#g++">Compiling ACE with GNU g++</a></li>
+  <li><a href="#minimum_build">What Do I Need to Build for TAO?</a></li>
+  <li><a href="#resource_requirements">System Resource Requirements</a></li>
+  <li><a href="#MPC">General MPC Information</a></li>
+  <li><a href="#eclipse">Working with ACE in Eclipse</a></li>
+  <li><a href="#advanced">Advanced Topics</a></li>
+  <li><a href="#power">Building from git</a></li>
 </li></ul>
 
 
@@ -1623,9 +1626,19 @@ your needs. For example when you give option debug=1 all the debug
 symbols will be created and the build will huge in size. The debug
 symbols are necessary when you want to debug your code.</p>
 
-<p></p><hr align="left" width="50%">
+<hr align="left" width="50%">
+
+<h2><a name="android">Building and Installing ACE on Android</a></h2>
+
+<ul>
+  <li><a href="#android-toolchain">Generating a Toolchain</a></li>
+  <li><a href="#android-oldndks">Using Older NDKs</a></li>
+  <li><a href="#android-building">Building</a></li>
+  <li><a href="#android-install">Installing ACE on Android</a></li>
+  <li><a href="#android-logging">Logging</a></li>
+  <li><a href="#android-openssl">OpenSSL</a></li>
+</ul>
 
-<p></p><h2><a name="android">Building and Installing ACE on Android</a></h2>
 <p>ACE can be built for Android by using the <a
 href="https://developer.android.com/ndk/">Android Native Development Kit
 (NDK)</a>. This is different than the standard way of writing Android
@@ -1633,10 +1646,24 @@ applications in Java which run the on Android Runtime or the older Dalvik
 Virtual Machine. Applications built using the NDK are native Linux applications
 written in C or C++ specifically compiled to run on Android systems. In
 addition, applications built using the NDK have access to Android-specific APIs
-much like on Java-based Android applications.
+much like the ones available to Java-based Android applications.
+</p>
+
+<div class="boxed">
+<p><b>Windows Users:</b> These instructions are written for a Unix based
+platform like Linux, but can also be used on Windows. If you are using an
+virtualized Linux environment like Windows Subsystem for Linux (WSL), Docker,
+or a traditional VM, then you can use the Linux version of the NDK and ignore
+rest of this note and all the other Windows specific notes.
 </p>
 
-<h3>Generating a Toolchain</h3>
+<p>If that is not the case, you should also pay attention to the notes marked
+with "<b>Windows Users:</b>" in addition to the rest of the instructions. In
+addition to the Windows version of the Android NDK, you will also need
+<a href="https://www.msys2.org">MSYS2 for Unix utilities that ACE needs</a>.
+</div>
+
+<h3><a name="android-toolchain">Generating a Toolchain</a></h3>
 
 <p>To build ACE for Android you need to download the NDK and generate a
 toolchain for the specific Android target you want. The specific target is
@@ -1662,7 +1689,7 @@ defined by two things:</p>
       <dt><code>armeabi-v7a</code></dt>
         <dd>32-bit ARM, The default ABI for both the NDK and ACE.</dd>
       <dt><code>armeabi-v7a-with-neon</code></dt>
-        <dd><code>armeabi-v7a</code> with NEON extentions enabled.</dd>
+        <dd><code>armeabi-v7a</code> with NEON extensions enabled.</dd>
       <dt><code>arm64-v8a</code></dt>
         <dd>64-bit ARM, Sometimes referred to as <code>aarch64</code>.</dd>
       <dt><code>x86</code></dt>
@@ -1721,8 +1748,31 @@ applications using ACE.</p>
   </tr>
 </table>
 
+<div class=boxed>
+<p><b>Windows Users:</b>
+Android NDK includes Python in <code>prebuilt\windows-x86_64\bin</code> for
+64-bit Windows NDKs. For the example above, assuming <code>%NDK%</code> is the
+location of the NDK and <code>%TOOLCHAIN%</code> is the desired location of the
+toolchain, run this command instead:</p>
+
+<p class="indent">
+<code>
+  %NDK%\prebuilt\windows-x86_64\bin\python.exe
+  %NDK%\build\tools\make_standalone_toolchain.py
+  --arch arm --api 24
+  --install-dir %TOOLCHAIN%</code>
+</p>
+
+<p>For Windows <code>%TOOLCHAIN%\bin</code> and the location of the MSYS2
+utilities must be in <code>%PATH%</code> when cross compiling ACE. The default
+location for these would be <code>C:\msys64\usr\bin</code>.
+</div>
+
 <!-- Remove this section if these NDKs can be considered not supported anymore -->
-<h3>Using Older NDKs (Skip if Using NDK r18 or Later)</h3>
+<h3><a name="android-oldndks">Using Older NDKs</a></h3>
+
+<p><b>Skip this section if using NDK r18 or later.</b></p>
+
 <p>
 It is <b>highly recommended</b> to use the latest NDK available assuming
 that it works with ACE. It is possible to use NDKs older than r18, but these
@@ -1772,39 +1822,60 @@ have caveats:
   </li>
   <li>
     There are probably unknown conflicts, especially in the minor revisions
-    before the last minor revision.
+    before the last minor revision of a NDK revision.
   </li>
 </ul>
 
-<h3>Building</h3>
+<h3><a name="android-building">Building</a></h3>
 
 <ul>
   <li>
     If building TAO, build the ACE and TAO tools (<code>ace_gperf</code> and
     <code>tao_idl</code>) for the host. Follow the <a
     href="../TAO/TAO-INSTALL.html">cross compilation setup instructions provide
-    in TAO-INSTALL.html</a>.</li>
+    in TAO-INSTALL.html</a>.
+    <div class="boxed indent">
+      <p><b>Windows Users:</b> If cross compiling TAO and the host tools were
+      built using using Visual Studio, make sure <code>cl.exe</code> can be run
+      from the environment when building for Android, as <code>tao_idl</code>
+      will need to use it as a C preprocessor.
+    </div>
+  </li>
   <li>Setup the Android build<ul>
     <li>Create <code>ace/config.h</code>: <code>#include "ace/config-android.h"</code></li>
     <li>Create <code>include/makeinclude/platform_macros.GNU</code>:
       <ul>
         <li>
           Set <code>ANDROID_ABI</code> to one of the options above. This
-          must match the toolchain <code>--arch</code> argument used according to the table above.
+          must match the toolchain <code>--arch</code> argument used according
+          to the table above.
         </li>
         <li>Set options for debug and optimization options as desired.</li>
           <li>If you want to compile static, add <code>static_libs_only:=1</code></li>
           <li>Must include <code>include $(ACE_ROOT)/include/makeinclude/platform_android.GNU</code>.</li>
-          <li>If building TAO, set the tao idl options specified in the cross compiling instructions in <code>TAO-INSTALL.html</code></li>
+          <li>
+            If building TAO, set the <code>tao_idl</code> options specified in
+            the cross compiling instructions in <code>TAO-INSTALL.html</code>
+          </li>
         </ul>
       </ul>
     </li>
     </li>
     <li>Generate makefiles (if necessary).</li>
-    <li>Build with GNU make.</li>
+    <li>Build with GNU make. Make sure you have <code>$TOOLCHAIN/bin</code> in
+      your <code>$PATH</code>.
+      <div class="boxed indent"><p>
+        <b>Windows Users:</b> Make sure you have <code>%TOOLCHAIN%\bin</code>
+        and MSYS2's <code>bin</code> in your <code>%PATH%</code> when building.
+        If you are cross compiling TAO you will also need a preprocessor for
+        <code>tao_idl</code> available (See Windows note above).</p>
+      </div>
+    </li>
 </ul>
 </p>
 
+<h3><a name="android-install">Installing ACE on Android</a></h3>
+
 <p>Native applications using the ACE library can be installed onto devices by
 several different methods.  The files can be include as assets of Java
 application and can be written by the Java application into it's executable
@@ -1815,7 +1886,7 @@ Development Kit's ADB tool.  This method requires uploading the native
 application to a directory that allows execution and having any output
 directed to a writable directory.</p>
 
-<h3>Logging</h3>
+<h3><a name="android-logging">Logging</a></h3>
 <p>
 On Android, <code>ACE_Log_Msg</code> (and therefore <code>ACE_DEBUG</code> and
 <code>ACE_ERROR</code>) uses Android's logging system (aka Logcat) by default
@@ -1824,20 +1895,18 @@ in addition to <code>stderr</code> because <code>stdout</code> and
 at runtime, run:
 </p>
 
-<p class="indent">
-<code>ACE_LOG_MSG-&gt;clr_flags (ACE_Log_Msg::SYSLOG);</code>
-</p>
+<pre class="indent">
+ACE_LOG_MSG-&gt;clr_flags (ACE_Log_Msg::SYSLOG);
+</pre>
 
 <p>To disable this at compile time include these lines in <code>config.h</code>:</p>
 
-<code class="indent">
-#define ACE_DEFAULT_LOG_FLAGS ACE_Log_Msg::STDERR<br>
-</code>
-<code class="indent">
+<pre class="indent">
+#define ACE_DEFAULT_LOG_FLAGS ACE_Log_Msg::STDERR
 #define ACE_DEFAULT_LOG_BACKEND_FLAGS 0
-</code>
+</pre>
 
-<h3>OpenSSL</h3>
+<h3><a name="android-openssl">OpenSSL</a></h3>
 <p>
   Depending on the features of ACE, TAO, or other software desired, you might need
   OpenSSL. On Android, OpenSSL isn't part of the NDK Library and Android
@@ -3102,8 +3171,10 @@ show_uninit        Lists all uninitialized in object files built for
 
 </pre>
 
-</p><hr><p>
-</p><h2><a name="power">Building from git</a></h2>
+</p><hr>
+
+<h2><a name="power">Building from git</a></h2>
+
 If users are building from our <a href="https://github.com/DOCGroup/ACE_TAO">Git repository</a> the
 GNUmakefiles, and project files for building on various platforms will
 not be available.  Git users are expected to <a href="#generate_using_mpc">generate them</a>
diff --git a/ACE/ChangeLogs/ACE-6_5_8 b/ACE/ChangeLogs/ACE-6_5_8
new file mode 100644
index 00000000000..c2e42abcbda
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_8
@@ -0,0 +1,544 @@
+commit 4d7f65535e1050d284dcf1d16f78751b38adfdde
+Merge: 937821529f1 76ee5a67011
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Feb 7 11:05:19 2020 -0600
+
+    Merge pull request #1039 from jonesc-oci/iOS-changes
+    
+    Configuration changes for iOS builds.
+
+commit 76ee5a67011243f5ae7595e324f08ee77a73408a
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Thu Feb 6 14:54:28 2020 -0600
+
+    Add ACE_HAS_IOS preprocessor macro. Change CXXFLAGS to CCFLAGS.
+
+commit dfe0e0929249c1c417c4d98ac9aee05476e43c9e
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Wed Feb 5 16:49:28 2020 -0600
+
+    Add bitcode compile feature.
+
+commit b40e6033e033d10b1f59b7627467ed9f12ed5970
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Wed Feb 5 16:13:41 2020 -0600
+
+    Use single config file for iOS builds. Update build flags for iOS hardware.
+
+commit b04b660d7d52f5d0c8019f1de29791c565bac1b7
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Feb 5 13:06:37 2020 -0600
+
+    Update ACE/ACE-INSTALL.html
+    
+    Co-Authored-By: Adam Mitz <mitza@objectcomputing.com>
+
+commit 87351e3ca860d234eb9206c006afa4726bc7335e
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Wed Feb 5 12:33:49 2020 -0600
+
+    Remove whitespace.
+
+commit 2afe9dc16a75cbbb3b9e0280af7bc182895338da
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Wed Feb 5 08:41:05 2020 -0600
+
+    Suppress "has no symbols" warnings for iOS builds.
+
+commit 8e75fd9d1b48373e709b3d90abb949deef6b9c8d
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Wed Feb 5 08:38:41 2020 -0600
+
+    Move ACE_LACKS_SYSTEM to iOS-specific header.
+
+commit 848c22e162de492caa4c1c9a3ce39a4cff0849b8
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Tue Feb 4 14:14:09 2020 -0600
+
+    Configuration changes for iOS builds.
+
+commit 7c1ba7b90306bec2a3479f81d15a51ad8834fd44
+Merge: c9ac5fecf46 37ddee2ee71
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 16:13:58 2020 -0600
+
+    Merge branch 'igtd/android-on-windows' of github.com:iguessthislldo/ACE_TAO into igtd/android-on-windows
+
+commit c9ac5fecf4621d2e186932a4003890506ce37b58
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 16:08:45 2020 -0600
+
+    Add VERSION rename to NEWS files
+
+commit 9d2fcbf4c5dde4294ed44ad7d741d929eccc4e04
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 16:02:07 2020 -0600
+
+    ACE-INSTALL: Update Android on Windows
+
+commit b810cc85ddbcac1a066e4036a441a57712e822f0
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 15:26:59 2020 -0600
+
+    platform_clang_common.GNU: Remove Alt GNU ld Check
+
+commit 977c354addc03b848b47c392658dfc00338bf1cb
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 15:23:17 2020 -0600
+
+    Change More References to VERSION.txt
+
+commit dc64a430fe1aa6b5245af09a354b98b78773b572
+Merge: 5c9bcb4f64b 816fca07086
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 14:56:25 2020 -0600
+
+    Merge remote-tracking branch 'upstream/master' into igtd/android-on-windows
+
+commit cd1cef25211ce104cf784bf2cba14a5b52d93d51
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 30 11:50:22 2020 +0100
+
+    List some important changes
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit b666e6ce5b5f26d51ac0a2a28df54ea046e7e718
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 29 09:46:15 2020 +0100
+
+    Remove empty lines
+    
+        * ACE/tests/INET_Addr_Test.cpp:
+        * ACE/tests/IOStream_Test.cpp:
+        * ACE/tests/Multicast_Test.cpp:
+
+commit 47c1ae25ed0ffccdd0d9ce93035850066d09eac9
+Merge: 1afb3f00e95 b0f830ea66e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 22 11:05:20 2020 +0100
+
+    Merge branch 'master' into jwi-layout
+
+commit 1afb3f00e95cf72bf39305bf62c6f06b90d39add
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 21 20:13:29 2020 +0100
+
+    Some more layout changes to trigger CI builds
+    
+        * ACE/ace/Activation_Queue.h:
+        * ACE/ace/Active_Map_Manager.h:
+        * ACE/ace/Active_Map_Manager_T.h:
+        * ACE/ace/Argv_Type_Converter.h:
+        * ACE/ace/Array_Map.h:
+        * ACE/ace/Asynch_Connector.h:
+        * ACE/ace/Atomic_Op.h:
+        * ACE/ace/Atomic_Op_GCC_T.h:
+        * ACE/ace/Based_Pointer_Repository.h:
+        * ACE/ace/Bound_Ptr.h:
+        * ACE/ace/CDR_Stream.h:
+        * ACE/ace/Cache_Map_Manager_T.h:
+        * ACE/ace/Caching_Strategies_T.h:
+        * ACE/ace/Capabilities.h:
+        * ACE/ace/Containers_T.h:
+        * ACE/ace/DLL.h:
+        * ACE/ace/DLL_Manager.h:
+        * ACE/ace/Dev_Poll_Reactor.h:
+
+commit b4e58d8b62f59bc92912dda32754cc0e4dd70672
+Merge: 6627fe21df7 8dae504b784
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jan 20 10:30:21 2020 -0600
+
+    Merge pull request #1029 from mitza-oci/rwlock-init
+    
+    wchar fix for #1023
+
+commit 8dae504b784400157d5d07c506db942abd4d56b8
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jan 20 09:17:55 2020 -0600
+
+    wchar fix
+
+commit d6c5fa19716b710de9738e80cc5c2840670a921e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 20 14:28:57 2020 +0100
+
+    Minor layout/doxygen changes, gathered through time
+    
+        * ACE/ace/ACE.inl:
+        * ACE/ace/ATM_Acceptor.cpp:
+        * ACE/ace/ATM_Addr.cpp:
+        * ACE/ace/ATM_Connector.cpp:
+        * ACE/ace/ATM_Params.cpp:
+        * ACE/ace/ATM_QoS.cpp:
+        * ACE/ace/ATM_QoS.h:
+        * ACE/ace/ATM_Stream.h:
+        * ACE/ace/Acceptor.h:
+        * ACE/ace/Active_Map_Manager_T.h:
+        * ACE/ace/Argv_Type_Converter.h:
+        * ACE/ace/Array_Base.h:
+        * ACE/ace/Array_Map.h:
+        * ACE/ace/Asynch_IO.h:
+        * ACE/ace/Atomic_Op_T.h:
+        * ACE/ace/Base_Thread_Adapter.h:
+        * ACE/ace/CDR_Base.h:
+        * ACE/ace/CDR_Size.h:
+        * ACE/ace/CDR_Stream.h:
+        * ACE/ace/CE_Screen_Output.h:
+        * ACE/ace/Cache_Map_Manager_T.h:
+        * ACE/ace/Cached_Connect_Strategy_T.h:
+        * ACE/ace/Caching_Strategies_T.h:
+        * ACE/ace/Caching_Utility_T.h:
+        * ACE/ace/Capabilities.h:
+        * ACE/ace/Cleanup_Strategies_T.h:
+        * ACE/ace/Codecs.h:
+        * ACE/ace/Codeset_Registry.h:
+        * ACE/ace/Compression/Compressor.h:
+        * ACE/ace/Configuration.h:
+        * ACE/ace/Connector.h:
+        * ACE/ace/Containers_T.h:
+        * ACE/ace/Copy_Disabled.h:
+        * ACE/ace/DEV_Connector.h:
+        * ACE/ace/DLL.h:
+        * ACE/ace/DLL_Manager.h:
+        * ACE/ace/Dev_Poll_Reactor.h:
+        * ACE/ace/Dynamic_Message_Strategy.h:
+        * ACE/ace/ETCL/ETCL_Constraint.h:
+        * ACE/ace/MEM_Stream.h:
+        * ACE/ace/Profile_Timer.h:
+        * ACE/ace/SUN_Proactor.h:
+        * ACE/ace/String_Base_Const.h:
+        * ACE/ace/Svc_Handler.h:
+
+commit 37ddee2ee7109a5093b360da104116389292acd5
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Jan 17 17:27:34 2020 -0600
+
+    Rename VERSION files to VERSION.txt
+    
+    C++20 brings a new standard header called "version". This wouldn't be an
+    issue except for on Windows where filenames can be case insensitive.
+    This issue was discovered why trying to cross-compile for Android on
+    Windows.
+
+commit d662f7dff3a3980f60af918227d4bf10fcb4a6a2
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Jan 17 16:46:24 2020 -0600
+
+    android: export CROSS_COMPILE var
+    
+    Export it so child processes can use tools from the same toolchain.
+
+commit 6627fe21df7aa79ad6ba7fa31d25863bd673e26e
+Merge: 4065ae9592e 1bdbb759df2
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 17 15:27:35 2020 -0600
+
+    Merge pull request #1023 from mitza-oci/rwlock-init
+    
+    ACE_OS::rwlock_init - fixed bug when RW Lock is emulated and creating a condition variable fails
+
+commit 1bdbb759df28e9ea36796c23a969ed1d847c91b0
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 17 09:05:34 2020 -0600
+
+    code review changes
+
+commit 4065ae9592e4d914d404d1b7e03223c8291d0a20
+Merge: 314d3ed8af0 d109e9f7982
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 15:35:03 2020 +0100
+
+    Merge pull request #1025 from jwillemsen/jwi-mpctag
+    
+    Add Latest_ACETAO tag to MPC
+
+commit f480c6cc4f2335b79e350b596cbbe225b728ca7e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 10:14:41 2020 +0100
+
+    Fixed error
+    
+        * ACE/tests/NonBlocking_Conn_Test.cpp:
+
+commit ef05a48c6f326bbb15eedd2d5606dd5134c05e0f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 09:22:28 2020 +0100
+
+    Updated the host we use to check our code with, some seem to be non responsive
+    
+        * ACE/tests/NonBlocking_Conn_Test.cpp:
+
+commit d109e9f7982997ba6a2047ddac4b6576bd51e16f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 09:08:28 2020 +0100
+
+    Removing tag on origin could also fail
+    
+        * ACE/bin/make_release.py:
+
+commit 15f0c6938a0ae2b88a498bd2fed7f353a5c51558
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 09:06:14 2020 +0100
+
+    Removing tag can fail when the tag is not yet there
+    
+        * ACE/bin/make_release.py:
+
+commit 76fab02113b0821c9bad447f357232ad9c3259eb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 09:02:42 2020 +0100
+
+    Add missing quotes and also push all latest tags
+    
+        * ACE/bin/make_release.py:
+
+commit 02b1d932b76e76760fbcb5a275e19f5b1a61b251
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 08:54:57 2020 +0100
+
+    Add Latest_ACETAO tags to MPC to make it easier to clone the latest ACETAO+MPC using a CI build
+    
+        * ACE/bin/make_release.py:
+
+commit 1604249b469d6b82f6ac03d8324420bfe3f8ef75
+Merge: ecdb3766eff 32b858f84cf
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 16 17:35:54 2020 -0600
+
+    Merge pull request #1014 from iguessthislldo/igtd/auto_run_tests
+    
+    Rewrote auto_run_tests.pl Arg Parsing
+
+commit 8161bcb366447083d67791bf14392a8882dc6659
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 16 16:46:31 2020 -0600
+
+    ACE_OS::rwlock_init - fixed bug when RW Lock is emulated and creating a condition variable fails
+
+commit 5c9bcb4f64b416d4330455dc034d292c76869f82
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Jan 15 16:05:52 2020 -0600
+
+    Revert Changes to Platform Files for Android
+
+commit 32b858f84cf4220a51287b537f15e3176a9d7e7a
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Wed Jan 15 13:45:26 2020 -0600
+
+    auto_run_tests.pl: remove spaces in calls
+
+commit 77504588d955e031f286528308ab6efefda2d8dc
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 18:48:07 2020 -0600
+
+    Update ACE NEWS
+
+commit 373ac1d54f1f02bef2472fe7dcb3da0b2c9cd976
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 18:39:08 2020 -0600
+
+    ACE-INSTALL: Cleanup
+
+commit 9b1927e2c8bda3c693c47b887189269f4bbecd7a
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 15:22:41 2020 -0600
+
+    ACE-INSTALL: Document VERSION file issue
+
+commit 1d9eb0db5c2a525dee79221af9cb77c9c48e6d31
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 13:22:16 2020 -0600
+
+    Fix platform_linux_common.GNU again
+
+commit 4d1f635e4b12eb49ef8b7372b51b3915d95400d7
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 13:05:51 2020 -0600
+
+    Fix platform_linux_common.GNU
+
+commit de523d8c2149b489a12c453d8e12dd0655ada279
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 12:59:17 2020 -0600
+
+    Building for Android on Windows
+
+commit 9028d05555bbe6f24f18ee0d93dc4c7521c49638
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 9 09:16:21 2020 +0100
+
+    Add cast to silence new warning
+    
+        * ACE/tests/SOCK_Dgram_Bcast_Test.cpp:
+
+commit 3429716fe5689b312bdcccc57feceba49d8cad97
+Merge: f853b84db13 dc125f1c8f9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 9 09:13:33 2020 +0100
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
+
+commit f853b84db13f3a3441a2bd78a752cd0b88bec2b5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 8 17:18:23 2020 +0100
+
+    Fixed typo in debug message
+    
+        * ACE/tests/SOCK_Dgram_Bcast_Test.cpp:
+
+commit dc125f1c8f9d0b60afbae36af9ddeb0342d90de8
+Merge: db04c975067 234cbc8f26c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 8 10:25:17 2020 +0100
+
+    Merge pull request #1013 from likema/proc-opts-fmt-attr
+    
+    Add ACE_GCC_FORMAT_ATTRIBUTE to ACE_Process_Options
+
+commit db04c97506766eda27f7ecb795cea8c26f0259d3
+Merge: 24caadcb663 a3bd9a4ff7f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 8 08:46:34 2020 +0100
+
+    Merge pull request #1018 from jwillemsen/jwi-embrio1033
+    
+    Embarcadero C++ Builder 10.3.3 changes (Rio)
+
+commit a3bd9a4ff7f464d69657b3482be2311572ddd892
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 7 14:54:23 2020 +0000
+
+    Embarcadero C++ Builder 10.3.3 changes (Rio)
+
+commit 71d507a8c63570dcf28b531838bf0223e0ac2c87
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 7 15:17:57 2020 +0100
+
+    Removed operator*& as it triggers the ambiguity issues
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit 127092869ecfd58450be59b7626b89180df6d670
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 6 09:30:18 2020 +0100
+
+    Make use of ACE_CDR::ULong for the operator[], that matches with TAO and should work with any compiler
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit eb87718ef82f6f7557e661b56e12aa72a5aae932
+Merge: 2075eb4e4ab c51ab9b2998
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 3 14:43:10 2020 -0600
+
+    Merge pull request #1015 from adamsj-oci/master
+    
+    add generate_export_file.pl to installed files
+
+commit c51ab9b29982fb81720f154ac23f34cb8915cae9
+Author: Jeremy Adams <adamsj@objectcomputing.com>
+Date:   Thu Jan 2 15:41:21 2020 -0600
+
+    add generate_export_file.pl to installed files
+
+commit 5aff54de415de4a223b401576b62f5a96133ba7b
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Tue Dec 31 17:39:02 2019 -0600
+
+    Rewrote auto_run_tests.pl Arg Parsing
+    
+    - Help message:
+      - It said test list options, like `-l` or `-a`, "only" do the tests
+        from that option. That isn't true, they include the tests in the
+        run.
+      - Removed reference to non-existent `-c` option which is supposed to
+        be an alias to `-Config`.
+      - Removed outdated synopsis and try to give a slightly more detailed
+        explanation of the script.
+      - Documented `-Exclude`
+      - Moved configuration listing to its own option and made it do it for
+        all test list files that would ran otherwise.
+    
+    - Argument Parsing:
+      - Switched to using `GetOpt::Long` and added long options.
+      - Fixed dry run `-z` option which wasn't being parsed.
+      - Fixed that when using `-l` to specify multiple files it only uses
+        the last one. Also made it so it takes non-option arguments as test
+        lists.
+    
+    - Documented what arguments are being parsed by `PerlACE` modules.
+    - Added 'use strict' and fixes for that.
+    - Removed seemingly unused `use English;`.
+
+commit 234cbc8f26c41ff53c1956ff3582c5fbdead28f1
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Sun Dec 29 01:27:56 2019 +0800
+
+    Add ACE_GCC_FORMAT_ATTRIBUTE to ACE_Process_Options::{command_line,setenv}.
+
+commit 06ee4ac4822a084fcdb296f00356721283bb158c
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Dec 20 16:59:03 2019 -0600
+
+    Use ACE_Time_Value(0) in ACE_Sync_Options::set
+    
+    Respond to Review in https://github.com/DOCGroup/ACE_TAO/pull/1010
+
+commit 77a212244fc64003da9f078738b4fa0863595210
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 18 12:18:52 2019 -0600
+
+    Style Fixes
+
+commit 077f03e97ed4cf43325b32fff14eadcfd8fa6bba
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 18 01:11:27 2019 -0600
+
+    Fixes for tao_idl compiled with asan and ubsan
+    
+    Various fixes for tao_idl built using clang with
+    -fsanitize=undefined,address passed.
+    
+    - Work around static init ub in ACE_Sync_Options based on if
+      ACE_INITIALIZE_MEMORY_BEFORE_USE is defined.
+    - Fix a memory leak in UTL_Scope and a possible null dereference in
+      tao_idl be.
+    - Fixed a hard to track down memory leak involving AST_InterfaceFwd not
+      handling ownership of its placeholder AST_Interface correctly under
+      a case when a forward declaration of an interface is made after the
+      interface was already declared.
+
+commit e6f2f93b584212545359a5f8ceb71f58f81e99e9
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Dec 11 17:01:54 2019 -0600
+
+    recvmsg on Windows with control data: controllen may be changed during the recv call, needs to be copied back out
+
+commit 7f2d38e7214361e25ff4ae6cd6609bccd1237e41
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Tue Dec 10 17:33:42 2019 +0800
+
+    Fix ACE_SOCK_Acceptor ctor comment.
+
+commit f968df011a227fc7f4406ff9c268593bc378305a
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Dec 6 13:25:02 2019 +0100
+
+    Fixed typo in config-posix.h
+
+commit cab5c35b998c07e98d5c5b360a774e65d973b733
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Nov 22 10:13:31 2019 +0100
+
+    Make x.5.7 available
+    
+        * ACE/NEWS:
+        * ACE/bin/copy-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/ACE/NEWS b/ACE/NEWS
index 831f6ca1634..ac7a0a7cc66 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,6 +1,17 @@
+USER VISIBLE CHANGES BETWEEN ACE-6.5.8 and ACE-6.5.9
+====================================================
+
 USER VISIBLE CHANGES BETWEEN ACE-6.5.7 and ACE-6.5.8
 ====================================================
 
+. Added instructions to ACE-INSTALL.html for building ACE/TAO for Android on
+  Windows.
+
+. Embarcadero C++ Builder Rio fixes
+
+. Renamed `VERSION` file to `VERSION.txt` to avoid conflicting with the
+  `version` standard header.
+
 USER VISIBLE CHANGES BETWEEN ACE-6.5.6 and ACE-6.5.7
 ====================================================
 
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index b99e9467f04..91fe85ad2f5 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.7
+    ACE VERSION: 6.5.8
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION b/ACE/VERSION.txt
index b9fe9066970..abe0fcef491 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 6.5.7, released Fri Nov 22 09:24:48 CET 2019
+This is ACE version 6.5.8, released Mon Feb 10 09:28:37 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/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index 4720a118835..d3188a55751 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -51,7 +51,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Sig_Handler;
 class ACE_Dev_Poll_Reactor;
 
-
 // ---------------------------------------------------------------------
 
 /**
@@ -98,7 +97,7 @@ public:
   /// Unimplemented method required by pure virtual method in abstract
   /// base class.
   /**
-   * This method's interface is not very compatibile with this
+   * This method's interface is not very compatible with this
    * Reactor's design.  It's not clear why this method is pure virtual
    * either.
    */
diff --git a/ACE/ace/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h
index 15af35692c0..70455ba79ec 100644
--- a/ACE/ace/MMAP_Memory_Pool.h
+++ b/ACE/ace/MMAP_Memory_Pool.h
@@ -245,9 +245,9 @@ protected:
    * SIGSEGV) will be triggered.  At that point, the ACE_Sig_Handler
    * (which is part of the ACE_Reactor) will catch the signal and
    * dispatch the handle_signal() method defined here.  If the SIGSEGV
-   * signal occurred due to the fact that the mapping wasn't uptodate
+   * signal occurred due to the fact that the mapping wasn't up to date
    * with respect to the backing store, the handler method below will
-   * update the mapping accordingly.  When the signal handler returns,
+   * update the mapping accordingly. When the signal handler returns,
    * the instruction should be restarted and the operation should work.
    */
   virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
diff --git a/ACE/ace/Msg_WFMO_Reactor.h b/ACE/ace/Msg_WFMO_Reactor.h
index 1440965f55e..6adb3d5d433 100644
--- a/ACE/ace/Msg_WFMO_Reactor.h
+++ b/ACE/ace/Msg_WFMO_Reactor.h
@@ -33,19 +33,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * Win32 <MsgWaitForMultipleObjects>.
  *
  * The ACE_Msg_WFMO_Reactor is an OO event demultiplexor and
- * event handler Reactor. It differs from <ACE_WFMO_Reactor> by
+ * event handler Reactor. It differs from ACE_WFMO_Reactor by
  * its ability to react on Windows messages.  It is needed when
  * the task should serve also as a COM/DCOM server.
  */
 class ACE_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor
 {
 public:
-  /// Initialize <ACE_Msg_WFMO_Reactor> with the default size.
+  /// Initialize ACE_Msg_WFMO_Reactor with the default size.
   ACE_Msg_WFMO_Reactor (ACE_Sig_Handler * = 0,
                         ACE_Timer_Queue * = 0);
 
   /**
-   * Initialize <ACE_Msg_WFMO_Reactor> with size @a size.  Two slots will be
+   * Initialize ACE_Msg_WFMO_Reactor with size @a size.  Two slots will be
    * added to the @a size parameter which will store handles used for
    * internal management purposes.
    */
diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp
index ac9fab0c903..99066b8c599 100644
--- a/ACE/ace/QtReactor/QtReactor.cpp
+++ b/ACE/ace/QtReactor/QtReactor.cpp
@@ -5,7 +5,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor)
 
 // Must be called with lock held
-
 ACE_QtReactor::ACE_QtReactor (QApplication *qapp ,
     ACE_Sig_Handler *sh,
     ACE_Timer_Queue *tq,
diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp
index 577a1e43035..e91de0b4fb4 100644
--- a/ACE/ace/Sig_Handler.cpp
+++ b/ACE/ace/Sig_Handler.cpp
@@ -36,16 +36,14 @@ ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context)
 #define ace_signal_handlers_dispatcher ACE_SignalHandler(ACE_Sig_Handlers::dispatch)
 #endif /* ACE_HAS_SIG_C_FUNC */
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Array of Event_Handlers that will handle the signals.
+/// Array of Event_Handlers that will handle the signals.
 ACE_Event_Handler *ACE_Sig_Handler::signal_handlers_[ACE_NSIG];
 
-// Remembers if a signal has occurred.
+/// Remembers if a signal has occurred.
 sig_atomic_t ACE_Sig_Handler::sig_pending_ = 0;
 
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handler)
 
 ACE_Sig_Handler::~ACE_Sig_Handler (void)
@@ -131,10 +129,9 @@ ACE_Sig_Handler::handler (int signum,
   return ACE_Sig_Handler::handler_i (signum, new_sh);
 }
 
-// Register an ACE_Event_Handler along with the corresponding SIGNUM.
-// This method does NOT acquire any locks, so it can be called from a
-// signal handler.
-
+/// Register an ACE_Event_Handler along with the corresponding SIGNUM.
+/// This method does NOT acquire any locks, so it can be called from a
+/// signal handler.
 int
 ACE_Sig_Handler::register_handler_i (int signum,
                                      ACE_Event_Handler *new_sh,
@@ -169,10 +166,9 @@ ACE_Sig_Handler::register_handler_i (int signum,
     return -1;
 }
 
-// Register an ACE_Event_Handler along with the corresponding SIGNUM.
-// This method acquires a lock, so it can't be called from a signal
-// handler, e.g., <dispatch>.
-
+/// Register an ACE_Event_Handler along with the corresponding SIGNUM.
+/// This method acquires a lock, so it can't be called from a signal
+/// handler, e.g., <dispatch>.
 int
 ACE_Sig_Handler::register_handler (int signum,
                                    ACE_Event_Handler *new_sh,
@@ -220,8 +216,7 @@ ACE_Sig_Handler::remove_handler_i (int signum,
   return new_disp->register_action (signum, old_disp);
 }
 
-// Remove an ACE_Event_Handler.
-
+/// Remove an ACE_Event_Handler.
 int
 ACE_Sig_Handler::remove_handler (int signum,
                                  ACE_Sig_Action *new_disp,
@@ -240,9 +235,8 @@ ACE_Sig_Handler::remove_handler (int signum,
   return -1;
 }
 
-// Master dispatcher function that gets called by a signal handler and
-// dispatches one handler...
-
+/// Master dispatcher function that gets called by a signal handler and
+/// dispatches one handler...
 void
 ACE_Sig_Handler::dispatch (int signum,
                            siginfo_t *siginfo,
@@ -285,13 +279,13 @@ ACE_Sig_Handler::dispatch (int signum,
 // from compiling...
 #define ACE_MAX_SIGNAL_HANDLERS ((size_t) 20)
 
-// Keeps track of the id that uniquely identifies each registered
-// signal handler.  This id can be used to cancel a timer via the
-// <remove_handler> method.
+/// Keeps track of the id that uniquely identifies each registered
+/// signal handler.  This id can be used to cancel a timer via the
+/// <remove_handler> method.
 int ACE_Sig_Handlers::sigkey_ = 0;
 
-// If this is true then a 3rd party library has registered a
-// handler...
+/// If this is true then a 3rd party library has registered a
+/// handler...
 bool ACE_Sig_Handlers::third_party_sig_handler_ = false;
 
 // Make life easier by defining typedefs...
@@ -337,9 +331,8 @@ ACE_Sig_Handlers::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-// This is the method that does all the dirty work...  The basic
-// structure of this method was devised by Detlef Becker.
-
+/// This is the method that does all the dirty work...  The basic
+/// structure of this method was devised by Detlef Becker.
 int
 ACE_Sig_Handlers::register_handler (int signum,
                                     ACE_Event_Handler *new_sh,
@@ -402,10 +395,10 @@ ACE_Sig_Handlers::register_handler (int signum,
                       ACE_Sig_Adapter (new_sh,
                                        ++ACE_Sig_Handlers::sigkey_),
                       -1);
+
       // Add the ACE signal handler to the set of handlers for this
       // signal (make sure it goes before the external one if there is
       // one of these).
-
       int result = ACE_Sig_Handlers_Set::instance (signum)->insert (ace_sig_adapter);
 
       if (result == -1)
@@ -465,11 +458,10 @@ ACE_Sig_Handlers::register_handler (int signum,
   return -1;
 }
 
-// Remove the ACE_Event_Handler currently associated with <signum>.
-// Install the new disposition (if given) and return the previous
-// disposition (if desired by the caller).  Returns 0 on success and
-// -1 if <signum> is invalid.
-
+/// Remove the ACE_Event_Handler currently associated with @a signum.
+/// Install the new disposition (if given) and return the previous
+/// disposition (if desired by the caller).  Returns 0 on success and
+// -1 if @a signum is invalid.
 int
 ACE_Sig_Handlers::remove_handler (int signum,
                                   ACE_Sig_Action *new_disp,
@@ -490,7 +482,6 @@ ACE_Sig_Handlers::remove_handler (int signum,
       ACE_SIG_HANDLERS_ITERATOR handler_iterator (*handler_set);
 
       // Iterate through the set of handlers for this signal.
-
       for (ACE_Event_Handler **eh;
            handler_iterator.next (eh) != 0;
            )
@@ -501,7 +492,6 @@ ACE_Sig_Handlers::remove_handler (int signum,
           // Remove the handler if (1) its key matches the key we've
           // been told to remove or (2) if we've been told to remove
           // *all* handlers (i.e., <sigkey> == -1).
-
           if (sh->sigkey () == sigkey || sigkey == -1)
             {
               handler_set->remove (*eh);
@@ -514,7 +504,6 @@ ACE_Sig_Handlers::remove_handler (int signum,
           // If there are no more handlers left for a signal then
           // register the new disposition or restore the default
           // disposition.
-
           ACE_Sig_Action sa (SIG_DFL, (sigset_t *) 0);
 
           if (new_disp == 0)
@@ -528,9 +517,8 @@ ACE_Sig_Handlers::remove_handler (int signum,
     return -1;
 }
 
-// Master dispatcher function that gets called by a signal handler and
-// dispatches *all* the handlers...
-
+/// Master dispatcher function that gets called by a signal handler and
+/// dispatches *all* the handlers...
 void
 ACE_Sig_Handlers::dispatch (int signum,
                             siginfo_t *siginfo,
@@ -569,10 +557,9 @@ ACE_Sig_Handlers::dispatch (int signum,
       }
 }
 
-// Return the first item in the list of handlers.  Note that this will
-// trivially provide the same behavior as the ACE_Sig_Handler
-// version if there is only 1 handler registered!
-
+/// Return the first item in the list of handlers.  Note that this will
+/// trivially provide the same behavior as the ACE_Sig_Handler
+/// version if there is only 1 handler registered!
 ACE_Event_Handler *
 ACE_Sig_Handlers::handler (int signum)
 {
@@ -585,12 +572,11 @@ ACE_Sig_Handlers::handler (int signum)
   return *eh;
 }
 
-// The following is a strange bit of logic that tries to give the same
-// semantics as what happens in ACE_Sig_Handler when we replace the
-// current signal handler with a new one.  Note that if there is only
-// one signal handler the behavior will be identical.  If there is
-// more than one handler then things get weird...
-
+/// The following is a strange bit of logic that tries to give the same
+/// semantics as what happens in ACE_Sig_Handler when we replace the
+/// current signal handler with a new one.  Note that if there is only
+/// one signal handler the behavior will be identical.  If there is
+/// more than one handler then things get weird...
 ACE_Event_Handler *
 ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh)
 {
diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h
index e71b153fb38..1bd2a66d464 100644
--- a/ACE/ace/Sig_Handler.h
+++ b/ACE/ace/Sig_Handler.h
@@ -195,7 +195,7 @@ public:
 
   // = Set/get the handler associated with a particular signal.
 
-  /// Return the head of the list of <ACE_Sig_Handler>s associated with
+  /// Return the head of the list of ACE_Sig_Handlers associated with
   /// SIGNUM.
   virtual ACE_Event_Handler *handler (int signum);
 
@@ -209,7 +209,7 @@ public:
 
   /**
    * Callback routine registered with sigaction(2) that dispatches the
-   * <handle_signal> method of all the pre-registered
+   * handle_signal() method of all the pre-registered
    * ACE_Event_Handlers for @a signum
    */
   static void dispatch (int signum, siginfo_t *, ucontext_t *);
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 3ef421fe12c..42cc249bfd6 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,9 +4,9 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 7
-#define ACE_BETA_VERSION 7
-#define ACE_VERSION "6.5.7"
-#define ACE_VERSION_CODE 394503
+#define ACE_MICRO_VERSION 8
+#define ACE_BETA_VERSION 8
+#define ACE_VERSION "6.5.8"
+#define ACE_VERSION_CODE 394504
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
index bacfe67842a..59d06539cc8 100644
--- a/ACE/ace/ace.mpc
+++ b/ACE/ace/ace.mpc
@@ -506,7 +506,7 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
   InstallData_Files {
     gendir = .
     ../README
-    ../VERSION
+    ../VERSION.txt
     ../PROBLEM-REPORT-FORM
     ../NEWS
     ../COPYING
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index f1667345ede..629b5c9d145 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -387,7 +387,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
 
   Documentation_Files {
     README
-    ../VERSION
+    ../VERSION.txt
   }
 
   Pkgconfig_Files {
diff --git a/ACE/ace/config-macosx-iOS-hardware.h b/ACE/ace/config-macosx-iOS-hardware.h
deleted file mode 100644
index 0d2cc900b85..00000000000
--- a/ACE/ace/config-macosx-iOS-hardware.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H
-#define ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H
-
-#define ACE_HAS_IPHONE
-#define ACE_SIZEOF_LONG_DOUBLE 8
-
-#include "ace/config-macosx-mavericks.h"
-
-#ifdef ACE_HAS_SYSV_IPC
-#undef ACE_HAS_SYSV_IPC
-#endif
-
-#endif /* ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H */
-
diff --git a/ACE/ace/config-macosx-iOS-simulator.h b/ACE/ace/config-macosx-iOS-simulator.h
deleted file mode 100644
index 483dad5530c..00000000000
--- a/ACE/ace/config-macosx-iOS-simulator.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H
-#define ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H
-
-#define ACE_HAS_IPHONE
-#include "ace/config-macosx-mavericks.h"
-
-#endif /* ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H */
-
diff --git a/ACE/ace/config-macosx-iOS.h b/ACE/ace/config-macosx-iOS.h
new file mode 100644
index 00000000000..4fcd1bd406c
--- /dev/null
+++ b/ACE/ace/config-macosx-iOS.h
@@ -0,0 +1,13 @@
+#ifndef ACE_CONFIG_MACOSX_IPHONE_H
+#define ACE_CONFIG_MACOSX_IPHONE_H
+
+#define ACE_HAS_IPHONE
+#define ACE_LACKS_SYSTEM
+
+#include "ace/config-macosx-mojave.h"
+
+#ifdef ACE_HAS_SYSV_IPC
+#undef ACE_HAS_SYSV_IPC
+#endif
+
+#endif /* ACE_CONFIG_MACOSX_IPHONE_H */
diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h
index 4e53e3bcada..722a0f3280c 100644
--- a/ACE/ace/config-macosx-leopard.h
+++ b/ACE/ace/config-macosx-leopard.h
@@ -204,11 +204,15 @@
 #endif
 
 #define ACE_LACKS_CONDATTR_SETCLOCK
+
+#ifndef ACE_HAS_IPHONE
 #if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
 #define ACE_LACKS_CLOCKID_T
 #define ACE_LACKS_CLOCK_MONOTONIC
 #define ACE_LACKS_CLOCK_REALTIME
 #endif
+#endif
+
 // dlcompat package (not part of base Darwin) is needed for dlopen().
 // You may download directly from sourceforge and install or use fink
 // Fink installer puts libraries in /sw/lib and headers in /sw/include
diff --git a/ACE/bin/ace-install b/ACE/bin/ace-install
index 312fcb243ec..8bf684a35e0 100755
--- a/ACE/bin/ace-install
+++ b/ACE/bin/ace-install
@@ -389,10 +389,10 @@ if [ $install -ne 0 ]; then
     ##########################################
     # determine final target directories
 
-    ACE_VER=`head -n 1 $ACE_ROOT/VERSION | sed -e 's/^[^0-9]*//' -e 's/[, ].*//'`
+    ACE_VER=`head -n 1 $ACE_ROOT/VERSION.txt | sed -e 's/^[^0-9]*//' -e 's/[, ].*//'`
     ACE_DIR="$ACE_DEST/ACE-$ACE_VER"; export ACE_DIR
 
-    TAO_VER=`head -n 1 $ACE_ROOT/TAO/VERSION | sed -e 's/^[^0-9]*//' -e 's/[, ].*//'`
+    TAO_VER=`head -n 1 $ACE_ROOT/TAO/VERSION.txt | sed -e 's/^[^0-9]*//' -e 's/[, ].*//'`
     TAO_DIR="$ACE_DEST/TAO-$TAO_VER"; export ACE_DIR
 
     ##########################################
@@ -417,7 +417,7 @@ if [ $install -ne 0 ]; then
     # copy TAO stuff
 
     cd $ACE_ROOT/TAO
-    cp VERSION $TAO_DIR/$ACE_ARCH/TAO-VERSION
+    cp VERSION.txt $TAO_DIR/$ACE_ARCH/TAO-VERSION
 
     # copy TAO includes
     echo "Copying include files..."
@@ -459,7 +459,7 @@ if [ $install -ne 0 ]; then
     # copy ACE stuff
 
     cd $ACE_ROOT
-    cp VERSION $ACE_DIR/$ACE_ARCH/ACE-VERSION
+    cp VERSION.txt $ACE_DIR/$ACE_ARCH/ACE-VERSION
 
     # copy ACE includes
     echo "Copying include files..."
diff --git a/ACE/bin/copy-local-script.sh b/ACE/bin/copy-local-script.sh
index 8b8bddf7105..c7931ca9c67 100755
--- a/ACE/bin/copy-local-script.sh
+++ b/ACE/bin/copy-local-script.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 for i in *.gz *.bz2 *.zip *.md5; do
-  d=`echo $i | sed 's/\.[tz][ai][rp]/-6.5.7&/'`
+  d=`echo $i | sed 's/\.[tz][ai][rp]/-6.5.8&/'`
   echo "Copying $i to $d"
   cp -ip $i $d
 done
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 f67d2613066..af5593bc254 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=2019_11_22; else olddate=$3; fi
+if test -z $3; then olddate=2020_02_10; 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/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl
index 2296438b59f..679c6fcf85c 100755
--- a/ACE/bin/generate_doxygen.pl
+++ b/ACE/bin/generate_doxygen.pl
@@ -27,7 +27,7 @@ if (!defined $DANCE_ROOT) {
 
 $is_release = 0;
 $exclude_ace = 0;
-$exclude_tao = !-r "$TAO_ROOT/VERSION";
+$exclude_tao = !-r "$TAO_ROOT/VERSION.txt";
 $exclude_ciao = !-r "$CIAO_ROOT/VERSION";
 $exclude_dance = !-r "$DANCE_ROOT/VERSION";
 $verbose = 0;
@@ -36,7 +36,7 @@ $html_output_dir = '.';
 $footer = '';
 
 $dds = 0;
-if (defined $DDS_ROOT && -r "$DDS_ROOT/VERSION") {
+if (defined $DDS_ROOT && -r "$DDS_ROOT/VERSION.txt") {
     $dds_path = Cwd::abs_path($DDS_ROOT);
     $cwd_path = Cwd::abs_path(getcwd());
     if ($dds_path eq $cwd_path) {
@@ -96,11 +96,11 @@ if (!-r "$ACE_ROOT/ace/config.h") {
     $wrote_configh = 1;
 }
 
-&generate_doxy_files ('ACE',  " $ACE_ROOT", " $ACE_ROOT/VERSION", @ACE_DOCS) if (!$exclude_ace);
-&generate_doxy_files ('TAO',  " $TAO_ROOT", " $TAO_ROOT/VERSION", @TAO_DOCS) if (!$exclude_tao);
+&generate_doxy_files ('ACE',  " $ACE_ROOT", " $ACE_ROOT/VERSION.txt", @ACE_DOCS) if (!$exclude_ace);
+&generate_doxy_files ('TAO',  " $TAO_ROOT", " $TAO_ROOT/VERSION.txt", @TAO_DOCS) if (!$exclude_tao);
 &generate_doxy_files ('CIAO', " $CIAO_ROOT", " $CIAO_ROOT/VERSION", @CIAO_DOCS) if (!$exclude_ciao);
 &generate_doxy_files ('DANCE'," $DANCE_ROOT", " $DANCE_ROOT/VERSION", @DANCE_DOCS) if (!$exclude_dance);
-&generate_doxy_files ('DDS',   "$DDS_ROOT", " $DDS_ROOT/VERSION", @DDS_DOCS) if $dds;
+&generate_doxy_files ('DDS',   "$DDS_ROOT", " $DDS_ROOT/VERSION.txt", @DDS_DOCS) if $dds;
 
 unlink "$ACE_ROOT/ace/config.h" if $wrote_configh;
 
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index b3f8ce26523..8186bdac1bc 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -196,18 +196,17 @@ def check_workspace ():
 
 def update_version_files (component):
     """ Updates the version files for a given component.  This includes
-    Version.h, the PRF, and the VERSION file."""
+    Version.h, the PRF, and the VERSION.txt file."""
 
     global comp_versions, opts, release_date
 
     vprint ("Updating version files for " + component)
 
-    import re
-
     retval = list ()
 
-    ## Update component/VERSION
-    with open (component + "/VERSION", "r+") as version_file:
+    ## Update component/VERSION.txt
+    filename = component + "/VERSION.txt"
+    with open (filename, "r+") as version_file:
         new_version = re.sub (component + " version .*",
                               "%s version %s, released %s" % (component,
                                                               comp_versions[component + "_version"],
@@ -223,7 +222,7 @@ def update_version_files (component):
 
         vprint ("Updating Version.h for " + component)
 
-    retval += [component + "/VERSION"]
+    retval += [filename]
 
     ## Update component/component/Version.h
     version_header = """
@@ -322,7 +321,6 @@ def update_debianbuild ():
 
     global comp_versions
 
-    import re
     from os import listdir
 
     files = list ()
@@ -432,20 +430,18 @@ def create_changelog (component):
     return ["%s/ChangeLogs/%s-%s" % (component, component, comp_versions[component + "_version_"])]
 
 def get_comp_versions (component):
-    """ Extracts the current version number from the VERSION
+    """ Extracts the current version number from the VERSION.txt
     file and increments it appropriately for the release type
     requested."""
     vprint ("Detecting current version for " + component)
 
-    import re
-
     global old_comp_versions, comp_versions, opts
 
     micro = re.compile ("version (\d+)\.(\d+)\.(\d+)")
     minor = re.compile ("version (\d+)\.(\d+)[^\.]")
     major = re.compile ("version (\d+)[^\.]")
 
-    with open (component + "/VERSION") as version_file:
+    with open (component + "/VERSION.txt") as version_file:
         for line in version_file:
             match = None
 
diff --git a/ACE/debian/control b/ACE/debian/control
index 86a7b36452f..57bbcd77226 100644
--- a/ACE/debian/control
+++ b/ACE/debian/control
@@ -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.7
+Package: libace-6.5.8
 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.7 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.8 (= ${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.7
+Package: libace-ssl-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.8 (= ${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.7
+Package: libace-rmcast-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.8 (= ${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.7
+Package: libace-tmcast-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.8 (= ${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.7
+Package: libace-htbp-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.8 (= ${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.7
+Package: libace-inet-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.8 (= ${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.7
+Package: libace-inet-ssl-6.5.8
 Architecture: any
 Section: libs
-Depends: libace-inet-6.5.7, libace-ssl-6.5.7, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.8, libace-ssl-6.5.8, ${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.7 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.8 (= ${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.7
+Package: libacexml-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.8 (= ${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.7
+Package: libace-xml-utils-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.8 (= ${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.7
+Package: libkokyu-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.8 (= ${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.7
+Package: libace-xtreactor-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.8 (= ${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.7
+Package: libace-tkreactor-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.8 (= ${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.7
+Package: libace-flreactor-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${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.7
+Package: libace-foxreactor-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.8 (= ${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.7
+Package: libnetsvcs-6.5.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.8 (= ${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/libace-6.5.7.lintian-overrides b/ACE/debian/libace-6.5.7.lintian-overrides
deleted file mode 100644
index a680e6e0aa6..00000000000
--- a/ACE/debian/libace-6.5.7.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-libace-6.5.7: no-symbols-control-file usr/lib/libACE-6.5.7.so
-libace-6.5.7: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.7.so
-libace-6.5.7: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.7.so
-libace-6.5.7: no-symbols-control-file usr/lib/libACE_ETCL-6.5.7.so
-libace-6.5.7: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.7.so
-libace-6.5.7: no-symbols-control-file usr/lib/libACE_Compression-6.5.7.so
diff --git a/ACE/debian/libace-6.5.7.docs b/ACE/debian/libace-6.5.8.docs
index 3bdab5b0089..ca760171412 100644
--- a/ACE/debian/libace-6.5.7.docs
+++ b/ACE/debian/libace-6.5.8.docs
@@ -1,8 +1,8 @@
 README
-VERSION
+VERSION.txt
 AUTHORS
 docs/FAQ
 PROBLEM-REPORT-FORM
 THANKS
-VERSION
+VERSION.txt
 NEWS
diff --git a/ACE/debian/libace-6.5.7.install b/ACE/debian/libace-6.5.8.install
index 182a5eda411..182a5eda411 100644
--- a/ACE/debian/libace-6.5.7.install
+++ b/ACE/debian/libace-6.5.8.install
diff --git a/ACE/debian/libace-6.5.8.lintian-overrides b/ACE/debian/libace-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..ccc1f750517
--- /dev/null
+++ b/ACE/debian/libace-6.5.8.lintian-overrides
@@ -0,0 +1,6 @@
+libace-6.5.8: no-symbols-control-file usr/lib/libACE-6.5.8.so
+libace-6.5.8: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.8.so
+libace-6.5.8: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.8.so
+libace-6.5.8: no-symbols-control-file usr/lib/libACE_ETCL-6.5.8.so
+libace-6.5.8: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.8.so
+libace-6.5.8: no-symbols-control-file usr/lib/libACE_Compression-6.5.8.so
diff --git a/ACE/debian/libace-dev.docs b/ACE/debian/libace-dev.docs
index b62a1c98d24..680046f4f26 100644
--- a/ACE/debian/libace-dev.docs
+++ b/ACE/debian/libace-dev.docs
@@ -1,7 +1,7 @@
 README
-VERSION
+VERSION.txt
 AUTHORS
 docs/FAQ
 PROBLEM-REPORT-FORM
 THANKS
-VERSION
+VERSION.txt
diff --git a/ACE/debian/libace-flreactor-6.5.7.lintian-overrides b/ACE/debian/libace-flreactor-6.5.7.lintian-overrides
deleted file mode 100644
index f3a139d2ff4..00000000000
--- a/ACE/debian/libace-flreactor-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-flreactor-6.5.7: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.7.so
diff --git a/ACE/debian/libace-flreactor-6.5.7.install b/ACE/debian/libace-flreactor-6.5.8.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.5.7.install
+++ b/ACE/debian/libace-flreactor-6.5.8.install
diff --git a/ACE/debian/libace-flreactor-6.5.8.lintian-overrides b/ACE/debian/libace-flreactor-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..65de8107df3
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-flreactor-6.5.8: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.8.so
diff --git a/ACE/debian/libace-foxreactor-6.5.7.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.7.lintian-overrides
deleted file mode 100644
index 64374193093..00000000000
--- a/ACE/debian/libace-foxreactor-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-foxreactor-6.5.7: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.7.so
diff --git a/ACE/debian/libace-foxreactor-6.5.7.install b/ACE/debian/libace-foxreactor-6.5.8.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.5.7.install
+++ b/ACE/debian/libace-foxreactor-6.5.8.install
diff --git a/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..1366abe881b
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-foxreactor-6.5.8: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.8.so
diff --git a/ACE/debian/libace-htbp-6.5.7.lintian-overrides b/ACE/debian/libace-htbp-6.5.7.lintian-overrides
deleted file mode 100644
index d980b5c098c..00000000000
--- a/ACE/debian/libace-htbp-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-htbp-6.5.7: no-symbols-control-file usr/lib/libACE_HTBP-6.5.7.so
diff --git a/ACE/debian/libace-htbp-6.5.7.install b/ACE/debian/libace-htbp-6.5.8.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.5.7.install
+++ b/ACE/debian/libace-htbp-6.5.8.install
diff --git a/ACE/debian/libace-htbp-6.5.8.lintian-overrides b/ACE/debian/libace-htbp-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..30f4ac9d32e
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-htbp-6.5.8: no-symbols-control-file usr/lib/libACE_HTBP-6.5.8.so
diff --git a/ACE/debian/libace-inet-6.5.7.lintian-overrides b/ACE/debian/libace-inet-6.5.7.lintian-overrides
deleted file mode 100644
index 3a61ad9f254..00000000000
--- a/ACE/debian/libace-inet-6.5.7.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libace-inet-6.5.7: extended-description-is-probably-too-short
-libace-inet-6.5.7: no-symbols-control-file usr/lib/libACE_INet-6.5.7.so
diff --git a/ACE/debian/libace-inet-6.5.7.install b/ACE/debian/libace-inet-6.5.8.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.5.7.install
+++ b/ACE/debian/libace-inet-6.5.8.install
diff --git a/ACE/debian/libace-inet-6.5.8.lintian-overrides b/ACE/debian/libace-inet-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..e49f0b41704
--- /dev/null
+++ b/ACE/debian/libace-inet-6.5.8.lintian-overrides
@@ -0,0 +1,2 @@
+libace-inet-6.5.8: extended-description-is-probably-too-short
+libace-inet-6.5.8: no-symbols-control-file usr/lib/libACE_INet-6.5.8.so
diff --git a/ACE/debian/libace-inet-ssl-6.5.7.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.7.lintian-overrides
deleted file mode 100644
index 09579f9870d..00000000000
--- a/ACE/debian/libace-inet-ssl-6.5.7.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libace-inet-ssl-6.5.7: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.7.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-inet-ssl-6.5.7: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-inet-ssl-6.5.7.install b/ACE/debian/libace-inet-ssl-6.5.8.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.5.7.install
+++ b/ACE/debian/libace-inet-ssl-6.5.8.install
diff --git a/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..9bfa0863154
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides
@@ -0,0 +1,4 @@
+libace-inet-ssl-6.5.8: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.8.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-inet-ssl-6.5.8: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-rmcast-6.5.7.lintian-overrides b/ACE/debian/libace-rmcast-6.5.7.lintian-overrides
deleted file mode 100644
index f5f66b3e683..00000000000
--- a/ACE/debian/libace-rmcast-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-rmcast-6.5.7: no-symbols-control-file usr/lib/libACE_RMCast-6.5.7.so
diff --git a/ACE/debian/libace-rmcast-6.5.7.install b/ACE/debian/libace-rmcast-6.5.8.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.5.7.install
+++ b/ACE/debian/libace-rmcast-6.5.8.install
diff --git a/ACE/debian/libace-rmcast-6.5.8.lintian-overrides b/ACE/debian/libace-rmcast-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..3e4f8730d24
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-rmcast-6.5.8: no-symbols-control-file usr/lib/libACE_RMCast-6.5.8.so
diff --git a/ACE/debian/libace-ssl-6.5.7.lintian-overrides b/ACE/debian/libace-ssl-6.5.7.lintian-overrides
deleted file mode 100644
index be236c078e2..00000000000
--- a/ACE/debian/libace-ssl-6.5.7.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-libace-ssl-6.5.7: extended-description-is-probably-too-short
-libace-ssl-6.5.7: no-symbols-control-file usr/lib/libACE_SSL-6.5.7.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-ssl-6.5.7: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-ssl-6.5.7.NEWS b/ACE/debian/libace-ssl-6.5.8.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.5.7.NEWS
+++ b/ACE/debian/libace-ssl-6.5.8.NEWS
diff --git a/ACE/debian/libace-ssl-6.5.7.install b/ACE/debian/libace-ssl-6.5.8.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.5.7.install
+++ b/ACE/debian/libace-ssl-6.5.8.install
diff --git a/ACE/debian/libace-ssl-6.5.8.lintian-overrides b/ACE/debian/libace-ssl-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..33779b71cd6
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.5.8.lintian-overrides
@@ -0,0 +1,5 @@
+libace-ssl-6.5.8: extended-description-is-probably-too-short
+libace-ssl-6.5.8: no-symbols-control-file usr/lib/libACE_SSL-6.5.8.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-ssl-6.5.8: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.5.7.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.7.lintian-overrides
deleted file mode 100644
index 8db3eafb2e8..00000000000
--- a/ACE/debian/libace-tkreactor-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tkreactor-6.5.7: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.7.so
diff --git a/ACE/debian/libace-tkreactor-6.5.7.install b/ACE/debian/libace-tkreactor-6.5.8.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.5.7.install
+++ b/ACE/debian/libace-tkreactor-6.5.8.install
diff --git a/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..8c75e539987
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-tkreactor-6.5.8: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.8.so
diff --git a/ACE/debian/libace-tmcast-6.5.7.lintian-overrides b/ACE/debian/libace-tmcast-6.5.7.lintian-overrides
deleted file mode 100644
index 7fa02289d82..00000000000
--- a/ACE/debian/libace-tmcast-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tmcast-6.5.7: no-symbols-control-file usr/lib/libACE_TMCast-6.5.7.so
diff --git a/ACE/debian/libace-tmcast-6.5.7.install b/ACE/debian/libace-tmcast-6.5.8.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.5.7.install
+++ b/ACE/debian/libace-tmcast-6.5.8.install
diff --git a/ACE/debian/libace-tmcast-6.5.8.lintian-overrides b/ACE/debian/libace-tmcast-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..1a4e9135d1d
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-tmcast-6.5.8: no-symbols-control-file usr/lib/libACE_TMCast-6.5.8.so
diff --git a/ACE/debian/libace-xml-utils-6.5.7.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.7.lintian-overrides
deleted file mode 100644
index 7fdfec21d25..00000000000
--- a/ACE/debian/libace-xml-utils-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xml-utils-6.5.7: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.7.so
diff --git a/ACE/debian/libace-xml-utils-6.5.7.install b/ACE/debian/libace-xml-utils-6.5.8.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.5.7.install
+++ b/ACE/debian/libace-xml-utils-6.5.8.install
diff --git a/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..d63c9bc5cfa
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-xml-utils-6.5.8: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.8.so
diff --git a/ACE/debian/libace-xtreactor-6.5.7.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.7.lintian-overrides
deleted file mode 100644
index 65d4edd2fee..00000000000
--- a/ACE/debian/libace-xtreactor-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xtreactor-6.5.7: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.7.so
diff --git a/ACE/debian/libace-xtreactor-6.5.7.install b/ACE/debian/libace-xtreactor-6.5.8.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.5.7.install
+++ b/ACE/debian/libace-xtreactor-6.5.8.install
diff --git a/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..a3e87729442
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-xtreactor-6.5.8: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.8.so
diff --git a/ACE/debian/libacexml-6.5.7.lintian-overrides b/ACE/debian/libacexml-6.5.7.lintian-overrides
deleted file mode 100644
index c474f3856a6..00000000000
--- a/ACE/debian/libacexml-6.5.7.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libacexml-6.5.7: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.7.so
-libacexml-6.5.7: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.7.so
-libacexml-6.5.7: no-symbols-control-file usr/lib/libACEXML-6.5.7.so
diff --git a/ACE/debian/libacexml-6.5.7.docs b/ACE/debian/libacexml-6.5.8.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.5.7.docs
+++ b/ACE/debian/libacexml-6.5.8.docs
diff --git a/ACE/debian/libacexml-6.5.7.install b/ACE/debian/libacexml-6.5.8.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.5.7.install
+++ b/ACE/debian/libacexml-6.5.8.install
diff --git a/ACE/debian/libacexml-6.5.8.lintian-overrides b/ACE/debian/libacexml-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..a9c6f75fafc
--- /dev/null
+++ b/ACE/debian/libacexml-6.5.8.lintian-overrides
@@ -0,0 +1,3 @@
+libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.8.so
+libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.8.so
+libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML-6.5.8.so
diff --git a/ACE/debian/libkokyu-6.5.7.lintian-overrides b/ACE/debian/libkokyu-6.5.7.lintian-overrides
deleted file mode 100644
index f9d71b00e0b..00000000000
--- a/ACE/debian/libkokyu-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkokyu-6.5.7: no-symbols-control-file usr/lib/libKokyu-6.5.7.so
diff --git a/ACE/debian/libkokyu-6.5.7.docs b/ACE/debian/libkokyu-6.5.8.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.5.7.docs
+++ b/ACE/debian/libkokyu-6.5.8.docs
diff --git a/ACE/debian/libkokyu-6.5.7.install b/ACE/debian/libkokyu-6.5.8.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.5.7.install
+++ b/ACE/debian/libkokyu-6.5.8.install
diff --git a/ACE/debian/libkokyu-6.5.8.lintian-overrides b/ACE/debian/libkokyu-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..87c19f0fd34
--- /dev/null
+++ b/ACE/debian/libkokyu-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libkokyu-6.5.8: no-symbols-control-file usr/lib/libKokyu-6.5.8.so
diff --git a/ACE/debian/libnetsvcs-6.5.7.lintian-overrides b/ACE/debian/libnetsvcs-6.5.7.lintian-overrides
deleted file mode 100644
index 2171c607360..00000000000
--- a/ACE/debian/libnetsvcs-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetsvcs-6.5.7: no-symbols-control-file usr/lib/libnetsvcs-6.5.7.so
diff --git a/ACE/debian/libnetsvcs-6.5.7.docs b/ACE/debian/libnetsvcs-6.5.8.docs
index 0b03c55b91f..0b03c55b91f 100644
--- a/ACE/debian/libnetsvcs-6.5.7.docs
+++ b/ACE/debian/libnetsvcs-6.5.8.docs
diff --git a/ACE/debian/libnetsvcs-6.5.7.install b/ACE/debian/libnetsvcs-6.5.8.install
index c7a04b16213..c7a04b16213 100644
--- a/ACE/debian/libnetsvcs-6.5.7.install
+++ b/ACE/debian/libnetsvcs-6.5.8.install
diff --git a/ACE/debian/libnetsvcs-6.5.8.lintian-overrides b/ACE/debian/libnetsvcs-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..9bdc70451e8
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libnetsvcs-6.5.8: no-symbols-control-file usr/lib/libnetsvcs-6.5.8.so
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index 04c3f488171..d6923b5e793 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.7 and TAO 2.5.7
-(ACE+TAO x.5.7), 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.8 and TAO 2.5.8
+(ACE+TAO x.5.8), 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_7/ACE+TAO-6.5.7.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.7.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-6.5.8.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.8.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE+TAO-src-6.5.7.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.7.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-src-6.5.8.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.8.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_7/ACE+TAO-6.5.7.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.7.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-6.5.8.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.8.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE+TAO-src-6.5.7.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.7.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-src-6.5.8.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.8.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_7/ACE+TAO-6.5.7.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.7.zip">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-6.5.8.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.8.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE+TAO-src-6.5.7.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.7.zip">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-src-6.5.8.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.8.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_7/ACE-html-6.5.7.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.7.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-html-6.5.8.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.8.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_7/ACE-html-6.5.7.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.7.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-html-6.5.8.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.8.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_7/ACE-html-6.5.7.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.7.zip">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-html-6.5.8.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.8.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_7/ACE-6.5.7.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.7.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-6.5.8.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.8.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE-src-6.5.7.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.7.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-src-6.5.8.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.8.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_7/ACE-6.5.7.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.7.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-6.5.8.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.8.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE-src-6.5.7.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.7.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-src-6.5.8.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.8.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_7/ACE-6.5.7.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.7.zip">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-6.5.8.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.8.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_7/ACE-src-6.5.7.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.7.zip">FTP</A>]
+      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-src-6.5.8.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.8.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index c6b325d6cef..7fdd7be04f2 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -159,11 +159,11 @@
             <li>
               ACE/PROBLEM-REPORT-FORM</li>
             <li>
-              ACE/VERSION</li>
+              ACE/VERSION.txt</li>
             <li>
               ACE/TAO/PROBLEM-REPORT-FORM</li>
             <li>
-              TAO/VERSION</li>
+              TAO/VERSION.txt</li>
             <li>
               TAO/tao/Version.h</li>
             ace/Version.h</li> </code>
@@ -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_7 ACE_TAO<br>
+        git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_5_8 ACE_TAO<br>
         cd ACE_TAO<br>
         export ACE_ROOT=$PWD/ACE<br>
         export TAO_ROOT=$PWD/TAO<br>
diff --git a/ACE/etc/index.html b/ACE/etc/index.html
index c10aac892b9..95774fc3bf7 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.8/html">6.5.8</A></P></LI>
       <LI><P><A HREF="6.5.7/html">6.5.7</A></P></LI>
       <LI><P><A HREF="6.5.6/html">6.5.6</A></P></LI>
       <LI><P><A HREF="6.5.5/html">6.5.5</A></P></LI>
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU
index 24ebf3bb5b4..94b52b16748 100644
--- a/ACE/include/makeinclude/platform_android.GNU
+++ b/ACE/include/makeinclude/platform_android.GNU
@@ -83,6 +83,9 @@ ifndef CROSS_COMPILE
   $(error ANDROID_ABI passed (set to: $(ANDROID_ABI)) is not valid)
 endif
 
+# Export so child processes can use tools from the same toolchain.
+export CROSS_COMPILE
+
 ifeq ($(android_force_clang),0)
   # Determine if the g++ compiler is GCC or Clang.
   # There are at least 3 assumptions being made here:
diff --git a/ACE/include/makeinclude/platform_clang_common.GNU b/ACE/include/makeinclude/platform_clang_common.GNU
index 51ccc49feda..00ca5467051 100644
--- a/ACE/include/makeinclude/platform_clang_common.GNU
+++ b/ACE/include/makeinclude/platform_clang_common.GNU
@@ -75,11 +75,7 @@ ifneq ($(DLD),)
     LD_FOR_VERSION_TEST = $(DLD)
   endif # DLD = CXX_FOR_VERSION_TEST
   # The -E option is GNU ld specific
-  ifneq ($(mingw32),1)
-    GNU_LD := $(shell sh -c '$(LD_FOR_VERSION_TEST) -v 2>&1 | grep -c "GNU ld"')
-  else
-    GNU_LD := $(if $(findstring GNU ld,$(shell $(LD_FOR_VERSION_TEST) -v)), 1, 0)
-  endif # mingw32
+  GNU_LD := $(if $(findstring GNU ld,$(shell $(LD_FOR_VERSION_TEST) -v)), 1, 0)
 endif # DLD
 
 ifeq ($(GNU_LD),1)
diff --git a/ACE/include/makeinclude/platform_macosx_iOS.GNU b/ACE/include/makeinclude/platform_macosx_iOS.GNU
index 4e554174a6f..c0acc1f9143 100644
--- a/ACE/include/makeinclude/platform_macosx_iOS.GNU
+++ b/ACE/include/makeinclude/platform_macosx_iOS.GNU
@@ -9,23 +9,35 @@ else
   XCODE:=/Applications/Xcode.app
 endif
 
+ifndef IPHONE_TARGET
+  $(error Please set IPHONE_TARGET to SIMULATOR or HARDWARE) 
+endif
+
 ifeq ($(IPHONE_TARGET), SIMULATOR)
+  CROSS-COMPILE=1
   IPHONE_PLATFORM:=$(XCODE)/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer
   IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneSimulator${IPHONE_VERSION}.sdk
-  IPHONE_HARDWARE_ARCHITECTURE=i386
+  IPHONE_HARDWARE_ARCHITECTURE=x86_64
 
-  # crt1.10.7.o is missing under MacOSX 10.7, fallback to 10.6
-  # until apple provides the missing crt1.10.7.o
-  CFLAGS  += -mmacosx-version-min=10.6
-  CCFLAGS += -mmacosx-version-min=10.6
-  LDFLAGS += -mmacosx-version-min=10.6
+# June 2017 release, iPhone 6s and later
+  CFLAGS  += -miphoneos-version-min=12.0
+  CCFLAGS += -miphoneos-version-min=12.0
+  LDFLAGS += -miphoneos-version-min=12.0
 endif
 
 ifeq ($(IPHONE_TARGET), HARDWARE)
   CROSS-COMPILE=1
   IPHONE_PLATFORM:=$(XCODE)/Contents/Developer/Platforms/iPhoneOS.platform/Developer
   IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneOS${IPHONE_VERSION}.sdk
-  IPHONE_HARDWARE_ARCHITECTURE=armv7
+# arm64 iPhone 6 and later
+  IPHONE_HARDWARE_ARCHITECTURE=arm64
+
+ifeq ($(iphone_bitcode),1)
+# enable bitcode
+  CFLAGS  += -fembed-bitcode
+  CCFLAGS += -fembed-bitcode
+endif
+
 ifeq ($(iphone_codesign),1)
   CODESIGN_ALLOCATE:=$(IPHONE_PLATFORM)/usr/bin/codesign_allocate
   POSTLINK=; codesign -f -s "iPhone Developer" $(BIN)
@@ -33,10 +45,15 @@ endif
   rwho = 0
 endif
 
+# pass a flag to the preprocessor
+CFLAGS  += -DACE_HAS_IOS
+CCFLAGS += -DACE_HAS_IOS
+
 CC:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 CXX:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
-AR:=$(IPHONE_PLATFORM)/usr/bin/ar
-RANLIB:=$(IPHONE_PLATFORM)/usr/bin/ranlib
+AR:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar
+ARFLAGS = rSv
+RANLIB:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib -no_warning_for_no_symbols
 DLD = $(CXX)
 LD  = $(CXX)
 CFLAGS  += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK)
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 89ce365f2d1..82092883412 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.7
-%define TAOVER  2.5.7
+%define ACEVER  6.5.8
+%define TAOVER  2.5.8
 
 # Conditional build
 # Default values are
@@ -829,6 +829,8 @@ export TAO_ROOT=$ACE_ROOT/TAO
 g++ --version
 g++ -dumpversion
 
+%define inline %{nil}
+
 %if %skip_make
 
 cd .. && rm -rf ACE_wrappers && ln -s ACE_wrappers-BUILT ACE_wrappers
@@ -1951,7 +1953,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 # ---------------- ace-devel ----------------
 
@@ -1993,7 +1995,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 # ---------------- ace-xml ----------------
 
@@ -2005,7 +2007,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 # ---------------- ace-gperf ----------------
 
@@ -2019,7 +2021,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 # ---------------- ace-xml-devel ----------------
 
@@ -2036,7 +2038,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 # ---------------- ace-kokyu ----------------
 
@@ -2048,7 +2050,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 # ---------------- ace-kokyu-devel ----------------
 
@@ -2060,7 +2062,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 # ---------------- ace-foxreactor ----------------
 
@@ -2074,7 +2076,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 %endif
 %endif
@@ -2090,7 +2092,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 %endif
 
@@ -2109,7 +2111,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 %endif
 
@@ -2125,7 +2127,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 %endif
 
@@ -2144,7 +2146,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 %endif
 
@@ -2160,7 +2162,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 %endif
 
@@ -2179,7 +2181,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 %endif
 
@@ -2195,7 +2197,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 %endif
 
@@ -2214,7 +2216,7 @@ fi
 %doc COPYING
 %doc PROBLEM-REPORT-FORM
 %doc README
-%doc VERSION
+%doc VERSION.txt
 
 %endif
 
@@ -2260,7 +2262,7 @@ fi
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
 %doc TAO/TAO-INSTALL.html
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 # ---------------- tao-devel ----------------
@@ -2312,7 +2314,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 # ---------------- tao-utils ----------------
@@ -2327,7 +2329,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 %doc TAO/utils/catior/README.catior
 %doc TAO/utils/nslist/README.nslist
@@ -2359,7 +2361,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 # ---------------- tao-cosevent ----------------
@@ -2386,7 +2388,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 # ---------------- tao-cosnotification ----------------
@@ -2413,7 +2415,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 # ---------------- tao-costrading ----------------
@@ -2441,7 +2443,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 # ---------------- tao-rtevent ----------------
@@ -2468,7 +2470,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 # ---------------- tao-cosconcurrency ----------------
@@ -2495,7 +2497,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 # ---------------- tao-flresource ----------------
@@ -2508,7 +2510,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 %endif
@@ -2527,7 +2529,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 %endif
@@ -2542,7 +2544,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 %endif
@@ -2561,7 +2563,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 %endif
@@ -2576,7 +2578,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 %endif
@@ -2595,7 +2597,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 %endif
@@ -2610,7 +2612,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 %endif
@@ -2629,7 +2631,7 @@ fi
 
 %doc TAO/COPYING
 %doc TAO/PROBLEM-REPORT-FORM
-%doc TAO/VERSION
+%doc TAO/VERSION.txt
 %doc TAO/README
 
 %endif
diff --git a/ACE/tests/Compiler_Features_32_Test.cpp b/ACE/tests/Compiler_Features_32_Test.cpp
index a7374894294..f51b9e16803 100644
--- a/ACE/tests/Compiler_Features_32_Test.cpp
+++ b/ACE/tests/Compiler_Features_32_Test.cpp
@@ -45,7 +45,7 @@ A::u_type_::~u_type_ ()
 void A::clear ()
 {
 #if defined __clang__ && \
-    (defined __apple_build_version__ && __apple_build_version__ < 9100000 \
+    (defined __apple_build_version__ && __apple_build_version__ <= 11000033 \
      || __clang_major__ <= 9)
 #define CLANG_WORKAROUND
 #endif
diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp
index 932007472c3..cfcc9dce132 100644
--- a/ACE/tests/INET_Addr_Test.cpp
+++ b/ACE/tests/INET_Addr_Test.cpp
@@ -112,7 +112,6 @@ static bool test_port_assignment (void)
 
 static bool test_multiple (void)
 {
-
   bool success = true;
 
   // Check the behavior when there are multiple addresses assigned to a name.
diff --git a/ACE/tests/IOStream_Test.cpp b/ACE/tests/IOStream_Test.cpp
index 2ba30d5adcc..da0b5331324 100644
--- a/ACE/tests/IOStream_Test.cpp
+++ b/ACE/tests/IOStream_Test.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    IOStream_Test.cpp
@@ -19,8 +18,6 @@
 #include "ace/IOStream.h"
 #include "ace/OS_NS_sys_wait.h"
 
-
-
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
 #  include "ace/OS_NS_unistd.h"
 #  include "ace/OS_NS_ctype.h"  // Needed for isspace() function
diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp
index 0e53b2a3abe..15455208437 100644
--- a/ACE/tests/Multicast_Test.cpp
+++ b/ACE/tests/Multicast_Test.cpp
@@ -47,8 +47,6 @@
 #include "ace/Signal.h"
 #include "ace/Min_Max.h"
 
-
-
 #if defined (ACE_HAS_IP_MULTICAST) && defined (ACE_HAS_THREADS)
 
 /*
diff --git a/README.md b/README.md
index 566e690bb89..6cae93f9649 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.com/DOCGroup/ACE_TAO.svg?branch=master)](https://travis-ci.com/DOCGroup/ACE_TAO)
 [![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 #
 
diff --git a/TAO/ChangeLogs/TAO-2_5_8 b/TAO/ChangeLogs/TAO-2_5_8
new file mode 100644
index 00000000000..08bb836fae5
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_8
@@ -0,0 +1,341 @@
+commit 937821529f194235a709d6db7b5622368857d272
+Merge: 9b58bb58f48 e1ec7a61a1b
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Feb 7 11:05:02 2020 -0600
+
+    Merge pull request #1038 from iguessthislldo/igtd/packaging
+    
+    Fix Make Install With DESTDIR
+
+commit 7c1ba7b90306bec2a3479f81d15a51ad8834fd44
+Merge: c9ac5fecf46 37ddee2ee71
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 16:13:58 2020 -0600
+
+    Merge branch 'igtd/android-on-windows' of github.com:iguessthislldo/ACE_TAO into igtd/android-on-windows
+
+commit c9ac5fecf4621d2e186932a4003890506ce37b58
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 16:08:45 2020 -0600
+
+    Add VERSION rename to NEWS files
+
+commit 977c354addc03b848b47c392658dfc00338bf1cb
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 15:23:17 2020 -0600
+
+    Change More References to VERSION.txt
+
+commit 816fca070860bbbb003aa59bc2acc69f98000cc0
+Merge: 38524dca083 cd1cef25211
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 30 12:20:16 2020 +0100
+
+    Merge pull request #1037 from jwillemsen/master
+    
+    List some important changes
+
+commit 38524dca083ae9a2687fca5f747f7a85cf0361b2
+Merge: 62b746c116f 2fd299e082a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 30 12:20:02 2020 +0100
+
+    Merge pull request #1036 from mcorino/mco-fix-deferred-segfault
+    
+    Fix transient error handling with deferred DII requests.
+
+commit cd1cef25211ce104cf784bf2cba14a5b52d93d51
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 30 11:50:22 2020 +0100
+
+    List some important changes
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit 2fd299e082affb7d8a98d10c4729b0b9215214f2
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Wed Jan 29 15:57:24 2020 +0100
+
+    Fix segmentation faults on transient (write) errors from DII deferred requests.
+    
+        * TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+
+commit 0f723d9f5e8a77fa0b80198cc0523295c730ca01
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Wed Jan 29 10:44:17 2020 +0100
+
+    Added regression test for transient error handling with deferred DII requests.
+    
+        * TAO/tests/DII_Deferred_Transient/DII_Deferred_Transient.mpc:
+        * TAO/tests/DII_Deferred_Transient/Hello.cpp:
+        * TAO/tests/DII_Deferred_Transient/Hello.h:
+        * TAO/tests/DII_Deferred_Transient/README:
+        * TAO/tests/DII_Deferred_Transient/Test.idl:
+        * TAO/tests/DII_Deferred_Transient/client.cpp:
+        * TAO/tests/DII_Deferred_Transient/run_test.pl:
+        * TAO/tests/DII_Deferred_Transient/server.cpp:
+          Added.
+    
+        * TAO/bin/tao_orb_tests.lst:
+
+commit ea67ac4d6fbe101532dda1f7d8247f3de5b1849a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 28 15:09:36 2020 +0100
+
+    Layout changes
+    
+        * TAO/tao/Abstract_Servant_Base.h:
+        * TAO/tao/AnyTypeCode/Alias_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Enum_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Fixed_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Objref_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Sequence_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/String_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Struct_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/True_RefCount_Policy.h:
+        * TAO/tao/AnyTypeCode/TypeCode.h:
+        * TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h:
+        * TAO/tao/AnyTypeCode/Union_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Value_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Value_TypeCode_Static.h:
+        * TAO/tao/Asynch_Reply_Dispatcher_Base.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h:
+        * TAO/tao/Cleanup_Func_Registry.h:
+        * TAO/tao/Connection_Handler.h:
+        * TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h:
+        * TAO/tao/Dynamic_TP/DTP_POA_Strategy.h:
+        * TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h:
+        * TAO/tao/Endpoint.h:
+        * TAO/tao/FlResource/FlResource_Factory.h:
+        * TAO/tao/FoxResource/FoxResource_Factory.h:
+        * TAO/tao/GUIResource_Factory.h:
+        * TAO/tao/IIOP_Profile.h:
+        * TAO/tao/IIOP_Transport.h:
+        * TAO/tao/IORManipulation/IORManip_Filter.h:
+        * TAO/tao/IORManipulation/IORManip_IIOP_Filter.h:
+        * TAO/tao/IORManipulation/IORManipulation.h:
+        * TAO/tao/IORTable/Async_Table_Adapter.h:
+        * TAO/tao/IORTable/Locate_ResponseHandler.h:
+        * TAO/tao/Invocation_Adapter.h:
+        * TAO/tao/LF_Event.h:
+        * TAO/tao/LF_Invocation_Event.h:
+        * TAO/tao/LF_Multi_Event.h:
+        * TAO/tao/LocalObject.h:
+        * TAO/tao/MProfile.h:
+        * TAO/tao/Messaging/AMH_Response_Handler.h:
+        * TAO/tao/Messaging/Asynch_Invocation_Adapter.h:
+        * TAO/tao/Transport.h:
+
+commit 1540f6900d923c6f4548c90dde09bb4d6175a45a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 28 13:48:09 2020 +0100
+
+    Layout changes
+    
+        * TAO/tao/AnyTypeCode/Alias_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Enum_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Fixed_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h:
+        * TAO/tao/AnyTypeCode/NVList.h:
+        * TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Sequence_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/String_TypeCode.h:
+        * TAO/tao/AnyTypeCode/String_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/TypeCode.h:
+        * TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h:
+        * TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h:
+        * TAO/tao/AnyTypeCode/TypeCode_Case_T.h:
+        * TAO/tao/AnyTypeCode/Value_TypeCode_Static.h:
+        * TAO/tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * TAO/tao/CDR.h:
+        * TAO/tao/CORBALOC_Parser.h:
+        * TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h:
+        * TAO/tao/CSD_Framework/CSD_POA.h:
+        * TAO/tao/CSD_Framework/CSD_Strategy_Base.h:
+        * TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Task.h:
+        * TAO/tao/Collocated_Invocation.h:
+        * TAO/tao/Connector_Impl.h:
+        * TAO/tao/Default_Endpoint_Selector_Factory.h:
+        * TAO/tao/Default_Thread_Lane_Resources_Manager.h:
+        * TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h:
+        * TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h:
+        * TAO/tao/DynamicAny/DynCommon.h:
+        * TAO/tao/DynamicInterface/DII_Invocation_Adapter.h:
+        * TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * TAO/tao/DynamicInterface/Dynamic_Implementation.h:
+        * TAO/tests/Connection_Failure/README:
+        * TAO/tests/Crashed_Callback/README:
+
+commit 96ca3b0d0c9fc273a570a51b1193a9dea90252c6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 24 16:30:52 2020 +0100
+
+    Simplified scope
+    
+        * TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+
+commit 95564b4494e21770f94fff6295e2c6e361963364
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 24 16:30:33 2020 +0100
+
+    Removed not used operation
+    
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp:
+        * TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h:
+
+commit 37ddee2ee7109a5093b360da104116389292acd5
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Jan 17 17:27:34 2020 -0600
+
+    Rename VERSION files to VERSION.txt
+    
+    C++20 brings a new standard header called "version". This wouldn't be an
+    issue except for on Windows where filenames can be case insensitive.
+    This issue was discovered why trying to cross-compile for Android on
+    Windows.
+
+commit e75bfac7b176650dc4a9933a080d58e9ebbd9a15
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Jan 8 15:54:41 2020 -0600
+
+    Simplify how gperf is used to generate code for TAO_IDL_FE
+
+commit e1ec7a61a1bc893f3c9d7fb6122c2068c88ebdde
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Tue Jan 7 17:03:05 2020 -0600
+
+    Fix Make Install With DESTDIR
+    
+    When DESTDIR is specified, this ln command with a shell expansion
+    doesn't work because the libraries don't exist in the INSTALL_PREFIX
+    yet.
+
+commit eec97cc2d1d1aa09844ea0c8d5be07deaa5853e6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 7 13:38:57 2020 +0100
+
+    Doxygen changes
+    
+        * TAO/tests/Policies/Manipulation.cpp:
+
+commit 91058043be8e95f249804fd853dd626cea81b95f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 7 13:38:38 2020 +0100
+
+    Removed empty lines
+    
+        * TAO/tao/Unbounded_Object_Reference_Sequence_T.h:
+
+commit 2075eb4e4ab97dc02f705656314428fb5f20815f
+Merge: e088d1ba9fe 377169fceaa
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Jan 3 11:53:20 2020 -0600
+
+    Merge pull request #1010 from iguessthislldo/igtd/tao_idl_leaks
+    
+    Various fixes for tao_idl built using clang with -fsanitize=undefined,address passed.
+
+commit 0012aac0cff7a8372dd81d4c232712681da4b866
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Dec 20 21:58:38 2019 -0600
+
+    Fix for Annotation Param Scope Issue
+    
+    See: https://github.com/DOCGroup/ACE_TAO/issues/997
+    
+    When the original annotation work (https://github.com/DOCGroup/ACE_TAO/pull/723)
+    was done it was assumed that when annotations didn't define the symbol
+    being used, the lookup for the parameters would go up the scope stack to
+    the current scope. This turned out not the case, so this functionality
+    was implemented just for annotation parameters.
+
+commit 9e30891676aa30106d679b3a71cc72b5c5b76c2b
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 18 01:10:00 2019 -0600
+
+    Various Small Fixes for IDLv4/annotations
+
+commit 377169fceaa4a348334b038c236be20df6fa59ed
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Dec 20 17:09:16 2019 -0600
+
+    New Method in AST_InterfaceFwd in tao_idl
+    
+    Separate out functionality for disowning memory into it's own function.
+    
+    Respond to Review in https://github.com/DOCGroup/ACE_TAO/pull/1010
+
+commit 77a212244fc64003da9f078738b4fa0863595210
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 18 12:18:52 2019 -0600
+
+    Style Fixes
+
+commit 077f03e97ed4cf43325b32fff14eadcfd8fa6bba
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 18 01:11:27 2019 -0600
+
+    Fixes for tao_idl compiled with asan and ubsan
+    
+    Various fixes for tao_idl built using clang with
+    -fsanitize=undefined,address passed.
+    
+    - Work around static init ub in ACE_Sync_Options based on if
+      ACE_INITIALIZE_MEMORY_BEFORE_USE is defined.
+    - Fix a memory leak in UTL_Scope and a possible null dereference in
+      tao_idl be.
+    - Fixed a hard to track down memory leak involving AST_InterfaceFwd not
+      handling ownership of its placeholder AST_Interface correctly under
+      a case when a forward declaration of an interface is made after the
+      interface was already declared.
+
+commit cab5c35b998c07e98d5c5b360a774e65d973b733
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Nov 22 10:13:31 2019 +0100
+
+    Make x.5.7 available
+    
+        * ACE/NEWS:
+        * ACE/bin/copy-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/NEWS b/TAO/NEWS
index 27177c72d13..1d829676035 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,6 +1,14 @@
+USER VISIBLE CHANGES BETWEEN TAO-2.5.8 and TAO-2.5.9
+====================================================
+
 USER VISIBLE CHANGES BETWEEN TAO-2.5.7 and TAO-2.5.8
 ====================================================
 
+. Fixed handling of transient errors with DII requests
+
+. Renamed `VERSION` file to `VERSION.txt` to avoid conflicting with the
+  `version` standard header.
+
 USER VISIBLE CHANGES BETWEEN TAO-2.5.6 and TAO-2.5.7
 ====================================================
 
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index da87d66187e..fdcbead859c 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.7
-    ACE VERSION: 6.5.7
+    TAO VERSION: 2.5.8
+    ACE VERSION: 6.5.8
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
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 e37489f190e..fa3e691ebc8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -453,11 +453,9 @@ be_visitor_interface_ss::generate_amh_classes (be_interface *node)
 int
 be_visitor_interface_ss::generate_proxy_classes (be_interface *node)
 {
-  be_visitor_context ctx = *this->ctx_;
-
   if (be_global->gen_direct_collocation ())
     {
-      ctx = *this->ctx_;
+      be_visitor_context ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS);
       be_visitor_interface_direct_proxy_impl_ss idpi_visitor (&ctx);
 
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 499bc04426a..9f83d277dfb 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
@@ -53,9 +53,6 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node)
 
   const char *full_skel_name = full_skel_name_holder.c_str ();
 
-  ACE_CString flat_name_holder =
-    this->generate_flat_name (node);
-
   *os << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
@@ -128,12 +125,6 @@ be_visitor_valuetype_ss::visit_eventtype (be_eventtype *node)
 }
 
 ACE_CString
-be_visitor_valuetype_ss::generate_flat_name (be_valuetype *node)
-{
-  return ACE_CString (node->flat_name ());
-}
-
-ACE_CString
 be_visitor_valuetype_ss::generate_local_name (be_valuetype *node)
 {
   return ACE_CString (node->local_name ());
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 ea53f7e5598..0c844fae670 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
@@ -35,7 +35,6 @@ public:
   virtual int visit_eventtype (be_eventtype *node);
 
 protected:
-  ACE_CString generate_flat_name (be_valuetype *node);
   ACE_CString generate_local_name (be_valuetype *node);
   ACE_CString generate_full_skel_name (be_valuetype *node);
 };
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index c2066e19b68..475529bdb6a 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -42,7 +42,8 @@ project(TAO_IDL_EXE) : aceexe, install, tao_output, tao_idl_fe {
 "	ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin"
 "ifeq ($(shared_libs),1)"
 "	@$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
-"	ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_[FB]E.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
+"	ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_FE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
+"	ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_BE.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/lib"
 "endif"
   }
 
diff --git a/TAO/VERSION b/TAO/VERSION.txt
index f4779e6769e..50959b39a35 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.7, released Fri Nov 22 09:24:48 CET 2019
+This is TAO version 2.5.8, released Mon Feb 10 09:28:37 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 22ba2f6be7a..303c079e515 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -476,6 +476,7 @@ TAO/tests/Parallel_Connect_Strategy/run_test.pl -quick : QUICK55
 TAO/tests/DII_Collocation_Tests/oneway/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/DII_Collocation_Tests/twoway/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/DII_Discard_Deferred/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/DII_Deferred_Transient/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Compression/run_test.pl
 TAO/tests/Collocated_Forwarding/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO
 TAO/tests/ZIOP/run_test.pl: ZLIB BZIP2
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 27a13d74f94..5622c0f7219 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -14,7 +14,7 @@
 <h3>
 Release Information for The ACE ORB (TAO)</h3></center>
 This document contains information on the following topics related to the
-<a href="../../VERSION">current
+<a href="../../VERSION.txt">current
 release</a> of <a href="http://www.dre.vanderbilt.edu/TAO">TAO</a>:
 
 <table BORDER=0 CELLSPACING=0 CELLPADDING=10 >
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 4753c932823..2fb670808a4 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -136,7 +136,6 @@ public:
                                      TAO::Collocation_Strategy strategy) = 0;
 
 protected:
-
   /// Default constructor, only derived classes can be created.
   TAO_Abstract_ServantBase (void);
 
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
index 3f9fa044c24..d617283dbb0 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
@@ -71,7 +71,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -89,7 +88,6 @@ namespace TAO
       virtual CORBA::TypeCode_ptr content_type_i (void) const;
 
     private:
-
       /// Base attributes for this @c TypeCode containing the
       /// repository ID and name of the @c typedef.
       Base_Attributes<StringType> attributes_;
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
index 4e77ae9616a..05a8f675fac 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
@@ -74,7 +74,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -92,7 +91,6 @@ namespace TAO
       virtual CORBA::TypeCode_ptr content_type_i (void) const;
 
     private:
-
       /// Base attributes for this @c TypeCode containing the
       /// repository ID and name of the @c typedef.
       Base_Attributes<char const *> attributes_;
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
index 55ea7df0192..d0ef4e370c2 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
@@ -46,7 +46,6 @@ namespace TAO
     class Empty_Param : public CORBA::TypeCode
     {
     public:
-
       /// Constructor.
       Empty_Param (CORBA::TCKind k);
 
@@ -66,7 +65,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -79,7 +77,6 @@ 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;
-
     };
 
   }  // End namespace TypeCode
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
index 43d3994b0ea..dbd05818165 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
@@ -68,7 +68,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -87,7 +86,6 @@ namespace TAO
       //@}
 
     private:
-
       /**
        * @c Enum Attributes
        *
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
index 895b31af85c..8fd342a90ef 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
@@ -74,7 +74,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -93,7 +92,6 @@ namespace TAO
       //@}
 
     private:
-
       /**
        * @c Enum Attributes
        *
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
index 1d6db07abd4..56a6b685fa0 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -62,7 +62,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -79,15 +78,12 @@ namespace TAO
       virtual CORBA::UShort fixed_scale_i (void) const;
 
     private:
-
       /// The number of significant digits.
       CORBA::UShort const digits_;
 
       /// The scale factor.
       CORBA::UShort const scale_;
-
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
index 08dfe756b7f..b72f0d14f2e 100644
--- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
@@ -72,7 +72,6 @@ namespace TAO
       void set_recursive_tc (CORBA::TypeCode_ptr);
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -121,7 +120,6 @@ namespace TAO
       //@}
 
     private:
-
       //@{
 
       /// Typecode id
@@ -137,9 +135,7 @@ namespace TAO
       unsigned long refcount_;
 
       //@}
-
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h
index e68f65402bf..001a1d7691d 100644
--- a/TAO/tao/AnyTypeCode/NVList.h
+++ b/TAO/tao/AnyTypeCode/NVList.h
@@ -106,7 +106,6 @@ namespace CORBA
     typedef NamedValue_out _out_type;
 
   protected:
-
     /// Destructor
     /**
      * Protected destructor to enforce proper memory management
@@ -115,13 +114,11 @@ namespace CORBA
     ~NamedValue (void);
 
   private:
-
     /// private constructor. Cannot be directly instantiated other than
     /// by its friends.
     NamedValue (void);
 
   private:
-
     /// Reference counter.
 #if defined (ACE_HAS_CPP11)
     std::atomic<uint32_t> refcount_;
@@ -241,7 +238,6 @@ namespace CORBA
     typedef NVList_out _out_type;
 
   protected:
-
     /// Destructor
     /**
      * Protected destructor to enforce proper memory management
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
index a9743c0670c..59e1abf4e3c 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
@@ -74,7 +74,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -92,7 +91,6 @@ namespace TAO
       virtual char const * name_i (void) const;
 
     protected:
-
       /// Base attributes (@c id and @c name).
       Base_Attributes<StringType> attributes_;
 
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
index f2b2d7dc00d..0887c074809 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
@@ -78,7 +78,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -96,7 +95,6 @@ namespace TAO
       virtual char const * name_i (void) const;
 
     protected:
-
       /// Base attributes (@c id and @c name).
       Base_Attributes<char const *> attributes_;
 
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
index 8036eb2c939..403529e8650 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -96,7 +96,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name TAO @c CORBA::TypeCode Template Methods
        *
@@ -133,7 +132,6 @@ namespace TAO
                                  CORBA::ULong nfields);
 
     private:
-
       /**
        * @class Reset
        *
@@ -151,7 +149,6 @@ namespace TAO
       };
 
     private:
-
       /// Internal state thread synchronization mutex.
       mutable TAO_SYNCH_RECURSIVE_MUTEX lock_;
 
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
index 629dbb309cf..9b621ac9bd3 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
@@ -65,7 +65,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -82,7 +81,6 @@ namespace TAO
       virtual CORBA::TypeCode_ptr content_type_i (void) const;
 
     private:
-
       /// Element type of the sequence.
       /**
        * A pointer to the @c CORBA::TypeCode_ptr rather than the
@@ -99,9 +97,7 @@ namespace TAO
       /// Length of the @c sequence or array.  A length of zero
       /// indicates an unbounded @c sequence.
       CORBA::ULong const length_;
-
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
index 28d92a55209..2750c37ab74 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
@@ -70,7 +70,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -87,7 +86,6 @@ namespace TAO
       virtual CORBA::TypeCode_ptr content_type_i (        void) const;
 
     private:
-
       /// Element type of the sequence.
       /**
        * A pointer to the @c CORBA::TypeCode_ptr rather than the
@@ -104,9 +102,7 @@ namespace TAO
       /// Length of the @c sequence or array.  A length of zero
       /// indicates an unbounded @c sequence.
       CORBA::ULong const length_;
-
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h
index 5c83294f862..507ad7ba137 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.h
@@ -64,7 +64,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -80,13 +79,10 @@ namespace TAO
       virtual CORBA::ULong length_i (void) const;
 
     private:
-
       /// Length of the @c string.  A length of zero indicates an
       /// unbounded @c string.
       CORBA::ULong const length_;
-
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
index 0f70af74bc2..8fb262cb65d 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
@@ -67,7 +67,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -83,13 +82,10 @@ namespace TAO
       virtual CORBA::ULong length_i (void) const;
 
     private:
-
       /// Length of the @c string.  A length of zero indicates an
       /// unbounded @c string.
       CORBA::ULong const length_;
-
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
index 088429048b5..3234062e624 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -80,7 +80,6 @@ namespace TAO
       const FieldArrayType& fields() const;
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -101,7 +100,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @c Struct Attributes
        *
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
index e97b6b40c6c..aa800a6b537 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
@@ -83,7 +83,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -104,7 +103,6 @@ namespace TAO
       //@}
 
     private:
-
       /**
        * @c Struct Attributes
        *
@@ -128,9 +126,7 @@ namespace TAO
       /// OMG IDL defined @c struct.
       Struct_Field<char const *,
                    CORBA::TypeCode_ptr const *> const * const fields_;
-
       //@}
-
     };
 
   }  // End namespace TypeCode
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
index 0f5a0875873..e1198f14cbe 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
@@ -86,7 +86,6 @@ namespace TAO
     void remove_ref (void);
 
   protected:
-
     /// Constructor.
     /**
      * @note This constructor is protected since it not meant to be
diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h
index 22d9e70516c..d7701ab1c50 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.h
+++ b/TAO/tao/AnyTypeCode/TypeCode.h
@@ -424,7 +424,6 @@ namespace CORBA
     typedef CORBA::TypeCode_out _out_type;
 
   protected:
-
     /// Constructor.
     TypeCode (CORBA::TCKind kind);
 
@@ -474,16 +473,13 @@ namespace CORBA
     //@}
 
   private:
-
     // Prevent copying and assignment.
     TypeCode (TypeCode const &);
     void operator= (TypeCode const &);
 
   protected:
-
     /// The kind of TypeCode.
     TCKind const kind_;
-
   };
 }  // End namespace CORBA
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
index 8c0976fdd1b..1616339555c 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
@@ -66,16 +66,13 @@ namespace TAO
       void name (char const * the_name);
 
     private:
-
       /// The @c RepositoryId globally identifying the type.
       STRING_TYPE const id_;
 
       /// The simple name identifying the type within its enclosing
       /// scope.
       STRING_TYPE name_;
-
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
index ab7eedee33f..da96f1360cd 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
@@ -107,7 +107,6 @@ namespace TAO
       bool equivalent (CORBA::ULong index, CORBA::TypeCode_ptr tc) const;
 
     protected:
-
       /// Marshal the IDL @c union @c case label value into the given
       /// output CDR stream.
       virtual bool marshal_label (TAO_OutputCDR & cdr) const = 0;
@@ -130,7 +129,6 @@ namespace TAO
                                 CORBA::TypeCode_ptr tc) const = 0;
 
     private:
-
       /// The name of the case.
       StringType name_;
 
@@ -146,7 +144,6 @@ namespace TAO
        *       @c Case.
        */
       TypeCodeType type_;
-
     };
 
     typedef Case<CORBA::String_var, CORBA::TypeCode_var> Case_Dynamic;
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
index fb96332372e..d6ab4a1ab36 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -116,12 +116,9 @@ namespace TAO
       //@}
 
     private:
-
       /// IDL @c union case/member label value.
       DiscriminatorType const label_;
-
     };
-
   }  // End namespace TypeCode
 }  // End namespace TAO
 
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h
index e778d151699..31855ed90a4 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -84,7 +84,6 @@ namespace TAO
       const CaseArrayType& cases(void) const;
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -107,7 +106,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @c Union Attributes
        *
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h
index 6bbf0417143..c454d0cbe1a 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h
@@ -87,7 +87,6 @@ namespace TAO
       const FieldArrayType& fields() const;
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -111,7 +110,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @c Valuetype Attributes
        *
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
index 33674648ea2..b159728edb8 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
@@ -84,7 +84,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO CORBA::TypeCode Template Methods
        *
@@ -108,7 +107,6 @@ namespace TAO
       //@}
 
     private:
-
       /**
        * @c Valuetype Attributes
        *
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
index 3d0920559de..ca07c546f93 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -73,7 +73,6 @@ public:
   bool try_dispatch_reply (void);
 
 protected:
-
   /// Destructor.
   virtual ~TAO_Asynch_Reply_Dispatcher_Base (void);
 
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index bc2a9361b56..bb568888c76 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -94,9 +94,9 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val)
   // the same ORB (different POA). In cases where huge numbers of
   // bi-directional POA instances are created, having a validator
   // instance per POA may introduce additional delays in policy
-  // validation and hence, the overal policy creation time. Since this
+  // validation and hence, the overall policy creation time. Since this
   // is out of the critical invocation processing path, I plan to keep
-  // the design simple and not try to avoid an ineficiency of such
+  // the design simple and not try to avoid an inefficiency of such
   // small proportions.
   val.add_validator (validator);
 }
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 3360714ffe4..87a5462f93e 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -240,13 +240,11 @@ public:
   int offset (char* pos);
 
 private:
-
   // disallow copying...
   TAO_OutputCDR (const TAO_OutputCDR& rhs);
   TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs);
 
 private:
-
   /**
    * @name Outgoing GIOP Fragment Related Attributes
    *
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index 24c075f204e..9ce93163da0 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -59,7 +59,6 @@ public:
                                           CORBA::ORB_ptr orb);
 
 private:
-
   /**
    * Make a stub from the MProfile that is created in
    * parse_string_mprofile_helper. Using this stub, create an object
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
index a1b2f08b7ad..055654f0c90 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
@@ -77,7 +77,6 @@ namespace TAO
       void cancel();
 
     private:
-
       /// Create a deep copy of the request_ object.
       /// The other clone methods are used to support the TAO_ServerRequest clone.
       TAO_ServerRequest* clone (TAO_ServerRequest*& from);
diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h
index 650c428dd96..c9ab1052c91 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.h
+++ b/TAO/tao/CSD_Framework/CSD_POA.h
@@ -82,7 +82,6 @@ public:
     servant_dispatching_strategy_proxy (void) const;
 
 private:
-
   TAO::CSD::Strategy_Proxy* sds_proxy_;
 };
 
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
index 98e8ed58280..879f86b08cd 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
@@ -114,7 +114,6 @@ namespace TAO
                                   const PortableServer::ObjectId& oid);
 
     private:
-
       /// Only our friend, the proxy, is allowed to invoke our private operations.
       /// This allows us to not pollute the public interface of the CSD Strategy_Base
       /// subclasses with methods that should never be called (except by the
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
index f78eb219ae3..2a96f39256d 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
@@ -88,7 +88,6 @@ namespace TAO
                                     const PortableServer::ObjectId& oid);
 
     private:
-
       /// Smart Pointer to a custom servant dispatching strategy object.
       /// This smart pointer will be in the "nil" state when the "default"
       /// strategy is to be applied.
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
index 3fce35f1871..3fd5f1d7be0 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
@@ -65,7 +65,6 @@ namespace TAO
       virtual bool visit_request(TP_Request* request, bool& remove_flag);
 
     private:
-
       /// Left as nil if we are to cancel all requests, or set to a specific
       /// servant if only requests targeting that servant should be cancelled.
       PortableServer::ServantBase_var servant_;
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
index cd001a9d02d..3acc7476b5e 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
@@ -46,7 +46,6 @@ namespace TAO
                                                  : public TP_Corba_Request
     {
     public:
-
       /// Constructor.
       TP_Collocated_Asynch_Request
                            (TAO_ServerRequest&              server_request,
@@ -61,7 +60,6 @@ namespace TAO
 
 
     protected:
-
       /// Prepare this TP_Collocated_Asynch_Request object to be placed
       /// into the request queue.  This will cause the underlying
       /// TAO_ServerRequest object to be cloned.
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
index db5bafb10e3..cf23ffa4d26 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
@@ -68,9 +68,7 @@ namespace TAO
       /// false if the request has been cancelled.
       bool wait(void);
 
-
     protected:
-
       /// Note that we do not override our base class implementation of
       /// prepare_for_queue_i() (which does nothing), because we don't
       /// need to clone the Server Request object.
@@ -81,9 +79,7 @@ namespace TAO
       /// Cancel the request.
       virtual void cancel_i();
 
-
     private:
-
       /// Helper used to block and unblock the thread that invokes our
       /// wait() method.
       TP_Synch_Helper synch_helper_;
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
index 017d5dcc127..06dde1e04af 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
@@ -72,9 +72,7 @@ namespace TAO
       /// false if the request has been cancelled.
       bool wait(void);
 
-
     protected:
-
       /// Prepare this TP_Collocated_Synch_With_Server_Request object to be
       /// placed into the request queue.  This will cause the underlying
       /// TAO_ServerRequest object to be cloned.
@@ -86,9 +84,7 @@ namespace TAO
       /// Cancel the request.
       virtual void cancel_i();
 
-
     private:
-
       /// Helper used to block and unblock the thread that invokes our
       /// wait() method.
       TP_Synch_Helper synch_helper_;
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
index dddaaa4c851..6162d4cf682 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
@@ -51,9 +51,7 @@ namespace TAO
       /// Virtual Destructor.
       virtual ~TP_Corba_Request();
 
-
     protected:
-
       /// Constructor.
       TP_Corba_Request(const PortableServer::ObjectId& object_id,
                        PortableServer::POA_ptr         poa,
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h
index 2b4e76e919e..b0ef729fe2b 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h
@@ -45,7 +45,6 @@ namespace TAO
                                              : public TP_Custom_Request
     {
     public:
-
       /// Constructor.
       TP_Custom_Asynch_Request(TP_Custom_Request_Operation* op,
                                TP_Servant_State*            servant_state);
@@ -53,9 +52,7 @@ namespace TAO
       /// Virtual Destructor.
       virtual ~TP_Custom_Asynch_Request();
 
-
     protected:
-
       /// Dispatch the request to the servant.
       virtual void dispatch_i();
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h
index 3e9498cece7..beaf7decfa3 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h
@@ -45,13 +45,10 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Custom_Request : public TP_Request
     {
     public:
-
       /// Virtual Destructor.
       virtual ~TP_Custom_Request();
 
-
     protected:
-
       /// Constructor.
       TP_Custom_Request(TP_Custom_Request_Operation* op,
                         TP_Servant_State*            servant_state);
@@ -59,9 +56,7 @@ namespace TAO
       void execute_op();
       void cancel_op();
 
-
     private:
-
       TP_Custom_Request_Operation_Handle op_;
     };
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
index c838d12b0c0..cc25a814a2e 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
@@ -68,18 +68,14 @@ namespace TAO
       /// is useful for chaining.
       PortableServer::Servant servant();
 
-
     protected:
-
       /// Constructor.
       TP_Custom_Request_Operation(PortableServer::Servant servant);
 
       virtual void execute_i() = 0;
       virtual void cancel_i() = 0;
 
-
     private:
-
       PortableServer::ServantBase_var servant_;
     };
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h
index 94d98d3f44d..f6bffc898eb 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h
@@ -45,7 +45,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Custom_Synch_Request : public TP_Custom_Request
     {
     public:
-
       /// Constructor.
       TP_Custom_Synch_Request(TP_Custom_Request_Operation* op,
                               TP_Servant_State*            servant_state);
@@ -59,23 +58,18 @@ namespace TAO
       /// been cancelled.
       bool wait();
 
-
     protected:
-
       /// Dispatch the request to the servant.
       virtual void dispatch_i();
 
       /// Cancel the request.
       virtual void cancel_i();
 
-
     private:
-
       /// Helper used to block and unblock the thread that invokes our
       /// wait() method.
       TP_Synch_Helper synch_helper_;
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
index 1359d2ef988..76a6b97669a 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
@@ -49,7 +49,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Dispatchable_Visitor : public TP_Queue_Visitor
     {
     public:
-
       /// Default Constructor.
       TP_Dispatchable_Visitor();
 
@@ -57,7 +56,7 @@ namespace TAO
       virtual ~TP_Dispatchable_Visitor();
 
       /// Reset this visitor object in order to re-use it for another
-      /// visitation of the request queue.  This sets the vistor's "result"
+      /// visitation of the request queue.  This sets the visitor's "result"
       /// (the TP_Request* data member) to its default value (a nil handle).
       void reset();
 
@@ -73,11 +72,9 @@ namespace TAO
 
 
     private:
-
       /// A handle to the located request.
       TP_Request_Handle request_;
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h
index 7799e0247ad..9066d0a0d77 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h
@@ -58,7 +58,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Queue
     {
     public:
-
       /// Default Constructor.
       TP_Queue();
 
@@ -77,14 +76,12 @@ namespace TAO
       void accept_visitor(TP_Queue_Visitor& visitor);
 
     private:
-
       /// The request at the front of the queue.
       TP_Request* head_;
 
       /// The request at the end of the queue.
       TP_Request* tail_;
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
index 0e62f1d4a62..27019971165 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
@@ -46,7 +46,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Queue_Visitor
     {
     public:
-
       /// Virtual Destructor.
       virtual ~TP_Queue_Visitor();
 
@@ -56,9 +55,7 @@ namespace TAO
       /// remove_flag alone otherwise.
       virtual bool visit_request(TP_Request* request, bool& remove_flag) = 0;
 
-
     protected:
-
       /// Default Constructor.
       TP_Queue_Visitor();
     };
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h
index 8d39084fb39..ee275c8dfd4 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h
@@ -59,7 +59,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Remote_Request : public TP_Corba_Request
     {
     public:
-
       /// Constructor.
       TP_Remote_Request(TAO_ServerRequest&              server_request,
                         const PortableServer::ObjectId& object_id,
@@ -73,7 +72,6 @@ namespace TAO
 
 
     protected:
-
       /// Prepare this TP_Remote_Request object to be placed into the
       /// request queue.  This will cause the underlying TAO_ServerRequest
       /// object to be cloned.
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
index c54fc546374..70d51f26fc9 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
@@ -78,7 +78,6 @@ namespace TAO
 
 
     protected:
-
       /// Constructor.
       TP_Request(PortableServer::Servant servant,
                  TP_Servant_State*       servant_state);
@@ -100,9 +99,7 @@ namespace TAO
       /// Ask the subclass to perform its duties to carry out the cancellation.
       virtual void cancel_i() = 0;
 
-
     private:
-
       /// The TP_Queue class is our friend since it needs access to
       /// the prev_ and next_ (private) data members.
       friend class TP_Queue;
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
index 3303b66db86..0b16cea7c4c 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
@@ -55,7 +55,6 @@ namespace TAO
                       : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX>
     {
     public:
-
       /// Handle Type (aka, Smart Pointer Type).
       typedef TAO_Intrusive_Ref_Count_Handle<TP_Servant_State> HandleType;
 
@@ -72,7 +71,6 @@ namespace TAO
       void busy_flag(bool new_value);
 
     private:
-
       /// The servant's current "busy" state (true == busy, false == not busy)
       bool busy_flag_;
     };
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
index 7057a1a3280..d78e196d0db 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
@@ -45,7 +45,6 @@ namespace TAO
     class TAO_CSD_TP_Export TP_Servant_State_Map
     {
     public:
-
       /// Default Constructor.
       TP_Servant_State_Map();
 
@@ -53,20 +52,15 @@ namespace TAO
       ~TP_Servant_State_Map();
 
       /// Accessor for the servant busy flag.
-      TP_Servant_State* find(PortableServer::Servant servant
-                            );
+      TP_Servant_State* find(PortableServer::Servant servant);
 
       /// Insert the servant to map.
-      void insert(PortableServer::Servant servant
-                 );
+      void insert(PortableServer::Servant servant);
 
       /// Remove the servant from map.
-      void remove(PortableServer::Servant servant
-                 );
-
+      void remove(PortableServer::Servant servant);
 
     private:
-
       /// Underlying Map Type - Hash-Based -
       /// Key Type: void*, Value Type: TP_Servant_State::HandleType
       typedef ACE_Hash_Map_Manager_Ex<void*,
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
index 6764927943a..703d074893a 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
@@ -102,7 +102,6 @@ namespace TAO
       void cancel_requests(PortableServer::Servant servant);
 
     protected:
-
       /// Handle the dispatching of a remote request.
       ///
       /// This will cause a new "request" object to be created and pushed
@@ -148,7 +147,6 @@ namespace TAO
                                      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
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
index 14bf8da3864..73597bdd60f 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
@@ -65,7 +65,6 @@ namespace TAO
 
 
     private:
-
       /// Enumeration Type for all possible states of this helper object.
       enum HelperState
       {
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
index 76d1004946d..1365350c168 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
@@ -103,7 +103,6 @@ namespace TAO
       void cancel_servant (PortableServer::Servant servant);
 
     private:
-
       typedef TAO_SYNCH_MUTEX         LockType;
       typedef TAO_Condition<LockType> ConditionType;
 
diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h
index 750e5a4113c..f3b02cd4b4c 100644
--- a/TAO/tao/Cleanup_Func_Registry.h
+++ b/TAO/tao/Cleanup_Func_Registry.h
@@ -39,7 +39,6 @@ class TAO_Export TAO_Cleanup_Func_Registry
   friend class TAO_ORB_Core;
 
 public:
-
   /// Constructor.
   TAO_Cleanup_Func_Registry (void);
 
@@ -47,7 +46,6 @@ public:
   size_t size (void) const;
 
 protected:
-
   /// Register a cleanup function.  The number of slot the cleanup
   /// function is placed is in will match the one reserved for the
   /// corresponding thread specific object in the ORB Core TSS
diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h
index 09074829782..41dfc3b23ac 100644
--- a/TAO/tao/Collocated_Invocation.h
+++ b/TAO/tao/Collocated_Invocation.h
@@ -83,10 +83,8 @@ namespace TAO
     Invocation_Status invoke (Collocation_Strategy strat);
 
   private:
-
     // Disallow default construction.
     Collocated_Invocation (void);
-
   };
 }
 
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 7009d08b963..a76506d7ceb 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -140,7 +140,6 @@ public:
    //@@ CONNECTION_HANDLER_SPL_PUBLIC_METHODS_ADD_HOOK
 
 protected:
-
   /// Return our TAO_ORB_Core pointer
   TAO_ORB_Core *orb_core (void);
 
diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h
index 1faf98d70ee..e220cb83212 100644
--- a/TAO/tao/Connector_Impl.h
+++ b/TAO/tao/Connector_Impl.h
@@ -44,7 +44,6 @@ template <class SVC_HANDLER>
 class TAO_Connect_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER>
 {
 public:
-
   /// Constructor.
   TAO_Connect_Creation_Strategy (ACE_Thread_Manager * = 0,
                                  TAO_ORB_Core* orb_core = 0);
@@ -54,7 +53,6 @@ public:
 
 
 private:
-
   /// Pointer to the ORB_Core on which we are activated
   TAO_ORB_Core * const orb_core_;
 };
@@ -75,7 +73,6 @@ class TAO_Connect_Concurrency_Strategy :
   public ACE_Concurrency_Strategy<SVC_HANDLER>
 {
 public:
-
   /// Constructor.
   TAO_Connect_Concurrency_Strategy (TAO_ORB_Core *orb_core);
 
@@ -85,7 +82,6 @@ public:
   int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg);
 
 private:
-
   /// Pointer to the ORB Core.
   TAO_ORB_Core * const orb_core_;
 };
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h
index f050cb771cb..e460006dc2b 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.h
@@ -62,13 +62,11 @@ public:
   virtual TAO_Invocation_Endpoint_Selector *get_selector (void);
 
 private:
-
   // Prevent copying/assignment.
   TAO_Default_Endpoint_Selector_Factory (TAO_Default_Endpoint_Selector_Factory const &);
   void operator= (TAO_Default_Endpoint_Selector_Factory const &);
 
 protected:
-
   /// The possible endpoint selector strategies that can be
   /// returned by this factory
   TAO_Default_Endpoint_Selector * const default_endpoint_selector_;
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
index 37ed5a68929..5df53e6209e 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
@@ -67,12 +67,10 @@ public:
   // @}
 
 private:
-
   TAO_Default_Thread_Lane_Resources_Manager (TAO_Default_Thread_Lane_Resources_Manager const &);
   void operator= (TAO_Default_Thread_Lane_Resources_Manager const &);
 
 protected:
-
   /// Default lane resources.
   TAO_Thread_Lane_Resources * const lane_resources_;
 
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
index b99cf2d340b..cf3dd677fc1 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
@@ -44,7 +44,6 @@ public:
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register DiffServ policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
index 3b615c12d56..740e9ef2c29 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
+++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h
@@ -57,7 +57,6 @@ public:
   CORBA::Long get_dscp_codepoint (TAO_Service_Context &sc);
 
 protected:
-
   TAO_ORB_Core *orb_core_;
 };
 
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
index 80e3a7498ac..41e22e0e1e7 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
@@ -94,7 +94,6 @@ public:
   CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 protected:
-
   virtual ~TAO_Server_Network_Priority_Policy (void);
 
 private:
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index 52af822228b..4d8da9d2790 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -248,7 +248,6 @@ protected:
 
 private:
   // Utility functions used by insert_* and get_*.
-
   CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc);
 };
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index fda3c80f2bf..aad60460f99 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -254,7 +254,14 @@ namespace TAO
 
     if (status == TAO_INVOKE_RESTART)
       {
+        CORBA::Boolean const is_permanent_forward =
+          (synch.reply_status () == GIOP::LOCATION_FORWARD_PERM);
+
         effective_target = synch.steal_forwarded_reference ();
+
+        this->object_forwarded (effective_target,
+                                r.stub (),
+                                is_permanent_forward);
       }
 
     return status;
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
index f06a07b7a62..43e5e098114 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
@@ -116,7 +116,6 @@ namespace TAO
 
     TAO::Exception_Data *ex_data_;
   private:
-
     /// Dont allow default initializations
     DII_Invocation_Adapter (void);
 
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index 018c2e4a5cd..d36706cacf9 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -48,7 +48,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
     }
 
   // See whether we need to delete the data block by checking the
-  // flags. We cannot be happy that we initally allocated the
+  // flags. We cannot be happy that we initially allocated the
   // datablocks of the stack. If this method is called twice, as is in
   // some cases where the same invocation object is used to make two
   // invocations like forwarding, the release becomes essential.
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 2a20f7cbafe..cff817fd412 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -71,7 +71,6 @@ public:
   virtual CORBA::InterfaceDef_ptr _get_interface (void);
 
 protected:
-
   /// Return 0.  Should never be used.
   virtual const char *_interface_repository_id (void) const;
 
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
index 05e2e2b8a0f..2d8608d0960 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
@@ -112,7 +112,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
 
 
  protected:
-
   /// Handle the dispatching of a remote request.
   ///
   /// This will cause a new "request" object to be created and pushed
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h
index 0f5d4d26304..13d90d8b5f5 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h
@@ -79,7 +79,6 @@ private:
   TAO_DTP_Thread_Lane_Resources_Manager (const TAO_DTP_Thread_Lane_Resources_Manager &);
 
 protected:
-
   /// Default lane resources.
   TAO_Thread_Lane_Resources *default_lane_resources_;
 
diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h
index 91a6cdc3bf6..130f465c02d 100644
--- a/TAO/tao/Endpoint.h
+++ b/TAO/tao/Endpoint.h
@@ -126,7 +126,6 @@ public:
   //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_ADD_HOOK
 
 protected:
-
   /// Lock for the address lookup.
   /**
    * @todo This lock should be strategized so that we dont lock in
diff --git a/TAO/tao/FlResource/FlResource_Factory.h b/TAO/tao/FlResource/FlResource_Factory.h
index 059ca7d56bd..8fe7606ce82 100644
--- a/TAO/tao/FlResource/FlResource_Factory.h
+++ b/TAO/tao/FlResource/FlResource_Factory.h
@@ -39,16 +39,13 @@ namespace TAO
   class TAO_FlResource_Export FlResource_Factory : public GUIResource_Factory
   {
   public:
-
     FlResource_Factory ();
 
   protected:
-
     /// Create or obtain current reactor implementation
     virtual ACE_Reactor_Impl *reactor_impl (void);
 
   private:
-
     /// Reactor created by this factory.
     ACE_FlReactor *reactor_impl_;
   };
diff --git a/TAO/tao/FoxResource/FoxResource_Factory.h b/TAO/tao/FoxResource/FoxResource_Factory.h
index 5018f07cf70..e9c8c6e82ac 100644
--- a/TAO/tao/FoxResource/FoxResource_Factory.h
+++ b/TAO/tao/FoxResource/FoxResource_Factory.h
@@ -38,16 +38,13 @@ namespace TAO
   class TAO_FoxResource_Export FoxResource_Factory : public GUIResource_Factory
   {
   public:
-
     FoxResource_Factory (FXApp *app);
 
   protected:
-
     /// Create or obtain current reactor implementation
     virtual ACE_Reactor_Impl *reactor_impl (void);
 
   private:
-
     /// Reactor created by this factory.
     ACE_FoxReactor *reactor_impl_;
 
diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h
index 4f693d589c9..efdba8c1a79 100644
--- a/TAO/tao/GUIResource_Factory.h
+++ b/TAO/tao/GUIResource_Factory.h
@@ -46,7 +46,6 @@ namespace TAO
   class TAO_Export GUIResource_Factory
   {
   public:
-
     GUIResource_Factory ();
 
     virtual ~GUIResource_Factory ();
@@ -65,7 +64,6 @@ namespace TAO
     virtual void reclaim_reactor (ACE_Reactor *);
 
   protected:
-
     /**
      * Create or return current reactor instance.
      * Please note that this call is NOT synchronized. Left to the
@@ -74,7 +72,6 @@ namespace TAO
     virtual ACE_Reactor_Impl *reactor_impl (void) = 0;
 
   private:
-
     /**
      * Flag that is set to true if the reactor obtained from the
      * get_reactor() method is dynamically allocated.  If this flag is
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 52834d013c5..b4a0a10b527 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -146,7 +146,6 @@ protected:
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
 protected:
-
   /**
    * Head of this profile's list of endpoints.  This endpoint is not
    * dynamically allocated because a profile always contains at least
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index cf91fc16278..63d3496d6b4 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -50,13 +50,11 @@ class TAO_Adapter;
 class TAO_Export TAO_IIOP_Transport : public TAO_Transport
 {
 public:
-
   /// Constructor.
   TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler,
                       TAO_ORB_Core *orb_core);
 
 protected:
-
   /// Destructor
   /**
    * Protected destructor to enforce proper memory management through
@@ -85,12 +83,9 @@ protected:
                             TAO::Transport::Drain_Constraints const & dc);
 #endif  /* TAO_HAS_SENDFILE==1 */
 
-
   virtual ssize_t recv (char *buf, size_t len, const ACE_Time_Value *s = 0);
 
-
 public:
-
   /// Bridge method to call a similar method on the connection handler
   void update_protocol_properties (int send_buffer_size,
                                    int recv_buffer_size,
@@ -114,11 +109,9 @@ public:
   virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
   virtual TAO_Connection_Handler * connection_handler_i (void);
-
   //@}
 
 private:
-
   /// Set the Bidirectional context info in the service context list
   void set_bidir_context_info (TAO_Operation_Details &opdetails);
 
@@ -128,7 +121,6 @@ private:
   int get_listen_point (IIOP::ListenPointList &listen_point_list,
                         TAO_Acceptor *acceptor);
 private:
-
   /// The connection service handler used for accessing lower layer
   /// communication protocols.
   TAO_IIOP_Connection_Handler *connection_handler_;
diff --git a/TAO/tao/IORManipulation/IORManip_Filter.h b/TAO/tao/IORManipulation/IORManip_Filter.h
index 2b68c83cea3..25a319eff9b 100644
--- a/TAO/tao/IORManipulation/IORManip_Filter.h
+++ b/TAO/tao/IORManipulation/IORManip_Filter.h
@@ -49,15 +49,12 @@ public:
                                        TAO_Profile* profile = 0);
 
 protected:
-
   /// This will be the bulk of the filtering code.
   virtual void filter_and_add (TAO_Profile* profile,
                                TAO_MProfile& profiles,
                                TAO_Profile* guideline = 0) = 0;
 
-
 private:
-
   /// The sanitize_profiles() methods call this to do the work.
   CORBA::Object_ptr sanitize (CORBA::Object_ptr object,
                               TAO_Profile* profile);
diff --git a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h
index 20834c1b872..0b606e23f95 100644
--- a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h
+++ b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.h
@@ -59,14 +59,12 @@ public:
                          const TAO_IORManip_IIOP_Filter::Profile_Info& pinfo);
 
 protected:
-
   /// This is the bulk of the filtering code.
   virtual void filter_and_add (TAO_Profile* profile,
                                TAO_MProfile& profiles,
                                TAO_Profile* guideline = 0);
 
 private:
-
   /// Fill in the Profile_Info with information from the profile.
   int fill_profile_info (TAO_Profile* profile,
                          TAO_IORManip_IIOP_Filter::Profile_Info& pinfo);
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index d5119c19551..d284d4186a4 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -77,7 +77,6 @@ public:
   virtual CORBA::ULong get_profile_count (CORBA::Object_ptr group);
 
 protected:
-
   /// Destructor
   ~TAO_IOR_Manipulation_impl (void);
 
diff --git a/TAO/tao/IORTable/Async_Table_Adapter.h b/TAO/tao/IORTable/Async_Table_Adapter.h
index 8930289bf36..330445362d1 100644
--- a/TAO/tao/IORTable/Async_Table_Adapter.h
+++ b/TAO/tao/IORTable/Async_Table_Adapter.h
@@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Async_IORTable_Export TAO_Async_Table_Adapter : public TAO_Table_Adapter
 {
 public:
-
   /// Constructor
   TAO_Async_Table_Adapter (TAO_ORB_Core &orb_core);
 
@@ -47,7 +46,6 @@ protected:
   /// Helper method to find an object bound in the table.
   void find_object (::IORTable::Locate_ResponseHandler rh,
                     TAO::ObjectKey &key);
-
 };
 
 // ****************************************************************
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h
index 3b1abc02326..81d4ce29cf5 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.h
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.h
@@ -119,7 +119,6 @@ public:
   static TAO_AMH_Locate_ResponseHandler* _unchecked_narrow (CORBA::Object_ptr);
 
 protected:
-
   /// Return 0.  Should never be used.
   virtual const char *_interface_repository_id (void) const;
 
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index 83fc8f7391f..68e9bc4d40b 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -140,7 +140,6 @@ namespace TAO
     int _tao_byte_order ();
 
   protected:
-
     /**
      * The stub pointer passed to this call has all the details about
      * the object to which the invocation needs to be routed to. The
diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h
index edf42f8b361..56abc8cde0e 100644
--- a/TAO/tao/LF_Event.h
+++ b/TAO/tao/LF_Event.h
@@ -121,7 +121,6 @@ public:
   static const char *state_name (LFS_STATE st);
 
 protected:
-
   /// Validate the state change
   virtual void state_changed_i (LFS_STATE new_state) = 0;
 
diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h
index 1e56a409c81..de5a422f4c3 100644
--- a/TAO/tao/LF_Invocation_Event.h
+++ b/TAO/tao/LF_Invocation_Event.h
@@ -43,7 +43,6 @@ public:
   virtual ~TAO_LF_Invocation_Event (void);
 
 protected:
-
   /// Validate and perform the state change
   /**
    * This concrete class uses the following states declared in the
diff --git a/TAO/tao/LF_Multi_Event.h b/TAO/tao/LF_Multi_Event.h
index 5b01b37ac30..8411652f92a 100644
--- a/TAO/tao/LF_Multi_Event.h
+++ b/TAO/tao/LF_Multi_Event.h
@@ -64,7 +64,6 @@ private:
   TAO_LF_Multi_Event (const TAO_LF_Multi_Event &);
 
 protected:
-
   /// Validate the state change
   virtual void state_changed_i (LFS_STATE new_state);
 
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index e03671a6d4f..0e11bcd646d 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -152,7 +152,6 @@ namespace CORBA
     typedef LocalObject_out _out_type;
 
   protected:
-
     /// Default constructor.
     /**
      * Make it protected to prevent instantiation of this class.
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index da3b1abd037..7d3aa640e01 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -169,13 +169,11 @@ public:
   CORBA::ULong hash (CORBA::ULong max);
 
 protected:
-
   /// This method handle the dynamic allocation of the data member
   /// <policy_list_>.
  void create_policy_list (void);
 
 public:
-
   /// Sets the policies list associated with the profiles
   /// owned by the TAO_MProfile.
   void policy_list (CORBA::PolicyList *policy_list);
@@ -185,7 +183,6 @@ public:
   CORBA::PolicyList *policy_list (void);
 
 protected:
-
   /// Initialize the policy list, demarsharling the policy.
   void init_policy_list (void);
 
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index 7a3b5e9e947..703728eba77 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -88,7 +88,6 @@ public:
   //@}
 
 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.
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
index 22fa8f7bd7f..c6af67798b7 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
@@ -72,8 +72,8 @@ namespace TAO
                  const TAO_Reply_Handler_Stub &reply_handler_stub);
 
     virtual void invoke (const TAO::Exception_Data *ex, unsigned long ex_count);
-  protected:
 
+  protected:
     virtual Invocation_Status invoke_twoway (
         TAO_Operation_Details &op,
         CORBA::Object_var &effective_target,
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 629e6f5c708..ea7f68d4c96 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -320,7 +320,6 @@ namespace TAO
 class TAO_Export TAO_Transport
 {
 public:
-
   /// Default creator, requires the tag value be supplied.
   TAO_Transport (CORBA::ULong tag,
                  TAO_ORB_Core *orb_core,
@@ -535,7 +534,6 @@ public:
                             TAO::Transport::Drain_Constraints const & dc);
 #endif  /* TAO_HAS_SENDFILE==1 */
 
-
   /// Read len bytes from into buf.
   /**
    * This method serializes on handler_lock_, guaranteeing that only
@@ -568,7 +566,6 @@ public:
 
   /// Call the implementation method after obtaining the lock.
   virtual void close_connection (void);
-
   //@}
 
   /** @name Template methods
@@ -677,11 +674,9 @@ public:
   //@@ TAO_TRANSPORT_SPL_PUBLIC_METHODS_ADD_HOOK
 
 protected:
-
   virtual TAO_Connection_Handler * connection_handler_i (void) = 0;
 
 public:
-
   /// This is a request for the transport object to write a
   /// LocateRequest header before it is sent out.
   int generate_locate_request (TAO_Target_Specification &spec,
@@ -784,7 +779,6 @@ public:
                                    ACE_Time_Value *max_wait_time);
 
 protected:
-
   /// Process the message by sending it to the higher layers of the
   /// ORB.
   int process_parsed_messages (TAO_Queued_Data *qd,
@@ -917,7 +911,6 @@ public:
   TAO::Transport::Stats* stats (void) const;
 
 private:
-
   /// Helper method that returns the Transport Cache Manager.
   TAO::Transport_Cache_Manager &transport_cache_manager (void);
 
@@ -1087,7 +1080,6 @@ private:
   //@@ TAO_TRANSPORT_SPL_PRIVATE_METHODS_ADD_HOOK
 
 protected:
-
   /// IOP protocol tag.
   CORBA::ULong const tag_;
 
@@ -1191,7 +1183,6 @@ protected:
   bool connection_closed_on_read_;
 
 private:
-
   /// Our messaging object.
   TAO_GIOP_Message_Base *messaging_object_;
 
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index f01cfb6291d..6d5a6f629c5 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,9 +4,9 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 7
-#define TAO_BETA_VERSION 7
-#define TAO_VERSION "2.5.7"
-#define TAO_VERSION_CODE 132359
+#define TAO_MICRO_VERSION 8
+#define TAO_BETA_VERSION 8
+#define TAO_VERSION "2.5.8"
+#define TAO_VERSION_CODE 132360
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 4c85353dc57..57036a486f1 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -706,7 +706,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid
     gendir = .
     ../rules.tao.GNU
     ../README*
-    ../VERSION
+    ../VERSION.txt
     ../PROBLEM-REPORT-FORM
     ../NEWS
     ../COPYING*
diff --git a/TAO/tests/Connection_Failure/README b/TAO/tests/Connection_Failure/README
index 74e7df40d0d..7ae5b95d45d 100644
--- a/TAO/tests/Connection_Failure/README
+++ b/TAO/tests/Connection_Failure/README
@@ -1,7 +1,5 @@
 /**
 
-
-
 @page Connection_Failure Test README File
 
 A simple test for connection failures. The client tries to connect to
diff --git a/TAO/tests/Crashed_Callback/README b/TAO/tests/Crashed_Callback/README
index ee6379a44c1..93dd4a401fa 100644
--- a/TAO/tests/Crashed_Callback/README
+++ b/TAO/tests/Crashed_Callback/README
@@ -1,17 +1,15 @@
 /**
 
-
-
 @page Crashed Callback Test README File
 
-	On TAO-1.1.12 the ORB would dead-lock when trying to send a
+On TAO-1.1.12 the ORB would dead-lock when trying to send a
 callback to a crashed server.  As far as we know it only happens with
 reliable oneways.
 
-	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/DII_Deferred_Transient/DII_Deferred_Transient.mpc b/TAO/tests/DII_Deferred_Transient/DII_Deferred_Transient.mpc
new file mode 100644
index 00000000000..de4381c7b1e
--- /dev/null
+++ b/TAO/tests/DII_Deferred_Transient/DII_Deferred_Transient.mpc
@@ -0,0 +1,34 @@
+// -*- MPC -*-
+project(*idl): taoidldefaults, dynamicinterface, avoids_minimum_corba {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, dynamicinterface, avoids_minimum_corba {
+  after += *idl
+  Source_Files {
+    Hello.cpp
+    server.cpp
+  }
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): taoclient, dynamicinterface, avoids_minimum_corba {
+  after += *idl
+  Source_Files {
+    client.cpp
+  }
+  Source_Files {
+    TestC.cpp
+  }
+  IDL_Files {
+  }
+}
+
diff --git a/TAO/tests/DII_Deferred_Transient/Hello.cpp b/TAO/tests/DII_Deferred_Transient/Hello.cpp
new file mode 100644
index 00000000000..6d8aab734a4
--- /dev/null
+++ b/TAO/tests/DII_Deferred_Transient/Hello.cpp
@@ -0,0 +1,20 @@
+// -*- C++ -*-
+#include "Hello.h"
+#include "ace/OS_NS_unistd.h"
+
+Hello::Hello ()
+{
+}
+
+void
+Hello::crash ()
+{
+  ACE::terminate_process (ACE_OS::getpid ());
+}
+
+char *
+Hello::get_string ()
+{
+//  ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Hello::get_string called\n"));
+  return CORBA::string_dup ("Hello there!");
+}
diff --git a/TAO/tests/DII_Deferred_Transient/Hello.h b/TAO/tests/DII_Deferred_Transient/Hello.h
new file mode 100644
index 00000000000..1f26f2bfe55
--- /dev/null
+++ b/TAO/tests/DII_Deferred_Transient/Hello.h
@@ -0,0 +1,23 @@
+
+#ifndef HELLO_H
+#define HELLO_H
+#include /**/ "ace/pre.h"
+
+#include "TestS.h"
+
+/// Implement the Test::Hello interface
+class Hello
+  : public virtual POA_Test::Hello
+{
+public:
+  /// Constructor
+  Hello ();
+
+  // = The skeleton methods
+  virtual void crash ();
+
+  virtual char * get_string ();
+};
+
+#include /**/ "ace/post.h"
+#endif /* HELLO_H */
diff --git a/TAO/tests/DII_Deferred_Transient/README b/TAO/tests/DII_Deferred_Transient/README
new file mode 100644
index 00000000000..d986907ed1b
--- /dev/null
+++ b/TAO/tests/DII_Deferred_Transient/README
@@ -0,0 +1,17 @@
+/**
+
+@page DII Discarded Deferred Request Test README File
+
+  The goals of writing this test are:
+
+- Test transient error management (in case of disappearing/unreachable clients)
+  with the deferred DII calling scheme.
+
+  To run the test use the run_test.pl script:
+
+$ ./run_test.pl
+
+  the script returns 0 if the test was successful.
+
+  In case of a regression the test might segfault.
+*/
diff --git a/TAO/tests/DII_Deferred_Transient/Test.idl b/TAO/tests/DII_Deferred_Transient/Test.idl
new file mode 100644
index 00000000000..78382dcbcec
--- /dev/null
+++ b/TAO/tests/DII_Deferred_Transient/Test.idl
@@ -0,0 +1,14 @@
+
+/// Put the interfaces in a module, to avoid global namespace pollution
+module Test
+{
+  /// A very simple interface
+  interface Hello
+  {
+    /// signal server to terminate
+    oneway void crash ();
+
+    /// Return a simple string
+    string get_string ();
+  };
+};
diff --git a/TAO/tests/DII_Deferred_Transient/client.cpp b/TAO/tests/DII_Deferred_Transient/client.cpp
new file mode 100644
index 00000000000..98baad26c9f
--- /dev/null
+++ b/TAO/tests/DII_Deferred_Transient/client.cpp
@@ -0,0 +1,113 @@
+// -*- C++ -*-
+#include "tao/DynamicInterface/Request.h"
+#include "tao/DynamicInterface/DII_CORBA_methods.h"
+#include "TestC.h"
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_unistd.h"
+
+const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var obj = orb->string_to_object(ior);
+
+      const char* the_string = 0;
+
+      ACE_DEBUG ((LM_INFO, "(%P|%t) - #### Deferred twoway DII (using get_response())\n"));
+
+      CORBA::Request_var req = obj->_request ("get_string");
+      req->set_return_type (CORBA::_tc_string);
+
+      req->send_deferred ();
+      ACE_DEBUG ((LM_INFO, "(%P|%t) - Get response...\n"));
+      req->get_response ();
+      req->return_value () >>= the_string;
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%C>\n",
+                  the_string));
+
+      ACE_DEBUG ((LM_INFO, "(%P|%t) - #### Oneway DII to initiate crash\n"));
+
+      req = obj->_request ("crash");
+
+      req->send_oneway ();
+
+      ACE_OS::sleep(1); // give it some time
+
+      ACE_DEBUG ((LM_INFO, "(%P|%t) - #### Multiple deferred twoway DII (with discarded replies)\n"));
+
+      int iterations = 10;
+      int exceptions = 0;
+      for (int i=0; i<iterations ;++i)
+      {
+        try
+        {
+          ACE_DEBUG ((LM_INFO, "(%P|%t) - get_string iteration #%d\n", i));
+
+          req = obj->_request ("get_string");
+          req->set_return_type (CORBA::_tc_string);
+
+          req->send_deferred ();
+          // discard reply
+
+          ACE_DEBUG ((LM_INFO, "(%P|%t) - sent deferred\n"));
+        }
+        catch (const CORBA::Exception&)
+        {
+          ++exceptions;
+        }
+      }
+
+      if (exceptions == 0)
+      {
+        ACE_DEBUG ((LM_ERROR, "(%P|%t) - All requests unexpectedly succeeded\n"));
+      }
+      else
+      {
+        ACE_DEBUG ((LM_INFO, "(%P|%t) - Caught exceptions from requests as expected (%d)\n", exceptions));
+      }
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/DII_Deferred_Transient/run_test.pl b/TAO/tests/DII_Deferred_Transient/run_test.pl
new file mode 100755
index 00000000000..80bc1ae58b1
--- /dev/null
+++ b/TAO/tests/DII_Deferred_Transient/run_test.pl
@@ -0,0 +1,75 @@
+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;
+
+$status = 0;
+$debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+}
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
+$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level -k file://$client_iorfile");
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->GetStderrLog();
+$client->GetStderrLog();
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/TAO/tests/DII_Deferred_Transient/server.cpp b/TAO/tests/DII_Deferred_Transient/server.cpp
new file mode 100644
index 00000000000..74558b8e9fe
--- /dev/null
+++ b/TAO/tests/DII_Deferred_Transient/server.cpp
@@ -0,0 +1,100 @@
+// -*- C++ -*-
+#include "Hello.h"
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+
+const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Panic: nil RootPOA\n"),
+                          1);
+
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Hello *hello_impl = 0;
+      ACE_NEW_RETURN (hello_impl,
+                      Hello (),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(hello_impl);
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (hello_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      Test::Hello_var hello = Test::Hello::_narrow (object.in ());
+
+      CORBA::String_var ior = orb->object_to_string (hello.in ());
+
+      // Output the IOR to the <ior_output_file>
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s\n",
+                           ior_output_file),
+                           1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate ();
+
+      orb->run ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
author	Knut Petter Svendsen <knut@altuma.no>	2020-03-06 10:08:19 +0100
committer	Knut Petter Svendsen <knut@altuma.no>	2020-03-06 10:08:19 +0100
commit	4e9b0a57acf3a313af273143650ca0871ec9866d (patch)
tree	51cf15ff6482c8dc9367aa734c94a3ee6dad2bdb
parent	91785b820aeefe3642db06833e17ca936382a2f7 (diff)
parent	9985d758f81608d988b2ff45165521b099e97f0c (diff)
download	ATCD-4e9b0a57acf3a313af273143650ca0871ec9866d.tar.gz