diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-11-17 09:50:11 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-11-17 09:50:11 +0100 |
commit | 02e49a5139604e2ca369ea836549b438b3c2069c (patch) | |
tree | dbb1a55792783ec98e16906b7b490c097dfb31e3 | |
parent | 55a4be8e62645e75083249690c380f77b614f9b2 (diff) | |
parent | f5e8e9be931a9f5a357a47f6129644b31428c630 (diff) | |
download | ATCD-02e49a5139604e2ca369ea836549b438b3c2069c.tar.gz |
Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
-rw-r--r-- | ACE/ChangeLogs/ACE-7_0_10 | 260 | ||||
-rw-r--r-- | ACE/PROBLEM-REPORT-FORM | 2 | ||||
-rw-r--r-- | ACE/VERSION.txt | 2 | ||||
-rw-r--r-- | ACE/ace/Version.h | 6 | ||||
-rw-r--r-- | ACE/debian/control | 62 | ||||
-rw-r--r-- | ACE/rpmbuild/ace-tao.spec | 4 | ||||
-rw-r--r-- | TAO/ChangeLogs/TAO-3_0_10 | 134 | ||||
-rw-r--r-- | TAO/PROBLEM-REPORT-FORM | 4 | ||||
-rw-r--r-- | TAO/VERSION.txt | 2 | ||||
-rw-r--r-- | TAO/tao/Version.h | 6 |
10 files changed, 438 insertions, 44 deletions
diff --git a/ACE/ChangeLogs/ACE-7_0_10 b/ACE/ChangeLogs/ACE-7_0_10 new file mode 100644 index 00000000000..de8fb8d9fd8 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_0_10 @@ -0,0 +1,260 @@ +commit 367992d328a3fdbf3465445b1922ea9b21a04f04 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Nov 17 07:58:59 2022 +0100 + + Update NEWS files for next release + + * ACE/NEWS: + * TAO/NEWS: + +commit a61fa263db13c5cf6e49a469d06d789a35bcce5e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Nov 2 12:23:32 2022 +0100 + + The environment variable set is Z, not ZZ + + * ACE/tests/Process_Env_Test.cpp: + +commit fca859fece1cf48bc3ecbba171286a09b660f879 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Nov 1 11:25:13 2022 +0100 + + Use const/override/default and some layout changes + + * ACE/ace/Process.cpp: + * ACE/ace/Process.h: + * TAO/tao/ORB_Core.cpp: + +commit 4db17ec554e3758aee08b78e676b3f7545f80967 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Oct 31 10:01:59 2022 +0100 + + Removed empty line + + * ACE/ace/config-win32-borland.h: + +commit c3005ef6ff3ce5daa18862b59b3f3dfd1d2f0e36 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Oct 31 10:01:31 2022 +0100 + + Add original code back + + * ACE/ace/config-win32-borland.h: + +commit 3f220acad9c039b3cb099adc3ca52532e6b5b6ea +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Oct 31 09:47:09 2022 +0100 + + Don't disable inlining always + + * ACE/ace/config-win32-borland.h: + +commit 3d67b98a644c748826e76a10659add89497c42b5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 19 19:56:03 2022 +0200 + + Use override + + * ACE/ace/OS_NS_stropts.cpp: + * TAO/tao/PortableServer/Active_Policy_Strategies.cpp: + * TAO/tao/PortableServer/ThreadStrategy.h: + * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h: + * TAO/tao/PortableServer/ThreadStrategyORBControl.h: + * TAO/tao/PortableServer/ThreadStrategySingle.h: + * TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h: + * TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp: + +commit 4f8d9685b45a3f7a0140eb6053fcb096c0f67719 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Oct 7 08:24:40 2022 +0200 + + Fixed potential memory leak on an allocation error, use nullptr + + * ACE/ace/Message_Block.cpp: + * ACE/ace/Message_Block.h: + +commit 2400ccf08afdf0ea9a60d18777c7a177bca09569 +Merge: f460e34343e d14bdd5c85d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Oct 6 14:01:39 2022 +0200 + + Merge pull request #1960 from jwillemsen/jwi-vxworksgethost + + Updated VxWorks checks + +commit d14bdd5c85dc0f4fb21ee6d3443d0e79ac0a652e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Oct 6 14:01:07 2022 +0200 + + Updated VxWorks checks + + * ACE/ace/os_include/os_netdb.h: + +commit e1dda342b0805ffc880c618df86550df27cb9ce5 +Merge: 9fb13ed9896 8989a69cac0 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 5 19:20:01 2022 +0200 + + Merge pull request #1954 from wkbrd/windows_resource_files + + Add windows resource files + +commit 8989a69cac0086c5f0df20bfdb003a1f8f635c1d +Author: wkbrd <30599409+wkbrd@users.noreply.github.com> +Date: Wed Oct 5 09:18:32 2022 -0400 + + Fixed path separators. + +commit 6f1bf15c3de6f62b2880a44f1b3977f930fe664a +Author: wkbrd <30599409+wkbrd@users.noreply.github.com> +Date: Wed Oct 5 08:09:35 2022 -0400 + + Correct FileDescription and InternalName + +commit a0a1c88566526496425aa49046f1caa053ee9247 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 5 11:46:48 2022 +0200 + + VxWorks 7 inet_aton returns 0 on failure, so we don't need the special VxWorks code anymore + + * ACE/ace/OS_NS_arpa_inet.cpp: + +commit 630c8d205b8cfb4a47f259091f8b06d8dc8d8a93 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 5 09:38:36 2022 +0200 + + Corrected version check + + * ACE/ace/SOCK_Dgram_Mcast.cpp: + +commit 88cc7195a5d562822d07376649d3d88550fe0397 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 5 09:37:36 2022 +0200 + + VxWorks 7 has ifaddrs.h + + * ACE/ace/SOCK_Dgram_Mcast.cpp: + +commit bbb1422b27c034970573317df9050ba1fe33d4e0 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 5 09:18:13 2022 +0200 + + Removed test compile error + + * ACE/ace/OS_NS_netdb.inl: + +commit 5766ae9409fa036a76b1a5e3155caed3af68e226 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 5 09:16:53 2022 +0200 + + VxWorks 7 also has a non-reentrant gethostbyaddr alternative + + * ACE/ace/OS_NS_netdb.inl: + * ACE/ace/Pipe.cpp: + * ACE/ace/os_include/os_netdb.h: + +commit 9b8f769e30b631baee892fee94a89ea4208a5cc2 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 5 09:01:36 2022 +0200 + + Moved VxWorks define to os_netdb.h + + * ACE/ace/os_include/os_netdb.h: + * ACE/ace/os_include/os_unistd.h: + +commit 320486a79260766c61512cc2217a805d915d3106 +Merge: 2ed56466bf3 20941bebd9d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 5 08:32:31 2022 +0200 + + Merge pull request #1953 from jwillemsen/jwi-vxworks7reentrent + + With VxWorks 7 the gethostbyname() API is not always reentrent + +commit 2ed56466bf34f1dd99260514cd6a38ac7497ee9a +Merge: a575bfe86fc 26ed9970aa4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 5 08:31:02 2022 +0200 + + Merge pull request #1952 from jwillemsen/jwi-pipeopen + + Use the ACE_INET_Addr::set instead of the constructor so that we can … + +commit fb116806b0178616262153f7f6f0c551b643b9d1 +Author: wkbrd <30599409+wkbrd@users.noreply.github.com> +Date: Tue Oct 4 21:51:08 2022 -0400 + + Rebasing on newer constant names. + +commit af00945c38ce0ed6b6d28db5ba79b3aa1bedc8b7 +Author: wkbrd <30599409+wkbrd@users.noreply.github.com> +Date: Tue Oct 4 18:48:03 2022 -0400 + + Add resource files + +commit 20941bebd9d5200ac1e8e1d63c15bdd2c487c531 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Oct 4 18:30:53 2022 +0200 + + With VxWorks 7 the gethostbyname() API is not always reentrent + + * ACE/ace/OS_NS_arpa_inet.inl: + * ACE/ace/OS_NS_netdb.inl: + * ACE/ace/os_include/os_unistd.h: + +commit 26ed9970aa41aac607e9dc9849e14b8ca0458b49 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Oct 4 17:50:06 2022 +0200 + + Use the ACE_INET_Addr::set instead of the constructor so that we can check the return value of the set operation + + * ACE/ace/Pipe.cpp: + +commit 4d827f7dbfef927d913e6bc20a8360b78bb07242 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Oct 4 16:54:06 2022 +0200 + + Use nullptr/std::addressof/default/uniform initialization + : + * ACE/ace/OS_NS_netdb.inl: + * TAO/tao/Endpoint.h: + * TAO/tao/Endpoint.inl: + * TAO/tao/IIOP_Endpoint.cpp: + * TAO/tao/IIOP_Endpoint.h: + +commit d5987833e7a582ff1a72a059f48c5c568a603b65 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Oct 1 14:39:21 2022 +0200 + + Make x.0.9 public + + * ACE/NEWS: + * 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 b785704c6dd43bb9cd36939d40e7d9bcbcc58154 +Merge: a276c37334a 9d6f14ac790 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Oct 1 14:30:56 2022 +0200 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master + +commit a276c37334a955f1a7c2aac1aba6b52ddf642e47 +Merge: ee9dff76f82 49bf14b8f41 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Oct 1 14:26:16 2022 +0200 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master + +commit ee9dff76f8276b344f18fab1a6c29d09ad56aa0a +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Sep 30 11:16:06 2022 +0200 + + Fixed typo + + * ACE/tests/SOCK_Connector_Test.cpp: diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 7b07a7a0af9..73c4e2af951 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -25,7 +25,7 @@ include an entire platform-specific configuration file in the form. 8<----------8<----------8<----------8<----------8<----------8<----------8<---- - ACE VERSION: 7.0.9 + ACE VERSION: 7.0.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 547f8a60e79..e3e8852a110 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 7.0.9, released Sat Oct 01 14:28:35 CEST 2022 +This is ACE version 7.0.10, released Thu Nov 17 09:46:24 CET 2022 If you have any problems with or questions about ACE, please open a issue or discussion on the ACE_TAO github project at diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index e9c73d7e3b4..2f4dc55b6be 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -4,7 +4,7 @@ #define ACE_MAJOR_VERSION 7 #define ACE_MINOR_VERSION 0 -#define ACE_MICRO_VERSION 9 -#define ACE_VERSION "7.0.9" -#define ACE_VERSION_CODE 0x70009 +#define ACE_MICRO_VERSION 10 +#define ACE_VERSION "7.0.10" +#define ACE_VERSION_CODE 0x7000a #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/debian/control b/ACE/debian/control index f9fe8b0a521..7061787a7d7 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-7.0.9 +Package: libace-7.0.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-7.0.9 (= ${binary:Version}), ${misc:Depends} +Depends: libace-7.0.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-7.0.9 +Package: libace-ssl-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-7.0.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-7.0.9 +Package: libace-rmcast-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-7.0.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-7.0.9 +Package: libace-tmcast-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-7.0.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-7.0.9 +Package: libace-htbp-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-7.0.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-7.0.9 +Package: libace-inet-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-7.0.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-7.0.9 +Package: libace-inet-ssl-7.0.10 Architecture: any Section: libs -Depends: libace-inet-7.0.9, libace-ssl-7.0.9, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-7.0.10, libace-ssl-7.0.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-7.0.9 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-7.0.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-7.0.9 +Package: libacexml-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-7.0.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-7.0.9 +Package: libace-xml-utils-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-7.0.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-7.0.9 +Package: libkokyu-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-7.0.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-7.0.9 +Package: libace-xtreactor-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-7.0.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-7.0.9 +Package: libace-tkreactor-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-7.0.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-7.0.9 +Package: libace-flreactor-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} +Depends: libace-flreactor-7.0.10 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FLTK - development files This package contains header files and static library for the ACE-FLTK reactor integration. -Package: libace-foxreactor-7.0.9 +Package: libace-foxreactor-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-7.0.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-7.0.9 +Package: libnetsvcs-7.0.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-7.0.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-7.0.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 addb2dbd0c9..7e82c0942b1 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,6 +1,6 @@ # Set the version number here. -%define ACEVER 7.0.9 -%define TAOVER 3.0.9 +%define ACEVER 7.0.10 +%define TAOVER 3.0.10 # Conditional build # Default values are diff --git a/TAO/ChangeLogs/TAO-3_0_10 b/TAO/ChangeLogs/TAO-3_0_10 new file mode 100644 index 00000000000..b0571846214 --- /dev/null +++ b/TAO/ChangeLogs/TAO-3_0_10 @@ -0,0 +1,134 @@ +commit 367992d328a3fdbf3465445b1922ea9b21a04f04 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Nov 17 07:58:59 2022 +0100 + + Update NEWS files for next release + + * ACE/NEWS: + * TAO/NEWS: + +commit fca859fece1cf48bc3ecbba171286a09b660f879 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Nov 1 11:25:13 2022 +0100 + + Use const/override/default and some layout changes + + * ACE/ace/Process.cpp: + * ACE/ace/Process.h: + * TAO/tao/ORB_Core.cpp: + +commit 5968484ea70f045ed9c5cdb8d38602d6592b7f25 +Merge: 711fbe05e66 3d67b98a644 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Oct 20 07:39:29 2022 +0200 + + Merge pull request #1970 from jwillemsen/jwi-overrirde + + Use override + +commit 3d67b98a644c748826e76a10659add89497c42b5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 19 19:56:03 2022 +0200 + + Use override + + * ACE/ace/OS_NS_stropts.cpp: + * TAO/tao/PortableServer/Active_Policy_Strategies.cpp: + * TAO/tao/PortableServer/ThreadStrategy.h: + * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h: + * TAO/tao/PortableServer/ThreadStrategyORBControl.h: + * TAO/tao/PortableServer/ThreadStrategySingle.h: + * TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h: + * TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp: + +commit f4e36f0711e03618f88594d3ee02938d0da6a3ee +Author: Niepsho <68657205+Niepsho@users.noreply.github.com> +Date: Tue Oct 18 13:56:41 2022 +0200 + + Use default + +commit e815db1b8fe83d68b037c7a61227c736166f9979 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Oct 14 08:38:46 2022 +0200 + + Fixed compile error due to cleanup and made destructors default + +commit 66da37c13452cd66442bb2baaa9beadbf3c449e4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Oct 13 09:07:28 2022 +0200 + + Make use of default + +commit dca58941074b2098a9e898e73b4bcd05a3b80bcb +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Oct 13 08:48:56 2022 +0200 + + Fixed unused variable warnings + +commit 969d4ddf3152fe1e6cb616b284dbecf72849c494 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Oct 13 08:39:56 2022 +0200 + + Fixed unused variable warnings + +commit 99f66230ce63174a10ff5acbe7c54e9c06b98065 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 12 09:44:26 2022 +0200 + + Layout changes + +commit 892141ae11c090cf86d1d6e8c017d2535645f69a +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 12 09:39:00 2022 +0200 + + Layout changes + +commit 727fb1f5d2a067320c00149f7df2ecba602d9457 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 12 09:29:41 2022 +0200 + + Layout changes + +commit d7b7a7ce9d2f46fb6e351b844ed87e643e051f27 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 12 09:08:18 2022 +0200 + + Layout/return changes + +commit 26c2fbc083da279e132f5a951bc43f95b4c97843 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 5 15:51:19 2022 +0200 + + Use default destructors + + * TAO/tao/String_Const_Sequence_Element_T.h: + * TAO/tao/String_Sequence_Element_T.h: + * TAO/tao/UserException.cpp: + * TAO/tao/UserException.h: + +commit 4d827f7dbfef927d913e6bc20a8360b78bb07242 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Oct 4 16:54:06 2022 +0200 + + Use nullptr/std::addressof/default/uniform initialization + : + * ACE/ace/OS_NS_netdb.inl: + * TAO/tao/Endpoint.h: + * TAO/tao/Endpoint.inl: + * TAO/tao/IIOP_Endpoint.cpp: + * TAO/tao/IIOP_Endpoint.h: + +commit d5987833e7a582ff1a72a059f48c5c568a603b65 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Oct 1 14:39:21 2022 +0200 + + Make x.0.9 public + + * ACE/NEWS: + * 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 04ef8c14488..c45772d00a7 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: 3.0.9 - ACE VERSION: 7.0.9 + TAO VERSION: 3.0.10 + ACE VERSION: 7.0.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 ca7c5621860..c6d7eccdc16 100644 --- a/TAO/VERSION.txt +++ b/TAO/VERSION.txt @@ -1,4 +1,4 @@ -This is TAO version 3.0.9, released Sat Oct 01 14:28:35 CEST 2022 +This is TAO version 3.0.10, released Thu Nov 17 09:46:24 CET 2022 If you have any problems with or questions about TAO, please open a issue or discussion on the ACE_TAO github project at diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index 60c806f739e..24a5563acaa 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -4,7 +4,7 @@ #define TAO_MAJOR_VERSION 3 #define TAO_MINOR_VERSION 0 -#define TAO_MICRO_VERSION 9 -#define TAO_VERSION "3.0.9" -#define TAO_VERSION_CODE 0x30009 +#define TAO_MICRO_VERSION 10 +#define TAO_VERSION "3.0.10" +#define TAO_VERSION_CODE 0x3000a #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |