diff options
45 files changed, 796 insertions, 138 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 62a2bf95960..98a0462f881 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -15,11 +15,6 @@ jobs: strategy: matrix: include: - - CC: gcc-4.8 - CXX: g++-4.8 - PackageDeps: g++-4.8 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-16.04 - CC: gcc-6 CXX: g++-6 PackageDeps: g++-6 @@ -45,11 +40,6 @@ jobs: PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU os: ubuntu-18.04 - - CC: clang-5.0 - CXX: clang++-5.0 - PackageDeps: clang-5.0 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - os: ubuntu-16.04 - CC: clang-6.0 CXX: clang++-6.0 PackageDeps: clang-6.0 diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index 96389ef47d2..f0016715f29 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -5,6 +5,7 @@ on: pull_request: schedule: - cron: '0 1 * * SUN' + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -13,11 +14,12 @@ concurrency: jobs: build: strategy: + fail-fast: false matrix: cxxstd: ["03", "11"] + os: [macos-10.15, macos-11.0] include: - - os: macos-10.15 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU + - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU runs-on: ${{ matrix.os }} name: "${{ matrix.os }}-C++${{ matrix.cxxstd }}" env: diff --git a/ACE/ChangeLogs/ACE-6_5_14 b/ACE/ChangeLogs/ACE-6_5_14 new file mode 100644 index 00000000000..2d7a41a1bbb --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_5_14 @@ -0,0 +1,115 @@ +commit 144e40f32a682e4729fb8b1ed773dfed94dd8e12 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Mon Aug 2 16:56:40 2021 -0500 + + make_multicast_ifaddr: prevent buffer overrun from net_if + + fixes #1637 + also removed a preprocessor conditional that was redundant + + (cherry picked from commit 06e2a14d2d98b2a18b50615f4c048cffd49b3bfd) + +commit b2763e7efaacc05dea0190d737644bcf0df61033 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 2 16:00:14 2021 +0200 + + Update NEWS + +commit 985ff7c0791b4f79d2625c56a58ed225ab884c65 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Jul 14 16:15:11 2021 +0200 + + Removed news item, Embarcadero classic compiler is not working + +commit 9604a4a75c1c3bb41b9f420b957b28b69c327b66 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jul 11 19:24:20 2021 +0200 + + Add news item + + * ACE/NEWS: + +commit 27718b5ac6bd219a4cf0ebdc1182c396ee40eb17 +Merge: 8dafd144835 b23362324e9 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Fri Jul 9 14:41:27 2021 -0500 + + Merge pull request #1593 from mitza-oci/install-relative + + [ACE 6] make install: use relative links in prefix/share + +commit 860746a594bf7bd04ee2501a8d8b5c7d678934c7 +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 8 17:26:09 2021 -0500 + + Attempt to Fix Coverity Issues from #840 + + https://github.com/DOCGroup/ACE_TAO/pull/840 + + Because the main set of issues in `coerce_value` was caused by applying + the existing pattern, the issues caused by the existing code should also + be fixed. + +commit 2cbdf73f5418ef30639750f25ca5a1362f943a24 +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 8 19:22:31 2021 -0500 + + IDLv4 Explicitly-named Integer Types + + Ported from https://github.com/DOCGroup/ACE_TAO/pull/840 to ACE6/TAO2. + Also regenerated with Bison 3.7.6 at the same time like in + d5819180d02d76ed3c14c421f02ad69c4d0bab9e in + https://github.com/DOCGroup/ACE_TAO/pull/1594 + +commit b23362324e929b731f3908c2f1d458d16c524f49 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Jul 8 14:04:25 2021 -0500 + + make install: use relative links in prefix/share + +commit 2063860a36b5b235cf681b74e8c3ef4909e2032d +Merge: eff39881ad4 40feeb36f0b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jun 21 15:51:42 2021 +0200 + + Merge pull request #1566 from jwillemsen/jwi-bcc32fix-ace6tao2 + + [ace6] Updated bcc32 version check + +commit 40feeb36f0b550019f2830238d64a521675ea8c4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jun 21 08:42:22 2021 +0200 + + Updated bcc32 version check + + * ACE/ace/post.h: + * ACE/ace/pre.h: + +commit 84438e5c0dfa16596fae1f9247d42e05b95db3c6 +Merge: 705b8d95eb5 bd42ac334e9 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Mon May 24 09:47:58 2021 -0500 + + Merge pull request #1508 from simpsont-oci/ace6tao2_ip_check_fix_v2 + + [ACE6] Fix SocketConnect::ip_check() Concurrency and Too-Early Request Issues for Windows + +commit bd42ac334e90816ed0a8778b9e45c1cc9d1b2447 +Author: Timothy Simpson <simpsont@objectcomputing.com> +Date: Fri May 14 09:00:59 2021 -0500 + + since we're not returning the value of recursing, switch to bool + +commit eef33151c45ae1826b346c0acbb03fca2f843cf6 +Author: Timothy Simpson <simpsont@objectcomputing.com> +Date: Thu May 13 14:29:01 2021 -0500 + + Apply suggestions from code review + + Co-authored-by: Adam Mitz <mitza@objectcomputing.com> + +commit 04d70c6c157074e053e4040d2d869c972be39eff +Author: Timothy Simpson <simpsont@objectcomputing.com> +Date: Thu May 13 13:51:58 2021 -0500 + + fix concurrency and too-early-request issues for windows ip_check diff --git a/ACE/ChangeLogs/ACE-6_5_15 b/ACE/ChangeLogs/ACE-6_5_15 new file mode 100644 index 00000000000..837c2a02fbb --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_5_15 @@ -0,0 +1,111 @@ +commit 91630f5cdb507babf94e0a9e7cc8ac236bc97648 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Sep 17 08:54:01 2021 +0200 + + Update NEWS + +commit 216a00bb8e60d3163dec87e634eabdbd8a6118e3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Sep 9 19:27:16 2021 +0200 + + Update NEWS + +commit f959e309ee75b1b5e51b27e80fb6a0a55cc4dfa1 +Merge: 106e4736533 e2e639121ad +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Mon Sep 6 11:23:46 2021 -0500 + + Merge pull request #1670 from mitza-oci/no-conv-lib-62 + + [ace6tao2] Removed conv_lib.mpb + +commit 106e47365336828900e66d8e33934e0959ef7838 +Merge: d035863b2a8 615284ae6d9 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Mon Sep 6 11:23:10 2021 -0500 + + Merge pull request #1664 from simpsont-oci/atomic_op_gcc_tsan_fixes_and_updated_atomics + + [ACE6] Update ACE_Atomic_Op_GCC to support newer __atomic operations when available + +commit e2e639121adf82de5183688b0d26fd0a6097dd3b +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Tue Aug 31 21:01:43 2021 -0500 + + Removed conv_lib.mpb + + Replaced uses of it with install_lib + + (cherry picked from commit 1bfbc674980869ef05c6fed94c01f291ff5fd7d4) + +commit 615284ae6d9ca661bd1f644b042003dd8e161f30 +Author: Timothy Simpson <simpsont@objectcomputing.com> +Date: Thu Aug 26 12:52:39 2021 -0500 + + make use of clang's compatibility with GCC's __atomic methods + +commit c04bb36209f697dab1f0f46a2868f4f43a5bfe29 +Author: Timothy Simpson <simpsont@objectcomputing.com> +Date: Wed Aug 25 22:45:34 2021 -0500 + + support for newer preferred C++11 style __atomic methods when applicable and load-side synchronization + +commit 2f773602b3a7788e27c0ce05dda02c0eb0326ed2 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Fri Aug 20 15:58:40 2021 -0500 + + Fixed warning in ACE_SOCK_Dgram::make_multicast_ifaddr + +commit 31673b8bcb8ff7e4b8e67f2671deef5a3f32d521 +Merge: b2600884c13 5dc04f8e9ff +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Fri Aug 20 14:51:03 2021 -0500 + + Merge pull request #1657 from jrw972/support-big-sur + + ACE 6 doesn't support Big Sur + +commit f416adcbdc76f096ae34bb984a50c1070e957701 +Author: Justin R. Wilson <wilsonj@objectcomputing.com> +Date: Fri Aug 20 11:00:40 2021 -0500 + + ACE 6 doesn't support Big Sur + + Problem + ------- + + ACE 6 doesn't compile for macOS Big Sur. + + Solution + -------- + + Update platform_macosx.GNU and related files to support Catalina and + Big Sur. + +commit ac4db46a6b9505ec3f2fe0e6792b9a08a8534843 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 16 16:20:25 2021 +0200 + + Updated Embarcadero C++ Compiler checks + + * ACE/ace/Compression/rle/RLECompressor.cpp: + * ACE/ace/post.h: + * ACE/ace/pre.h: + +commit b344abde2f0676ecda529735264f1c41e3c5ee94 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 16 08:32:08 2021 +0200 + + Updated Embarcadero version checks + +commit 38bfd5a69ed2f584e436980b9fe309935010919f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 16 08:28:09 2021 +0200 + + Updated Embarcadero version checks + +commit 448e4b00edd5d4e5e7ccdbbfcb97dbc686ecfdb5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Aug 4 08:48:30 2021 +0200 + + Updated for next release @@ -1,3 +1,16 @@ +USER VISIBLE CHANGES BETWEEN ACE-6.5.15 and ACE-6.5.16 +====================================================== + +USER VISIBLE CHANGES BETWEEN ACE-6.5.14 and ACE-6.5.15 +====================================================== + +. Add support for Embarcadero C++ Builder 11.0 Alexandria using + the bcc32 compiler + +. Add support for MacOSX Big Sur + +. Improved ACE_Atomic implementation for g++ + USER VISIBLE CHANGES BETWEEN ACE-6.5.13 and ACE-6.5.14 ====================================================== diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index b2185061816..808bd9ef0c7 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.13 + ACE VERSION: 6.5.15 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 62e8c74e470..f1ed65e3af7 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 6.5.13, released Fri May 14 09:39:28 CEST 2021 +This is ACE version 6.5.15, released Wed Sep 29 09:17:26 CEST 2021 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/Atomic_Op_GCC_T.inl b/ACE/ace/Atomic_Op_GCC_T.inl index 90f7c4839c2..adc637e7a71 100644 --- a/ACE/ace/Atomic_Op_GCC_T.inl +++ b/ACE/ace/Atomic_Op_GCC_T.inl @@ -1,6 +1,11 @@ // -*- C++ -*- #if defined (ACE_HAS_GCC_ATOMIC_BUILTINS) && (ACE_HAS_GCC_ATOMIC_BUILTINS == 1) +#if (defined (__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) \ + || (defined (__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))) +# define USE_GCC_CPP11_ATOMICS +#endif + ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> @@ -29,91 +34,149 @@ template <typename T> ACE_INLINE T ACE_Atomic_Op_GCC<T>::operator++ (void) { - return __sync_add_and_fetch (&this->value_, 1); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_add_fetch (&value_, 1, __ATOMIC_ACQ_REL); +#else + return __sync_add_and_fetch (&value_, 1); +#endif } template <typename T> ACE_INLINE T ACE_Atomic_Op_GCC<T>::operator++ (int) { - return __sync_fetch_and_add (&this->value_, 1); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_fetch_add (&value_, 1, __ATOMIC_ACQ_REL); +#else + return __sync_fetch_and_add (&value_, 1); +#endif } template <typename T> ACE_INLINE T ACE_Atomic_Op_GCC<T>::operator-- (void) { - return __sync_sub_and_fetch (&this->value_, 1); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_sub_fetch (&value_, 1, __ATOMIC_ACQ_REL); +#else + return __sync_sub_and_fetch (&value_, 1); +#endif } template <typename T> ACE_INLINE T ACE_Atomic_Op_GCC<T>::operator-- (int) { - return __sync_fetch_and_sub (&this->value_, 1); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_fetch_sub (&value_, 1, __ATOMIC_ACQ_REL); +#else + return __sync_fetch_and_sub (&value_, 1); +#endif } template <typename T> ACE_INLINE T ACE_Atomic_Op_GCC<T>::operator+= (T rhs) { - return __sync_add_and_fetch (&this->value_, rhs); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_add_fetch (&value_, rhs, __ATOMIC_ACQ_REL); +#else + return __sync_add_and_fetch (&value_, rhs); +#endif } template <typename T> ACE_INLINE T ACE_Atomic_Op_GCC<T>::operator-= (T rhs) { - return __sync_sub_and_fetch (&this->value_, rhs); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_sub_fetch (&value_, rhs, __ATOMIC_ACQ_REL); +#else + return __sync_sub_and_fetch (&value_, rhs); +#endif } template <typename T> ACE_INLINE bool ACE_Atomic_Op_GCC<T>::operator== (T rhs) const { - return (this->value_ == rhs); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_load_n (&value_, __ATOMIC_CONSUME) == rhs; +#else + __sync_synchronize(); + return value_ == rhs; +#endif } template <typename T> ACE_INLINE bool ACE_Atomic_Op_GCC<T>::operator!= (T rhs) const { - return (this->value_ != rhs); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_load_n (&value_, __ATOMIC_CONSUME) != rhs; +#else + __sync_synchronize(); + return value_ != rhs; +#endif } template <typename T> ACE_INLINE bool ACE_Atomic_Op_GCC<T>::operator>= (T rhs) const { - return (this->value_ >= rhs); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_load_n (&value_, __ATOMIC_CONSUME) >= rhs; +#else + __sync_synchronize(); + return value_ >= rhs; +#endif } template <typename T> ACE_INLINE bool ACE_Atomic_Op_GCC<T>::operator> (T rhs) const { - return (this->value_ > rhs); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_load_n (&value_, __ATOMIC_CONSUME) > rhs; +#else + __sync_synchronize(); + return value_ > rhs; +#endif } template <typename T> ACE_INLINE bool ACE_Atomic_Op_GCC<T>::operator<= (T rhs) const { - return (this->value_ <= rhs); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_load_n (&value_, __ATOMIC_CONSUME) <= rhs; +#else + __sync_synchronize(); + return value_ <= rhs; +#endif } template <typename T> ACE_INLINE bool ACE_Atomic_Op_GCC<T>::operator< (T rhs) const { - return (this->value_ < rhs); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_load_n (&value_, __ATOMIC_CONSUME) < rhs; +#else + __sync_synchronize(); + return value_ < rhs; +#endif } template <typename T> ACE_INLINE ACE_Atomic_Op_GCC<T> & ACE_Atomic_Op_GCC<T>::operator= (T rhs) { - (void) __sync_lock_test_and_set (&this->value_, rhs); +#if defined (USE_GCC_CPP11_ATOMICS) + __atomic_store_n (&value_, rhs, __ATOMIC_RELEASE); +#else + (void) __sync_lock_test_and_set (&value_, rhs); +#endif return *this; } @@ -122,7 +185,11 @@ ACE_INLINE ACE_Atomic_Op_GCC<T> & ACE_Atomic_Op_GCC<T>::operator= ( const ACE_Atomic_Op_GCC<T> &rhs) { - (void) __sync_lock_test_and_set (&this->value_, rhs.value_); +#if defined (USE_GCC_CPP11_ATOMICS) + __atomic_store_n (&value_, __atomic_load_n (&rhs.value_, __ATOMIC_CONSUME), __ATOMIC_RELEASE); +#else + (void) __sync_lock_test_and_set (&value_, rhs.value_); +#endif return *this; } @@ -130,23 +197,34 @@ template <typename T> ACE_INLINE T ACE_Atomic_Op_GCC<T>::exchange (T newval) { - return __sync_val_compare_and_swap (&this->value_, this->value_, newval); +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_exchange_n (&value_, newval, __ATOMIC_ACQ_REL); +#else + return __sync_val_compare_and_swap (&value_, value_, newval); +#endif } template <typename T> ACE_INLINE T ACE_Atomic_Op_GCC<T>::value (void) const { - return this->value_; +#if defined (USE_GCC_CPP11_ATOMICS) + return __atomic_load_n (&value_, __ATOMIC_CONSUME); +#else + __sync_synchronize(); + return value_; +#endif } template <typename T> ACE_INLINE volatile T & ACE_Atomic_Op_GCC<T>::value_i (void) { - return this->value_; + return value_; } +#undef USE_GCC_CPP11_ATOMICS + ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_GCC_ATOMIC_BUILTINS */ diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h index cdbb58d875b..84085cf4482 100644 --- a/ACE/ace/CDR_Base.h +++ b/ACE/ace/CDR_Base.h @@ -405,10 +405,15 @@ public: }; class Iterator - : public std::iterator<std::bidirectional_iterator_tag, Proxy> - , private IteratorBase + : private IteratorBase { public: + typedef std::bidirectional_iterator_tag iterator_category; + typedef Proxy value_type; + typedef std::ptrdiff_t difference_type; + typedef Proxy* pointer; + typedef Proxy& reference; + explicit Iterator (Fixed *outer, int digit = 0); Proxy operator* (); Iterator &operator+= (std::ptrdiff_t n); @@ -423,10 +428,15 @@ public: }; class ConstIterator - : public std::iterator<std::bidirectional_iterator_tag, Octet> - , private IteratorBase + : public IteratorBase { public: + typedef std::bidirectional_iterator_tag iterator_category; + typedef Octet value_type; + typedef std::ptrdiff_t difference_type; + typedef Octet* pointer; + typedef Octet& reference; + explicit ConstIterator (const Fixed *outer, int digit = 0); Octet operator* (); ConstIterator &operator+= (std::ptrdiff_t n); diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp index cbed31d58f1..148f5ddc28b 100644 --- a/ACE/ace/Compression/rle/RLECompressor.cpp +++ b/ACE/ace/Compression/rle/RLECompressor.cpp @@ -1,7 +1,7 @@ #include "RLECompressor.h" #include "ace/OS_NS_string.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option push -w-8072 #endif @@ -140,6 +140,6 @@ ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_RLECompressor, ACE_SYNCH_M // Close versioned namespace, if enabled by the user. ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option pop #endif diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index a3578099074..d6296a20100 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -721,7 +721,8 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq, ACE_HTONL (interface_addr.get_ip_address ()); #else ifreq if_address; - ACE_OS::strncpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if), sizeof if_address.ifr_name); + ACE_OS::strncpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if), sizeof (if_address.ifr_name) - 1); + if_address.ifr_name[(sizeof if_address.ifr_name) - 1] = '\0'; if (ACE_OS::ioctl (this->get_handle (), SIOCGIFADDR, &if_address) == -1) diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index ec0848ca684..bbd1a4a3d89 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 13 -#define ACE_BETA_VERSION 13 -#define ACE_VERSION "6.5.13" -#define ACE_VERSION_CODE 0x6050d +#define ACE_MICRO_VERSION 15 +#define ACE_BETA_VERSION 15 +#define ACE_VERSION "6.5.15" +#define ACE_VERSION_CODE 0x6050f #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 88b54d708cd..fea108caa44 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -145,24 +145,16 @@ # endif /* !__MT__ */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#if (__BORLANDC__ <= 0x750) -# define ACE_LACKS_ISWCTYPE -# define ACE_LACKS_ISCTYPE -#endif - -#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x750) -# define ACE_LACKS_STRTOK_R -#endif +#define ACE_LACKS_ISWCTYPE +#define ACE_LACKS_ISCTYPE +#define ACE_LACKS_STRTOK_R +#define ACE_LACKS_ASCTIME_R #if (__BORLANDC__ <= 0x740) # define ACE_LACKS_LOCALTIME_R # define ACE_LACKS_GMTIME_R #endif -#if (__BORLANDC__ <= 0x750) -# define ACE_LACKS_ASCTIME_R -#endif - #define ACE_WCSDUP_EQUIVALENT ::_wcsdup #define ACE_STRCASECMP_EQUIVALENT ::stricmp #define ACE_STRNCASECMP_EQUIVALENT ::strnicmp diff --git a/ACE/ace/post.h b/ACE/ace/post.h index 67049ff8354..13f7d2b1986 100644 --- a/ACE/ace/post.h +++ b/ACE/ace/post.h @@ -15,7 +15,7 @@ # pragma pack (pop) #elif defined (__BORLANDC__) # pragma option pop -# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option pop # endif # pragma nopushoptwarn diff --git a/ACE/ace/pre.h b/ACE/ace/pre.h index 0b5f37caa16..1ce0832da5d 100644 --- a/ACE/ace/pre.h +++ b/ACE/ace/pre.h @@ -17,7 +17,7 @@ # pragma pack (push, 8) #elif defined (__BORLANDC__) # pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig -# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) // False warning: Function defined with different linkage, reported to // Embarcadero as QC 117740 # pragma option push -w-8127 diff --git a/ACE/bin/MakeProjectCreator/config/conv_lib.mpb b/ACE/bin/MakeProjectCreator/config/conv_lib.mpb deleted file mode 100644 index 3d4221c5baf..00000000000 --- a/ACE/bin/MakeProjectCreator/config/conv_lib.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -project { - specific { - install_this_target = 1 - } -} diff --git a/ACE/debian/control b/ACE/debian/control index 12d6d3e763c..a9ebd8daf5f 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.13 +Package: libace-6.5.15 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.13 (= ${binary:Version}), ${misc:Depends} +Depends: libace-6.5.15 (= ${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.13 +Package: libace-ssl-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-6.5.15 (= ${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.13 +Package: libace-rmcast-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-6.5.15 (= ${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.13 +Package: libace-tmcast-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-6.5.15 (= ${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.13 +Package: libace-htbp-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-6.5.15 (= ${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.13 +Package: libace-inet-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-6.5.15 (= ${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.13 +Package: libace-inet-ssl-6.5.15 Architecture: any Section: libs -Depends: libace-inet-6.5.13, libace-ssl-6.5.13, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-6.5.15, libace-ssl-6.5.15, ${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.13 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-6.5.15 (= ${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.13 +Package: libacexml-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-6.5.15 (= ${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.13 +Package: libace-xml-utils-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-6.5.15 (= ${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.13 +Package: libkokyu-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-6.5.15 (= ${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.13 +Package: libace-xtreactor-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-6.5.15 (= ${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.13 +Package: libace-tkreactor-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-6.5.15 (= ${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.13 +Package: libace-flreactor-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends} +Depends: libace-flreactor-6.5.15 (= ${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.13 +Package: libace-foxreactor-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-6.5.15 (= ${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.13 +Package: libnetsvcs-6.5.15 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-6.5.15 (= ${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/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index f318adace60..0e2d18e20e5 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -20,19 +20,28 @@ MACOS_CODENAME_VER_10_11 := elcapitan MACOS_CODENAME_VER_10_12 := sierra MACOS_CODENAME_VER_10_13 := highsierra MACOS_CODENAME_VER_10_14 := mojave -MACOS_CODENAME_VER_latest := mojave +MACOS_CODENAME_VER_10_15 := catalina +MACOS_CODENAME_VER_10_latest := catalina +MACOS_CODENAME_VER_11_5 := bigsur +MACOS_CODENAME_VER_11_latest := bigsur MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) ifeq ($(MACOS_MAJOR_VERSION),10) - ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 14; echo $$?),0) + ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 15; echo $$?),0) ## if the detected version is greater than the latest know version, ## just use the latest known version - MACOS_CODENAME = $(MACOS_CODENAME_VER_latest) + MACOS_CODENAME = $(MACOS_CODENAME_VER_10_latest) else ifeq ($(shell test $(MACOS_MINOR_VERSION) -lt 2; echo $$?),0) ## Unsupported minor version $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) endif +else ifeq ($(MACOS_MAJOR_VERSION),11) + ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 2; echo $$?),0) + ## if the detected version is greater than the latest know version, + ## just use the latest known version + MACOS_CODENAME = $(MACOS_CODENAME_VER_11_latest) + endif else ## Unsupported major version $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) diff --git a/ACE/include/makeinclude/platform_macosx_bigsur.GNU b/ACE/include/makeinclude/platform_macosx_bigsur.GNU new file mode 100644 index 00000000000..6da5a8c610b --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_bigsur.GNU @@ -0,0 +1 @@ +include $(ACE_ROOT)/include/makeinclude/platform_macosx_catalina.GNU diff --git a/ACE/include/makeinclude/platform_macosx_catalina.GNU b/ACE/include/makeinclude/platform_macosx_catalina.GNU new file mode 100644 index 00000000000..d3f430d9c7f --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_catalina.GNU @@ -0,0 +1 @@ +include $(ACE_ROOT)/include/makeinclude/platform_macosx_mojave.GNU diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index b0306707f07..ada8cf952bf 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.13 -%define TAOVER 2.5.13 +%define ACEVER 6.5.15 +%define TAOVER 2.5.15 # Conditional build # Default values are diff --git a/TAO/ChangeLogs/TAO-2_5_14 b/TAO/ChangeLogs/TAO-2_5_14 new file mode 100644 index 00000000000..c09fbbd0f21 --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_5_14 @@ -0,0 +1,192 @@ +commit 8f7fa3d6e2ae2e10690e8d54197ff716d5344d77 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 2 16:00:46 2021 +0200 + + Update NEWS + +commit 648d530d787acf85b9b85f0e30f3ed114ff10294 +Merge: 4a2d6b0bd3f e3bafb9e3cb +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Fri Jul 23 18:11:40 2021 -0500 + + Merge pull request #1634 from iguessthislldo/igtd/idl-features6 + + [ACE6] Fix Coverity Issue + +commit e3bafb9e3cbedcdd7d4c6fb48e61101b92b390fe +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Fri Jul 23 11:55:34 2021 -0500 + + Fix Coverity Issue + +commit 4a2d6b0bd3f50e7628fbed8ce58eb520685b578d +Merge: ac9ef6c7bb4 dc2f407fabf +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 22 18:34:10 2021 -0500 + + Merge pull request #1630 from mitza-oci/taoidlfe + + [ACE6] Updated tao_idl_fe base project + +commit d082b97a344ac018d29ca2696bdf265a44148160 +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 22 15:24:09 2021 -0500 + + Refactor DRV_cpp_putarg to Avoid ACE_TCHAR + +commit dc2f407fabf64f80154b6b61bd7db6fb54b8f2c5 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Jul 22 15:00:34 2021 -0500 + + Updated tao_idl_fe base project. + + Projects that use tao_idl_fe need TAO_ROOT on preprocessor include + path, due to the recent change to idl_defines.h including + idl_features.h from tao. + +commit 5fb27b193352b656f91a609b8d57806b536cd9ab +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 22 02:39:57 2021 -0500 + + Escape Double Quotes in tao_idl PP Args on Windows + + This is a backport of https://github.com/DOCGroup/ACE_TAO/pull/1627 + +commit 8620f1886211103da60154c16e55149f1b9862ad +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Tue Jul 20 20:39:18 2021 -0500 + + Header File for TAO_IDL Supported IDL Features + + Backport of https://github.com/DOCGroup/ACE_TAO/pull/1621 + + Get information about what the IDL compiler is capable of, similarly to + the "version" standard header in C++. + + In C++ it can be used like this if you want to be compatible with older + versions of TAO: + + ```c++ + #include "tao/orbconf.h" + #if defined TAO_HAS_IDL_FEATURES && TAO_HAS_IDL_FEATURES + // Use this macro if you are using something that's not the max possible + // version. + # define TAO_IDL_IDL_VERSION 0x30000 + # include "tao/idl_features.h" + # if defined TAO_IDL_HAS_FEATURE && TAO_IDL_HAS_FEATURE + # define USE_FEATURE + # endif + #endif + ``` + + In IDL it can be used like this if you want to be compatible with older + versions of TAO: + + ```c++ + #if defined __TAO_IDL_FEATURES + # include __TAO_IDL_FEATURES + # if defined TAO_IDL_HAS_FEATURE && TAO_IDL_HAS_FEATURE + # define USE_FEATURE + # endif + #endif + ``` + +commit 27718b5ac6bd219a4cf0ebdc1182c396ee40eb17 +Merge: 8dafd144835 b23362324e9 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Fri Jul 9 14:41:27 2021 -0500 + + Merge pull request #1593 from mitza-oci/install-relative + + [ACE 6] make install: use relative links in prefix/share + +commit 8d789a12c3180f0308105054eeead7f5c181811c +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Fri Jul 9 14:25:27 2021 -0500 + + Update TAO/NEWS + +commit 3675e79e90533dfc63626ee0c4f0116d1ae9c902 +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 8 22:30:42 2021 -0500 + + Replace a Stray nullptr with 0 + +commit 74641777190b74d7e2b2e7a142299771f1086289 +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 8 20:22:38 2021 -0500 + + ast_expression.cpp: Fix Uninitialized Value + +commit 2100bb4d9d73a251171b0d3808c059483314b885 +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 8 19:31:41 2021 -0500 + + TAO/TAO_IDL/regen.pl: Exit with Error + +commit 860746a594bf7bd04ee2501a8d8b5c7d678934c7 +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 8 17:26:09 2021 -0500 + + Attempt to Fix Coverity Issues from #840 + + https://github.com/DOCGroup/ACE_TAO/pull/840 + + Because the main set of issues in `coerce_value` was caused by applying + the existing pattern, the issues caused by the existing code should also + be fixed. + +commit 1655769f404204483e8ee28a686f765df332be71 +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 1 14:41:42 2021 -0500 + + Fix Integer Literals for Windows + +commit 90531b1dd0bcf226497542cd414c4a3b03456c10 +Author: Claus Klein <claus.klein@rohde-schwarz.com> +Date: Tue Jul 6 16:32:48 2021 +0200 + + add missed header Basic_Types_IDLv4 to list + +commit 2cbdf73f5418ef30639750f25ca5a1362f943a24 +Author: Fred Hornsey <hornseyf@objectcomputing.com> +Date: Thu Jul 8 19:22:31 2021 -0500 + + IDLv4 Explicitly-named Integer Types + + Ported from https://github.com/DOCGroup/ACE_TAO/pull/840 to ACE6/TAO2. + Also regenerated with Bison 3.7.6 at the same time like in + d5819180d02d76ed3c14c421f02ad69c4d0bab9e in + https://github.com/DOCGroup/ACE_TAO/pull/1594 + +commit b23362324e929b731f3908c2f1d458d16c524f49 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Jul 8 14:04:25 2021 -0500 + + make install: use relative links in prefix/share + +commit 9b6353b6f0b64b46099ef57cb8e6305f6ea0cabc +Author: Phil Mesnier <mesnierp@ociweb.com> +Date: Tue Jun 15 13:38:28 2021 -0500 + + more whitespace cleanup + + Co-authored-by: Fred Hornsey <hornseyf@objectcomputing.com> + +commit b1f713b0baf1e199151ae5b54cdbbe8a159cbc1a +Author: Phil Mesnier <mesnierp@objectcomputing.com> +Date: Tue Jun 15 08:22:10 2021 -0500 + + applying suggested whitespace changes. + +commit 2e2cb43b91ee0c0903feb7a25f33f98bffb01931 +Author: Phil Mesnier <mesnierp@objectcomputing.com> +Date: Mon Jun 14 17:00:30 2021 -0500 + + Fuzz fix + +commit f39d2560e0c5d304fee5cd90b2ec9e52c1482e69 +Author: Phil Mesnier <mesnierp@objectcomputing.com> +Date: Mon Jun 14 16:51:26 2021 -0500 + + Fix and test for incorrect handling of empty enum-based union labels that happen to alias the default case. diff --git a/TAO/ChangeLogs/TAO-2_5_15 b/TAO/ChangeLogs/TAO-2_5_15 new file mode 100644 index 00000000000..f2b532e4a29 --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_5_15 @@ -0,0 +1,77 @@ +commit e2e639121adf82de5183688b0d26fd0a6097dd3b +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Tue Aug 31 21:01:43 2021 -0500 + + Removed conv_lib.mpb + + Replaced uses of it with install_lib + + (cherry picked from commit 1bfbc674980869ef05c6fed94c01f291ff5fd7d4) + +commit 01c351d947d384751554b134232ca98a9e2f0a42 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Aug 26 16:35:59 2021 -0500 + + update for ace6tao2 branch + +commit b04549c0a1ccef03e8ebc08b2c3e7875d5147772 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Aug 26 16:32:34 2021 -0500 + + annotest_idl.mpc: simplify using tao_idl_fe.mpb now that it's fixed + + (cherry picked from commit b4b2c11a6121786288b489eca3e2f155bea26167) + +commit ddf34497171687b3e7310714a3efd6da96f8439a +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Aug 26 16:20:30 2021 -0500 + + Unit test for TAO_IDL_FE's AST + + (cherry picked from commit 5e2989a4d63b05cab291bd99acf2fdb00cb0578e) + +commit 8d13e38185201f272e619113cc901319d2319c9c +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Aug 26 16:17:44 2021 -0500 + + removed invalid base project from tao_idl_fe + + (cherry picked from commit 26c8e7643c6623ffee6c902203ec9b55c7f216cf) + +commit 3a344501bebb195b1728c209d3e162622e8ec506 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Aug 26 08:48:34 2021 -0500 + + TAO_IDL_FE: NT_fixed needs owns_base_type in typedef + +commit ee7ce31bfef2fff492986fb7a585d0e0804ae72e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 16 17:01:15 2021 +0200 + + Updated Embarcadero compiler checks + + * TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp: + * TAO/tests/Bug_3574_Regression/test.cpp: + +commit c2b320bec71aa87b0f58251df05146d7cf84f459 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 16 16:49:28 2021 +0200 + + Updated Embarcadero compiler checks + + * TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h: + * TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h: + +commit 050a5a59990fd781fe33e464c82af448dbb6f32e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 16 16:34:29 2021 +0200 + + Updated compiler check + + * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp: + +commit 448e4b00edd5d4e5e7ccdbbfcb97dbc686ecfdb5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Aug 4 08:48:30 2021 +0200 + + Updated for next release diff --git a/TAO/MPC/config/tao_idl_fe.mpb b/TAO/MPC/config/tao_idl_fe.mpb index bcc73c92ef9..ec69567b46f 100644 --- a/TAO/MPC/config/tao_idl_fe.mpb +++ b/TAO/MPC/config/tao_idl_fe.mpb @@ -1,5 +1,5 @@ // -*- MPC -*- -project: acelib, conv_lib { +project: acelib { includes += $(TAO_ROOT)/TAO_IDL/fe $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT) after += TAO_IDL_FE libs += TAO_IDL_FE @@ -1,3 +1,12 @@ +USER VISIBLE CHANGES BETWEEN TAO-2.5.15 and TAO-2.5.16 +====================================================== + +USER VISIBLE CHANGES BETWEEN TAO-2.5.14 and TAO-2.5.15 +====================================================== + +. Add support for Embarcadero C++ Builder 11.0 Alexandria using + the bcc32 compiler + USER VISIBLE CHANGES BETWEEN TAO-2.5.13 and TAO-2.5.14 ====================================================== @@ -8,8 +17,8 @@ USER VISIBLE CHANGES BETWEEN TAO-2.5.13 and TAO-2.5.14 . Added the `tao/idl_features.h` header file for getting the IDL features supported by TAO_IDL. See the file for example usage. - -. Fix empty case evaluation on unions with enum discriminators + +. Fix empty case evaluation on unions with enum discriminators USER VISIBLE CHANGES BETWEEN TAO-2.5.12 and TAO-2.5.13 ====================================================== diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM index faa2ad4b4de..2475376e942 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.13 - ACE VERSION: 6.5.13 + TAO VERSION: 2.5.15 + ACE VERSION: 6.5.15 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp index 8ff7cb8321e..fa3157e0925 100644 --- a/TAO/TAO_IDL/ast/ast_field.cpp +++ b/TAO/TAO_IDL/ast/ast_field.cpp @@ -103,6 +103,7 @@ AST_Field::AST_Field (AST_Type *ft, this->owns_base_type_ = fnt == AST_Decl::NT_array || fnt == AST_Decl::NT_sequence + || fnt == AST_Decl::NT_fixed || fnt == AST_Decl::NT_param_holder; if (fnt == AST_Decl::NT_param_holder) @@ -135,6 +136,7 @@ AST_Field::AST_Field (AST_Decl::NodeType nt, this->owns_base_type_ = fnt == AST_Decl::NT_array || fnt == AST_Decl::NT_sequence + || fnt == AST_Decl::NT_fixed || fnt == AST_Decl::NT_param_holder; if (fnt == AST_Decl::NT_param_holder) diff --git a/TAO/TAO_IDL/tao_idl_be.mpc b/TAO/TAO_IDL/tao_idl_be.mpc index a121b594e73..5328677f6d0 100644 --- a/TAO/TAO_IDL/tao_idl_be.mpc +++ b/TAO/TAO_IDL/tao_idl_be.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- -project(TAO_IDL_BE) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE dynamicflags += TAO_IDL_BE_BUILD_DLL includes += $(TAO_ROOT) @@ -53,7 +53,7 @@ project(TAO_IDL_BE) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe } } -project(TAO_IDL_BE_VIS_A) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_A) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_A dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE @@ -82,7 +82,7 @@ project(TAO_IDL_BE_VIS_A) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_C) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_C) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_C dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_A @@ -112,7 +112,7 @@ project(TAO_IDL_BE_VIS_C) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_E) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_E) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_E dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_C @@ -142,7 +142,7 @@ project(TAO_IDL_BE_VIS_E) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_I) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_I) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_I dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_E @@ -172,7 +172,7 @@ project(TAO_IDL_BE_VIS_I) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_O) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_O) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_O dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_I @@ -200,7 +200,7 @@ project(TAO_IDL_BE_VIS_O) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_S) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_S) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_S dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_O @@ -231,7 +231,7 @@ project(TAO_IDL_BE_VIS_S) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_U) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_U) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_U dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_S @@ -260,7 +260,7 @@ project(TAO_IDL_BE_VIS_U) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_i } } -project(TAO_IDL_BE_VIS_V) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE_VIS_V) : acelib, install_lib, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE_VIS_V dynamicflags += TAO_IDL_BE_BUILD_DLL after += TAO_IDL_BE_VIS_U diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc index 6875856ee17..64074b3d952 100644 --- a/TAO/TAO_IDL/tao_idl_fe.mpc +++ b/TAO/TAO_IDL/tao_idl_fe.mpc @@ -53,7 +53,7 @@ project(TAO_IDL_GEN) { } } -project(TAO_IDL_FE) : acelib, conv_lib, tao_output { +project(TAO_IDL_FE) : acelib, install_lib, tao_output { sharedname = TAO_IDL_FE dynamicflags += TAO_IDL_FE_BUILD_DLL includes += $(TAO_ROOT) diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt index c51ba11733e..d02d28b8929 100644 --- a/TAO/VERSION.txt +++ b/TAO/VERSION.txt @@ -1,4 +1,4 @@ -This is TAO version 2.5.13, released Fri May 14 09:39:28 CEST 2021 +This is TAO version 2.5.15, released Wed Sep 29 09:17:26 CEST 2021 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/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst index 46bba23e670..fb439b2b43e 100644 --- a/TAO/bin/tao_orb_tests.lst +++ b/TAO/bin/tao_orb_tests.lst @@ -509,3 +509,4 @@ TAO/DevGuideExamples/AMH/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO TAO/DevGuideExamples/AMH_AMI/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO TAO/tests/IDLv4/annotations/run_test.pl TAO/tests/IDLv4/explicit_ints/run_test.pl +TAO/tests/AST_Unit_Tests/run_test.pl diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc index 8e72e8939ff..3960128314c 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc @@ -1,4 +1,4 @@ -project(*Lib): orbsvcslib, orbsvcs_output, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, install, svc_utils { +project(*Lib): orbsvcslib, orbsvcs_output, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, install, svc_utils { sharedname = TAO_ReplicationManagerLib dynamicflags += TAO_REPLICATIONMANAGERLIB_BUILD_DLL diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc index 3446c2c6ff2..0dcc70aa38e 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc @@ -13,7 +13,7 @@ project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client, } } -project(TAO_IFR_BE) : taolib, tao_output, conv_lib, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_idl_fe, svc_utils { +project(TAO_IFR_BE) : taolib, tao_output, install_lib, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_idl_fe, svc_utils { sharedname = TAO_IFR_BE dynamicflags += TAO_IFR_BE_BUILD_DLL diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index bf8b9c5de39..bb83939e52d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -1,4 +1,4 @@ -project(Async_ImR_Client_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, messaging, tao_versioning_idl_defaults { +project(Async_ImR_Client_IDL) : orbsvcslib, orbsvcs_output, install_lib, valuetype, portableserver, messaging, tao_versioning_idl_defaults { sharedname = TAO_Async_ImR_Client_IDL dynamicflags += ASYNC_IMR_CLIENT_BUILD_DLL @@ -32,7 +32,7 @@ project(Async_ImR_Client_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, } -project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, dynamicinterface, portableserver, messaging, tao_versioning_idl_defaults { +project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, install_lib, valuetype, dynamicinterface, portableserver, messaging, tao_versioning_idl_defaults { sharedname = TAO_ImR_Activator_IDL dynamicflags += ACTIVATOR_IDL_BUILD_DLL after += Async_ImR_Client_IDL @@ -54,7 +54,7 @@ project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, dy } } -project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, messaging, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro,tao_versioning_idl_defaults { +project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, install_lib, valuetype, portableserver, messaging, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro,tao_versioning_idl_defaults { sharedname = TAO_ImR_Locator_IDL after += ImR_Activator_IDL libs += TAO_ImR_Activator_IDL TAO_Async_ImR_Client_IDL @@ -78,7 +78,7 @@ project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, port } } -project(ImR_Activator) : orbsvcslib, orbsvcs_output, conv_lib, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, valuetype, portableserver, messaging, dynamicinterface, pi, codecfactory, svc_utils { +project(ImR_Activator) : orbsvcslib, orbsvcs_output, install_lib, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, valuetype, portableserver, messaging, dynamicinterface, pi, codecfactory, svc_utils { sharedname = TAO_ImR_Activator dynamicflags += ACTIVATOR_BUILD_DLL after += ImR_Locator_IDL @@ -97,7 +97,7 @@ project(ImR_Activator) : orbsvcslib, orbsvcs_output, conv_lib, acexml, avoids_mi } } -project(ImR_Locator) : orbsvcslib, orbsvcs_output, conv_lib, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, async_iortable, portableserver, messaging, svc_utils, acexml, iormanip, dynamicinterface { +project(ImR_Locator) : orbsvcslib, orbsvcs_output, install_lib, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, async_iortable, portableserver, messaging, svc_utils, acexml, iormanip, dynamicinterface { sharedname = TAO_ImR_Locator dynamicflags += LOCATOR_BUILD_DLL after += ImR_Locator_IDL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp index c5c6d1097c4..845e6e62980 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp @@ -340,7 +340,7 @@ TAO_Port_Utils<T>::create_entry (const char *id, return T::_narrow (obj.in ()); } -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) // Borland gives warnings about argument not used on the construct as used // for the other compilers. This has been reported to Borland, adding // a workaround to suppress these warnings so that the real important ones diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h index 67021c98ab8..50ee750f958 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h @@ -21,7 +21,7 @@ #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option push -w-8022 #endif @@ -68,7 +68,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option pop #endif diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h index d8e61bda16b..1834a3ce004 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h @@ -18,7 +18,7 @@ #include "orbsvcs/Notify/Default_Factory.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option push -w-8022 #endif @@ -50,7 +50,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option pop #endif diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp index 7c80f15b44c..6780dab114b 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp @@ -10,7 +10,7 @@ #include "DllOrb.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option push -w-8057 #endif @@ -231,6 +231,6 @@ ACE_TMAIN(int, ACE_TCHAR **argv) return 0; } -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option pop #endif diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index 61d42672ccc..dc51e2195d4 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 13 -#define TAO_BETA_VERSION 13 -#define TAO_VERSION "2.5.13" -#define TAO_VERSION_CODE 0x2050d +#define TAO_MICRO_VERSION 15 +#define TAO_BETA_VERSION 15 +#define TAO_VERSION "2.5.15" +#define TAO_VERSION_CODE 0x2050f #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/TAO/tests/AST_Unit_Tests/.gitignore b/TAO/tests/AST_Unit_Tests/.gitignore new file mode 100644 index 00000000000..8e7d97b1527 --- /dev/null +++ b/TAO/tests/AST_Unit_Tests/.gitignore @@ -0,0 +1 @@ +/AST_Unit_Tests diff --git a/TAO/tests/AST_Unit_Tests/AST_Unit_Tests.cpp b/TAO/tests/AST_Unit_Tests/AST_Unit_Tests.cpp new file mode 100644 index 00000000000..33ac27086d6 --- /dev/null +++ b/TAO/tests/AST_Unit_Tests/AST_Unit_Tests.cpp @@ -0,0 +1,30 @@ +#include "../Sequence_Unit_Tests/test_macros.h" + +#include <ast_fixed.h> +#include <ast_typedef.h> +#include <fe_extern.h> +#include <utl_identifier.h> + +#include <cstdlib> + +int test_fixed_typedef () +{ + Identifier id_fixed ("fixed"); + UTL_ScopedName name_fixed (&id_fixed, 0); + AST_Expression digits (22), scale (2); + AST_Fixed fixed (&name_fixed, &digits, &scale); + + Identifier id_typedef ("Myfixed"); + UTL_ScopedName name_typedef (&id_typedef, 0); + AST_Typedef td (&fixed, &name_typedef, false, false); + CHECK (td.owns_base_type ()); + return EXIT_SUCCESS; +} + +int ACE_TMAIN (int, ACE_TCHAR *[]) +{ + FE_init (); + int status = EXIT_SUCCESS; + status += test_fixed_typedef (); + return status; +} diff --git a/TAO/tests/AST_Unit_Tests/AST_Unit_Tests.mpc b/TAO/tests/AST_Unit_Tests/AST_Unit_Tests.mpc new file mode 100644 index 00000000000..8f15b2f913c --- /dev/null +++ b/TAO/tests/AST_Unit_Tests/AST_Unit_Tests.mpc @@ -0,0 +1,2 @@ +project: aceexe, tao_idl_fe { +} diff --git a/TAO/tests/AST_Unit_Tests/run_test.pl b/TAO/tests/AST_Unit_Tests/run_test.pl new file mode 100755 index 00000000000..887f4f7bf68 --- /dev/null +++ b/TAO/tests/AST_Unit_Tests/run_test.pl @@ -0,0 +1,29 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; +use strict; + +my $process = 'AST_Unit_Tests'; +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $P = $server->CreateProcess ($process); + +print "Running $process ...\n"; +my $result = $P->Spawn; +if ($result != 0) { + print "FAILED $process\n"; + exit 1; +} + +$result = $P->WaitKill ($server->ProcessStartWaitInterval ()); +if ($result != 0) { + print "FAILED $process\n"; + exit 1; +} + +print "SUCCESS\n"; +exit 0; diff --git a/TAO/tests/Bug_3574_Regression/test.cpp b/TAO/tests/Bug_3574_Regression/test.cpp index acbbf98b012..a949254b5ec 100644 --- a/TAO/tests/Bug_3574_Regression/test.cpp +++ b/TAO/tests/Bug_3574_Regression/test.cpp @@ -1,6 +1,6 @@ #include "tao/StringSeqC.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option push -w-8011 #endif @@ -52,6 +52,6 @@ ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760) # pragma option pop #endif diff --git a/TAO/tests/IDLv4/annotations/annotest_idl.mpc b/TAO/tests/IDLv4/annotations/annotest_idl.mpc index 4f0b53d2071..cace56b57e2 100644 --- a/TAO/tests/IDLv4/annotations/annotest_idl.mpc +++ b/TAO/tests/IDLv4/annotations/annotest_idl.mpc @@ -1,6 +1,4 @@ -project: aceexe { +project: aceexe, tao_idl_fe { exename = * - after += TAO_IDL_FE - libs += TAO_IDL_FE - includes += . $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe $(TAO_ROOT) + includes += . } |