diff options
| author | Erik Sohns <esohns@users.noreply.github.com> | 2023-04-06 11:09:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 11:09:11 +0200 |
| commit | a3a7c2a50383ebf00534c28014704ce57e092821 (patch) | |
| tree | 0de4a576c9929ac6d821462e1693882654f2a456 /ACE | |
| parent | 5625244fd7bb77bafabce28fdec790f51ef50080 (diff) | |
| parent | b50aba0fdce1069b9aa9b1baac9adee396663779 (diff) | |
| download | ATCD-a3a7c2a50383ebf00534c28014704ce57e092821.tar.gz | |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE')
78 files changed, 1140 insertions, 1120 deletions
diff --git a/ACE/ChangeLogs/ACE-7_1_0 b/ACE/ChangeLogs/ACE-7_1_0 new file mode 100644 index 00000000000..4a00ae7d580 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_1_0 @@ -0,0 +1,727 @@ +commit 419b7060685fe7df63f0a91bc64bcaf9848a84fb +Merge: 1a0d76d1c62 adb7bcc177d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 27 12:14:49 2023 +0100 + + Merge pull request #2056 from jwillemsen/jwi-osmmanredef + + Fix redefinition warnings when using mingw64 with ucrt + +commit 1a0d76d1c6251067df8a2c18816b2316b6950dfa +Merge: 7b119e54bbb 26ed33ba535 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 27 11:07:53 2023 +0100 + + Merge pull request #2055 from jwillemsen/jwi-curtfix + + Ruby 3.1 ships ucrt which has a 3 param wcstok + +commit adb7bcc177df26ef326fa00148d64aac810abe32 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 27 10:08:04 2023 +0100 + + Fix redefinition warnings when using mingw64 with ucrt + + * ACE/ace/os_include/sys/os_mman.h: + +commit 26ed33ba535cc904c88c4405f58e7e67343096eb +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 27 08:05:05 2023 +0100 + + Ruby 3.1 ships ucrt which has a 3 param wcstok + + * ACE/ace/config-win32-mingw64.h: + +commit 7b119e54bbbcaeeec03cf2e6e7a3ff889e08fd12 +Merge: c0ef1f6daad 3827363c2df +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Feb 23 09:26:26 2023 +0100 + + Merge pull request #2053 from ffontaine/master + + ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= 3.5.0 + +commit 017929ad88287a15cf7733bc5bacc1782e647a22 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 22 14:57:09 2023 +0100 + + Set ACE_HAS_CPP20 when C++20 is supported + + * ACE/ace/config-win32-msvc-141.h: + +commit 3827363c2dfe94345cab759b5b968eeec89205b4 +Merge: c5b4f7009b4 4ea44f59178 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 22 13:32:52 2023 +0100 + + Merge branch 'master' into master + +commit 606a42cd58a161c971723d10713699d922530a28 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 22 09:10:40 2023 +0100 + + Add define of ACE_WIN32_VC14, before dropping Visual Studio 2015 this was also set for newer Visual Studio versions + + * ACE/ace/config-win32-msvc-141.h: + +commit c5b4f7009b47eac331fb5d20d53366fc99abecf0 +Author: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Tue Feb 21 14:20:11 2023 +0100 + + ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= 3.5.0 + + Fix the following build failure with libressl >= 3.5.0: + + /tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type + 45 | static BIO_METHOD methods_ACE = + | ^~~~~~~~~~~ + + Fixes: + - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb + + Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> + +commit 06974e568d233fcf8f0550a5ebb9987588928ce3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Feb 21 13:23:32 2023 +0100 + + List Visual Studio 2015 EOL + + * ACE/NEWS: + +commit 7ff7378063fb7a2cda02c096a55ec8319a9e7854 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Feb 21 07:09:31 2023 +0100 + + Update ACE/ace/Global_Macros.h + + Co-authored-by: Fred Hornsey <fred@hornsey.us> + +commit fd5c368d5c7b26ff2a44446bd215e28ffc07b033 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 20 16:35:04 2023 +0100 + + Remove clang5 + + * .github/workflows/linux.yml: + * ACE/include/makeinclude/platform_linux_clang.GNU: + +commit 9740e05c8e2f2c906444bf6b4ae01dd24e39cf39 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 20 16:28:53 2023 +0100 + + Enable C++14 for clang 5/6/7/8 + + * ACE/include/makeinclude/platform_linux_clang.GNU: + +commit 46e095cc536cb302af7bef33c79f3c93977df343 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 20 15:48:34 2023 +0100 + + Removed Visual Studio 2015 support, lacks C++14 + + * ACE/ace/config-win32-msvc-14.h: + Deleted. + + * ACE/ace/config-win32-msvc-141.h: + * ACE/ace/config-win32-msvc.h: + +commit 7a7f6db56d3a136c765558ace03eda3845d9f3a3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 20 15:44:04 2023 +0100 + + ACE/TAO now require C++14 or newer + + * ACE/NEWS: + * ACE/ace/Global_Macros.h: + * ACE/ace/config-win32-msvc-141.h: + * ACE/examples/Logger/Acceptor-server/server_loggerd.cpp: + * ACE/include/makeinclude/platform_linux_clang.GNU: + * ACE/include/makeinclude/platform_macosx_common.GNU: + +commit d19030946af88f57a4b2b29af9228cbbf0386a71 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 13 18:08:58 2023 +0100 + + Revert one constexpr change + + * ACE/apps/gperf/src/Key_List.cpp: + +commit 90371aba592ff8153762036e2b0d5bd723af4a7d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 13 17:04:25 2023 +0100 + + Generate some parts as constexpr + + * ACE/apps/gperf/src/Key_List.cpp: + +commit 4db6c4351dfd785f59a9b16122e52eeec44520c0 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 13 12:30:59 2023 +0100 + + Fixed unresolved exports, more override + + * ACE/protocols/ace/HTBP/HTBP_Addr.cpp: + * ACE/protocols/ace/HTBP/HTBP_Addr.h: + * TAO/tao/PortableServer/Active_Object_Map.cpp: + * TAO/tao/PortableServer/Active_Object_Map.h: + * TAO/tao/PortableServer/Active_Policy_Strategies.h: + * TAO/tao/PortableServer/Active_Policy_Strategies.inl: + * TAO/tao/PortableServer/IdUniquenessStrategy.h: + * TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp: + * TAO/tao/PortableServer/Operation_Table_Binary_Search.h: + * TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h: + * TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp: + * TAO/tao/PortableServer/Operation_Table_Linear_Search.h: + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp: + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h: + * TAO/tao/PortableServer/POA_Current_Factory.cpp: + * TAO/tao/PortableServer/POA_Current_Impl.cpp: + * TAO/tao/PortableServer/POA_Current_Impl.h: + * TAO/tao/PortableServer/POA_Policy_Set.h: + * TAO/tao/PortableServer/ServantRetentionStrategy.h: + +commit 69fbec6c475060cf01a710a3d7ed6e756538858c +Merge: 7e8b94b728b 89a05c65fd6 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 6 09:21:37 2023 +0100 + + Merge pull request #2046 from jwillemsen/jwinullptrexce + + Use nullptr and make destructor of TAO SystemException default + +commit 89a05c65fd627673f0bcc260b990257dcf30150c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Feb 3 19:49:52 2023 +0100 + + Use nullptr + + * ACE/ace/Time_Policy.h: + * ACE/ace/Time_Policy.inl: + +commit 7e8b94b728b886d14fc17b6af789e9ba0c50a050 +Merge: 4961b8026b5 ec19b2725b5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Feb 2 09:13:03 2023 +0100 + + Merge pull request #2042 from jwillemsen/jwi-cleanupmacros + + Cleanup unused macros + +commit 4961b8026b5c90e2517f27f9d9d5584be6f94ab0 +Merge: 757fd0a5eef 007bcf039e9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Feb 2 09:10:49 2023 +0100 + + Merge pull request #2044 from jmccabe/Indent-endif-by-an-extra-space + + Align one endif with its associated if + +commit 757fd0a5eef53e1c9e1a8327eb5d4b34e81d7cb9 +Merge: 107d2bfea7c 7f4365e6544 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Feb 2 09:09:17 2023 +0100 + + Merge pull request #2043 from jwillemsen/jwi-pharlapcleanup + + Removed pharlap support + +commit 007bcf039e9226a746bffbc0dcffa892c091adbe +Author: John McCabe <jmccabe@kirintec.com> +Date: Wed Feb 1 16:51:54 2023 +0000 + + Align one endif with its associated if + +commit d90c1cb3964f254cb5e9a0de2d7f620b79750e16 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 1 16:01:29 2023 +0100 + + Removed left over sun file + +commit 7f4365e65442e6c9d482fa64f808303f1546fe68 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 1 15:52:25 2023 +0100 + + Fixed cleanup mistake + + * ACE/ace/OS_NS_unistd.inl: + +commit 6198126ce20cc418252f461621c81d19ee2b36e4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 1 15:44:33 2023 +0100 + + Removed pharlap support + +commit 1eb5c6564e45cce7980f6bbac7b4b073b806788c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 1 14:48:42 2023 +0100 + + Removed include + + * ACE/ace/OS_NS_unistd.cpp: + +commit 281078a59a44ca971675b90616f5e35a998bf077 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 1 14:41:51 2023 +0100 + + Removed os_include headers which don't include any file anymore + +commit 9d3475584970e20117a7a99d3a75fecb521a0da9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 1 14:38:17 2023 +0100 + + Further cleanup not used macros + + * ACE/ace/IOStream.h: + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/Profile_Timer.cpp: + * ACE/ace/README: + * ACE/ace/os_include/os_netdb.h: + * ACE/ace/os_include/sys/os_loadavg.h: + * ACE/ace/os_include/sys/os_pstat.h: + +commit 01cb9ff254befab9c674e957a9e063b3c09bcc26 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 1 10:56:12 2023 +0100 + + Fix + + * ACE/ace/CDR_Stream.inl: + +commit c3e71f69e85deb48d5f3cdba355679da4deffdb3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Feb 1 10:51:23 2023 +0100 + + good_bit is a bool and removed some uncessary c-style casts + +commit 980b4296358a1b3f0f3ffde85c2826eeeb240637 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Jan 18 13:21:32 2023 +0100 + + Fixed warning + + * ACE/ace/OS_NS_Thread.inl: + +commit dfc5c60f27c6ea1f566b1819ebbc3d979c19ffad +Merge: 956dcabf4bd d97b6edbeeb +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Jan 18 10:14:13 2023 +0100 + + Merge pull request #2035 from jwillemsen/jwi-cleanupsolaris + + Cleanup Solaris support + +commit d97b6edbeeb9a007f65e10e069a753bc087e998f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 16:38:01 2023 +0100 + + Updated for release + + * ACE/NEWS: + +commit 956dcabf4bdd4fb3ec1be53c392398b495af27cf +Merge: 016eb1b3caa 461fcfe1d09 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 15:41:34 2023 +0100 + + Merge pull request #2030 from lockhart/rpm_extras_7_0_11 + + Add headers and other source files to the list of files to be installed. + +commit ffbcea5aea4d73a2cb04c4c128662c4672f95d0d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 15:26:19 2023 +0100 + + More cleanup + + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/config-hurd.h: + * ACE/ace/os_include/os_unistd.h: + * ACE/ace/os_include/sys/os_mman.h: + +commit 94724143a88b7ad5b10194690d9d73db3a3b6c54 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 12:43:59 2023 +0100 + + More Sun OS/compiler cleanup + +commit a7f809c172f0a2578ab584920dc02f1e45c06e6d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 12:40:30 2023 +0100 + + More Sun OS/compiler cleanup + +commit 83567bb4eb3abc1133a10a8cd3a97e4dfd1f23f8 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 12:35:36 2023 +0100 + + Removed some unused defines + +commit 5a45b0554cf1649e5f1eddebde2aa22df6c69719 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 12:33:05 2023 +0100 + + More Sun OS/compiler cleanup + +commit e5391a0076f5e370f929b111a8a6ed52ee4cb5da +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 12:32:56 2023 +0100 + + More Sun OS/compiler cleanup + +commit 654bdcf1600bc5f2ada5790cb0a6a3418a8cc8d3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 09:46:42 2023 +0100 + + Fixed cleanup issues + + * ACE/ace/OS_NS_Thread.h: + * ACE/ace/POSIX_Proactor.cpp: + +commit 73bdf800479e53a11143735e48348bb88c527c24 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 09:44:30 2023 +0100 + + Cleanup Solaris support + +commit 016eb1b3caa7b8ba0ff4c479895151eca984c82b +Merge: cf4d1e0117b 3f2b66203cb +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 17 08:30:27 2023 +0100 + + Merge pull request #2034 from jwillemsen/jwi-macrocleanup + + Cleanup several macros which are not set by any config file + +commit 461fcfe1d099e9dc4e10b38ce7b19d922a368869 +Author: lockhart <tlockhart1976@gmail.com> +Date: Mon Jan 16 22:22:39 2023 -0800 + + Update ace-tao.spec + + Need yet more .cpp files from ACE and TAO subsystems to enable a clean build of an external project. + +commit d6c603febcd87d749e3babb7cbe3386cd76a3c18 +Author: lockhart <tlockhart1976@gmail.com> +Date: Mon Jan 16 11:09:08 2023 -0800 + + Update ace-tao.spec + + Tailor previous updates to the list of installed files to remove most duplicates and commented-out lines. + This includes one explicit line for the ESF/ subdirectory since at least one .cpp is needed but does not match the other patterns. + Updates are based on feedback from Johnny W. + +commit 3f2b66203cbef9985486a6e9ce4ef33feb5cfb20 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jan 16 18:49:33 2023 +0100 + + Cleanup several macros which are not set by any config file + + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/OS_NS_dirent.inl: + * ACE/ace/OS_NS_sys_stat.inl: + * ACE/ace/OS_NS_time.cpp: + * ACE/ace/OS_NS_time.h: + * ACE/ace/OS_NS_time.inl: + * ACE/ace/OS_NS_unistd.inl: + * ACE/ace/README: + * ACE/ace/TLI.cpp: + * ACE/ace/os_include/os_stropts.h: + * ACE/ace/os_include/sys/os_mman.h: + +commit dcb4692364d4a9175db59b9280dbbd54524bb3ce +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jan 16 16:45:00 2023 +0100 + + Removed checks for ACE_TEMPLATES_REQUIRE_SOURCE + +commit f25410e018ff6b65ec24df5ba249447f74eb0198 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jan 16 15:47:01 2023 +0100 + + Removed AIX support + +commit fd9764555ac1865589fe02dcd8201ab3d91e7030 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jan 16 15:46:41 2023 +0100 + + Removed AIX support + +commit a1a1a43595697bb82a040368286340f94b24c122 +Author: Thomas Lockhart <tlockhart1976@gmail.com> +Date: Sun Jan 15 19:45:57 2023 -0800 + + Add headers and other source files to the list of files to be installed. + This includes stubs and skeletons for IDL interfaces and files required to extend interfaces. + This is a superset of files which are known to be required to build external packages. + +commit b2b2abd13518168f2b2930d4dd157d5311dccbe5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 16:51:22 2023 +0100 + + Removed RTEMS support + +commit 61cab1e92cb345f27ddde5aa78787b9565b81121 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 16:51:08 2023 +0100 + + Removed RTEMS support + +commit d645bf461a41039dda402e1674ed7a6d40620957 +Merge: c9c577ffbe6 098b5aa5257 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 16:14:12 2023 +0100 + + Merge pull request #2028 from jwillemsen/jwi-removehpux + + Remove HPUX support + +commit c9c577ffbe64efca48e6a05add0e0070add7da6d +Merge: 6f36dbed40c 0a572bec884 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 14:04:11 2023 +0100 + + Merge pull request #2027 from jwillemsen/jwi-openvmscleanup + + Removed some OpenVMS code + +commit 098b5aa525738b909ba9bca915cc53c8a5573c20 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 13:53:46 2023 +0100 + + Update FIFO_Test.cpp + +commit b5aeaf20ef9d15d09acb52b4c8ac77762937ae26 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 12:28:28 2023 +0100 + + More cleanup + + * ACE/ace/config-linux-common.h: + * ACE/ace/config-macros.h: + * TAO/TAO_IDL/fe/idl.yy.cpp: + +commit aceac7234ef1ef995de5ade1e4daa27220960fb3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 11:17:04 2023 +0100 + + More cleanup + + * ACE/ace/README: + * ACE/ace/os_include/sys/os_socket.h: + +commit 041537498bf9bc6cd673518b79b56c152579ac13 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 11:16:01 2023 +0100 + + Fixed cleanup mistakes + + * ACE/ace/os_include/os_pthread.h: + * ACE/ace/os_include/sys/os_socket.h: + +commit da66efe89c66a7997f6728759c196643c3910018 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 11:02:36 2023 +0100 + + Updated NEWS files + +commit b30753f1a1b18c831e89223ec01db66231b5a64a +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 11:01:49 2023 +0100 + + Removed HPUX support + +commit 0a572bec8848eabb70c652fffa043ec335f45454 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 10:34:15 2023 +0100 + + Removed some OpenVMS code + + * ACE/ace/SSL/SSL_Context.cpp: + * ACE/ace/Sock_Connect.cpp: + * TAO/TAO-INSTALL.html: + +commit 6f36dbed40cbedb60f2c40376d360c704d7db93b +Merge: f06824b2d9f b488f1ab871 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jan 15 10:33:43 2023 +0100 + + Merge pull request #2023 from esohns/issue_2016_move_make_qword + + move ACE_Make_QWORD to OS_NS_macros.h + +commit 54ee4626edad4d98513a330beb2acf4a3a0596b7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jan 14 16:26:19 2023 +0100 + + Removed openvms config files + +commit 9f5b645ee9d959b538c3b26d2b42c20ec0c227be +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jan 14 12:55:48 2023 +0100 + + Update Process_Manager_Test.cpp + +commit 3a1440fc22d845cc46125af05c5fec96a8090674 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jan 14 11:46:06 2023 +0100 + + Update Process_Manager_Test.cpp + +commit 1996ba72caf059aaddc4cc3883fff329cf22dcf9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jan 14 11:37:31 2023 +0100 + + Update os_types.h + +commit 2916b2fa78bc0fdcae44b590af9543245d481e15 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jan 14 10:09:54 2023 +0100 + + Removed OpenVMS support + +commit 20da1c5dcbed95befc08ccf258f62c91a16762f4 +Merge: 158938dceab cc5865a9582 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jan 14 09:53:44 2023 +0100 + + Merge pull request #2014 from jwillemsen/jwi-doxygen196 + + Upgrade doxygen configuration files to latest doxygen release + +commit b488f1ab8719835737d42ba4658cd18f352d0ad4 +Author: Erik Sohns <erik.sohns@posteo.de> +Date: Fri Jan 13 17:37:00 2023 +0100 + + move ACE_Make_QWORD to OS_NS_macros.h + +commit f59d4713c14113a6889656296896e9042468ced0 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 13 16:13:13 2023 +0100 + + Cleanup another not used define + + * ACE/ace/OS_NS_unistd.inl: + +commit a5662cef58b5c9377120dfa4b3a8098113be2594 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 13 14:27:50 2023 +0100 + + Cleanup workarounds which we don't need anymore + + * ACE/ace/OS_NS_stdlib.cpp: + * ACE/ace/OS_NS_sys_resource.inl: + * ACE/ace/OS_NS_sys_time.inl: + * ACE/ace/OS_NS_unistd.cpp: + * ACE/ace/OS_NS_unistd.inl: + * ACE/ace/os_include/os_errno.h: + * ACE/ace/os_include/os_signal.h: + * ACE/ace/os_include/sys/os_types.h: + +commit cde8fd193652205cf84a9ef5f74775000f0c9807 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 13 13:53:24 2023 +0100 + + Fixed cleanup error + + * ACE/tests/Proactor_Test_IPV6.cpp: + +commit 3f7247d33935f6451bd13835015cf7bf53b50969 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 13 13:08:57 2023 +0100 + + Fixed cleanup error + + * ACE/ace/config-win32-common.h: + * ACE/ace/config-win32-msvc.h: + +commit bbb975d6dee09baaad4e2b0425a0afb20b784005 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 13 12:52:36 2023 +0100 + + Fixed cleanup error + + * ACE/ace/OS_NS_Thread.inl: + +commit d1921e1511f65cd42503e8eeecfd301f5c3358b4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 13 12:40:18 2023 +0100 + + Fixed cleanup error + + * ACE/ace/config-macros.h: + +commit 22359d30f11aa48abba5a3ad7bad7bed7489ff5b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 13 12:36:49 2023 +0100 + + Fixed cleanup mistakes + + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/OS_NS_stdio.inl: + * ACE/tests/Bug_3943_Regression_Test.cpp: + +commit 8f0f05f51c0cf595654a35f9dc47d82809c2268d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 13 09:58:03 2023 +0100 + + More Windows CE cleanup + +commit 378fbc350bc7d7d940523ac194b646e94caf312d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 13 09:41:15 2023 +0100 + + Removed Windows CE support + +commit cc5865a958281cb7706a1421a4b96d3becd39c93 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Jan 12 11:46:29 2023 +0100 + + Upgrade doxygen configuration files to latest doxygen release + +commit 6d4a282d86f0145004ac0cab58371d261abca19b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Jan 12 11:43:53 2023 +0100 + + Make use of nullptr and delete + + * ACE/ace/ace_wchar.h: + * ACE/ace/ace_wchar.inl: + +commit 6c8071c2b785655696c93a71b9a240705508026f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jan 9 16:43:26 2023 +0100 + + Updated OpenDDS url + + * ACE/docs/bczar/bczar.html: + +commit 36c558c30b842c6b6f70b62a8736c35077b2f093 +Author: Chad Elliott <elliottc@objectcomputing.com> +Date: Thu Jan 5 09:55:27 2023 -0600 + + Adds the ability to build ACE core libraries, gperf, and possibly others using CMake. + +commit 6756ee16851ac1daa006f1b30b8987bd03a9c42e +Merge: ec326c77c9a 44d0b213860 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Dec 19 12:19:34 2022 +0100 + + Merge pull request #2005 from jwillemsen/jwi-x711 + + Make ACE 7.0.11 and TAO 3.0.11 public available + +commit 44d0b213860be8801160f0519c77b648a0316033 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Dec 19 12:18:46 2022 +0100 + + Make ACE 7.0.11 and TAO 3.0.11 public available + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: @@ -1,8 +1,13 @@ +USER VISIBLE CHANGES BETWEEN ACE-7.1.0 and ACE-7.1.1 +==================================================== + USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0 ===================================================== . Removed support for Windows CE, OpenVMS, HPUX, AIX, RTEMS, - and Solaris + Pharlap, Solaris, and Visual Studio 2015 + +. ACE/TAO now require C++14 or newer USER VISIBLE CHANGES BETWEEN ACE-7.0.10 and ACE-7.0.11 ====================================================== diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index a42decdf7d1..8afc475100e 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -25,7 +25,7 @@ include an entire platform-specific configuration file in the form. 8<----------8<----------8<----------8<----------8<----------8<----------8<---- - ACE VERSION: 7.0.11 + ACE VERSION: 7.1.0 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 bbf4d7d4adb..f3a2b95ce72 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 7.0.11, released Mon Dec 19 12:02:50 CET 2022 +This is ACE version 7.1.0, released Fri Mar 03 09:14:01 CET 2023 If you have any problems with or questions about ACE, please open a issue or discussion on the ACE_TAO github project at diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 06b0289b89a..88e75e8a9e4 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -215,10 +215,7 @@ ACE::select (int width, int ACE::terminate_process (pid_t pid) { -#if defined (ACE_HAS_PHARLAP) - ACE_UNUSED_ARG (pid); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) // Create a handle for the given process id. ACE_HANDLE process_handle = ::OpenProcess (PROCESS_TERMINATE, @@ -239,7 +236,7 @@ ACE::terminate_process (pid_t pid) } #else return ACE_OS::kill (pid, 9); -#endif /* ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } int diff --git a/ACE/ace/CDR_Size.inl b/ACE/ace/CDR_Size.inl index 5d5edca3247..29cc5ac9a76 100644 --- a/ACE/ace/CDR_Size.inl +++ b/ACE/ace/CDR_Size.inl @@ -43,7 +43,7 @@ ACE_SizeCDR::write_octet (ACE_CDR::Octet x) ACE_INLINE ACE_CDR::Boolean ACE_SizeCDR::write_boolean (ACE_CDR::Boolean x) { - return (ACE_CDR::Boolean) this->write_octet (x ? (ACE_CDR::Octet) 1 : (ACE_CDR::Octet) 0); + return this->write_octet (x ? (ACE_CDR::Octet) 1 : (ACE_CDR::Octet) 0); } ACE_INLINE ACE_CDR::Boolean @@ -184,7 +184,7 @@ ACE_SizeCDR::write_wchar_array (const ACE_CDR::WChar* x, if (ACE_OutputCDR::wchar_maxbytes () == 0) { errno = EACCES; - return (ACE_CDR::Boolean) (this->good_bit_ = false); + return (this->good_bit_ = false); } if (ACE_OutputCDR::wchar_maxbytes () == sizeof (ACE_CDR::WChar)) return this->write_array (x, @@ -305,98 +305,98 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Char x) { ss.write_char (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Short x) { ss.write_short (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::UShort x) { ss.write_ushort (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Long x) { ss.write_long (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::ULong x) { ss.write_ulong (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::LongLong x) { ss.write_longlong (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::ULongLong x) { ss.write_ulonglong (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::LongDouble x) { ss.write_longdouble (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Float x) { ss.write_float (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Double x) { ss.write_double (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::Fixed &x) { ss.write_fixed (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::Char *x) { ss.write_string (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::WChar *x) { ss.write_wstring (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const std::string& x) { ss.write_string (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } #if !defined(ACE_LACKS_STD_WSTRING) @@ -404,7 +404,7 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const std::wstring& x) { ss.write_wstring (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } #endif @@ -413,28 +413,28 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_boolean x) { ss.write_boolean (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_char x) { ss.write_char (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_wchar x) { ss.write_wchar (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_octet x) { ss.write_octet (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean @@ -448,8 +448,7 @@ operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_string x) } ss.write_string (len, x.val_); - return - (ACE_CDR::Boolean) (ss.good_bit () && (!x.bound_ || len <= x.bound_)); + return (ss.good_bit () && (!x.bound_ || len <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean @@ -463,8 +462,7 @@ operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_wstring x) } ss.write_wstring (len, x.val_); - return - (ACE_CDR::Boolean) (ss.good_bit () && (!x.bound_ || len <= x.bound_)); + return (ss.good_bit () && (!x.bound_ || len <= x.bound_)); } diff --git a/ACE/ace/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl index 5f0a55da680..cbfa8203fb6 100644 --- a/ACE/ace/CDR_Stream.inl +++ b/ACE/ace/CDR_Stream.inl @@ -413,7 +413,7 @@ ACE_OutputCDR::write_wchar_array (const ACE_CDR::WChar* x, if (ACE_OutputCDR::wchar_maxbytes_ == 0) { errno = EACCES; - return (ACE_CDR::Boolean) (this->good_bit_ = false); + return (this->good_bit_ = false); } if (ACE_OutputCDR::wchar_maxbytes_ == sizeof (ACE_CDR::WChar)) @@ -742,7 +742,7 @@ ACE_InputCDR::read_boolean (ACE_CDR::Boolean& x) ACE_CDR::Octet tmp = 0; (void) this->read_octet (tmp); x = tmp ? true : false; - return (ACE_CDR::Boolean) this->good_bit_; + return this->good_bit_; } ACE_INLINE ACE_CDR::Boolean @@ -1271,114 +1271,110 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Char x) { os.write_char (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Short x) { os.write_short (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::UShort x) { os.write_ushort (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Long x) { os.write_long (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::ULong x) { os.write_ulong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::LongLong x) { os.write_longlong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::ULongLong x) { os.write_ulonglong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::LongDouble x) { os.write_longdouble (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Float x) { os.write_float (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Double x) { os.write_double (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::Fixed &x) { os.write_fixed (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::Char *x) { os.write_string (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::WChar *x) { os.write_wstring (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_string x) { - ACE_CDR::ULong const len = - static_cast<ACE_CDR::ULong> (x.val_.size ()); + ACE_CDR::ULong const len = static_cast<ACE_CDR::ULong> (x.val_.size ()); os.write_string (len, x.val_.c_str ()); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } #if !defined(ACE_LACKS_STD_WSTRING) ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_wstring x) { - ACE_CDR::ULong const len = - static_cast<ACE_CDR::ULong> (x.val_.size ()); + ACE_CDR::ULong const len = static_cast<ACE_CDR::ULong> (x.val_.size ()); os.write_wstring (len, x.val_.c_str ()); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } #endif @@ -1386,7 +1382,7 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const std::string& x) { os.write_string (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } #if !defined(ACE_LACKS_STD_WSTRING) @@ -1394,7 +1390,7 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const std::wstring& x) { os.write_wstring (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } #endif @@ -1403,28 +1399,28 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_boolean x) { (void) os.write_boolean (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_char x) { os.write_char (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wchar x) { os.write_wchar (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_octet x) { os.write_octet (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean @@ -1438,8 +1434,7 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x) } os.write_string (len, x.val_); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean @@ -1453,22 +1448,21 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wstring x) } os.write_wstring (len, x.val_); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_uint8 x) { os.write_uint8 (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_int8 x) { os.write_int8 (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } // **************************************************************** diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 56cb81fd8ea..a902e263c4a 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -401,7 +401,7 @@ ACE_Configuration::operator!= (const ACE_Configuration& rhs) const ////////////////////////////////////////////////////////////////////////////// -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) +#if defined (ACE_WIN32) static constexpr int ACE_DEFAULT_BUFSIZE = 256; @@ -1020,7 +1020,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, return result; } -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ /////////////////////////////////////////////////////////////// diff --git a/ACE/ace/Configuration.h b/ACE/ace/Configuration.h index b9cb18204d9..436ee3bf0ad 100644 --- a/ACE/ace/Configuration.h +++ b/ACE/ace/Configuration.h @@ -407,7 +407,7 @@ protected: ACE_Configuration_Section_Key root_; }; -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) +#if defined (ACE_WIN32) /** * @class ACE_Section_Key_Win32 @@ -534,7 +534,7 @@ protected: const u_long security_access_; }; -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ // ACE_Allocator version diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index bc9b20a4962..5520938f01c 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -57,9 +57,9 @@ # define ACE_SET_BITS(WORD, BITS) (WORD |= (BITS)) # define ACE_CLR_BITS(WORD, BITS) (WORD &= ~(BITS)) -#if !defined (ACE_HAS_CPP11) -# error ACE/TAO require C++11 compliance, please upgrade your compiler and/or fix the platform configuration for your environment -#endif /* !ACE_HAS_CPP11 */ +#if !defined (ACE_HAS_CPP14) +# error ACE/TAO require C++14 compliance, please upgrade your compiler and/or fix the platform configuration for your environment +#endif #define ACE_UNIMPLEMENTED_FUNC(f) f = delete; diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h index 38ebe090593..6acbb0687ad 100644 --- a/ACE/ace/IOStream.h +++ b/ACE/ace/IOStream.h @@ -373,19 +373,6 @@ typedef ostream& (*__omanip_)(ostream&); // These are necessary in case somebody wants to derive from us and // override one of these with a custom approach. -# if defined (ACE_LACKS_CHAR_RIGHT_SHIFTS) -#define GET_FUNC_SET0(MT,CODE,CODE2) \ - GET_PROT(MT,short &,CODE) \ - GET_PROT(MT,u_short &,CODE) \ - GET_PROT(MT,int &,CODE) \ - GET_PROT(MT,u_int &,CODE) \ - GET_PROT(MT,long &,CODE) \ - GET_PROT(MT,u_long &,CODE) \ - GET_PROT(MT,float &,CODE) \ - GET_PROT(MT,double &,CODE) \ - inline virtual MT& operator>>(__omanip_ func) CODE2 \ - inline virtual MT& operator>>(__manip_ func) CODE2 -# else #define GET_FUNC_SET0(MT,CODE,CODE2) \ GET_PROT(MT,short &,CODE) \ GET_PROT(MT,u_short &,CODE) \ @@ -401,7 +388,6 @@ typedef ostream& (*__omanip_)(ostream&); GET_PROT(MT,u_char *,CODE) \ inline virtual MT& operator>>(__omanip_ func) CODE2 \ inline virtual MT& operator>>(__manip_ func) CODE2 -# endif #define PUT_FUNC_SET0(MT,CODE,CODE2) \ PUT_PROT(MT,short,CODE) \ diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index 085ed0b938e..ca7decd224b 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -25,14 +25,14 @@ ACE::ldfind (const ACE_TCHAR* filename, { ACE_TRACE ("ACE::ldfind"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) ACE_TCHAR expanded_filename[MAXPATHLEN]; if (ACE_TEXT_ExpandEnvironmentStrings (filename, expanded_filename, sizeof expanded_filename / sizeof (ACE_TCHAR))) filename = expanded_filename; -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ ACE_TCHAR tempcopy[MAXPATHLEN + 1]; ACE_TCHAR searchpathname[MAXPATHLEN + 1]; diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index dd7e904b36e..570711e99dc 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -80,7 +80,7 @@ public: }; #endif /* ACE_MT_SAFE */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_NT_Event_Log #elif defined (ACE_ANDROID) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_Android_Logcat @@ -1313,10 +1313,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { errno = ACE::map_errno (this->errnum ()); ACE_TCHAR *lpMsgBuf = 0; - - // PharLap can't do FormatMessage, so try for socket - // error. -# if !defined (ACE_HAS_PHARLAP) ACE_TEXT_FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_MAX_WIDTH_MASK | FORMAT_MESSAGE_FROM_SYSTEM, @@ -1328,7 +1324,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, (ACE_TCHAR *) &lpMsgBuf, 0, 0); -# endif /* ACE_HAS_PHARLAP */ // If we don't get a valid response from // <FormatMessage>, we'll assume this is a @@ -1521,10 +1516,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { errno = ACE::map_errno (this->errnum ()); ACE_TCHAR *lpMsgBuf = 0; - - // PharLap can't do FormatMessage, so try for socket - // error. -# if !defined (ACE_HAS_PHARLAP) ACE_TEXT_FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_MAX_WIDTH_MASK | FORMAT_MESSAGE_FROM_SYSTEM, @@ -1536,7 +1527,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, (ACE_TCHAR *) &lpMsgBuf, 0, 0); -# endif /* ACE_HAS_PHARLAP */ // If we don't get a valid response from // <FormatMessage>, we'll assume this is a diff --git a/ACE/ace/Msg_WFMO_Reactor.cpp b/ACE/ace/Msg_WFMO_Reactor.cpp index 57682de44f3..af05fb8929c 100644 --- a/ACE/ace/Msg_WFMO_Reactor.cpp +++ b/ACE/ace/Msg_WFMO_Reactor.cpp @@ -1,6 +1,6 @@ #include "ace/Msg_WFMO_Reactor.h" -#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) +#if defined (ACE_WIN32) #if !defined (__ACE_INLINE__) #include "ace/Msg_WFMO_Reactor.inl" @@ -78,4 +78,4 @@ ACE_Msg_WFMO_Reactor::poll_remaining_handles (DWORD slot) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/Msg_WFMO_Reactor.h b/ACE/ace/Msg_WFMO_Reactor.h index 3381da09d5d..835edb59513 100644 --- a/ACE/ace/Msg_WFMO_Reactor.h +++ b/ACE/ace/Msg_WFMO_Reactor.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) +#if defined (ACE_WIN32) #include "ace/WFMO_Reactor.h" @@ -111,7 +111,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Msg_WFMO_Reactor.inl" #endif /* __ACE_INLINE__ */ -#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */ +#endif /* ACE_WIN32 */ #include /**/ "ace/post.h" #endif /* ACE_MSG_WFMO_REACTOR_H */ diff --git a/ACE/ace/Msg_WFMO_Reactor.inl b/ACE/ace/Msg_WFMO_Reactor.inl index ee73e611812..cf6a280996c 100644 --- a/ACE/ace/Msg_WFMO_Reactor.inl +++ b/ACE/ace/Msg_WFMO_Reactor.inl @@ -1,5 +1,5 @@ // -*- C++ -*- -#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) +#if defined (ACE_WIN32) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -29,4 +29,4 @@ ACE_Msg_WFMO_Reactor::alertable_handle_events (ACE_Time_Value *how_long) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/NT_Service.cpp b/ACE/ace/NT_Service.cpp index cdc6ecc5bc8..66c8432ce10 100644 --- a/ACE/ace/NT_Service.cpp +++ b/ACE/ace/NT_Service.cpp @@ -1,5 +1,5 @@ #include "ace/config-all.h" -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) +#if defined (ACE_WIN32) #include "ace/NT_Service.h" @@ -610,4 +610,4 @@ ACE_NT_Service::wait_for_service_state (DWORD desired_state, ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h index 5c9f282884f..f931d0fbd55 100644 --- a/ACE/ace/NT_Service.h +++ b/ACE/ace/NT_Service.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) +#if defined (ACE_WIN32) #include "ace/ACE.h" #include "ace/OS_Log_Msg_Attributes.h" @@ -429,7 +429,7 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc, \ #include "ace/NT_Service.inl" #endif /* __ACE_INLINE__ */ -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ +#endif /* ACE_WIN32 */ #include /**/ "ace/post.h" diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index d4e3c82b253..1dff5ccf076 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -2552,16 +2552,6 @@ ACE_OS::event_init (ACE_event_t *event, if (type == USYNC_PROCESS) { const char *name_p = name; -# if defined (ACE_SHM_OPEN_REQUIRES_ONE_SLASH) - char adj_name[MAXPATHLEN]; - if (name[0] != '/') - { - adj_name[0] = '/'; - ACE_OS::strsncpy (&adj_name[1], name, MAXPATHLEN-1); - name_p = adj_name; - } -# endif /* ACE_SHM_OPEN_REQUIRES_ONE_SLASH */ - bool owner = false; // Let's see if the shared memory entity already exists. ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name_p), @@ -3176,34 +3166,12 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } #elif defined (ACE_WIN32) - // PharLap ETS can act on the current thread - it can set the - // quantum also, unlike Win32. All this only works on the RT - // version. -# if defined (ACE_HAS_PHARLAP_RT) - if (id != ACE_SELF) - ACE_NOTSUP_RETURN (-1); - -# if !defined (ACE_PHARLAP_LABVIEW_RT) - if (sched_params.quantum() != ACE_Time_Value::zero) - EtsSetTimeSlice (sched_params.quantum().msec()); -# endif -# else - if (sched_params.quantum () != ACE_Time_Value::zero) - { - // I don't know of a way to set the quantum on Win32. - errno = EINVAL; - return -1; - } -# endif /* ACE_HAS_PHARLAP_RT */ - if (sched_params.scope () == ACE_SCOPE_THREAD) { // Setting the REALTIME_PRIORITY_CLASS on Windows is almost always // a VERY BAD THING. This include guard will allow people // to easily disable this feature in ACE. - // It won't work at all for Pharlap since there's no SetPriorityClass. -#if !defined (ACE_HAS_PHARLAP) && \ - !defined (ACE_DISABLE_WIN32_INCREASE_PRIORITY) +#if !defined (ACE_DISABLE_WIN32_INCREASE_PRIORITY) // Set the priority class of this process to the REALTIME process class // _if_ the policy is ACE_SCHED_FIFO. Otherwise, set to NORMAL. if (!::SetPriorityClass (::GetCurrentProcess (), @@ -3223,9 +3191,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } else if (sched_params.scope () == ACE_SCOPE_PROCESS) { -# if defined (ACE_HAS_PHARLAP_RT) - ACE_NOTSUP_RETURN (-1); -# else HANDLE hProcess = ::OpenProcess (PROCESS_SET_INFORMATION, FALSE, @@ -3253,8 +3218,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } ::CloseHandle (hProcess); return 0; -#endif /* ACE_HAS_PHARLAP_RT */ - } else { diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index a33b50b076f..e20c7077f88 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -534,7 +534,7 @@ ACE_OS::event_init (ACE_event_t *event, #endif /* ACE_HAS_WCHAR */ ACE_INLINE long -ACE_OS::priority_control (ACE_idtype_t /*idtype*/, ACE_id_t /*identifier*/, int /*cmd*/, void */*arg*/) +ACE_OS::priority_control (ACE_idtype_t /*idtype*/, ACE_id_t /*identifier*/, int /*cmd*/, void * /*arg*/) { ACE_OS_TRACE ("ACE_OS::priority_control"); ACE_NOTSUP_RETURN (-1); @@ -2095,10 +2095,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) if (expired) error = ETIME; - -# if defined (ACE_LACKS_COND_TIMEDWAIT_RESET) - tv = tv.now (); -# endif /* ACE_LACKS_COND_TIMEDWAIT_RESET */ } if (result != -2) @@ -2173,9 +2169,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) if (result == 0) { -# if defined (ACE_LACKS_COND_TIMEDWAIT_RESET) - tv = tv.now (); -# endif /* ACE_LACKS_COND_TIMEDWAIT_RESET */ --s->count_; } @@ -2495,22 +2488,11 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) # elif defined (ACE_HAS_WTHREADS) ACE_Errno_Guard error (errno); priority = ::GetThreadPriority (ht_id); - -# if defined (ACE_HAS_PHARLAP) -# if defined (ACE_PHARLAP_LABVIEW_RT) - policy = ACE_SCHED_FIFO; -# else - DWORD timeslice = ::EtsGetTimeSlice (); - policy = timeslice == 0 ? ACE_SCHED_OTHER : ACE_SCHED_FIFO; -# endif /* ACE_PHARLAP_LABVIEW_RT */ -# else DWORD const priority_class = ::GetPriorityClass (::GetCurrentProcess ()); if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR) ACE_FAIL_RETURN (-1); policy = (priority_class == REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER; -# endif /* ACE_HAS_PHARLAP */ - return 0; # elif defined (ACE_HAS_VXTHREADS) return ::taskPriorityGet (ht_id, &priority); diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl index b9928e2936a..058f4cb2ba9 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -8,10 +8,6 @@ #include "ace/os_include/os_fcntl.h" #include "ace/os_include/os_string.h" -#if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) -# include "ace/OS_NS_stdio.h" -#endif - #if defined (ACE_USES_ASM_SYMBOL_IN_DLSYM) # include "ace/OS_Memory.h" # include "ace/OS_NS_string.h" @@ -69,9 +65,6 @@ ACE_OS::dlerror () //FUZZ: enable check_for_lack_ACE_OS # elif defined (ACE_WIN32) static ACE_TCHAR buf[128]; -# if defined (ACE_HAS_PHARLAP) - ACE_OS::sprintf (buf, "error code %d", GetLastError()); -# else ACE_TEXT_FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, 0, ::GetLastError (), @@ -79,7 +72,6 @@ ACE_OS::dlerror () buf, sizeof buf / sizeof buf[0], 0); -# endif /* ACE_HAS_PHARLAP */ return buf; # else ACE_NOTSUP_RETURN (0); diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp index 6ede9036026..49f658e5c5e 100644 --- a/ACE/ace/OS_NS_netdb.cpp +++ b/ACE/ace/OS_NS_netdb.cpp @@ -5,10 +5,6 @@ # include "ace/OS_NS_netdb.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ -#if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) -# include "ace/OS_NS_stdio.h" -#endif - #include "ace/os_include/net/os_if.h" #include "ace/Global_Macros.h" #include "ace/OS_NS_arpa_inet.h" @@ -44,7 +40,6 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) ACE_OS_TRACE ("ACE_OS::getmacaddress"); #if defined (ACE_WIN32) -# if !defined (ACE_HAS_PHARLAP) /** Define a structure for use with the netbios routine */ struct ADAPTERSTAT { @@ -96,35 +91,6 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) } } return 0; -# else -# if defined (ACE_HAS_PHARLAP_RT) - DEVHANDLE ip_dev = (DEVHANDLE)0; - EK_TCPIPCFG *devp = 0; - size_t i; - ACE_TCHAR dev_name[16]; - - for (i = 0; i < 10; i++) - { - // Ethernet. - ACE_OS::snprintf (dev_name, 16, "ether%d", i); - ip_dev = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev != 0) - break; - } - if (ip_dev == 0) - return -1; - devp = EtsTCPGetDeviceCfg (ip_dev); - if (devp == 0) - return -1; - ACE_OS::memcpy (node->node, - &devp->EthernetAddress[0], - 6); - return 0; -# else - ACE_UNUSED_ARG (node); - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ -# endif /* ACE_HAS_PHARLAP */ #elif defined (ACE_LINUX) && !defined (ACE_LACKS_NETWORKING) // It's easiest to know the first MAC-using interface. Use the BSD diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 6066165912e..f3268c7ac1d 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -39,7 +39,6 @@ ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock, case SEEK_CUR: { LARGE_INTEGER offset; -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) LARGE_INTEGER distance; distance.QuadPart = 0; if (!::SetFilePointerEx (lock->handle_, @@ -50,18 +49,6 @@ ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock, ACE_OS::set_errno_to_last_error (); return; } -# else - offset.LowPart = ::SetFilePointer (lock->handle_, - 0, - &offset.HighPart, - FILE_CURRENT); - if (offset.LowPart == INVALID_SET_FILE_POINTER && - ::GetLastError() != NO_ERROR) - { - ACE_OS::set_errno_to_last_error (); - return; - } -# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ # if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 start += offset.QuadPart; @@ -364,10 +351,6 @@ ACE_OS::cuserid (char *user, size_t maxlen) ::remCurIdGet (user, 0); return user; } -#elif defined (ACE_HAS_PHARLAP) - ACE_UNUSED_ARG (user); - ACE_UNUSED_ARG (maxlen); - ACE_NOTSUP_RETURN (0); #elif defined (ACE_WIN32) BOOL const result = GetUserNameA (user, (u_long *) &maxlen); if (result == FALSE) @@ -841,7 +824,7 @@ ACE_OS::rename (const char *old_name, ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) +# elif defined (ACE_WIN32) // NT4 (and up) provides a way to rename/move a file with similar semantics // to what's usually done on UNIX - if there's an existing file with // <new_name> it is removed before the file is renamed/moved. The @@ -870,7 +853,7 @@ ACE_OS::rename (const wchar_t *old_name, ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) +# elif defined (ACE_WIN32) // NT4 (and up) provides a way to rename/move a file with similar semantics // to what's usually done on UNIX - if there's an existing file with // <new_name> it is removed before the file is renamed/moved. The diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl index 5ff514997b5..87cffd62937 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -40,11 +40,11 @@ ACE_OS::mmap (void *addr, const ACE_TCHAR *file_mapping_name) { ACE_OS_TRACE ("ACE_OS::mmap"); -#if !defined (ACE_WIN32) || defined (ACE_HAS_PHARLAP) +#if !defined (ACE_WIN32) ACE_UNUSED_ARG (file_mapping_name); -#endif /* !defined (ACE_WIN32) || defined (ACE_HAS_PHARLAP) */ +#endif /* !defined (ACE_WIN32) */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) if (!ACE_BIT_ENABLED (flags, MAP_FIXED)) addr = 0; else if (addr == 0) // can not map to address 0 @@ -149,7 +149,7 @@ ACE_OS::mmap (void *addr, ACE_UNUSED_ARG (file_mapping); ACE_UNUSED_ARG (sa); ACE_NOTSUP_RETURN (MAP_FAILED); -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } // Implements simple read/write control for pages. Affects a page if @@ -161,7 +161,7 @@ ACE_INLINE int ACE_OS::mprotect (void *addr, size_t len, int prot) { ACE_OS_TRACE ("ACE_OS::mprotect"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) DWORD dummy; // Sigh! return ::VirtualProtect(addr, len, prot, &dummy) ? 0 : -1; #elif !defined (ACE_LACKS_MPROTECT) @@ -171,16 +171,15 @@ ACE_OS::mprotect (void *addr, size_t len, int prot) ACE_UNUSED_ARG (len); ACE_UNUSED_ARG (prot); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } ACE_INLINE int ACE_OS::msync (void *addr, size_t len, int sync) { ACE_OS_TRACE ("ACE_OS::msync"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) ACE_UNUSED_ARG (sync); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FlushViewOfFile (addr, len), ace_result_), int, -1); #elif !defined (ACE_LACKS_MSYNC) return ::msync ((ACE_MMAP_TYPE) addr, len, sync); @@ -189,7 +188,7 @@ ACE_OS::msync (void *addr, size_t len, int sync) ACE_UNUSED_ARG (len); ACE_UNUSED_ARG (sync); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } ACE_INLINE int diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 3cbce8dc578..3b53035a777 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -400,13 +400,6 @@ ACE_OS::recvfrom (ACE_HANDLE handle, } else { -# if defined (ACE_HAS_PHARLAP) - // Pharlap ETS (at least to v13) returns a legit address but doesn't - // include the sin_zero[8] bytes in the count. Correct for this here. - if (addrlen != 0 && addr != 0 && - *addrlen == 8 && addr->sa_family == AF_INET) - *addrlen = sizeof(sockaddr_in); -# endif /* ACE_HAS_PHARLAP */ return result; } #else /* non Win32 */ diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp index 604947b5825..8d4da8dbddd 100644 --- a/ACE/ace/OS_NS_sys_utsname.cpp +++ b/ACE/ace/OS_NS_sys_utsname.cpp @@ -41,21 +41,7 @@ ACE_OS::uname (ACE_utsname *name) # endif SYSTEM_INFO sinfo; -# if defined (ACE_HAS_PHARLAP) - // PharLap doesn't do GetSystemInfo. What's really wanted is the - // CPU architecture, so we can get that with EtsGetSystemInfo. Fill - // in what's wanted in the SYSTEM_INFO structure, and carry on. Note - // that the CPU type values in EK_KERNELINFO have the same values - // are the ones defined for SYSTEM_INFO. - EK_KERNELINFO ets_kern; - EK_SYSTEMINFO ets_sys; - EtsGetSystemInfo (&ets_kern, &ets_sys); - sinfo.wProcessorLevel = static_cast<WORD> (ets_kern.CpuType); - sinfo.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; - sinfo.dwProcessorType = ets_kern.CpuType * 100 + 86; -# else ::GetSystemInfo(&sinfo); -# endif /* ACE_HAS_PHARLAP */ const char* unknown = "???"; diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index 49b5736f970..145a34d3b43 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -11,7 +11,6 @@ #include "ace/OS_Memory.h" #include "ace/OS_NS_Thread.h" #include "ace/Object_Manager_Base.h" -#include "ace/os_include/sys/os_pstat.h" #if defined (ACE_HAS_SYSCTL) # include "ace/os_include/sys/os_sysctl.h" #endif /* ACE_HAS_SYSCTL */ @@ -380,9 +379,7 @@ ACE_OS::num_processors () { ACE_OS_TRACE ("ACE_OS::num_processors"); -#if defined (ACE_HAS_PHARLAP) - return 1; -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return sys_info.dwNumberOfProcessors; @@ -408,9 +405,7 @@ ACE_OS::num_processors_online () { ACE_OS_TRACE ("ACE_OS::num_processors_online"); -#if defined (ACE_HAS_PHARLAP) - return 1; -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); long active_processors = 0; diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 8c5d2834ade..83f77073575 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -79,7 +79,7 @@ ACE_INLINE long ACE_OS::getpagesize () { ACE_OS_TRACE ("ACE_OS::getpagesize"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return (long) sys_info.dwPageSize; @@ -356,16 +356,9 @@ ACE_OS::ftruncate (ACE_HANDLE handle, ACE_OFF_T offset) { ACE_OS_TRACE ("ACE_OS::ftruncate"); #if defined (ACE_WIN32) -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) LARGE_INTEGER loff; loff.QuadPart = offset; if (::SetFilePointerEx (handle, loff, 0, FILE_BEGIN)) -# else - if (::SetFilePointer (handle, - offset, - 0, - FILE_BEGIN) != INVALID_SET_FILE_POINTER) -# endif ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetEndOfFile (handle), ace_result_), int, -1); else ACE_FAIL_RETURN (-1); @@ -512,19 +505,7 @@ ACE_INLINE int ACE_OS::hostname (char name[], size_t maxnamelen) { ACE_OS_TRACE ("ACE_OS::hostname"); -#if defined (ACE_HAS_PHARLAP) - // PharLap only can do net stuff with the RT version. -# if defined (ACE_HAS_PHARLAP_RT) - // @@This is not at all reliable... requires ethernet and BOOTP to be used. - // A more reliable way is to go thru the devices w/ EtsTCPGetDeviceCfg until - // a legit IP address is found, then get its name w/ gethostbyaddr. - ACE_SOCKCALL_RETURN (gethostname (name, maxnamelen), int, SOCKET_ERROR); -# else - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (maxnamelen); - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ -#elif defined (ACE_VXWORKS) +#if defined (ACE_VXWORKS) return ::gethostname (name, maxnamelen); #elif defined (ACE_WIN32) if (::gethostname (name, ACE_Utils::truncate_cast<int> (maxnamelen)) == 0) @@ -548,7 +529,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) return -1; #elif defined (ACE_LACKS_GETHOSTNAME) ACE_NOTSUP_RETURN (-1); -#else /* ACE_HAS_PHARLAP */ +#else /* ACE_VXWORKS */ ACE_utsname host_info; if (ACE_OS::uname (&host_info) == -1) @@ -558,7 +539,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_OS::strsncpy (name, host_info.nodename, maxnamelen); return 0; } -#endif /* ACE_HAS_PHARLAP */ +#endif /* ACE_VXWORKS */ } #if defined (ACE_HAS_WCHAR) @@ -687,7 +668,6 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) return ::lseek64 (handle, offset, whence); #elif defined (ACE_HAS_LLSEEK) # if defined (ACE_WIN32) -# ifndef ACE_LACKS_WIN32_SETFILEPOINTEREX LARGE_INTEGER distance, new_file_pointer; distance.QuadPart = offset; @@ -696,22 +676,6 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) (::SetFilePointerEx (handle, distance, &new_file_pointer, whence) ? new_file_pointer.QuadPart : static_cast<ACE_LOFF_T> (-1)); -# else - LARGE_INTEGER l_offset; - l_offset.QuadPart = offset; - LONG low_offset = l_offset.LowPart; - LONG high_offset = l_offset.HighPart; - - l_offset.LowPart = ::SetFilePointer (handle, - low_offset, - &high_offset, - whence); - if (l_offset.LowPart == INVALID_SET_FILE_POINTER && - GetLastError () != NO_ERROR) - return static_cast<ACE_LOFF_T> (-1); - l_offset.HighPart = high_offset; - return l_offset.QuadPart; -# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ # else return ::llseek (handle, offset, whence); # endif /* WIN32 */ @@ -1055,7 +1019,7 @@ ACE_OS::sysconf (int name) } ACE_INLINE long -ACE_OS::sysinfo (int /*cmd*/, char */*buf*/, long /*count*/) +ACE_OS::sysinfo (int /*cmd*/, char * /*buf*/, long /*count*/) { ACE_OS_TRACE ("ACE_OS::sysinfo"); ACE_NOTSUP_RETURN (0); @@ -1067,33 +1031,16 @@ ACE_OS::truncate (const ACE_TCHAR *filename, { ACE_OS_TRACE ("ACE_OS::truncate"); #if defined (ACE_WIN32) - ACE_HANDLE handle = ACE_OS::open (filename, - O_WRONLY, - ACE_DEFAULT_FILE_PERMS); + ACE_HANDLE handle = ACE_OS::open (filename, O_WRONLY, ACE_DEFAULT_FILE_PERMS); -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) LARGE_INTEGER loffset; loffset.QuadPart = offset; -#else - LONG low_offset = ACE_LOW_PART(offset); - LONG high_offset = ACE_HIGH_PART(offset); -#endif if (handle == ACE_INVALID_HANDLE) - ACE_FAIL_RETURN (-1); - -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) - else if (::SetFilePointerEx (handle, - loffset, - 0, - FILE_BEGIN)) -# else - else if (::SetFilePointer (handle, - low_offset, - &high_offset, - FILE_BEGIN) != INVALID_SET_FILE_POINTER - || GetLastError () == NO_ERROR) -# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ + { + ACE_FAIL_RETURN (-1); + } + else if (::SetFilePointerEx (handle, loffset, 0, FILE_BEGIN)) { BOOL result = ::SetEndOfFile (handle); ::CloseHandle (handle); diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp index 8af6e554b66..f5523223c68 100644 --- a/ACE/ace/Pagefile_Memory_Pool.cpp +++ b/ACE/ace/Pagefile_Memory_Pool.cpp @@ -19,7 +19,7 @@ #include "ace/Based_Pointer_Repository.h" #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) #define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd) \ MapViewOfFileEx (_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd) @@ -217,7 +217,6 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, // Create file mapping, if not yet done if (object_handle_ == 0) { -#if !defined (ACE_LACKS_WIN32_SECURITY_DESCRIPTORS) // Allow access by all users. SECURITY_ATTRIBUTES sa; SECURITY_DESCRIPTOR sd; @@ -230,7 +229,6 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, sa.nLength = sizeof (SECURITY_ATTRIBUTES); sa.lpSecurityDescriptor = &sd; sa.bInheritHandle = FALSE; -#endif /* ACE_LACKS_WIN32_SECURITY_DESCRIPTORS */ // Get an object handle to the named reserved memory object. DWORD size_high; @@ -245,11 +243,7 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, object_handle_ = ACE_TEXT_CreateFileMapping (INVALID_HANDLE_VALUE, -#if !defined (ACE_LACKS_WIN32_SECURITY_DESCRIPTORS) &sa, -#else - 0, -#endif /* !ACE_LACKS_WIN32_SECURITY_DESCRIPTORS */ PAGE_READWRITE | SEC_RESERVE, size_high, size_low, @@ -369,4 +363,4 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h index 254a5a7ad8a..4e8d4af8315 100644 --- a/ACE/ace/Pagefile_Memory_Pool.h +++ b/ACE/ace/Pagefile_Memory_Pool.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) #include "ace/ACE.h" #include "ace/os_include/sys/os_mman.h" @@ -190,7 +190,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ #if defined (__ACE_INLINE__) #include "ace/Pagefile_Memory_Pool.inl" diff --git a/ACE/ace/Pagefile_Memory_Pool.inl b/ACE/ace/Pagefile_Memory_Pool.inl index e6b2919d873..46734e75ba7 100644 --- a/ACE/ace/Pagefile_Memory_Pool.inl +++ b/ACE/ace/Pagefile_Memory_Pool.inl @@ -1,5 +1,5 @@ // -*- C++ -*- -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -48,4 +48,4 @@ ACE_Pagefile_Memory_Pool::base_addr () const ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 &7 !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp index 838e7860b8a..dbfe197d690 100644 --- a/ACE/ace/Profile_Timer.cpp +++ b/ACE/ace/Profile_Timer.cpp @@ -64,7 +64,6 @@ void ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage) { ACE_TRACE ("ACE_Profile_Timer::elapsed_rusage"); -# if !defined (ACE_HAS_LIMITED_RUSAGE_T) // integral shared memory size usage.ru_ixrss = this->end_usage_.ru_ixrss - this->last_usage_.ru_ixrss; @@ -110,9 +109,6 @@ ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage) this->subtract (usage.ru_stime, this->end_usage_.ru_stime, this->last_usage_.ru_stime); -# else - ACE_UNUSED_ARG(usage); -# endif /* ACE_HAS_LIMITED_RUSAGE_T */ } void diff --git a/ACE/ace/README b/ACE/ace/README index 99d94841674..eb25e0dda78 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -175,10 +175,6 @@ ACE_SCANDIR_CMP_USES_VOIDPTR The OS's scandir() comparator function ACE_SCANDIR_CMP_USES_CONST_VOIDPTR The OS's scandir() comparator function is int (*compare)(const void*, const void*). -ACE_HAS_STDARG_THR_DEST Platform has void (*)(...) - prototype for - pthread_key_create() - destructor (e.g., LynxOS). ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS Platform/compiler supports Win32 structural exceptions ACE_HAS_4_4BSD_SENDMSG_RECVMSG Platform has BSD 4.4 @@ -197,20 +193,6 @@ ACE_HAS_BIG_FD_SET Compiler/platform has typedef ACE_HAS_BROKEN_ACCEPT_ADDR Platform can't correctly deal with a NULL addr to accept() (e.g, VxWorks < 6.9). -ACE_HAS_BROKEN_DGRAM_SENDV Platform sendv() does not work - properly with datagrams, - i.e. it fails when the iovec - size is IOV_MAX. -ACE_HAS_BROKEN_MAP_FAILED Platform doesn't cast MAP_FAILED - to a void *. -ACE_HAS_BROKEN_MSG_H Platform headers don't support - <msg.h> prototypes -ACE_HAS_BROKEN_MMAP_H HP/UX does not wrap the - mmap(2) header files with - extern "C". -ACE_HAS_BROKEN_NESTED_TEMPLATES MSVC has trouble with defining - STL containers for nested - structs and classes ACE_HAS_BYTESEX_H Platform has <bytesex.h>. ACE_HAS_CANCEL_IO Platform supports the Win32 CancelIO() function (WinNT 4.0 @@ -286,8 +268,6 @@ ACE_HAS_NONSTATIC_OBJECT_MANAGER Causes the ACE_Object_Manager a static (global) instance. ACE_HAS_THR_KEYDELETE Platform supports thr_keydelete (e.g,. UNIXWARE) -ACE_HAS_LIMITED_RUSAGE_T The rusage_t structure has - only two fields. ACE_HAS_LINUX_NPTL Linux platform (with kernel >= 2.6.x) with GLibc including new NPTL (Native POSIX Thread Library). @@ -427,7 +407,7 @@ ACE_HAS_SIGINFO_T Platform supports SVR4 extended signals ACE_HAS_SIGSUSPEND Platform supports sigsuspend() ACE_HAS_SIGISMEMBER_BUG Platform has bug with - sigismember() (HP/UX 11). + sigismember() ACE_HAS_SIGNAL_OBJECT_AND_WAIT Platform supports the Win32 SignalObjectAndWait() function (WinNT 4.0 and beyond). @@ -465,39 +445,21 @@ ACE_HAS_STRNLEN Platform supports strnlen(3). ACE_HAS_STREAMS Platform supports STREAMS ACE_HAS_STREAM_PIPES Platform supports STREAM pipes ACE_HAS_STRICT Use the STRICT compilation mode on Win32. -ACE_HAS_STRUCT_NETDB_DATA Compiler/platform has strange - hostent API for socket *_r() - calls ACE_HAS_SVR4_DYNAMIC_LINKING Compiler/platform supports SVR4 dynamic linking semantics ACE_HAS_SVR4_GETTIMEOFDAY Compiler/platform supports SVR4 gettimeofday() prototype ACE_HAS_SVR4_SIGNAL_T Compiler/platform supports SVR4 signal typedef -ACE_HAS_SYSCALL_GETRUSAGE HP/UX has an undefined syscall - for GETRUSAGE... -ACE_HAS_SYSENT_H Platform provides <sysent.h> - header ACE_HAS_SYSV_IPC Platform supports System V IPC (most versions of UNIX, but not Win32) ACE_HAS_SYS_FILIO_H Platform provides <sys/filio.h> header -ACE_HAS_SYS_LOADAVG_H Compiler/platform contains the - <sys/loadavg.h> file. -ACE_HAS_SYS_PSTAT_H Compiler/platform contains the - <sys/pstat.h> file. ACE_HAS_SYS_SOCKIO_H Compiler/platform provides the sockio.h file ACE_HAS_SYS_SYSCALL_H Compiler/platform contains the <sys/syscall.h> file. -ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA Compiler's template - instantiation mechanism - supports the use of "#pragma - instantiate". Edison Design - Group compilers, e.g., SGI C++ - and Green Hills 1.8.8 and - later, support this. ACE_HAS_TEMPLATE_TYPEDEFS Compiler implements templates that support typedefs inside of classes used as formal @@ -547,9 +509,6 @@ ACE_HAS_UALARM Platform supports ualarm() ACE_HAS_UCONTEXT_T Platform supports ucontext_t (which is used in the extended signal API). -ACE_HAS_UNION_WAIT The wait() system call takes a - (union wait *) rather than int - * ACE_HAS_VALGRIND Running with valgrind ACE_HAS_VERBOSE_NOTSUP Prints out console message in ACE_NOTSUP. Useful for @@ -653,9 +612,6 @@ ACE_LACKS_OPENDIR Platform lacks opendir and the opendir emulation must be used ACE_LACKS_READDIR Platform lacks readdir and the readdir emulation must be used -ACE_LACKS_COND_TIMEDWAIT_RESET pthread_cond_timedwait does - *not* reset the time argument - when the lock is acquired. ACE_LACKS_CONST_TIMESPEC_PTR Platform forgot const in cond_timewait (e.g., HP/UX). ACE_LACKS_COND_T Platform lacks condition @@ -712,10 +668,6 @@ ACE_LACKS_MPROTECT The platform doesn't have LYNX)) ACE_LACKS_MSG_ACCRIGHTS Platform defines ACE_HAS_MSG, but lacks msg_accrights{,len}. -ACE_LACKS_MSG_WFMO Platform lacks - MsgWaitForMultipleObjects - (only needs to be defined when - ACE_WIN32 is also defined). ACE_LACKS_MSYNC Platform lacks msync() (e.g., Linux) ACE_LACKS_MUTEXATTR_PSHARED Platform lacks @@ -731,8 +683,6 @@ ACE_LACKS_NETDB_REENTRANT_FUNCTIONS Platform does not support getservbyname_r). ACE_LACKS_NEW_H OS doesn't have, or we don't want to use, new.h. -ACE_LACKS_NULL_PTHREAD_STATUS OS requires non-null status pointer - for ::pthread_join (). ACE_LACKS_PERFECT_MULTICAST_FILTERING Platform lacks IGMPv3 "perfect" filtering of multicast dgrams at the socket level. If == 1, ACE_SOCK_Dgram_Mcast will bind @@ -751,8 +701,6 @@ ACE_LACKS_PTHREAD_THR_SIGSETMASK Platform lacks ACE_LACKS_PUTENV_PROTOTYPE Platform/compiler lacks the putenv() prototype (e.g., LynxOS) -ACE_LACKS_PWD_REENTRANT_FUNCTIONS Platform lacks getpwnam_r() - methods (e.g., SGI 6.2). ACE_LACKS_QSORT Compiler/platform lacks the standard C library qsort() function @@ -842,12 +790,6 @@ ACE_LACKS_TIMESPEC_T Platform does not define struct timespec. ACE_LACKS_TRUNCATE Platform doesn't have truncate() (e.g., vxworks) -ACE_LACKS_CHAR_RIGHT_SHIFTS Compiler does not have any istream - operator>> for chars, u_chars, or - signed chars. -ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS Compiler does not have - operator>> (istream &, u_char *) or - operator>> (istream &, signed char *) ACE_LACKS_UCONTEXT_H Platform lacks the ucontext.h file ACE_LACKS_UMASK Platform lacks umask function @@ -859,19 +801,12 @@ ACE_LACKS_UNIX_DOMAIN_SOCKETS ACE platform has no UNIX domain sockets ACE_LACKS_UNIX_SIGNALS Platform lacks full signal support (e.g., Win32). -ACE_LACKS_UNSIGNEDLONGLONG_T Compiler/platform does not - support the unsigned long - long datatype. ACE_LACKS_UTSNAME_T Platform lacks struct utsname (e.g., Win32 and VxWorks) ACE_LACKS_UNAME Platform lacks uname calls ACE_LACKS_WAIT The platform lacks wait ACE_LACKS_WIN32_GETPROCESSTIMES The Windows platform doesn't have GetProcessTimes(). -ACE_LACKS_WIN32_MOVEFILEEX The Windows platform doesn't have - MoveFileEx(). -ACE_LACKS_WIN32_SECURITY_DESCRIPTORS The Windows platform doesn't have - security descriptor support. ACE_LACKS_WRITEV Platform doesn't define writev, so use our own ACE_NEEDS_HUGE_THREAD_STACKSIZE Required by platforms with @@ -887,10 +822,6 @@ ACE_NO_WIN32_LEAN_AND_MEAN If this is set, then ACE does not code that uses non-lean Win32 facilities such as COM. -ACE_SHM_OPEN_REQUIRES_ONE_SLASH The path specified on shm_open() must - have a leading, single slash and not - have any other slashes. - ACE_WSTRING_HAS_USHORT_SUPPORT If a platform has wchar_t as a separate type, then ACE_WString doesn't have a @@ -1187,16 +1118,6 @@ ACE_HAS_POLL: #include /**/ <poll.h> #endif /* ACE_HAS_POLL */ -ACE_USE_POLL_IMPLEMENTATION: ------------------- - - Used in: - ace/OS.h - - Notes: - Use the poll() event demultiplexor rather than select(). - - ACE_HAS_SVR4_SIGNAL_T: ---------------------- @@ -1291,19 +1212,6 @@ ACE_HAS_TIUSER_H: in conjunction with t_bind, t_accept, etc.. transport layer. -ACE_USE_POLL_IMPLEMENTATION: ----------------------------- - - Used in: - libsrc/Reactor/Reactor.i - include/Event_Handler.h - ace/OS.h - include/Reactor.h - - Notes: - in the reactor, use poll instead of select. In general, - good thing to have set. - ACE_USES_GPROF: ---------------------------- Used in: diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp index 1f7b2dc8129..d75cf7d8354 100644 --- a/ACE/ace/Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Recursive_Thread_Mutex.cpp @@ -79,7 +79,7 @@ int ACE_Recursive_Thread_Mutex::get_nesting_level () { // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level"); -#if defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_VXTHREADS) ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_RECURSIVE_MUTEXES) # if defined (ACE_WIN32) @@ -99,7 +99,7 @@ ACE_Recursive_Thread_Mutex::get_nesting_level () nesting_level = this->lock_.nesting_level_; ACE_OS::mutex_unlock (&this->lock_.nesting_mutex_); return nesting_level; -#endif /* ACE_HAS_VXTHREADS || ACE_HAS_PHARLAP */ +#endif /* ACE_HAS_VXTHREADS */ } void diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp index ddd8e77923e..cc98d803395 100644 --- a/ACE/ace/Registry.cpp +++ b/ACE/ace/Registry.cpp @@ -1,6 +1,6 @@ #include "ace/Registry.h" -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) +#if defined (ACE_WIN32) # include "ace/os_include/os_netdb.h" # include "ace/OS_NS_unistd.h" @@ -1113,4 +1113,4 @@ ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h index 8d5e613116e..f58f1a9808f 100644 --- a/ACE/ace/Registry.h +++ b/ACE/ace/Registry.h @@ -19,8 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) -// This only works on registry-capable Win32 platforms. +#if defined (ACE_WIN32) #include "ace/Containers.h" #include "ace/SString.h" @@ -553,6 +552,6 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ #include /**/ "ace/post.h" #endif /* ACE_REGISTRY_H */ diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp index c507b47ee92..2822fa82b53 100644 --- a/ACE/ace/SPIPE_Connector.cpp +++ b/ACE/ace/SPIPE_Connector.cpp @@ -67,7 +67,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, ACE_HANDLE handle; ACE_UNUSED_ARG (pipe_mode); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) // We need to allow for more than one attempt to connect, // calculate the absolute time at which we give up. ACE_Time_Value absolute_time; @@ -143,11 +143,11 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, } } } -#else /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#else /* ACE_WIN32 */ handle = ACE::handle_timed_open (timeout, remote_sap.get_path_name (), flags, perms, sa); -#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP */ +#endif /* !ACE_WIN32 */ new_io.set_handle (handle); new_io.remote_addr_ = remote_sap; // class copy. diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.cpp b/ACE/ace/SSL/SSL_Asynch_BIO.cpp index 0faa775fc0f..0317ccbd12c 100644 --- a/ACE/ace/SSL/SSL_Asynch_BIO.cpp +++ b/ACE/ace/SSL/SSL_Asynch_BIO.cpp @@ -41,7 +41,7 @@ extern "C" #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) static BIO_METHOD methods_ACE = { BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, @@ -68,14 +68,14 @@ static BIO_METHOD methods_ACE = #else static BIO_METHOD* methods_ACE; # define BIO_set_num(b, val) -#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ +#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) BIO * const pBIO = BIO_new (&methods_ACE); #else if (!methods_ACE) diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 37e8ea1a339..6d7fd6b1282 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -30,7 +30,7 @@ const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_IN const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT; #endif /* ACE_VXWORKS <= 0x670 && __RTP__ && ACE_HAS_IPV6 */ -#if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) # include "ace/OS_NS_stdio.h" #endif @@ -438,89 +438,6 @@ static int get_ip_interfaces_win32 (size_t &count, ACE_INET_Addr *&addrs) { -# if defined (ACE_HAS_PHARLAP) - // PharLap ETS has its own kernel routines to rummage through the device - // configs and extract the interface info, but only for Pharlap RT. -# if !defined (ACE_HAS_PHARLAP_RT) - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ - - // Locate all of the IP devices in the system, saving a DEVHANDLE - // for each. Then allocate the ACE_INET_Addrs needed and fetch all - // the IP addresses. To locate the devices, try the available - // device name roots and increment the device number until the - // kernel says there are no more of that type. - const size_t ACE_MAX_ETS_DEVICES = 64; // Arbitrary, but should be enough. - DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES]; - EK_TCPIPCFG *devp = 0; - size_t i, j; - ACE_TCHAR dev_name[16]; - - count = 0; - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // Ethernet. - ACE_OS::sprintf (dev_name, - "ether%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // SLIP. - ACE_OS::sprintf (dev_name, - "sl%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // PPP. - ACE_OS::sprintf (dev_name, - "ppp%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - - if (count > 0) - ACE_NEW_RETURN (addrs, - ACE_INET_Addr[count], - -1); - else - addrs = 0; - - for (i = 0, j = 0; i < count; i++) - { - devp = EtsTCPGetDeviceCfg (ip_dev[i]); - if (devp != 0) - { - addrs[j].set (0, - devp->nwIPAddress, - 0); // Already in net order. - ++j; - } - // There's no call to close the DEVHANDLE. - } - - count = j; - if (count == 0 && addrs != 0) - { - delete [] addrs; - addrs = 0; - } - - return 0; - - -# else - // All non-CE, non-Pharlap Windows. Must support Winsock2. - int i, n_interfaces, status; INTERFACE_INFO info[64]; @@ -637,8 +554,6 @@ get_ip_interfaces_win32 (size_t &count, } return 0; - -# endif /* ACE_HAS_PHARLAP */ } #elif defined (ACE_HAS_GETIFADDRS) diff --git a/ACE/ace/Time_Policy.h b/ACE/ace/Time_Policy.h index b50d0594a4d..41a42eb1c39 100644 --- a/ACE/ace/Time_Policy.h +++ b/ACE/ace/Time_Policy.h @@ -108,7 +108,7 @@ class ACE_Dynamic_Time_Policy_Base; // forward decl class ACE_Export ACE_Delegating_Time_Policy { public: - ACE_Delegating_Time_Policy (ACE_Dynamic_Time_Policy_Base const * delegate = 0); + ACE_Delegating_Time_Policy (ACE_Dynamic_Time_Policy_Base const * delegate = nullptr); /// Return the current time according to this policy ACE_Time_Value_T<ACE_Delegating_Time_Policy> operator()() const; diff --git a/ACE/ace/Time_Policy.inl b/ACE/ace/Time_Policy.inl index f057ed3a0f7..52fe49f1f27 100644 --- a/ACE/ace/Time_Policy.inl +++ b/ACE/ace/Time_Policy.inl @@ -76,7 +76,7 @@ ACE_Delegating_Time_Policy::set_gettimeofday (ACE_Time_Value (*)()) ACE_INLINE void ACE_Delegating_Time_Policy::set_delegate (ACE_Dynamic_Time_Policy_Base const * delegate) { - if (delegate != 0) + if (delegate) { this->delegate_ = delegate; } diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index 1f8a71d8fb8..59cc14bdfc2 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -3,8 +3,8 @@ // This is file was automatically generated by $ACE_ROOT/bin/make_release.py #define ACE_MAJOR_VERSION 7 -#define ACE_MINOR_VERSION 0 -#define ACE_MICRO_VERSION 11 -#define ACE_VERSION "7.0.11" -#define ACE_VERSION_CODE 0x7000b +#define ACE_MINOR_VERSION 1 +#define ACE_MICRO_VERSION 0 +#define ACE_VERSION "7.1.0" +#define ACE_VERSION_CODE 0x70100 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index f5cd8859ebb..cf935f9dd45 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1763,18 +1763,6 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, DWORD result = 0; while (1) { -# if defined (ACE_HAS_PHARLAP) - // PharLap doesn't implement WaitForMultipleObjectsEx, and doesn't - // do async I/O, so it's not needed in this case anyway. - result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), - this->atomic_wait_array_, - TRUE, - timeout); - - if (result != WAIT_IO_COMPLETION) - break; - -# else result = ::WaitForMultipleObjectsEx (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), this->atomic_wait_array_, TRUE, @@ -1783,8 +1771,6 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, if (result != WAIT_IO_COMPLETION) break; - -# endif /* ACE_HAS_PHARLAP */ } switch (result) @@ -1811,22 +1797,11 @@ ACE_WFMO_Reactor::wait_for_multiple_events (int timeout, // Wait for any of handles_ to be active, or until timeout expires. // If <alertable> is enabled allow asynchronous completion of // ReadFile and WriteFile operations. - -#if defined (ACE_HAS_PHARLAP) - // PharLap doesn't do async I/O and doesn't implement - // WaitForMultipleObjectsEx, so use WaitForMultipleObjects. - ACE_UNUSED_ARG (alertable); - return ::WaitForMultipleObjects (this->handler_rep_.max_handlep1 (), - this->handler_rep_.handles (), - FALSE, - timeout); -#else return ::WaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (), this->handler_rep_.handles (), FALSE, timeout, alertable); -#endif /* ACE_HAS_PHARLAP */ } DWORD diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index 9ab89245007..b4c80688734 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -31,7 +31,7 @@ # define ACE_FALLTHROUGH [[gnu::fallthrough]] # else # define ACE_FALLTHROUGH -# endif +# endif # endif #endif diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 144e0283d98..ac57a80e0b3 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -101,7 +101,7 @@ # if !defined (ACE_HAS_PROCESS_SPAWN) # if !defined (ACE_LACKS_FORK) || \ - (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) + (defined (ACE_WIN32)) # define ACE_HAS_PROCESS_SPAWN 1 # endif # endif /* ACE_HAS_PROCESS_SPAWN */ diff --git a/ACE/ace/config-pharlap.h b/ACE/ace/config-pharlap.h deleted file mode 100644 index dbc933bc574..00000000000 --- a/ACE/ace/config-pharlap.h +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- C++ -*- */ -// This configuration file is for use with the PharLap Realtime ETS Kernel. -// It has been tested with PharLap TNT Embedded ToolSuite version 9.1. - -#ifndef ACE_CONFIG_PHARLAP_H -#define ACE_CONFIG_PHARLAP_H -#include /**/ "ace/pre.h" - -#define ACE_HAS_PHARLAP -// Some features are only available with the Realtime edition of ETS. -// Assume that if using ACE, the realtime version is also being used, but -// allow it to be turned off as well. -#ifndef ACE_HAS_PHARLAP_RT -# define ACE_HAS_PHARLAP_RT -#else -# if (ACE_HAS_PHARLAP_RT == 0) -# undef ACE_HAS_PHARLAP_RT -# endif -#endif - -// Fortunately, PharLap ETS offers much of the Win32 API. But it's still on -// Winsock 1.1 -#define ACE_HAS_WINSOCK2 0 -#define ACE_HAS_WINSOCK1 1 - -// The TSS implementation doesn't pass muster on the TSS_Test, but it works -// well with ACE's TSS emulation. -#define ACE_HAS_TSS_EMULATION - -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_TCP_NODELAY -#define ACE_LACKS_MSG_WFMO -#define ACE_LACKS_WIN32_MOVEFILEEX -#define ACE_LACKS_WIN32_REGISTRY -#define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS -#define ACE_LACKS_WIN32_SERVICES -#define ACE_LACKS_WIN32_SETFILEPOINTEREX - -// There's no host table, by default. So using "localhost" won't work. -// If your system does have the ability to use "localhost" and you want to, -// define it before including this file. -#if !defined (ACE_LOCALHOST) -# define ACE_LOCALHOST "127.0.0.1" -#endif /* ACE_LOCALHOST */ - -// The normal Windows default stack size doesn't hold for ETS. Set what you -// want explicitly. -#if !defined (ACE_DEFAULT_THREAD_STACKSIZE) -# define ACE_DEFAULT_THREAD_STACKSIZE (1024*1024) -#endif /* ACE_DEFAULT_THREAD_STACKSIZE */ - -// Don't know how to get the page size at execution time. This is most likely -// the correct value. -#define ACE_PAGE_SIZE 4096 - -#if defined (ACE_HAS_PHARLAP_RT) -# define ACE_HAS_IP_MULTICAST - // ETS winsock doesn't define IP level socket options -//# define IP_TOS 8 -#endif /* ACE_HAS_PHARLAP_RT */ - -// Let the config-win32.h file do its thing -#undef ACE_CONFIG_H -#include "ace/config-win32.h" -// Now remove things that desktop/server Windows has but Pharlap ETS doesn't. -#undef ACE_HAS_INTERLOCKED_EXCHANGEADD -#undef ACE_HAS_WCHAR - -// PharLap's exports apparantly define LockFile, but it's documented as -// unsupported. LockFileEx is not present. -#define ACE_LACKS_FILELOCKS - -#include /**/ <embkern.h> -#if defined (ACE_HAS_PHARLAP_RT) -# include /**/ <embtcpip.h> -#define ACE_LACKS_IP_ADD_MEMBERSHIP -#endif /* ACE_HAS_PHARLAP_RT */ - -// Although IN_CLASSD is defined in both winsock.h and winsock2.h, it ends -// up undefined for Pharlap ETS builds. If this is the case, set things up -// so nothing looks like class D. -#if !defined (IN_CLASSD) -# define IN_CLASSD(i) (0) -#endif - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_PHARLAP_H */ diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h deleted file mode 100644 index 75fafb245d4..00000000000 --- a/ACE/ace/config-suncc-common.h +++ /dev/null @@ -1,42 +0,0 @@ -// -*- C++ -*- -#ifndef ACE_SUNCC_COMMON_H -#define ACE_SUNCC_COMMON_H -#include /**/ "ace/pre.h" - -# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS -# define ACE_HAS_THR_C_DEST 1 -# define ACE_LACKS_SWAB -#if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0 -# undef ACE_HAS_CUSTOM_EXPORT_MACROS -#else -# ifndef ACE_HAS_CUSTOM_EXPORT_MACROS -# define ACE_HAS_CUSTOM_EXPORT_MACROS -# endif /* !ACE_HAS_CUSTOM_EXPORT_MACROS */ -# define ACE_Proper_Export_Flag __attribute__ ((visibility("default"))) -# define ACE_Proper_Import_Flag -# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T -# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE <CLASS, LOCK>; -# define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T -# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>; -#endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ - -#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 12 -#endif /* i386 */ - -#if defined (i386) || defined (__i386__) - // If running an Intel, assume that it's a Pentium so that - // ACE_OS::gethrtime () can use the RDTSC instruction. If running a - // 486 or lower, be sure to comment this out. (If not running an - // Intel CPU, this #define will not be seen because of the i386 - // protection, so it can be ignored.) -# define ACE_HAS_PENTIUM -#endif /* i386 */ - -#if !defined (ACE_LACKS_PRAGMA_ONCE) - // We define it with a -D with make depend. -# define ACE_LACKS_PRAGMA_ONCE -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ace/post.h" -#endif /* ACE_SUNCC_COMMON_H */ diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index f22fbb0f063..7e433c02da6 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -460,7 +460,7 @@ // PharLap ETS has its own winsock lib, so don't grab the one // supplied with the OS. -# if defined (_MSC_VER) && !defined (ACE_HAS_PHARLAP) +# if defined (_MSC_VER) # pragma comment(lib, "wsock32.lib") # endif /* _MSC_VER */ @@ -490,17 +490,14 @@ #define ACE_HAS_INTERLOCKED_EXCHANGEADD -#if !defined (ACE_HAS_PHARLAP) - -# if _WIN32_WINNT >= 0x400 -# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT -# endif +#if _WIN32_WINNT >= 0x400 +# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT +#endif // If CancelIO is undefined get the updated sp2-sdk from MS -# define ACE_HAS_CANCEL_IO -# define ACE_HAS_WIN32_OVERLAPPED_IO -# define ACE_HAS_WIN32_NAMED_PIPES -#endif /* !ACE_HAS_PHARLAP */ +#define ACE_HAS_CANCEL_IO +#define ACE_HAS_WIN32_OVERLAPPED_IO +#define ACE_HAS_WIN32_NAMED_PIPES #if !defined (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION) # define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH @@ -544,9 +541,7 @@ # define ACE_DISABLES_THREAD_LIBRARY_CALLS 0 #endif /* ACE_DISABLES_THREAD_LIBRARY_CALLS */ -#if !defined (ACE_HAS_PHARLAP) -# define ACE_HAS_LOG_MSG_NT_EVENT_LOG -#endif /* !ACE_HAS_PHARLAP */ +#define ACE_HAS_LOG_MSG_NT_EVENT_LOG #define ACE_HAS_LLSEEK diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h index f7414ebda54..1d378aa1e23 100644 --- a/ACE/ace/config-win32-mingw64.h +++ b/ACE/ace/config-win32-mingw64.h @@ -128,5 +128,10 @@ #define ACE_DLL_PREFIX ACE_TEXT ("lib") +#if defined(_UCRT) +# define ACE_HAS_3_PARAM_WCSTOK +#endif + + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MINGW64_H */ diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h deleted file mode 100644 index 18fea9a9a5e..00000000000 --- a/ACE/ace/config-win32-msvc-14.h +++ /dev/null @@ -1,131 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-14.h - * - * @brief Microsoft Visual C++ 14.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 2015. - * - * @note Do not include this file directly, include config-win32.h instead. - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_14_H -#define ACE_CONFIG_WIN32_MSVC_14_H -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#ifndef ACE_WIN32_VC14 -# define ACE_WIN32_VC14 -#endif - -// Windows' timeval is non-conformant (defined in terms of long instead of -// time_t) and VC8 changed time_t to a 64-bit value even when compiling a -// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few -// things for this compiler. See Time_Value.h for complete details. -#if !defined (_USE_32BIT_TIME_T) -# define ACE_HAS_TIME_T_LONG_MISMATCH -#endif - -#define ACE_HAS_ITOA - -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) - -#define ACE_HAS_SIG_ATOMIC_T - -#define ACE_LACKS_STRPTIME - -#define ACE_HAS_INTRIN_H -#define ACE_HAS_INTRINSIC_INTERLOCKED - -#define ACE_HAS_INTRINSIC_BYTESWAP - -#define ACE_LACKS_STRRECVFD - -// Platform provides ACE_TLI function prototypes. -// For Win32, this is not really true, but saves a lot of hassle! -#define ACE_HAS_TLI_PROTOTYPES - -// Platform support linebuffered streaming is broken -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -// ace/iostream.h does not work with the standard cpp library (yet). -#if !defined (ACE_USES_OLD_IOSTREAMS) -# define ACE_LACKS_ACE_IOSTREAM -#endif /* ! ACE_USES_OLD_IOSTREAMS */ - -// There are too many instances of this warning to fix it right now. -// Maybe in the future. - -// Disable warning of using Microsoft Extension. -#pragma warning(disable:4231) - -// 'class1' : inherits 'class2::member' via dominance -#pragma warning(disable:4250) - -#if !defined (ACE_HAS_TR24731_2005_CRT) -# define ACE_HAS_TR24731_2005_CRT -#endif - -// A template can not be exported. Only an instantiation may be exported. -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT - -// Windows Vista and Windows Server 2008 and newer do have native condition -// variables, but this is commented out because the support in ACE hasn't -// been completed -// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) -// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE -// # undef ACE_LACKS_COND_T -// #endif - -#define ACE_HAS_POSIX_TIME 1 -#define ACE_LACKS_TIMESPEC_T 1 - -// According to MS the Visual Studio 2015 C-runtime has a -// C99 compliant vsnprintf/vsnwprintf, this is a change compared to -// previous versions -#define ACE_HAS_C99_VSNPRINTF -#define ACE_HAS_C99_VSNWPRINTF - -// Visual Studio 2015 has 3 parameter wcstok -#define ACE_HAS_3_PARAM_WCSTOK - -// Visual Studio 2015 has adequate C++11 support -#define ACE_HAS_CPP11 - -#define ACE_PUTENV_EQUIVALENT ::_putenv -#define ACE_TEMPNAM_EQUIVALENT ::_tempnam -#define ACE_STRDUP_EQUIVALENT ::_strdup -#define ACE_MKDIR_EQUIVALENT ::_mkdir -#define ACE_ACCESS_EQUIVALENT ::_access -#define ACE_CHDIR_EQUIVALENT ::_chdir -#define ACE_RMDIR_EQUIVALENT ::_rmdir -#define ACE_GETCWD_EQUIVALENT ::_getcwd -#define ACE_SWAB_EQUIVALENT ::_swab -#define ACE_UNLINK_EQUIVALENT ::_unlink - -#define ACE_HAS_STRNLEN -#define ACE_HAS_WCSNLEN - -#define ACE_LACKS_STRUCT_DIR -#define ACE_LACKS_OPENDIR -#define ACE_LACKS_CLOSEDIR -#define ACE_LACKS_READDIR - -#define ACE_LACKS_MODE_T -#define ACE_LACKS_PID_T - -#define ACE_LACKS_NLINK_T -#define ACE_LACKS_UID_T -#define ACE_LACKS_GID_T - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_14_H */ diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h index c6376395d13..60de5347739 100644 --- a/ACE/ace/config-win32-msvc-141.h +++ b/ACE/ace/config-win32-msvc-141.h @@ -19,11 +19,116 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ +#ifndef ACE_WIN32_VC14 +# define ACE_WIN32_VC14 +#endif #ifndef ACE_WIN32_VC141 # define ACE_WIN32_VC141 #endif -#include "ace/config-win32-msvc-14.h" +// Windows' timeval is non-conformant (defined in terms of long instead of +// time_t) and VC8 changed time_t to a 64-bit value even when compiling a +// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few +// things for this compiler. See Time_Value.h for complete details. +#if !defined (_USE_32BIT_TIME_T) +# define ACE_HAS_TIME_T_LONG_MISMATCH +#endif + +#define ACE_HAS_ITOA + +#define ACE_ITOA_EQUIVALENT ::_itoa +#define ACE_STRCASECMP_EQUIVALENT ::_stricmp +#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp +#define ACE_WCSDUP_EQUIVALENT ::_wcsdup +#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) + +#define ACE_HAS_SIG_ATOMIC_T + +#define ACE_LACKS_STRPTIME + +#define ACE_HAS_INTRIN_H +#define ACE_HAS_INTRINSIC_INTERLOCKED + +#define ACE_HAS_INTRINSIC_BYTESWAP + +#define ACE_LACKS_STRRECVFD + +// Platform provides ACE_TLI function prototypes. +// For Win32, this is not really true, but saves a lot of hassle! +#define ACE_HAS_TLI_PROTOTYPES + +// Platform support linebuffered streaming is broken +#define ACE_LACKS_LINEBUFFERED_STREAMBUF + +// ace/iostream.h does not work with the standard cpp library (yet). +#if !defined (ACE_USES_OLD_IOSTREAMS) +# define ACE_LACKS_ACE_IOSTREAM +#endif /* ! ACE_USES_OLD_IOSTREAMS */ + +// There are too many instances of this warning to fix it right now. +// Maybe in the future. + +// Disable warning of using Microsoft Extension. +#pragma warning(disable:4231) + +// 'class1' : inherits 'class2::member' via dominance +#pragma warning(disable:4250) + +#if !defined (ACE_HAS_TR24731_2005_CRT) +# define ACE_HAS_TR24731_2005_CRT +#endif + +// A template can not be exported. Only an instantiation may be exported. +#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + +// Windows Vista and Windows Server 2008 and newer do have native condition +// variables, but this is commented out because the support in ACE hasn't +// been completed +// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) +// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE +// # undef ACE_LACKS_COND_T +// #endif + +#define ACE_HAS_POSIX_TIME 1 +#define ACE_LACKS_TIMESPEC_T 1 + +// According to MS the Visual Studio 2015 C-runtime has a +// C99 compliant vsnprintf/vsnwprintf, this is a change compared to +// previous versions +#define ACE_HAS_C99_VSNPRINTF +#define ACE_HAS_C99_VSNWPRINTF + +// Visual Studio 2015 has 3 parameter wcstok +#define ACE_HAS_3_PARAM_WCSTOK + +// Visual Studio 2015 has adequate C++11 support +#define ACE_HAS_CPP11 + +#define ACE_PUTENV_EQUIVALENT ::_putenv +#define ACE_TEMPNAM_EQUIVALENT ::_tempnam +#define ACE_STRDUP_EQUIVALENT ::_strdup +#define ACE_MKDIR_EQUIVALENT ::_mkdir +#define ACE_ACCESS_EQUIVALENT ::_access +#define ACE_CHDIR_EQUIVALENT ::_chdir +#define ACE_RMDIR_EQUIVALENT ::_rmdir +#define ACE_GETCWD_EQUIVALENT ::_getcwd +#define ACE_SWAB_EQUIVALENT ::_swab +#define ACE_UNLINK_EQUIVALENT ::_unlink + +#define ACE_HAS_STRNLEN +#define ACE_HAS_WCSNLEN + +#define ACE_LACKS_STRUCT_DIR +#define ACE_LACKS_OPENDIR +#define ACE_LACKS_CLOSEDIR +#define ACE_LACKS_READDIR + +#define ACE_LACKS_MODE_T +#define ACE_LACKS_PID_T + +#define ACE_LACKS_NLINK_T +#define ACE_LACKS_UID_T +#define ACE_LACKS_GID_T #if _MSVC_LANG >= 201402L # define ACE_HAS_CPP14 @@ -33,5 +138,9 @@ # define ACE_HAS_CPP17 #endif /* _MSVC_LANG >= 201703L */ +#if _MSVC_LANG >= 202002L +# define ACE_HAS_CPP20 +#endif /* _MSVC_LANG >= 202002L */ + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_141_H */ diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 1e1b063d420..e467bf0230b 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -39,8 +39,6 @@ # include "ace/config-win32-msvc-142.h" #elif (_MSC_VER >= 1910) # include "ace/config-win32-msvc-141.h" -#elif (_MSC_VER >= 1900) -# include "ace/config-win32-msvc-14.h" #else # error This version of Microsoft Visual C++ is not supported. #endif diff --git a/ACE/ace/os_include/netinet/os_in.h b/ACE/ace/os_include/netinet/os_in.h index f71e757532b..a9bca3fe2f8 100644 --- a/ACE/ace/os_include/netinet/os_in.h +++ b/ACE/ace/os_include/netinet/os_in.h @@ -41,11 +41,9 @@ extern "C" #endif /* !ACE_LACKS_NETINET_IN_H */ -# if defined (ACE_HAS_PHARLAP_RT) -# define ACE_IPPROTO_TCP SOL_SOCKET -# elif !defined (ACE_IPPROTO_TCP) +# if !defined (ACE_IPPROTO_TCP) # define ACE_IPPROTO_TCP IPPROTO_TCP -# endif /* ACE_HAS_PHARLAP_RT */ +# endif /* !ACE_IPPROTO_TCP */ # if !defined (ACE_HAS_IP_MULTICAST) && defined (ACE_LACKS_IP_ADD_MEMBERSHIP) // Even if ACE_HAS_IP_MULTICAST is not defined, if IP_ADD_MEMBERSHIP diff --git a/ACE/ace/os_include/os_netdb.h b/ACE/ace/os_include/os_netdb.h index de509b4cbc7..189f29b9dbb 100644 --- a/ACE/ace/os_include/os_netdb.h +++ b/ACE/ace/os_include/os_netdb.h @@ -127,24 +127,19 @@ struct servent { # define EAI_OVERFLOW -12 /* Error result from getaddrinfo(): buffer overflow */ #endif -#if defined (ACE_HAS_STRUCT_NETDB_DATA) - typedef char ACE_HOSTENT_DATA[sizeof(struct hostent_data)]; - typedef char ACE_SERVENT_DATA[sizeof(struct servent_data)]; - typedef char ACE_PROTOENT_DATA[sizeof(struct protoent_data)]; -#else -# if !defined ACE_HOSTENT_DATA_SIZE -# define ACE_HOSTENT_DATA_SIZE (4*1024) -# endif /*ACE_HOSTENT_DATA_SIZE */ -# if !defined ACE_SERVENT_DATA_SIZE -# define ACE_SERVENT_DATA_SIZE (4*1024) -# endif /*ACE_SERVENT_DATA_SIZE */ -# if !defined ACE_PROTOENT_DATA_SIZE -# define ACE_PROTOENT_DATA_SIZE (2*1024) -# endif /*ACE_PROTOENT_DATA_SIZE */ - typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE]; - typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE]; - typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE]; -#endif /* ACE_HAS_STRUCT_NETDB_DATA */ +#if !defined ACE_HOSTENT_DATA_SIZE +# define ACE_HOSTENT_DATA_SIZE (4*1024) +#endif /*ACE_HOSTENT_DATA_SIZE */ +#if !defined ACE_SERVENT_DATA_SIZE +# define ACE_SERVENT_DATA_SIZE (4*1024) +#endif /*ACE_SERVENT_DATA_SIZE */ +#if !defined ACE_PROTOENT_DATA_SIZE +# define ACE_PROTOENT_DATA_SIZE (2*1024) +#endif /*ACE_PROTOENT_DATA_SIZE */ + +typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE]; +typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE]; +typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE]; # if !defined(MAXHOSTNAMELEN) # define MAXHOSTNAMELEN HOST_NAME_MAX diff --git a/ACE/ace/os_include/sys/os_loadavg.h b/ACE/ace/os_include/sys/os_loadavg.h deleted file mode 100644 index 6437d7d9235..00000000000 --- a/ACE/ace/os_include/sys/os_loadavg.h +++ /dev/null @@ -1,29 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file os_loadavg.h - * - * loadavg functions - * - * @author Johnny Willemsen <jwillemsen@remedy.nl> - */ -//============================================================================= - -#ifndef ACE_OS_INCLUDE_SYS_OS_LOADAVG_H -#define ACE_OS_INCLUDE_SYS_OS_LOADAVG_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_SYS_LOADAVG_H) -# include /**/ <sys/loadavg.h> -#endif /* ACE_HAS_SYS_LOADAVG_H */ - -#include /**/ "ace/post.h" -#endif /* ACE_OS_INCLUDE_SYS_OS_LOADAVG_H */ diff --git a/ACE/ace/os_include/sys/os_mman.h b/ACE/ace/os_include/sys/os_mman.h index 6671ffd1c86..8870bf22f5c 100644 --- a/ACE/ace/os_include/sys/os_mman.h +++ b/ACE/ace/os_include/sys/os_mman.h @@ -49,22 +49,25 @@ extern "C" # define MAP_FIXED 0 #elif defined (ACE_WIN32) // These two may be used for internal flags soon: -# define MAP_PRIVATE 1 -# define MAP_SHARED 2 -# define MAP_FIXED 4 +# if !defined (MAP_PRIVATE) +# define MAP_PRIVATE 1 +# endif +# if !defined (MAP_SHARED) +# define MAP_SHARED 2 +# endif +# if !defined (MAP_FIXED) +# define MAP_FIXED 4 +# endif // MMAP flags -# define PROT_READ PAGE_READONLY -# define PROT_WRITE PAGE_READWRITE -# define PROT_RDWR PAGE_READWRITE -/* If we can find suitable use for these flags, here they are: -PAGE_WRITECOPY -PAGE_EXECUTE -PAGE_EXECUTE_READ -PAGE_EXECUTE_READWRITE -PAGE_EXECUTE_WRITECOPY -PAGE_GUARD -PAGE_NOACCESS -PAGE_NOCACHE */ +# if !defined (PROT_READ) +# define PROT_READ PAGE_READONLY +# endif +# if !defined (PROT_WRITE) +# define PROT_WRITE PAGE_READWRITE +# endif +# if !defined (PROT_RDWR) +# define PROT_RDWR PAGE_READWRITE +# endif #endif /* !ACE_LACKS_SYS_MMAN_H && !ACE_WIN32*/ # if !defined (ACE_MAP_PRIVATE) diff --git a/ACE/ace/os_include/sys/os_pstat.h b/ACE/ace/os_include/sys/os_pstat.h deleted file mode 100644 index 377e83b2e1c..00000000000 --- a/ACE/ace/os_include/sys/os_pstat.h +++ /dev/null @@ -1,30 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file os_pstat.h - * - * pstat functions - * - * @author Johnny Willemsen <jwillemsen@remedy.nl> - */ -//============================================================================= - -#ifndef ACE_OS_INCLUDE_SYS_OS_PSTAT_H -#define ACE_OS_INCLUDE_SYS_OS_PSTAT_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_SYS_PSTAT_H) -# include /**/ <sys/param.h> -# include /**/ <sys/pstat.h> -#endif /* ACE_HAS_SYS_PSTAT_H */ - -#include /**/ "ace/post.h" -#endif /* ACE_OS_INCLUDE_SYS_OS_PSTAT_H */ diff --git a/ACE/apps/gperf/src/Key_List.cpp b/ACE/apps/gperf/src/Key_List.cpp index 1d02a425acb..cdb6ee90851 100644 --- a/ACE/apps/gperf/src/Key_List.cpp +++ b/ACE/apps/gperf/src/Key_List.cpp @@ -501,7 +501,6 @@ Key_List::reorder () // Outputs the maximum and minimum hash values. Since the list is // already sorted by hash value all we need to do is find the final // item! - void Key_List::output_min_max () { @@ -1145,7 +1144,7 @@ Key_List::output_hash_function () // Generate the asso_values table. ACE_OS::printf (" static %sunsigned %s asso_values[] =\n {", - option[CONSTANT] ? "const " : "", + option[CONSTANT] ? "constexpr " : "", max_hash_value < ((int) UCHAR_MAX) ? "char" : (max_hash_value < ((int) USHRT_MAX) ? "short" : "int")); #if ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE @@ -1443,7 +1442,7 @@ Key_List::output_lookup_array () const char *indent = option[GLOBAL] ? "" : " "; - ACE_OS::printf ("%sstatic %ssigned %s lookup[] =\n%s%s{\n%s", indent, option[CONSTANT] ? "const " : "", + ACE_OS::printf ("%sstatic %ssigned %s lookup[] =\n%s%s{\n%s", indent, option[CONSTANT] ? "constexpr " : "", max <= SCHAR_MAX ? "char" : (max <= SHRT_MAX ? "short" : "int"), indent, indent, option[DEBUGGING] ? "" : " "); diff --git a/ACE/apps/gperf/src/Options.h b/ACE/apps/gperf/src/Options.h index 1bfac29b593..e679193cea0 100644 --- a/ACE/apps/gperf/src/Options.h +++ b/ACE/apps/gperf/src/Options.h @@ -71,12 +71,6 @@ enum Option_Type // g++ doesn't seem to do the right thing with them at the // moment... ;-( -// PharLap ETS defines EOS as well... so if building for ETS, clear out -// their EOS. -#if defined (ACE_HAS_PHARLAP) && defined (EOS) -# undef EOS -#endif /* ACE_HAS_PHARLAP && EOS */ - enum { MAX_KEY_POS = 128 - 1, /**< Max size of each word's key set. */ diff --git a/ACE/bin/copy-local-script.sh b/ACE/bin/copy-local-script.sh index d2d00615482..1f78db60bab 100755 --- a/ACE/bin/copy-local-script.sh +++ b/ACE/bin/copy-local-script.sh @@ -1,7 +1,7 @@ #!/bin/sh for i in *.gz *.bz2 *.zip *.md5; do - d=`echo $i | sed 's/\.[tz][ai][rp]/-7.0.12&/'` + d=`echo $i | sed 's/\.[tz][ai][rp]/-7.1.1&/'` echo "Copying $i to $d" cp -ip $i $d done diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh index f309efdc3e0..c0ea5f72290 100755 --- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh +++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh @@ -2,7 +2,7 @@ if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi -if test -z $3; then olddate=2022_12_19; else olddate=$3; fi +if test -z $3; then olddate=2023_03_03; else olddate=$3; fi if test -z $ACE_ROOT; then ACE_ROOT=..; fi if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi # diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index f75c1b6d325..e6b857054b4 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -906,7 +906,7 @@ sub check_for_NULL () } if ($disable == 0) { if(/(\(|\)|\s+|=)NULL(\)|\s+|\;|\,)/ and $` !~ /\/\// and $` !~ /\/\*/ and $` !~ /\*\*+/ and $` !~ /\s+\*+\s+/) { - print_error ("$file:$.: NULL found"); + print_error ("$file:$.: NULL found, use nullptr"); } } } diff --git a/ACE/debian/control b/ACE/debian/control index 3bbdc4b43e6..04828b116d5 100644 --- a/ACE/debian/control +++ b/ACE/debian/control @@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator * mpc-ace: generates project files for a single target * mwc-ace: generates workspace files for a set of projects -Package: libace-7.0.11 +Package: libace-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -45,7 +45,7 @@ Description: C++ network programming framework Package: libace-dev Architecture: any Section: libdevel -Depends: libace-7.0.11 (= ${binary:Version}), ${misc:Depends} +Depends: libace-7.1.0 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, pkg-config Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework - development files @@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation This package contains the ACE overview documentation, tutorials, examples, and information regarding upstream development. -Package: libace-ssl-7.0.11 +Package: libace-ssl-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -73,12 +73,12 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. -Package: libace-rmcast-7.0.11 +Package: libace-rmcast-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -92,12 +92,12 @@ Description: ACE reliable multicast library Package: libace-rmcast-dev Architecture: any Section: libdevel -Depends: libace-rmcast-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE reliable multicast library - development files This package contains the header files and static library for the ACE reliable multicast library. -Package: libace-tmcast-7.0.11 +Package: libace-tmcast-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -111,12 +111,12 @@ Description: ACE transactional multicast library Package: libace-tmcast-dev Architecture: any Section: libdevel -Depends: libace-tmcast-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE transactional multicast library - development files This package contains the header files and static library for the ACE transactional multicast library. -Package: libace-htbp-7.0.11 +Package: libace-htbp-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library Package: libace-htbp-dev Architecture: any Section: libdevel -Depends: libace-htbp-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE protocol over HTTP tunneling library - development files This package contains the header files and static library for the ACE HTBP library. -Package: libace-inet-7.0.11 +Package: libace-inet-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -146,15 +146,15 @@ Description: ACE Inet protocol library Package: libace-inet-dev Architecture: any Section: libdevel -Depends: libace-inet-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE Inet protocol library - development files This package contains the header files and static library for the ACE Inet protocol library. -Package: libace-inet-ssl-7.0.11 +Package: libace-inet-ssl-7.1.0 Architecture: any Section: libs -Depends: libace-inet-7.0.11, libace-ssl-7.0.11, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-7.1.0, libace-ssl-7.1.0, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library Package: libace-inet-ssl-dev Architecture: any Section: libdevel -Depends: libace-inet-ssl-7.0.11 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-7.1.0 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SSL-enabled Inet protocol library - development files This package contains the header files and static library for the ACE SSL-enabled Inet protocol library. @@ -180,7 +180,7 @@ Description: ACE perfect hash function generator basically the same options and functionality. ace_gperf simply takes advantage of some of the features provided by the ACE library. -Package: libacexml-7.0.11 +Package: libacexml-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -196,12 +196,12 @@ Package: libacexml-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libacexml-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library - development files This package contains the header files and static library for the ACE XML parsing library. -Package: libace-xml-utils-7.0.11 +Package: libace-xml-utils-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -215,12 +215,12 @@ Package: libace-xml-utils-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libace-xml-utils-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev Description: ACE XML utility classes and methods - development files This package contains the header files and static library for the ACE XML Utils library -Package: libkokyu-7.0.11 +Package: libkokyu-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library Package: libkokyu-dev Architecture: any Section: libdevel -Depends: libkokyu-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE scheduling and dispatching library - development files This package contains the header files and static library for the ACE scheduling and dispatching library. -Package: libace-xtreactor-7.0.11 +Package: libace-xtreactor-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. -Package: libace-tkreactor-7.0.11 +Package: libace-tkreactor-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} Description: ACE-GUI reactor integration for Tk - development files This package contains header files and static library for the ACE-Tk reactor integration. -Package: libace-flreactor-7.0.11 +Package: libace-flreactor-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} +Depends: libace-flreactor-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FLTK - development files This package contains header files and static library for the ACE-FLTK reactor integration. -Package: libace-foxreactor-7.0.11 +Package: libace-foxreactor-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX Package: libace-foxreactor-dev Architecture: any Section: libdevel -Depends: libace-foxreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-7.1.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FOX - development files This package contains header files and static library for the ACE-FOX reactor integration. @@ -343,7 +343,7 @@ Description: ACE network service implementations files to link the various ACE network services together, either statically or dynamically, and form complete server programs. -Package: libnetsvcs-7.0.11 +Package: libnetsvcs-7.1.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries Package: libnetsvcs-dev Architecture: any Section: libdevel -Depends: libnetsvcs-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-7.1.0 (= ${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/docs/Download.html b/ACE/docs/Download.html index b9ec2ae919a..f6f2249e235 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -90,160 +90,160 @@ Windows line feeds. For all other platforms download a .gz/.bz2 package. </P> <UL> -<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 7.0.11 and TAO 3.0.11 -(ACE+TAO x.0.11), please use the links below to download it.<P> +<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 7.1.0 and TAO 3.1.0 +(ACE+TAO x.1.0), please use the links below to download it.<P> <TABLE BORDER="4"> <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR> <TR><TD>ACE+TAO.tar.gz</TD> <TD>ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE+TAO-7.0.11.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.11.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-7.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.1.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE+TAO-src-7.0.11.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.11.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-src-7.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.1.0.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE+TAO-7.0.11.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.11.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-7.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.1.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE+TAO-src-7.0.11.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.11.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-src-7.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.1.0.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE+TAO-7.0.11.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.11.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-7.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.1.0.zip">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE+TAO-src-7.0.11.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.11.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-src-7.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.1.0.zip">FTP</A>] </TD> </TR> <TR><TD>ACE-html.tar.gz</TD> <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE-html-7.0.11.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.11.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-html-7.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.1.0.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE-html.tar.bz2</TD> <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE-html-7.0.11.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.11.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-html-7.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.1.0.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE-html.zip</TD> <TD>Doxygen documentation for ACE+TAO (zip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE-html-7.0.11.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.11.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-html-7.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.1.0.zip">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE-7.0.11.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.11.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-7.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.1.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE-src-7.0.11.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.11.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-src-7.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.1.0.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE-7.0.11.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.11.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-7.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.1.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE-src-7.0.11.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.11.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-src-7.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.1.0.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE-7.0.11.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.11.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-7.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.1.0.zip">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_11/ACE-src-7.0.11.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.11.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-src-7.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.1.0.zip">FTP</A>] </TD> </TR> </TABLE> -<LI> <B>Latest ACE+TAO Minor Release.</B> The latest minor release is ACE 7.0.0 and TAO 3.0.0 -(ACE+TAO x.0.0), please use the links below to download it.<P> +<LI> <B>Latest ACE+TAO Minor Release.</B> The latest minor release is ACE 7.1.0 and TAO 3.1.0 +(ACE+TAO x.1.0), please use the links below to download it.<P> <TABLE BORDER="4"> <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR> - <TR><TD>ACE+TAO-7.0.0.tar.gz</TD> + <TR><TD>ACE+TAO-7.1.0.tar.gz</TD> <TD>ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-7.0.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.0.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-7.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.1.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-src-7.0.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.0.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-src-7.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.1.0.tar.gz">FTP</A>] </TD> </TR> - <TR><TD>ACE+TAO-7.0.0.tar.bz2</TD> + <TR><TD>ACE+TAO-7.1.0.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-7.0.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.0.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-7.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.1.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-src-7.0.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.0.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-src-7.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.1.0.tar.bz2">FTP</A>] </TD> </TR> - <TR><TD>ACE+TAO-7.0.0.zip</TD> + <TR><TD>ACE+TAO-7.1.0.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-7.0.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.0.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-7.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.1.0.zip">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-src-7.0.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.0.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE+TAO-src-7.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.1.0.zip">FTP</A>] </TD> </TR> - <TR><TD>ACE-html-7.0.0.tar.gz</TD> + <TR><TD>ACE-html-7.1.0.tar.gz</TD> <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-html-7.0.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.0.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-html-7.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.1.0.tar.gz">FTP</A>] </TD> </TR> - <TR><TD>ACE-html-7.0.0.tar.bz2</TD> + <TR><TD>ACE-html-7.1.0.tar.bz2</TD> <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-html-7.0.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.0.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-html-7.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.1.0.tar.bz2">FTP</A>] </TD> </TR> - <TR><TD>ACE-html-7.0.0.zip</TD> + <TR><TD>ACE-html-7.1.0.zip</TD> <TD>Doxygen documentation for ACE+TAO (zip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-html-7.0.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.0.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-html-7.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.1.0.zip">FTP</A>] </TD> </TR> - <TR><TD>ACE-7.0.0.tar.gz</TD> + <TR><TD>ACE-7.1.0.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-7.0.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.0.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-7.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.1.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-src-7.0.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.0.tar.gz">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-src-7.1.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.1.0.tar.gz">FTP</A>] </TD> </TR> - <TR><TD>ACE-7.0.0.tar.bz2</TD> + <TR><TD>ACE-7.1.0.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-7.0.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.0.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-7.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.1.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-src-7.0.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.0.tar.bz2">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-src-7.1.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.1.0.tar.bz2">FTP</A>] </TD> </TR> - <TR><TD>ACE-7.0.0.zip</TD> + <TR><TD>ACE-7.1.0.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-7.0.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.0.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-7.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.1.0.zip">FTP</A>] </TD> - <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-src-7.0.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.0.zip">FTP</A>] + <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_1_0/ACE-src-7.1.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.1.0.zip">FTP</A>] </TD> </TR> </TABLE> diff --git a/ACE/etc/index.html b/ACE/etc/index.html index 8af2badef55..6cd8ffd21c4 100644 --- a/ACE/etc/index.html +++ b/ACE/etc/index.html @@ -30,6 +30,7 @@ <hr> We do have the documentation for previous releases <ul> + <LI><P><A HREF="7.1.0/html">7.1.0</A></P></LI> <LI><P><A HREF="7.0.11/html">7.0.11</A></P></LI> <LI><P><A HREF="7.0.10/html">7.0.10</A></P></LI> <LI><P><A HREF="7.0.9/html">7.0.9</A></P></LI> diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp index ba53e2b3af6..dc3a2af3b01 100644 --- a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -260,7 +260,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 0; } -//typedef ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t> ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Reactor, ACE_Null_Mutex); ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Null_Mutex); #define ACE_Test_and_Set_type \ diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 2cfc0accbec..a0fed4aa604 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -18,12 +18,6 @@ else CXX_MAJOR_VERSION := $(shell $(CXX) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//') endif -# clang5 has C++03 as default C++ version, enable this to be C++11 -# the older clang versions all return 4.2.1 as part of dumpversion -ifeq ($(findstring $(CXX_MAJOR_VERSION),4),$(CXX_MAJOR_VERSION)) - c++11 ?= 1 -endif - CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = $(CXX) @@ -45,6 +39,10 @@ ifeq ($(c++11),1) CCFLAGS += -std=c++11 endif +ifeq ($(c++14),1) + CCFLAGS += -std=c++14 +endif + ifeq ($(no_deprecated),1) CCFLAGS += -Wno-deprecated-declarations endif diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU index 342883b2855..315521a7f8f 100644 --- a/ACE/include/makeinclude/platform_macosx_common.GNU +++ b/ACE/include/makeinclude/platform_macosx_common.GNU @@ -42,7 +42,7 @@ SOBUILD = -o $(VSHDIR)$*.dylib $< ifeq ($(findstring g++,$(CXX)),)# include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU else - c++11 ?= 1 + c++14 ?= 1 include $(ACE_ROOT)/include/makeinclude/platform_clang_common.GNU endif diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.cpp b/ACE/protocols/ace/HTBP/HTBP_Addr.cpp index fdc13f56090..182fa4f1fbc 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Addr.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Addr.cpp @@ -3,14 +3,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// Constructor -ACE::HTBP::Addr::Addr () -{ -} - // Creates a ACE_INET_Addr from a PORT_NUMBER and the remote // HOST_NAME. - ACE::HTBP::Addr::Addr (u_short port_number, const char host_name[], int address_family) diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h index 3484700dc53..21e6ec35303 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Addr.h +++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h @@ -41,7 +41,7 @@ namespace ACE { public: /// Constructor - Addr (); + Addr () = default; Addr (const Addr &other); diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h index b14823f17b0..9ab9456110e 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h @@ -49,12 +49,7 @@ #define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") -#if defined (ACE_HAS_PHARLAP) -const size_t ACE_MAX_CLIENTS = 4; -#else const size_t ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_PHARLAP */ - const size_t ACE_NS_MAX_ENTRIES = 1000; const size_t ACE_DEFAULT_USECS = 1000; const size_t ACE_MAX_TIMERS = 4; @@ -170,7 +165,7 @@ inline ACE_Test_Output::~ACE_Test_Output () ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) delete this->output_file_; #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ } @@ -184,13 +179,6 @@ ACE_Test_Output::output_file () inline int ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) { -#if defined (ACE_HAS_PHARLAP) - // For PharLap, just send it all to the host console for now - redirect - // to a file there for saving/analysis. - EtsSelectConsole(ETS_CO_HOST); - ACE_LOG_MSG->msg_ostream (&cout); - -#else ACE_TCHAR temp[MAXPATHLEN]; // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; @@ -243,8 +231,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->msg_ostream (this->output_file ()); -#endif /* ACE_HAS_PHARLAP */ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 7168e8acf84..fdcdbb4491d 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,6 +1,6 @@ # Set the version number here. -%define ACEVER 7.0.11 -%define TAOVER 3.0.11 +%define ACEVER 7.1.0 +%define TAOVER 3.1.0 # Conditional build # Default values are diff --git a/ACE/tests/Conn_Test.cpp b/ACE/tests/Conn_Test.cpp index c44c607df25..b44f9547a9c 100644 --- a/ACE/tests/Conn_Test.cpp +++ b/ACE/tests/Conn_Test.cpp @@ -81,16 +81,8 @@ using CACHED_CONNECT_STRATEGY = ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOC #define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> // Default number of clients/servers. -#if defined (ACE_HAS_PHARLAP) -// PharLap is, by default, resource contrained. Test for something that works -// on the default configuration. -static int n_servers = 2; -static int n_clients = 4; -#else static int n_servers = 5; static int n_clients = 5; -#endif /* ACE_HAS_PHARLAP */ - static int n_client_iterations = 3; Svc_Handler::Svc_Handler (ACE_Thread_Manager *) diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 96262570a46..045152faec2 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -506,7 +506,7 @@ test_ostream () 1); } -#if !defined (ACE_VXWORKS) && !defined (ACE_HAS_PHARLAP) || (defined(ACE_VXWORKS) && (ACE_VXWORKS > 0x690)) +#if !defined (ACE_VXWORKS) || (defined(ACE_VXWORKS) && (ACE_VXWORKS > 0x690)) # define TEST_CAN_UNLINK_IN_ADVANCE #endif diff --git a/ACE/tests/Test_Output.cpp b/ACE/tests/Test_Output.cpp index a886cfed6a3..664b2e5ed90 100644 --- a/ACE/tests/Test_Output.cpp +++ b/ACE/tests/Test_Output.cpp @@ -52,8 +52,7 @@ ACE_Test_Output::~ACE_Test_Output () ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && \ - (!defined (ACE_HAS_PHARLAP) || defined (ACE_PHARLAP_TESTLOG_TO_FILE)) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) delete this->output_file_; #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ } @@ -74,13 +73,6 @@ ACE_Test_Output::output_file () int ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) { -#if defined (ACE_HAS_PHARLAP) && !defined (ACE_PHARLAP_TESTLOG_TO_FILE) - // For PharLap, just send it all to the host console for now - redirect - // to a file there for saving/analysis. - EtsSelectConsole(ETS_CO_HOST); - ACE_LOG_MSG->msg_ostream (&cout); - -#else ACE_TCHAR temp[MAXPATHLEN + 1] = { 0 }; // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir = 0; @@ -151,8 +143,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->msg_ostream (this->output_file_, 0); -#endif /* ACE_HAS_PHARLAP && !ACE_PHARLAP_TESTLOG_TO_FILE */ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp index edfbcf035a7..04eb3fc6ec7 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -56,7 +56,7 @@ static size_t svr_thrno = ACE_MAX_THREADS; // Default network parameters (MAX_BINDS and system buffers) are too small // for full test on some platforms; add platforms that can't handle too many // connection simultaneously here. -#if defined (ACE_VXWORKS) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_VXWORKS) #define ACE_LOAD_FACTOR /2 #else #define ACE_LOAD_FACTOR diff --git a/ACE/tests/Thread_Pool_Reactor_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Test.cpp index aa654361fba..e792840294d 100644 --- a/ACE/tests/Thread_Pool_Reactor_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Test.cpp @@ -58,7 +58,7 @@ static size_t svr_thrno = ACE_MAX_THREADS; // Default network parameters (MAX_BINDS and system buffers) are too small // for full test on some platforms; add platforms that can't handle too many // connection simultaneously here. -#if defined (ACE_VXWORKS) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_VXWORKS) #define ACE_LOAD_FACTOR /2 #else #define ACE_LOAD_FACTOR diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h index beb395d7b6e..bcd4ecd0c3f 100644 --- a/ACE/tests/test_config.h +++ b/ACE/tests/test_config.h @@ -57,12 +57,7 @@ # define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") #endif /* ACE_LOG_FILE_EXT_NAME */ -#if defined (ACE_HAS_PHARLAP) -size_t const ACE_MAX_CLIENTS = 4; -#else size_t const ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_PHARLAP */ - size_t const ACE_NS_MAX_ENTRIES = 1000; size_t const ACE_DEFAULT_USECS = 1000; size_t const ACE_MAX_TIMERS = 4; |