ACE+TAO-6_5_16ACE+TAO-6_5_16

10 files changed, 264 insertions, 46 deletions

diff --git a/ACE/ChangeLogs/ACE-6_5_16 b/ACE/ChangeLogs/ACE-6_5_16
new file mode 100644
index 00000000000..1d41388343e
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_16
@@ -0,0 +1,105 @@
+commit 2d073c5a90f7663d8c43fec451ab31c9e24e73d4
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Nov 16 08:20:24 2021 -0600
+
+    ACE NEWS for 6.5.16
+
+commit d155cf53c6e82d9c9ec1086d18d2db413ae28930
+Merge: 0cfb634acbf 05799339af7
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Nov 10 08:33:06 2021 -0600
+
+    Merge pull request #1714 from mitza-oci/msvc-langstd-ace6tao2
+    
+    [ace6tao2] Port to MSVC with /std:c++17 and 20
+
+commit 0cfb634acbf7e879190307efcbe91b29fc6f360d
+Merge: 15373a92f1c 6205b23dc8b
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Nov 10 08:32:50 2021 -0600
+
+    Merge pull request #1641 from mitza-oci/handle-set-warnings
+    
+    [ACE 6] Fixed warnings related to Handle_Set's copy constructor
+
+commit 05799339af7c3c80b8de34451fec513aa2afc4dd
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Nov 5 10:27:48 2021 -0500
+
+    Resolve "ambiguous call to overloaded operator" with /std:c++20
+    
+    (cherry picked from commit fd83ab71c26234f56b7e8bfb3794c7058b923dcc)
+
+commit 4ffb9d10827d95f58716cb868d2b8a4af5af2f56
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Nov 5 10:27:21 2021 -0500
+
+    Reverted b01722554a69d1850c026d529e5b0a5e023961cd
+    
+    (cherry picked from commit 0e2c9d980d009ace54e08a2da3ab2d57d48b5596)
+    
+    # Conflicts:
+    #       ACE/ace/Malloc.h
+
+commit 920ee20982e751376e99e782515831acf0cebefd
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Nov 4 17:22:01 2021 -0500
+
+    Updated ACE tests for /std:c++17
+
+commit 7e1eda8c1cd59d4d1720ceb96b24a8806de33877
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Nov 3 20:19:41 2021 -0500
+
+    Added included needed for ACE_HAS_CPP11 and up
+
+commit 81fe8e4219fb2b6d43dc2c09e6acbc4151431bdc
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Sun Oct 31 21:07:11 2021 -0500
+
+    getting libACE to compile with /std:c++20
+    
+    avoid ambiguous calls to overloaded operators
+
+commit 9b46cce3c9fb6eed1ad06b116a6c7cc31f823465
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Sun Oct 31 12:56:00 2021 -0500
+
+    ACE tests: fixed compatibility with MSVC /std:c++17
+
+commit a0dffa696c8a11a1bc6039118fc578663843cd65
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Sat Oct 30 17:22:45 2021 -0500
+
+    Add versioned namespace macros
+
+commit 9dbd5b15e1bf2181d99e21d13bdd24b61b625ccb
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Sat Oct 30 14:34:42 2021 -0500
+
+    Fix compile errors on MSVC /std:c++17
+
+commit a2a30309aeeb4b6d51ddbfec14acbf24315b83f2
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Nov 1 15:19:51 2021 -0500
+
+    Merge pull request #1300 from VemundH/remove-std-iterator
+    
+    Remove deprecated std::iterator
+    
+    (cherry picked from commit 858a63528d213eeec10de11660a770f7b7dc1bfd)
+
+commit 4b7a9168a77c958cbdd05a4e1ecee71a3bf73303
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 29 09:49:53 2021 +0200
+
+    Update for next ACE 6.5.x release
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit 6205b23dc8beb0691e887f988246f53bb0f3da4f
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Aug 3 11:02:39 2021 -0500
+
+    Fixed warnings related to Handle_Set's copy constructor
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 808bd9ef0c7..e1f5ee523ed 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.15
+    ACE VERSION: 6.5.16
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION.txt b/ACE/VERSION.txt
index f1ed65e3af7..00cbe107063 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 6.5.15, released Wed Sep 29 09:17:26 CEST 2021
+This is ACE version 6.5.16, released Wed Nov 17 08:51:00 CET 2021
 
 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/Version.h b/ACE/ace/Version.h
index bbd1a4a3d89..e246812bd97 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,8 +4,8 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 15
-#define ACE_BETA_VERSION 15
-#define ACE_VERSION "6.5.15"
-#define ACE_VERSION_CODE 0x6050f
+#define ACE_MICRO_VERSION 16
+#define ACE_BETA_VERSION 16
+#define ACE_VERSION "6.5.16"
+#define ACE_VERSION_CODE 0x60510
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index a9ebd8daf5f..4235a54d572 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.15
+Package: libace-6.5.16
 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.15 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.16 (= ${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.15
+Package: libace-ssl-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.16 (= ${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.15
+Package: libace-rmcast-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.16 (= ${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.15
+Package: libace-tmcast-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.16 (= ${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.15
+Package: libace-htbp-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.16 (= ${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.15
+Package: libace-inet-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.16 (= ${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.15
+Package: libace-inet-ssl-6.5.16
 Architecture: any
 Section: libs
-Depends: libace-inet-6.5.15, libace-ssl-6.5.15, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.16, libace-ssl-6.5.16, ${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.15 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.16 (= ${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.15
+Package: libacexml-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.16 (= ${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.15
+Package: libace-xml-utils-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.16 (= ${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.15
+Package: libkokyu-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.16 (= ${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.15
+Package: libace-xtreactor-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.16 (= ${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.15
+Package: libace-tkreactor-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.16 (= ${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.15
+Package: libace-flreactor-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.16 (= ${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.15
+Package: libace-foxreactor-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.16 (= ${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.15
+Package: libnetsvcs-6.5.16
 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.15 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.16 (= ${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/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index ada8cf952bf..2c2206e3114 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.15
-%define TAOVER  2.5.15
+%define ACEVER  6.5.16
+%define TAOVER  2.5.16
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_16 b/TAO/ChangeLogs/TAO-2_5_16
new file mode 100644
index 00000000000..e9e5ecaa543
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_16
@@ -0,0 +1,113 @@
+commit 8d8ffb88621135e4ea8acb50ef79a56cb2907864
+Merge: e79f78efa9e 6221d768d75
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Nov 12 10:08:50 2021 -0600
+
+    Merge pull request #1728 from mitza-oci/tao2-notifyinclude
+    
+    [TAO 2] Notify svc: Fixed include
+
+commit 6221d768d759732d11fb425ea8766b64d0db14c3
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Nov 11 11:37:07 2021 -0600
+
+    Notify svc: Fixed include
+    
+    The "make install" tree doesn't have two orbsvcs directories
+    
+    (cherry picked from commit 026a87c8d9d1ce03c09d77e8c1fb99eb7d6af666)
+
+commit 65c0af62568253959345d73f01af0dc94fb1e11c
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Nov 10 14:53:28 2021 -0600
+
+    SystemExceptions shouldn't use a different export
+    
+    All classes defined in libTAO should use the same export macro.
+    This avoids MSVC creating import libs for all executables that use
+    libTAO -- see https://github.com/DOCGroup/MPC/issues/130 and
+    https://github.com/microsoft/vcpkg/issues/16551
+    
+    (cherry picked from commit 0f879fd3f8a6e4d0b1762bd6c1424af735813ccc)
+    
+    # Conflicts:
+    #       TAO/tao/SystemException.h
+
+commit e8bc30554bb54f07fd3b55a655c45bc381e52cd4
+Merge: 596c90c7d6c d155cf53c6e
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Nov 10 08:34:19 2021 -0600
+
+    Merge branch 'ace6tao2' into igtd/backport-1715
+
+commit 596c90c7d6c06260c74e12d3b995dc17b7985ab6
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Nov 9 12:54:59 2021 -0600
+
+    TAO/NEWS: Remove extra "in"
+
+commit 80d4db0c504f09077954fa2f3139ba2aa1955e6e
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Nov 9 12:30:34 2021 -0600
+
+    Restore bool bitwise expressions
+
+commit 36af3cc15a754cdbb887d25a2b16e167abb9051d
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Nov 9 09:08:07 2021 -0600
+
+    Remove Unnecessary Boolean Operations
+    
+    To address warnings on windows.
+
+commit a0461832021d4989a43aa1141f711cb9e849f454
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Nov 9 00:46:55 2021 -0600
+
+    Update TAO/NEWS
+
+commit d4922e3d93d2b3fb42d03b09ae764423d8d8b1cc
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Nov 9 00:31:55 2021 -0600
+
+    Fix Floating Point Constant Expressions in tao_idl
+    
+    Backport of https://github.com/DOCGroup/ACE_TAO/pull/1715
+    
+    Fixes #1713 and adds some regression tests for constant expressions.
+    Also tried to do some more cleanup and minor fixes related to #840.
+
+commit ef2d9343c11931079c32ca80ff7017e12865024e
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Nov 1 15:28:00 2021 -0500
+
+    tao_idl updates for /std:c++20
+    
+    std::ostream doesn't work with wchar_t
+
+commit a863b40b782977086995a6a9d8f805c55cc93678
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Nov 1 12:03:17 2021 -0500
+
+    TAO updates for /std:c++20
+    
+    Note that the C++20 standard library disallows using
+    wide (wchar_t) strings with narrow iostreams
+
+commit ecbca0bd527eb34e4568c5b5a8abf54667dccebd
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Sun Oct 31 21:38:48 2021 -0500
+
+    tao_idl updates for /std:c++20
+    
+    resolved ambiguous call to operator<< by refactoring to avoid
+    repetition of the same statement 300 times
+
+commit 4b7a9168a77c958cbdd05a4e1ecee71a3bf73303
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 29 09:49:53 2021 +0200
+
+    Update for next ACE 6.5.x release
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 2475376e942..a1a5f177325 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.15
-    ACE VERSION: 6.5.15
+    TAO VERSION: 2.5.16
+    ACE VERSION: 6.5.16
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt
index d02d28b8929..57493ecf078 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.15, released Wed Sep 29 09:17:26 CEST 2021
+This is TAO version 2.5.16, released Wed Nov 17 08:51:00 CET 2021
 
 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/tao/Version.h b/TAO/tao/Version.h
index dc51e2195d4..7992e2a57e4 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,8 +4,8 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 15
-#define TAO_BETA_VERSION 15
-#define TAO_VERSION "2.5.15"
-#define TAO_VERSION_CODE 0x2050f
+#define TAO_MICRO_VERSION 16
+#define TAO_BETA_VERSION 16
+#define TAO_VERSION "2.5.16"
+#define TAO_VERSION_CODE 0x20510
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))