diff --git a/ACE/ChangeLogs/ACE-6_5_18 b/ACE/ChangeLogs/ACE-6_5_18 new file mode 100644 index 0000000000000..932041605d0d1 --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_5_18 @@ -0,0 +1,82 @@ +commit e8adb6ba4621e3eb9b25707c8757ba6a76656ffa +Author: Adam Mitz +Date: Fri Aug 5 10:16:59 2022 -0500 + + NEWS for next ACE6+TAO2 release + +commit 77ac4bba5873b30ea47f445262f78aa55985dacd +Author: Son Dinh +Date: Wed Jul 13 10:58:09 2022 -0500 + + Add header and footer for stuck stacks + +commit 50f69436f7a6d656a89ef995a8025e3ad244cff1 +Author: Timothy Simpson +Date: Mon Jul 11 18:39:52 2022 -0500 + + Update ACE/ace/Synch_Options.h + + Co-authored-by: Adam Mitz + +commit 56b5f840e64cb7dce6c4b601386e36a73e49d463 +Author: Timothy Simpson +Date: Mon Jul 11 12:55:56 2022 -0500 + + per review + +commit 7f2438525abef7fafb1ef2dabc53d16850c2f7d6 +Author: Adam Mitz +Date: Mon Jun 27 11:15:20 2022 -0600 + + Merge pull request #1865 from mitza-oci/no_ifdef_anyops_ns + + Removed ACE_ANY_OPS_USE_NAMESPACE as a compile-time option + + (cherry picked from commit dbc6154a1b9c2782e78b4d0698364a0780a9a06d) + + # Conflicts: + # ACE/ace/config-win32-borland.h + # TAO/NEWS + # TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp + +commit 8dcfa002061c49db6327e3c68fbc587e58bebe05 +Author: Adam Mitz +Date: Fri Jun 24 15:13:50 2022 -0600 + + Merge pull request #1864 from mitza-oci/g++12 + + GCC 12 + + (cherry picked from commit 94d132b173807bb55f8c7481a57a523b4f07ba7e) + + # Conflicts: + # .github/workflows/linux.yml + # .github/workflows/macosx.yml + # TAO/NEWS + # TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp + +commit af898a97d578ae2d68e29f064cd317369b0d04c3 +Author: Johnny Willemsen +Date: Tue Jun 14 09:11:36 2022 +0200 + + Prepare for next 6.5.x release + + * ACE/NEWS: + * TAO/NEWS: diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 1e8e129f26da3..20f9441ab28aa 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -40,7 +40,7 @@ To: ace-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - ACE VERSION: 6.5.17 + ACE VERSION: 6.5.18 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 2aef84891a751..b9853fb3d9393 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 6.5.17, released Tue Jun 14 08:43:48 CEST 2022 +This is ACE version 6.5.18, released Wed Aug 10 08:40:14 CEST 2022 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 6f7270fd91ffa..371c5e9f7ff42 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -4,8 +4,8 @@ #define ACE_MAJOR_VERSION 6 #define ACE_MINOR_VERSION 5 -#define ACE_MICRO_VERSION 17 -#define ACE_BETA_VERSION 17 -#define ACE_VERSION "6.5.17" -#define ACE_VERSION_CODE 0x60511 +#define ACE_MICRO_VERSION 18 +#define ACE_BETA_VERSION 18 +#define ACE_VERSION "6.5.18" +#define ACE_VERSION_CODE 0x60512 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/debian/control b/ACE/debian/control index 31b243c2df2e9..2532c115c8f14 100644 --- a/ACE/debian/control +++ b/ACE/debian/control @@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator * mpc-ace: generates project files for a single target * mwc-ace: generates workspace files for a set of projects -Package: libace-6.5.17 +Package: libace-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -45,7 +45,7 @@ Description: C++ network programming framework Package: libace-dev Architecture: any Section: libdevel -Depends: libace-6.5.17 (= ${binary:Version}), ${misc:Depends} +Depends: libace-6.5.18 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, pkg-config Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework - development files @@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation This package contains the ACE overview documentation, tutorials, examples, and information regarding upstream development. -Package: libace-ssl-6.5.17 +Package: libace-ssl-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -73,12 +73,12 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. -Package: libace-rmcast-6.5.17 +Package: libace-rmcast-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -92,12 +92,12 @@ Description: ACE reliable multicast library Package: libace-rmcast-dev Architecture: any Section: libdevel -Depends: libace-rmcast-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE reliable multicast library - development files This package contains the header files and static library for the ACE reliable multicast library. -Package: libace-tmcast-6.5.17 +Package: libace-tmcast-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -111,12 +111,12 @@ Description: ACE transactional multicast library Package: libace-tmcast-dev Architecture: any Section: libdevel -Depends: libace-tmcast-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE transactional multicast library - development files This package contains the header files and static library for the ACE transactional multicast library. -Package: libace-htbp-6.5.17 +Package: libace-htbp-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library Package: libace-htbp-dev Architecture: any Section: libdevel -Depends: libace-htbp-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE protocol over HTTP tunneling library - development files This package contains the header files and static library for the ACE HTBP library. -Package: libace-inet-6.5.17 +Package: libace-inet-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -146,15 +146,15 @@ Description: ACE Inet protocol library Package: libace-inet-dev Architecture: any Section: libdevel -Depends: libace-inet-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE Inet protocol library - development files This package contains the header files and static library for the ACE Inet protocol library. -Package: libace-inet-ssl-6.5.17 +Package: libace-inet-ssl-6.5.18 Architecture: any Section: libs -Depends: libace-inet-6.5.17, libace-ssl-6.5.17, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-6.5.18, libace-ssl-6.5.18, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library Package: libace-inet-ssl-dev Architecture: any Section: libdevel -Depends: libace-inet-ssl-6.5.17 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-6.5.18 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SSL-enabled Inet protocol library - development files This package contains the header files and static library for the ACE SSL-enabled Inet protocol library. @@ -180,7 +180,7 @@ Description: ACE perfect hash function generator basically the same options and functionality. ace_gperf simply takes advantage of some of the features provided by the ACE library. -Package: libacexml-6.5.17 +Package: libacexml-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -196,12 +196,12 @@ Package: libacexml-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libacexml-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library - development files This package contains the header files and static library for the ACE XML parsing library. -Package: libace-xml-utils-6.5.17 +Package: libace-xml-utils-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -215,12 +215,12 @@ Package: libace-xml-utils-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libace-xml-utils-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev Description: ACE XML utility classes and methods - development files This package contains the header files and static library for the ACE XML Utils library -Package: libkokyu-6.5.17 +Package: libkokyu-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library Package: libkokyu-dev Architecture: any Section: libdevel -Depends: libkokyu-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE scheduling and dispatching library - development files This package contains the header files and static library for the ACE scheduling and dispatching library. -Package: libace-xtreactor-6.5.17 +Package: libace-xtreactor-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. -Package: libace-tkreactor-6.5.17 +Package: libace-tkreactor-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} Description: ACE-GUI reactor integration for Tk - development files This package contains header files and static library for the ACE-Tk reactor integration. -Package: libace-flreactor-6.5.17 +Package: libace-flreactor-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends} +Depends: libace-flreactor-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends} Description: ACE-GUI reactor integration for FLTK - development files This package contains header files and static library for the ACE-FLTK reactor integration. -Package: libace-foxreactor-6.5.17 +Package: libace-foxreactor-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX Package: libace-foxreactor-dev Architecture: any Section: libdevel -Depends: libace-foxreactor-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FOX - development files This package contains header files and static library for the ACE-FOX reactor integration. @@ -343,7 +343,7 @@ Description: ACE network service implementations files to link the various ACE network services together, either statically or dynamically, and form complete server programs. -Package: libnetsvcs-6.5.17 +Package: libnetsvcs-6.5.18 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries Package: libnetsvcs-dev Architecture: any Section: libdevel -Depends: libnetsvcs-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-6.5.18 (= ${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 eed46d3986665..9f6fda36d537b 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,6 +1,6 @@ # Set the version number here. -%define ACEVER 6.5.17 -%define TAOVER 2.5.17 +%define ACEVER 6.5.18 +%define TAOVER 2.5.18 # Conditional build # Default values are diff --git a/TAO/ChangeLogs/TAO-2_5_18 b/TAO/ChangeLogs/TAO-2_5_18 new file mode 100644 index 0000000000000..e290aded3abc0 --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_5_18 @@ -0,0 +1,96 @@ +commit e8adb6ba4621e3eb9b25707c8757ba6a76656ffa +Author: Adam Mitz +Date: Fri Aug 5 10:16:59 2022 -0500 + + NEWS for next ACE6+TAO2 release + +commit 9e624020cf57ba399aadf1847b665e17a64ded25 +Author: Adam Mitz +Date: Tue Jun 28 08:47:31 2022 -0600 + + Merge pull request #1868 from mitza-oci/seq-codegen-any + + Updated sequence Any operators code generation + + (cherry picked from commit b4822ca137fe6622bbe7d2e3a48737a7d4bec21a) + + # Conflicts: + # TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp + +commit 7f2438525abef7fafb1ef2dabc53d16850c2f7d6 +Author: Adam Mitz +Date: Mon Jun 27 11:15:20 2022 -0600 + + Merge pull request #1865 from mitza-oci/no_ifdef_anyops_ns + + Removed ACE_ANY_OPS_USE_NAMESPACE as a compile-time option + + (cherry picked from commit dbc6154a1b9c2782e78b4d0698364a0780a9a06d) + + # Conflicts: + # ACE/ace/config-win32-borland.h + # TAO/NEWS + # TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp + # TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp + # TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp + +commit 8dcfa002061c49db6327e3c68fbc587e58bebe05 +Author: Adam Mitz +Date: Fri Jun 24 15:13:50 2022 -0600 + + Merge pull request #1864 from mitza-oci/g++12 + + GCC 12 + + (cherry picked from commit 94d132b173807bb55f8c7481a57a523b4f07ba7e) + + # Conflicts: + # .github/workflows/linux.yml + # .github/workflows/macosx.yml + # TAO/NEWS + # TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp + +commit e0f2db3bf37bed348344ca1fff655eab1252a25f +Author: Adam Mitz +Date: Sat Jun 18 15:41:39 2022 -0500 + + Corrected a nullptr that was merged from the TAO 3 branch + +commit 70857a74b9bd658a68b902a0a79abf83a7dea1bb +Author: Adam Mitz +Date: Fri Jun 17 07:40:13 2022 -0600 + + Merge pull request #1859 from mitza-oci/valuetype-vn + + TAO_IDL updates for valuetypes and versioned namespaces + + (cherry picked from commit 587bacedd8b09849a25c3fa368b5fc315fe45ee6) + + # Conflicts: + # TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp + # TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp + # TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp + +commit af898a97d578ae2d68e29f064cd317369b0d04c3 +Author: Johnny Willemsen +Date: Tue Jun 14 09:11:36 2022 +0200 + + Prepare for next 6.5.x release + + * ACE/NEWS: + * TAO/NEWS: diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM index e33cff2b1840d..ebe017409f97f 100644 --- a/TAO/PROBLEM-REPORT-FORM +++ b/TAO/PROBLEM-REPORT-FORM @@ -40,8 +40,8 @@ To: tao-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - TAO VERSION: 2.5.17 - ACE VERSION: 6.5.17 + TAO VERSION: 2.5.18 + ACE VERSION: 6.5.18 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 0416cc64c3360..2fc14ef02f639 100644 --- a/TAO/VERSION.txt +++ b/TAO/VERSION.txt @@ -1,4 +1,4 @@ -This is TAO version 2.5.17, released Tue Jun 14 08:43:48 CEST 2022 +This is TAO version 2.5.18, released Wed Aug 10 08:40:14 CEST 2022 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 8ddceb158b6f3..e2e3f2496a8cf 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -4,8 +4,8 @@ #define TAO_MAJOR_VERSION 2 #define TAO_MINOR_VERSION 5 -#define TAO_MICRO_VERSION 17 -#define TAO_BETA_VERSION 17 -#define TAO_VERSION "2.5.17" -#define TAO_VERSION_CODE 0x20511 +#define TAO_MICRO_VERSION 18 +#define TAO_BETA_VERSION 18 +#define TAO_VERSION "2.5.18" +#define TAO_VERSION_CODE 0x20512 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))