diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-12-08 08:49:01 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-12-08 08:49:01 +0100 |
commit | ed1925da7c384e5773b9dbf56cab8e4924d4342a (patch) | |
tree | 77d4207db05e8e6a87f6074f51a11f9a47d0ecc3 | |
parent | a4deec50d29f8eee4f65c6def5e6305177ad7237 (diff) | |
download | ATCD-ed1925da7c384e5773b9dbf56cab8e4924d4342a.tar.gz |
ACE+TAO-6_4_6ACE+TAO-6_4_6
-rw-r--r-- | ACE/ChangeLogs/ACE-6_4_6 | 190 | ||||
-rw-r--r-- | ACE/PROBLEM-REPORT-FORM | 2 | ||||
-rw-r--r-- | ACE/VERSION | 2 | ||||
-rw-r--r-- | ACE/ace/Version.h | 8 | ||||
-rw-r--r-- | ACE/debian/ace.dsc | 6 | ||||
-rw-r--r-- | ACE/debian/debian.control | 62 | ||||
-rw-r--r-- | ACE/debian/libace-6.4.6.docs (renamed from ACE/debian/libace-6.4.5.docs) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-6.4.6.install (renamed from ACE/debian/libace-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-6.4.6.lintian-overrides (renamed from ACE/debian/libace-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-flreactor-6.4.6.install (renamed from ACE/debian/libace-flreactor-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-flreactor-6.4.6.lintian-overrides (renamed from ACE/debian/libace-flreactor-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-foxreactor-6.4.6.install (renamed from ACE/debian/libace-foxreactor-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-foxreactor-6.4.6.lintian-overrides (renamed from ACE/debian/libace-foxreactor-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-htbp-6.4.6.install (renamed from ACE/debian/libace-htbp-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-htbp-6.4.6.lintian-overrides (renamed from ACE/debian/libace-htbp-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-inet-6.4.6.install (renamed from ACE/debian/libace-inet-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-inet-6.4.6.lintian-overrides (renamed from ACE/debian/libace-inet-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-inet-ssl-6.4.6.install (renamed from ACE/debian/libace-inet-ssl-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides (renamed from ACE/debian/libace-inet-ssl-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-qtreactor-6.4.6.install (renamed from ACE/debian/libace-qtreactor-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-qtreactor-6.4.6.lintian-overrides (renamed from ACE/debian/libace-qtreactor-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-rmcast-6.4.6.install (renamed from ACE/debian/libace-rmcast-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-rmcast-6.4.6.lintian-overrides (renamed from ACE/debian/libace-rmcast-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-ssl-6.4.6.NEWS (renamed from ACE/debian/libace-ssl-6.4.5.NEWS) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-ssl-6.4.6.install (renamed from ACE/debian/libace-ssl-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-ssl-6.4.6.lintian-overrides (renamed from ACE/debian/libace-ssl-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-tkreactor-6.4.6.install (renamed from ACE/debian/libace-tkreactor-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-tkreactor-6.4.6.lintian-overrides (renamed from ACE/debian/libace-tkreactor-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-tmcast-6.4.6.install (renamed from ACE/debian/libace-tmcast-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-tmcast-6.4.6.lintian-overrides (renamed from ACE/debian/libace-tmcast-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-xml-utils-6.4.6.install (renamed from ACE/debian/libace-xml-utils-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-xml-utils-6.4.6.lintian-overrides (renamed from ACE/debian/libace-xml-utils-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-xtreactor-6.4.6.install (renamed from ACE/debian/libace-xtreactor-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libace-xtreactor-6.4.6.lintian-overrides (renamed from ACE/debian/libace-xtreactor-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libacexml-6.4.6.docs (renamed from ACE/debian/libacexml-6.4.5.docs) | 0 | ||||
-rw-r--r-- | ACE/debian/libacexml-6.4.6.install (renamed from ACE/debian/libacexml-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libacexml-6.4.6.lintian-overrides (renamed from ACE/debian/libacexml-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libkokyu-6.4.6.docs (renamed from ACE/debian/libkokyu-6.4.5.docs) | 0 | ||||
-rw-r--r-- | ACE/debian/libkokyu-6.4.6.install (renamed from ACE/debian/libkokyu-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libkokyu-6.4.6.lintian-overrides (renamed from ACE/debian/libkokyu-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/debian/libnetsvcs-6.4.6.docs (renamed from ACE/debian/libnetsvcs-6.4.5.docs) | 0 | ||||
-rw-r--r-- | ACE/debian/libnetsvcs-6.4.6.install (renamed from ACE/debian/libnetsvcs-6.4.5.install) | 0 | ||||
-rw-r--r-- | ACE/debian/libnetsvcs-6.4.6.lintian-overrides (renamed from ACE/debian/libnetsvcs-6.4.5.lintian-overrides) | 0 | ||||
-rw-r--r-- | ACE/rpmbuild/ace-tao.spec | 4 | ||||
-rw-r--r-- | TAO/ChangeLogs/TAO-2_4_6 | 196 | ||||
-rw-r--r-- | TAO/PROBLEM-REPORT-FORM | 4 | ||||
-rw-r--r-- | TAO/VERSION | 2 | ||||
-rw-r--r-- | TAO/tao/Version.h | 8 |
48 files changed, 435 insertions, 49 deletions
diff --git a/ACE/ChangeLogs/ACE-6_4_6 b/ACE/ChangeLogs/ACE-6_4_6 new file mode 100644 index 00000000000..188afa11381 --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_4_6 @@ -0,0 +1,190 @@ +commit a4deec50d29f8eee4f65c6def5e6305177ad7237 +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Dec 7 09:55:28 2017 -0600 + + More NEWS for next release + +commit 18dbe87dc905e64597b1fef4f2557d4a1e354003 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Dec 6 20:12:51 2017 +0100 + + List changes + + * ACE/NEWS: + +commit 4c70a05e0dff993cffe43abdcb4797ec51343355 +Author: Thomas Lockhart <Thomas.Lockhart@jpl.nasa.gov> +Date: Tue Dec 5 14:51:48 2017 -0800 + + Add missing ESF header files to allow extending features in application code. + +commit e9778ea7d1d3bb7baab3403f0c0e3802df209250 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 24 13:40:05 2017 +0100 + + When we have C++11 support we use std::unique_ptr instead of auto_ptr + + * ACE/ace/Thread_Manager.cpp: + +commit 1e501fb9df9cd2122ccadf03e5c886c06d0b6cea +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 24 10:06:36 2017 +0100 + + Layout changes + + * ACE/examples/Logger/README: + * ACE/examples/README: + +commit 4d2d5bba206f06e72f96b7c64fbb0b50a29de68f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 10 13:43:22 2017 +0100 + + Removed scope of local variable + + * ACE/ace/Timer_Queue_T.cpp: + +commit 6ddb5b9e42b957401acc2b82505134e4800ae972 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 10 13:40:23 2017 +0100 + + Removed scope of variable + + * ACE/ACEXML/common/Mem_Map_Stream.cpp: + +commit a20df95a2b4614745fff9ea1621b1f613f6413f3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 10 13:16:41 2017 +0100 + + Fixed exception throwing + + * ACE/ACEXML/parser/parser/Parser.cpp: + +commit 9d0b2ea258f08682b47ab64abb4fe58f87903579 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 10 09:31:24 2017 +0100 + + Merge all changes from the debian packaging effort + +commit a6e6c7b8db5c2abe6c4789136d0b41336dfca389 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 10 09:29:26 2017 +0100 + + Merge all changes from the debian packaging effort + +commit cfd6b34887915d1addee556265c88184a7a26348 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Oct 30 18:22:48 2017 +0100 + + Don't use C++11 + + * ACE/tests/Compiler_Features_37_Test.cpp: + +commit f72d9e7a52a78ec2eb5a2f80a2f7085d3ce5329f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Oct 30 18:21:27 2017 +0100 + + Make sure we initialise our members explicitly so that we get a capacity of zero and our nodes pointer is also zero + + * ACE/tests/Compiler_Features_37_Test.cpp: + +commit c3b6f0c68dd9d6bd266a6dfe06380924a3bafcc2 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Oct 27 18:39:28 2017 +0200 + + Only one exit point in the constructor + + * ACE/ace/Malloc_T.cpp: + +commit 130aa32a44615d968a1a075b2941d1479d1c56c5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Oct 27 18:39:06 2017 +0200 + + Removed empty line + + * ACE/tests/Malloc_Test.cpp: + +commit 83b52d9570d2226de51b14d60bfe078ce92a47f8 +Author: Adam Mitz <mitza@ociweb.com> +Date: Fri Oct 13 17:21:39 2017 -0500 + + VxWorks 7 (SR0510) support + +commit 35b64b7c8b5a20a9bba2e0ebc7370378eb4f9af0 +Merge: f0410ceecf4 36afa956d3e +Author: Adam Mitz <mitza@ociweb.com> +Date: Mon Oct 9 13:47:33 2017 -0500 + + Merge pull request #524 from mitza-oci/master + + gnuace build improvements + +commit 36afa956d3e91c27242c05e0ae1e321bdffed017 +Author: Adam Mitz <mitza@ociweb.com> +Date: Mon Oct 9 11:11:03 2017 -0500 + + gnuace: use .PHONY for makefile targets that aren't files + +commit 30a3ef141df6b2477ef6d2a3439f3bda72746ec3 +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Oct 5 17:21:10 2017 -0500 + + gnuace rpath: move HP-UX settings to its own config file; support newer Apple macOS + +commit 88ce1806d42c2635558b855b2363a7d7f5a62e66 +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Oct 5 17:18:40 2017 -0500 + + Set ACE_HAS_DYNAMIC_LINKING=0 when not linking to libdl on linux + +commit a634ac2f9d956f0ddcdfbb1970a0e8281fd50088 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Oct 5 19:44:03 2017 +0200 + + Added perl bash to resolve debian packaging warning + + * ACE/bin/generate_export_file.pl: + +commit 82060fbf0679137be1aab4a4e17813ade4aa4309 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Oct 5 19:43:47 2017 +0200 + + Const fix + + * ACE/ace/SSL/SSL_Asynch_Stream.cpp: + +commit 4dc3529a09cb7e723f03243f6b7f4924c3c3f18c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Sep 7 10:36:50 2017 +0200 + + Updated 6.4.4 to 6.4.5 + + * ACE/debian/libace-6.4.5.lintian-overrides: + * ACE/debian/libace-flreactor-6.4.5.lintian-overrides: + * ACE/debian/libace-foxreactor-6.4.5.lintian-overrides: + * ACE/debian/libace-htbp-6.4.5.lintian-overrides: + * ACE/debian/libace-inet-6.4.5.lintian-overrides: + * ACE/debian/libace-inet-ssl-6.4.5.lintian-overrides: + * ACE/debian/libace-qtreactor-6.4.5.lintian-overrides: + * ACE/debian/libace-rmcast-6.4.5.lintian-overrides: + * ACE/debian/libace-ssl-6.4.5.lintian-overrides: + * ACE/debian/libace-tkreactor-6.4.5.lintian-overrides: + * ACE/debian/libace-tmcast-6.4.5.lintian-overrides: + * ACE/debian/libace-xml-utils-6.4.5.lintian-overrides: + * ACE/debian/libace-xtreactor-6.4.5.lintian-overrides: + * ACE/debian/libacexml-6.4.5.lintian-overrides: + * ACE/debian/libkokyu-6.4.5.lintian-overrides: + * ACE/debian/libnetsvcs-6.4.5.lintian-overrides: + +commit 320c854b6270c62517cd612b2c93e96dcff1d3f4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Sep 7 09:47:05 2017 +0200 + + Make x.4.5 public available and prepare for next release + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/debian/debian.control: + * ACE/docs/Download.html: + * ACE/docs/bczar/bczar.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index d3ae86f1ea2..8ea942bbbca 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.4.5 + ACE VERSION: 6.4.6 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/ACE/VERSION b/ACE/VERSION index ed359349ac4..5c6ece94edd 100644 --- a/ACE/VERSION +++ b/ACE/VERSION @@ -1,4 +1,4 @@ -This is ACE version 6.4.5, released Thu Sep 07 08:59:40 CEST 2017 +This is ACE version 6.4.6, released Fri Dec 08 08:48:59 CET 2017 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 9bea1dc962f..53e1c908024 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -4,9 +4,9 @@ #define ACE_MAJOR_VERSION 6 #define ACE_MINOR_VERSION 4 -#define ACE_MICRO_VERSION 5 -#define ACE_BETA_VERSION 5 -#define ACE_VERSION "6.4.5" -#define ACE_VERSION_CODE 394245 +#define ACE_MICRO_VERSION 6 +#define ACE_BETA_VERSION 6 +#define ACE_VERSION "6.4.6" +#define ACE_VERSION_CODE 394246 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc index d9d426436ea..80f711c00d0 100644 --- a/ACE/debian/ace.dsc +++ b/ACE/debian/ace.dsc @@ -1,10 +1,10 @@ Format: 1.0 -Source: ACE+src-6.4.5 -Version: 2.4.5 +Source: ACE+src-6.4.6 +Version: 2.4.6 Binary: ace Maintainer: Johnny Willemsen <jwillemsen@remedy.nl> Architecture: any Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, docbook-to-man, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev Files: - 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-6.4.5.tar.gz + 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-6.4.6.tar.gz diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control index 8340607ac97..1edbbee45ec 100644 --- a/ACE/debian/debian.control +++ b/ACE/debian/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.4.5 +Package: libace-6.4.6 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.4.5 (= ${binary:Version}), ${misc:Depends} +Depends: libace-6.4.6 (= ${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.4.5 +Package: libace-ssl-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-6.4.6 (= ${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.4.5 +Package: libace-rmcast-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-6.4.6 (= ${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.4.5 +Package: libace-tmcast-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-6.4.6 (= ${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.4.5 +Package: libace-htbp-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-6.4.6 (= ${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.4.5 +Package: libace-inet-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-6.4.6 (= ${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.4.5 +Package: libace-inet-ssl-6.4.6 Architecture: any Section: libs -Depends: libace-inet-6.4.5, libace-ssl-6.4.5, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-6.4.5, libace-ssl-6.4.6, ${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.4.5 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-6.4.6 (= ${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.4.5 +Package: libacexml-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-6.4.6 (= ${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.4.5 +Package: libace-xml-utils-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-6.4.6 (= ${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.4.5 +Package: libkokyu-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-6.4.6 (= ${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.4.5 +Package: libace-xtreactor-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-6.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.6), ${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.4.5 +Package: libace-tkreactor-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-6.4.6 (= ${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.4.5 +Package: libace-flreactor-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends} +Depends: libace-flreactor-6.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.6), ${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.4.5 +Package: libace-foxreactor-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-6.4.6 (= ${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.4.5 +Package: libnetsvcs-6.4.6 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.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE network service implementations - development files ACE network services provide reusable components for common distributed system tasks such as logging, naming, locking, and time diff --git a/ACE/debian/libace-6.4.5.docs b/ACE/debian/libace-6.4.6.docs index 3bdab5b0089..3bdab5b0089 100644 --- a/ACE/debian/libace-6.4.5.docs +++ b/ACE/debian/libace-6.4.6.docs diff --git a/ACE/debian/libace-6.4.5.install b/ACE/debian/libace-6.4.6.install index 182a5eda411..182a5eda411 100644 --- a/ACE/debian/libace-6.4.5.install +++ b/ACE/debian/libace-6.4.6.install diff --git a/ACE/debian/libace-6.4.5.lintian-overrides b/ACE/debian/libace-6.4.6.lintian-overrides index 240f8e08d0c..240f8e08d0c 100644 --- a/ACE/debian/libace-6.4.5.lintian-overrides +++ b/ACE/debian/libace-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-flreactor-6.4.5.install b/ACE/debian/libace-flreactor-6.4.6.install index 528836aacee..528836aacee 100644 --- a/ACE/debian/libace-flreactor-6.4.5.install +++ b/ACE/debian/libace-flreactor-6.4.6.install diff --git a/ACE/debian/libace-flreactor-6.4.5.lintian-overrides b/ACE/debian/libace-flreactor-6.4.6.lintian-overrides index 4b58af00d10..4b58af00d10 100644 --- a/ACE/debian/libace-flreactor-6.4.5.lintian-overrides +++ b/ACE/debian/libace-flreactor-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-foxreactor-6.4.5.install b/ACE/debian/libace-foxreactor-6.4.6.install index e360f29f5af..e360f29f5af 100644 --- a/ACE/debian/libace-foxreactor-6.4.5.install +++ b/ACE/debian/libace-foxreactor-6.4.6.install diff --git a/ACE/debian/libace-foxreactor-6.4.5.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.6.lintian-overrides index 61c403e638b..61c403e638b 100644 --- a/ACE/debian/libace-foxreactor-6.4.5.lintian-overrides +++ b/ACE/debian/libace-foxreactor-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-htbp-6.4.5.install b/ACE/debian/libace-htbp-6.4.6.install index 08103fd5cad..08103fd5cad 100644 --- a/ACE/debian/libace-htbp-6.4.5.install +++ b/ACE/debian/libace-htbp-6.4.6.install diff --git a/ACE/debian/libace-htbp-6.4.5.lintian-overrides b/ACE/debian/libace-htbp-6.4.6.lintian-overrides index 32697f5e2c0..32697f5e2c0 100644 --- a/ACE/debian/libace-htbp-6.4.5.lintian-overrides +++ b/ACE/debian/libace-htbp-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-inet-6.4.5.install b/ACE/debian/libace-inet-6.4.6.install index 59a73a509d0..59a73a509d0 100644 --- a/ACE/debian/libace-inet-6.4.5.install +++ b/ACE/debian/libace-inet-6.4.6.install diff --git a/ACE/debian/libace-inet-6.4.5.lintian-overrides b/ACE/debian/libace-inet-6.4.6.lintian-overrides index afb8bb9f959..afb8bb9f959 100644 --- a/ACE/debian/libace-inet-6.4.5.lintian-overrides +++ b/ACE/debian/libace-inet-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-inet-ssl-6.4.5.install b/ACE/debian/libace-inet-ssl-6.4.6.install index b9b8b9045f7..b9b8b9045f7 100644 --- a/ACE/debian/libace-inet-ssl-6.4.5.install +++ b/ACE/debian/libace-inet-ssl-6.4.6.install diff --git a/ACE/debian/libace-inet-ssl-6.4.5.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides index dcf77c5c4a0..dcf77c5c4a0 100644 --- a/ACE/debian/libace-inet-ssl-6.4.5.lintian-overrides +++ b/ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-qtreactor-6.4.5.install b/ACE/debian/libace-qtreactor-6.4.6.install index 1d371e1e571..1d371e1e571 100644 --- a/ACE/debian/libace-qtreactor-6.4.5.install +++ b/ACE/debian/libace-qtreactor-6.4.6.install diff --git a/ACE/debian/libace-qtreactor-6.4.5.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.6.lintian-overrides index 31bc9dc3867..31bc9dc3867 100644 --- a/ACE/debian/libace-qtreactor-6.4.5.lintian-overrides +++ b/ACE/debian/libace-qtreactor-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-rmcast-6.4.5.install b/ACE/debian/libace-rmcast-6.4.6.install index 86e78259853..86e78259853 100644 --- a/ACE/debian/libace-rmcast-6.4.5.install +++ b/ACE/debian/libace-rmcast-6.4.6.install diff --git a/ACE/debian/libace-rmcast-6.4.5.lintian-overrides b/ACE/debian/libace-rmcast-6.4.6.lintian-overrides index 89d1e6523ce..89d1e6523ce 100644 --- a/ACE/debian/libace-rmcast-6.4.5.lintian-overrides +++ b/ACE/debian/libace-rmcast-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-ssl-6.4.5.NEWS b/ACE/debian/libace-ssl-6.4.6.NEWS index e5bd0e4aa10..e5bd0e4aa10 100644 --- a/ACE/debian/libace-ssl-6.4.5.NEWS +++ b/ACE/debian/libace-ssl-6.4.6.NEWS diff --git a/ACE/debian/libace-ssl-6.4.5.install b/ACE/debian/libace-ssl-6.4.6.install index 8df45a6d55f..8df45a6d55f 100644 --- a/ACE/debian/libace-ssl-6.4.5.install +++ b/ACE/debian/libace-ssl-6.4.6.install diff --git a/ACE/debian/libace-ssl-6.4.5.lintian-overrides b/ACE/debian/libace-ssl-6.4.6.lintian-overrides index 2b0bc5f692a..2b0bc5f692a 100644 --- a/ACE/debian/libace-ssl-6.4.5.lintian-overrides +++ b/ACE/debian/libace-ssl-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-tkreactor-6.4.5.install b/ACE/debian/libace-tkreactor-6.4.6.install index 12ab35062d2..12ab35062d2 100644 --- a/ACE/debian/libace-tkreactor-6.4.5.install +++ b/ACE/debian/libace-tkreactor-6.4.6.install diff --git a/ACE/debian/libace-tkreactor-6.4.5.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.6.lintian-overrides index 836f6d37a9f..836f6d37a9f 100644 --- a/ACE/debian/libace-tkreactor-6.4.5.lintian-overrides +++ b/ACE/debian/libace-tkreactor-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-tmcast-6.4.5.install b/ACE/debian/libace-tmcast-6.4.6.install index e066131dea0..e066131dea0 100644 --- a/ACE/debian/libace-tmcast-6.4.5.install +++ b/ACE/debian/libace-tmcast-6.4.6.install diff --git a/ACE/debian/libace-tmcast-6.4.5.lintian-overrides b/ACE/debian/libace-tmcast-6.4.6.lintian-overrides index fbb009770a6..fbb009770a6 100644 --- a/ACE/debian/libace-tmcast-6.4.5.lintian-overrides +++ b/ACE/debian/libace-tmcast-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-xml-utils-6.4.5.install b/ACE/debian/libace-xml-utils-6.4.6.install index 2428ec9f109..2428ec9f109 100644 --- a/ACE/debian/libace-xml-utils-6.4.5.install +++ b/ACE/debian/libace-xml-utils-6.4.6.install diff --git a/ACE/debian/libace-xml-utils-6.4.5.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.6.lintian-overrides index dfe499a9dbb..dfe499a9dbb 100644 --- a/ACE/debian/libace-xml-utils-6.4.5.lintian-overrides +++ b/ACE/debian/libace-xml-utils-6.4.6.lintian-overrides diff --git a/ACE/debian/libace-xtreactor-6.4.5.install b/ACE/debian/libace-xtreactor-6.4.6.install index c53614c7208..c53614c7208 100644 --- a/ACE/debian/libace-xtreactor-6.4.5.install +++ b/ACE/debian/libace-xtreactor-6.4.6.install diff --git a/ACE/debian/libace-xtreactor-6.4.5.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.6.lintian-overrides index 683006fa589..683006fa589 100644 --- a/ACE/debian/libace-xtreactor-6.4.5.lintian-overrides +++ b/ACE/debian/libace-xtreactor-6.4.6.lintian-overrides diff --git a/ACE/debian/libacexml-6.4.5.docs b/ACE/debian/libacexml-6.4.6.docs index 002855d7915..002855d7915 100644 --- a/ACE/debian/libacexml-6.4.5.docs +++ b/ACE/debian/libacexml-6.4.6.docs diff --git a/ACE/debian/libacexml-6.4.5.install b/ACE/debian/libacexml-6.4.6.install index d3e912ffa51..d3e912ffa51 100644 --- a/ACE/debian/libacexml-6.4.5.install +++ b/ACE/debian/libacexml-6.4.6.install diff --git a/ACE/debian/libacexml-6.4.5.lintian-overrides b/ACE/debian/libacexml-6.4.6.lintian-overrides index 62753f80cfe..62753f80cfe 100644 --- a/ACE/debian/libacexml-6.4.5.lintian-overrides +++ b/ACE/debian/libacexml-6.4.6.lintian-overrides diff --git a/ACE/debian/libkokyu-6.4.5.docs b/ACE/debian/libkokyu-6.4.6.docs index e8869c513b2..e8869c513b2 100644 --- a/ACE/debian/libkokyu-6.4.5.docs +++ b/ACE/debian/libkokyu-6.4.6.docs diff --git a/ACE/debian/libkokyu-6.4.5.install b/ACE/debian/libkokyu-6.4.6.install index 62854308f96..62854308f96 100644 --- a/ACE/debian/libkokyu-6.4.5.install +++ b/ACE/debian/libkokyu-6.4.6.install diff --git a/ACE/debian/libkokyu-6.4.5.lintian-overrides b/ACE/debian/libkokyu-6.4.6.lintian-overrides index 73e11dec443..73e11dec443 100644 --- a/ACE/debian/libkokyu-6.4.5.lintian-overrides +++ b/ACE/debian/libkokyu-6.4.6.lintian-overrides diff --git a/ACE/debian/libnetsvcs-6.4.5.docs b/ACE/debian/libnetsvcs-6.4.6.docs index 0b03c55b91f..0b03c55b91f 100644 --- a/ACE/debian/libnetsvcs-6.4.5.docs +++ b/ACE/debian/libnetsvcs-6.4.6.docs diff --git a/ACE/debian/libnetsvcs-6.4.5.install b/ACE/debian/libnetsvcs-6.4.6.install index c7a04b16213..c7a04b16213 100644 --- a/ACE/debian/libnetsvcs-6.4.5.install +++ b/ACE/debian/libnetsvcs-6.4.6.install diff --git a/ACE/debian/libnetsvcs-6.4.5.lintian-overrides b/ACE/debian/libnetsvcs-6.4.6.lintian-overrides index 6ae68da92a4..6ae68da92a4 100644 --- a/ACE/debian/libnetsvcs-6.4.5.lintian-overrides +++ b/ACE/debian/libnetsvcs-6.4.6.lintian-overrides diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 68f1380babf..c354eb471fa 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.4.5 -%define TAOVER 2.4.5 +%define ACEVER 6.4.6 +%define TAOVER 2.4.6 # Conditional build # Default values are diff --git a/TAO/ChangeLogs/TAO-2_4_6 b/TAO/ChangeLogs/TAO-2_4_6 new file mode 100644 index 00000000000..f7bbb874298 --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_4_6 @@ -0,0 +1,196 @@ +commit b7c88666f27c6582c506647911c4506c08b77ef3 +Author: Adam Mitz <mitza@ociweb.com> +Date: Wed Dec 6 11:09:50 2017 -0600 + + NEWS for PR546 + +commit 023a87ef783547246ee4c596c52dc8ea10dba6b8 +Author: Adam Mitz <mitza@ociweb.com> +Date: Fri Dec 1 13:30:52 2017 -0600 + + Bug 1220 fix applied to SSLIOP (fixed for IIOP long ago). + +commit 4cfd0f592e8a2bce85c306d5592b6a842d200eae +Author: Adam Mitz <mitza@ociweb.com> +Date: Fri Dec 1 13:30:07 2017 -0600 + + For BiDir GIOP over SSL, need to handle IPv4-mapped IPv6 addresses. + +commit ca4cc89f788025e0405fbd649035753c42d930ef +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Dec 1 15:33:24 2017 +0100 + + Put back protected copy/assignment + + * TAO/tao/PortableServer/Servant_Base.cpp: + * TAO/tao/PortableServer/Servant_Base.h: + +commit d79eac1fee4f07bc60fa0c61d37bbff8c3f637cb +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Dec 1 15:22:51 2017 +0100 + + Documentation update + + * TAO/tao/PortableServer/Servant_Base.h: + +commit 086572d4d184bf23d916b35b006e1092b16c25fe +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Dec 1 15:21:59 2017 +0100 + + Make copy/assignment operators private and don't implement them, they are not used. Extended constructor so that operation table pointer can be passed directly with the constructor + + * TAO/tao/PortableServer/Servant_Base.cpp: + * TAO/tao/PortableServer/Servant_Base.h: + +commit 9540f4901e1da99a2fda48dcb583498e10f44791 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 10 13:41:49 2017 +0100 + + Catch exceptions by reference + + * TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp: + +commit 80e33c4654681aea26372512ab0befd6e9b90572 +Merge: 7fdc541a146 5a5edb88418 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 10 08:16:31 2017 +0100 + + Merge pull request #538 from jwillemsen/jwi-unboundeconst + + Kill running processes when the consumer fails + +commit 5a5edb88418617cd9b1c5cc51e6fc59ef15e599c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 10 08:15:53 2017 +0100 + + Kill runnin processes when the consumer fails + + * TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: + +commit 7fdc541a1468f652290fefe85701051f3fb6888b +Merge: 2ec54b4c9f0 6f189099786 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Nov 6 19:01:16 2017 +0100 + + Merge pull request #537 from jwillemsen/jwi-unboundeconst + + Const fix to resolve C++ core guideline warning + +commit 6f189099786a012cefe5e9884b6ea41e53302a84 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Nov 6 16:43:59 2017 +0100 + + Const fix to resolve C++ core guideline warning + + * TAO/tao/Unbounded_Octet_Sequence_T.h: + +commit 2ec54b4c9f081954031b2fa8d3156487e1369f4e +Merge: aa8114dd866 76450354d78 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 3 14:06:51 2017 +0100 + + Merge pull request #536 from jwillemsen/master + + Documentation typo fixes + +commit 76450354d787c693f49f8379273daf6686abedf4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 3 12:42:28 2017 +0100 + + Documentation typo fixes + + * TAO/tao/PortableServer/Operation_Table_Binary_Search.h: + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp: + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h: + +commit aa8114dd866153bd3bb20a2ff4ba212a5e6d04d2 +Merge: e781670ab24 d690b993e0e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 3 10:12:28 2017 +0100 + + Merge pull request #534 from jwillemsen/jwi-remotecoseventbasicrandom + + Removed RND_Timer, it is not used + +commit 50e0a0dfa1826dc0383be27bc84644220b303f2b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 3 09:38:35 2017 +0100 + + Fixed compile errors + + * TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: + +commit d690b993e0e3cfdeb62b5d9422771b2e7d034b70 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Nov 3 09:23:12 2017 +0100 + + Removed RND_Timer, it is not used + + * TAO/orbsvcs/tests/CosEvent/Basic/Random.h: + +commit 0ffe7d97a791975beb6e89948cfbb124e3fb253e +Merge: 7751cfd7c6e 9bde53fd6ea +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Nov 2 11:06:54 2017 +0100 + + Merge pull request #533 from jwillemsen/jwi-ft-errorprint + + Replace some prints of exceptions with an ACE_DEBUG, this are really … + +commit 9bde53fd6ea194cd284318c3861cfd723054fa30 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Nov 2 09:50:43 2017 +0100 + + Replace some prints of exceptions with an ACE_DEBUG, this are really informational messages which shouldn't pollute the scoreboard + + * TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: + +commit 7b9f53187376a92bf12f4f7ba61f9ab6a5adc4b9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Oct 25 19:18:45 2017 +0200 + + Minor cleanup to documentation and removed commented out code + + * TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h: + * TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h: + * TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h: + * TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h: + +commit 5e6d85273a5f092ddc0d53f972515e94ac4e748e +Merge: ece7b4b5898 5349f67c59c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Oct 24 14:04:21 2017 +0200 + + Merge pull request #528 from jwillemsen/jwi-notify-layoutchanges + + Layout changes + +commit 5349f67c59c3e8ef38323f161d533104c7795913 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Oct 24 08:51:16 2017 +0200 + + Layout changes + + * TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h: + * TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h: + * TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp: + +commit 83b52d9570d2226de51b14d60bfe078ce92a47f8 +Author: Adam Mitz <mitza@ociweb.com> +Date: Fri Oct 13 17:21:39 2017 -0500 + + VxWorks 7 (SR0510) support + +commit 320c854b6270c62517cd612b2c93e96dcff1d3f4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Sep 7 09:47:05 2017 +0200 + + Make x.4.5 public available and prepare for next release + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/debian/debian.control: + * 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 ad206d4f312..7d6bc051567 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.4.5 - ACE VERSION: 6.4.5 + TAO VERSION: 2.4.6 + ACE VERSION: 6.4.6 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/TAO/VERSION b/TAO/VERSION index 6af8f18f423..b1072b15d50 100644 --- a/TAO/VERSION +++ b/TAO/VERSION @@ -1,4 +1,4 @@ -This is TAO version 2.4.5, released Thu Sep 07 08:59:40 CEST 2017 +This is TAO version 2.4.6, released Fri Dec 08 08:48:59 CET 2017 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 c648d645b05..cc44cc260f3 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -4,9 +4,9 @@ #define TAO_MAJOR_VERSION 2 #define TAO_MINOR_VERSION 4 -#define TAO_MICRO_VERSION 5 -#define TAO_BETA_VERSION 5 -#define TAO_VERSION "2.4.5" -#define TAO_VERSION_CODE 132101 +#define TAO_MICRO_VERSION 6 +#define TAO_BETA_VERSION 6 +#define TAO_VERSION "2.4.6" +#define TAO_VERSION_CODE 132102 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |