summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLogs/ACE-6_5_12701
-rw-r--r--ACE/PROBLEM-REPORT-FORM2
-rw-r--r--ACE/VERSION.txt2
-rw-r--r--ACE/ace/Version.h8
-rw-r--r--ACE/debian/control62
-rw-r--r--ACE/rpmbuild/ace-tao.spec4
-rw-r--r--TAO/ChangeLogs/TAO-2_5_12349
-rw-r--r--TAO/PROBLEM-REPORT-FORM4
-rw-r--r--TAO/VERSION.txt2
-rw-r--r--TAO/tao/Version.h8
10 files changed, 1096 insertions, 46 deletions
diff --git a/ACE/ChangeLogs/ACE-6_5_12 b/ACE/ChangeLogs/ACE-6_5_12
new file mode 100644
index 00000000000..0e64eebeff6
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_12
@@ -0,0 +1,701 @@
+commit 7449152aa7f626f93fc495b68b747d94b7331731
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sun Oct 25 09:48:17 2020 +0100
+
+ Extend news file with changes as part of issue #1271
+
+ * ACE/NEWS:
+
+commit 83dc09aacce718c0844ba721053298f21bc8e160
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat Oct 24 10:39:48 2020 +0200
+
+ Updated news file for x.5.12
+
+ * ACE/NEWS:
+
+commit 350d4011d2eddbe4429d0048b8dfda4e293be23c
+Merge: 46f29e2e07d 22532739d89
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Thu Oct 22 08:40:45 2020 -0500
+
+ Merge pull request #1268 from mitza-oci/android
+
+ Updates for Windows-hosted Android NDK cross-compile
+
+commit 46f29e2e07d210e6804786b1863b087aee05a540
+Merge: 886935f09b8 935fcd2d827
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Oct 22 11:02:54 2020 +0200
+
+ Merge pull request #1261 from jwillemsen/jwi-cle
+
+ Removed changelog editor, we don't maintain manual changelogs anymore…
+
+commit 886935f09b885b90391c29d1be85d286af15222c
+Merge: c4559d9048a 17c1db72fef
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Oct 22 10:42:19 2020 +0200
+
+ Merge pull request #1262 from jwillemsen/jwi-guidelines
+
+ Fixed some typos and removed some references/support for subversion as version control
+
+commit 22532739d89cd5ad3883c6b04ad289db54cf5e41
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Wed Oct 21 12:52:41 2020 -0500
+
+ Updates for Windows-hosted Android NDK cross-compile
+
+commit 935fcd2d82761dd605211a1ac0556a17f0188b17
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Oct 14 14:43:45 2020 +0200
+
+ Removed changelog editor, we don't maintain manual changelogs anymore and the tool hasn't bee updated for git at all
+
+commit 17c1db72fef43b50d4454ed4bb6df1a85781501f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Oct 14 14:35:02 2020 +0200
+
+ Updated comment
+
+commit a428372d1b0a1516853947c554e33f6223cba7e8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Oct 14 14:34:46 2020 +0200
+
+ Updated comment
+
+commit afd4cc54d7c5bab54cf4ac76e3cf0feb9f704108
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Oct 14 14:34:23 2020 +0200
+
+ Removed check for non svn files
+
+commit d09cdd5a2c7a5c0c83f58c7954dcab4036c33ebd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Oct 14 14:31:50 2020 +0200
+
+ Removed special handling for subversion files
+
+commit 3ab2a7fc9753f0686bf4f0c887f1eb3d22b1e7f6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Oct 14 14:30:52 2020 +0200
+
+ Removed check_for_changelog_errors, we don't maintain changelogs anymore
+
+commit 50f221e13831d2fd0a3a09b671d649cac28f980a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Oct 14 14:30:19 2020 +0200
+
+ Fixed typos in comments
+
+commit a32f0645e56f07afdbd86c6230537edc9ef8858a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Oct 14 14:29:57 2020 +0200
+
+ Removed reference to svn
+
+commit 4b16e80fdac9e3c74774b03f405b4d2383d0aa90
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Oct 12 17:08:01 2020 +0200
+
+ Fixed typos
+
+ * ACE/ace/Copy_Disabled.h:
+ * ACE/ace/DLL_Manager.h:
+ * ACE/ace/Date_Time.h:
+
+commit 42c12b3727d091e29bcf74886343a75023c43a2e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Oct 12 17:02:27 2020 +0200
+
+ Layout and typo changes
+
+ * ACE/ace/PI_Malloc.h:
+
+commit c942cf5318f7599584cccedaf2f6c3ababd49708
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Oct 12 16:48:29 2020 +0200
+
+ Removed c++0x and c++1y, added c++20
+
+commit 30dc9807c9d6c752e0bc0d528ae2e7c57c53f716
+Merge: d25bf627beb a5bb8cb886e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 6 13:05:15 2020 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit d25bf627bebf25507b2f4c7e3023ec2c1bd0ed7b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 6 13:05:07 2020 +0200
+
+ Use https
+
+ * ACE/docs/ACE-bug-process.html:
+ * ACE/docs/usage-bugzilla.html:
+ * ACE/html/Stats/img.html:
+ * TAO/docs/TAO-metrics.html:
+ * TAO/docs/releasenotes/index.html:
+
+commit 80472e4cf63bea10b0b3a1dd45f1b8d6a05cc57f
+Merge: 01c51074185 ae13700f764
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Oct 5 13:54:24 2020 +0200
+
+ Merge pull request #1248 from jwillemsen/jwi-doxygenup2
+
+ Upgrade to latest doxygen
+
+commit ae13700f76493361f0c82ac49d87567f9ac18cf9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Oct 5 12:10:20 2020 +0200
+
+ Upgrade to latest doxygen
+
+ * ACE/etc/ace.doxygen:
+ * ACE/etc/ace_inet.doxygen:
+ * ACE/etc/ace_qos.doxygen:
+ * ACE/etc/ace_rmcast.doxygen:
+ * ACE/etc/ace_ssl.doxygen:
+ * ACE/etc/acexml.doxygen:
+ * TAO/etc/tao.doxygen:
+ * TAO/etc/tao_anytypecode.doxygen:
+ * TAO/etc/tao_av.doxygen:
+ * TAO/etc/tao_compression.doxygen:
+ * TAO/etc/tao_cosevent.doxygen:
+ * TAO/etc/tao_cosnaming.doxygen:
+ * TAO/etc/tao_cosnotification.doxygen:
+ * TAO/etc/tao_costime.doxygen:
+ * TAO/etc/tao_costrader.doxygen:
+ * TAO/etc/tao_dynamicany.doxygen:
+ * TAO/etc/tao_dynamicinterface.doxygen:
+ * TAO/etc/tao_esf.doxygen:
+ * TAO/etc/tao_ifr.doxygen:
+ * TAO/etc/tao_implrepo.doxygen:
+ * TAO/etc/tao_iormanip.doxygen:
+ * TAO/etc/tao_iortable.doxygen:
+ * TAO/etc/tao_pi.doxygen:
+ * TAO/etc/tao_pi_server.doxygen:
+ * TAO/etc/tao_portablegroup.doxygen:
+ * TAO/etc/tao_portableserver.doxygen:
+ * TAO/etc/tao_rtcorba.doxygen:
+ * TAO/etc/tao_rtevent.doxygen:
+ * TAO/etc/tao_rtportableserver.doxygen:
+ * TAO/etc/tao_security.doxygen:
+ * TAO/etc/tao_smartproxies.doxygen:
+ * TAO/etc/tao_ssliop.doxygen:
+ * TAO/etc/tao_strategies.doxygen:
+ * TAO/etc/tao_transportcurrent.doxygen:
+ * TAO/etc/tao_ziop.doxygen:
+
+commit d80f32e641d3431e39268d66f7718042611754c6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sun Oct 4 10:24:41 2020 +0200
+
+ Add link for conda-forge update
+
+ * ACE/docs/bczar/bczar.html:
+
+commit f458a1ace77661e39f55575a153d0c34160e218e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat Oct 3 10:24:37 2020 +0200
+
+ Give an eror when we can't detect the MacOSX version instead of silently including no real config file
+
+ * ACE/ace/config-macosx.h:
+
+commit 7d1e5116b673b3655837e0ce549e7781702d309c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Oct 2 16:45:22 2020 +0200
+
+ Perl shebang portability changes
+
+ * ACE/bin/PerlACE/ConfigList.pm:
+ * ACE/bin/PerlACE/MSProject.pm:
+ * ACE/bin/PerlACE/Process.pm:
+ * ACE/bin/PerlACE/ProcessAndroid.pm:
+ * ACE/bin/PerlACE/ProcessLVRT.pm:
+ * ACE/bin/PerlACE/ProcessVX.pm:
+ * ACE/bin/PerlACE/ProcessVX_Unix.pm:
+ * ACE/bin/PerlACE/ProcessVX_Win32.pm:
+ * ACE/bin/PerlACE/ProcessWinCE.pm:
+ * ACE/bin/PerlACE/ProcessWinCE_Unix.pm:
+ * ACE/bin/PerlACE/Process_Unix.pm:
+ * ACE/bin/PerlACE/Process_VMS.pm:
+ * ACE/bin/PerlACE/Process_Win32.pm:
+ * ACE/bin/PerlACE/Run_Test.pm:
+ * ACE/bin/PerlACE/TestTarget.pm:
+ * ACE/bin/PerlACE/TestTarget_Android.pm:
+ * ACE/bin/PerlACE/TestTarget_LVRT.pm:
+ * ACE/bin/PerlACE/TestTarget_VxWorks.pm:
+ * ACE/bin/PerlACE/TestTarget_WinCE.pm:
+ * ACE/bin/Uniqueid.pm:
+
+commit 39b6bf47cedf362390469a2cd7aadf123adc8033
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Oct 2 16:25:40 2020 +0200
+
+ Use #!/usr/bin/env perl as perl shebang for portability, see https://stackoverflow.com/questions/10376206/what-is-the-preferred-bash-shebang and https://github.com/conda-forge/staged-recipes/pull/12698
+
+ * ACE/bin/depgen.pl:
+ * ACE/bin/generate_export_file.pl:
+ * ACE/bin/mpc.pl:
+ * ACE/bin/mwc.pl:
+ * ACE/bin/split-cpp.pl:
+ * ACE/examples/IPC_SAP/SOCK_SAP/summarize.pl:
+ * ACE/examples/IPC_SAP/SSL_SAP/summarize.pl:
+
+commit 44a6cb570564dd58e71eedb1fc1975df048fcbf9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Sep 22 08:33:59 2020 +0200
+
+ Zap empty lines
+
+ * ACE/ace/SPIPE_Addr.cpp:
+
+commit 6f78b0285ec9a20ccc8c626ff99e5df711a25e18
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Sep 18 08:46:41 2020 +0200
+
+ Remove usage of narrow_from_decl/narrow_from_scope and replace them with dynamic_cast
+
+commit 0ca9c019335cde957877214b6ffb4328de4ca198
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Sep 9 13:49:45 2020 +0200
+
+ Doxygen change
+
+ * ACE/ace/SOCK_Dgram_Mcast.h:
+
+commit ab728e5de3864251bc10d399aa3dab686706e75c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Sep 9 11:13:20 2020 +0200
+
+ Removed empty lines
+
+ * ACE/examples/Reactor/Ntalker/README:
+
+commit 1359caf0cc52564e3480de85d1b87811425f02c9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Sep 9 11:13:06 2020 +0200
+
+ Doxygen changes
+
+ * ACE/ace/Log_Category.h:
+
+commit 14d3e012d5632d4932f1a5045241b934a0956e33
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Sep 2 15:47:24 2020 +0200
+
+ Removed setting of cidl, not used anymore for ACE/TAO
+
+ * ACE/rpmbuild/ace-tao.spec:
+
+commit aabdac304b8b9c20617e95b1b3bf890f34c3c011
+Merge: 2667ee25fd5 29f2ebd6e7b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Sep 2 12:14:10 2020 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit 2667ee25fd5de951201fe27171f1168cdaa5224b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Sep 2 12:14:05 2020 +0200
+
+ Layout changes
+
+ * ACE/ace/Init_ACE.cpp:
+ * ACE/ace/Service_Config.h:
+
+commit 29f2ebd6e7ba98e76722cedc4ff1ae95fcdce16d
+Merge: 38f7c05997f 46923db6e60
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Sep 1 15:48:51 2020 +0200
+
+ Merge pull request #1230 from jwillemsen/jwi-noxscdynamictypes
+
+ No need for adding XSC_ROOT/MPC to dynamic_types
+
+commit 35d57553c13c79ff64d9eebad1d5486e293861fc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Sep 1 14:24:27 2020 +0200
+
+ Layout and docu changes
+
+ * ACE/ace/Service_Config.h:
+ * ACE/ace/Service_Gestalt.h:
+
+commit 46923db6e60d8970b4b502ee903f2bb48b3f59eb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 31 12:17:16 2020 +0200
+
+ No need for adding XSC_ROOT/MPC to dynamic_types
+
+ * ACE/bin/MakeProjectCreator/config/MPC.cfg:
+
+commit a886e56c56209c11b35ebf7c89834ecb9e837882
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 27 08:25:31 2020 +0200
+
+ Revert "Use unspecified_bool_type instead of bool."
+
+commit e816643abb2682e5a53a33e61e276183289dba8d
+Merge: 80a604ead86 38143a3c197
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 27 08:14:17 2020 +0200
+
+ Merge pull request #1226 from sudipm-mukherjee/sudip/hurd
+
+ Fix build for Debian hurd
+
+commit 38143a3c1975fbc8a35db00a5b15d12f8bfbe5a1
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Date: Wed Aug 26 20:28:21 2020 +0100
+
+ Fix build for Debian hurd
+
+ Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+
+commit 0c2d1a119120df3e6f615c82cbb23d39e9763dfa
+Merge: ffdd6735537 e4e843a66e9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 26 20:29:11 2020 +0200
+
+ Merge branch 'thr-mgr-join-leak-deadlock' of git://github.com/likema/ACE_TAO into likema-thr-mgr-join-leak-deadlock
+
+commit ffdd6735537f4c5a69fdf75a658d12d55108d7cd
+Merge: dac841ab982 75f62ae3902
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 26 20:28:49 2020 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit dac841ab98249ba3984f7cae975115d0f3ad236e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 26 16:15:22 2020 +0200
+
+ Indent change in class docu
+
+ * ACE/ace/Log_Msg_Callback.h:
+
+commit 6fdc79c928bc388be70ccf9f1e371648cdf70ef3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 26 15:54:32 2020 +0200
+
+ Layout changes
+
+ * ACE/ace/Intrusive_Auto_Ptr.inl:
+
+commit 3f027144ea3b868d7dbf75231b993c410a2156fb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 26 15:53:29 2020 +0200
+
+ Layout changes and removed commented out operation
+
+ * ACE/ace/Intrusive_Auto_Ptr.h:
+
+commit 182f6c2a6453a8e4c84bd64a234194d7b42ea07f
+Merge: 8b02c0495ec 7e7902f9ffa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 26 15:53:08 2020 +0200
+
+ Merge branch 'unspecified-bool-type' of git://github.com/likema/ACE_TAO into likema-unspecified-bool-type
+
+commit b4840dd0504121a633774fae167c59c85103a5f9
+Merge: 2f35a199f9d 37280f99664
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 26 08:22:47 2020 +0200
+
+ Merge pull request #1216 from jwillemsen/jwi-linuxfeaturestravis
+
+ Migrate several custom travis configurations to github actions
+
+commit e39f3d46ca6b992428cae3f9629de1d77225d452
+Author: Like Ma <likemartinma@gmail.com>
+Date: Wed Aug 26 02:02:33 2020 +0800
+
+ Fix building DLL_Manager.cpp on AIX
+
+commit 5be4b01d123bebfc355cef1ec83e2b5d041b6ac8
+Merge: 9b8aa251557 939549d98ba
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Aug 25 13:26:57 2020 +0200
+
+ Merge pull request #1219 from likema/fix-select-reactor-hash-map
+
+ Fix redefined ACE_SELECT_REACTOR_BASE_USES_HASH_MAP warning.
+
+commit 9277daf0bc51db1eda1fd6b347ddf11bc2e20a7f
+Merge: 8d1155019cf dfbada54e38
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 24 20:06:46 2020 +0200
+
+ Merge pull request #1218 from jwillemsen/master
+
+ Fixed documentation typos
+
+commit 939549d98ba657b60b122875918e66fc9fd907d6
+Author: Like Ma <likemartinma@gmail.com>
+Date: Tue Aug 25 01:17:38 2020 +0800
+
+ Fix redefined ACE_SELECT_REACTOR_BASE_USES_HASH_MAP warning.
+
+ If ACE_SELECT_REACTOR_BASE_USES_HASH_MAP is defined by ace/config.h, GCC
+ would warn redefinition.
+
+commit dfbada54e389168c27e9c5748ba16787225c4727
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 24 17:31:10 2020 +0200
+
+ Doxygen changes
+
+ * ACE/ace/NT_Service.h:
+
+commit c3c16c78dfec71183de20d1ec95e3cda0aeee557
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 24 17:29:22 2020 +0200
+
+ Fixed typo
+
+ * ACE/ace/Obstack_T.h:
+ * TAO/docs/releasenotes/trader.html:
+ * TAO/orbsvcs/tests/Property/client.cpp:
+ * TAO/orbsvcs/tests/Simple_Naming/README:
+
+commit c1d01ce02ae81bc47e88fdaa46c8aa0b67bed81e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 24 17:02:00 2020 +0200
+
+ UNIX_Addr_Test should also be excluded for ACE_FOR_TAO
+
+ * ACE/tests/run_test.lst:
+ * ACE/tests/tests.mpc:
+
+commit e6d828ed165644465a6499a17105f01586f7f3d4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 24 16:31:18 2020 +0200
+
+ Bug_4189_Regression_Test needs to be excluded for ace_for_tao
+
+ * ACE/tests/Bug_4189_Regression_Test.cpp:
+ * ACE/tests/run_test.lst:
+ * ACE/tests/tests.mpc:
+
+commit a293b62dab742818572a514251dad14abafcd502
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 24 15:54:59 2020 +0200
+
+ Layout changes
+
+ * ACE/ace/Cleanup.h:
+ * ACE/ace/Object_Manager_Base.h:
+
+commit 8d1155019cf86f95cc49c77c7329dace810142a3
+Merge: 026e77fdfb4 fd49219a28f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Aug 21 19:41:20 2020 +0200
+
+ Merge pull request #1210 from jwillemsen/jwi-noreturn
+
+ Mark also ACE_OS::exit with ACE_GCC_NO_RETURN
+
+commit 7bc0aecc3d80e8d105be68f329ede4a8c3a3fc6e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Aug 21 11:16:06 2020 +0200
+
+ With C++11 make use of std::unique_ptr
+
+ * ACE/examples/APG/Naming/Name_Binding.h:
+ * ACE/examples/APG/Reactor/HAStatus.cpp:
+
+commit d5f4d848c1318e544f2f1f82f6d82e4a1361ec64
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Aug 21 11:02:14 2020 +0200
+
+ Make use of C++11 std::unique_ptr
+
+ * ACE/ACEXML/examples/SAXPrint/main.cpp:
+ * ACE/tests/Bug_2540_Regression_Test.cpp:
+ * ACE/tests/Bug_2820_Regression_Test.cpp:
+ * ACE/tests/DLL_Test.cpp:
+
+commit fd49219a28f14136731f809f8fb959bc2022f912
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Aug 21 10:32:13 2020 +0200
+
+ Const change
+
+ * ACE/tests/NonBlocking_Conn_Test.h:
+
+commit 888e4cf4a074e7dd0ef7f0f6e0adb5fa9675a817
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Aug 21 10:32:05 2020 +0200
+
+ Layout change
+
+ * ACE/ace/OS_NS_stdlib.inl:
+
+commit b272800c49f5b929962e38c0a8628e6fec167412
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Aug 21 10:31:51 2020 +0200
+
+ Mark also exit with ACE_GCC_NO_RETURN
+
+ * ACE/ace/OS_NS_stdlib.h:
+
+commit 53ac0545ce37c867745c618a29eb6f82b538fc8a
+Merge: 57ecd9fd721 c61b0db31cd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 20 18:29:29 2020 +0200
+
+ Merge pull request #1209 from jwillemsen/jwi-doxygen2
+
+ Upgrade doxygen files to latest doxygen version
+
+commit 57ecd9fd7216a7fbdd09c54b5ff32a2b03dc0fa6
+Merge: c199c1aa62b 3932af0ee97
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Thu Aug 20 10:27:26 2020 -0500
+
+ Merge pull request #1206 from iguessthislldo/igtd/no-return
+
+ Create ACE_GCC_NO_RETURN, Add to ACE_OS::_exit
+
+commit c199c1aa62b82c917fde05ee91589a6ff9222c91
+Merge: ab97ecf8087 bbe905207b9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 20 17:12:04 2020 +0200
+
+ Merge pull request #1208 from jwillemsen/master
+
+ Various layout/const/doxygen/bool minor changes
+
+commit c61b0db31cda9725e27e512b8a847651fb7708d0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 20 16:06:33 2020 +0200
+
+ Upgrade doxygen files to latest doxygen version
+
+commit fefa0d5f1850d0f1e633c4182702698ce64f6eb8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 20 14:41:22 2020 +0200
+
+ Layout and true/false changes
+
+ * ACE/ace/INET_Addr.cpp:
+ * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+ * TAO/tao/DynamicInterface/DII_Arguments.cpp:
+ * TAO/tao/DynamicInterface/Server_Request.cpp:
+
+commit 78bb4ae0df5461dcfd5303a02c63fc2fb8fd82d2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 20 14:13:07 2020 +0200
+
+ Const and layout changes
+
+ * ACE/ace/Acceptor.cpp:
+ * ACE/ace/Connector.cpp:
+ * ACE/ace/FILE_IO.h:
+ * ACE/ace/Hashable.h:
+ * ACE/ace/INET_Addr.cpp:
+ * ACE/ace/IOStream_T.h:
+ * ACE/ace/IO_SAP.h:
+ * ACE/ace/IPC_SAP.h:
+ * ACE/ace/If_Then_Else.h:
+ * ACE/ace/Local_Memory_Pool.h:
+
+commit 3932af0ee97a2c713fb6e0bbea6c3c317fe7e19f
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Wed Aug 19 17:00:34 2020 -0500
+
+ Create ACE_GCC_NO_RETURN, Add to ACE_OS::_exit
+
+ To fix fallthrough warning in ACE.cpp. Also added to ACE_OS::abort.
+
+commit e0d4c3e0147452a79a786088be1fec7365435b82
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 19 13:43:00 2020 +0200
+
+ Const changes
+
+ * ACE/ace/Connector.cpp:
+
+commit ece08cd0ab22e71841e70cf8aeea5f52eeccefad
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 19 12:09:43 2020 +0200
+
+ Removed empty lines
+
+ * ACE/ace/Unbounded_Set.h:
+ * ACE/ace/Unbounded_Set_Ex.h:
+
+commit 00fa9dccdc506736f651c4076d74d6f821f54762
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 17 11:21:49 2020 +0200
+
+ Remove Visual Studio 2015 as IDE for which we ship generated solutions as part of the release
+
+ * ACE/docs/Download.html:
+
+commit fcdeaf9ba2ff504e3d3f4ac2f9c06657d498b39f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 17 11:05:51 2020 +0200
+
+ Add missing changelogs
+
+commit 8f8ccba316c69953e1f1263f734e707a98c72581
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 17 11:04:51 2020 +0200
+
+ Prepare for next release and always create a changelog
+
+ * ACE/bin/copy-local-script.sh:
+ * ACE/bin/make_release.py:
+
+commit dbbd86832258985b5cf9533d85738e38df37ee66
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 17 10:14:35 2020 +0200
+
+ Make ACE 6.5.11 and TAO 2.5.11 public available and prepare for next release
+
+ * ACE/bin/copy-local-script.sh:
+ * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+ * ACE/docs/Download.html:
+ * ACE/docs/bczar/bczar.html:
+ * ACE/etc/index.html:
+ * TAO/NEWS:
+
+commit 7ed14884f80170cd5d19c586a5be53b6c89b36ce
+Merge: 951879f18dc 11fa72370c0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 17 10:10:23 2020 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit 951879f18dc071dda270bd3177e289ef1cd97436
+Merge: 35b185f0431 1ec10d1f7b5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 17 09:59:52 2020 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit 35b185f043170e07dc9ec1c06f818dfb385b1082
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Aug 14 15:27:47 2020 +0200
+
+ Add ace directory as we do with all ace includes
+
+ * ACE/ace/config-windows.h:
+
+commit e4e843a66e9388138dfcb64328637221d264b6a0
+Author: Like Ma <likemartinma@gmail.com>
+Date: Sat Mar 9 02:09:32 2019 +0800
+
+ Fix ACE_Thread_Manager::join memory leak and deadlock.
+
+commit 7e7902f9ffa652f78540870170c492a67816b731
+Author: Like Ma <likemartinma@gmail.com>
+Date: Wed Nov 13 20:20:47 2019 +0800
+
+ Use unspecified_bool_type instead of bool.
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index ad33046dd0e..ec2169becd6 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
To: ace-bugs@list.isis.vanderbilt.edu
Subject: [area]: [synopsis]
- ACE VERSION: 6.5.11
+ ACE VERSION: 6.5.12
HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION.txt b/ACE/VERSION.txt
index 6df66dc8918..ed10f670b0f 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 6.5.11, released Mon Aug 17 10:04:17 CEST 2020
+This is ACE version 6.5.12, released Tue Oct 27 12:46:14 CET 2020
If you have any problems with or questions about ACE, please send
e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 9789be85f49..0d4635b824b 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,8 +4,8 @@
#define ACE_MAJOR_VERSION 6
#define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 11
-#define ACE_BETA_VERSION 11
-#define ACE_VERSION "6.5.11"
-#define ACE_VERSION_CODE 394507
+#define ACE_MICRO_VERSION 12
+#define ACE_BETA_VERSION 12
+#define ACE_VERSION "6.5.12"
+#define ACE_VERSION_CODE 394508
#define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index 37224766228..c1645f8eec1 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.11
+Package: libace-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: C++ network programming framework
Package: libace-dev
Architecture: any
Section: libdevel
-Depends: libace-6.5.11 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.12 (= ${binary:Version}), ${misc:Depends}
Suggests: libace-doc, pkg-config
Replaces: mpc-ace (<< 5.6.3-4)
Description: C++ network programming framework - development files
@@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
This package contains the ACE overview documentation, tutorials,
examples, and information regarding upstream development.
-Package: libace-ssl-6.5.11
+Package: libace-ssl-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,12 +73,12 @@ Description: ACE secure socket layer library
Package: libace-ssl-dev
Architecture: any
Section: libdevel
-Depends: libace-ssl-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
Description: ACE secure socket layer library - development files
This package contains the header files and static library for the ACE
SSL library.
-Package: libace-rmcast-6.5.11
+Package: libace-rmcast-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -92,12 +92,12 @@ Description: ACE reliable multicast library
Package: libace-rmcast-dev
Architecture: any
Section: libdevel
-Depends: libace-rmcast-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE reliable multicast library - development files
This package contains the header files and static library for the ACE
reliable multicast library.
-Package: libace-tmcast-6.5.11
+Package: libace-tmcast-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,12 +111,12 @@ Description: ACE transactional multicast library
Package: libace-tmcast-dev
Architecture: any
Section: libdevel
-Depends: libace-tmcast-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE transactional multicast library - development files
This package contains the header files and static library for the ACE
transactional multicast library.
-Package: libace-htbp-6.5.11
+Package: libace-htbp-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
Package: libace-htbp-dev
Architecture: any
Section: libdevel
-Depends: libace-htbp-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE protocol over HTTP tunneling library - development files
This package contains the header files and static library for the ACE
HTBP library.
-Package: libace-inet-6.5.11
+Package: libace-inet-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -146,15 +146,15 @@ Description: ACE Inet protocol library
Package: libace-inet-dev
Architecture: any
Section: libdevel
-Depends: libace-inet-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE Inet protocol library - development files
This package contains the header files and static library for the ACE
Inet protocol library.
-Package: libace-inet-ssl-6.5.11
+Package: libace-inet-ssl-6.5.12
Architecture: any
Section: libs
-Depends: libace-inet-6.5.11, libace-ssl-6.5.11, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.12, libace-ssl-6.5.12, ${shlibs:Depends}, ${misc:Depends}
Description: ACE SSL-enabled Inet protocol library
This package provides an ACE addon library for clients (and possibly
servers at some point) using Inet protocols which support SSL, such as
@@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
Package: libace-inet-ssl-dev
Architecture: any
Section: libdevel
-Depends: libace-inet-ssl-6.5.11 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.12 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE SSL-enabled Inet protocol library - development files
This package contains the header files and static library for the ACE
SSL-enabled Inet protocol library.
@@ -180,7 +180,7 @@ Description: ACE perfect hash function generator
basically the same options and functionality. ace_gperf simply takes
advantage of some of the features provided by the ACE library.
-Package: libacexml-6.5.11
+Package: libacexml-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -196,12 +196,12 @@ Package: libacexml-dev
Architecture: any
Section: libdevel
Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE SAX based XML parsing library - development files
This package contains the header files and static library for the ACE
XML parsing library.
-Package: libace-xml-utils-6.5.11
+Package: libace-xml-utils-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -215,12 +215,12 @@ Package: libace-xml-utils-dev
Architecture: any
Section: libdevel
Replaces: libace-dev (<< 5.7.7-4)
-Depends: libace-xml-utils-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
Description: ACE XML utility classes and methods - development files
This package contains the header files and static library for the ACE XML
Utils library
-Package: libkokyu-6.5.11
+Package: libkokyu-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library
Package: libkokyu-dev
Architecture: any
Section: libdevel
-Depends: libkokyu-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE scheduling and dispatching library - development files
This package contains the header files and static library for the ACE
scheduling and dispatching library.
-Package: libace-xtreactor-6.5.11
+Package: libace-xtreactor-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt
Package: libace-xtreactor-dev
Architecture: any
Section: libdevel
-Depends: libace-xtreactor-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
Description: ACE-GUI reactor integration for Xt - development files
This package contains header files and static library for the ACE-Xt
reactor integration.
-Package: libace-tkreactor-6.5.11
+Package: libace-tkreactor-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk
Package: libace-tkreactor-dev
Architecture: any
Section: libdevel
-Depends: libace-tkreactor-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
Description: ACE-GUI reactor integration for Tk - development files
This package contains header files and static library for the ACE-Tk
reactor integration.
-Package: libace-flreactor-6.5.11
+Package: libace-flreactor-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK
Package: libace-flreactor-dev
Architecture: any
Section: libdevel
-Depends: libace-flreactor-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.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.11
+Package: libace-foxreactor-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX
Package: libace-foxreactor-dev
Architecture: any
Section: libdevel
-Depends: libace-foxreactor-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
Description: ACE-GUI reactor integration for FOX - development files
This package contains header files and static library for the ACE-FOX
reactor integration.
@@ -343,7 +343,7 @@ Description: ACE network service implementations
files to link the various ACE network services together, either
statically or dynamically, and form complete server programs.
-Package: libnetsvcs-6.5.11
+Package: libnetsvcs-6.5.12
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries
Package: libnetsvcs-dev
Architecture: any
Section: libdevel
-Depends: libnetsvcs-6.5.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE network service implementations - development files
ACE network services provide reusable components for common
distributed system tasks such as logging, naming, locking, and time
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 15e48ca9b72..016f775e646 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,6 +1,6 @@
# Set the version number here.
-%define ACEVER 6.5.11
-%define TAOVER 2.5.11
+%define ACEVER 6.5.12
+%define TAOVER 2.5.12
# Conditional build
# Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_12 b/TAO/ChangeLogs/TAO-2_5_12
new file mode 100644
index 00000000000..39f87a5b5e8
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_12
@@ -0,0 +1,349 @@
+commit 30dc9807c9d6c752e0bc0d528ae2e7c57c53f716
+Merge: d25bf627beb a5bb8cb886e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 6 13:05:15 2020 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit d25bf627bebf25507b2f4c7e3023ec2c1bd0ed7b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 6 13:05:07 2020 +0200
+
+ Use https
+
+ * ACE/docs/ACE-bug-process.html:
+ * ACE/docs/usage-bugzilla.html:
+ * ACE/html/Stats/img.html:
+ * TAO/docs/TAO-metrics.html:
+ * TAO/docs/releasenotes/index.html:
+
+commit 28e4e2fbcd7b9b80ffb295ae469366c198c61d61
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 6 10:42:48 2020 +0200
+
+ Fixed typo and removed blank lines
+
+ * TAO/tests/IDL_Test/README:
+ * TAO/tests/IDL_Test/enum_in_struct.idl:
+ * TAO/tests/IDL_Test/typecode.idl:
+
+commit f54ee35e7280cba29259b321cdaed3e32cec5609
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 6 10:34:48 2020 +0200
+
+ Also use Objects as part of an operation but as a result don't generate Any operations anymore in a separate file
+
+ * TAO/tests/IDL_Test/IDL_Test.mpc:
+ * TAO/tests/IDL_Test/keywords.idl:
+
+commit d1e01360b3348b5df10def429aa4a3f3083efee5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 6 09:53:27 2020 +0200
+
+ Add keyword escaping example and use that also for private/public
+
+ * TAO/tests/IDL_Test/keywords.idl:
+
+commit ae13700f76493361f0c82ac49d87567f9ac18cf9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Oct 5 12:10:20 2020 +0200
+
+ Upgrade to latest doxygen
+
+ * ACE/etc/ace.doxygen:
+ * ACE/etc/ace_inet.doxygen:
+ * ACE/etc/ace_qos.doxygen:
+ * ACE/etc/ace_rmcast.doxygen:
+ * ACE/etc/ace_ssl.doxygen:
+ * ACE/etc/acexml.doxygen:
+ * TAO/etc/tao.doxygen:
+ * TAO/etc/tao_anytypecode.doxygen:
+ * TAO/etc/tao_av.doxygen:
+ * TAO/etc/tao_compression.doxygen:
+ * TAO/etc/tao_cosevent.doxygen:
+ * TAO/etc/tao_cosnaming.doxygen:
+ * TAO/etc/tao_cosnotification.doxygen:
+ * TAO/etc/tao_costime.doxygen:
+ * TAO/etc/tao_costrader.doxygen:
+ * TAO/etc/tao_dynamicany.doxygen:
+ * TAO/etc/tao_dynamicinterface.doxygen:
+ * TAO/etc/tao_esf.doxygen:
+ * TAO/etc/tao_ifr.doxygen:
+ * TAO/etc/tao_implrepo.doxygen:
+ * TAO/etc/tao_iormanip.doxygen:
+ * TAO/etc/tao_iortable.doxygen:
+ * TAO/etc/tao_pi.doxygen:
+ * TAO/etc/tao_pi_server.doxygen:
+ * TAO/etc/tao_portablegroup.doxygen:
+ * TAO/etc/tao_portableserver.doxygen:
+ * TAO/etc/tao_rtcorba.doxygen:
+ * TAO/etc/tao_rtevent.doxygen:
+ * TAO/etc/tao_rtportableserver.doxygen:
+ * TAO/etc/tao_security.doxygen:
+ * TAO/etc/tao_smartproxies.doxygen:
+ * TAO/etc/tao_ssliop.doxygen:
+ * TAO/etc/tao_strategies.doxygen:
+ * TAO/etc/tao_transportcurrent.doxygen:
+ * TAO/etc/tao_ziop.doxygen:
+
+commit 0c65b800b02daee58d9f0187442bf829a3ff0a69
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Oct 2 18:24:09 2020 +0200
+
+ Perl shebang changes
+
+ * TAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl:
+ * TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.pl:
+ * TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_gnuplot.pl:
+ * TAO/tests/Bug_2702_Regression/fakeserver2.pl:
+
+commit ab4ee33c0aa8253f8d6f9ea03840a645f8ac8523
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Oct 2 16:24:16 2020 +0200
+
+ Fixed typo and layout issues
+
+ * TAO/tests/AMH_Exceptions/server.cpp:
+ * TAO/tests/AMH_Oneway/server.cpp:
+ * TAO/tests/AlternateIIOP/README:
+ * TAO/tests/Big_Oneways/README:
+ * TAO/tests/Big_Oneways/Session.h:
+
+commit 6f78b0285ec9a20ccc8c626ff99e5df711a25e18
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Sep 18 08:46:41 2020 +0200
+
+ Remove usage of narrow_from_decl/narrow_from_scope and replace them with dynamic_cast
+
+commit 0eff81cbdb5089fc417afd9aeddf20a626e7512a
+Merge: ad651b66893 3a00d263bcd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Sep 18 08:21:19 2020 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit ad651b668932c63e66cdc4b6a29961059a802edf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Sep 17 19:38:47 2020 +0200
+
+ Reduced indent of bullets in several readme files
+
+commit 7c83db6c282edbe68cd43e5cb7a21d2a121407bc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Sep 17 19:22:35 2020 +0200
+
+ Removed old cidlc comments
+
+ * TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp:
+ * TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp:
+ * TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp:
+ * TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp:
+ * TAO/TAO_IDL/be/be_visitor_component/component_svth.cpp:
+ * TAO/TAO_IDL/be/be_visitor_component/component_svts.cpp:
+ * TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp:
+ * TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp:
+ * TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
+ * TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp:
+ * TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp:
+ * TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp:
+ * TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp:
+ * TAO/TAO_IDL/be_include/be_global.h:
+
+commit 064720271e9e6c629aeba94bcf012bf4c77ebc7e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sun Aug 30 11:11:34 2020 +0200
+
+ Removed unnecessary semicolon after ACE_UNIMPLEMENTED_FUNC
+
+ * TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+
+commit 8154ac1e47daf9cd93dadf61561d854b29f4f574
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Aug 28 16:52:09 2020 +0200
+
+ Const change
+
+ * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp:
+
+commit ad42f8ce4169c55170a5aa6ff87ba7d76dd8ead5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Aug 28 16:51:58 2020 +0200
+
+ Layout change
+
+ * TAO/TAO_IDL/be/be_interface.cpp:
+
+commit e3c786e54c4aab48cf39949f69bc18fc3dee1055
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Aug 28 16:51:47 2020 +0200
+
+ Generate also a private move constructor/assignment and use ACE_UNIMPLEMENTED_FUNC in order to get `= delete` with C++11 and newer
+
+ * TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+
+commit 87008d7060ffffb9ee9c5c264c250dc90e48e1b2
+Merge: ce68efbcbd0 b4840dd0504
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 26 08:24:10 2020 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
+
+commit 2f35a199f9d5c6074e8f6450c3973ea6a10af5ff
+Merge: 9c8bbd22dac 548012c88c8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 26 08:22:22 2020 +0200
+
+ Merge pull request #1214 from jwillemsen/jwi-githubactionwindows
+
+ Replace azure pipelines with github actions for CI testing on Windows
+
+commit e0a6ada7a4296a0abc33cd98ba3e36df03eb9c5b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Aug 25 18:17:15 2020 +0200
+
+ Layout changes
+
+ * TAO/tao/Strategies/SCIOP_Acceptor.h:
+
+commit ec41c7dc9431f851d4b9231f8fb7a1c54054a4cd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Aug 25 15:21:04 2020 +0200
+
+ Const changes and removed some unnessary casts
+
+ * TAO/tao/IIOP_Acceptor.cpp:
+ * TAO/tao/ORB_Core.cpp:
+ * TAO/tao/RTCORBA/RT_ORB_Loader.cpp:
+ * TAO/tao/Strategies/SCIOP_Acceptor.cpp:
+ * TAO/tao/default_resource.cpp:
+ * TAO/tao/default_server.cpp:
+
+commit bda85e4db023e38cf6f314e7c80698be40ee4bce
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Aug 25 14:32:50 2020 +0200
+
+ Use bool for found_a_port
+
+ * TAO/tao/Strategies/SCIOP_Acceptor.cpp:
+
+commit c3c16c78dfec71183de20d1ec95e3cda0aeee557
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 24 17:29:22 2020 +0200
+
+ Fixed typo
+
+ * ACE/ace/Obstack_T.h:
+ * TAO/docs/releasenotes/trader.html:
+ * TAO/orbsvcs/tests/Property/client.cpp:
+ * TAO/orbsvcs/tests/Simple_Naming/README:
+
+commit 69d236085b3493ec61ef3a092b9cfe7585629c66
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat Aug 22 15:37:33 2020 +0200
+
+ Windows only on pull request
+
+ * .github/workflows/windows.yml:
+ * TAO/examples/Simple/Simple_util.h:
+
+commit 2e743e10ceb17abf3eeb02ed74bbe65839fff6b5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat Aug 22 12:55:49 2020 +0200
+
+ Fixed typo in comment
+
+ * TAO/tests/AMI/run_test.pl:
+
+commit c61b0db31cda9725e27e512b8a847651fb7708d0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 20 16:06:33 2020 +0200
+
+ Upgrade doxygen files to latest doxygen version
+
+commit bbe905207b94a34fb3000be67ba9c02e2de6dbd4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 20 15:24:36 2020 +0200
+
+ Layout changes
+
+ * TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp:
+ * TAO/tao/AnyTypeCode/Any_Array_Impl_T.h:
+ * TAO/tao/AnyTypeCode/Any_Special_Impl_T.h:
+ * TAO/tao/AnyTypeCode/Enum_TypeCode.cpp:
+ * TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
+ * TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
+ * TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp:
+ * TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp:
+ * TAO/tao/AnyTypeCode/Union_TypeCode.cpp:
+ * TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp:
+ * TAO/tao/AnyTypeCode/Value_TypeCode.cpp:
+ * TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp:
+ * TAO/tao/AnyTypeCode/append.cpp:
+ * TAO/tao/CORBANAME_Parser.cpp:
+ * TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+ * TAO/tao/CSD_Framework/CSD_POA.cpp:
+ * TAO/tao/Connector_Registry.cpp:
+ * TAO/tao/DynamicAny/DynCommon.cpp:
+ * TAO/tao/DynamicAny/DynStruct_i.cpp:
+ * TAO/tao/DynamicAny/DynUnion_i.cpp:
+ * TAO/tao/DynamicAny/DynValueBox_i.cpp:
+ * TAO/tao/DynamicAny/DynValue_i.cpp:
+ * TAO/tao/RTScheduling/RTScheduler_Initializer.cpp:
+ * TAO/tao/RTScheduling/RTScheduler_Manager.inl:
+ * TAO/tao/RTScheduling/Request_Interceptor.cpp:
+ * TAO/tao/Strategies/COIOP_Profile.h:
+ * TAO/tao/Strategies/SCIOP_Profile.cpp:
+ * TAO/tao/Strategies/SCIOP_Profile.h:
+ * TAO/tao/Strategies/SHMIOP_Profile.cpp:
+ * TAO/tao/Strategies/SHMIOP_Profile.h:
+ * TAO/tao/Strategies/UIOP_Connector.h:
+ * TAO/tao/Transport_Connector.cpp:
+ * TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+
+commit fefa0d5f1850d0f1e633c4182702698ce64f6eb8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 20 14:41:22 2020 +0200
+
+ Layout and true/false changes
+
+ * ACE/ace/INET_Addr.cpp:
+ * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+ * TAO/tao/DynamicInterface/DII_Arguments.cpp:
+ * TAO/tao/DynamicInterface/Server_Request.cpp:
+
+commit 3568c72dc8476bc3a521150fff2e8bb6f193a7d8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Aug 20 12:39:12 2020 +0200
+
+ Layout and docu changes
+
+ * TAO/tao/Object.cpp:
+ * TAO/tao/Service_Callbacks.cpp:
+ * TAO/tao/Service_Callbacks.h:
+
+commit 4a682e2b0a5795e8c5812b7604d366f04f37e60d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Aug 19 11:13:28 2020 +0200
+
+ Removed some empty lines
+
+ * TAO/tao/On_Demand_Fragmentation_Strategy.h:
+
+commit fcdeaf9ba2ff504e3d3f4ac2f9c06657d498b39f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 17 11:05:51 2020 +0200
+
+ Add missing changelogs
+
+commit dbbd86832258985b5cf9533d85738e38df37ee66
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 17 10:14:35 2020 +0200
+
+ Make ACE 6.5.11 and TAO 2.5.11 public available and prepare for next release
+
+ * ACE/bin/copy-local-script.sh:
+ * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+ * ACE/docs/Download.html:
+ * ACE/docs/bczar/bczar.html:
+ * ACE/etc/index.html:
+ * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 6419f40bfbf..fcfe13e826b 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
To: tao-bugs@list.isis.vanderbilt.edu
Subject: [area]: [synopsis]
- TAO VERSION: 2.5.11
- ACE VERSION: 6.5.11
+ TAO VERSION: 2.5.12
+ ACE VERSION: 6.5.12
HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt
index 60ad1c28b6a..de53a1d46af 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.11, released Mon Aug 17 10:04:17 CEST 2020
+This is TAO version 2.5.12, released Tue Oct 27 12:46:14 CET 2020
If you have any problems with or questions about TAO, please send
e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index e3aa3a5cd76..10655235dc0 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,8 +4,8 @@
#define TAO_MAJOR_VERSION 2
#define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 11
-#define TAO_BETA_VERSION 11
-#define TAO_VERSION "2.5.11"
-#define TAO_VERSION_CODE 132363
+#define TAO_MICRO_VERSION 12
+#define TAO_BETA_VERSION 12
+#define TAO_VERSION "2.5.12"
+#define TAO_VERSION_CODE 132364
#define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))