summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLogs/ACE-6_5_10736
-rw-r--r--ACE/PROBLEM-REPORT-FORM2
-rw-r--r--ACE/VERSION.txt2
-rw-r--r--ACE/ace/Version.h9
-rw-r--r--ACE/debian/control62
-rw-r--r--ACE/rpmbuild/ace-tao.spec4
-rw-r--r--TAO/ChangeLogs/TAO-2_5_10579
-rw-r--r--TAO/PROBLEM-REPORT-FORM4
-rw-r--r--TAO/VERSION.txt2
-rw-r--r--TAO/tao/Version.h9
10 files changed, 1361 insertions, 48 deletions
diff --git a/ACE/ChangeLogs/ACE-6_5_10 b/ACE/ChangeLogs/ACE-6_5_10
new file mode 100644
index 00000000000..d2e6f0e66d6
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_10
@@ -0,0 +1,736 @@
+commit f082edff2b464aa48cbf7c4221e04b03a4e4e0fc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 30 08:24:35 2020 +0200
+
+ Revert "Replacing use of ::select in favor of ::poll"
+
+commit c61e51e5d135a2950fba52e7fc55983f2b46ef28
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 29 19:35:48 2020 +0200
+
+ Changed ready flags of ACE::handle_ready from int to bool
+
+ * ACE/ace/ACE.cpp:
+ * ACE/ace/ACE.h:
+ * ACE/ace/ACE.inl:
+ * ACE/ace/Cached_Connect_Strategy_T.cpp:
+ * ACE/ace/SSL/SSL_SOCK_Stream.inl:
+ * ACE/tests/SOCK_Test.cpp:
+
+commit fe244776c888db6c91c7fe56e5bc25c7603ab780
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 29 17:20:02 2020 +0200
+
+ Const change
+
+ * ACE/ace/Cached_Connect_Strategy_T.cpp:
+
+commit 885ffbb0d51c93cec57ff50433ad95e8b79e6a32
+Merge: 7cf3f1283ef 98ab6f28e52
+Author: Steve Huston <shuston@riverace.com>
+Date: Mon Jun 29 08:12:07 2020 -0400
+
+ Merge pull request #1044 from johnjanthony/Replace-select-with-poll-in-SOCK-Connector-and-Acceptor
+
+ Replacing use of ::select in favor of ::poll
+
+commit ef7fc87642a65e385ca9819e7550b708e0a68bb1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 15 19:47:59 2020 +0200
+
+ Layout change
+
+ * ACE/ace/Get_Opt.h:
+
+commit f18c85a3c30f519f7f26689ac5a144ac427b5446
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 15 19:47:51 2020 +0200
+
+ Doxygen change
+
+ * ACE/ace/Functor_T.h:
+
+commit dad285f2c4e0ed6b6f568539cd7b1a07412542bf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 15 19:47:36 2020 +0200
+
+ sys/sysctl.h got deprecated in glibc 2.30, removed in kernel 5.5, so updated version check to use glibc
+
+ * ACE/ace/config-linux-common.h:
+
+commit efac498d689122d0e6246cfe48dd85d0541f5ff4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 15 13:26:14 2020 +0200
+
+ Only include os_sysctl.h when ACE_HAS_SYSCTL has been defined and with linux kernel >= 5.5.0 sys/sysctl.h has been marked deprecated
+
+ * ACE/ace/OS_NS_unistd.cpp:
+ * ACE/ace/config-linux-common.h:
+
+commit a1f0b95dd2a59c385e3f1a74911651fd0c92805c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Jun 10 17:34:57 2020 +0200
+
+ Use ACE_OS_Dirent instead of ACE_OS
+
+ * ACE/ace/Dirent_Selector.h:
+
+commit adb4749455ef87e39e9629d6dbe0026c074dbe08
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Jun 10 17:33:22 2020 +0200
+
+ Use ACE_OS instead of ACE_OS_Memory
+
+ * ACE/tests/ARGV_Test.cpp:
+
+commit 27e4f2f6b65a17333a930c844c80409b072b821d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Jun 10 17:32:28 2020 +0200
+
+ Use ACE_OS instead of ACE_OS_String
+
+ * ACE/ace/OS_NS_time.inl:
+ * ACE/examples/APG/Config/ARGV_Example.cpp:
+ * ACE/examples/APG/Config/Get_Opt.cpp:
+ * ACE/examples/APG/Config/Get_Opt_Long.cpp:
+ * ACE/tests/ARGV_Test.cpp:
+ * TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp:
+ * TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp:
+ * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp:
+ * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp:
+ * TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp:
+ * TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp:
+ * TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp:
+ * TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp:
+ * TAO/tests/Bug_3941_Regression/test.cpp:
+
+commit 02af73cfc64c1dcf73dd907b25fcd67b80b88203
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Jun 10 16:59:49 2020 +0200
+
+ Use ACE_OS::strcmp instead of ACE_OS_String::strcmp
+
+ * ACE/tests/Message_Queue_Test.cpp:
+ * TAO/docs/ec_options.html:
+ * TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
+ * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h:
+ * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h:
+ * TAO/orbsvcs/orbsvcs/HTIOP/README.txt:
+ * TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp:
+ * TAO/tao/Connection_Purging_Strategy.h:
+ * TAO/tao/GIOP_Message_Base.cpp:
+ * TAO/tao/Invocation_Retry_Params.cpp:
+ * TAO/tao/Invocation_Retry_State.cpp:
+ * TAO/tao/Invocation_Retry_State.h:
+ * TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h:
+ * TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h:
+ * TAO/tao/Synch_Invocation.cpp:
+ * TAO/tao/Transport_Cache_Manager_T.cpp:
+ * TAO/tao/Transport_Cache_Manager_T.h:
+ * TAO/tests/Bug_1495_Regression/server_interceptor.cpp:
+ * TAO/tests/DII_AMI_Forward/server_interceptor.cpp:
+ * TAO/tests/ForwardOnceUponException/README:
+ * TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp:
+ * TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp:
+ * TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp:
+ * TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp:
+
+commit 328c87c87e1e4f29561cfcd182c328377ef81a16
+Merge: 5650c5ce9e2 a4dc39467c6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 9 16:03:19 2020 +0200
+
+ Merge pull request #1136 from jwillemsen/jwi-azureubuntu
+
+ Move some jobs to ubuntu 20.04
+
+commit 3aef14966f96bddba2ef9c4e25d435a08bce3f8a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 9 13:19:03 2020 +0200
+
+ Fixed typo in comment
+
+ * ACE/ace/OS_NS_macros.h:
+
+commit 5650c5ce9e20862e78087ca818427366669dff67
+Merge: 79af351e070 58e6d4cd1e7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat Jun 6 14:59:15 2020 +0200
+
+ Merge pull request #1081 from likema/remove-unnecessary-init
+
+ Remove unnecessary ACE_Select_Reactor_Handler_Repository ctor init parameter.
+
+commit 52d35023a4f6c76abab966de1dfa683d8d7fdb3b
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Mon Jun 1 20:33:20 2020 -0500
+
+ Update .gitignore files
+
+ After building TAO tests for
+ https://github.com/DOCGroup/ACE_TAO/pull/1132 I was left with a lot of
+ untracked files. I used
+ https://github.com/objectcomputing/OpenDDS/blob/e1b3c99f74e73a537083e790f3bf9fb9ee6ed8b9/tools/scripts/update_gitignore.pl
+ to create and update `.gitignore` files. I made sure I wasn't creating
+ any directories just containing a `.gitignore` file, except for
+ `ACE/apps/gperf/tests/iout2_gen`. It had a placeholder file called
+ `.empty` which I deleted because the `.gitignore` can serve the same
+ purpose.
+
+commit 3da2954d3b6d2df3ab709b980da39c70e106e17b
+Merge: 57a75e55497 ca31d936b69
+Author: Steve Huston <shuston@riverace.com>
+Date: Sat May 30 11:56:15 2020 -0400
+
+ Merge pull request #1129 from DOCGroup/riverace-case-2186
+
+ Do not invoke a method on pointer returned from remove() without chec…
+
+commit 66d6dee67bfba03438bcf396edaf0277d24a8964
+Merge: 386ca8fb87a 6e165d5d0fd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat May 30 09:02:33 2020 +0200
+
+ Merge pull request #1124 from jwillemsen/jwi-emb-hascppdefines
+
+ Set ACE_HAS_CPP11|14|17|20 based on __cplusplus for clang embarcadero
+
+commit 386ca8fb87a1cf0093548ed4f9b12c07b2094027
+Merge: c1bce79510b b3254a06251
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat May 30 09:02:07 2020 +0200
+
+ Merge pull request #1123 from jwillemsen/jwi-autoptr-cpp17
+
+ With CPP17 or newer provide our auto_ptr implementation to not break …
+
+commit ca31d936b698d3e6e318668ac55f77f70f6d81c3
+Author: Steve Huston <shuston@riverace.com>
+Date: Fri May 29 22:05:47 2020 +0000
+
+ Do not invoke a method on pointer returned from remove() without checking it
+
+commit c1bce79510b3afaef44dfe1465fd22e77b72b45f
+Merge: 8d4781b498d 685eb73bc7e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 29 19:43:46 2020 +0200
+
+ Merge pull request #1128 from jwillemsen/jwi-usetabs
+
+ We need to use tabs in GNU make rules
+
+commit b3254a062511de65208e93700757b32d2ad2558e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 29 19:41:09 2020 +0200
+
+ Add include of memory in case we have C++17
+
+ * ACE/ace/Auto_Ptr.h:
+
+commit 685eb73bc7e72491329cea82c4381d85735cd39b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 29 14:23:33 2020 +0200
+
+ We need to use tabs in GNU make rules
+
+commit 376cc6429f8b5e44f2f1a6d95e5f5bf9db08ffc2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 27 16:50:52 2020 +0200
+
+ Removed empty line
+
+ * ACE/ace/Auto_Ptr.h:
+
+commit 90a0ee705399ddf51ddb9c68fe57b9ad78b20619
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 27 11:21:16 2020 +0200
+
+ With CPP17 or newer provide our auto_ptr implementation to not break all ACE/TAO tests
+
+commit 6e165d5d0fd299365cc931f9da4aee185f4a1b6e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 27 11:20:01 2020 +0200
+
+ Set ACE_HAS_CPP11|14|17|20 based on __cplusplus for clang
+
+commit baa8faa56bfbcc0468e3c787d0ef7daf680d0dad
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 27 09:04:00 2020 +0200
+
+ Don't enable C++11 support for ACE, causes all kinds of compile problems :-(
+
+ * ACE/ace/config-win32-borland.h:
+
+commit 70220ed436a20dad8d2cdcc4d39d4faa4e5819aa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 27 08:21:55 2020 +0200
+
+ Add support for Embarcadero C++ Builder 10.4 Sydney
+
+ * ACE/NEWS:
+ * ACE/ace/Compression/rle/RLECompressor.cpp:
+ * ACE/ace/OS_NS_Thread.cpp:
+ * ACE/ace/config-win32-borland.h:
+ * ACE/ace/os_include/net/os_if.h:
+ * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp:
+ * TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h:
+ * TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h:
+ * TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
+ * TAO/tests/Bug_3574_Regression/test.cpp:
+
+commit 0a50ebb1c91efb70a4d7de65eac68aca22f1485a
+Merge: 71ad93429ff 4d603bcaa03
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 20 13:47:50 2020 +0200
+
+ Merge pull request #1119 from jwillemsen/jwi-msvcwarnings
+
+ Fix some msvc level 4 warnings
+
+commit 4d603bcaa034c0ee27c12eae4b53ac62a3e139ee
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 20 09:54:51 2020 +0200
+
+ Removed const again, variable is changed
+
+ * ACE/ace/OS_NS_stropts.cpp:
+
+commit a9f9d42feadc888d2d32279283c7ef0a78f3d7a7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 20 08:56:20 2020 +0200
+
+ Removed empty lines
+
+ * ACE/ace/QoS/README:
+
+commit 2faa23271fdb2fb44a6939dd44c69fb7a4b3adfb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 20 08:56:10 2020 +0200
+
+ Reduced scope variables
+
+ * ACE/ace/OS_NS_stropts.cpp:
+
+commit 85aa3ddc28da8c2037ec28a3c04c300f4e3c4ddf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 20 08:55:55 2020 +0200
+
+ Removed hidden variables
+
+ * ACE/ace/Configuration_Import_Export.cpp:
+
+commit 71ad93429ff7f99dc50419da5f0cbac9b6af752d
+Merge: b1c483ba83f a72b0d6da47
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Mon May 18 15:45:25 2020 -0500
+
+ Merge pull request #1116 from jonesc-oci/android-win-host-line-too-long
+
+ Modify Android link on Windows hosts to avoid error
+
+commit a72b0d6da47b8ce94d4772601e4a83f00f0394c9
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date: Mon May 18 12:19:31 2020 -0500
+
+ Update Android link on Windows hosts to avoid err.
+
+ Replace echo/$foreach logic with $file function which avoids
+ potential tmpfile truncation. Make tmpfile name unique.
+
+commit 134f0d30fdea43c4c733fd5f8102cf819313ee00
+Merge: ac954bfe407 9d89f20fc84
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon May 18 15:53:56 2020 +0200
+
+ Merge pull request #1114 from jwillemsen/jwi-msvc2019-2
+
+ Code changes to workaround the Visual Studio 2019 crash, instead of d…
+
+commit 9d89f20fc8444914dc43d9963ab88199819b5872
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon May 18 15:41:05 2020 +0200
+
+ Fixed typo in documentation
+
+ * ACE/ace/Object_Manager.h:
+
+commit 3eefc82b3e44164b0caf46c177c03dae1a84f122
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon May 18 15:40:50 2020 +0200
+
+ Layout change
+
+ * ACE/ace/Process_Manager.cpp:
+
+commit 4ec31a69d924ed1dfa44d4536be7dfdac91de868
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat May 16 09:47:49 2020 +0200
+
+ Reworked msvc2019 patch
+
+ * ACE/ace/Process_Manager.cpp:
+
+commit 54220d34e730c9f46167a4a3c5ff779c69c60385
+Merge: d9c8b8024e6 72fe6a224c3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat May 16 09:42:39 2020 +0200
+
+ Merge branch 'master' into jwi-msvc2019-2
+
+commit ac954bfe407f5bec55302a155b9ba5c195a832a3
+Merge: 8b09cdd41d7 2ec0cf26658
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Fri May 15 17:04:30 2020 -0500
+
+ Merge pull request #1101 from jonesc-oci/android-if_nameindex
+
+ Define ACE_LACKS_IF_NAMEINDEX for Android APIs < 24
+
+commit 8b09cdd41d73fc599e736d5d04b2e9066588b9fa
+Merge: c4d6cb02b46 8279c807d71
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 15 20:30:59 2020 +0200
+
+ Merge pull request #1097 from okellogg/master
+
+ Fixes for ACE/bin/ace-install
+
+commit 72fe6a224c32f648de14795dd80a79b06771a183
+Merge: 70a709c0eee c4d6cb02b46
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 15 20:29:06 2020 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
+
+commit 70a709c0eee50e73e049ec8c54df2e1c0270429f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 15 20:28:59 2020 +0200
+
+ Layout changes
+
+ * ACE/ace/SSL/SSL_SOCK_Stream.cpp:
+ * ACE/ace/SSL/SSL_SOCK_Stream.inl:
+
+commit e257dff6722872b25660c8b4fe69d946c0b10626
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date: Fri May 15 10:32:50 2020 -0500
+
+ Modify Android link on Windows hosts to avoid err.
+
+ Modify the Android link step on Windows hosts to avoid
+ a 'command line too long' error when linking a large
+ number of object files.
+
+commit a6374afe74fd0ceb059407571e3051125d6f14f7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 15 16:21:09 2020 +0200
+
+ Layout and doxygen changes
+
+ * ACE/ace/SSL/SSL_Asynch_Stream.h:
+ * ACE/ace/SSL/SSL_SOCK.h:
+ * ACE/ace/SSL/SSL_SOCK_Acceptor.cpp:
+ * ACE/ace/SSL/SSL_SOCK_Acceptor.h:
+ * ACE/ace/SSL/SSL_SOCK_Connector.h:
+ * ACE/ace/SSL/SSL_SOCK_Stream.h:
+
+commit d9c8b8024e6c9a6be6f5081fd4b49faff9484a6a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 15 09:00:55 2020 +0100
+
+ Code changes to workaround the Visual Studio 2019 crash, instead of deferencing the instance point just take the typeid of ACE_Process_Manager directly
+
+commit 2ec0cf266583ffeefd588fd85d93c88158cbf906
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date: Thu May 14 11:55:58 2020 -0500
+
+ NDK standalone toolchains < 15 lack if_nameindex.
+
+commit 6a633b1ba8c0fbe423cf1d993fbfa2d7a338acf3
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date: Thu May 14 11:49:35 2020 -0500
+
+ Simplify Win32/Android 'if_nameindex' conditional.
+
+commit 6302da798fda1efb043fca59ab201b31938ed298
+Merge: eeb1288ab4e 58be69d5e40
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu May 14 12:34:02 2020 +0200
+
+ Merge pull request #1113 from jwillemsen/jwi-sslimprov
+
+ Minor ACE SSL related changes
+
+commit 58be69d5e403512f57fe5812b9c934af3926695e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu May 14 11:05:37 2020 +0200
+
+ Doxygen changes
+
+ * ACE/ace/SSL/SSL_SOCK_Stream.h:
+
+commit 2d366e54e7a507b6b3dfa4c3c8bc29f55e62785e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu May 14 10:01:29 2020 +0200
+
+ Layout, const, logging, doxygen changes
+
+ * ACE/ace/SSL/SSL_Asynch_Stream.cpp:
+ * ACE/ace/SSL/SSL_Context.cpp:
+ * ACE/examples/IPC_SAP/SSL_SAP/README:
+ * ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h:
+ * ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h:
+ * ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp:
+ * ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp:
+ * ACE/tests/SSL/Bug_2912_Regression_Test.cpp:
+ * ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp:
+ * ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h:
+ * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp:
+
+commit 5c8267be775feee34018e9a219d3850a783a5c18
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date: Wed May 13 15:47:33 2020 -0500
+
+ Android NDKs<14.1 lack struct if_nameindex.
+
+ Android NDKs 12 and 13 lack a 'struct if_nameindex'
+ definition even though they support API 24.
+
+commit db73931499290bc5fb46ceff47e47e5be3601be7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 13 12:20:15 2020 +0200
+
+ Removed Compiler_Features_08_Test from this mpc file, it is not in git anymore
+
+ * ACE/tests/tests.mpc:
+
+commit db3c5ecbc94edb3feca008433aeeb34f9c289b2d
+Merge: ea574b9e547 0eb41eafb62
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue May 12 12:35:28 2020 +0200
+
+ Merge pull request #1092 from jwillemsen/jwi-basictypes2
+
+ Header change
+
+commit 0eb41eafb625f6ea1305c8a94cbd3883f7f3d51f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue May 12 12:34:36 2020 +0200
+
+ Removed include
+
+ * ACE/ace/Basic_Types.h:
+
+commit 1d8f885f09f7e1dfd87385ecf9e6518feab77c69
+Merge: 9e6da1ce728 09935108c63
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue May 12 12:33:58 2020 +0200
+
+ Fixed merge
+
+commit 5c36116562e9254bb9a53e90a119eabeed83f97d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue May 12 09:21:15 2020 +0200
+
+ Add missing include for std::bad_cast
+
+ * ACE/tests/Compiler_Features_13_Test.cpp:
+
+commit fe23892b353096105c98c43a68a2480d8fba9b72
+Merge: 6747a42958f e10bc3417cd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon May 11 19:06:33 2020 +0200
+
+ Merge branch 'master' into jwi-badcast
+
+commit 8279c807d71456ebcfc1da64fa92a60d2bb98997
+Merge: 0be94abdd67 0a6165f4f81
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date: Mon May 11 17:46:08 2020 +0200
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit 6747a42958f938531aa6886b381cc6c6bec1c0da
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon May 11 11:44:12 2020 +0200
+
+ An incorrect dynamic_cast should throw std::bad_cast which is derived from std::exception, let us test that we get std::bad_cast
+
+ * ACE/tests/Compiler_Features_13_Test.cpp:
+
+commit 30f134dbf5eab3550c40c9667f659dc55f97b1d4
+Merge: ea0cd275457 3a5803f18c1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat May 9 09:38:23 2020 +0200
+
+ Merge pull request #1105 from jwillemsen/jwi-processenvtest
+
+ On Windows vista or newer there is a limit of 32767 per environment variable
+
+commit ea0cd275457e067cae0ab833d5821fd6496855f5
+Merge: af0e3e558c3 84f362508aa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 8 15:58:59 2020 +0200
+
+ Merge pull request #1104 from jwillemsen/jwi-ctrlhandlersignature
+
+ Updated CtrlHandle signature to match other use cases to resolve some warnings
+
+commit 3a5803f18c1211185d19646ab23283373d30b199
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 8 12:04:54 2020 +0200
+
+ Updated version check
+
+ * ACE/tests/Process_Env_Test.cpp:
+
+commit 31fcc77d69a91783f0582baf3bd86504f2b39b12
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 8 12:02:26 2020 +0200
+
+ Windows Vista or newer allow 32767 per environment variable with CreateProcess
+
+ * ACE/tests/Process_Env_Test.cpp:
+
+commit ae3cc2cd581bdeda5024822406c793b08c97af1b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 8 11:00:45 2020 +0200
+
+ Updated CtrlHandle signature to match other use cases to resolve some warnings with some compilers
+
+ * ACE/tests/Network_Adapters_Test.cpp:
+
+commit effe8611c980c7065f950829fd5168404b4b15f0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 8 10:27:24 2020 +0200
+
+ Removed commented out code, small const change
+
+ * ACE/ace/OS_NS_Thread.cpp:
+
+commit 1d14886e4d98b3e39e9a3b0500cf69bc98f995c2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu May 7 18:25:08 2020 +0200
+
+ Also list strawberry perl
+
+ * ACE/ACE-INSTALL.html:
+
+commit 2d36a8c008d8c648421acb7eb04539a3eaa49eeb
+Author: Chip Jones <51006990+jonesc-oci@users.noreply.github.com>
+Date: Thu May 7 09:11:34 2020 -0500
+
+ Also check NDK revision
+
+ Co-authored-by: Fred Hornsey <hornseyf@objectcomputing.com>
+
+commit 289a4a8e0006f7a20e8de568334f74ba74f7a4bf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu May 7 14:19:46 2020 +0200
+
+ Update various links, point to github issues
+
+ * ACE/COPYING:
+ * ACE/PROBLEM-REPORT-FORM:
+ * ACE/README:
+ * TAO/PROBLEM-REPORT-FORM:
+
+commit 5564c9667dc17bc7826e54efe7dae79334218a03
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu May 7 14:14:22 2020 +0200
+
+ Update various hyperlinks
+
+ * ACE/ACE-INSTALL.html:
+ * ACE/COPYING:
+ * ACE/ace/Object_Manager.cpp:
+ * TAO/TAO-INSTALL.html:
+
+commit 0be94abdd67febd5cd440a5264f6c4ac93398c48
+Merge: 393910a1ddc 7c298ab6902
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date: Thu May 7 00:43:36 2020 +0200
+
+ Merge remote-tracking branch 'upstream/master'
+
+commit 83371870f4743b616410a48e797756887b5a5404
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date: Wed May 6 16:07:11 2020 -0500
+
+ ACE_LACKS_IF_NAMEINDEX for Android APIs < 24
+
+commit 6dd70b41c47a097dfa2d6d3de62b3d06aa801d54
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 6 11:19:13 2020 +0200
+
+ Upgrade to CIAO 1.3.9 and DAnCE 1.3.9
+
+ * ACE/docs/Download.html:
+
+commit 393910a1ddcb4169d3c7326ba5c7522d72f5824c
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date: Wed May 6 07:20:04 2020 +0200
+
+ ACE/bin/ace-install
+ - On FIND runs for copying TAO libs and for copying ACE libs, replace
+ exclusions by union of patterns "lib?*.so*", "lib?*.a", "lib?*.dll",
+ "*.dylib".
+ - On copying ACE executables change ACE_PROGS to
+ apps/gperf/src/ace_gperf.
+ - Address some findings of checkstyle.
+
+commit dc92e73096bfd073dad31e2cf5d60ae3dbdf66ee
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 1 10:28:14 2020 +0200
+
+ Make x.5.9 public and prepare for next release
+
+ * ACE/NEWS:
+ * ACE/bin/copy-local-script.sh:
+ * 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:
+
+commit 3d454e61d150aff4a5260791f856657e86be89f1
+Merge: fc48dfcd2c4 57e38a7b4a4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Apr 28 16:17:51 2020 +0200
+
+ Merge branch 'master' into jwi-basictypes2
+
+commit fc48dfcd2c41720eecd202f7fbaf4a73657a7819
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Apr 2 11:32:38 2020 +0200
+
+ When we have C++11 support make use of the C++ (u)intxx_t types
+
+ * ACE/ace/Basic_Types.h:
+
+commit 58e6d4cd1e7ba55f3d7541df776a3fd94cf13bb6
+Author: Like Ma <likemartinma@gmail.com>
+Date: Sun Apr 12 02:38:47 2020 +0800
+
+ Remove unnecessary ACE_Select_Reactor_Handler_Repository ctor init parameter.
+
+commit 98ab6f28e5230f5561182c9914801d6d3a83b2bd
+Author: John Anthony <john.anthony@redpointglobal.com>
+Date: Wed Mar 25 11:06:24 2020 -0600
+
+ removing trailing spaces
+
+commit 26eb8172a683665ac3dd17d9f2eade14927dffb9
+Author: John Anthony <john.anthony@redpointglobal.com>
+Date: Tue Mar 24 16:18:14 2020 -0600
+
+ removing tabs
+
+commit 4da3933c12416d6083309d950525b7215ad9ea64
+Author: John Anthony <john.anthony@redpointglobal.com>
+Date: Fri Feb 21 13:39:55 2020 -0700
+
+ replacing use of select for poll
+
+ Replacing use of ::select() with ::poll() in SSL_SOCK_Connector and SSL_SOCK_Acceptor - on systems that support ::poll()
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index c97905e5e29..7a6ba05c9e3 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.9
+ ACE VERSION: 6.5.10
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 49b343637f3..b37ee3db011 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 6.5.9, released Fri May 01 09:57:51 CEST 2020
+This is ACE version 6.5.10, released Wed Jul 01 09:54:36 CEST 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 289c71e5b64..738fd175103 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,9 +4,8 @@
#define ACE_MAJOR_VERSION 6
#define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 9
-#define ACE_BETA_VERSION 9
-#define ACE_VERSION "6.5.9"
-#define ACE_VERSION_CODE 394505
+#define ACE_MICRO_VERSION 10
+#define ACE_BETA_VERSION 10
+#define ACE_VERSION "6.5.10"
+#define ACE_VERSION_CODE 394506
#define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-
diff --git a/ACE/debian/control b/ACE/debian/control
index 2a7347d9b84..d991d20f7e4 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.9
+Package: libace-6.5.10
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.9 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.10 (= ${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.9
+Package: libace-ssl-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.10 (= ${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.9
+Package: libace-rmcast-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.10 (= ${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.9
+Package: libace-tmcast-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.10 (= ${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.9
+Package: libace-htbp-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.10 (= ${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.9
+Package: libace-inet-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.10 (= ${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.9
+Package: libace-inet-ssl-6.5.10
Architecture: any
Section: libs
-Depends: libace-inet-6.5.9, libace-ssl-6.5.9, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.10, libace-ssl-6.5.10, ${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.9 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.10 (= ${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.9
+Package: libacexml-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.10 (= ${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.9
+Package: libace-xml-utils-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.10 (= ${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.9
+Package: libkokyu-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.10 (= ${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.9
+Package: libace-xtreactor-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.10 (= ${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.9
+Package: libace-tkreactor-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.10 (= ${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.9
+Package: libace-flreactor-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.10 (= ${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.9
+Package: libace-foxreactor-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.10 (= ${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.9
+Package: libnetsvcs-6.5.10
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.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.10 (= ${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 c745532a186..0c434a5d671 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.9
-%define TAOVER 2.5.9
+%define ACEVER 6.5.10
+%define TAOVER 2.5.10
# Conditional build
# Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_10 b/TAO/ChangeLogs/TAO-2_5_10
new file mode 100644
index 00000000000..cb936130482
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_10
@@ -0,0 +1,579 @@
+commit 7cf3f1283ef8a4901d8962e7f951ada8252288ce
+Merge: ae6be536342 869843c1dcf
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Tue Jun 16 12:53:07 2020 -0500
+
+ Merge pull request #1141 from mitza-oci/master
+
+ tao_idl: only write "processing <filename>" to stderr in verbose mode
+
+commit 0bbb85f28b5f78a978767cc115e4f94cebd90e2a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 15 16:26:29 2020 +0200
+
+ With C++11 define a default assignment operator to get rid of C++11 warnings lacking it
+
+ * TAO/tao/CDR.h:
+
+commit 869843c1dcf946e383968d7d33b3451410918582
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Sun Jun 14 18:16:10 2020 -0500
+
+ tao_idl: only write "processing <filename>" to stderr in verbose mode
+
+commit 6903c62313a4160d09d91999f6f424f3925dfa11
+Merge: c3907f7aa62 a3d5544c8fa
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri Jun 12 14:42:53 2020 -0500
+
+ Merge pull request #1135 from iguessthislldo/igtd/anon_types
+
+ Anonymous Types in IDL4
+
+commit a3d5544c8fa6734e8cb57f48a15d39a57488f4aa
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Thu Jun 11 16:31:16 2020 -0500
+
+ Change Anonymous Type Messages
+
+commit 5dd2f8932d5ad7180790ff54e439fcaa3ba8109c
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Thu Jun 11 16:27:37 2020 -0500
+
+ Simplify Calls to anonymous_type_diagnostic
+
+commit bbe0215c83303c5001587e9736e592df5354ab0f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Jun 11 13:17:54 2020 +0200
+
+ Tab/newline cleanup
+
+ * TAO/examples/CSD_Strategy/ThreadPool5/README:
+ * TAO/tests/Big_Twoways/README:
+
+commit 27e4f2f6b65a17333a930c844c80409b072b821d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Jun 10 17:32:28 2020 +0200
+
+ Use ACE_OS instead of ACE_OS_String
+
+ * ACE/ace/OS_NS_time.inl:
+ * ACE/examples/APG/Config/ARGV_Example.cpp:
+ * ACE/examples/APG/Config/Get_Opt.cpp:
+ * ACE/examples/APG/Config/Get_Opt_Long.cpp:
+ * ACE/tests/ARGV_Test.cpp:
+ * TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp:
+ * TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp:
+ * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp:
+ * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp:
+ * TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp:
+ * TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp:
+ * TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp:
+ * TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp:
+ * TAO/tests/Bug_3941_Regression/test.cpp:
+
+commit 02af73cfc64c1dcf73dd907b25fcd67b80b88203
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Jun 10 16:59:49 2020 +0200
+
+ Use ACE_OS::strcmp instead of ACE_OS_String::strcmp
+
+ * ACE/tests/Message_Queue_Test.cpp:
+ * TAO/docs/ec_options.html:
+ * TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
+ * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h:
+ * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h:
+ * TAO/orbsvcs/orbsvcs/HTIOP/README.txt:
+ * TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp:
+ * TAO/tao/Connection_Purging_Strategy.h:
+ * TAO/tao/GIOP_Message_Base.cpp:
+ * TAO/tao/Invocation_Retry_Params.cpp:
+ * TAO/tao/Invocation_Retry_State.cpp:
+ * TAO/tao/Invocation_Retry_State.h:
+ * TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h:
+ * TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h:
+ * TAO/tao/Synch_Invocation.cpp:
+ * TAO/tao/Transport_Cache_Manager_T.cpp:
+ * TAO/tao/Transport_Cache_Manager_T.h:
+ * TAO/tests/Bug_1495_Regression/server_interceptor.cpp:
+ * TAO/tests/DII_AMI_Forward/server_interceptor.cpp:
+ * TAO/tests/ForwardOnceUponException/README:
+ * TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp:
+ * TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp:
+ * TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp:
+ * TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp:
+
+commit ff725437a997295f0372195cacd04997030381c1
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Wed Jun 10 02:02:11 2020 -0500
+
+ TAO IDL FE: override for IDL4 anon_type_diagnostic
+
+ To allow incompatible backends to avoid having to deal with anonymous
+ types when using IDL4.
+
+commit ebe174f375fb53c4584f3e7e7b212d28771afb78
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 9 16:56:09 2020 +0200
+
+ Simplify matrix
+
+ * .github/workflows/linux.yml:
+ * TAO/tao/Invocation_Retry_State.cpp:
+ * TAO/tao/Invocation_Retry_State.h:
+
+commit 328c87c87e1e4f29561cfcd182c328377ef81a16
+Merge: 5650c5ce9e2 a4dc39467c6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 9 16:03:19 2020 +0200
+
+ Merge pull request #1136 from jwillemsen/jwi-azureubuntu
+
+ Move some jobs to ubuntu 20.04
+
+commit a4dc39467c66fdae4e3b6698558108b36492526b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 9 13:19:10 2020 +0200
+
+ Zap empty lines
+
+ * TAO/tao/params.h:
+
+commit 757eb4f5a158b60c233062fa0a8543ffaaced513
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri Jun 5 12:02:36 2020 -0500
+
+ Respond to Review in #1135
+
+commit 4e92865d520dac46061275197f150ea75f99219f
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri Jun 5 11:27:25 2020 -0500
+
+ Update TAO/NEWS
+
+commit bc148a36212a9067ade114a89a5c75eae503823e
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri Jun 5 11:24:37 2020 -0500
+
+ IDL4 Anonymous Types Test
+
+commit b8840569730c83f4d229b4c285c95a206af98746
+Merge: 6778610a144 79af351e070
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri Jun 5 10:37:07 2020 -0500
+
+ Merge remote-tracking branch 'upstream/master' into igtd/anon_types
+
+commit 79af351e070d97d0637c85a22cded9a0b3db256f
+Merge: 051f13e0387 a77543d720d
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Thu Jun 4 14:34:52 2020 -0500
+
+ Merge pull request #1134 from iguessthislldo/igtd/valuetype_annotations
+
+ More Fixes for #1125
+
+commit 051f13e038731cf3188194ca75c8b315e820a7f5
+Merge: 154c43538b1 52d35023a4f
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Thu Jun 4 14:34:31 2020 -0500
+
+ Merge pull request #1133 from iguessthislldo/igtd/gitignores
+
+ Update .gitignore Files for TAO Tests
+
+commit a77543d720d7c48dc113859af741b05b950e5839
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Wed Jun 3 15:52:47 2020 -0500
+
+ More Fixes for #1125
+
+ More Fixes for https://github.com/DOCGroup/ACE_TAO/pull/1125
+
+ Fixed using wrong prointer for add to scope in
+ https://github.com/DOCGroup/ACE_TAO/pull/1132 for interfaces, now doing
+ that for eventtype and component. See:
+ https://github.com/DOCGroup/ACE_TAO/pull/1125#discussion_r434675138
+
+commit 154c43538b1f9993afdf4cfae39e81c9b1b990ad
+Merge: 65f122d51c2 69b8c2c0323
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Mon Jun 1 22:35:54 2020 -0500
+
+ Merge pull request #1132 from iguessthislldo/igtd/valuetype_annotations
+
+ Fixes for #1125
+
+commit 52d35023a4f6c76abab966de1dfa683d8d7fdb3b
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Mon Jun 1 20:33:20 2020 -0500
+
+ Update .gitignore files
+
+ After building TAO tests for
+ https://github.com/DOCGroup/ACE_TAO/pull/1132 I was left with a lot of
+ untracked files. I used
+ https://github.com/objectcomputing/OpenDDS/blob/e1b3c99f74e73a537083e790f3bf9fb9ee6ed8b9/tools/scripts/update_gitignore.pl
+ to create and update `.gitignore` files. I made sure I wasn't creating
+ any directories just containing a `.gitignore` file, except for
+ `ACE/apps/gperf/tests/iout2_gen`. It had a placeholder file called
+ `.empty` which I deleted because the `.gitignore` can serve the same
+ purpose.
+
+commit 69b8c2c03238fb4f3ad2ff354216b0f525d50b34
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Mon Jun 1 19:55:52 2020 -0500
+
+ Fixes for #1125
+
+ Fixes for https://github.com/DOCGroup/ACE_TAO/pull/1125
+
+ - `TAO_IDL/fe.ypp`
+ - Fixed using wrong pointer in grammar.
+ - Other minor tweaks.
+ - `tests/IDLv4/annotations`
+ - Fixed preprocessor usage that some compilers don't like.
+ - Fixed passing `std::string` as a `const char*`.
+ - Rewrote IDL output function to try to be more flexible.
+
+commit d9c3c14887d38f7d23391ff1dcc0c3b2eb4ae8a5
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date: Sun May 31 21:30:35 2020 +0200
+
+ Change TAO/tests/IDLv4/TestIDLv4.idl into valid IDLv4:
+
+ - Hoist constant `dub` from struct Annotated1.
+ - At Annotated1 member `k` fix annotation parameter.
+
+commit 57a75e554972de820ab00faae93e08150b22a743
+Merge: 66d6dee67bf 3021f30998f
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Sat May 30 08:30:28 2020 -0500
+
+ Merge pull request #1125 from iguessthislldo/igtd/valuetype_annotations
+
+ Extend Annotation Support
+
+commit 3021f30998f4db0721536083343cf2e46c41242c
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri May 29 20:40:02 2020 -0500
+
+ Tweak TAO_IDL/docs/annotations.md
+
+commit 564ef3667aa188404f050d77f0841e36da42cedf
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri May 29 18:20:06 2020 -0500
+
+ Update TAO/NEWS
+
+commit 8a7521d685021bb160ba2ebb57e77f598bcd678c
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri May 29 18:16:28 2020 -0500
+
+ TAO IDL FE: Respond to Review in #1125
+
+commit 8d4781b498d1ad34c77370a5b87eb94ce3a8c591
+Merge: e442b9ed709 30fc9304b56
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 29 19:43:08 2020 +0200
+
+ Merge pull request #1127 from jwillemsen/jwi-costradingregen
+
+ Regenerated with latest byacc
+
+commit e442b9ed709cea1e445b7d42b742791a113dbe48
+Merge: adced9754c8 81d3fc44021
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 29 19:42:45 2020 +0200
+
+ Merge pull request #1121 from jwillemsen/jwi-emb-104-sydney
+
+ Add support for Embarcadero C++ Builder 10.4 Sydney
+
+commit 6778610a1441288247e5575346cce16f5daead60
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri May 29 12:19:43 2020 -0500
+
+ TAO IDL FE: Use Existing Anon Type Feature in IDL4
+
+ This just uses the existing IDL2 support to enable using them in IDL4,
+ but it's not know how good that support is. At the very least a new test
+ will have to be made in tests/IDLv4.
+
+commit 30fc9304b5660c907e333a18d7e2a5d2b8b59151
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 29 14:05:37 2020 +0200
+
+ Regenerated with latest byacc
+
+ * TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h:
+ * TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+
+commit 6d9405d60949f8761f11f3f83ef4eded2e3f74d1
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri May 29 01:37:59 2020 -0500
+
+ Update TAO/NEWS
+
+commit ce1f7689e0dce79c15c1fd848424e88a923ff1a5
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Fri May 29 01:14:40 2020 -0500
+
+ TAO IDL FE: Extended Annotation Support
+
+ Annotation support extended to on the following types and their
+ contents:
+ - Interfaces
+ - Porttypes
+ - Eventtypes
+ - Components
+
+ Annotations on Valuetypes and most of their possible contents are also
+ supported. The exceptions to this are these types of valuetype
+ statements:
+ - import: not supported by TAO
+ - typeid: not supported by TAO on valuetypes
+ - typeprefix: No corresponding AST Node to attach annotations to
+
+commit 69e8ba266bf52262e5b17cf9bfb65fd207307c01
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Thu May 28 20:03:05 2020 -0500
+
+ tao_idl: Record lineno of errors and warnings
+
+commit 81d3fc440215bcffd262440b0a057982b80caf14
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 27 16:51:26 2020 +0200
+
+ Removed usage of register, not allowed anymore with C++17
+
+ * TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp:
+
+commit 265095a9d78259589cfcbf5160b686f55f48c761
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date: Wed May 27 09:26:32 2020 +0200
+
+ Fixed warning for maybe-uninitialized
+
+commit 70220ed436a20dad8d2cdcc4d39d4faa4e5819aa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed May 27 08:21:55 2020 +0200
+
+ Add support for Embarcadero C++ Builder 10.4 Sydney
+
+ * ACE/NEWS:
+ * ACE/ace/Compression/rle/RLECompressor.cpp:
+ * ACE/ace/OS_NS_Thread.cpp:
+ * ACE/ace/config-win32-borland.h:
+ * ACE/ace/os_include/net/os_if.h:
+ * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp:
+ * TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h:
+ * TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h:
+ * TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
+ * TAO/tests/Bug_3574_Regression/test.cpp:
+
+commit 50380b349dfe3d840ca3e07ce635745a93ee3250
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon May 25 17:24:06 2020 +0200
+
+ Regenerated with bison 3.6.2
+
+ * TAO/TAO_IDL/fe/idl.tab.cpp:
+ * TAO/TAO_IDL/fe/idl.tab.hpp:
+
+commit b1c483ba83f0af216ee9fb7aea7b109a60a3f68a
+Merge: 134f0d30fde 4e9b0a57acf
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Mon May 18 15:45:14 2020 -0500
+
+ Merge pull request #1005 from knutpett/thread_safe_eval
+
+ Improve exception safety for IDL_GlobalData::eval()
+
+commit 2d366e54e7a507b6b3dfa4c3c8bc29f55e62785e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu May 14 10:01:29 2020 +0200
+
+ Layout, const, logging, doxygen changes
+
+ * ACE/ace/SSL/SSL_Asynch_Stream.cpp:
+ * ACE/ace/SSL/SSL_Context.cpp:
+ * ACE/examples/IPC_SAP/SSL_SAP/README:
+ * ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h:
+ * ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h:
+ * ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp:
+ * ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp:
+ * ACE/tests/SSL/Bug_2912_Regression_Test.cpp:
+ * ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp:
+ * ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h:
+ * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp:
+
+commit ba17567d4b6f5795afeba54929eed66b6b77dbfb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon May 11 10:52:01 2020 +0200
+
+ Remove register keyword, illegal with C++17.
+
+ * TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp:
+ * TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp:
+
+commit 289a4a8e0006f7a20e8de568334f74ba74f7a4bf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu May 7 14:19:46 2020 +0200
+
+ Update various links, point to github issues
+
+ * ACE/COPYING:
+ * ACE/PROBLEM-REPORT-FORM:
+ * ACE/README:
+ * TAO/PROBLEM-REPORT-FORM:
+
+commit 5564c9667dc17bc7826e54efe7dae79334218a03
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu May 7 14:14:22 2020 +0200
+
+ Update various hyperlinks
+
+ * ACE/ACE-INSTALL.html:
+ * ACE/COPYING:
+ * ACE/ace/Object_Manager.cpp:
+ * TAO/TAO-INSTALL.html:
+
+commit dc92e73096bfd073dad31e2cf5d60ae3dbdf66ee
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri May 1 10:28:14 2020 +0200
+
+ Make x.5.9 public and prepare for next release
+
+ * ACE/NEWS:
+ * ACE/bin/copy-local-script.sh:
+ * 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:
+
+commit 4e9b0a57acf3a313af273143650ca0871ec9866d
+Merge: 91785b820ae 9985d758f81
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date: Fri Mar 6 10:08:19 2020 +0100
+
+ Merge branch 'master' of github.com:DOCGroup/ACE_TAO into thread_safe_eval
+
+commit 91785b820aeefe3642db06833e17ca936382a2f7
+Author: Knut P <knut@altuma.no>
+Date: Tue Mar 3 19:59:20 2020 +0100
+
+ Update TAO/TAO_IDL/util/utl_global.cpp
+
+ Co-Authored-By: Fred Hornsey <fred@hornsey.us>
+
+commit 3e8b6e03c4693a62730d1115be3705542df32fb9
+Author: Knut P <knut@altuma.no>
+Date: Fri Feb 28 13:07:40 2020 +0100
+
+ Update TAO/TAO_IDL/util/utl_global.cpp
+
+ Co-Authored-By: Fred Hornsey <fred@hornsey.us>
+
+commit d1931582ffe4607fd832748c377f02385fdfd7a1
+Author: Knut P <knut@altuma.no>
+Date: Fri Feb 28 13:07:31 2020 +0100
+
+ Update TAO/TAO_IDL/util/utl_global.cpp
+
+ Co-Authored-By: Fred Hornsey <fred@hornsey.us>
+
+commit 689c64bcdaeffefaccc8c3cd6b886578995a9ecb
+Author: Knut P <knut@altuma.no>
+Date: Fri Feb 28 13:03:39 2020 +0100
+
+ Update TAO/TAO_IDL/util/utl_global.cpp
+
+ Co-Authored-By: Fred Hornsey <fred@hornsey.us>
+
+commit 502c8866973364f8fc78e4b9d39d8cc8f1521700
+Author: Knut P <knut@altuma.no>
+Date: Fri Feb 28 13:03:21 2020 +0100
+
+ Update TAO/TAO_IDL/util/utl_global.cpp
+
+ Co-Authored-By: Fred Hornsey <fred@hornsey.us>
+
+commit 2aa32210712c300ffd903ef31f0941340751cc72
+Author: Knut P <knut@altuma.no>
+Date: Tue Feb 25 09:15:57 2020 +0100
+
+ Update TAO/TAO_IDL/util/utl_global.cpp
+
+ Co-Authored-By: Adam Mitz <mitza@objectcomputing.com>
+
+commit 0ce29d3e3dd46551863dd260e38f03ebb7d0e1f7
+Author: Knut P <knut@altuma.no>
+Date: Tue Feb 25 09:15:47 2020 +0100
+
+ Update TAO/TAO_IDL/util/utl_global.cpp
+
+ Co-Authored-By: Adam Mitz <mitza@objectcomputing.com>
+
+commit 9b0f5a79033cd502bc03a570f40d9ce0d6e13dab
+Author: Knut P <knut@altuma.no>
+Date: Tue Feb 25 09:15:32 2020 +0100
+
+ Update TAO/TAO_IDL/util/utl_global.cpp
+
+ Co-Authored-By: Adam Mitz <mitza@objectcomputing.com>
+
+commit bb40ff0d33aa106872cba0d027d833e3de6d1738
+Author: Knut P <knut@altuma.no>
+Date: Tue Feb 25 09:14:56 2020 +0100
+
+ Update TAO/TAO_IDL/util/utl_global.cpp
+
+ Co-Authored-By: Adam Mitz <mitza@objectcomputing.com>
+
+commit b99d0f133665d598b6bd17ef47f0d78f1a367f41
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date: Fri Jan 31 12:47:09 2020 +0100
+
+ Fix whitespace and remove comments
+
+commit 8c2a34853c53f86c971999f5847f816ad081b459
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date: Mon Jan 27 14:18:04 2020 +0100
+
+ Fixes from review 2
+
+commit 41b654b2e0c6d9b6159c02971558363432c24d74
+Merge: 0af017fd1ff 468b6db323a
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date: Fri Jan 24 16:03:14 2020 +0100
+
+ Merge branch 'master' of github.com:DOCGroup/ACE_TAO into thread_safe_eval
+
+commit 0af017fd1ff2e70f47308d9e321a8a7ffcc41057
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date: Fri Jan 24 16:03:01 2020 +0100
+
+ Fixes after review
+
+commit 6166895e4fab04b76525a5a1401ec294a73ed52b
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date: Wed Dec 11 11:30:31 2019 +0100
+
+ Improve exception safety for IDL_GlobalData::eval()
+
+ If eval() parses code which causes an exception, then
+ the output won't be re-enabled. Fixed by using a helper
+ class that re-enables in the dtor.
+
+commit 8e2a713e66eb6f7bfb76e78db5ae20dda6294acd
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date: Mon Dec 9 13:04:03 2019 +0100
+
+ WIP: Improve thread safety for IDL_GlobalData::eval()
+
+ If eval() parses code which causes an exception, then
+ the output won't be re-enabled. Fixed by using a helper
+ class that re-enables in the dtor.
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 95190651d64..e87585b6247 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.9
- ACE VERSION: 6.5.9
+ TAO VERSION: 2.5.10
+ ACE VERSION: 6.5.10
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 e5c30591118..f1b61b7d282 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.9, released Fri May 01 09:57:51 CEST 2020
+This is TAO version 2.5.10, released Wed Jul 01 09:54:36 CEST 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 acc29c703af..608d1dc7b88 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,9 +4,8 @@
#define TAO_MAJOR_VERSION 2
#define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 9
-#define TAO_BETA_VERSION 9
-#define TAO_VERSION "2.5.9"
-#define TAO_VERSION_CODE 132361
+#define TAO_MICRO_VERSION 10
+#define TAO_BETA_VERSION 10
+#define TAO_VERSION "2.5.10"
+#define TAO_VERSION_CODE 132362
#define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-