ACE+TAO-6_4_7ACE+TAO-6_4_7

48 files changed, 759 insertions, 49 deletions

diff --git a/ACE/ChangeLogs/ACE-6_4_7 b/ACE/ChangeLogs/ACE-6_4_7
new file mode 100644
index 00000000000..3a24d62fe21
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_4_7
@@ -0,0 +1,427 @@
+commit 99f855f9f3ab5102ce07424fd2968f8e330462a6
+Author: Steve Huston <shuston@riverace.com>
+Date:   Tue Mar 13 17:03:33 2018 -0400
+
+    Fix IPv4 case
+
+commit ba891f62e7f7d1d5255cbff26bf31f19d299a028
+Merge: 5a4a08e1606 2ea8eaff34b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 12 21:26:07 2018 +0100
+
+    Merge pull request #593 from jwillemsen/jwi-comp38
+    
+    Sun Studio 5.13 and older can't handle this
+
+commit 2ea8eaff34b62be1b38c3291779bae72a3dd3e56
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 12 18:19:20 2018 +0100
+
+    Sun Studio 5.13 and older can't handle this
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit 4cbfbc87e403652de1493685778392309524a095
+Merge: 1879d43292c 168208dfd6b
+Author: Steve Huston <shuston@riverace.com>
+Date:   Fri Mar 9 17:16:58 2018 -0500
+
+    Merge pull request #592 from DOCGroup/fix-ipv6only-handling
+    
+    Remove preproc checks - if ACE_HAS_IPV6 is set, the IPV6 defs should be there too.
+
+commit 168208dfd6bb859a48a7470730127de8cc22c639
+Author: Steve Huston <shuston@riverace.com>
+Date:   Fri Mar 9 16:02:04 2018 -0500
+
+    Remove preproc checks - if ACE_HAS_IPV6 is set, the IPV^ defs should be there too.
+
+commit 8ebc1623b063e89a2e3e3b225af7c54dc2c5de2f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Mar 9 08:52:30 2018 +0100
+
+    Check if __GNUC__ is defined and only log that C++ support is ok when the test code has been compiled
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit 4cfd0f26bde05974b3c4152463f92eb91f8ff6ad
+Merge: 2018a59b318 643658368ad
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Mar 6 18:52:35 2018 +0100
+
+    Merge pull request #589 from jwillemsen/jwi-oldidtag
+    
+    Remove old left over version commit message
+
+commit 643658368ad9c4db6ee41aa22036a8e7c9994708
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Mar 6 18:43:59 2018 +0100
+
+    Remove old left over version commit message
+    
+        * ACE/bin/MakeProjectCreator/config/bmake.features:
+
+commit 4fa7cca17c3ff0c07f4c1b7b1bda71b6e131092b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Mar 6 11:41:04 2018 +0100
+
+    Any bcc32 version doesn't support inlined assembly
+    
+        * ACE/ace/config-win32-borland.h:
+
+commit 45df27f3869f66d895964f18a582136bb44333af
+Author: shuai.lou <shuai.lou@greatopensource.com>
+Date:   Fri Mar 2 22:34:46 2018 +0800
+
+    Bugfix: ACE abort when use %l and the msg len exceed ACE_MAXLOGMSGLEN
+
+commit 8e034deb5cee9701aa396f10cfc16c01be0acd08
+Author: Steve Huston <shuston@riverace.com>
+Date:   Thu Mar 1 09:16:13 2018 -0500
+
+    Remove $Id$ to resolve fuzz error
+
+commit 1fee8620f369c4699a3ab44144a9d19a1e510303
+Merge: 296d82b7a2f 71a517bfb38
+Author: Steve Huston <shuston@riverace.com>
+Date:   Wed Feb 28 19:02:06 2018 -0500
+
+    Merge out from master
+
+commit 296d82b7a2fcff3d9cc704039a25fb0189669c17
+Author: Steve Huston <shuston@riverace.com>
+Date:   Wed Feb 28 18:54:05 2018 -0500
+
+    Add UDP changes and test program
+
+commit 222b5db197187810b1fd1b54aad9fc8dc0ffd774
+Author: Steve Huston <shuston@riverace.com>
+Date:   Wed Feb 28 18:30:19 2018 -0500
+
+    Added description of changes
+
+commit d4c520ce4cf5fc14aa296936e6c80cccbc12757e
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Feb 26 11:24:58 2018 -0600
+
+    NEWS for upcoming release
+
+commit 386d660e8d4f805190f0afcc68e3b3a8b0827da7
+Merge: 7675cb72f6b 63265355d6c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Feb 26 09:59:19 2018 +0100
+
+    Merge pull request #580 from jwillemsen/jwi-wfmo-versioned
+    
+    List major changes
+
+commit 63265355d6c8d9677f048ee0dd628a82608b904e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Feb 26 09:58:37 2018 +0100
+
+    List major changes
+    
+        * ACE/NEWS:
+
+commit 7675cb72f6b415ae19a278ac6364089eb57b4fff
+Merge: 61beb04ce03 7ff4828b1d6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Feb 25 10:20:43 2018 +0100
+
+    Merge pull request #579 from DOCGroup/jwillemsen-patch-2
+    
+    Fixed mingw error
+
+commit 7ff4828b1d6fd976240a3aa15401f8a907f8119e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Feb 25 08:40:13 2018 +0100
+
+    Fixed mingw error
+
+commit fee85964688d1ac7da3cb792906d857440f6c072
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Feb 25 08:17:33 2018 +0100
+
+    Fixed error
+
+commit 250aef2e14bc22a9faffefb1999bc71646105d1c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Feb 24 15:12:38 2018 +0100
+
+    Fixed errors with versioned namespace builds
+    
+        * ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp:
+        * ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp:
+
+commit b3a525bcc9a7e575b8e17e0abb9dd7d8f39cb5a7
+Merge: cb29bd46571 e46f45e6a00
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Feb 17 22:32:19 2018 +0100
+
+    Merge pull request #574 from jwillemsen/jwi-taoidlleak
+    
+    msvc7.1 and gcc 4.1.1 can't handle this test so disable this test for…
+
+commit e46f45e6a00228722f3694152fcb02e79a9c1bc9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Feb 17 20:05:27 2018 +0100
+
+    msvc7.1 and gcc 4.1.1 can't handle this test so disable this test for those compilers
+
+commit cb29bd46571e428d1d71c860ec9010d29a3a1fe4
+Merge: 4665969af11 d14029823bf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 16:05:33 2018 +0100
+
+    Merge pull request #573 from jwillemsen/jwi-taoidlleak
+    
+    Add new C++ compiler test for testing a feature TAO is using
+
+commit d14029823bf4be658affed6c0a413b45534e5cfe
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 12:39:02 2018 +0100
+
+    Initialise member to solve Codacy warning
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit 785cca646211feed9c238cf8d219687b85552546
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 12:09:57 2018 +0100
+
+    Add constructor to make codacy happy
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit 56cba7ad62f51463ddaf89894db16cabc2193b9c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 11:36:35 2018 +0100
+
+    Add new compiler test for a C++ feature TAO is using
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+          Added.
+    
+        * ACE/tests/run_test.lst:
+        * ACE/tests/tests.mpc:
+
+commit eb04d4bc9c163aed6f509d2c9888c65b3f1f622f
+Author: Steve Huston <shuston@riverace.com>
+Date:   Mon Jan 29 19:34:50 2018 -0500
+
+    Fix typos, compile errors
+
+commit a13ddfc5371ca69a38c7d66906bd357a8ca87830
+Merge: c5d68d4ed60 220e906922b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jan 27 14:17:58 2018 +0100
+
+    Merge pull request #569 from jwillemsen/master
+    
+    Performance improvements
+
+commit 220e906922bcfd91013611a19923094f5c95f96b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jan 27 11:11:06 2018 +0100
+
+    Fixed compile error
+    
+        * ACE/ace/XML_Utils/XMLSchema/id_map.hpp:
+
+commit 6bd80e559a75a00ca328997d7e54acc6d6030c79
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jan 27 11:08:01 2018 +0100
+
+    Pass strings as const&
+    
+        * ACE/ace/XML_Utils/XMLSchema/id_map.hpp:
+
+commit d5ba9d4e65ade6cc83a76c5cc47eab41ed3ad941
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jan 27 10:26:34 2018 +0100
+
+    Check trailing whitespaces also for .py files
+    
+        * ACE/bin/fuzz.pl:
+
+commit c5d68d4ed60d031445356d670fa293d78f04c505
+Merge: 6639d53a99c fb5c132cda3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 26 18:57:16 2018 +0100
+
+    Merge pull request #568 from jwillemsen/master
+    
+    Update XML_Utils file with the latest from xsc
+
+commit fb5c132cda315cf72f7ba0873c2f06b60ca8b952
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 26 16:18:10 2018 +0100
+
+    Mark constructor explicit
+    
+        * ACE/ace/XML_Utils/XMLSchema/id_map.hpp:
+
+commit d32216e0244b969acfffa4776073637519ceaa02
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 26 15:53:25 2018 +0100
+
+    Pull in latest version from XSC which adds a new operation and provides some more information when an error occurs
+    
+        * ACE/ace/XML_Utils/XMLSchema/id_map.hpp:
+
+commit 1a055d24a37d709ff78364ccf0b84fae594107e6
+Author: Steve Huston <shuston@riverace.com>
+Date:   Mon Jan 22 18:55:00 2018 -0500
+
+    Add Howard's changes to allow ipv6-only on SOCK_Acceptor
+
+commit 29a39ca0376d04d1675b1642d9a06d509bca49d2
+Merge: 98ccf5cd1c7 6f09295375e
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 19 08:59:51 2018 -0600
+
+    Merge pull request #566 from iguessthislldo/master
+    
+    MPC global.features wireshark2 renamed to wireshark_cmake
+
+commit 9da59f9347aca3bd71a291b0a4b0b24666a82004
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 19 11:04:26 2018 +0100
+
+    Removed old left over cvs id tag
+
+commit 6f09295375e7dbe65ad6087c4be02c93dd84d2ac
+Author: Frederick Hornsey <fred@hornsey.us>
+Date:   Wed Jan 17 18:22:19 2018 -0600
+
+    MPC global.features wireshark2 renamed to wireshark_cmake
+
+commit 41018b2be93ea1f5ef30d74ca9a0b9233e86630a
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Sat Jan 13 12:10:40 2018 -0600
+
+    Compiler Features 32 Test: need to check Apple clang version numbers which use a different scheme than real clang version numbers
+
+commit 26a9a5469899f66eb5816d9d585b296cf49df28a
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Jan 12 15:23:17 2018 -0600
+
+    Compiler Features 24 Test: skip older clang versions
+
+commit 7d0117c30506099a968a0dc0d9229330217ec9ed
+Merge: b0ef5cf1876 484dcbf6f2e
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 11 13:54:45 2018 -0600
+
+    Merge pull request #557 from iguessthislldo/master
+    
+    Match MPC for Wireshark 2 Support
+
+commit e5d6c55227f9ee795d2e8ff8473296848a7e0190
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jan 11 13:54:08 2018 -0600
+
+    check clang version number for compiler test workaround
+
+commit 90adcc25acb454ce3de98443fb76e9a6d52de871
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jan 11 12:13:06 2018 -0600
+
+    clang workarounds for Compiler_Features_32_Test
+
+commit db6ca5ccdcb52899ce9571ff24897d50529de13b
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jan 11 11:10:39 2018 -0600
+
+    clang: set ACE_HAS_CPP11 based on predefined macros
+
+commit 484dcbf6f2e089757a1fe38cd3638da1482f03df
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Fri Jan 5 13:16:29 2018 -0600
+
+    Match MPC for Wireshark 2 Support
+    
+    Added wireshark_any and wireshark2 to global.features for Wireshark2 Support  Windows to match the global.features file in MPC.
+
+commit 6fbf5788f0589ae7cde5448baeda0d6e9b1bfc79
+Merge: ac9ffb65e75 4ac686684c6
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Jan 2 09:36:50 2018 -0600
+
+    Merge pull request #555 from mitza-oci/singleton-restart
+    
+    ACE_Singleton should work after ACE::fini, ACE::init (fixes issue #554)
+
+commit ac9ffb65e75c37283e3d238ba7ec86ffb35fd147
+Merge: 8e4d9ab2ae8 dff4439b183
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 2 12:26:30 2018 +0100
+
+    Merge pull request #556 from jwillemsen/master
+    
+    Updated copyright to 2018
+
+commit dff4439b18379b9008ee696303be492d84d794dd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 1 11:24:13 2018 +0100
+
+    Updated copyright to 2018
+    
+        * ACE/tests/ACE.bsp:
+          Deleted, not used anymore
+    
+        * ACE/COPYING:
+        * TAO/COPYING:
+
+commit 4ac686684c6dff57c295fd5c28f929613be5aefa
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Dec 21 10:20:15 2017 -0600
+
+    updated test list now that test should pass
+
+commit 5bbbaacd283951886642a5113300f0c0543e51c0
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Dec 21 10:18:10 2017 -0600
+
+    fixed issue #554 ACE_Singleton use after ACE::fini, ACE::init
+
+commit a68721afec17c9ac51077591bf12159645ef0756
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Dec 21 10:10:52 2017 -0600
+
+    Updated MPC project for new ACE test
+
+commit 7233cf588e327e1c9ff4121ece63b8c0a63878d8
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Dec 19 17:36:03 2017 -0600
+
+    New ACE test: check if ACE_Singleton works after ACE::fini, ACE::init
+    
+    Some lock types work, others don't, due to different logic per lock type
+    in ACE_Object_Manager::get_singleton_lock and how ACE_Singleton uses it.
+
+commit f0067177b0a0aa227b503f9b20cfd623143372cf
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Dec 12 12:09:46 2017 -0600
+
+    Added support for FreeBSD 11
+
+commit 98c5adf44b718a26304d89619f993dc5725b0790
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Dec 11 17:14:28 2017 -0600
+
+    Added support for cross compiling using MinGW on a Linux host.
+
+commit 52618c6f2a83446eb15ecd95e98e9d178a013d47
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Dec 8 09:38:58 2017 +0100
+
+    Make ACE 6.4.6 and TAO 2.4.6 public
+    
+        * 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 8ea942bbbca..cfcd00dc322 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.6
+    ACE VERSION: 6.4.7
 
     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 5c6ece94edd..3e2aa8f1ac4 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.4.6, released Fri Dec 08 08:48:59 CET 2017
+This is ACE version 6.4.7, released Fri Mar 16 08:05:28 CET 2018
 
 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 53e1c908024..25bd543d50e 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 6
-#define ACE_BETA_VERSION 6
-#define ACE_VERSION "6.4.6"
-#define ACE_VERSION_CODE 394246
+#define ACE_MICRO_VERSION 7
+#define ACE_BETA_VERSION 7
+#define ACE_VERSION "6.4.7"
+#define ACE_VERSION_CODE 394247
 #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 80f711c00d0..5e386aaf397 100644
--- a/ACE/debian/ace.dsc
+++ b/ACE/debian/ace.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
-Source: ACE+src-6.4.6
-Version: 2.4.6
+Source: ACE+src-6.4.7
+Version: 2.4.7
 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.6.tar.gz
+ 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-6.4.7.tar.gz
 
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index 5eb1bd3bae4..20c2ed49c96 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.6
+Package: libace-6.4.7
 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.6 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.4.7 (= ${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.6
+Package: libace-ssl-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.4.7 (= ${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.6
+Package: libace-rmcast-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.4.7 (= ${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.6
+Package: libace-tmcast-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.4.7 (= ${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.6
+Package: libace-htbp-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.4.7 (= ${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.6
+Package: libace-inet-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.4.7 (= ${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.6
+Package: libace-inet-ssl-6.4.7
 Architecture: any
 Section: libs
-Depends: libace-inet-6.4.6, libace-ssl-6.4.6, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.4.6, libace-ssl-6.4.7, ${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.6 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.4.7 (= ${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.6
+Package: libacexml-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.4.7 (= ${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.6
+Package: libace-xml-utils-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.4.7 (= ${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.6
+Package: libkokyu-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.4.7 (= ${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.6
+Package: libace-xtreactor-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.6), ${misc:Depends}
+Depends: libace-xtreactor-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.7), ${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.6
+Package: libace-tkreactor-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.4.7 (= ${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.6
+Package: libace-flreactor-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.6), ${misc:Depends}
+Depends: libace-flreactor-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.7), ${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.6
+Package: libace-foxreactor-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.4.7 (= ${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.6
+Package: libnetsvcs-6.4.7
 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.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.4.7 (= ${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.6.docs b/ACE/debian/libace-6.4.7.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.4.6.docs
+++ b/ACE/debian/libace-6.4.7.docs
diff --git a/ACE/debian/libace-6.4.6.install b/ACE/debian/libace-6.4.7.install
index 182a5eda411..182a5eda411 100644
--- a/ACE/debian/libace-6.4.6.install
+++ b/ACE/debian/libace-6.4.7.install
diff --git a/ACE/debian/libace-6.4.6.lintian-overrides b/ACE/debian/libace-6.4.7.lintian-overrides
index 240f8e08d0c..240f8e08d0c 100644
--- a/ACE/debian/libace-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-flreactor-6.4.6.install b/ACE/debian/libace-flreactor-6.4.7.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.4.6.install
+++ b/ACE/debian/libace-flreactor-6.4.7.install
diff --git a/ACE/debian/libace-flreactor-6.4.6.lintian-overrides b/ACE/debian/libace-flreactor-6.4.7.lintian-overrides
index 4b58af00d10..4b58af00d10 100644
--- a/ACE/debian/libace-flreactor-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-flreactor-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-foxreactor-6.4.6.install b/ACE/debian/libace-foxreactor-6.4.7.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.4.6.install
+++ b/ACE/debian/libace-foxreactor-6.4.7.install
diff --git a/ACE/debian/libace-foxreactor-6.4.6.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
index 61c403e638b..61c403e638b 100644
--- a/ACE/debian/libace-foxreactor-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-htbp-6.4.6.install b/ACE/debian/libace-htbp-6.4.7.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.4.6.install
+++ b/ACE/debian/libace-htbp-6.4.7.install
diff --git a/ACE/debian/libace-htbp-6.4.6.lintian-overrides b/ACE/debian/libace-htbp-6.4.7.lintian-overrides
index 32697f5e2c0..32697f5e2c0 100644
--- a/ACE/debian/libace-htbp-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-htbp-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-inet-6.4.6.install b/ACE/debian/libace-inet-6.4.7.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.4.6.install
+++ b/ACE/debian/libace-inet-6.4.7.install
diff --git a/ACE/debian/libace-inet-6.4.6.lintian-overrides b/ACE/debian/libace-inet-6.4.7.lintian-overrides
index afb8bb9f959..afb8bb9f959 100644
--- a/ACE/debian/libace-inet-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-inet-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-inet-ssl-6.4.6.install b/ACE/debian/libace-inet-ssl-6.4.7.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.4.6.install
+++ b/ACE/debian/libace-inet-ssl-6.4.7.install
diff --git a/ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
index dcf77c5c4a0..dcf77c5c4a0 100644
--- a/ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-qtreactor-6.4.6.install b/ACE/debian/libace-qtreactor-6.4.7.install
index 1d371e1e571..1d371e1e571 100644
--- a/ACE/debian/libace-qtreactor-6.4.6.install
+++ b/ACE/debian/libace-qtreactor-6.4.7.install
diff --git a/ACE/debian/libace-qtreactor-6.4.6.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides
index 31bc9dc3867..31bc9dc3867 100644
--- a/ACE/debian/libace-qtreactor-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-rmcast-6.4.6.install b/ACE/debian/libace-rmcast-6.4.7.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.4.6.install
+++ b/ACE/debian/libace-rmcast-6.4.7.install
diff --git a/ACE/debian/libace-rmcast-6.4.6.lintian-overrides b/ACE/debian/libace-rmcast-6.4.7.lintian-overrides
index 89d1e6523ce..89d1e6523ce 100644
--- a/ACE/debian/libace-rmcast-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-rmcast-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-ssl-6.4.6.NEWS b/ACE/debian/libace-ssl-6.4.7.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.4.6.NEWS
+++ b/ACE/debian/libace-ssl-6.4.7.NEWS
diff --git a/ACE/debian/libace-ssl-6.4.6.install b/ACE/debian/libace-ssl-6.4.7.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.4.6.install
+++ b/ACE/debian/libace-ssl-6.4.7.install
diff --git a/ACE/debian/libace-ssl-6.4.6.lintian-overrides b/ACE/debian/libace-ssl-6.4.7.lintian-overrides
index 2b0bc5f692a..2b0bc5f692a 100644
--- a/ACE/debian/libace-ssl-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-ssl-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-tkreactor-6.4.6.install b/ACE/debian/libace-tkreactor-6.4.7.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.4.6.install
+++ b/ACE/debian/libace-tkreactor-6.4.7.install
diff --git a/ACE/debian/libace-tkreactor-6.4.6.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
index 836f6d37a9f..836f6d37a9f 100644
--- a/ACE/debian/libace-tkreactor-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-tmcast-6.4.6.install b/ACE/debian/libace-tmcast-6.4.7.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.4.6.install
+++ b/ACE/debian/libace-tmcast-6.4.7.install
diff --git a/ACE/debian/libace-tmcast-6.4.6.lintian-overrides b/ACE/debian/libace-tmcast-6.4.7.lintian-overrides
index fbb009770a6..fbb009770a6 100644
--- a/ACE/debian/libace-tmcast-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-tmcast-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-xml-utils-6.4.6.install b/ACE/debian/libace-xml-utils-6.4.7.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.4.6.install
+++ b/ACE/debian/libace-xml-utils-6.4.7.install
diff --git a/ACE/debian/libace-xml-utils-6.4.6.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
index dfe499a9dbb..dfe499a9dbb 100644
--- a/ACE/debian/libace-xml-utils-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
diff --git a/ACE/debian/libace-xtreactor-6.4.6.install b/ACE/debian/libace-xtreactor-6.4.7.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.4.6.install
+++ b/ACE/debian/libace-xtreactor-6.4.7.install
diff --git a/ACE/debian/libace-xtreactor-6.4.6.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
index 683006fa589..683006fa589 100644
--- a/ACE/debian/libace-xtreactor-6.4.6.lintian-overrides
+++ b/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
diff --git a/ACE/debian/libacexml-6.4.6.docs b/ACE/debian/libacexml-6.4.7.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.4.6.docs
+++ b/ACE/debian/libacexml-6.4.7.docs
diff --git a/ACE/debian/libacexml-6.4.6.install b/ACE/debian/libacexml-6.4.7.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.4.6.install
+++ b/ACE/debian/libacexml-6.4.7.install
diff --git a/ACE/debian/libacexml-6.4.6.lintian-overrides b/ACE/debian/libacexml-6.4.7.lintian-overrides
index 62753f80cfe..62753f80cfe 100644
--- a/ACE/debian/libacexml-6.4.6.lintian-overrides
+++ b/ACE/debian/libacexml-6.4.7.lintian-overrides
diff --git a/ACE/debian/libkokyu-6.4.6.docs b/ACE/debian/libkokyu-6.4.7.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.4.6.docs
+++ b/ACE/debian/libkokyu-6.4.7.docs
diff --git a/ACE/debian/libkokyu-6.4.6.install b/ACE/debian/libkokyu-6.4.7.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.4.6.install
+++ b/ACE/debian/libkokyu-6.4.7.install
diff --git a/ACE/debian/libkokyu-6.4.6.lintian-overrides b/ACE/debian/libkokyu-6.4.7.lintian-overrides
index 73e11dec443..73e11dec443 100644
--- a/ACE/debian/libkokyu-6.4.6.lintian-overrides
+++ b/ACE/debian/libkokyu-6.4.7.lintian-overrides
diff --git a/ACE/debian/libnetsvcs-6.4.6.docs b/ACE/debian/libnetsvcs-6.4.7.docs
index 0b03c55b91f..0b03c55b91f 100644
--- a/ACE/debian/libnetsvcs-6.4.6.docs
+++ b/ACE/debian/libnetsvcs-6.4.7.docs
diff --git a/ACE/debian/libnetsvcs-6.4.6.install b/ACE/debian/libnetsvcs-6.4.7.install
index c7a04b16213..c7a04b16213 100644
--- a/ACE/debian/libnetsvcs-6.4.6.install
+++ b/ACE/debian/libnetsvcs-6.4.7.install
diff --git a/ACE/debian/libnetsvcs-6.4.6.lintian-overrides b/ACE/debian/libnetsvcs-6.4.7.lintian-overrides
index 6ae68da92a4..6ae68da92a4 100644
--- a/ACE/debian/libnetsvcs-6.4.6.lintian-overrides
+++ b/ACE/debian/libnetsvcs-6.4.7.lintian-overrides
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index c354eb471fa..a91db76813a 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.6
-%define TAOVER  2.4.6
+%define ACEVER  6.4.7
+%define TAOVER  2.4.7
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-2_4_7 b/TAO/ChangeLogs/TAO-2_4_7
new file mode 100644
index 00000000000..65d37fbae34
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_4_7
@@ -0,0 +1,283 @@
+commit b1228f4bfd1be92b1590de65fe49c8511c2b71e1
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Mar 13 10:58:36 2018 -0500
+
+    TAO test list: mark tests that won't run with CORBA/e compact
+
+commit 5a4a08e16062d6ecbf0e599fc2bdb26f103e72d3
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Mar 12 11:19:23 2018 -0500
+
+    TAO NEWS for shmiop change
+
+commit 66e84f43246a74b1efadf60ff7aef1146a853c98
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Mar 6 11:06:41 2018 -0600
+
+    Bug 1220 fix applied to SHMIOP (fixed for IIOP long ago).
+    
+    Also added a SHMIOP test, IPv6 compatibility, and fixed wrong indent in Synch_Invocation.cpp.
+
+commit 71a517bfb38858939cecc4e021dc3805663ff07a
+Merge: 7aadef4fc59 d4c520ce4cf
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Feb 26 14:12:55 2018 -0600
+
+    Merge pull request #582 from mitza-oci/master
+    
+    NEWS for upcoming release
+
+commit d4c520ce4cf5fc14aa296936e6c80cccbc12757e
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Feb 26 11:24:58 2018 -0600
+
+    NEWS for upcoming release
+
+commit 73307efb832657d40b3c39492a2c4ae4b0b47762
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Feb 26 18:20:26 2018 +0100
+
+    Doxygen fixes and fixed some typos
+    
+        * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
+        * TAO/tests/Bug_2953_Regression/client.cpp:
+        * TAO/tests/Bug_2953_Regression/server.cpp:
+        * TAO/tests/Smart_Proxies/Benchmark/client.cpp:
+        * TAO/tests/Smart_Proxies/Policy/client.cpp:
+        * TAO/tests/Smart_Proxies/client.cpp:
+
+commit dded6e0e48ee7e1c6c39240d60fb0b3111ceddf2
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Fri Feb 23 09:05:06 2018 +0100
+
+    TAO/tests/Bug_3940_Regression/test.idl
+    - Address issue #571 comment by jwillemsen: Disable content of IDL file
+      for Borland C++ Builder. The cpp32 preprocessor apparently strips out
+      all @ characters which inhibits processing of annotations.
+
+commit 35218a474eeb88b4288df227a98f04cbf0865f8b
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Sun Feb 18 02:30:07 2018 +0100
+
+    Address https://github.com/DOCGroup/ACE_TAO/issues/571 :
+    Shift handling of annotation applications from lexer to parser.
+    
+    TAO/TAO_IDL/fe/idl.ll
+    - Remove rule matching annotation applications.
+    
+    TAO/TAO_IDL/fe/idl.ypp
+    - Define %type <idval> defining_id.
+    - Duplicate rule `id' as defining_id.
+      In defining_id allow for annotation applications.
+    - Substitute `id' by defining_id in following rules:
+      template_module_ref, template_module_inst, interface_decl, value_decl,
+      const_dcl, simple_declarator, struct_decl, union_decl, enum_type,
+      array_declarator, exception, component_forward_decl, component_header,
+      home_header, factory_decl, finder_decl, event_concrete_forward_decl,
+      event_abs_forward_decl, event_abs_header, event_custom_header,
+      event_plain_header.
+    - Allow for annotation applications in following rules:
+      definitions, at_least_one_definition, tpl_definitions, member_i,
+      case_branch, case_labels, enumerator, operation, init_decl,
+      porttype_decl, at_least_one_actual_parameter, actual_parameters,
+      connector_header.
+    - New rule `annotations' implements sequence of 0 or more annotation_appl.
+    - New rules annotation_appl, annotation_appl_params, annotation_appl_param
+      implement rules 225, 226, 227 from IDL 4.2 section 7.4.15.3.
+    - New rule at_least_one_annotation_appl_param implements 2nd alternative
+      on RHS of rule 226.
+    - New rule annotation_appl_named_params is auxiliary to
+      at_least_one_annotation_appl_param.
+      It implements a sequence of 0 or more annotation_appl_param.
+    
+    TAO/TAO_IDL/fe/idl.yy.cpp
+    - Regenerate from idl.ll using TAO/TAO_IDL/regen.sh with flex-2.6.4.
+    
+    TAO/TAO_IDL/fe/idl.tab.cpp
+    - Regenerate from idl.ypp using TAO/TAO_IDL/regen.sh with bison-3.0.2.
+
+commit cb29bd46571e428d1d71c860ec9010d29a3a1fe4
+Merge: 4665969af11 d14029823bf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 16:05:33 2018 +0100
+
+    Merge pull request #573 from jwillemsen/jwi-taoidlleak
+    
+    Add new C++ compiler test for testing a feature TAO is using
+
+commit 4473a426454c16a2d7af7328778369d603d701ca
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 10:23:41 2018 +0100
+
+    Fixed typo in comment
+    
+        * TAO/tests/Bug_3683_Regression/Simple_util.h:
+
+commit 0b1e33835dcdb9397c9eeb23eef5db53908d87e0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 10:23:28 2018 +0100
+
+    Convert to doxygen style comments
+    
+        * TAO/tests/Bug_3683_Regression/Echo.idl:
+
+commit 4665969af11545a831900244fd4ac6fa6f30a155
+Merge: cbb40b5f6f2 c8d9edf5117
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Feb 15 10:32:39 2018 +0100
+
+    Merge pull request #572 from jwillemsen/jwi-taoidlleak
+    
+    Fixed memory leak when we have a wstrval
+
+commit c8d9edf5117f6aa7334bd63e351e816d4946aece
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Feb 13 19:23:59 2018 +0100
+
+    Fixed memory leak when we have a wstrval
+    
+        * TAO/TAO_IDL/ast/ast_expression.cpp:
+
+commit e1f507ba668b0373e2ef3ab6fb74a9f792374fb3
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Sun Feb 4 19:43:06 2018 +0100
+
+    Followup to commit 3f751cb addresses
+    https://github.com/DOCGroup/ACE_TAO/pull/567#issuecomment-360504123 ,
+    
+    > [...] the Solaris/SunCC build failed because its preprocessor splits
+    > the @ from the following token:
+    >
+    > $ echo '@foo' > /tmp/foo.c && /opt/compilers/suncc5.12/bin/CC -E \
+    >   /tmp/foo.c && rm /tmp/foo.c
+    > #1 "/tmp/foo.c"
+    > @ foo
+    
+    TAO/TAO_IDL/fe/idl.ll
+    - Modify the rule matching annotations to include an optional space
+      after the '@',
+      @ ?[A-Za-z][A-Za-z0-9_]*[ \t]*(\([^)]+\))?
+
+commit be871ac59565386b582b41e48ef129d509c354fc
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Wed Jan 24 22:24:13 2018 +0100
+
+    Followup to PR #565: Address new conversion warning at
+      http://buildlogs.remedy.nl/win_msvc15_opendds_debug/index.html ,
+    > fe\idl.yy.cpp(1383): warning C4267: 'argument': conversion from
+    > 'size_t' to 'int'
+    
+    TAO/TAO_IDL/tao_idl_fe.mpc rule lex.yy
+    - In the sed regexes, replace the fread related substitution by an
+      #include <errno.h> substitution.
+      As a marginal cosmetic improvement, adjust the tab substitution
+      to produce 4 spaces per tab.
+    - In the error message of the else-part, increase the minimum required
+      flex version to 2.6.4.
+    
+    TAO/TAO_IDL/fe/idl.yy.cpp
+    - Regenerate using regen.sh with flex 2.6.4.
+
+commit a2f4310d1beb46927e396cbfb1f563abf390eb8f
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Fri Jan 19 21:43:43 2018 +0100
+
+    Follow suggestion by mitza-oci at
+                https://github.com/DOCGroup/ACE_TAO/pull/565 :
+    > Since it's a compile-only test, it shouldn't need a run_test.pl or a
+    > test.cpp (build a library instead of an executable).
+    
+    TAO/tests/Bug_3940_Regression/Bug_3940_Regression.mpc
+    - Change superproject to taolib_with_idl.
+    - Remove exename and Source_Files.
+    
+    TAO/tests/Bug_3940_Regression/test.cpp
+    TAO/tests/Bug_3940_Regression/run_test.pl
+    - Remove files.
+
+commit 383454e6ee7d814cbfa3e1758f506a90f96b7d13
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Wed Jan 17 22:01:45 2018 +0100
+
+    * TAO/tests/Bug_3940_Regression :
+      New test verifies that tao_idl tolerates IDL4 annotations.
+
+commit 3f751cb31255f9916a5b5ec31f572f4aa1758c96
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Tue Jan 16 22:09:36 2018 +0100
+
+    http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=3940#c4
+    Attachment 1524: Patch to make tao_idl ignore IDL4 annotations
+    
+    TAO/TAO_IDL/fe/idl.ll
+    - Add rule @[A-Za-z][A-Za-z0-9_]*[ \t]*(\([^)]+\))? with action "break".
+    
+    TAO/TAO_IDL/fe/idl.tab.cpp
+    TAO/TAO_IDL/fe/idl.tab.hpp
+    TAO/TAO_IDL/fe/idl.yy.cpp
+    - In directory TAO/TAO_IDL execute script regen.sh using flex 2.6.0 and
+      bison 3.0.2.
+    
+    TAO/TAO_IDL/fe/idl.ypp
+    - Fix typo in comment.
+
+commit 2a2491926e1a1e044da01f979dcaa4e1e2032c51
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 15 18:14:06 2018 +0100
+
+    Removed reference to CIAO, moved to a separate repo, added msvc 14.1 (Visual Studio 2017)
+    
+        * TAO/TAO-INSTALL.html:
+
+commit 57a3da79bd35109aadaa74110f58440e4a5eab86
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Fri Jan 12 00:03:25 2018 +0100
+
+    - In section "Building and Installing TAO from git", mention that the
+      ACE_ROOT and TAO_ROOT env vars are set different from ACE_wrappers.
+    - Fix a few typos.
+    - Add a few missing </LI> tags.
+
+commit 6fbf5788f0589ae7cde5448baeda0d6e9b1bfc79
+Merge: ac9ffb65e75 4ac686684c6
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Jan 2 09:36:50 2018 -0600
+
+    Merge pull request #555 from mitza-oci/singleton-restart
+    
+    ACE_Singleton should work after ACE::fini, ACE::init (fixes issue #554)
+
+commit dff4439b18379b9008ee696303be492d84d794dd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 1 11:24:13 2018 +0100
+
+    Updated copyright to 2018
+    
+        * ACE/tests/ACE.bsp:
+          Deleted, not used anymore
+    
+        * ACE/COPYING:
+        * TAO/COPYING:
+
+commit 5bbbaacd283951886642a5113300f0c0543e51c0
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Dec 21 10:18:10 2017 -0600
+
+    fixed issue #554 ACE_Singleton use after ACE::fini, ACE::init
+
+commit 52618c6f2a83446eb15ecd95e98e9d178a013d47
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Dec 8 09:38:58 2017 +0100
+
+    Make ACE 6.4.6 and TAO 2.4.6 public
+    
+        * 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 7d6bc051567..de278b594bf 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.6
-    ACE VERSION: 6.4.6
+    TAO VERSION: 2.4.7
+    ACE VERSION: 6.4.7
 
     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 b1072b15d50..96091bea5bb 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.4.6, released Fri Dec 08 08:48:59 CET 2017
+This is TAO version 2.4.7, released Fri Mar 16 08:05:28 CET 2018
 
 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 cc44cc260f3..8b48ae5bef1 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 6
-#define TAO_BETA_VERSION 6
-#define TAO_VERSION "2.4.6"
-#define TAO_VERSION_CODE 132102
+#define TAO_MICRO_VERSION 7
+#define TAO_BETA_VERSION 7
+#define TAO_VERSION "2.4.7"
+#define TAO_VERSION_CODE 132103
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))