diff options
802 files changed, 15041 insertions, 8640 deletions
diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100644 index 00000000000..781f4161474 --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,45 @@ +### Version + +The version of ACE and/or TAO you are using + +### Host machine and operating system + +### Target machine and operating system (if different from host) + +### Compiler name and version (including patch level) + +### The $ACE_ROOT/ace/config.h file + +If you use a link to a platform-specific file, simply state which one + +### The $ACE_ROOT/include/makeinclude/platform_macros.GNU file + +if you use a link to a platform-specific file, simply state which one (unless this isn't used in this case, e.g., with Microsoft Visual C++) + +### Contents of $ACE_ROOT/bin/MakeProjectCreator/config/default.features + +Used by MPC when you generate your own makefiles + +### AREA/CLASS/EXAMPLE AFFECTED: + +What example failed? What module failed to compile? + +### The problem effects: + +Does it affect compilation, linking, or execution. Please indicate whether ACE/TAO, your application, or both are affected. + +### Synopsis + +Brief description of the problem + +### Description + +Detailed description of problem. Don't just say "<blah> doesn't work, here's a fix," explain what your program does to get to the <blah> state. + +### Repeat by + +What you did to get the error; include test program or session transcript if at all possible. + +### Sample fix/ workaround + +If available diff --git a/.travis.yml b/.travis.yml index 262acbab1f0..ad2e5813c9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: false +group: travis_latest language: cpp os: - linux @@ -21,7 +22,7 @@ env: - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO - MPC_ROOT=$TRAVIS_BUILD_DIR/MPC - LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH - - COMPILER=g++-7 + - COMPILER=g++-8 matrix: include: @@ -30,12 +31,54 @@ matrix: apt: sources: - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 + packages: + - libxerces-c-dev + - libssl-dev + - clang-7 + env: COMPILER=clang++-7 VERSIONED=1 TAO=1 ACETESTS=1 + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-6.0 + packages: + - libxerces-c-dev + - libssl-dev + - clang-6.0 + env: COMPILER=clang++-6.0 VERSIONED=1 TAO=1 ACETESTS=1 + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test - llvm-toolchain-trusty-5.0 packages: - libxerces-c-dev - libssl-dev - - clang++-5.0 + - clang-5.0 env: COMPILER=clang++-5.0 VERSIONED=1 TAO=1 ACETESTS=1 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - libxerces-c-dev + - libssl-dev + - g++-7 + env: COMPILER=g++-7 VERSIONED=1 TAO=1 ACETESTS=1 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - libxerces-c-dev + - libssl-dev + - g++-6 + env: COMPILER=g++-6 VERSIONED=1 TAO=1 ACETESTS=1 - os: osx env: COMPILER=clang++ VERSIONED=1 TAO=1 ACETESTS=1 @@ -46,7 +89,7 @@ addons: packages: - libssl-dev - libxerces-c-dev - - g++-7 + - g++-8 before_install: - git clone --depth 1 git://github.com/DOCGroup/MPC.git diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index b4434c62d79..a3e0d6a96eb 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -2023,7 +2023,7 @@ libraries. </p></li><li><b><a name="Linux">Linux</a></b><p> - ACE has been ported to <a href="http://www.cs.wustl.edu/%7Ecleeland/ace/">Linux</a> on + ACE has been ported to Linux on Intel, Alpha, and PowerPC platforms. If you use a RedHat 5.x distribution, it's best to use RedHat 5.1 or later. ACE works without any modifications on RedHat 5.1 and later, and on diff --git a/ACE/COPYING b/ACE/COPYING index 87a1661d7a0..67fc56322e6 100644 --- a/ACE/COPYING +++ b/ACE/COPYING @@ -8,7 +8,7 @@ (henceforth referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, [8]University of California, Irvine, and [9]Vanderbilt - University, Copyright (c) 1993-2017, all rights reserved. Since DOC + University, Copyright (c) 1993-2018, all rights reserved. Since DOC software is open-source, freely available software, you are free to use, modify, copy, and distribute--perpetually and irrevocably--the DOC software source code and object code produced from the source, as diff --git a/ACE/ChangeLogs/ACE-6_4_7 b/ACE/ChangeLogs/ACE-6_4_7 new file mode 100644 index 00000000000..3a24d62fe21 --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_4_7 @@ -0,0 +1,427 @@ +commit 99f855f9f3ab5102ce07424fd2968f8e330462a6 +Author: Steve Huston <shuston@riverace.com> +Date: Tue Mar 13 17:03:33 2018 -0400 + + Fix IPv4 case + +commit ba891f62e7f7d1d5255cbff26bf31f19d299a028 +Merge: 5a4a08e1606 2ea8eaff34b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Mar 12 21:26:07 2018 +0100 + + Merge pull request #593 from jwillemsen/jwi-comp38 + + Sun Studio 5.13 and older can't handle this + +commit 2ea8eaff34b62be1b38c3291779bae72a3dd3e56 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Mar 12 18:19:20 2018 +0100 + + Sun Studio 5.13 and older can't handle this + + * ACE/tests/Compiler_Features_38_Test.cpp: + +commit 4cbfbc87e403652de1493685778392309524a095 +Merge: 1879d43292c 168208dfd6b +Author: Steve Huston <shuston@riverace.com> +Date: Fri Mar 9 17:16:58 2018 -0500 + + Merge pull request #592 from DOCGroup/fix-ipv6only-handling + + Remove preproc checks - if ACE_HAS_IPV6 is set, the IPV6 defs should be there too. + +commit 168208dfd6bb859a48a7470730127de8cc22c639 +Author: Steve Huston <shuston@riverace.com> +Date: Fri Mar 9 16:02:04 2018 -0500 + + Remove preproc checks - if ACE_HAS_IPV6 is set, the IPV^ defs should be there too. + +commit 8ebc1623b063e89a2e3e3b225af7c54dc2c5de2f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Mar 9 08:52:30 2018 +0100 + + Check if __GNUC__ is defined and only log that C++ support is ok when the test code has been compiled + + * ACE/tests/Compiler_Features_38_Test.cpp: + +commit 4cfd0f26bde05974b3c4152463f92eb91f8ff6ad +Merge: 2018a59b318 643658368ad +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Mar 6 18:52:35 2018 +0100 + + Merge pull request #589 from jwillemsen/jwi-oldidtag + + Remove old left over version commit message + +commit 643658368ad9c4db6ee41aa22036a8e7c9994708 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Mar 6 18:43:59 2018 +0100 + + Remove old left over version commit message + + * ACE/bin/MakeProjectCreator/config/bmake.features: + +commit 4fa7cca17c3ff0c07f4c1b7b1bda71b6e131092b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Mar 6 11:41:04 2018 +0100 + + Any bcc32 version doesn't support inlined assembly + + * ACE/ace/config-win32-borland.h: + +commit 45df27f3869f66d895964f18a582136bb44333af +Author: shuai.lou <shuai.lou@greatopensource.com> +Date: Fri Mar 2 22:34:46 2018 +0800 + + Bugfix: ACE abort when use %l and the msg len exceed ACE_MAXLOGMSGLEN + +commit 8e034deb5cee9701aa396f10cfc16c01be0acd08 +Author: Steve Huston <shuston@riverace.com> +Date: Thu Mar 1 09:16:13 2018 -0500 + + Remove $Id$ to resolve fuzz error + +commit 1fee8620f369c4699a3ab44144a9d19a1e510303 +Merge: 296d82b7a2f 71a517bfb38 +Author: Steve Huston <shuston@riverace.com> +Date: Wed Feb 28 19:02:06 2018 -0500 + + Merge out from master + +commit 296d82b7a2fcff3d9cc704039a25fb0189669c17 +Author: Steve Huston <shuston@riverace.com> +Date: Wed Feb 28 18:54:05 2018 -0500 + + Add UDP changes and test program + +commit 222b5db197187810b1fd1b54aad9fc8dc0ffd774 +Author: Steve Huston <shuston@riverace.com> +Date: Wed Feb 28 18:30:19 2018 -0500 + + Added description of changes + +commit d4c520ce4cf5fc14aa296936e6c80cccbc12757e +Author: Adam Mitz <mitza@ociweb.com> +Date: Mon Feb 26 11:24:58 2018 -0600 + + NEWS for upcoming release + +commit 386d660e8d4f805190f0afcc68e3b3a8b0827da7 +Merge: 7675cb72f6b 63265355d6c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 26 09:59:19 2018 +0100 + + Merge pull request #580 from jwillemsen/jwi-wfmo-versioned + + List major changes + +commit 63265355d6c8d9677f048ee0dd628a82608b904e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 26 09:58:37 2018 +0100 + + List major changes + + * ACE/NEWS: + +commit 7675cb72f6b415ae19a278ac6364089eb57b4fff +Merge: 61beb04ce03 7ff4828b1d6 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Feb 25 10:20:43 2018 +0100 + + Merge pull request #579 from DOCGroup/jwillemsen-patch-2 + + Fixed mingw error + +commit 7ff4828b1d6fd976240a3aa15401f8a907f8119e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Feb 25 08:40:13 2018 +0100 + + Fixed mingw error + +commit fee85964688d1ac7da3cb792906d857440f6c072 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Feb 25 08:17:33 2018 +0100 + + Fixed error + +commit 250aef2e14bc22a9faffefb1999bc71646105d1c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Feb 24 15:12:38 2018 +0100 + + Fixed errors with versioned namespace builds + + * ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp: + * ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp: + +commit b3a525bcc9a7e575b8e17e0abb9dd7d8f39cb5a7 +Merge: cb29bd46571 e46f45e6a00 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Feb 17 22:32:19 2018 +0100 + + Merge pull request #574 from jwillemsen/jwi-taoidlleak + + msvc7.1 and gcc 4.1.1 can't handle this test so disable this test for… + +commit e46f45e6a00228722f3694152fcb02e79a9c1bc9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Feb 17 20:05:27 2018 +0100 + + msvc7.1 and gcc 4.1.1 can't handle this test so disable this test for those compilers + +commit cb29bd46571e428d1d71c860ec9010d29a3a1fe4 +Merge: 4665969af11 d14029823bf +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Feb 16 16:05:33 2018 +0100 + + Merge pull request #573 from jwillemsen/jwi-taoidlleak + + Add new C++ compiler test for testing a feature TAO is using + +commit d14029823bf4be658affed6c0a413b45534e5cfe +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Feb 16 12:39:02 2018 +0100 + + Initialise member to solve Codacy warning + + * ACE/tests/Compiler_Features_38_Test.cpp: + +commit 785cca646211feed9c238cf8d219687b85552546 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Feb 16 12:09:57 2018 +0100 + + Add constructor to make codacy happy + + * ACE/tests/Compiler_Features_38_Test.cpp: + +commit 56cba7ad62f51463ddaf89894db16cabc2193b9c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Feb 16 11:36:35 2018 +0100 + + Add new compiler test for a C++ feature TAO is using + + * ACE/tests/Compiler_Features_38_Test.cpp: + Added. + + * ACE/tests/run_test.lst: + * ACE/tests/tests.mpc: + +commit eb04d4bc9c163aed6f509d2c9888c65b3f1f622f +Author: Steve Huston <shuston@riverace.com> +Date: Mon Jan 29 19:34:50 2018 -0500 + + Fix typos, compile errors + +commit a13ddfc5371ca69a38c7d66906bd357a8ca87830 +Merge: c5d68d4ed60 220e906922b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jan 27 14:17:58 2018 +0100 + + Merge pull request #569 from jwillemsen/master + + Performance improvements + +commit 220e906922bcfd91013611a19923094f5c95f96b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jan 27 11:11:06 2018 +0100 + + Fixed compile error + + * ACE/ace/XML_Utils/XMLSchema/id_map.hpp: + +commit 6bd80e559a75a00ca328997d7e54acc6d6030c79 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jan 27 11:08:01 2018 +0100 + + Pass strings as const& + + * ACE/ace/XML_Utils/XMLSchema/id_map.hpp: + +commit d5ba9d4e65ade6cc83a76c5cc47eab41ed3ad941 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jan 27 10:26:34 2018 +0100 + + Check trailing whitespaces also for .py files + + * ACE/bin/fuzz.pl: + +commit c5d68d4ed60d031445356d670fa293d78f04c505 +Merge: 6639d53a99c fb5c132cda3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 26 18:57:16 2018 +0100 + + Merge pull request #568 from jwillemsen/master + + Update XML_Utils file with the latest from xsc + +commit fb5c132cda315cf72f7ba0873c2f06b60ca8b952 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 26 16:18:10 2018 +0100 + + Mark constructor explicit + + * ACE/ace/XML_Utils/XMLSchema/id_map.hpp: + +commit d32216e0244b969acfffa4776073637519ceaa02 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 26 15:53:25 2018 +0100 + + Pull in latest version from XSC which adds a new operation and provides some more information when an error occurs + + * ACE/ace/XML_Utils/XMLSchema/id_map.hpp: + +commit 1a055d24a37d709ff78364ccf0b84fae594107e6 +Author: Steve Huston <shuston@riverace.com> +Date: Mon Jan 22 18:55:00 2018 -0500 + + Add Howard's changes to allow ipv6-only on SOCK_Acceptor + +commit 29a39ca0376d04d1675b1642d9a06d509bca49d2 +Merge: 98ccf5cd1c7 6f09295375e +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Fri Jan 19 08:59:51 2018 -0600 + + Merge pull request #566 from iguessthislldo/master + + MPC global.features wireshark2 renamed to wireshark_cmake + +commit 9da59f9347aca3bd71a291b0a4b0b24666a82004 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jan 19 11:04:26 2018 +0100 + + Removed old left over cvs id tag + +commit 6f09295375e7dbe65ad6087c4be02c93dd84d2ac +Author: Frederick Hornsey <fred@hornsey.us> +Date: Wed Jan 17 18:22:19 2018 -0600 + + MPC global.features wireshark2 renamed to wireshark_cmake + +commit 41018b2be93ea1f5ef30d74ca9a0b9233e86630a +Author: Adam Mitz <mitza@ociweb.com> +Date: Sat Jan 13 12:10:40 2018 -0600 + + Compiler Features 32 Test: need to check Apple clang version numbers which use a different scheme than real clang version numbers + +commit 26a9a5469899f66eb5816d9d585b296cf49df28a +Author: Adam Mitz <mitza@ociweb.com> +Date: Fri Jan 12 15:23:17 2018 -0600 + + Compiler Features 24 Test: skip older clang versions + +commit 7d0117c30506099a968a0dc0d9229330217ec9ed +Merge: b0ef5cf1876 484dcbf6f2e +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Jan 11 13:54:45 2018 -0600 + + Merge pull request #557 from iguessthislldo/master + + Match MPC for Wireshark 2 Support + +commit e5d6c55227f9ee795d2e8ff8473296848a7e0190 +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Jan 11 13:54:08 2018 -0600 + + check clang version number for compiler test workaround + +commit 90adcc25acb454ce3de98443fb76e9a6d52de871 +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Jan 11 12:13:06 2018 -0600 + + clang workarounds for Compiler_Features_32_Test + +commit db6ca5ccdcb52899ce9571ff24897d50529de13b +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Jan 11 11:10:39 2018 -0600 + + clang: set ACE_HAS_CPP11 based on predefined macros + +commit 484dcbf6f2e089757a1fe38cd3638da1482f03df +Author: Fred Hornsey <fred@hornsey.us> +Date: Fri Jan 5 13:16:29 2018 -0600 + + Match MPC for Wireshark 2 Support + + Added wireshark_any and wireshark2 to global.features for Wireshark2 Support Windows to match the global.features file in MPC. + +commit 6fbf5788f0589ae7cde5448baeda0d6e9b1bfc79 +Merge: ac9ffb65e75 4ac686684c6 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Tue Jan 2 09:36:50 2018 -0600 + + Merge pull request #555 from mitza-oci/singleton-restart + + ACE_Singleton should work after ACE::fini, ACE::init (fixes issue #554) + +commit ac9ffb65e75c37283e3d238ba7ec86ffb35fd147 +Merge: 8e4d9ab2ae8 dff4439b183 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jan 2 12:26:30 2018 +0100 + + Merge pull request #556 from jwillemsen/master + + Updated copyright to 2018 + +commit dff4439b18379b9008ee696303be492d84d794dd +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jan 1 11:24:13 2018 +0100 + + Updated copyright to 2018 + + * ACE/tests/ACE.bsp: + Deleted, not used anymore + + * ACE/COPYING: + * TAO/COPYING: + +commit 4ac686684c6dff57c295fd5c28f929613be5aefa +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Dec 21 10:20:15 2017 -0600 + + updated test list now that test should pass + +commit 5bbbaacd283951886642a5113300f0c0543e51c0 +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Dec 21 10:18:10 2017 -0600 + + fixed issue #554 ACE_Singleton use after ACE::fini, ACE::init + +commit a68721afec17c9ac51077591bf12159645ef0756 +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Dec 21 10:10:52 2017 -0600 + + Updated MPC project for new ACE test + +commit 7233cf588e327e1c9ff4121ece63b8c0a63878d8 +Author: Adam Mitz <mitza@ociweb.com> +Date: Tue Dec 19 17:36:03 2017 -0600 + + New ACE test: check if ACE_Singleton works after ACE::fini, ACE::init + + Some lock types work, others don't, due to different logic per lock type + in ACE_Object_Manager::get_singleton_lock and how ACE_Singleton uses it. + +commit f0067177b0a0aa227b503f9b20cfd623143372cf +Author: Adam Mitz <mitza@ociweb.com> +Date: Tue Dec 12 12:09:46 2017 -0600 + + Added support for FreeBSD 11 + +commit 98c5adf44b718a26304d89619f993dc5725b0790 +Author: Adam Mitz <mitza@ociweb.com> +Date: Mon Dec 11 17:14:28 2017 -0600 + + Added support for cross compiling using MinGW on a Linux host. + +commit 52618c6f2a83446eb15ecd95e98e9d178a013d47 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Dec 8 09:38:58 2017 +0100 + + Make ACE 6.4.6 and TAO 2.4.6 public + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/debian/debian.control: + * ACE/docs/Download.html: + * ACE/docs/bczar/bczar.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/ACE/ChangeLogs/ACE-6_4_8 b/ACE/ChangeLogs/ACE-6_4_8 new file mode 100644 index 00000000000..824571dd9bd --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_4_8 @@ -0,0 +1,401 @@ +commit 6229f4500eae90370ec6ae3799d992b1cb27d1d4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon May 14 16:16:02 2018 +0200 + + List some more changes to ACE + +commit 3af62afe62ee636f3f5c3b17351c7fe6da8f26a7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat May 12 21:09:20 2018 +0200 + + List changes + + * ACE/NEWS: + +commit c546c63d12554c5b4b8e0b4641b02cd2ab0b15df +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Apr 23 16:58:35 2018 +0200 + + Get rid of ACE_HAS_NONCONST_FD_ISSET, not used anymore, related to issue #609 + + * ACE/ace/config-android.h: + * ACE/ace/config-macosx-leopard.h: + +commit a8ea2ce0ab23614064dc07707e215761aecd708e +Merge: 3abc2a0a218 f160e4078d8 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Apr 23 16:57:23 2018 +0200 + + Merge pull request #609 from dskyle/master + + * Fix ACE_Handle_Set::is_set to support platforms with both … + +commit d90fc5d87565a9f2e6cb7bd2cb616c0cc4803aa9 +Author: Adam Mitz <mitza@ociweb.com> +Date: Tue Apr 17 17:28:15 2018 -0500 + + gnuace MPC type: Environment variables must be "exported" to impact child processes + +commit 86658bfdb75efd76b043e637a8ddc9e254fa5524 +Author: Adam Mitz <mitza@ociweb.com> +Date: Tue Apr 17 17:27:52 2018 -0500 + + GNUAutobuild MPC type: + + Use POSIX-compliant redirection to work with all shells + +commit f160e4078d8d1591d71e36c3dc0d32c7f65c0880 +Author: David Kyle <david.kyle@gmail.com> +Date: Fri Apr 13 17:39:19 2018 -0400 + + Always const_cast for FD_ISSET. Remove intra-statement #if + +commit b08762b114014d42ba557ed8763aba8253ad1612 +Merge: 4b277a6f3ea 76b8f305025 +Author: David Kyle <david.kyle@gmail.com> +Date: Fri Apr 13 17:34:05 2018 -0400 + + Merge branch 'master' of github.com:dskyle/ACE_TAO + +commit 4b277a6f3ea98b5c6b1e4a4b9a96001bf9a43dbb +Merge: 4e72f72ed0b 439c9e0c867 +Author: David Kyle <david.kyle@gmail.com> +Date: Fri Apr 13 17:33:28 2018 -0400 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO + +commit bedd53e87472824b2ce78ba1dc661e18301157f9 +Merge: e467545f4ed b41eee5bece +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 07:53:33 2018 +0200 + + Merge pull request #608 from mitza-oci/ace-mpc + + No need to list ace_wchar.inl twice in the MPC file. + +commit e467545f4ed86697096c6cfa79bdc9d9308e4642 +Merge: ac7a1dae17e 4414c7bd3e8 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 07:52:37 2018 +0200 + + Merge pull request #616 from jwillemsen/jwi-acevs2017_2 + + Only list VERSION once + +commit 4414c7bd3e896b84dd030e983b9f40a17cc7be99 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Apr 12 20:37:06 2018 +0200 + + Only list VERSION once + +commit ceb273ea994e3718d2e7197454839bf7c1fcce34 +Merge: 3718261cb81 29c5bc48b96 +Author: Steve Huston <shuston@riverace.com> +Date: Tue Apr 10 18:59:38 2018 -0400 + + Merge out from master + +commit 3718261cb814c3cc598de91fa2bee7ddcdfffc7b +Author: Steve Huston <shuston@riverace.com> +Date: Tue Apr 10 18:43:02 2018 -0400 + + Pull changes from master; remove addr_any restriction from ipv6_only UDP + +commit 3ead9df51912321ed0040cf193127eb254adbdf5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 10 08:32:23 2018 +0200 + + Don't use inline assembly with clang compilers + + * ACE/ace/config-win32-borland.h: + +commit 3653b7c9b62e2e8c9fc49e98d3b82bccd3424a58 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 10 08:28:07 2018 +0200 + + Enable intel assembly when using the Embarcadero clang compilers + + * ACE/ace/CDR_Base.cpp: + * ACE/ace/config-win32-borland.h: + +commit 76b8f30502577cea23ccc31813f3c5e40f2b0c05 +Author: David Kyle <dskyle@sei.cmu.edu> +Date: Mon Apr 9 20:44:16 2018 -0400 + + * Fix Handle_Set.inl for Visual Studio + +commit e6349f5df343ef089ffadcbc6448ca5f9f2eb5d2 +Merge: 7374b0209e7 85cc6bae8a7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Apr 9 12:41:47 2018 +0200 + + Merge pull request #610 from jwillemsen/jwi-builtinbswap + + Make use of builtin_bswap(16|32|64) with Embarcadero C++ Builder clang + +commit 85cc6bae8a7187b9b5a4c41264aea2f9d8620922 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Apr 9 10:33:37 2018 +0200 + + Removed accidental change + + * ACE/ace/CDR_Base.inl: + +commit e9839d1b9f1d42cd15aaabb04fe015eb25bee9e3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Apr 9 09:20:19 2018 +0200 + + Test double/float as last, they are more complex so could easier fail + + * ACE/tests/CDR_Array_Test.cpp: + +commit 95fff62248ae45054a36ffc3b569a34b86c6d151 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Apr 9 08:15:19 2018 +0100 + + Make use of builtin_bswap(16|32|64) + +commit 4e72f72ed0b30b373564e45e8462412f443e1255 +Author: David Kyle <david.kyle@gmail.com> +Date: Sun Apr 8 16:51:22 2018 -0400 + + * Fix ACE_Handle_Set::is_set to support platforms with both ACE_HAS_BIG_FD_SET + and ACE_HAS_NONCONST_FD_ISSET. + * Add ACE_HAS_NONCONST_FD_ISSET to compile for recent android NDKs. + +commit b41eee5bece55292f12d5eec78966a0a80812d27 +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Apr 5 15:20:46 2018 -0500 + + No need to list ace_wchar.inl twice in the MPC file. + +commit 7374b0209e7ac3b6e22bfd86246d02f419d6fbb4 +Merge: effd803b7b9 b901665ea61 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Wed Apr 4 11:02:37 2018 -0500 + + Merge pull request #606 from mitza-oci/perlace-stacktrace + + Process_Unix.pm: optional stack traces and core file generation for stuck processes + +commit effd803b7b9badcd4414e1dc1d8dfdf6021a99e8 +Merge: b085ae3be0e 6f8b356f4ac +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Apr 4 18:01:47 2018 +0200 + + Merge pull request #607 from jwillemsen/master + + Small docu changes and only set no_deprecated=1 in our GNU make rules when it is not set yet + +commit 6f8b356f4acd034ff8996f515a81b789abeef715 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Apr 4 16:48:42 2018 +0200 + + Only set no_deprecated to 1 when it not has been set + + * ACE/include/makeinclude/platform_g++_common.GNU: + +commit 110a761b4731a561fbc04a62f98bc35863d4a64f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Apr 4 11:03:29 2018 +0200 + + Minor documentation changes and remove old cvs date tags + +commit b901665ea61fc8d923ec498d708909c777967cdb +Author: Adam Mitz <mitza@ociweb.com> +Date: Wed Mar 28 15:21:39 2018 -0500 + + Process_Unix.pm: optional stack traces and core file generation for stuck processes + +commit 0f82fa2d40bc0a82a92a8cb809c74727eac78a66 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Thu Mar 29 14:31:58 2018 -0500 + + Compiler_Features_32_Test for clang 6 + + No different than clang 5 + +commit 8903deb76a7129defc2849125165f95ab2235692 +Author: brewmanz(75) <brewmanz@gmail.com> +Date: Thu Mar 29 20:54:02 2018 +1300 + + Add missing $ prefix to ACE_ROOT + +commit d7e67f3d37c23b4b46875d9c810c3fa44a64ac8b +Author: David Ward <david.ward@ll.mit.edu> +Date: Sun Mar 25 19:05:50 2018 -0400 + + Update my e-mail address + +commit b7d5b823a788467d79b12c27f9771f5d407746f3 +Author: David Ward <david.ward@ll.mit.edu> +Date: Sun Mar 25 19:05:44 2018 -0400 + + Update instructions for adding a release to openSUSE Build Service + +commit 30f4c6e7312ac0941b4eeadaa2b0916de4918399 +Author: David Ward <david.ward@ll.mit.edu> +Date: Sun Mar 25 19:04:39 2018 -0400 + + Fix handling of Debian packaging files in ACE/bin/make_release.py + + Remove unused code to handle TAO, which is not packaged for Debian. + + Remove code to handle ACE/debian/ace.dsc which was deleted. (A .dsc + file is produced automatically by building a Debian source package.) + + Examine ACE/debian/control instead of ACE/debian/debian.control. + + Update the version inside ACE/debian/*-<version>.lintain-overrides + files, in addition to renaming these files. + + Adjust a regular expression to avoid matching on whitespace or other + characters past the end of the file or package name. This had caused + version updates to occur in the wrong places in ACE/debian/control. + +commit c6def22a0b87bb608496721bcf8c4dc0a4b121b4 +Author: David Ward <david.ward@ll.mit.edu> +Date: Sun Mar 25 19:04:24 2018 -0400 + + Exclude TAO in ACE/debian/ACE-DPKG.mwc + + This provides consistency with ACE/ACE.mwc, which excludes TAO (as + seen in both the ACE-only and ACE+TAO source distributions). + + Adding this exclusion allows Debian package builds to succeed from + either source distribution, rather than failing if it contains TAO. + In turn, this allows the openSUSE Build Service to produce both RPM + and Debian packages from a single ACE+TAO source distribution. + +commit ad5f2b013459dc63d98aee4b0533e5c4d1b14878 +Author: David Ward <david.ward@ll.mit.edu> +Date: Sun Mar 25 19:04:11 2018 -0400 + + Include appropriate file from ChangeLogs directory in Debian packages + + Use the ACE version number to determine the file in the ChangeLogs + directory to install in Debian packages. (The variable definitions + are copied from ACE/include/makeinclude/wrapper_macros.GNU for the + non-Windows case.) + +commit be271a0a0fd77a77cbfd35c989abdbb84bd537d4 +Author: David Ward <david.ward@ll.mit.edu> +Date: Sun Mar 25 19:03:44 2018 -0400 + + Synchronize ACE/debian with contents of Debian source repository + + Incorporate changes from the Debian source repository [1], but keep + the package version current (and where the package version is wrong, + correct it). Also fix corrupted version checks for external package + dependencies. + + This does not introduce additional scripts from the repository that + are unused when building packages. + + [1]: git://anonscm.debian.org/pkg-ace/pkg-ace.git + +commit 4ad608f47c5b15468dee6384823312a9425b4e44 +Author: David Ward <david.ward@ll.mit.edu> +Date: Sun Mar 25 19:03:34 2018 -0400 + + Remove unused file ACE/rpmbuild/ace-tao-macros.patch + +commit 9910eb31a3e742a9734b526b27370cc8280a1ac8 +Author: David Ward <david.ward@ll.mit.edu> +Date: Sun Mar 25 19:03:25 2018 -0400 + + Improve test for RHEL or CentOS in RPM packaging + + The %{rhel_version} and %{centos_version} RPM macros are specific + to the openSUSE Build Service. Use the %{rhel} macro to test for + these distributions instead, which supports local builds. + +commit 1d3807c4da1e3cadf16b71192d2e41fac3488814 +Author: David Ward <david.ward@ll.mit.edu> +Date: Sun Mar 25 19:03:15 2018 -0400 + + Explicitly require Data::Dumper Perl module to build RPM packages + + In Fedora, this Perl module is located in a separate package that + may not be installed automatically in a minimal build environment + (for example, when building packages with Mock [1]). This module + is used by MPC during the build. + + This change adds the virtual package name "perl(Data::Dumper)" to + the BuildRequires: tag, which ensures that the package containing + this module is installed for any RPM-based distribution. This was + tested with the openSUSE Build Service. + + [1]: https://github.com/rpm-software-management/mock/wiki + +commit 9850ed266139718f636331a75db49f9605b62e6a +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Mar 25 20:36:36 2018 +0200 + + Remove workarounds for vc6 and old gcc versions + + * ACE/ace/XML_Utils/XSCRT/Elements.hpp: + +commit c3ba4e68c86219610841d08d0506c8bbd66c3034 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Mar 25 18:26:25 2018 +0200 + + Minor improvements to the XML utils classes + + * ACE/ace/UUID.h: + * ACE/ace/XML_Utils/XMLSchema/id_map.hpp: + * ACE/ace/XML_Utils/XSCRT/Elements.hpp: + +commit 4e39b7db8eed8cddbb4ec1a97ae2870f842f7976 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Mar 21 11:22:24 2018 +0100 + + Documentation improvements + + * ACE/docs/index.html: + * ACE/docs/msvc_notes.txt: + +commit 2867697ce480fda37af565f38c729a3dbc13e6ee +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Mar 21 08:30:59 2018 +0100 + + Add get_idref that works wit a string& + + * ACE/ace/XML_Utils/XMLSchema/Types.hpp: + * ACE/ace/XML_Utils/XSCRT/Elements.hpp: + +commit 92d0806c151f4be4735a516aecfedd81f3876196 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Mar 18 10:55:07 2018 +0100 + + Remove empty ipp files + + * ACE/ace/XML_Utils/XMLSchema/Traversal.ipp: + * ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp: + * ACE/ace/XML_Utils/XMLSchema/Types.ipp: + * ACE/ace/XML_Utils/XMLSchema/Writer.ipp: + Deleted. + + * ACE/ace/XML_Utils/XMLSchema/Traversal.hpp: + * ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp: + * ACE/ace/XML_Utils/XMLSchema/Types.hpp: + * ACE/ace/XML_Utils/XMLSchema/Writer.hpp: + +commit 16e8495dd2f69b3c89d4fcd13b8e0c3096931c41 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Mar 16 16:32:16 2018 +0100 + + Instead of using [0] a [0L] has to be used, that is the correct fix + + * ACE/tests/Compiler_Features_38_Test.cpp: + +commit 1a40037d09b677b680a6ecbf6f3386aec5871807 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Mar 16 08:46:32 2018 +0100 + + ACE/TAO x.4.7 release + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: diff --git a/ACE/ChangeLogs/ACE-6_5_0 b/ACE/ChangeLogs/ACE-6_5_0 new file mode 100644 index 00000000000..dd7a5f32c4d --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_5_0 @@ -0,0 +1,96 @@ +commit 5837bc6cf7b1e2b1b71ce318e2748fa37c3d516a +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jun 5 08:57:02 2018 +0200 + + Added starter files for MacOSX Mojave + + * ACE/ace/config-macosx-mojave.h: + * ACE/include/makeinclude/platform_macosx_mojave.GNU: + Added. + + * ACE/ace/config-macosx.h: + * ACE/include/makeinclude/platform_macosx.GNU: + +commit 19536a1a9f180bce5160cfa4c0f3dc22410af6c3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu May 31 14:39:51 2018 +0200 + + Removed invalid supp + + * ACE/bin/valgrind.supp: + +commit 51d87f3608962ffe1fb12e7a1de31e4c9fa7d729 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed May 30 11:51:07 2018 +0200 + + Next release will be minor + + * ACE/NEWS: + * TAO/NEWS: + +commit 8df6cf5df25f1de0a9a329ed44bc802d0ebf987f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri May 18 16:35:09 2018 +0200 + + Updated suppresion + * ACE/bin/valgrind.supp: + +commit 5f92d94e30389d3f4bf595ae4d270fb5ef8fbde4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri May 18 16:03:34 2018 +0200 + + Add valgrind suppression + + * ACE/bin/valgrind.supp: + +commit 98b95510000b4da8460034b8936422e98527740f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed May 16 18:27:21 2018 +0200 + + List std::unique_ptr usage + +commit 4c6e6ee3e74a866a345e0cb056b549815fcda121 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed May 16 16:18:24 2018 +0200 + + Make use of std::unique_ptr when C++11 is used + + * ACE/ace/XML_Utils/XML_Helper.h: + * ACE/ace/XML_Utils/XSCRT/Elements.hpp: + +commit ae77ea225ceb7eb17a8a4a0caaacdb9217bcfef7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 17:13:20 2018 +0200 + + Use std::unique_ptr when we have C++11 + + * ACE/ace/Thread_Manager.cpp: + +commit 22018c88a84afaad35045c52d74a212092a763f7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 17:12:12 2018 +0200 + + Use std::unique_ptr when we have C++11 + + * ACE/ace/Proactor.cpp: + +commit 0de4dc18e8809c9c0d47ae810ae6d5d087dab087 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 17:10:48 2018 +0200 + + Make use of std::unique_ptr when we have C++11 + + * ACE/ace/OS_NS_Thread.cpp: + +commit c560110d8f3206a7866866cff325489eb2ea88db +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon May 14 16:27:08 2018 +0200 + + ACE+TAO x.4.8 release + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/docs/bczar/bczar.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/ACE/ChangeLogs/ACE-6_5_1 b/ACE/ChangeLogs/ACE-6_5_1 new file mode 100644 index 00000000000..08ed12f3efe --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_5_1 @@ -0,0 +1,149 @@ +commit ae3cee721637d0481cdec3c52e1b379eb65a55c0 +Merge: 2103902aeee 1cc8fd38cd7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 6 13:13:43 2018 +0200 + + Merge pull request #660 from jwillemsen/master + + Changed deprecated_declarations to no_deprecated so that we have the … + +commit 1cc8fd38cd74c92035478504088aaf6e9fff533f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 6 11:25:13 2018 +0200 + + Changed deprecated_declarations to no_deprecated so that we have the same setting with clang and gcc + + * ACE/include/makeinclude/platform_linux_clang.GNU: + +commit 2103902aeee31d66e515ee7d885acb445e0161ad +Merge: 2864135a422 0a3568b650e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 6 09:59:20 2018 +0200 + + Merge pull request #659 from jwillemsen/master + + List important changes for the upcoming release + +commit 0a3568b650ee1d8cdbd66f5e521b5f4bd0b96680 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 6 09:58:51 2018 +0200 + + Updated changes + + * ACE/NEWS: + +commit d6b268e7eee10aabaa775065f72e283e2ce053f0 +Merge: 15c371e5493 c7571f5ff80 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 6 09:42:41 2018 +0200 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO + +commit 15c371e5493f0d727cd0bd395fe218b064bc4f16 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 6 09:41:29 2018 +0200 + + List important changes for the upcoming release + + * ACE/NEWS: + * TAO/NEWS: + +commit d4de87431e6ac1856460ea9dd829378a36037ff0 +Author: Martin Corino <mcorino@remedy.nl> +Date: Mon Aug 6 07:40:43 2018 +0200 + + added explicit include of <string> to fix older MSVC compile errors + + * ACE/ace/CDR_Stream.h: + +commit 4a09b0b10cbea1fdcb16161583ee22f7d151784b +Author: Martin Corino <mcorino@remedy.nl> +Date: Fri Aug 3 14:15:38 2018 +0200 + + add full support for streaming std::(w)string + + (optimized for C++11 and onwards) + added tests for optimized std::(w)string support + extend character translators with std::(w)string support also + +commit 8a9912c18c61fcb3141d661a6536370091a6fc67 +Author: Adam Mitz <mitza@ociweb.com> +Date: Mon Jul 9 10:08:30 2018 -0500 + + Removed duplicated project files (MPC issue 50) + +commit b54eb818519dfd0d592ffc21580704b6347510da +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 29 09:16:18 2018 +0200 + + Removed not used member + + * ACE/ace/Timer_Wheel_T.cpp: + +commit d3bb3163e9380bc55a4a8b7877949fdca5326571 +Author: Steve Huston <shuston@riverace.com> +Date: Tue Jun 26 18:01:38 2018 -0400 + + Fix memory leak in schedule; replace broken next-count logic in generate_timer_id + +commit 515ec9ad5cb7d0361b499a31c13a7cb6c83f435a +Author: Steve Huston <shuston@riverace.com> +Date: Tue Jun 26 18:00:48 2018 -0400 + + Remove unused member variable max_per_spoke_ + +commit ded09ee554a5fb49fb246f9177c697fbea8c2719 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 22 13:45:53 2018 +0200 + + When we have C++11 we are using std::unique_ptr instead of std::auto_ptr + + * ACE/ace/Auto_Ptr.cpp: + * ACE/ace/WFMO_Reactor.cpp: + +commit 720ab6a2f37514830b7fce2aba179a1cf67016e9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 22 13:31:29 2018 +0200 + + When using Visual Studio 2017 we can enable C++14 and C++17 compliance, with C++17 we don't have auto_ptr so shouldn't do a using + + * ACE/ace/Auto_Ptr.h: + * ACE/ace/config-win32-msvc-141.h: + +commit cfa4831d01916c0835db5c52cb3a99bf1c4ad067 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 15 08:59:00 2018 +0200 + + Document API change + + * ACE/NEWS: + +commit 1cc3c03e2d52b02c9270238d9297acadc00dad69 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Jun 14 20:32:01 2018 +0200 + + When we have C++11 ACE_Strong_Bound_Ptr doesn't provide std::auto_ptr support, that is deprecated + + * ACE/ace/Bound_Ptr.h: + * ACE/ace/Bound_Ptr.inl: + * ACE/tests/Bound_Ptr_Test.cpp: + +commit 3a2f66fd31d78518857fd95790e02c46b0c099fb +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jun 12 10:05:28 2018 +0200 + + When making a new minor also update micro/beta tags + + * ACE/bin/make_release.py: + +commit 9f9cbdf71f7ef7c30c4b288de7f7b48f2a8c046e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jun 12 10:04:59 2018 +0200 + + Make x.5.0 public + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/ACE/ChangeLogs/ACE-6_5_2 b/ACE/ChangeLogs/ACE-6_5_2 new file mode 100644 index 00000000000..b311dda5107 --- /dev/null +++ b/ACE/ChangeLogs/ACE-6_5_2 @@ -0,0 +1,338 @@ +commit 011bf410fc6819c49497d8adbf8bdcc0d464b7ea +Author: Adam Mitz <mitza@ociweb.com> +Date: Wed Sep 12 10:49:55 2018 -0500 + + ACE_QtReactor: work-around a Qt5 bug + +commit 5fbe132d07ca2fa714f20a5be4ef25e6a32d37dc +Author: Adam Mitz <mitza@ociweb.com> +Date: Tue Sep 11 15:01:45 2018 -0500 + + Removed qt4=1 from gnuace.features. + + In order to switch between qt4 and qt5, the actual state of Qt support needs to be known at the time makefiles are generated with MPC. + +commit d43bdde22b088d4ba8280c8dbf8947cdf2835c7d +Author: Adam Mitz <mitza@ociweb.com> +Date: Tue Sep 11 08:53:48 2018 -0500 + + Allow Qt custom file types even when neither supported Qt version is enabled + +commit aaeeeb818dff6826cca42d1a5d63eb106fa8ab02 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Sep 11 09:01:13 2018 +0200 + + Removed comment at top of mpc file + +commit 0de90a8d46631024eb28a800c214129f85550fae +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Sep 11 09:01:01 2018 +0200 + + Layou change + + * ACE/README: + +commit 29506289651778c6218c4c65af77b2cc5785c8ec +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Sep 11 09:00:46 2018 +0200 + + Small changes to the doc files we package where + + * ACE/rpmbuild/ace-tao.spec: + +commit d8991068db5dfcb98a703323d7469da9615c43e2 +Merge: a752608aaa7 06a00d65352 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Mon Sep 10 18:17:32 2018 -0500 + + Merge pull request #697 from mitza-oci/qt5 + + Qt5 support + +commit a752608aaa76f8b0939918c920e47ec3ed5ea51f +Merge: 69e4852390e 141d42047ca +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Mon Sep 10 18:16:01 2018 -0500 + + Merge pull request #696 from mitza-oci/warnings + + Fixed clang warnings + +commit 06a00d6535256ddaf2f031d5521c095c3d3cf40e +Author: Adam Mitz <mitza@ociweb.com> +Date: Mon Sep 10 08:32:47 2018 -0500 + + Use qt5 mpc feature + +commit 2a4d10f1e13aadcb4735c81064b9cf60d81c8d6a +Author: Adam Mitz <mitza@ociweb.com> +Date: Mon Sep 10 08:07:56 2018 -0500 + + Projects using qtreactor need to be skipped when there's no qt + + Added NEWS + +commit 69e4852390e89fe8c8fe6eadedfaae9348cee091 +Merge: f5890a26e2a b91e4aa764f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Sep 9 10:01:38 2018 +0100 + + Merge pull request #698 from jwillemsen/master + + Removed qt settings to 0 for debian packaging, these are disabled by default + +commit b91e4aa764f05f3acc0d05973eade26cfec909d2 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Sep 8 14:50:24 2018 +0200 + + Removed qt settings to 0, these are disabled by default + + * ACE/debian/default.features: + * ACE/debian/platform_macros.GNU: + +commit f5890a26e2a40b811f87efaa372affd1771fa1b6 +Merge: a6398b53bd6 23e563b05ff +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Fri Sep 7 16:56:39 2018 -0500 + + Merge pull request #684 from iguessthislldo/master + + Disable Qt5 MPC Feature by Default + +commit 95bf013bd3bccdada189c038efbd93c87b774b1b +Author: Adam Mitz <mitza@ociweb.com> +Date: Fri Sep 7 16:29:56 2018 -0500 + + Qt5 support + +commit 141d42047ca42cbd011c01ff1f7cc395b4a1b37f +Author: Adam Mitz <mitza@ociweb.com> +Date: Fri Sep 7 16:25:09 2018 -0500 + + Fixed warning from clang + +commit 43f29d07196a29b536b8b0dc934c7877e93d16c7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Sep 7 16:59:33 2018 +0200 + + Layout changes + + * ACE/ace/QtReactor/QtReactor.h: + * TAO/tao/BiDir_GIOP/BiDirGIOP.h: + * TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h: + * TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h: + * TAO/tao/BiDir_GIOP/BiDir_Policy_i.h: + * TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h: + * TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h: + * TAO/tao/EndpointPolicy/EndpointPolicy_i.h: + * TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h: + * TAO/tao/IORInterceptor/IORInfo.h: + * TAO/tao/QtResource/QtResource_Factory.h: + +commit 5739964a26f380fd4051d1d78ca95d1212ac3970 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Sep 7 10:51:52 2018 +0200 + + List change + + * ACE/NEWS: + +commit 4a37c070ec51742c8a2e152901e3a47f7093ea55 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Sep 3 16:40:12 2018 +0200 + + Layout change + + * ACE/ace/Service_Repository.h: + +commit fff288bee7bc9a1d1e870ebd5c5d8cfcd11e6db8 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Sep 3 16:23:43 2018 +0200 + + Fixed typo in comment + + * ACE/ace/Service_Config.h: + * ACE/ace/Service_Gestalt.cpp: + * ACE/ace/TSS_T.h: + +commit 16c5af445ef3067bb364d97460fc2d80beb409be +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Sep 3 14:05:58 2018 +0200 + + Only define BIO_set_flags when it has not been defined yet + + * ACE/ace/SSL/SSL_Asynch_BIO.cpp: + +commit 9d8f3669be70635e3caceb84241c267cb143d6d0 +Merge: 5b33255ed43 b9b8143d1e7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 31 19:38:30 2018 +0100 + + Merge pull request #686 from jwillemsen/jwi-cbuilderx-strtok + + Corrected version check to also include C++BuilderXE2 + +commit b9b8143d1e76a10d84e940b7b0845f49cf4a021f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 31 17:52:00 2018 +0200 + + Fixed typo in comment + + * ACE/ace/Future.h: + +commit 72ea4b7804d5f2d193513d7ed20036a778775786 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 31 17:51:46 2018 +0200 + + Corrected version check to also include C++BuilderXE2 + + * ACE/ace/config-win32-borland.h: + +commit 94a495724845a9e2345dcfe428d5d8c4f05db594 +Merge: c763cbad5ed 037af8d86a7 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Fri Aug 31 08:55:34 2018 -0500 + + Merge pull request #681 from mitza-oci/gnuace-postbuild + + gnuace: postbuild step shouldn't run until after exeout/dllout/libout link/copy + +commit 18f775e47a7a03530c76935f80fd1c18e66d4c8e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 31 10:23:46 2018 +0200 + + Fixed typo + + * ACE/ace/QtReactor/QtReactor.h: + +commit 23e563b05ff215fe82c5f491cca396a4186a152f +Author: Fred Hornsey <fred@hornsey.us> +Date: Thu Aug 30 16:53:13 2018 -0500 + + Disable Qt5 MPC Feature by Default + +commit af38510e83bd5b8cbeb6777c7415677eb0d35e8b +Author: Like Ma <likemartinma@gmail.com> +Date: Thu Aug 30 16:19:32 2018 +0800 + + Use RAND_poll instead of RAND_screen that is deprecated in OpenSSL 1.1 + +commit 037af8d86a759c1970aff32d94c03aac7d88001f +Author: Adam Mitz <mitza@ociweb.com> +Date: Wed Aug 29 11:30:05 2018 -0500 + + gnuace: postbuild step shouldn't run until after exeout/dllout/libout link/copy + +commit 54c418e976e750016877a1c3bcd53e093c1ea824 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Aug 29 11:51:04 2018 +0200 + + Check observer pointer before using it + + * ACE/ace/Future.cpp: + +commit 97c91c6f403cca708bfd46f03b0facd04a0c14f1 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 16 12:13:05 2018 +0200 + + Updated msvc check, works now with Visual Studio 2017 + + * ACE/tests/Compiler_Features_27_Test.cpp: + +commit 0bb2f07ae39fd19ad96e8db8895fad69e42e09a4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 16 12:12:48 2018 +0200 + + Removed empty lines + + * ACE/examples/Map_Manager/test_hash_map_manager.cpp: + +commit 15701d04189a817616d3fa26b69ea5bfccb7f52f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Aug 15 13:01:52 2018 +0200 + + Removed empty line + + * ACE/ace/Service_Object.cpp: + +commit f061bb71b6b58cc51aeae57fd99e10e6de286c1c +Merge: 68381f0376d fb7aa2fd418 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 21:30:29 2018 +0200 + + Merge pull request #668 from jwillemsen/jwi-imr-enhancements + + Logging enhancements to the ImR + +commit 9626700e4e3fa997bb1e9e9a2a399eca3960bde6 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 13:31:24 2018 +0200 + + Fixed typos + + * ACE/ace/Connector.h: + * TAO/docs/pluggable_messaging.html: + * TAO/examples/Persistent_Grid/Grid_Client_i.cpp: + * TAO/examples/Persistent_Grid/Persistent_Client_i.cpp: + * TAO/examples/Simple/grid/Grid_Client_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp: + * TAO/tao/ImR_Client/ImplRepo.idl: + +commit c173bf51bc1f898964662cb51246e0b7c0109690 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 14:24:49 2018 +0200 + + Updated list of Visual Studio versions we pregenerate as part of the release + + * ACE/docs/Download.html: + +commit 24dc765d24cd5544ba3c6239829a7d2ea65a0642 +Merge: f9b4c7aa49e 82c6ba74c4d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 14:23:46 2018 +0200 + + Merge branch 'master' into jwi-zapvc12-release + +commit 82c6ba74c4d4fb52e07ea8846b5d1abf642cae7c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 10:56:00 2018 +0200 + + Updated copy/past text for doxygen gen + + * ACE/docs/bczar/bczar.html: + +commit f9b4c7aa49e674e49ffe12ffc9d8dc3d2f42cf49 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 10:55:29 2018 +0200 + + Don't ship vc12 generated solutions, Visual Studio 2015 and 2017 are the ones most used + + * ACE/bin/make_release.py: + +commit f92154b03a1dda2440d9be98219fea996623029b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 10:48:41 2018 +0200 + + Make x.5.1 public and prepare for the next release + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/ACE/Kokyu/Kokyu.mpc b/ACE/Kokyu/Kokyu.mpc index a3ab5aed2ea..f915e06fce6 100644 --- a/ACE/Kokyu/Kokyu.mpc +++ b/ACE/Kokyu/Kokyu.mpc @@ -1,4 +1,4 @@ -// -*- MPC -*- now wouldn't this be cool... +// -*- MPC -*- project(Kokyu) : acelib, ace_output, install { sharedname = Kokyu dynamicflags += KOKYU_BUILD_DLL @@ -1,3 +1,71 @@ +USER VISIBLE CHANGES BETWEEN ACE-6.5.2 and ACE-6.5.3 +==================================================== + +USER VISIBLE CHANGES BETWEEN ACE-6.5.1 and ACE-6.5.2 +==================================================== + +. Enhanced C++Builder XE2 support + +. ACE_QtReactor can be built with Qt version 5 using the qt5 MPC feature + +USER VISIBLE CHANGES BETWEEN ACE-6.5.0 and ACE-6.5.1 +==================================================== + +. At the moment C++11 or newer is enabled ACE_Strong_Bound_Ptr + doesn't provide the convenience functions to use a + std::auto_ptr anymore + +. Optimized CDR std::(w)string insertion and extraction + when C++11 or newer is enabled + +. Solved Visual Studio 2017 solution loading due to duplicate + files generated in a project file + +USER VISIBLE CHANGES BETWEEN ACE-6.4.8 and ACE-6.5.0 +==================================================== + +. The ACE core libraries now use std::unique_ptr instead + of std::auto_ptr when C++11 or newer is enabled + +USER VISIBLE CHANGES BETWEEN ACE-6.4.7 and ACE-6.4.8 +==================================================== + +. Enhanced Embarcadero C++ Builder support + +. ACE XML_Utils enhancements + +. Debian packaging enhancements + +. Support for clang6 and gcc8 + +. Enhanced Android support + +. Remove addr_any restriction from ipv6_only UDP + +USER VISIBLE CHANGES BETWEEN ACE-6.4.6 and ACE-6.4.7 +==================================================== + +. Added a new, optional argument named ipv6_only to: + ACE_Acceptor::ACE_Acceptor + ACE_Acceptor::open + ACE_SOCK_Dgram::ACE_SOCK_Dgram + ACE_SOCK_Dgram::open + If ipv6_only is 0/false (the default) the socket will accept + both IPv6 and IPv4 connections/datagrams. If ipv6_only is + 1/true the socket will only accept IPv6. + This behavior only applies when ACE_HAS_IPV6 is true and the + local-side IP address is the generic localhost IP address. + +. Integrated some changes from XSC into XML Utils + +. Enable ACE_HAS_CPP11 when we have clang with C++11 enabled + +. Added support for cross compiling using MinGW on a Linux host + +. Added support for FreeBSD 11 + +. Fixed issue ACE_Singleton was broken after ACE::fini, ACE::init (GitHub #554) + USER VISIBLE CHANGES BETWEEN ACE-6.4.5 and ACE-6.4.6 ==================================================== @@ -5,7 +73,7 @@ USER VISIBLE CHANGES BETWEEN ACE-6.4.5 and ACE-6.4.6 . VxWorks 7 (SR0510) support -. Support make install on newer Apple macOS versions +. Support make install on newer Apple MacOS versions USER VISIBLE CHANGES BETWEEN ACE-6.4.4 and ACE-6.4.5 ==================================================== diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 8ea942bbbca..75b1119c9a2 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -40,7 +40,7 @@ To: ace-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - ACE VERSION: 6.4.6 + ACE VERSION: 6.5.2 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/ACE/README b/ACE/README index f58f1a9100e..09d63156e15 100644 --- a/ACE/README +++ b/ACE/README @@ -1,5 +1,3 @@ - - This document is also available at the following URL: http://www.dre.vanderbilt.edu/~schmidt/ACE.html diff --git a/ACE/THANKS b/ACE/THANKS index 6072880a6fa..10b22318872 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2324,7 +2324,7 @@ Tim Pinkawa <tpinkawa at eagleseven dot com> Ed Blackmond <ed dot blackmond at themis dot com> Dave <dwh0403 at 163 dot com> Inma Perea <inma dot perea dot fdz at gmail dot com> -David Ward <dpward at mit dot edu> +David Ward <david dot ward at ll dot mit dot edu> Anatoli Sakhnik <sakhnik at gmail dot com> Max Zhou <earthdog at 126 dot com> Daynesh Mangal <daynesh at gmail dot com> diff --git a/ACE/VERSION b/ACE/VERSION index 5c6ece94edd..9241f2bc305 100644 --- a/ACE/VERSION +++ b/ACE/VERSION @@ -1,4 +1,4 @@ -This is ACE version 6.4.6, released Fri Dec 08 08:48:59 CET 2017 +This is ACE version 6.5.2, released Tue Sep 18 09:25:49 CEST 2018 If you have any problems with or questions about ACE, please send e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu), diff --git a/ACE/ace/Auto_Ptr.cpp b/ACE/ace/Auto_Ptr.cpp index 5a1184ea3e2..09028186a67 100644 --- a/ACE/ace/Auto_Ptr.cpp +++ b/ACE/ace/Auto_Ptr.cpp @@ -11,8 +11,6 @@ #include "ace/Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tt(ACE_Auto_Basic_Ptr) diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h index e06eb21b4a8..ad71242e978 100644 --- a/ACE/ace/Auto_Ptr.h +++ b/ACE/ace/Auto_Ptr.h @@ -76,7 +76,9 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include <memory> #if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) +#if !defined (ACE_HAS_CPP17) using std::auto_ptr; +#endif /* !ACE_HAS_CPP17 */ #endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ #else /* ACE_HAS_STANDARD_CPP_LIBRARY */ diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h index 46123c1ee43..4d07c5417d9 100644 --- a/ACE/ace/Bound_Ptr.h +++ b/ACE/ace/Bound_Ptr.h @@ -20,7 +20,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Auto_Ptr.h" +#if !defined (ACE_HAS_CPP11) +# include "ace/Auto_Ptr.h" +#endif /* !ACE_HAS_CPP11 */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -114,9 +116,11 @@ public: /// object \<p\> immediately. explicit ACE_Strong_Bound_Ptr (X *p = 0); +#if !defined (ACE_HAS_CPP11) /// Constructor that initializes an ACE_Strong_Bound_Ptr by stealing /// ownership of an object from an auto_ptr. explicit ACE_Strong_Bound_Ptr (auto_ptr<X> p); +#endif /* !ACE_HAS_CPP11 */ /// Copy constructor binds @c this and @a r to the same object. ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r); @@ -214,10 +218,12 @@ public: /// underlying object. void reset (X *p = 0); +#if !defined (ACE_HAS_CPP11) /// Resets the ACE_Strong_Bound_Ptr to refer to a different /// underlying object, ownership of which is stolen from the /// auto_ptr. void reset (auto_ptr<X> p); +#endif /* !ACE_HAS_CPP11 */ /// Allows us to check for NULL on all ACE_Strong_Bound_Ptr /// objects. diff --git a/ACE/ace/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl index 4acc85e6e05..826c9aa9898 100644 --- a/ACE/ace/Bound_Ptr.inl +++ b/ACE/ace/Bound_Ptr.inl @@ -146,12 +146,14 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (X *p) { } +#if !defined (ACE_HAS_CPP11) template <class X, class ACE_LOCK> inline ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (auto_ptr<X> p) : counter_ (COUNTER::create_strong ()), ptr_ (p.release()) { } +#endif /* !ACE_HAS_CPP11 */ template <class X, class ACE_LOCK> inline ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r) @@ -301,6 +303,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::reset (X *p) delete old_ptr; } +#if !defined (ACE_HAS_CPP11) template<class X, class ACE_LOCK> inline void ACE_Strong_Bound_Ptr<X, ACE_LOCK>::reset (auto_ptr<X> p) { @@ -311,6 +314,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::reset (auto_ptr<X> p) if (COUNTER::detach_strong (old_counter) == 0) delete old_ptr; } +#endif /* !ACE_HAS_CPP11 */ template <class X, class ACE_LOCK> inline ACE_Weak_Bound_Ptr<X, ACE_LOCK>::ACE_Weak_Bound_Ptr (X *p) diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp index d66a0625eba..56b65f08080 100644 --- a/ACE/ace/CDR_Base.cpp +++ b/ACE/ace/CDR_Base.cpp @@ -52,7 +52,7 @@ ACE_CDR::swap_2_array (char const * orig, char* target, size_t n) } #else char const * const o4 = ACE_ptr_align_binary (orig, 4); - // this is an _if_, not a _while_. The mistmatch can only be by 2. + // this is an _if_, not a _while_. The mismatch can only be by 2. if (orig != o4) { ACE_CDR::swap_2 (orig, target); @@ -74,7 +74,7 @@ ACE_CDR::swap_2_array (char const * orig, char* target, size_t n) // end marks our barrier for not falling outside. char const * const end = orig + 2 * (n & (~3)); - // See if we're aligned for writting in 64 or 32 bit chunks... + // See if we're aligned for writing in 64 or 32 bit chunks... #if ACE_SIZEOF_LONG == 8 && \ !((defined(__amd64__) || defined (__x86_64__)) && defined(__GNUG__)) if (target == ACE_ptr_align_binary (target, 8)) diff --git a/ACE/ace/CDR_Base.inl b/ACE/ace/CDR_Base.inl index 24000ac669e..c31c3b78555 100644 --- a/ACE/ace/CDR_Base.inl +++ b/ACE/ace/CDR_Base.inl @@ -66,6 +66,9 @@ ACE_CDR::swap_2 (const char *orig, char* target) // function. *reinterpret_cast<unsigned short *> (target) = _byteswap_ushort (*reinterpret_cast<unsigned short const *> (orig)); +#elif defined (ACE_HAS_BUILTIN_BSWAP16) + *reinterpret_cast<uint16_t *> (target) = + __builtin_bswap16 (*reinterpret_cast<uint16_t const *> (orig)); #elif defined (ACE_HAS_BSWAP16) *reinterpret_cast<uint16_t *> (target) = bswap16 (*reinterpret_cast<uint16_t const *> (orig)); @@ -100,6 +103,9 @@ ACE_CDR::swap_4 (const char* orig, char* target) // function. *reinterpret_cast<unsigned long *> (target) = _byteswap_ulong (*reinterpret_cast<unsigned long const *> (orig)); +#elif defined (ACE_HAS_BUILTIN_BSWAP32) + *reinterpret_cast<uint32_t *> (target) = + __builtin_bswap32 (*reinterpret_cast<uint32_t const *> (orig)); #elif defined (ACE_HAS_BSWAP32) *reinterpret_cast<uint32_t *> (target) = bswap32 (*reinterpret_cast<uint32_t const *> (orig)); @@ -135,6 +141,9 @@ ACE_CDR::swap_8 (const char* orig, char* target) // function. *reinterpret_cast<unsigned __int64 *> (target) = _byteswap_uint64 (*reinterpret_cast<unsigned __int64 const *> (orig)); +#elif defined (ACE_HAS_BUILTIN_BSWAP64) + *reinterpret_cast<uint64_t *> (target) = + __builtin_bswap64 (*reinterpret_cast<uint64_t const *> (orig)); #elif defined (ACE_HAS_BSWAP64) *reinterpret_cast<uint64_t *> (target) = bswap64 (*reinterpret_cast<uint64_t const *> (orig)); diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h index 0a29edf58a1..a791b89bd64 100644 --- a/ACE/ace/CDR_Size.h +++ b/ACE/ace/CDR_Size.h @@ -78,6 +78,10 @@ public: ACE_CDR::Boolean write_wstring (const ACE_CDR::WChar *x); ACE_CDR::Boolean write_wstring (ACE_CDR::ULong length, const ACE_CDR::WChar *x); + ACE_CDR::Boolean write_string (const std::string &x); +#if !defined(ACE_LACKS_STD_WSTRING) + ACE_CDR::Boolean write_wstring (const std::wstring &x); +#endif //@} /// @note the portion written starts at <x> and ends @@ -223,6 +227,12 @@ extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::Char* x); extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::WChar* x); +extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, + const std::string& x); +#if !defined(ACE_LACKS_STD_WSTRING) +extern ACE_Export ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, + const std::wstring& x); +#endif ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/CDR_Size.inl b/ACE/ace/CDR_Size.inl index 9b83b6f72e0..d138b3de13b 100644 --- a/ACE/ace/CDR_Size.inl +++ b/ACE/ace/CDR_Size.inl @@ -144,6 +144,26 @@ ACE_SizeCDR::write_wstring (const ACE_CDR::WChar *x) } ACE_INLINE ACE_CDR::Boolean +ACE_SizeCDR::write_string (const std::string &x) +{ + ACE_CDR::ULong len = + static_cast<ACE_CDR::ULong> (x.size ()); + return this->write_string (len, + x.empty () ? 0 : x.c_str ()); +} + +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_INLINE ACE_CDR::Boolean +ACE_SizeCDR::write_wstring (const std::wstring &x) +{ + ACE_CDR::ULong len = + static_cast<ACE_CDR::ULong> (x.size ()); + return this->write_wstring (len, + x.empty () ? 0 : x.c_str ()); +} +#endif + +ACE_INLINE ACE_CDR::Boolean ACE_SizeCDR::write_char_array (const ACE_CDR::Char *x, ACE_CDR::ULong length) { @@ -372,6 +392,22 @@ operator<< (ACE_SizeCDR &ss, const ACE_CDR::WChar *x) return (ACE_CDR::Boolean) 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 (); +} + +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_INLINE ACE_CDR::Boolean +operator<< (ACE_SizeCDR &ss, const std::wstring& x) +{ + ss.write_wstring (x); + return (ACE_CDR::Boolean) ss.good_bit (); +} +#endif + // The following use the helper classes ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_boolean x) diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index 3df331ff80b..32654aeddf8 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -1684,6 +1684,146 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x) return false; } +// As of C++11 std::string guarantees contiguous memory storage. +// That provides the opportunity to optimize CDR streaming. +ACE_CDR::Boolean +ACE_InputCDR::read_string (std::string& x) +{ +#if defined (ACE_HAS_CPP11) + // @@ This is a slight violation of "Optimize for the common case", + // i.e. normally the translator will be 0, but OTOH the code is + // smaller and should be better for the cache ;-) ;-) + if (this->char_translator_ != 0) + { + this->good_bit_ = this->char_translator_->read_string (*this, x); + return this->good_bit_; + } + + ACE_CDR::ULong len = 0; + + if (!this->read_ulong (len)) + return false; + + // A check for the length being too great is done later in the + // call to read_char_array but we want to have it done before + // the memory is allocated. + if (len > 0 && len <= this->length()) + { + try + { + x.resize (len-1); // no need to include the terminating '\0' here + } + catch (const std::bad_alloc&) + { + return false; + } + + if (len == 0 || this->read_char_array (&x[0], len-1)) + { + return this->skip_char (); // skip the terminating '\0' + } + } + + this->good_bit_ = false; + x.clear (); + return false; +#else + ACE_CDR::Char *buf = 0; + ACE_CDR::Boolean const marshal_flag = this->read_string (buf); + x.assign (buf); + ACE::strdelete (buf); + return marshal_flag; +#endif +} + +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_CDR::Boolean +ACE_InputCDR::read_wstring (std::wstring& x) +{ +#if defined (ACE_HAS_CPP11) + // @@ This is a slight violation of "Optimize for the common case", + // i.e. normally the translator will be 0, but OTOH the code is + // smaller and should be better for the cache ;-) ;-) + if (this->wchar_translator_ != 0) + { + this->good_bit_ = this->wchar_translator_->read_wstring (*this, x); + return this->good_bit_; + } + if (ACE_OutputCDR::wchar_maxbytes_ == 0) + { + errno = EACCES; + return (this->good_bit_ = false); + } + + ACE_CDR::ULong len = 0; + + if (!this->read_ulong (len)) + { + return false; + } + + // A check for the length being too great is done later in the + // call to read_char_array but we want to have it done before + // the memory is allocated. + if (len > 0 && len <= this->length ()) + { + if (static_cast<ACE_CDR::Short> (this->major_version_) == 1 + && static_cast<ACE_CDR::Short> (this->minor_version_) == 2) + { + len /= + ACE_Utils::truncate_cast<ACE_CDR::ULong> ( + ACE_OutputCDR::wchar_maxbytes_); + + try + { + x.resize (len); + } + catch (const std::bad_alloc&) + { + return false; + } + + if (this->read_wchar_array (&x[0], len)) + { + return true; + } + } + else + { + try + { + x.resize (len-1); // no need to include the terminating '\0' here + } + catch (const std::bad_alloc&) + { + return false; + } + + if (len == 1 || this->read_wchar_array (&x[0], len-1)) + { + return this->skip_wchar (); // skip the terminating '\0' + } + } + } + else if (len == 0) + { + x.clear (); + return true; + } + + this->good_bit_ = false; + x.clear (); + return false; +#else + ACE_CDR::WChar *buf = 0; + ACE_CDR::Boolean const marshal_flag = this->read_wstring (buf); + x.assign (buf); + ACE::strdelete (buf); + return marshal_flag; +#endif +} +#endif + ACE_CDR::Boolean ACE_InputCDR::read_array (void* x, size_t size, @@ -2227,12 +2367,36 @@ ACE_Char_Codeset_Translator::~ACE_Char_Codeset_Translator (void) { } +ACE_CDR::Boolean +ACE_Char_Codeset_Translator::read_string (ACE_InputCDR &cdr, + std::string &x) +{ + ACE_CDR::Char *buf = 0; + ACE_CDR::Boolean const marshal_flag = this->read_string (cdr, buf); + x.assign (buf); + ACE::strdelete (buf); + return marshal_flag; +} + // -------------------------------------------------------------- ACE_WChar_Codeset_Translator::~ACE_WChar_Codeset_Translator (void) { } +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_CDR::Boolean +ACE_WChar_Codeset_Translator::read_wstring (ACE_InputCDR &cdr, + std::wstring &x) +{ + ACE_CDR::WChar *buf = 0; + ACE_CDR::Boolean const marshal_flag = this->read_wstring (cdr, buf); + x.assign (buf); + ACE::strdelete (buf); + return marshal_flag; +} +#endif + // -------------------------------------------------------------- ACE_CDR::Boolean diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h index d085fb2ccd1..be7f7c80ede 100644 --- a/ACE/ace/CDR_Stream.h +++ b/ACE/ace/CDR_Stream.h @@ -56,6 +56,7 @@ #include "Monitor_Size.h" #endif /* ACE_HAS_MONITOR_POINTS==1 */ +#include <string> ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -221,6 +222,24 @@ public: ACE_CDR::ULong bound_; ACE_CDR::Boolean nocopy_; }; + + struct ACE_Export from_std_string + { + from_std_string (const std::string &s, + ACE_CDR::ULong b); + const std::string &val_; + ACE_CDR::ULong bound_; + }; + +#if !defined(ACE_LACKS_STD_WSTRING) + struct ACE_Export from_std_wstring + { + from_std_wstring (const std::wstring &ws, + ACE_CDR::ULong b); + const std::wstring &val_; + ACE_CDR::ULong bound_; + }; +#endif //@} /** @@ -250,6 +269,11 @@ public: ACE_CDR::Boolean write_wstring (const ACE_CDR::WChar *x); ACE_CDR::Boolean write_wstring (ACE_CDR::ULong length, const ACE_CDR::WChar *x); + ACE_CDR::Boolean write_string (const std::string &x); +#if !defined(ACE_LACKS_STD_WSTRING) + ACE_CDR::Boolean write_wstring (const std::wstring &x); +#endif + //@} /// @note the portion written starts at @a x and ends @@ -794,6 +818,25 @@ public: const ACE_CDR::WChar *&val_; ACE_CDR::ULong bound_; }; + + /// Helper classes for extracting bounded strings into std::string/wstring. + struct ACE_Export to_std_string + { + to_std_string (std::string &s, + ACE_CDR::ULong b); + std::string &val_; + ACE_CDR::ULong bound_; + }; + +#if !defined(ACE_LACKS_STD_WSTRING) + struct ACE_Export to_std_wstring + { + to_std_wstring (std::wstring &ws, + ACE_CDR::ULong b); + std::wstring &val_; + ACE_CDR::ULong bound_; + }; +#endif /* ACE_LACKS_STD_WSTRING */ //@} /** @@ -818,6 +861,10 @@ public: ACE_CDR::Boolean read_string (ACE_CDR::Char *&x); ACE_CDR::Boolean read_string (ACE_CString &x); ACE_CDR::Boolean read_wstring (ACE_CDR::WChar*& x); + ACE_CDR::Boolean read_string (std::string& x); +#if !defined(ACE_LACKS_STD_WSTRING) + ACE_CDR::Boolean read_wstring (std::wstring& x); +#endif //@} /** @@ -1114,6 +1161,12 @@ public: virtual ACE_CDR::Boolean read_string (ACE_InputCDR&, ACE_CDR::Char *&) = 0; + /// Read a std::string from the stream, including the length, converting + /// the characters from the stream codeset to the native codeset + /// (provide non-optimized default implementation) + virtual ACE_CDR::Boolean read_string (ACE_InputCDR&, + std::string &); + /// Read an array of characters from the stream, converting the /// characters from the stream codeset to the native codeset. virtual ACE_CDR::Boolean read_char_array (ACE_InputCDR&, @@ -1210,6 +1263,13 @@ public: ACE_CDR::WChar&) = 0; virtual ACE_CDR::Boolean read_wstring (ACE_InputCDR&, ACE_CDR::WChar *&) = 0; +#if !defined(ACE_LACKS_STD_WSTRING) + /// Read a std::wstring from the stream, including the length, converting + /// the characters from the stream codeset to the native codeset + /// (provide non-optimized default implementation) + virtual ACE_CDR::Boolean read_wstring (ACE_InputCDR&, + std::wstring &); +#endif virtual ACE_CDR::Boolean read_wchar_array (ACE_InputCDR&, ACE_CDR::WChar*, ACE_CDR::ULong) = 0; @@ -1344,6 +1404,16 @@ extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::Char* x); extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::WChar* x); +extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, + ACE_OutputCDR::from_std_string x); +extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, + const std::string& x); +#if !defined(ACE_LACKS_STD_WSTRING) +extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, + ACE_OutputCDR::from_std_wstring x); +extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, + const std::wstring& x); +#endif // Not used by CORBA or TAO extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, @@ -1389,6 +1459,16 @@ extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, ACE_CDR::Char*& x); extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, ACE_CDR::WChar*& x); +extern ACE_Export ACE_CDR::Boolean operator<< (ACE_InputCDR &os, + ACE_InputCDR::to_std_string x); +extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, + std::string& x); +#if !defined(ACE_LACKS_STD_WSTRING) +extern ACE_Export ACE_CDR::Boolean operator<< (ACE_InputCDR &os, + ACE_InputCDR::to_std_wstring x); +extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is, + std::wstring& x); +#endif ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl index 85c5f132d03..fe25108da85 100644 --- a/ACE/ace/CDR_Stream.inl +++ b/ACE/ace/CDR_Stream.inl @@ -128,6 +128,40 @@ ACE_InputCDR::to_wstring::to_wstring (const ACE_CDR::WChar *&ws, } ACE_INLINE +ACE_InputCDR::to_std_string::to_std_string (std::string &s, + ACE_CDR::ULong b) + : val_ (s), + bound_ (b) +{ +} + +ACE_INLINE +ACE_OutputCDR::from_std_string::from_std_string (const std::string &ws, + ACE_CDR::ULong b) + : val_ (ws), + bound_ (b) +{ +} + +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_INLINE +ACE_InputCDR::to_std_wstring::to_std_wstring (std::wstring &s, + ACE_CDR::ULong b) + : val_ (s), + bound_ (b) +{ +} + +ACE_INLINE +ACE_OutputCDR::from_std_wstring::from_std_wstring (const std::wstring &ws, + ACE_CDR::ULong b) + : val_ (ws), + bound_ (b) +{ +} +#endif + +ACE_INLINE ACE_InputCDR::Transfer_Contents::Transfer_Contents (ACE_InputCDR &rhs) : rhs_ (rhs) { @@ -302,6 +336,26 @@ ACE_OutputCDR::write_wstring (const ACE_CDR::WChar *x) } ACE_INLINE ACE_CDR::Boolean +ACE_OutputCDR::write_string (const std::string &x) +{ + ACE_CDR::ULong const len = + static_cast<ACE_CDR::ULong> (x.size ()); + return this->write_string (len, + x.empty () ? 0 : x.c_str ()); +} + +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_INLINE ACE_CDR::Boolean +ACE_OutputCDR::write_wstring (const std::wstring &x) +{ + ACE_CDR::ULong const len = + static_cast<ACE_CDR::ULong> (x.size ()); + return this->write_wstring (len, + x.empty () ? 0 : x.c_str ()); +} +#endif + +ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::write_char_array (const ACE_CDR::Char *x, ACE_CDR::ULong length) { @@ -1220,6 +1274,46 @@ operator<< (ACE_OutputCDR &os, const ACE_CDR::WChar *x) return (ACE_CDR::Boolean) os.good_bit (); } +ACE_INLINE ACE_CDR::Boolean +operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_string x) +{ + ACE_CDR::ULong 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_)); +} + +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_INLINE ACE_CDR::Boolean +operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_wstring x) +{ + ACE_CDR::ULong 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_)); +} +#endif + +ACE_INLINE ACE_CDR::Boolean +operator<< (ACE_OutputCDR &os, const std::string& x) +{ + os.write_string (x); + return (ACE_CDR::Boolean) os.good_bit (); +} + +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_INLINE ACE_CDR::Boolean +operator<< (ACE_OutputCDR &os, const std::wstring& x) +{ + os.write_wstring (x); + return (ACE_CDR::Boolean) os.good_bit (); +} +#endif + // The following use the helper classes ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_boolean x) @@ -1359,6 +1453,20 @@ operator>> (ACE_InputCDR &is, ACE_CDR::WChar *&x) return is.read_wstring (x) && is.good_bit (); } +ACE_INLINE ACE_CDR::Boolean +operator>> (ACE_InputCDR &is, std::string& x) +{ + return is.read_string (x) && is.good_bit (); +} + +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_INLINE ACE_CDR::Boolean +operator>> (ACE_InputCDR &is, std::wstring& x) +{ + return is.read_wstring (x) && is.good_bit (); +} +#endif + // The following use the helper classes ACE_INLINE ACE_CDR::Boolean operator>> (ACE_InputCDR &is, ACE_InputCDR::to_boolean x) @@ -1406,6 +1514,29 @@ operator>> (ACE_InputCDR &is, ACE_InputCDR::to_wstring x) || ACE_OS::strlen (x.val_) <= x.bound_)); } +ACE_INLINE ACE_CDR::Boolean +operator>> (ACE_InputCDR &is, ACE_InputCDR::to_std_string x) +{ + // check if the bounds are satisfied + return + (is.read_string (x.val_) + && is.good_bit () + && (!x.bound_ + || static_cast<ACE_CDR::ULong> (x.val_.size ()) <= x.bound_)); +} + +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_INLINE ACE_CDR::Boolean +operator>> (ACE_InputCDR &is, ACE_InputCDR::to_std_wstring x) +{ + // check if the bounds are satisfied + return + (is.read_wstring (x.val_) + && is.good_bit () + && (!x.bound_ + || static_cast<ACE_CDR::ULong> (x.val_.size ()) <= x.bound_)); +} +#endif // *************************************************************************** // We must define these methods here because they use the "read_*" inlined // methods of the ACE_InputCDR class diff --git a/ACE/ace/Codeset_IBM1047.cpp b/ACE/ace/Codeset_IBM1047.cpp index ba8d1eb9cd7..edfd2bab4df 100644 --- a/ACE/ace/Codeset_IBM1047.cpp +++ b/ACE/ace/Codeset_IBM1047.cpp @@ -120,6 +120,42 @@ ACE_IBM1047_ISO8859::read_string (ACE_InputCDR& in, } ACE_CDR::Boolean +ACE_IBM1047_ISO8859::read_string (ACE_InputCDR& in, + std::string & x) +{ +#if defined (ACE_HAS_CPP11) + ACE_CDR::ULong len; + + in.read_ulong (len); + + if (len > 0) + { + try + { + x.resize (len); + } + catch (const std::bad_alloc&) + { + return false; + } + + if (this->read_char_array (in, &x[0], len)) + { + x.resize (len-1); // drop terminating '\0' read from stream + return true; + } + + delete [] x; + } + + x.clear (); + return false; +#else + return this->ACE_Char_Codeset_Translator::read_string (in, x); +#endif +} + +ACE_CDR::Boolean ACE_IBM1047_ISO8859::read_char_array (ACE_InputCDR& in, ACE_CDR::Char* x, ACE_CDR::ULong len) @@ -237,6 +273,42 @@ ACE_ISO8859_IBM1047::read_string (ACE_InputCDR &in, } ACE_CDR::Boolean +ACE_ISO8859_IBM1047::read_string (ACE_InputCDR& in, + std::string & x) +{ +#if defined (ACE_HAS_CPP11) + ACE_CDR::ULong len; + + in.read_ulong (len); + + if (len > 0) + { + try + { + x.resize (len); + } + catch (const std::bad_alloc&) + { + return false; + } + + if (this->read_char_array (in, &x[0], len)) + { + x.resize (len-1); // drop terminating '\0' read from stream + return true; + } + + delete [] x; + } + + x.clear (); + return false; +#else + return this->ACE_Char_Codeset_Translator::read_string (in, x); +#endif +} + +ACE_CDR::Boolean ACE_ISO8859_IBM1047::read_char_array (ACE_InputCDR &in, ACE_CDR::Char *x, ACE_CDR::ULong len) diff --git a/ACE/ace/Codeset_IBM1047.h b/ACE/ace/Codeset_IBM1047.h index d04b5997b34..d9d84aa4019 100644 --- a/ACE/ace/Codeset_IBM1047.h +++ b/ACE/ace/Codeset_IBM1047.h @@ -53,6 +53,8 @@ public: ACE_CDR::Char &); virtual ACE_CDR::Boolean read_string (ACE_InputCDR &, ACE_CDR::Char *&); + virtual ACE_CDR::Boolean read_string (ACE_InputCDR &, + std::string &); virtual ACE_CDR::Boolean read_char_array (ACE_InputCDR &, ACE_CDR::Char *, ACE_CDR::ULong); @@ -96,6 +98,8 @@ public: ACE_CDR::Char &); virtual ACE_CDR::Boolean read_string (ACE_InputCDR &, ACE_CDR::Char *&); + virtual ACE_CDR::Boolean read_string (ACE_InputCDR &, + std::string &); virtual ACE_CDR::Boolean read_char_array (ACE_InputCDR &, ACE_CDR::Char *, ACE_CDR::ULong); diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h index ed9e0eb69eb..23f3014692f 100644 --- a/ACE/ace/Connector.h +++ b/ACE/ace/Connector.h @@ -70,7 +70,7 @@ public: /// Close up and return underlying SVC_HANDLER through @c sh. /** - * If the return value is true the close was performed succesfully, + * If the return value is true the close was performed successfully, * implying that this object was removed from the reactor and thereby * (by means of reference counting decremented to 0) deleted. * If the return value is false, the close was not successful. diff --git a/ACE/ace/ETCL/ETCL.ll b/ACE/ace/ETCL/ETCL.ll index 7cbc0c47828..fde5839ac57 100644 --- a/ACE/ace/ETCL/ETCL.ll +++ b/ACE/ace/ETCL/ETCL.ll @@ -1,7 +1,6 @@ %option noyywrap %{ -// ETCL.ll,v 1.5 2005/11/16 07:53:24 ossama Exp // ======================================================================== // // = LIBRARY @@ -156,4 +155,4 @@ yywrap (void) return 1; } -ACE_END_VERSIONED_NAMESPACE_DECL
\ No newline at end of file +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/FlReactor/ace_flreactor.mpc b/ACE/ace/FlReactor/ace_flreactor.mpc index c9fc2b039aa..c0cf403746c 100644 --- a/ACE/ace/FlReactor/ace_flreactor.mpc +++ b/ACE/ace/FlReactor/ace_flreactor.mpc @@ -1,4 +1,4 @@ -// -*- MPC -*- now wouldn't this be cool... +// -*- MPC -*- project(ACE_FlReactor) : acedefaults, install, acelib, ace_output, ace_fl{ sharedname = ACE_FlReactor dynamicflags += ACE_FLREACTOR_BUILD_DLL diff --git a/ACE/ace/FoxReactor/ace_foxreactor.mpc b/ACE/ace/FoxReactor/ace_foxreactor.mpc index 16ba4d5196f..def7c0d0a94 100644 --- a/ACE/ace/FoxReactor/ace_foxreactor.mpc +++ b/ACE/ace/FoxReactor/ace_foxreactor.mpc @@ -1,4 +1,4 @@ -// -*- MPC -*- now wouldn't this be cool... +// -*- MPC -*- project(ACE_FoxReactor) : acedefaults, install, acelib, ace_output, ace_fox { sharedname = ACE_FoxReactor dynamicflags += ACE_FOXREACTOR_BUILD_DLL diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp index fa6d6964571..c2ec6adfcc7 100644 --- a/ACE/ace/Future.cpp +++ b/ACE/ace/Future.cpp @@ -195,7 +195,10 @@ ACE_Future_Rep<T>::set (const T &r, while (iterator != end) { OBSERVER *observer = *iterator++; - observer->update (caller); + if (observer) + { + observer->update (caller); + } } // Signal all the waiting threads. diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h index c83fae41a47..d19f80ab51b 100644 --- a/ACE/ace/Future.h +++ b/ACE/ace/Future.h @@ -94,7 +94,7 @@ protected: * * @brief ACE_Future_Rep<T> * - * An ACE_Future_Rep<T> object encapsules a pointer to an object + * An ACE_Future_Rep<T> object encapsulates a pointer to an object * of class T which is the result of an asynchronous method * invocation. It is pointed to by ACE_Future<T> object[s] and * only accessible through them. diff --git a/ACE/ace/Handle_Set.inl b/ACE/ace/Handle_Set.inl index c234bd79aa5..d3cfe6d3822 100644 --- a/ACE/ace/Handle_Set.inl +++ b/ACE/ace/Handle_Set.inl @@ -65,19 +65,16 @@ ACE_INLINE int ACE_Handle_Set::is_set (ACE_HANDLE handle) const { ACE_TRACE ("ACE_Handle_Set::is_set"); + + fd_set *set = const_cast<fd_set*> (&this->mask_); + int ret = FD_ISSET (handle, set); + #if defined (ACE_HAS_BIG_FD_SET) - return FD_ISSET (handle, - &this->mask_) - && this->size_ > 0; -#elif defined (ACE_HAS_NONCONST_FD_ISSET) - return FD_ISSET (handle, - const_cast<fd_set*> (&this->mask_)); + ret = ret && this->size_ > 0; #elif defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x690 - return FD_ISSET (handle, &this->mask_) != 0; -#else - return FD_ISSET (handle, - &this->mask_); -#endif /* ACE_HAS_BIG_FD_SET */ + ret = ret != 0; +#endif + return ret; } // Enables the handle. diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 09b43632575..cc5cf7107a2 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -1256,6 +1256,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, this->linenum ()); else this_len = ACE_OS::sprintf (bp, format, this->linenum ()); + ACE_UPDATE_COUNT (bspace, this_len); break; case 'N': // Source file name diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 18ac132a7df..38f92de4943 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -13,7 +13,6 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_ctype.h" #include "ace/Log_Category.h" // for ACE_ASSERT -// This is necessary to work around nasty problems with MVS C++. #include "ace/Auto_Ptr.h" #include "ace/Thread_Mutex.h" #include "ace/Condition_Thread_Mutex.h" @@ -3557,7 +3556,11 @@ ACE_OS::thr_create (ACE_THR_FUNC func, else thread_args = thread_adapter; +#if defined (ACE_HAS_CPP11) + std::unique_ptr <ACE_Base_Thread_Adapter> auto_thread_args; +#else auto_ptr <ACE_Base_Thread_Adapter> auto_thread_args; +#endif /* ACE_HAS_CPP11 */ if (thread_adapter == 0) ACE_auto_ptr_reset (auto_thread_args, diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h index e9db0df8e9b..3d606236d33 100644 --- a/ACE/ace/OS_NS_signal.h +++ b/ACE/ace/OS_NS_signal.h @@ -166,6 +166,10 @@ namespace ACE_OS { int kill (pid_t pid, int signum); +#ifdef pthread_sigmask +# define ACE_PTHREAD_SIGMASK_MACRO pthread_sigmask +# undef pthread_sigmask +#endif ACE_NAMESPACE_INLINE_FUNCTION int pthread_sigmask (int how, const sigset_t *nsp, diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl index 7959ab7ee00..e125f430c1c 100644 --- a/ACE/ace/OS_NS_signal.inl +++ b/ACE/ace/OS_NS_signal.inl @@ -34,7 +34,10 @@ pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp) { #if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_SIGMASK) int result; -# if defined (ACE_HAS_NONCONST_PTHREAD_SIGMASK) +# ifdef ACE_PTHREAD_SIGMASK_MACRO + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (ACE_PTHREAD_SIGMASK_MACRO (how, nsp, osp) + , result), int, -1); +# elif defined (ACE_HAS_NONCONST_PTHREAD_SIGMASK) sigset_t *ncnsp = const_cast<sigset_t *>(nsp); ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, ncnsp, osp), result), diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index cd8e9133c80..38caad17b05 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -243,7 +243,11 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &, ACE_TEXT ("create_asynch_timer failed")), -1); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<ACE_Asynch_Result_Impl> safe_asynch_timer (asynch_timer); +#else auto_ptr<ACE_Asynch_Result_Impl> safe_asynch_timer (asynch_timer); +#endif /* ACE_HAS_CPP11 */ // Post a completion. if (-1 == safe_asynch_timer->post_completion diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp index ce602960591..ac9fab0c903 100644 --- a/ACE/ace/QtReactor/QtReactor.cpp +++ b/ACE/ace/QtReactor/QtReactor.cpp @@ -125,12 +125,28 @@ ACE_QtReactor::timeout_event (void) this->reset_timeout (); } +#ifdef ACE_HAS_QT5 +ACE_HANDLE +ACE_QtReactor::handle_from_sender () const +{ + // The argument passed to the Qt slot method is ignored due to this bug: + // https://bugreports.qt.io/browse/QTBUG-70441 + QSocketNotifier *const notifier = dynamic_cast<QSocketNotifier *> (this->sender ()); + return notifier ? ACE_HANDLE (notifier->socket ()) : ACE_INVALID_HANDLE; +} +#endif + void -ACE_QtReactor::read_event (int p_handle) +ACE_QtReactor::read_event (ACE_QT_HANDLE_TYPE p_handle) { ACE_TRACE ("ACE_QtReactor::read_event"); +#ifdef ACE_HAS_QT5 + ACE_UNUSED_ARG (p_handle); + ACE_HANDLE const handle = this->handle_from_sender (); +#else ACE_HANDLE handle = ACE_HANDLE( p_handle ); +#endif #ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS // disable socket notifier to clear pending events @@ -156,11 +172,16 @@ ACE_QtReactor::read_event (int p_handle) } void -ACE_QtReactor::write_event (int p_handle) +ACE_QtReactor::write_event (ACE_QT_HANDLE_TYPE p_handle) { ACE_TRACE ("ACE_QtReactor::write_event"); +#ifdef ACE_HAS_QT5 + ACE_UNUSED_ARG (p_handle); + ACE_HANDLE const handle = this->handle_from_sender (); +#else ACE_HANDLE handle = ACE_HANDLE( p_handle ); +#endif #ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS // disable socket notifier to clear pending events @@ -185,12 +206,16 @@ ACE_QtReactor::write_event (int p_handle) } void -ACE_QtReactor::exception_event (int p_handle) +ACE_QtReactor::exception_event (ACE_QT_HANDLE_TYPE p_handle) { ACE_TRACE ("ACE_QtReactor::exception_event"); +#ifdef ACE_HAS_QT5 + ACE_UNUSED_ARG (p_handle); + ACE_HANDLE const handle = this->handle_from_sender (); +#else ACE_HANDLE handle = ACE_HANDLE( p_handle ); - +#endif #ifdef ACE_QTREACTOR_CLEAR_PENDING_EVENTS // disable socket notifier to clear pending events @@ -320,13 +345,18 @@ ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle) qsock_notifier) == -1) ) { ACE_NEW (qsock_notifier, - QSocketNotifier (int(handle), QSocketNotifier::Read, this)); + QSocketNotifier (ACE_QT_HANDLE_TYPE(handle), QSocketNotifier::Read, this)); this->read_notifier_.bind (handle, qsock_notifier); + +#ifdef ACE_HAS_QT5 + QObject::connect (qsock_notifier, &QSocketNotifier::activated, this, &ACE_QtReactor::read_event); +#else QObject::connect (qsock_notifier, - SIGNAL (activated (int)), + SIGNAL (activated (ACE_QT_HANDLE_TYPE)), this, - SLOT (read_event (int))) ; + SLOT (read_event (ACE_QT_HANDLE_TYPE))) ; +#endif // disable; it will be enabled by the regular register_handler_i if // necessary qsock_notifier->setEnabled (0); @@ -341,15 +371,19 @@ ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle) qsock_notifier) == -1)) { ACE_NEW (qsock_notifier, - QSocketNotifier (int(handle), QSocketNotifier::Write, this)); + QSocketNotifier (ACE_QT_HANDLE_TYPE(handle), QSocketNotifier::Write, this)); this->write_notifier_.bind (handle, qsock_notifier); +#ifdef ACE_HAS_QT5 + QObject::connect (qsock_notifier, &QSocketNotifier::activated, this, &ACE_QtReactor::write_event); +#else QObject::connect (qsock_notifier, - SIGNAL (activated (int)), + SIGNAL (activated (ACE_QT_HANDLE_TYPE)), this, - SLOT (write_event (int))); + SLOT (write_event (ACE_QT_HANDLE_TYPE))); +#endif // disable; it will be enabled by the regular register_handler_i if // necessary qsock_notifier->setEnabled (0); @@ -365,15 +399,19 @@ ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle) { ACE_NEW (qsock_notifier, - QSocketNotifier (int(handle), QSocketNotifier::Exception, this)); + QSocketNotifier (ACE_QT_HANDLE_TYPE(handle), QSocketNotifier::Exception, this)); this->exception_notifier_.bind (handle, qsock_notifier); +#ifdef ACE_HAS_QT5 + QObject::connect (qsock_notifier, &QSocketNotifier::activated, this, &ACE_QtReactor::exception_event); +#else QObject::connect (qsock_notifier, - SIGNAL (activated (int)), + SIGNAL (activated (ACE_QT_HANDLE_TYPE)), this, - SLOT (exception_event (int))) ; + SLOT (exception_event (ACE_QT_HANDLE_TYPE))) ; +#endif // disable; it will be enabled by the regular register_handler_i if // necessary qsock_notifier->setEnabled (0); @@ -592,7 +630,7 @@ ACE_QtReactor::QtWaitForMultipleEvents (int width, #endif // Reset the width, in case it changed during the upcalls. - width = handler_rep_.max_handlep1 (); + width = static_cast<int> (handler_rep_.max_handlep1 ()); // Now actually read the result needed by the <Select_Reactor> using // <select>. @@ -620,7 +658,7 @@ ACE_QtReactor::wait_for_multiple_events ( handle_set.wr_mask_ = this->wait_set_.wr_mask_; handle_set.ex_mask_ = this->wait_set_.ex_mask_; - nfound = QtWaitForMultipleEvents (width, + nfound = QtWaitForMultipleEvents (static_cast<int> (width), handle_set, max_wait_time); diff --git a/ACE/ace/QtReactor/QtReactor.h b/ACE/ace/QtReactor/QtReactor.h index 4a1279694d0..6bafe3c7f4c 100644 --- a/ACE/ace/QtReactor/QtReactor.h +++ b/ACE/ace/QtReactor/QtReactor.h @@ -28,7 +28,13 @@ #endif // QT toolkit specific includes. +#ifdef ACE_HAS_QT5 +#include /**/ <QtWidgets/QApplication> +#define ACE_QT_HANDLE_TYPE qintptr +#else #include /**/ <QtGui/QApplication> +#define ACE_QT_HANDLE_TYPE int +#endif #include /**/ <QtCore/QObject> #include /**/ <QtCore/QSocketNotifier> #include /**/ <QtCore/QTimer> @@ -42,7 +48,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * dispatcher that uses the Qt Library. This class declaration * also uses the extension facilities provided by the Qt. So, * readers of the class declaration should not be upset with - * the appearence of the Keywords like Q_OBJECT, private slots + * the appearance of the Keywords like Q_OBJECT, private slots * etc. They are specific to Qt which uses these as a call back * methods implementation mechanism. * @@ -87,14 +93,13 @@ class ACE_QtReactor_Export ACE_QtReactor : public QObject, public ACE_Select_Reactor { - Q_OBJECT public: /** \brief Constructor follows @ACE_Select_Reactor \param QApplication *qapp, qapplication which runs events loop */ - ACE_QtReactor (QApplication *qapp = 0, + explicit ACE_QtReactor (QApplication *qapp = 0, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, @@ -105,7 +110,7 @@ public: /** \brief Constructor follows @ACE_Select_Reactor \param QApplication *qapp, qapplication which runs events loop */ - ACE_QtReactor (size_t size, + explicit ACE_QtReactor (size_t size, QApplication *qapp = 0, bool restart = false, ACE_Sig_Handler * = 0, @@ -133,9 +138,6 @@ public: int dont_call_handle_close = 1); protected: - - // = Register timers/handles with Qt - /// Register a single @a handler. virtual int register_handler_i (ACE_HANDLE handle, ACE_Event_Handler *handler, @@ -189,7 +191,7 @@ protected: /// An exception notifier MAP exception_notifier_; - /// The timer class that would provide timer-sgnals & single-shot timers + /// The timer class that would provide timer-signals & single-shot timers QTimer *qtime_ ; private: @@ -198,21 +200,27 @@ private: void reset_timeout (void); /// reopens notification pipe to create SocketNotifier for it void reopen_notification_pipe(void); + +#ifdef ACE_HAS_QT5 + /// Recover the socket's ACE_HANDLE based on the sender of the Qt signal. + /// Must be called from a Qt slot method. + ACE_HANDLE handle_from_sender () const; +#endif + /// Deny access since member-wise won't work... ACE_QtReactor (const ACE_QtReactor &); ACE_QtReactor &operator= (const ACE_QtReactor &); private slots: - // These are all part of the communication mechanism adopted in Qt. /// Dispatch a Read Event - void read_event (int FD); + void read_event (ACE_QT_HANDLE_TYPE p_handle); /// Dispatch a Write Event - void write_event (int FD); + void write_event (ACE_QT_HANDLE_TYPE p_handle); /// Dispatch an exception event - void exception_event (int FD); + void exception_event (ACE_QT_HANDLE_TYPE p_handle); /// Dispatch a timeout event void timeout_event (void); diff --git a/ACE/ace/QtReactor/ace_qt5reactor.mpc b/ACE/ace/QtReactor/ace_qt5reactor.mpc new file mode 100644 index 00000000000..af0e1aa4a86 --- /dev/null +++ b/ACE/ace/QtReactor/ace_qt5reactor.mpc @@ -0,0 +1,29 @@ +// -*- MPC -*- +project(ACE_Qt5Reactor_moc) : acedefaults, ace_qt5 { + custom_only = 1 + MOC_Files { + QtReactor.h + } +} + +project(ACE_Qt5Reactor) : acedefaults, install, acelib, ace_output, ace_qt5 { + after += ACE_Qt5Reactor_moc + sharedname = ACE_QtReactor + dynamicflags += ACE_QTREACTOR_BUILD_DLL + + MOC_Files { + } + + Source_Files { + QtReactor_moc.cpp + QtReactor.cpp + } + + Header_Files { + ACE_QtReactor_export.h + } + + specific { + install_dir = ace/QtReactor + } +} diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h index b7b8eb005e1..a7cbc6220d0 100644 --- a/ACE/ace/Reactor.h +++ b/ACE/ace/Reactor.h @@ -341,7 +341,6 @@ public: ACE_Reactor_Mask mask); #if defined (ACE_WIN32) - /** * Register handler for OS events. * @@ -360,7 +359,6 @@ public: */ int register_handler (ACE_Event_Handler *event_handler, ACE_HANDLE event_handle = ACE_INVALID_HANDLE); - #endif /* ACE_WIN32 */ /** diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp index c93eb3b59f9..47057df08d3 100644 --- a/ACE/ace/SOCK_Acceptor.cpp +++ b/ACE/ace/SOCK_Acceptor.cpp @@ -221,12 +221,15 @@ ACE_SOCK_Acceptor::dump (void) const int ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap, int protocol_family, - int backlog) + int backlog, + int ipv6_only) { ACE_TRACE ("ACE_SOCK_Acceptor::shared_open"); int error = 0; -#if defined (ACE_HAS_IPV6) +#if !defined (ACE_HAS_IPV6) + ACE_UNUSED_ARG (ipv6_only); +#else /* defined (ACE_HAS_IPV6) */ if (protocol_family == PF_INET6) { sockaddr_in6 local_inet6_addr; @@ -243,29 +246,31 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap, else local_inet6_addr = *reinterpret_cast<sockaddr_in6 *> (local_sap.get_addr ()); -# if defined (ACE_WIN32) - // on windows vista and later, Winsock can support dual stack sockets - // but this must be explicitly set prior to the bind. Since this - // behavior is the default on *nix platforms, it should be benigh to - // just do it here. On older platforms the setsockopt will fail, but - // that should be OK. - int zero = 0; - ACE_OS::setsockopt (this->get_handle (), - IPPROTO_IPV6, - IPV6_V6ONLY, - (char *)&zero, - sizeof (zero)); -# endif /* ACE_WIN32 */ - // We probably don't need a bind_port written here. - // There are currently no supported OS's that define - // ACE_LACKS_WILDCARD_BIND. - if (ACE_OS::bind (this->get_handle (), - reinterpret_cast<sockaddr *> (&local_inet6_addr), - sizeof local_inet6_addr) == -1) + /* + * Handle IPv6-only requests. On Windows, v6-only is the default + * unless it is turned off. On Linux, v4/v6 dual is the default + * unless v6-only is turned on. + * This must be done before attempting to bind the address. + * On Windows older than Vista this will fail. + */ + int setting = !!ipv6_only; + if (-1 == ACE_OS::setsockopt (this->get_handle (), + IPPROTO_IPV6, + IPV6_V6ONLY, + (char *)&setting, + sizeof (setting))) error = 1; + else + // We probably don't need a bind_port written here. + // There are currently no supported OS's that define + // ACE_LACKS_WILDCARD_BIND. + if (ACE_OS::bind (this->get_handle (), + reinterpret_cast<sockaddr *> (&local_inet6_addr), + sizeof local_inet6_addr) == -1) + error = 1; } else -#endif +#endif /* ACE_HAS_IPV6 */ if (protocol_family == PF_INET) { sockaddr_in local_inet_addr; @@ -315,7 +320,8 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, int reuse_addr, int protocol_family, int backlog, - int protocol) + int protocol, + int ipv6_only) { ACE_TRACE ("ACE_SOCK_Acceptor::open"); @@ -333,7 +339,8 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, else return this->shared_open (local_sap, protocol_family, - backlog); + backlog, + ipv6_only); } ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, @@ -343,7 +350,8 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, int reuse_addr, int protocol_family, int backlog, - int protocol) + int protocol, + int ipv6_only) { ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor"); if (this->open (local_sap, @@ -353,7 +361,8 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, reuse_addr, protocol_family, backlog, - protocol) == -1) + protocol, + ipv6_only) == -1) ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Acceptor"))); @@ -366,7 +375,8 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, int reuse_addr, int protocol_family, int backlog, - int protocol) + int protocol, + int ipv6_only) { ACE_TRACE ("ACE_SOCK_Acceptor::open"); @@ -389,7 +399,8 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap, else return this->shared_open (local_sap, protocol_family, - backlog); + backlog, + ipv6_only); } // General purpose routine for performing server ACE_SOCK creation. @@ -398,14 +409,16 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, int reuse_addr, int protocol_family, int backlog, - int protocol) + int protocol, + int ipv6_only) { ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor"); if (this->open (local_sap, reuse_addr, protocol_family, backlog, - protocol) == -1) + protocol, + ipv6_only) == -1) ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Acceptor"))); diff --git a/ACE/ace/SOCK_Acceptor.h b/ACE/ace/SOCK_Acceptor.h index cda6d40b034..06430883245 100644 --- a/ACE/ace/SOCK_Acceptor.h +++ b/ACE/ace/SOCK_Acceptor.h @@ -46,12 +46,16 @@ public: * @a local_sap is the address that we're going to listen for * connections on. If @a reuse_addr is 1 then we'll use the * @c SO_REUSEADDR to reuse this address. + * @a ipv6_only is used when opening a IPv6 acceptor. If non-zero, + * the socket will only accept connections from IPv6 peers. If zero + * the socket will accept both IPv4 and v6 if it is able to. */ ACE_SOCK_Acceptor (const ACE_Addr &local_sap, int reuse_addr = 0, int protocol_family = PF_UNSPEC, int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); + int protocol = 0, + int ipv6_only = 0); /// Initialize a passive-mode QoS-enabled acceptor socket. Returns 0 /// on success and -1 on failure. @@ -62,20 +66,26 @@ public: int reuse_addr, int protocol_family = PF_UNSPEC, int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); + int protocol = 0, + int ipv6_only = 0); /** * Initialize a passive-mode BSD-style acceptor socket (no QoS). * @a local_sap is the address that we're going to listen for * connections on. If @a reuse_addr is 1 then we'll use the - * @c SO_REUSEADDR to reuse this address. Returns 0 on success and + * @c SO_REUSEADDR to reuse this address. + * @a ipv6_only is used when opening a IPv6 acceptor. If non-zero, + * the socket will only accept connections from IPv6 peers. If zero + * the socket will accept both IPv4 and v6 if it is able to. + * @retval Returns 0 on success and * -1 on failure. */ int open (const ACE_Addr &local_sap, int reuse_addr = 0, int protocol_family = PF_UNSPEC, int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); + int protocol = 0, + int ipv6_only = 0); /// Initialize a passive-mode QoS-enabled acceptor socket. Returns 0 /// on success and -1 on failure. @@ -86,7 +96,8 @@ public: int reuse_addr, int protocol_family = PF_UNSPEC, int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 0); + int protocol = 0, + int ipv6_only = 0); /// Close the socket. Returns 0 on success and -1 on failure. int close (void); @@ -159,7 +170,8 @@ protected: */ int shared_open (const ACE_Addr &local_sap, int protocol_family, - int backlog); + int backlog, + int ipv6_only); private: /// Do not allow this function to percolate up to this interface... diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index 2d3c5e0dd0f..710ac47f7ef 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -116,10 +116,26 @@ ACE_SOCK_Dgram::recv (iovec *io_vec, int ACE_SOCK_Dgram::shared_open (const ACE_Addr &local, - int protocol_family) + int protocol_family, + int ipv6_only) { ACE_TRACE ("ACE_SOCK_Dgram::shared_open"); bool error = false; +#if defined (ACE_HAS_IPV6) + int setting = !!ipv6_only; + if (protocol_family == PF_INET6 && + -1 == ACE_OS::setsockopt (this->get_handle (), + IPPROTO_IPV6, + IPV6_V6ONLY, + (char *)&setting, + sizeof (setting))) + { + this->close(); + return -1; + } +#else + ACE_UNUSED_ARG (ipv6_only); +#endif /* defined (ACE_HAS_IPV6) */ if (local == ACE_Addr::sap_any) { @@ -153,7 +169,8 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local, ACE_Protocol_Info *protocolinfo, ACE_SOCK_GROUP g, u_long flags, - int reuse_addr) + int reuse_addr, + int ipv6_only) { if (ACE_SOCK::open (SOCK_DGRAM, protocol_family, @@ -164,7 +181,8 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local, reuse_addr) == -1) return -1; else if (this->shared_open (local, - protocol_family) == -1) + protocol_family, + ipv6_only) == -1) return -1; else return 0; @@ -176,7 +194,8 @@ int ACE_SOCK_Dgram::open (const ACE_Addr &local, int protocol_family, int protocol, - int reuse_addr) + int reuse_addr, + int ipv6_only) { ACE_TRACE ("ACE_SOCK_Dgram::open"); @@ -198,7 +217,8 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local, return -1; else return this->shared_open (local, - protocol_family); + protocol_family, + ipv6_only); } // Here's the general-purpose constructor used by a connectionless @@ -207,14 +227,16 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local, ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, int protocol_family, int protocol, - int reuse_addr) + int reuse_addr, + int ipv6_only) { ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram"); if (this->open (local, protocol_family, protocol, - reuse_addr) == -1) + reuse_addr, + ipv6_only) == -1) ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Dgram"))); @@ -226,7 +248,8 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, ACE_Protocol_Info *protocolinfo, ACE_SOCK_GROUP g, u_long flags, - int reuse_addr) + int reuse_addr, + int ipv6_only) { ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram"); if (this->open (local, @@ -235,7 +258,8 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, protocolinfo, g, flags, - reuse_addr) == -1) + reuse_addr, + ipv6_only) == -1) ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Dgram"))); diff --git a/ACE/ace/SOCK_Dgram.h b/ACE/ace/SOCK_Dgram.h index 1b8f9f8be42..457962f8acf 100644 --- a/ACE/ace/SOCK_Dgram.h +++ b/ACE/ace/SOCK_Dgram.h @@ -43,7 +43,8 @@ public: ACE_SOCK_Dgram (const ACE_Addr &local, int protocol_family = ACE_PROTOCOL_FAMILY_INET, int protocol = 0, - int reuse_addr = 0); + int reuse_addr = 0, + int ipv6_only = 0); /** * This is a QoS-enabed method for initiating a socket dgram that @@ -56,14 +57,16 @@ public: ACE_Protocol_Info *protocolinfo, ACE_SOCK_GROUP g = 0, u_long flags = 0, - int reuse_addr = 0); + int reuse_addr = 0, + int ipv6_only = 0); /// This is a BSD-style method (i.e., no QoS) for initiating a socket /// dgram that will accept datagrams at the <local> address. int open (const ACE_Addr &local, int protocol_family = ACE_PROTOCOL_FAMILY_INET, int protocol = 0, - int reuse_addr = 0); + int reuse_addr = 0, + int ipv6_only = 0); /** * This is a QoS-enabed method for initiating a socket dgram that @@ -76,7 +79,8 @@ public: ACE_Protocol_Info *protocolinfo, ACE_SOCK_GROUP g = 0, u_long flags = 0, - int reuse_addr = 0); + int reuse_addr = 0, + int ipv6_only = 0); /// Default dtor. ~ACE_SOCK_Dgram (void); @@ -204,7 +208,9 @@ public: protected: /// Open is shared by this and by <LSOCK_Dgram>. - int shared_open (const ACE_Addr &local, int protocol_family); + int shared_open (const ACE_Addr &local, + int protocol_family, + int ipv6_only = 0); /// Create a multicast addr/if pair, in format useful for system calls. /// If mreq param is NULL, just verify the passed addr/interface specs. diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.cpp b/ACE/ace/SSL/SSL_Asynch_BIO.cpp index 6bb8aa2f677..a657d8a14e6 100644 --- a/ACE/ace/SSL/SSL_Asynch_BIO.cpp +++ b/ACE/ace/SSL/SSL_Asynch_BIO.cpp @@ -58,7 +58,9 @@ static BIO_METHOD methods_ACE = # define BIO_set_init(b, val) b->init = val # define BIO_set_data(b, val) b->ptr = val # define BIO_set_num(b, val) b->num = val -# define BIO_set_flags(b, val) b->flags = val +# if !defined (BIO_set_flags) +# define BIO_set_flags(b, val) b->flags = val +# endif /* !BIO_set_flags */ # define BIO_set_shutdown(b, val) b->shutdown = val # define BIO_get_init(b) b->init # define BIO_get_data(b) b->ptr diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index 982c67d4210..5105dd3d09a 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -172,7 +172,11 @@ ACE_SSL_Context::ssl_library_init (void) #ifdef WIN32 // Seed the random number generator by sampling the screen. +# if OPENSSL_VERSION_NUMBER < 0x10100000L ::RAND_screen (); +# else + ::RAND_poll (); +# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ #endif /* WIN32 */ #if OPENSSL_VERSION_NUMBER >= 0x00905100L diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index c27f62211d8..6eb407ef0a5 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -220,7 +220,6 @@ public: ACE_Reactor_Mask mask); #if defined (ACE_WIN32) - // Originally this interface was available for all platforms, but // because ACE_HANDLE is an int on non-Win32 platforms, compilers // are not able to tell the difference between @@ -231,7 +230,6 @@ public: /// Not implemented. virtual int register_handler (ACE_Event_Handler *event_handler, ACE_HANDLE event_handle = ACE_INVALID_HANDLE); - #endif /* ACE_WIN32 */ /// Not implemented. diff --git a/ACE/ace/Select_Reactor_T.inl b/ACE/ace/Select_Reactor_T.inl index be6192c55da..7200933a448 100644 --- a/ACE/ace/Select_Reactor_T.inl +++ b/ACE/ace/Select_Reactor_T.inl @@ -70,7 +70,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler (int signum, } #if defined (ACE_WIN32) - template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE int ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler (ACE_Event_Handler *, @@ -79,7 +78,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler (ACE_Event_Hand // Don't have an implementation for this yet... ACE_NOTSUP_RETURN (-1); } - #endif /* ACE_WIN32 */ template <class ACE_SELECT_REACTOR_TOKEN> diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index 5fc12579a02..7bf1916cdea 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -252,19 +252,19 @@ public: * The ACE_Service_Config uses the Monostate pattern. Therefore, * you can only have one of these instantiated per-process. It * represents the process-wide collection of services, which is - * typicaly shared among all other configurable entities. The only + * typically shared among all other configurable entities. The only * ACE_Service_Config instance is registered with and owned by the * ACE_Object_Manager. * * By contrast, the ACE_Service_Gestalt represents the collection - * of services, pertaining to a configurable entity. Typicaly, a + * of services, pertaining to a configurable entity. Typically, a * "configurable entity" is an instance, which owns an instance of - * ACE_Service_Gestalt in order to ensure full controll over the + * ACE_Service_Gestalt in order to ensure full control over the * services it needs. * * Another facet of ACE_Service_Config is that for a given thread, * it provides access to its current, process-global - * ACE_Service_Gestalt instance through its curent() method. + * ACE_Service_Gestalt instance through its current() method. * * @note The signal_handler_ static member is allocated by the * ACE_Object_Manager. The ACE_Service_Config constructor diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index 074706dfc01..3beb09263ea 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -358,7 +358,7 @@ ACE_Service_Gestalt::add_processed_static_svc /// associates a service object with the Gestalt and makes the /// resource (a Service Object) local to the repository. This is but /// the first step in using such SO. The next is the - /// "initialization" step. It is typicaly done through a "static" + /// "initialization" step. It is typically done through a "static" /// service configuration directive. /// /// In contrast a "dynamic" directive, when processed through the diff --git a/ACE/ace/Service_Object.cpp b/ACE/ace/Service_Object.cpp index d9e316d3acb..a16b9af04f2 100644 --- a/ACE/ace/Service_Object.cpp +++ b/ACE/ace/Service_Object.cpp @@ -30,7 +30,6 @@ ACE_Service_Type::dump (void) const ACE_TRACE ("ACE_Service_Type::dump"); #endif /* ACE_HAS_DUMP */ - // Using printf, since the log facility may not have been // initialized yet. Using a "//" prefix, in case the executable // happens to be a code generator and the output gets embedded in diff --git a/ACE/ace/Service_Repository.h b/ACE/ace/Service_Repository.h index aadc839c32c..3d3c71716bb 100644 --- a/ACE/ace/Service_Repository.h +++ b/ACE/ace/Service_Repository.h @@ -191,9 +191,9 @@ protected: /// The typedef of the array used to store the services. #if defined (ACE_HAS_ALLOC_HOOKS) - typedef ACE_Array_Map<size_t, const ACE_Service_Type*, std::equal_to<size_t>, ACE_Allocator_Std_Adapter<std::pair<size_t, const ACE_Service_Type*> > > array_type; + typedef ACE_Array_Map<size_t, const ACE_Service_Type*, std::equal_to<size_t>, ACE_Allocator_Std_Adapter<std::pair<size_t, const ACE_Service_Type*> > > array_type; #else - typedef ACE_Array_Map<size_t, const ACE_Service_Type*> array_type; + typedef ACE_Array_Map<size_t, const ACE_Service_Type*> array_type; #endif /* ACE_HAS_ALLOC_HOOKS */ /// Contains all the configured services. diff --git a/ACE/ace/Singleton.cpp b/ACE/ace/Singleton.cpp index d6a7a23a3a2..52ca2b53d36 100644 --- a/ACE/ace/Singleton.cpp +++ b/ACE/ace/Singleton.cpp @@ -101,8 +101,11 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void) ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0); // Register for destruction with ACE_Object_Manager. +#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 0) ACE_Object_Manager::at_exit (singleton, 0, typeid (TYPE).name ()); -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) +#else + ACE_Object_Manager::at_exit (singleton, &lock, + typeid (TYPE).name ()); } #endif /* ACE_MT_SAFE */ } @@ -112,11 +115,21 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void) } template <class TYPE, class ACE_LOCK> void -ACE_Singleton<TYPE, ACE_LOCK>::cleanup (void *) +ACE_Singleton<TYPE, ACE_LOCK>::cleanup (void *param) { ACE_Object_Manager::remove_at_exit (this); delete this; ACE_Singleton<TYPE, ACE_LOCK>::instance_i () = 0; + +#if !defined ACE_MT_SAFE || ACE_MT_SAFE == 0 || defined ACE_FACE_SAFETY_BASE + ACE_UNUSED_ARG (param); +#else + if (param) + { + ACE_LOCK **lock = static_cast<ACE_LOCK **> (param); + *lock = 0; + } +#endif } template <class TYPE, class ACE_LOCK> void diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h index 35cf20e5643..b0d36565980 100644 --- a/ACE/ace/TSS_T.h +++ b/ACE/ace/TSS_T.h @@ -22,7 +22,7 @@ // This should probably go somewhere else, but it's only used here and // in Thread_Manager. -// Note there is no ACE_TSS_SET because one would typicaly do +// Note there is no ACE_TSS_SET because one would typically do // 'ACE_TSS_GET()->xyz_ = value', so the macro would have been too // complicated. # if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp index d958983686e..172e4a43af8 100644 --- a/ACE/ace/Thread_Manager.cpp +++ b/ACE/ace/Thread_Manager.cpp @@ -588,7 +588,11 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, // Create a new thread running <func>. *Must* be called with the // <lock_> held... // Get a "new" Thread Descriptor from the freelist. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<ACE_Thread_Descriptor> new_thr_desc (this->thread_desc_freelist_.remove ()); +#else auto_ptr<ACE_Thread_Descriptor> new_thr_desc (this->thread_desc_freelist_.remove ()); +#endif /* ACE_HAS_CPP11 */ // Reset thread descriptor status new_thr_desc->reset (this); diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index e33d73ef35c..77c151e135c 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -180,8 +180,8 @@ ACE_Time_Value::normalize (bool saturate) if (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS || this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS) { - time_t sec = std::abs(this->tv_.tv_usec) / ACE_ONE_SECOND_IN_USECS * (this->tv_.tv_usec > 0 ? 1 : -1); - suseconds_t usec = static_cast<suseconds_t> (this->tv_.tv_usec - sec * ACE_ONE_SECOND_IN_USECS); + time_t const sec = std::abs(this->tv_.tv_usec) / ACE_ONE_SECOND_IN_USECS * (this->tv_.tv_usec > 0 ? 1 : -1); + suseconds_t const usec = static_cast<suseconds_t> (this->tv_.tv_usec - sec * ACE_ONE_SECOND_IN_USECS); if (saturate && this->tv_.tv_sec > 0 && sec > 0 && ACE_Numeric_Limits<time_t>::max() - this->tv_.tv_sec < sec) @@ -317,7 +317,7 @@ ACE_Time_Value::operator *= (double d) #ifdef ACE_HAS_CPP98_IOSTREAMS ostream &operator<<(ostream &o, const ACE_Time_Value &v) { - char oldFiller = o.fill (); + char const oldFiller = o.fill (); o.fill ('0'); const timeval *tv = v; if (tv->tv_sec) diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp index e9d4f294e97..5c55346187c 100644 --- a/ACE/ace/Timer_Wheel_T.cpp +++ b/ACE/ace/Timer_Wheel_T.cpp @@ -311,24 +311,17 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::generate_timer_id (u_in if (root == root->get_next ()) root->set_act(0); - // We use this field to keep track of the next counter value that - // may be in use. Of course it may have expired, so we just use - // this field so that we know when we don't have to check for duplicates -#if defined (ACE_WIN64) - // The cast below is legit... we know that long is shorter than a - // pointer, but are only using it as a 'long' storage area. -# pragma warning(push) -# pragma warning(disable : 4311) -#endif /* ACE_WIN64 */ - long next_cnt = ACE_Utils::truncate_cast<long> ((intptr_t)root->get_act ()); -#if defined (ACE_WIN64) -# pragma warning(pop) -#endif /* ACE_WIN64 */ - // This field is used as a counter instead of a timer_id. long cnt = root->get_timer_id (); - if (cnt >= max_cnt && root == root->get_next ()) + if (cnt < max_cnt) + { + root->set_timer_id (cnt + 1); + return (cnt << this->spoke_bits_) | spoke; + } + + // Count has overflowed its range. + if (root == root->get_next ()) { // Special case when we overflow on an empty spoke. We can just // wrap the count around without searching for duplicates. We only @@ -337,50 +330,20 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::generate_timer_id (u_in root->set_timer_id (1); return spoke; } - else if (cnt >= max_cnt) - { // overflow - cnt = 0; // try again starting at zero - } - else if (next_cnt == 0 || cnt < next_cnt) - { - root->set_timer_id (cnt + 1); - return (cnt << this->spoke_bits_) | spoke; - } + // Overflowed count, and the spoke is not empty. Search for an unused + // id value. //ACELIB_ERROR((LM_ERROR, "Timer id overflow. We have to search now.\n")); - - // We've run out of consecutive id numbers so now we have to search - // for a unique id. - // We'll try increasing numbers until we find one that is not in use, - // and we'll record the next highest number so that we can avoid this - // search as often as possible. - for (; cnt < max_cnt - 1; ++cnt) + for (cnt = 0; cnt < max_cnt - 1; ++cnt) { + // Look for an unused id. Yes, every new id on this spoke will result in a + // scan until all the spoke's timers get canceled/expired then the spoke will + // start over like new. So, when an empty spot is found, don't reset the + // root node's timer_id - it stays at max until the spoke clears out and + // starts over. long id = (cnt << this->spoke_bits_) | spoke; - ACE_Timer_Node_T<TYPE>* n = this->find_spoke_node (spoke, id); - if (n == 0) - { - root->set_timer_id (cnt + 1); - // Now we need to find the next highest cnt in use - next_cnt = 0; - for (; n != root; n = n->get_next ()) - { - long tmp = n->get_timer_id () >> this->spoke_bits_; - if (tmp > cnt && (tmp < next_cnt || next_cnt == 0)) - next_cnt = tmp; - } -#if defined (ACE_WIN64) - // The cast below is legit... we know we're storing a long in - // a pointer, but are only using it as a 'long' storage area. -# pragma warning(push) -# pragma warning(disable : 4312) -#endif /* ACE_WIN64 */ - root->set_act (reinterpret_cast<void*> (next_cnt)); -#if defined (ACE_WIN64) -# pragma warning(pop) -#endif /* ACE_WIN64 */ - return id; - } + if (0 == this->find_spoke_node (spoke, id)) + return id; } return -1; // We did our best, but the spoke is full. @@ -421,6 +384,10 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::schedule_i (const TYPE& n->set (type, act, future_time, interval, 0, 0, id); this->schedule_i (n, spoke, future_time); } + else + { + this->free_node (n); + } return id; } diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h index 22c204ca1ef..51df3401f15 100644 --- a/ACE/ace/Timer_Wheel_T.h +++ b/ACE/ace/Timer_Wheel_T.h @@ -200,8 +200,6 @@ private: u_int spoke_count_; /// Number of timer_id bits used for the spoke int spoke_bits_; - /// Maximum number of timers per spoke - u_int max_per_spoke_; /// Resolution (in microsoconds) of the timing wheel. int res_bits_; /// Index of the list with the earliest time diff --git a/ACE/ace/TkReactor/ace_tkreactor.mpc b/ACE/ace/TkReactor/ace_tkreactor.mpc index 6389e320dd4..eb923b2bc26 100644 --- a/ACE/ace/TkReactor/ace_tkreactor.mpc +++ b/ACE/ace/TkReactor/ace_tkreactor.mpc @@ -1,4 +1,4 @@ -// -*- MPC -*- now wouldn't this be cool... +// -*- MPC -*- project(ACE_TkReactor) : acedefaults, install, acelib, ace_output, ace_tk { sharedname = ACE_TkReactor dynamicflags += ACE_TKREACTOR_BUILD_DLL diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h index 1e9671214d1..5ed3877da89 100644 --- a/ACE/ace/UUID.h +++ b/ACE/ace/UUID.h @@ -267,7 +267,7 @@ namespace ACE_Utils bool destroy_lock_; - /// Initalization state of the generator. + /// Initialization state of the generator. bool is_init_; }; diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index 53e1c908024..145af28027e 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -3,10 +3,10 @@ // This is file was automatically generated by $ACE_ROOT/bin/make_release.py #define ACE_MAJOR_VERSION 6 -#define ACE_MINOR_VERSION 4 -#define ACE_MICRO_VERSION 6 -#define ACE_BETA_VERSION 6 -#define ACE_VERSION "6.4.6" -#define ACE_VERSION_CODE 394246 +#define ACE_MINOR_VERSION 5 +#define ACE_MICRO_VERSION 2 +#define ACE_BETA_VERSION 2 +#define ACE_VERSION "6.5.2" +#define ACE_VERSION_CODE 394498 #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 f2c103d1c03..5f901b14108 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1384,7 +1384,11 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle, long new_network_events = 0; bool delete_event = false; +#if defined (ACE_HAS_CPP11) + std::unique_ptr <ACE_Auto_Event> event; +#else auto_ptr <ACE_Auto_Event> event; +#endif /* ACE_HAS_CPP11 */ // Look up the repository to see if the <event_handler> is already // there. @@ -1401,10 +1405,15 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle, // need to create one if (event_handle == ACE_INVALID_HANDLE) { +#if defined (ACE_HAS_CPP11) + std::unique_ptr<ACE_Auto_Event> tmp (new ACE_Auto_Event); + event = std::move(tmp); +#else // Note: don't change this since some C++ compilers have // <auto_ptr>s that don't work properly... auto_ptr<ACE_Auto_Event> tmp (new ACE_Auto_Event); event = tmp; +#endif /* ACE_HAS_CPP11 */ event_handle = event->handle (); delete_event = true; } diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h index 0841641d217..b85cb152b6d 100644 --- a/ACE/ace/WFMO_Reactor.h +++ b/ACE/ace/WFMO_Reactor.h @@ -71,11 +71,10 @@ int WSAEnumNetworkEvents (SOCKET s, #endif /* !defined ACE_HAS_WINSOCK2 */ -class ACE_WFMO_Reactor_Test; // Must be out of versioned namespace. - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Forward decl. +class ACE_WFMO_Reactor_Test; class ACE_WFMO_Reactor; class ACE_Handle_Set; diff --git a/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp b/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp index 970e0a6d3eb..3fc320640ac 100644 --- a/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp +++ b/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp @@ -69,6 +69,4 @@ namespace XMLSchema } } -#include <ace/XML_Utils/XMLSchema/Traversal.ipp> - #endif // XMLSCHEMA_TRAVERSAL_HPP diff --git a/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp b/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp deleted file mode 100644 index c96910a60a5..00000000000 --- a/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp +++ /dev/null @@ -1,9 +0,0 @@ -// file : XMLSchema/Traversal.ipp -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> - -namespace XMLSchema -{ - namespace Traversal - { - } -} diff --git a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp index 2016982b73b..75da2c30ad6 100644 --- a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp +++ b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp @@ -14,7 +14,6 @@ namespace XMLSchema }; } -#include <ace/XML_Utils/XMLSchema/TypeInfo.ipp> #include <ace/XML_Utils/XMLSchema/TypeInfo.tpp> #endif // XMLSCHEMA_TYPE_INFO_HPP diff --git a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp deleted file mode 100644 index 20cce1f97be..00000000000 --- a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp +++ /dev/null @@ -1,6 +0,0 @@ -// file : XMLSchema/TypeInfo.ipp -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> - -namespace XMLSchema -{ -} diff --git a/ACE/ace/XML_Utils/XMLSchema/Types.hpp b/ACE/ace/XML_Utils/XMLSchema/Types.hpp index 9027786a834..966c588fd3e 100644 --- a/ACE/ace/XML_Utils/XMLSchema/Types.hpp +++ b/ACE/ace/XML_Utils/XMLSchema/Types.hpp @@ -57,8 +57,6 @@ namespace XMLSchema typedef basic_string<C> Base__ ; public: - // typedef ACE_Refcounted_Auto_Ptr < string, ACE_Null_Mutex > _ptr; - //@@ VC6 does not inject XSCRT::Type into the scope so I have // to qualify it all the time. // @@ -662,6 +660,4 @@ namespace XMLSchema }; } -#include "ace/XML_Utils/XMLSchema/Types.ipp" - #endif // XMLSCHEMA_TYPES_HPP diff --git a/ACE/ace/XML_Utils/XMLSchema/Types.ipp b/ACE/ace/XML_Utils/XMLSchema/Types.ipp deleted file mode 100644 index b39e46a39ee..00000000000 --- a/ACE/ace/XML_Utils/XMLSchema/Types.ipp +++ /dev/null @@ -1,7 +0,0 @@ -// file : XMLSchema/Types.ipp -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> - -namespace XMLSchema -{ - -} diff --git a/ACE/ace/XML_Utils/XMLSchema/Writer.hpp b/ACE/ace/XML_Utils/XMLSchema/Writer.hpp index 781432b8fda..5a12ce2ff2a 100644 --- a/ACE/ace/XML_Utils/XMLSchema/Writer.hpp +++ b/ACE/ace/XML_Utils/XMLSchema/Writer.hpp @@ -151,6 +151,4 @@ namespace XMLSchema } } -#include <ace/XML_Utils/XMLSchema/Writer.ipp> - #endif // XMLSCHEMA_WRITER_HPP diff --git a/ACE/ace/XML_Utils/XMLSchema/Writer.ipp b/ACE/ace/XML_Utils/XMLSchema/Writer.ipp deleted file mode 100644 index 98078da9298..00000000000 --- a/ACE/ace/XML_Utils/XMLSchema/Writer.ipp +++ /dev/null @@ -1,9 +0,0 @@ -// file : XMLSchema/Writer.ipp -// author : Boris Kolpackov <boris@dre.vanderbilt.edu> - -namespace XMLSchema -{ - namespace Writer - { - } -} diff --git a/ACE/ace/XML_Utils/XMLSchema/id_map.hpp b/ACE/ace/XML_Utils/XMLSchema/id_map.hpp index 2803a5a85be..559d461665f 100644 --- a/ACE/ace/XML_Utils/XMLSchema/id_map.hpp +++ b/ACE/ace/XML_Utils/XMLSchema/id_map.hpp @@ -54,7 +54,18 @@ //Unresolved_IDREF thrown when there are IDREF's in the //XML document. - class Unresolved_IDREF {}; + class Unresolved_IDREF { + public: + explicit Unresolved_IDREF(const std::basic_string<ACE_TCHAR> &message) : message(message) + {} + ~Unresolved_IDREF(){} + std::basic_string<ACE_TCHAR> get_message ( void ) + { + return message; + } + private: + std::basic_string<ACE_TCHAR> message; + }; //Only a default constructor and destructor are needed //Constructor @@ -67,8 +78,8 @@ { } - //Add an ID to the ID map - void add_id (std::basic_string<ACE_TCHAR> id, XSCRT::Type *obj_ref) + // Add an ID to the ID map + void add_id (const std::basic_string<ACE_TCHAR>& id, XSCRT::Type *obj_ref) { if (obj_ref) { @@ -78,11 +89,10 @@ { throw NULL_PTR_Entry(); } - return; } - //Add an IDREF to the IDREF map - void add_idref (std::basic_string<ACE_TCHAR> idref, XSCRT::Type *obj_ref) + // Add an IDREF to the IDREF map + void add_idref (const std::basic_string<ACE_TCHAR>& idref, XSCRT::Type *obj_ref) { if (obj_ref) { @@ -92,7 +102,19 @@ { throw NULL_PTR_Entry(); } - return; + } + + void resolve_single_idref (const std::basic_string<ACE_TCHAR>& idref, ::XSCRT::Type * element) + { + ID_Map::id_iterator id_iterator = this->id_map_.find(idref); + if (id_iterator != this->id_map_.end()) + { + element->set_idref(idref, id_iterator->second); + } + else + { + throw Unresolved_IDREF(idref); + } } //Sets the referencing elements XSCRT::Type::idref_ to point to the @@ -100,26 +122,23 @@ //Note: The pointer is of type "XSCRT::Type*" void resolve_idref ( void ) { - //Declare iterators to navigate the maps - ID_Map::id_iterator id_iterator; - ID_Map::idref_iterator idref_iterator; - - for (idref_iterator = this->idref_map_.begin(); + // Declare iterators to navigate the maps + for (ID_Map::idref_iterator idref_iterator = this->idref_map_.begin(); idref_iterator != this->idref_map_.end(); ++idref_iterator) { //Find the ID that matches the IDREF element - id_iterator = this->id_map_.find(idref_iterator->first); + ID_Map::id_iterator id_iterator = this->id_map_.find(idref_iterator->first); if (id_iterator != this->id_map_.end()) { - //Add the IDREF identifier and the reference to the - //identified object + // Add the IDREF identifier and the reference to the + // identified object std::basic_string<ACE_TCHAR> temp_id = id_iterator->first; idref_iterator->second->set_idref(temp_id, id_iterator->second); } else { - //throw Unresolved_IDREF(); + throw Unresolved_IDREF(idref_iterator->first); } } } @@ -131,11 +150,11 @@ } private: - //id_map_: maps the ID string to the element with the - // ID attribute - //idref_map_: multimap that maps the IDREF string to the - // element with the IDREF attribute + /// Maps the ID string to the element with the + /// ID attribute ID_MAP id_map_; + /// Multimap that maps the IDREF string to the + /// element with the IDREF attribute IDREF_MAP idref_map_; }; diff --git a/ACE/ace/XML_Utils/XML_Helper.h b/ACE/ace/XML_Utils/XML_Helper.h index 6fa5b8d789f..001a575b947 100644 --- a/ACE/ace/XML_Utils/XML_Helper.h +++ b/ACE/ace/XML_Utils/XML_Helper.h @@ -83,7 +83,11 @@ namespace XML private: bool initialized_; XERCES_CPP_NAMESPACE::DOMImplementation *impl_; +#if defined (ACE_HAS_CPP11) + mutable std::unique_ptr<XERCES_CPP_NAMESPACE::XercesDOMParser> parser_; +#else mutable std::auto_ptr<XERCES_CPP_NAMESPACE::XercesDOMParser> parser_; +#endif /* ACE_HAS_CPP11 */ Resolver *resolver_; bool release_resolver_; diff --git a/ACE/ace/XML_Utils/XSCRT/Elements.hpp b/ACE/ace/XML_Utils/XSCRT/Elements.hpp index 601e0f9f338..5395a2a930a 100644 --- a/ACE/ace/XML_Utils/XSCRT/Elements.hpp +++ b/ACE/ace/XML_Utils/XSCRT/Elements.hpp @@ -28,7 +28,6 @@ namespace XSCRT class Type { public: - virtual ~Type (void) { } @@ -149,11 +148,14 @@ namespace XSCRT { if (map_.get () == 0) { +#if defined (ACE_HAS_CPP11) + map_ = std::unique_ptr<Map_> (new Map_); +#else map_ = std::auto_ptr<Map_> (new Map_); +#endif /* ACE_HAS_CPP11 */ } - if (!map_->insert ( - std::pair<IdentityProvider const*, Type*> (&id, t)).second) + if (!map_->insert (std::pair<IdentityProvider const*, Type*> (&id, t)).second) { throw 1; } @@ -197,12 +199,24 @@ namespace XSCRT return 0; } - //Get and set methods for the idref_map_ data member + /// Get and set methods for the idref_map_ data member Type* get_idref (const char* name) { std::basic_string<ACE_TCHAR> name_string (ACE_TEXT_CHAR_TO_TCHAR(name)); - std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i = - this->idref_map_.find(name_string); + std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i = this->idref_map_.find(name_string); + if (i != idref_map_.end()) + { + return i->second; + } + else + { + return 0; + } + } + + Type* get_idref (const std::basic_string<ACE_TCHAR>& name) + { + std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i = this->idref_map_.find(name); if (i != idref_map_.end()) { return i->second; @@ -216,8 +230,7 @@ namespace XSCRT Type* get_idref (const wchar_t *name) { std::basic_string<ACE_TCHAR> name_string (ACE_TEXT_WCHAR_TO_TCHAR(name)); - std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i = - this->idref_map_.find(name_string); + std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i = this->idref_map_.find(name_string); if (i != idref_map_.end()) { return i->second; @@ -228,16 +241,14 @@ namespace XSCRT } } - - void set_idref (std::basic_string<ACE_TCHAR> name, Type* new_idref) + void set_idref (const std::basic_string<ACE_TCHAR>& name, Type* new_idref) { this->idref_map_.insert(std::pair<std::basic_string<ACE_TCHAR>,Type*>(name, new_idref)); - return; } private: - //Data member to handle unbounded IDREF attributes and elements + // Data member to handle unbounded IDREF attributes and elements std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*> idref_map_; Type* container_; @@ -255,7 +266,11 @@ namespace XSCRT std::map<IdentityProvider const*, Type*, IdentityComparator> Map_; +#if defined (ACE_HAS_CPP11) + std::unique_ptr<Map_> map_; +#else std::auto_ptr<Map_> map_; +#endif /* ACE_HAS_CPP11 */ }; // Fundamental types template. @@ -267,9 +282,6 @@ namespace XSCRT public: // Trait for marshaling a FundamentalType X typedef X CDR_Type__; -#if !defined (__BORLANDC__) || (__BORLANDC__ >= 0x620) - typedef ACE_Refcounted_Auto_Ptr < FundamentalType, ACE_Null_Mutex > _ptr; -#endif /* !__BORLANDC__ */ FundamentalType () { @@ -318,13 +330,6 @@ namespace XSCRT X x_; }; -#if !((defined (__GNUC__) && (__GNUC__ == 3 && (__GNUC_MINOR__ < 3))) || \ - (defined (__BORLANDC__) && (__BORLANDC__ < 0x620)) || \ - (defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x5100))) - - // Stuff for normal compilers. - // - // Specialization for `signed char' // // @@ -391,137 +396,6 @@ namespace XSCRT x_ = static_cast<unsigned char> (t); } -#else - - // Stuff for broken VC6 & gcc < 3.3. Don't like what you see - use better - // compiler! - // - - // Specialization for signed char. - // - template <> - class FundamentalType<signed char> : public Type - { - public: - FundamentalType () - { - } - - template<typename C> - FundamentalType (XML::Element<C> const& e) - { - std::basic_stringstream<C> s; - s << e.value (); - - short t; - s >> t; - - x_ = static_cast<signed char> (t); - } - - template<typename C> - FundamentalType (XML::Attribute<C> const& a) - { - std::basic_stringstream<C> s; - s << a.value (); - - short t; - s >> t; - - x_ = static_cast<signed char> (t); - } - - FundamentalType (signed char const& x) - : x_ (x) - { - } - - FundamentalType& - operator= (signed char const& x) - { - x_ = x; - return *this; - } - - public: - operator signed char const& () const - { - return x_; - } - - operator signed char& () - { - return x_; - } - - protected: - signed char x_; - }; - - // Specialization for unsigned char. - // - template <> - class FundamentalType<unsigned char> : public Type - { - public: - FundamentalType () - { - } - - template<typename C> - FundamentalType (XML::Element<C> const& e) - { - std::basic_stringstream<C> s; - s << e.value (); - - unsigned short t; - s >> t; - - x_ = static_cast<unsigned char> (t); - } - - template<typename C> - FundamentalType (XML::Attribute<C> const& a) - { - std::basic_stringstream<C> s; - s << a.value (); - - unsigned short t; - s >> t; - - x_ = static_cast<unsigned char> (t); - } - - FundamentalType (unsigned char const& x) - : x_ (x) - { - } - - FundamentalType& - operator= (unsigned char const& x) - { - x_ = x; - return *this; - } - - public: - operator unsigned char const& () const - { - return x_; - } - - operator unsigned char& () - { - return x_; - } - - protected: - unsigned char x_; - }; - -#endif - - // Specialization for bool. // // diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 2de100fe757..b0aa313dd17 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -1,4 +1,4 @@ -// -*- MPC -*- now wouldn't this be cool... +// -*- MPC -*- project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, uuid, filecache, versioned_namespace, pkgconfig, support_ostream { avoids = ace_for_tao sharedname = ACE @@ -467,7 +467,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Version.h Versioned_Namespace.h ace_wchar.h - ace_wchar.inl checked_iterator.h config-*.h config.h @@ -481,7 +480,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Documentation_Files { README - ../VERSION } Pkgconfig_Files { diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index b388f81ba68..95f5e4c6354 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -31,7 +31,7 @@ # define ACE_HAS_NEW_NOTHROW #endif /* __GNUC__ >= 3.3 */ -#if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) +#if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) || defined __clang__ # if __cplusplus > 199711L # define ACE_HAS_CPP11 # endif diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index 09571443f0f..4e53e3bcada 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -31,10 +31,6 @@ #define ACE_ISCTYPE_EQUIVALENT __isctype -#ifndef ACE_HAS_NONCONST_FD_ISSET -#define ACE_HAS_NONCONST_FD_ISSET -#endif - #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR #define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" diff --git a/ACE/ace/config-macosx-mojave.h b/ACE/ace/config-macosx-mojave.h new file mode 100644 index 00000000000..6b0164b9e33 --- /dev/null +++ b/ACE/ace/config-macosx-mojave.h @@ -0,0 +1,6 @@ +#ifndef ACE_CONFIG_MACOSX_MOJAVE_H +#define ACE_CONFIG_MACOSX_MOJAVE_H + +#include "ace/config-macosx-highsierra.h" + +#endif // ACE_CONFIG_MACOSX_MOJAVE_H diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index 3c63301d8a5..13a853a9318 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -2,7 +2,9 @@ #define ACE_CONFIG_MACOSX_ALL_H #include <Availability.h> -#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 +#include "config-macosx-mojave.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 #include "config-macosx-highsierra.h" #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200 #include "config-macosx-sierra.h" diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 0f6faa8e1b3..47fd0dbf0d0 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -150,7 +150,7 @@ # define ACE_LACKS_ISCTYPE #endif -#if (__BORLANDC__ >= 0x650) && (__BORLANDC__ <= 0x730) +#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x730) # define ACE_LACKS_STRTOK_R #endif @@ -174,12 +174,22 @@ #endif #if defined (ACE_HAS_BCC32) +// The bcc32 compiler can't handle assembly in inline methods or +// templates (E2211). When we build for pentium optimized and we are inlining +// then we disable inline assembly +# if defined (ACE_HAS_PENTIUM) && defined(__ACE_INLINE__) && !defined(__clang__) +# define ACE_LACKS_INLINE_ASSEMBLY +# endif # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_NEEDS_DL_UNDERSCORE #endif #ifdef __clang__ # define ACE_ANY_OPS_USE_NAMESPACE +# define ACE_HAS_BUILTIN_BSWAP16 +# define ACE_HAS_BUILTIN_BSWAP32 +# define ACE_HAS_BUILTIN_BSWAP64 +# define ACE_LACKS_INLINE_ASSEMBLY #endif /* __clang__ */ diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h index e62150b5bc8..b801b10a771 100644 --- a/ACE/ace/config-win32-mingw64.h +++ b/ACE/ace/config-win32-mingw64.h @@ -127,6 +127,8 @@ #define ACE_HAS_NONCONST_WCSDUP #define ACE_ISCTYPE_EQUIVALENT ::_isctype +#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE + #define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" #define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h index 330df3e56f7..c6376395d13 100644 --- a/ACE/ace/config-win32-msvc-141.h +++ b/ACE/ace/config-win32-msvc-141.h @@ -25,5 +25,13 @@ #include "ace/config-win32-msvc-14.h" +#if _MSVC_LANG >= 201402L +# define ACE_HAS_CPP14 +#endif /* _MSVC_LANG >= 201402L */ + +#if _MSVC_LANG >= 201703L +# define ACE_HAS_CPP17 +#endif /* _MSVC_LANG >= 201703L */ + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_141_H */ diff --git a/ACE/apps/Gateway/Peer/peer.mpc b/ACE/apps/Gateway/Peer/peer.mpc index d2e6a0476c1..6e5aca8d84d 100644 --- a/ACE/apps/Gateway/Peer/peer.mpc +++ b/ACE/apps/Gateway/Peer/peer.mpc @@ -5,9 +5,6 @@ project(Gateway_Peer) : ace_output, acelib { Options.cpp Peer.cpp } - Documentation_Files { - svc.conf - } } project(gateway_peerd) : aceexe { diff --git a/ACE/bin/MakeProjectCreator/config/ace_qt5.mpb b/ACE/bin/MakeProjectCreator/config/ace_qt5.mpb new file mode 100644 index 00000000000..76d24e980d7 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ace_qt5.mpb @@ -0,0 +1,4 @@ +// -*- MPC -*- +project: qt5_gui { + macros += ACE_HAS_QT5 +} diff --git a/ACE/bin/MakeProjectCreator/config/ace_qt5reactor.mpb b/ACE/bin/MakeProjectCreator/config/ace_qt5reactor.mpb new file mode 100644 index 00000000000..4357a3779de --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ace_qt5reactor.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +project : acelib, ace_qt5, qt5_widgets { + requires += ace_qt5reactor + after += ACE_Qt5Reactor + libs += ACE_QtReactor +} diff --git a/ACE/bin/MakeProjectCreator/config/ace_qtreactor.mpb b/ACE/bin/MakeProjectCreator/config/ace_qtreactor.mpb new file mode 100644 index 00000000000..21a6f52c60a --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ace_qtreactor.mpb @@ -0,0 +1,13 @@ +feature(qt4): ace_qt4reactor { +} +feature(qt5): ace_qt5reactor { +} +feature(!qt4, !qt5) { + requires += dummy_label + Define_Custom(UIC) { + } + Define_Custom(MOC) { + } + Define_Custom(QRC) { + } +} diff --git a/ACE/bin/MakeProjectCreator/config/bmake.features b/ACE/bin/MakeProjectCreator/config/bmake.features index f7f24def9d1..fa48614c377 100644 --- a/ACE/bin/MakeProjectCreator/config/bmake.features +++ b/ACE/bin/MakeProjectCreator/config/bmake.features @@ -1,5 +1,3 @@ -// bmake.features,v 1.2 2005/08/22 09:35:48 jwillemsen Exp - ssl=0 qos=1 cidl=0 diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features index 7f8f0d286a5..e59027e8290 100644 --- a/ACE/bin/MakeProjectCreator/config/global.features +++ b/ACE/bin/MakeProjectCreator/config/global.features @@ -62,7 +62,9 @@ ofccm = 0 ndds = 0 nddsmonitor = 0 mcpp = 0 +wireshark_any = 0 wireshark = 0 +wireshark_cmake = 0 old_stdstream = 0 exclude_inet = 0 inet_ssl = 0 @@ -104,6 +106,8 @@ qt = 0 qt3 = 0 // 1 - Qt4 core libraries are available qt4 = 0 +// Qt5 +qt5 = 0 // 1 - Fox libraries are available fox = 0 // 1 - OpenGL libraries are available diff --git a/ACE/bin/MakeProjectCreator/config/gnuace.features b/ACE/bin/MakeProjectCreator/config/gnuace.features index fdea234cf42..4f85db88591 100644 --- a/ACE/bin/MakeProjectCreator/config/gnuace.features +++ b/ACE/bin/MakeProjectCreator/config/gnuace.features @@ -1,7 +1,5 @@ ssl=1 -qt4=1 fl=1 tk=1 xt=1 sctp=1 - diff --git a/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm index 7f29c927088..87070c42c59 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm @@ -51,7 +51,7 @@ sub write_project_targets { ($chdir ? "cd $dname && " : ''), "\$(MAKE) -f ", $output_project, - " $target &> $output_project.log ; cat $output_project.log ; rm $output_project.log $crlf"; + " $target > $output_project.log 2>&1 ; cat $output_project.log ; rm $output_project.log $crlf"; } } diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 3449aa7e2a9..c00cab2da08 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -566,11 +566,11 @@ endif SPACE = $(should_be_unset) $(should_be_unset) <%foreach(custom_types)%> <%if(custom_type->libpath)%> -DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):<%custom_type->libpath%>$(if $(ARCH),:<%custom_type->libpath%>/$(ARCH)) -LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):<%custom_type->libpath%>$(if $(ARCH),:<%custom_type->libpath%>/$(ARCH)) -SHLIB_PATH := $(SHLIB_PATH):<%custom_type->libpath%>$(if $(ARCH),:<%custom_type->libpath%>/$(ARCH)) -LIBPATH := $(LIBPATH):<%custom_type->libpath%>$(if $(ARCH),:<%custom_type->libpath%>/$(ARCH)) -PATH := $(PATH):<%custom_type->libpath%>$(if $(ARCH),:<%custom_type->libpath%>/$(ARCH)) +export DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):<%custom_type->libpath%>$(if $(ARCH),:<%custom_type->libpath%>/$(ARCH)) +export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):<%custom_type->libpath%>$(if $(ARCH),:<%custom_type->libpath%>/$(ARCH)) +export SHLIB_PATH := $(SHLIB_PATH):<%custom_type->libpath%>$(if $(ARCH),:<%custom_type->libpath%>/$(ARCH)) +export LIBPATH := $(LIBPATH):<%custom_type->libpath%>$(if $(ARCH),:<%custom_type->libpath%>/$(ARCH)) +export PATH := $(PATH):<%custom_type->libpath%>$(if $(ARCH),:<%custom_type->libpath%>/$(ARCH)) <%endif%> <%foreach(custom_type->input_files)%> @@ -767,10 +767,10 @@ endif all: __postbuild__ <%if(exename)%> -__postbuild__: $(VBIN) +__postbuild__: $(VBIN) $(INSTALL) <%else%> <%if(sharedname || staticname)%> -__postbuild__: $(VLIBS) +__postbuild__: $(VLIBS) $(INSTALL) <%endif%> <%endif%> diff --git a/ACE/bin/PerlACE/Process_Unix.pm b/ACE/bin/PerlACE/Process_Unix.pm index 487a2880abb..6202626cce1 100644 --- a/ACE/bin/PerlACE/Process_Unix.pm +++ b/ACE/bin/PerlACE/Process_Unix.pm @@ -586,6 +586,20 @@ sub WaitKill ($) if ($status == -1) { print STDERR "ERROR: $self->{EXECUTABLE} timedout\n"; + + if ($ENV{ACE_TEST_LOG_STUCK_STACKS}) { + my $debugger = ($^O eq 'darwin') ? 'lldb' : 'gdb'; + my $commands = ($^O eq 'darwin') ? "-o 'bt all'" + : "-ex 'set pagination off' -ex 'thread apply all backtrace'"; + system "$debugger --batch -p $self->{PROCESS} $commands"; + } + + if ($ENV{ACE_TEST_GENERATE_CORE_FILE}) { + system ($^O ne 'darwin') ? "gcore $self->{PROCESS}" + : "lldb -b -p $self->{PROCESS} -o " . + "'process save-core core.$self->{PROCESS}'"; + } + $self->Kill (); } 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 b421e3bf5b1..938700d724c 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=2017_09_07; else olddate=$3; fi +if test -z $3; then olddate=2018_09_18; 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 if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index 5053b0b6115..a237f0ed59f 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -610,7 +610,7 @@ sub check_for_trailing_whitespace () print "Running trailing_whitespaces check\n"; ITERATION: foreach $file (@files_cpp, @files_inl, @files_h, @files_idl, - @files_cdp, @files_pl, @files_generic) { + @files_cdp, @files_pl, @files_py, @files_generic) { if (open (FILE, $file)) { my $disable = 0; print "Looking at file $file\n" if $opt_d; diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index a55ba82d9da..b6e828e00fe 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -302,66 +302,64 @@ def update_spec_file (): def update_debianbuild (): """ Updates ACE_ROOT/debian directory. - - renames all files with version nrs in name to new scheme. - - updates version nrs in file debian/control - Currently ONLY ACE & TAO stuff is handled here """ + - renames all files with version numbers in name; if file contains + lintian overrides, update version numbers inside file + - updates version numbers inside file debian/control + Currently ONLY ACE is handled here """ global comp_versions - import glob import re - from os.path import basename - from os.path import dirname - from os.path import join + from os import listdir files = list () prev_ace_ver = None - prev_tao_ver = None - # rename files - mask = re.compile ("(libace|libkokyu|libnetsvcs)(.*)(\d+\.\d+\.\d+)(.*)") - tao = re.compile ("tao", re.IGNORECASE) + dname = doc_root + '/ACE_TAO/ACE/debian/' - for fname in glob.iglob(doc_root + '/ACE_TAO/ACE/debian/*'): - print "Considering " + fname - match = None + mask = re.compile ("(libace|libACE|libkokyu|libKokyu|libnetsvcs)([^\s,:]*-)(\d+\.\d+\.\d+)([^\s,:]*)") - fbase = basename (fname) + def update_ver (match): + return match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4) - match = mask.search (fbase) - fnewname = None - if match is not None: - if tao.search (fbase) is not None: - fnewname = join (dirname (fname), match.group (1) + match.group (2) + comp_versions["TAO_version"] + match.group (4)) - prev_tao_ver = match.group (3) - else: - fnewname = join (dirname (fname), match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4)) - prev_ace_ver = match.group (3) + # find files in debian/* matching mask + for fname in listdir(dname): + match = mask.search (fname) + if match is None: + continue - print prev_ace_ver -# print prev_tao_var + fnewname = update_ver (match) + prev_ace_ver = match.group (3) - if fnewname is not None: - if opts.take_action: - print "Rename: " + fname + " to " + fnewname + "\n" - ex ("git mv " + fname + " " + fnewname) - else: - print "Rename: " + fname + " to " + fnewname + "\n" + # if file contains lintian overrides, update file + if match.group (4) == '.lintian-overrides': + with open (dname + fname, 'r+') as lintian_overrides_file: + new_lintian_overrides = "" + for line in lintian_overrides_file.readlines (): + new_lintian_overrides += mask.sub (update_ver, line) - # update debianbuild/control - def update_ver (match): - if match.group (1) == 'libtao': - return match.group (1) + match.group (2) + comp_versions["TAO_version"] + match.group (4) - else: - return match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4) + if opts.take_action: + lintian_overrides_file.seek (0) + lintian_overrides_file.truncate (0) + lintian_overrides_file.writelines (new_lintian_overrides) + else: + print "New lintian-overrides file:" + print "".join (new_lintian_overrides) + + files.append (dname + fnewname) + + # rename file + print "Rename: " + dname + fname + " to " + dname + fnewname + "\n" + if opts.take_action: + ex ("git mv " + dname + fname + " " + dname + fnewname) - with open (doc_root + "/ACE_TAO/ACE/debian/debian.control", 'r+') as control_file: + # update debian/control + with open (dname + "control", 'r+') as control_file: new_ctrl = "" for line in control_file.readlines (): if re.search ("^(Package|Depends|Suggests):", line) is not None: line = mask.sub (update_ver, line) elif re.search ('^Replaces:', line) is not None: - print comp_versions["ACE_version"] line = line.replace (prev_ace_ver, comp_versions["ACE_version"]) new_ctrl += line @@ -374,30 +372,7 @@ def update_debianbuild (): print "New control file:" print "".join (new_ctrl) - files.append (doc_root + "/ACE_TAO/ACE/debian/debian.control") - - # rewrite debian/dsc - dsc_lines = """Format: 1.0 -Source: ACE+src-%s -Version: %s -Binary: ace -Maintainer: Johnny Willemsen <jwillemsen@remedy.nl> -Architecture: any -Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, docbook-to-man, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev -Files: - 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-%s.tar.gz - -""" % (comp_versions["ACE_version"], comp_versions["TAO_version"], comp_versions["ACE_version"]) - if opts.take_action: - with open (doc_root + "/ACE_TAO/ACE/debian/ace.dsc", 'r+') as dsc_file: - dsc_file.seek (0) - dsc_file.truncate (0) - dsc_file.writelines (dsc_lines) - else: - print "New dsc file:\n" - print dsc_lines - - files.append (doc_root + "/ACE_TAO/ACE/debian/ace.dsc") + files.append (dname + "control") return files @@ -590,8 +565,13 @@ def tag (): # Update latest tag if opts.release_type == "major": update_latest_tag ("Major", tagname) + update_latest_tag ("Minor", tagname) + update_latest_tag ("Beta", tagname) + update_latest_tag ("Micro", tagname) elif opts.release_type == "minor": update_latest_tag ("Minor", tagname) + update_latest_tag ("Beta", tagname) + update_latest_tag ("Micro", tagname) elif opts.release_type == "micro": update_latest_tag ("Beta", tagname) update_latest_tag ("Micro", tagname) @@ -886,7 +866,6 @@ def generate_workspaces (stage_dir): mpc_option = ' -recurse -hierarchy -relative ACE_ROOT=' + stage_dir + '/ACE_wrappers ' mpc_option += ' -relative TAO_ROOT=' + stage_dir + '/ACE_wrappers/TAO ' msvc_exclude_option = ' ' - vc12_option = ' -name_modifier *_vc12 ' vc14_option = ' -name_modifier *_vc14 ' vs2017_option = ' -name_modifier *_vs2017 ' @@ -897,9 +876,6 @@ def generate_workspaces (stage_dir): print "\tGenerating GNUmakefiles...." ex (mpc_command + " -type gnuace " + exclude_option + workers_option + mpc_option + redirect_option) - print "\tGenerating VC12 solutions..." - ex (mpc_command + " -type vc12 " + msvc_exclude_option + mpc_option + workers_option + vc12_option + redirect_option) - print "\tGenerating VC14 solutions..." ex (mpc_command + " -type vc14 " + msvc_exclude_option + mpc_option + workers_option + vc14_option + redirect_option) diff --git a/ACE/contrib/FaCE/FaCE.cpp b/ACE/contrib/FaCE/FaCE.cpp index 22eeadc1e13..bbe83ebca91 100644 --- a/ACE/contrib/FaCE/FaCE.cpp +++ b/ACE/contrib/FaCE/FaCE.cpp @@ -26,7 +26,6 @@ const ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt"); * parameters and parameter history file. * * @author Si Mong Park (spark@ociweb.com) - * @version $Revision$ $Date$ */ class ParameterList { diff --git a/ACE/debian/ACE-DPKG.mwc b/ACE/debian/ACE-DPKG.mwc new file mode 100644 index 00000000000..cdbfe475b9f --- /dev/null +++ b/ACE/debian/ACE-DPKG.mwc @@ -0,0 +1,31 @@ +workspace { + exclude { + TAO + + performance-tests + + examples + ACEXML/examples + ASNMP + + tests + Kokyu/tests + ACEXML/tests + apps/gperf/tests + apps/drwho + apps/Gateway + apps/AWS + apps/JAWS + apps/JAWS2 + apps/JAWS3 + apps/mkcsregdb + apps/soreduce + + websvcs + contrib + protocols/tests + protocols/examples + + netsvcs/clients + } +} diff --git a/ACE/debian/TOREMOVE b/ACE/debian/TOREMOVE deleted file mode 100644 index b2ceb242f5a..00000000000 --- a/ACE/debian/TOREMOVE +++ /dev/null @@ -1,25 +0,0 @@ -TAO/orbsvcs/orbsvcs/LB_ORTS.cpp -TAO/orbsvcs/orbsvcs/SecurityLevel3S.cpp -TAO/orbsvcs/orbsvcs/SecurityLevel3S.h -TAO/orbsvcs/orbsvcs/RtecEventCommS.inl -TAO/orbsvcs/orbsvcs/RtecUDPAdminS_T.h -TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h -TAO/orbsvcs/orbsvcs/RtecEventCommS.cpp -TAO/orbsvcs/orbsvcs/GSSUPS.cpp -TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS.inl -TAO/orbsvcs/orbsvcs/GSSUPS.h -TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS.h -TAO/orbsvcs/orbsvcs/RtecEventCommS.h -TAO/orbsvcs/orbsvcs/RtecUDPAdminS.cpp -TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS.cpp -TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h -TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS.inl -TAO/orbsvcs/orbsvcs/CSIIOPS.cpp -TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS.h -TAO/orbsvcs/orbsvcs/RtecUDPAdminS.inl -TAO/orbsvcs/orbsvcs/RtecEventCommS_T.h -TAO/orbsvcs/orbsvcs/CSIIOPS.h -TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS.cpp -TAO/orbsvcs/orbsvcs/CSIS.h -TAO/orbsvcs/orbsvcs/CSIS.cpp -TAO/orbsvcs/orbsvcs/RtecUDPAdminS.h diff --git a/ACE/debian/ace-netsvcs.doc-base b/ACE/debian/ace-netsvcs.doc-base new file mode 100644 index 00000000000..9e20176dac6 --- /dev/null +++ b/ACE/debian/ace-netsvcs.doc-base @@ -0,0 +1,10 @@ +Document: ace-netsvcs +Title: ACE network services +Author: Douglas C. Schmidt and his research group +Abstract: This document describes the ACE network services: naming, time, + token, and logging services. +Section: Programming/C++ + +Format: html +Index: /usr/share/doc/ace-netsvcs/ACE-netsvcs.html +Files: /usr/share/doc/ace-netsvcs/*.html diff --git a/ACE/debian/ace-netsvcs.docs b/ACE/debian/ace-netsvcs.docs new file mode 100644 index 00000000000..307913e25f2 --- /dev/null +++ b/ACE/debian/ace-netsvcs.docs @@ -0,0 +1,3 @@ +PROBLEM-REPORT-FORM +netsvcs/servers/README +netsvcs/ACE-netsvcs.html diff --git a/ACE/debian/ace-netsvcs.install b/ACE/debian/ace-netsvcs.install new file mode 100644 index 00000000000..61f06619abb --- /dev/null +++ b/ACE/debian/ace-netsvcs.install @@ -0,0 +1,2 @@ +../../netsvcs/servers/ace_netsvcs usr/bin +../../netsvcs/servers/svc.conf* usr/share/ace-netsvcs diff --git a/ACE/debian/ace-netsvcs.manpages b/ACE/debian/ace-netsvcs.manpages new file mode 100644 index 00000000000..43bf0f7a731 --- /dev/null +++ b/ACE/debian/ace-netsvcs.manpages @@ -0,0 +1 @@ +debian/ace_netsvcs.1 diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc deleted file mode 100644 index 80f711c00d0..00000000000 --- a/ACE/debian/ace.dsc +++ /dev/null @@ -1,10 +0,0 @@ -Format: 1.0 -Source: ACE+src-6.4.6 -Version: 2.4.6 -Binary: ace -Maintainer: Johnny Willemsen <jwillemsen@remedy.nl> -Architecture: any -Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, docbook-to-man, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev -Files: - 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-6.4.6.tar.gz - diff --git a/ACE/debian/debian.changelog b/ACE/debian/changelog index ed34c59f384..ed34c59f384 100644 --- a/ACE/debian/debian.changelog +++ b/ACE/debian/changelog diff --git a/ACE/debian/debian.control b/ACE/debian/control index 1edbbee45ec..25d98b26a84 100644 --- a/ACE/debian/debian.control +++ b/ACE/debian/control @@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator * mpc-ace: generates project files for a single target * mwc-ace: generates workspace files for a set of projects -Package: libace-6.4.6 +Package: libace-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -45,7 +45,7 @@ Description: C++ network programming framework Package: libace-dev Architecture: any Section: libdevel -Depends: libace-6.4.6 (= ${binary:Version}), ${misc:Depends} +Depends: libace-6.5.2 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, pkg-config Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework - development files @@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation This package contains the ACE overview documentation, tutorials, examples, and information regarding upstream development. -Package: libace-ssl-6.4.6 +Package: libace-ssl-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -73,12 +73,12 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. -Package: libace-rmcast-6.4.6 +Package: libace-rmcast-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -92,12 +92,12 @@ Description: ACE reliable multicast library Package: libace-rmcast-dev Architecture: any Section: libdevel -Depends: libace-rmcast-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE reliable multicast library - development files This package contains the header files and static library for the ACE reliable multicast library. -Package: libace-tmcast-6.4.6 +Package: libace-tmcast-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -111,12 +111,12 @@ Description: ACE transactional multicast library Package: libace-tmcast-dev Architecture: any Section: libdevel -Depends: libace-tmcast-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE transactional multicast library - development files This package contains the header files and static library for the ACE transactional multicast library. -Package: libace-htbp-6.4.6 +Package: libace-htbp-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library Package: libace-htbp-dev Architecture: any Section: libdevel -Depends: libace-htbp-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE protocol over HTTP tunneling library - development files This package contains the header files and static library for the ACE HTBP library. -Package: libace-inet-6.4.6 +Package: libace-inet-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -146,15 +146,15 @@ Description: ACE Inet protocol library Package: libace-inet-dev Architecture: any Section: libdevel -Depends: libace-inet-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE Inet protocol library - development files This package contains the header files and static library for the ACE Inet protocol library. -Package: libace-inet-ssl-6.4.6 +Package: libace-inet-ssl-6.5.2 Architecture: any Section: libs -Depends: libace-inet-6.4.5, libace-ssl-6.4.6, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-6.5.2, libace-ssl-6.5.2, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library Package: libace-inet-ssl-dev Architecture: any Section: libdevel -Depends: libace-inet-ssl-6.4.6 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-6.5.2 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SSL-enabled Inet protocol library - development files This package contains the header files and static library for the ACE SSL-enabled Inet protocol library. @@ -180,7 +180,7 @@ Description: ACE perfect hash function generator basically the same options and functionality. ace_gperf simply takes advantage of some of the features provided by the ACE library. -Package: libacexml-6.4.6 +Package: libacexml-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -196,12 +196,12 @@ Package: libacexml-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libacexml-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library - development files This package contains the header files and static library for the ACE XML parsing library. -Package: libace-xml-utils-6.4.6 +Package: libace-xml-utils-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -215,12 +215,12 @@ Package: libace-xml-utils-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libace-xml-utils-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev Description: ACE XML utility classes and methods - development files This package contains the header files and static library for the ACE XML Utils library -Package: libkokyu-6.4.6 +Package: libkokyu-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library Package: libkokyu-dev Architecture: any Section: libdevel -Depends: libkokyu-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE scheduling and dispatching library - development files This package contains the header files and static library for the ACE scheduling and dispatching library. -Package: libace-xtreactor-6.4.6 +Package: libace-xtreactor-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-6.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.6), ${misc:Depends} +Depends: libace-xtreactor-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. -Package: libace-tkreactor-6.4.6 +Package: libace-tkreactor-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} Description: ACE-GUI reactor integration for Tk - development files This package contains header files and static library for the ACE-Tk reactor integration. -Package: libace-flreactor-6.4.6 +Package: libace-flreactor-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-6.4.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.6), ${misc:Depends} +Depends: libace-flreactor-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends} Description: ACE-GUI reactor integration for FLTK - development files This package contains header files and static library for the ACE-FLTK reactor integration. -Package: libace-foxreactor-6.4.6 +Package: libace-foxreactor-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX Package: libace-foxreactor-dev Architecture: any Section: libdevel -Depends: libace-foxreactor-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FOX - development files This package contains header files and static library for the ACE-FOX reactor integration. @@ -343,7 +343,7 @@ Description: ACE network service implementations files to link the various ACE network services together, either statically or dynamically, and form complete server programs. -Package: libnetsvcs-6.4.6 +Package: libnetsvcs-6.5.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries Package: libnetsvcs-dev Architecture: any Section: libdevel -Depends: libnetsvcs-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE network service implementations - development files ACE network services provide reusable components for common distributed system tasks such as logging, naming, locking, and time diff --git a/ACE/debian/debian.compat b/ACE/debian/debian.compat deleted file mode 100644 index ec635144f60..00000000000 --- a/ACE/debian/debian.compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/ACE/debian/default.features b/ACE/debian/default.features index e1eb5270a02..119caf8c23c 100644 --- a/ACE/debian/default.features +++ b/ACE/debian/default.features @@ -17,10 +17,6 @@ ace_tkreactor = 1 fl = 1 ace_flreactor = 1 -qt = 0 -qt4 = 0 -ace_qtreactor = 0 - fox = 1 ace_foxreactor = 1 diff --git a/ACE/debian/get-orig-source.sh b/ACE/debian/get-orig-source.sh new file mode 100755 index 00000000000..4d3df97152b --- /dev/null +++ b/ACE/debian/get-orig-source.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +set -ex + +UPSTREAM_VERSION=$2 +ORIG_TARBALL=../ace_${UPSTREAM_VERSION}.orig.tar.gz + +REAL_TARBALL=`readlink -f ${ORIG_TARBALL}` + +WORKING_DIR=`dirname ${ORIG_TARBALL}` + +ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1+dfsg\2/g"` +ORIG_TARBALL_DIR=`echo ${ORIG_TARBALL_DFSG} | sed -e "s/_\(${UPSTREAM_VERSION}\)/-\1/g" -e "s/\.tar\.gz//g"` +ORIG_TARBALL_DIR_STRIP=`basename ${ORIG_TARBALL_DIR}` + +mkdir -p ${ORIG_TARBALL_DIR} +tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xzf ${REAL_TARBALL} || exit 1 +rm -f ${ORIG_TARBALL} ${REAL_TARBALL} + +cd ${ORIG_TARBALL_DIR} + +rm -rf ASNMP +rm -rf performance-tests +rm -rf rpmbuild debian +rm -rf websvcs +rm bin/LabVIEW_RT/*.exe +rm -rf examples/C++NPv2 +rm -rf examples/C++NPv1 +rm -rf examples/APG + +GZIP=-9 tar --remove-files -czf ${ORIG_TARBALL_DFSG} ${ORIG_TARBALL_DIR} || exit 1 + +exit 0 diff --git a/ACE/debian/libace-6.4.6.lintian-overrides b/ACE/debian/libace-6.4.6.lintian-overrides deleted file mode 100644 index 240f8e08d0c..00000000000 --- a/ACE/debian/libace-6.4.6.lintian-overrides +++ /dev/null @@ -1,6 +0,0 @@ -libace-6.4.5: no-symbols-control-file usr/lib/libACE-6.4.5.so -libace-6.4.5: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.4.5.so -libace-6.4.5: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.4.5.so -libace-6.4.5: no-symbols-control-file usr/lib/libACE_ETCL-6.4.5.so -libace-6.4.5: no-symbols-control-file usr/lib/libACE_RLECompression-6.4.5.so -libace-6.4.5: no-symbols-control-file usr/lib/libACE_Compression-6.4.5.so diff --git a/ACE/debian/libace-6.4.6.docs b/ACE/debian/libace-6.5.2.docs index 3bdab5b0089..3bdab5b0089 100644 --- a/ACE/debian/libace-6.4.6.docs +++ b/ACE/debian/libace-6.5.2.docs diff --git a/ACE/debian/libace-6.4.6.install b/ACE/debian/libace-6.5.2.install index 182a5eda411..182a5eda411 100644 --- a/ACE/debian/libace-6.4.6.install +++ b/ACE/debian/libace-6.5.2.install diff --git a/ACE/debian/libace-6.5.2.lintian-overrides b/ACE/debian/libace-6.5.2.lintian-overrides new file mode 100644 index 00000000000..2c6a8f23a26 --- /dev/null +++ b/ACE/debian/libace-6.5.2.lintian-overrides @@ -0,0 +1,6 @@ +libace-6.5.2: no-symbols-control-file usr/lib/libACE-6.5.2.so +libace-6.5.2: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.2.so +libace-6.5.2: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.2.so +libace-6.5.2: no-symbols-control-file usr/lib/libACE_ETCL-6.5.2.so +libace-6.5.2: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.2.so +libace-6.5.2: no-symbols-control-file usr/lib/libACE_Compression-6.5.2.so diff --git a/ACE/debian/libace-flreactor-6.4.6.lintian-overrides b/ACE/debian/libace-flreactor-6.4.6.lintian-overrides deleted file mode 100644 index 4b58af00d10..00000000000 --- a/ACE/debian/libace-flreactor-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-flreactor-6.4.5: no-symbols-control-file usr/lib/libACE_FlReactor-6.4.5.so diff --git a/ACE/debian/libace-flreactor-6.4.6.install b/ACE/debian/libace-flreactor-6.5.2.install index 528836aacee..528836aacee 100644 --- a/ACE/debian/libace-flreactor-6.4.6.install +++ b/ACE/debian/libace-flreactor-6.5.2.install diff --git a/ACE/debian/libace-flreactor-6.5.2.lintian-overrides b/ACE/debian/libace-flreactor-6.5.2.lintian-overrides new file mode 100644 index 00000000000..d2c0a3aa593 --- /dev/null +++ b/ACE/debian/libace-flreactor-6.5.2.lintian-overrides @@ -0,0 +1 @@ +libace-flreactor-6.5.2: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.2.so diff --git a/ACE/debian/libace-foxreactor-6.4.6.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.6.lintian-overrides deleted file mode 100644 index 61c403e638b..00000000000 --- a/ACE/debian/libace-foxreactor-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-foxreactor-6.4.5: no-symbols-control-file usr/lib/libACE_FoxReactor-6.4.5.so diff --git a/ACE/debian/libace-foxreactor-6.4.6.install b/ACE/debian/libace-foxreactor-6.5.2.install index e360f29f5af..e360f29f5af 100644 --- a/ACE/debian/libace-foxreactor-6.4.6.install +++ b/ACE/debian/libace-foxreactor-6.5.2.install diff --git a/ACE/debian/libace-foxreactor-6.5.2.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.2.lintian-overrides new file mode 100644 index 00000000000..552b11a964b --- /dev/null +++ b/ACE/debian/libace-foxreactor-6.5.2.lintian-overrides @@ -0,0 +1 @@ +libace-foxreactor-6.5.2: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.2.so diff --git a/ACE/debian/libace-htbp-6.4.6.lintian-overrides b/ACE/debian/libace-htbp-6.4.6.lintian-overrides deleted file mode 100644 index 32697f5e2c0..00000000000 --- a/ACE/debian/libace-htbp-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-htbp-6.4.5: no-symbols-control-file usr/lib/libACE_HTBP-6.4.5.so diff --git a/ACE/debian/libace-htbp-6.4.6.install b/ACE/debian/libace-htbp-6.5.2.install index 08103fd5cad..08103fd5cad 100644 --- a/ACE/debian/libace-htbp-6.4.6.install +++ b/ACE/debian/libace-htbp-6.5.2.install diff --git a/ACE/debian/libace-htbp-6.5.2.lintian-overrides b/ACE/debian/libace-htbp-6.5.2.lintian-overrides new file mode 100644 index 00000000000..386b435edb5 --- /dev/null +++ b/ACE/debian/libace-htbp-6.5.2.lintian-overrides @@ -0,0 +1 @@ +libace-htbp-6.5.2: no-symbols-control-file usr/lib/libACE_HTBP-6.5.2.so diff --git a/ACE/debian/libace-inet-6.4.6.lintian-overrides b/ACE/debian/libace-inet-6.4.6.lintian-overrides deleted file mode 100644 index afb8bb9f959..00000000000 --- a/ACE/debian/libace-inet-6.4.6.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libace-inet-6.4.5: extended-description-is-probably-too-short -libace-inet-6.4.5: no-symbols-control-file usr/lib/libACE_INet-6.4.5.so diff --git a/ACE/debian/libace-inet-6.4.6.install b/ACE/debian/libace-inet-6.5.2.install index 59a73a509d0..59a73a509d0 100644 --- a/ACE/debian/libace-inet-6.4.6.install +++ b/ACE/debian/libace-inet-6.5.2.install diff --git a/ACE/debian/libace-inet-6.5.2.lintian-overrides b/ACE/debian/libace-inet-6.5.2.lintian-overrides new file mode 100644 index 00000000000..8f451dc7ad4 --- /dev/null +++ b/ACE/debian/libace-inet-6.5.2.lintian-overrides @@ -0,0 +1,2 @@ +libace-inet-6.5.2: extended-description-is-probably-too-short +libace-inet-6.5.2: no-symbols-control-file usr/lib/libACE_INet-6.5.2.so diff --git a/ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides deleted file mode 100644 index dcf77c5c4a0..00000000000 --- a/ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -libace-inet-ssl-6.4.5: no-symbols-control-file usr/lib/libACE_INet_SSL-6.4.5.so - -# It's Bison-generate code covered by the GNU Bison GPL-exception -libace-inet-ssl-6.4.5: possible-gpl-code-linked-with-openssl diff --git a/ACE/debian/libace-inet-ssl-6.4.6.install b/ACE/debian/libace-inet-ssl-6.5.2.install index b9b8b9045f7..b9b8b9045f7 100644 --- a/ACE/debian/libace-inet-ssl-6.4.6.install +++ b/ACE/debian/libace-inet-ssl-6.5.2.install diff --git a/ACE/debian/libace-inet-ssl-6.5.2.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.2.lintian-overrides new file mode 100644 index 00000000000..bcb3079d1db --- /dev/null +++ b/ACE/debian/libace-inet-ssl-6.5.2.lintian-overrides @@ -0,0 +1,4 @@ +libace-inet-ssl-6.5.2: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.2.so + +# It's Bison-generate code covered by the GNU Bison GPL-exception +libace-inet-ssl-6.5.2: possible-gpl-code-linked-with-openssl diff --git a/ACE/debian/libace-qtreactor-6.4.6.install b/ACE/debian/libace-qtreactor-6.4.6.install deleted file mode 100644 index 1d371e1e571..00000000000 --- a/ACE/debian/libace-qtreactor-6.4.6.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_QtReactor-*.so diff --git a/ACE/debian/libace-qtreactor-6.4.6.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.6.lintian-overrides deleted file mode 100644 index 31bc9dc3867..00000000000 --- a/ACE/debian/libace-qtreactor-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-qtreactor-6.4.5: no-symbols-control-file usr/lib/libACE_QtReactor-6.4.5.so diff --git a/ACE/debian/libace-qtreactor-dev.install b/ACE/debian/libace-qtreactor-dev.install deleted file mode 100644 index c5fd689c59a..00000000000 --- a/ACE/debian/libace-qtreactor-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_QtReactor.so -usr/include/ace/QtReactor -usr/lib/pkgconfig/ACE_QtReactor.pc diff --git a/ACE/debian/libace-qtreactor-dev.lintian-overrides b/ACE/debian/libace-qtreactor-dev.lintian-overrides deleted file mode 100644 index 2bf18f7681a..00000000000 --- a/ACE/debian/libace-qtreactor-dev.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-qtreactor-dev: extended-description-is-probably-too-short diff --git a/ACE/debian/libace-rmcast-6.4.6.lintian-overrides b/ACE/debian/libace-rmcast-6.4.6.lintian-overrides deleted file mode 100644 index 89d1e6523ce..00000000000 --- a/ACE/debian/libace-rmcast-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-rmcast-6.4.5: no-symbols-control-file usr/lib/libACE_RMCast-6.4.5.so diff --git a/ACE/debian/libace-rmcast-6.4.6.install b/ACE/debian/libace-rmcast-6.5.2.install index 86e78259853..86e78259853 100644 --- a/ACE/debian/libace-rmcast-6.4.6.install +++ b/ACE/debian/libace-rmcast-6.5.2.install diff --git a/ACE/debian/libace-rmcast-6.5.2.lintian-overrides b/ACE/debian/libace-rmcast-6.5.2.lintian-overrides new file mode 100644 index 00000000000..cf94e80df3d --- /dev/null +++ b/ACE/debian/libace-rmcast-6.5.2.lintian-overrides @@ -0,0 +1 @@ +libace-rmcast-6.5.2: no-symbols-control-file usr/lib/libACE_RMCast-6.5.2.so diff --git a/ACE/debian/libace-ssl-6.4.6.lintian-overrides b/ACE/debian/libace-ssl-6.4.6.lintian-overrides deleted file mode 100644 index 2b0bc5f692a..00000000000 --- a/ACE/debian/libace-ssl-6.4.6.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -libace-ssl-6.4.5: extended-description-is-probably-too-short -libace-ssl-6.4.5: no-symbols-control-file usr/lib/libACE_SSL-6.4.5.so - -# It's Bison-generate code covered by the GNU Bison GPL-exception -libace-ssl-6.4.5: possible-gpl-code-linked-with-openssl diff --git a/ACE/debian/libace-ssl-6.4.6.NEWS b/ACE/debian/libace-ssl-6.5.2.NEWS index e5bd0e4aa10..e5bd0e4aa10 100644 --- a/ACE/debian/libace-ssl-6.4.6.NEWS +++ b/ACE/debian/libace-ssl-6.5.2.NEWS diff --git a/ACE/debian/libace-ssl-6.4.6.install b/ACE/debian/libace-ssl-6.5.2.install index 8df45a6d55f..8df45a6d55f 100644 --- a/ACE/debian/libace-ssl-6.4.6.install +++ b/ACE/debian/libace-ssl-6.5.2.install diff --git a/ACE/debian/libace-ssl-6.5.2.lintian-overrides b/ACE/debian/libace-ssl-6.5.2.lintian-overrides new file mode 100644 index 00000000000..9b9d32fdba8 --- /dev/null +++ b/ACE/debian/libace-ssl-6.5.2.lintian-overrides @@ -0,0 +1,5 @@ +libace-ssl-6.5.2: extended-description-is-probably-too-short +libace-ssl-6.5.2: no-symbols-control-file usr/lib/libACE_SSL-6.5.2.so + +# It's Bison-generate code covered by the GNU Bison GPL-exception +libace-ssl-6.5.2: possible-gpl-code-linked-with-openssl diff --git a/ACE/debian/libace-tkreactor-6.4.6.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.6.lintian-overrides deleted file mode 100644 index 836f6d37a9f..00000000000 --- a/ACE/debian/libace-tkreactor-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-tkreactor-6.4.5: no-symbols-control-file usr/lib/libACE_TkReactor-6.4.5.so diff --git a/ACE/debian/libace-tkreactor-6.4.6.install b/ACE/debian/libace-tkreactor-6.5.2.install index 12ab35062d2..12ab35062d2 100644 --- a/ACE/debian/libace-tkreactor-6.4.6.install +++ b/ACE/debian/libace-tkreactor-6.5.2.install diff --git a/ACE/debian/libace-tkreactor-6.5.2.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.2.lintian-overrides new file mode 100644 index 00000000000..57332e40e76 --- /dev/null +++ b/ACE/debian/libace-tkreactor-6.5.2.lintian-overrides @@ -0,0 +1 @@ +libace-tkreactor-6.5.2: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.2.so diff --git a/ACE/debian/libace-tmcast-6.4.6.lintian-overrides b/ACE/debian/libace-tmcast-6.4.6.lintian-overrides deleted file mode 100644 index fbb009770a6..00000000000 --- a/ACE/debian/libace-tmcast-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-tmcast-6.4.5: no-symbols-control-file usr/lib/libACE_TMCast-6.4.5.so diff --git a/ACE/debian/libace-tmcast-6.4.6.install b/ACE/debian/libace-tmcast-6.5.2.install index e066131dea0..e066131dea0 100644 --- a/ACE/debian/libace-tmcast-6.4.6.install +++ b/ACE/debian/libace-tmcast-6.5.2.install diff --git a/ACE/debian/libace-tmcast-6.5.2.lintian-overrides b/ACE/debian/libace-tmcast-6.5.2.lintian-overrides new file mode 100644 index 00000000000..9ee76d5186e --- /dev/null +++ b/ACE/debian/libace-tmcast-6.5.2.lintian-overrides @@ -0,0 +1 @@ +libace-tmcast-6.5.2: no-symbols-control-file usr/lib/libACE_TMCast-6.5.2.so diff --git a/ACE/debian/libace-xml-utils-6.4.6.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.6.lintian-overrides deleted file mode 100644 index dfe499a9dbb..00000000000 --- a/ACE/debian/libace-xml-utils-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-xml-utils-6.4.5: no-symbols-control-file usr/lib/libACE_XML_Utils-6.4.5.so diff --git a/ACE/debian/libace-xml-utils-6.4.6.install b/ACE/debian/libace-xml-utils-6.5.2.install index 2428ec9f109..2428ec9f109 100644 --- a/ACE/debian/libace-xml-utils-6.4.6.install +++ b/ACE/debian/libace-xml-utils-6.5.2.install diff --git a/ACE/debian/libace-xml-utils-6.5.2.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.2.lintian-overrides new file mode 100644 index 00000000000..42c31526464 --- /dev/null +++ b/ACE/debian/libace-xml-utils-6.5.2.lintian-overrides @@ -0,0 +1 @@ +libace-xml-utils-6.5.2: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.2.so diff --git a/ACE/debian/libace-xtreactor-6.4.6.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.6.lintian-overrides deleted file mode 100644 index 683006fa589..00000000000 --- a/ACE/debian/libace-xtreactor-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-xtreactor-6.4.5: no-symbols-control-file usr/lib/libACE_XtReactor-6.4.5.so diff --git a/ACE/debian/libace-xtreactor-6.4.6.install b/ACE/debian/libace-xtreactor-6.5.2.install index c53614c7208..c53614c7208 100644 --- a/ACE/debian/libace-xtreactor-6.4.6.install +++ b/ACE/debian/libace-xtreactor-6.5.2.install diff --git a/ACE/debian/libace-xtreactor-6.5.2.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.2.lintian-overrides new file mode 100644 index 00000000000..ee0bc214bdd --- /dev/null +++ b/ACE/debian/libace-xtreactor-6.5.2.lintian-overrides @@ -0,0 +1 @@ +libace-xtreactor-6.5.2: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.2.so diff --git a/ACE/debian/libacexml-6.4.6.lintian-overrides b/ACE/debian/libacexml-6.4.6.lintian-overrides deleted file mode 100644 index 62753f80cfe..00000000000 --- a/ACE/debian/libacexml-6.4.6.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML_Parser-6.4.5.so -libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.4.5.so -libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML-6.4.5.so diff --git a/ACE/debian/libacexml-6.4.6.docs b/ACE/debian/libacexml-6.5.2.docs index 002855d7915..002855d7915 100644 --- a/ACE/debian/libacexml-6.4.6.docs +++ b/ACE/debian/libacexml-6.5.2.docs diff --git a/ACE/debian/libacexml-6.4.6.install b/ACE/debian/libacexml-6.5.2.install index d3e912ffa51..d3e912ffa51 100644 --- a/ACE/debian/libacexml-6.4.6.install +++ b/ACE/debian/libacexml-6.5.2.install diff --git a/ACE/debian/libacexml-6.5.2.lintian-overrides b/ACE/debian/libacexml-6.5.2.lintian-overrides new file mode 100644 index 00000000000..b4d34a87a85 --- /dev/null +++ b/ACE/debian/libacexml-6.5.2.lintian-overrides @@ -0,0 +1,3 @@ +libacexml-6.5.2: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.2.so +libacexml-6.5.2: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.2.so +libacexml-6.5.2: no-symbols-control-file usr/lib/libACEXML-6.5.2.so diff --git a/ACE/debian/libkokyu-6.4.6.lintian-overrides b/ACE/debian/libkokyu-6.4.6.lintian-overrides deleted file mode 100644 index 73e11dec443..00000000000 --- a/ACE/debian/libkokyu-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libkokyu-6.4.5: no-symbols-control-file usr/lib/libKokyu-6.4.5.so diff --git a/ACE/debian/libkokyu-6.4.6.docs b/ACE/debian/libkokyu-6.5.2.docs index e8869c513b2..e8869c513b2 100644 --- a/ACE/debian/libkokyu-6.4.6.docs +++ b/ACE/debian/libkokyu-6.5.2.docs diff --git a/ACE/debian/libkokyu-6.4.6.install b/ACE/debian/libkokyu-6.5.2.install index 62854308f96..62854308f96 100644 --- a/ACE/debian/libkokyu-6.4.6.install +++ b/ACE/debian/libkokyu-6.5.2.install diff --git a/ACE/debian/libkokyu-6.5.2.lintian-overrides b/ACE/debian/libkokyu-6.5.2.lintian-overrides new file mode 100644 index 00000000000..e759bbcfd7e --- /dev/null +++ b/ACE/debian/libkokyu-6.5.2.lintian-overrides @@ -0,0 +1 @@ +libkokyu-6.5.2: no-symbols-control-file usr/lib/libKokyu-6.5.2.so diff --git a/ACE/debian/libnetsvcs-6.4.6.lintian-overrides b/ACE/debian/libnetsvcs-6.4.6.lintian-overrides deleted file mode 100644 index 6ae68da92a4..00000000000 --- a/ACE/debian/libnetsvcs-6.4.6.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libnetsvcs-6.4.5: no-symbols-control-file usr/lib/libnetsvcs-6.4.5.so diff --git a/ACE/debian/libnetsvcs-6.4.6.docs b/ACE/debian/libnetsvcs-6.5.2.docs index 0b03c55b91f..0b03c55b91f 100644 --- a/ACE/debian/libnetsvcs-6.4.6.docs +++ b/ACE/debian/libnetsvcs-6.5.2.docs diff --git a/ACE/debian/libnetsvcs-6.4.6.install b/ACE/debian/libnetsvcs-6.5.2.install index c7a04b16213..c7a04b16213 100644 --- a/ACE/debian/libnetsvcs-6.4.6.install +++ b/ACE/debian/libnetsvcs-6.5.2.install diff --git a/ACE/debian/libnetsvcs-6.5.2.lintian-overrides b/ACE/debian/libnetsvcs-6.5.2.lintian-overrides new file mode 100644 index 00000000000..aa26fd7ba22 --- /dev/null +++ b/ACE/debian/libnetsvcs-6.5.2.lintian-overrides @@ -0,0 +1 @@ +libnetsvcs-6.5.2: no-symbols-control-file usr/lib/libnetsvcs-6.5.2.so diff --git a/ACE/debian/platform_macros.GNU b/ACE/debian/platform_macros.GNU index ae54f3863b9..d56d56523ce 100644 --- a/ACE/debian/platform_macros.GNU +++ b/ACE/debian/platform_macros.GNU @@ -8,8 +8,6 @@ xt = 1 tk = 1 fl = 1 fox = 1 -qt4 = 0 -ace_qt4reactor = 0 xerces3 = 1 versioned_so = 2 diff --git a/ACE/debian/debian.rules b/ACE/debian/rules index 9078a188dab..2bc9510ec4f 100644..100755 --- a/ACE/debian/debian.rules +++ b/ACE/debian/rules @@ -36,6 +36,10 @@ export ACE_ROOT := $(shell pwd) export MPC_ROOT := $(ACE_ROOT)/MPC export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib +ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) +ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) +ACE_MICRO_VERSION := $(shell awk '/ACE_MICRO_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) + %: dh $@ @@ -79,9 +83,6 @@ override_dh_auto_clean: rm -f $(ACE_ROOT)/ACE-DPKG.mwc rm -f debian/*.1 debian/mpc-ace.sgml rm -f *-stamp -# Remove stubs that get generated during TAO compilation but for some reason -# are not removed on make realclean - rm -f `cat debian/TOREMOVE` rm -Rf $(ACE_ROOT)/html/libace-doc \ $(ACE_ROOT)/html/libacexml-doc \ $(ACE_ROOT)/doxygen_sqlite3.db @@ -98,7 +99,8 @@ override_dh_installchangelogs: dh_installchangelogs -pace-gperf -pgperf-ace apps/gperf/ChangeLog dh_installchangelogs -pmpc-ace MPC/ChangeLog dh_installchangelogs $(addprefix -p,$(ALL_ACEXML)) ACEXML/ChangeLog - dh_installchangelogs --remaining-packages ChangeLogs/ACE-6_4_5 + dh_installchangelogs --remaining-packages \ + ChangeLogs/ACE-$(ACE_MAJOR_VERSION)_$(ACE_MINOR_VERSION)_$(ACE_MICRO_VERSION) override_dh_fixperms: ifneq (,$(filter libace-doc, $(shell dh_listpackages))) diff --git a/ACE/debian/source/format b/ACE/debian/source/format new file mode 100644 index 00000000000..163aaf8d82b --- /dev/null +++ b/ACE/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/ACE/debian/source/lintian-overrides b/ACE/debian/source/lintian-overrides new file mode 100644 index 00000000000..721df3d38a3 --- /dev/null +++ b/ACE/debian/source/lintian-overrides @@ -0,0 +1,3 @@ +# We are using a compat level marked as experimental +# (compat=9 in debhelper >= 8.1.3) +ace source: package-needs-versioned-debhelper-build-depends 9 diff --git a/ACE/docs/ACE-bug-process.html b/ACE/docs/ACE-bug-process.html index af5c8740c01..85ee8abbf29 100644 --- a/ACE/docs/ACE-bug-process.html +++ b/ACE/docs/ACE-bug-process.html @@ -162,7 +162,7 @@ with our software here's the process for submitting it: will end up in the ATCD ChangeLog. When you have tested your changes at least on Windows and Linux prepare a <a href="https://help.github.com/articles/using-pull-requests/">pull request</a>.<P> -<LI> Create a ``unified diff'' of all changs and put this into Bugzilla at <P> +<LI> Create a ``unified diff'' of all changes and put this into Bugzilla at <P> <A HREF="http://bugzilla.dre.vanderbilt.edu/">http://bugzilla.dre.vanderbilt.edu/</A> <P> diff --git a/ACE/docs/ACE-subsets.html b/ACE/docs/ACE-subsets.html index d63ff54428f..94cb06f2028 100644 --- a/ACE/docs/ACE-subsets.html +++ b/ACE/docs/ACE-subsets.html @@ -47,18 +47,16 @@ into the application.</p> <p> In fact, this technique was applied systematically to ACE_OS in 2003, -and resulted in a <a -href="http://www.dre.vanderbilt.edu/Stats/footprint.shtml">10-15% -decrease in overall footprint</a> for statically linked applications. -Interestingly, these techniques also helped reduce <a -href="http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/CP_Metrics/metrics/">compilation -times by ~50%</a>.</p> +and resulted in a 10-15% +decrease in overall footprint for statically linked applications. +Interestingly, these techniques also helped reduce compilation +times by ~50%.</p> <p> Another very powerful technique for reducing the size of shared libries is <a href="../apps/soreduce/README">The Shared Library Reduction (<CODE>soreduce</CODE>) tool</a>. <code>soreduce</code> -also benifits from the techniques listed above and should give +also benefits from the techniques listed above and should give results comparable to static linking. In fact, when deploying multiple applications, use of shared libraries with <code>soreduce</code> will result in smaller overall footprint than static linking.</p> diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index b54e77bba54..04232e54fc0 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -83,7 +83,7 @@ case. You may want to understand the DOC group's <A HREF="http://htmlpreview.github.com/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/docs/ACE-bug-process.html"> bug fixing policies</A> when you make this decision. </P>The full packages do contain all sources with pre generated makefiles for GNU -make, Visual C++ 12.0/14.0/2017. The +make, Visual Studio 2015/017. The sources-only packages just contain the source code, you have to generate your own makefiles with MPC. </P> <P> @@ -92,160 +92,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 6.4.5 and TAO 2.4.5 -(ACE+TAO x.4.5), please use the links below to download it.<P> +<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 6.5.2 and TAO 2.5.2 +(ACE+TAO x.5.2), 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="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.5.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.5.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.2.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.2.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.5.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.5.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.2.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.2.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.5.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.5.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.2.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.2.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.5.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.5.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.2.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.2.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.5.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.5.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.2.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.2.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.5.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.5.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.2.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.2.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="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.5.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.5.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.2.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.2.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="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.5.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.5.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.2.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.2.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE-html.zip</TD> <TD>Doxygen documentation for ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.5.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.5.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.2.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.2.zip">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.5.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.5.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.2.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.2.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.5.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.5.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.2.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.2.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.5.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.5.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.2.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.2.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.5.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.5.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.2.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.2.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.5.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.5.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.2.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.2.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.5.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.5.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.2.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.2.zip">FTP</A>] </TD> </TR> </TABLE> -<LI> <B>Latest ACE+TAO Minor Release.</B> The latest minor release is ACE 6.4.0 and TAO 2.4.0 -(ACE+TAO x.4.0), please use the links below to download it.<P> +<LI> <B>Latest ACE+TAO Minor Release.</B> The latest minor release is ACE 6.5.0 and TAO 2.5.0 +(ACE+TAO x.5.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-6.4.0.tar.gz</TD> + <TR><TD>ACE+TAO-6.5.0.tar.gz</TD> <TD>ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.gz">FTP</A>] </TD> </TR> - <TR><TD>ACE+TAO-6.4.0.tar.bz2</TD> + <TR><TD>ACE+TAO-6.5.0.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.bz2">FTP</A>] </TD> </TR> - <TR><TD>ACE+TAO-6.4.0.zip</TD> + <TR><TD>ACE+TAO-6.5.0.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.zip">FTP</A>] </TD> </TR> - <TR><TD>ACE-html-6.4.0.tar.gz</TD> + <TR><TD>ACE-html-6.5.0.tar.gz</TD> <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.gz">FTP</A>] </TD> </TR> - <TR><TD>ACE-html-6.4.0.tar.bz2</TD> + <TR><TD>ACE-html-6.5.0.tar.bz2</TD> <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.bz2">FTP</A>] </TD> </TR> - <TR><TD>ACE-html-6.4.0.zip</TD> + <TR><TD>ACE-html-6.5.0.zip</TD> <TD>Doxygen documentation for ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.zip">FTP</A>] </TD> </TR> - <TR><TD>ACE-6.4.0.tar.gz</TD> + <TR><TD>ACE-6.5.0.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.0.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.0.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.gz">FTP</A>] </TD> </TR> - <TR><TD>ACE-6.4.0.tar.bz2</TD> + <TR><TD>ACE-6.5.0.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.0.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.0.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.bz2">FTP</A>] </TD> </TR> - <TR><TD>ACE-6.4.0.zip</TD> + <TR><TD>ACE-6.5.0.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.0.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.0.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.zip">FTP</A>] </TD> </TR> </TABLE> @@ -259,20 +259,20 @@ of the CIAO micro release is available for <TR><TH>Filename</TH><TH>Description</TH><TH>Sources only</TH></TR> <TR><TD>CIAO.tar.gz</TD> <TD>CIAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_5-src.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_5-src.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_6-src.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_6-src.tar.gz">FTP</A>] </TD> </TR> <TR><TD>CIAO.tar.bz2</TD> <TD>CIAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_5-src.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_5-src.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_6-src.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_6-src.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>CIAO.zip</TD> <TD>CIAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_5-src.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_5-src.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_6-src.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/CIAO-1_3_6-src.zip">FTP</A>] </TD> </TR> </TABLE> @@ -286,20 +286,20 @@ of the DAnCE micro release is available for <TR><TH>Filename</TH><TH>Description</TH><TH>Sources only</TH></TR> <TR><TD>DAnCE.tar.gz</TD> <TD>DAnCE (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_5-src.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_5-src.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_6-src.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_6-src.tar.gz">FTP</A>] </TD> </TR> <TR><TD>DAnCE.tar.bz2</TD> <TD>DAnCE (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_5-src.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_5-src.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_6-src.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_6-src.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>DAnCE.zip</TD> <TD>DAnCE (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_5-src.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_5-src.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_6-src.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/DAnCE-1_3_6-src.zip">FTP</A>] </TD> </TR> </TABLE> @@ -329,18 +329,16 @@ of the DAnCE micro release is available for <A HREF="http://software.opensuse.org/search">Open Build Service</A>. <UL> <LI>Latest micro release - <A HREF="http://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro/">http://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro/</A> + <A HREF="https://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro/">https://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro/</A> <LI>Latest micro release with versioned namespaces - <A HREF="http://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro:/versioned/">http://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro:/versioned/</A> + <A HREF="https://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro:/versioned/">https://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro:/versioned/</A> <LI>Latest minor release - <A HREF="http://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor/">http://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor/</A> + <A HREF="https://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor/">https://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor/</A> <LI>Latest minor release with versioned namespaces - <A HREF="http://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor:/versioned/">http://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor:/versioned/</A> + <A HREF="https://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor:/versioned/">https://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor:/versioned/</A> <LI>Latest major release - <A HREF="http://download.opensuse.org/repositories/devel:/libraries:/ACE:/major/">http://download.opensuse.org/repositories/devel:/libraries:/ACE:/major/</A> + <A HREF="https://download.opensuse.org/repositories/devel:/libraries:/ACE:/major/">https://download.opensuse.org/repositories/devel:/libraries:/ACE:/major/</A> </UL> - <LI> Ken Sedgwick's <A HREF="http://dist.bonsai.com/ken/ace_tao_rpm/">Fedora - RPMs</A> for ACE and TAO. </UL><P> </BODY> </HTML> diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index b67f3093de2..c1541b074a6 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -102,17 +102,17 @@ Make sure your release system has all the needed tools. This can be achieved on Fedora using: <ul> - <li><code>yum install perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool GitPython</code></li> + <li><code>yum install perl screen automake doxygen bzip2 tar gzip openssh graphviz zip libtool GitPython</code></li> <li><code>yum update</code></li> </ul> or on OpenSuSE <ul> - <li><code>zypper install perl screen python-pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool python-gitpython</code></li> + <li><code>zypper install perl screen automake doxygen bzip2 tar gzip openssh graphviz zip libtool python-gitpython</code></li> <li><code>zypper update</code></li> </ul> If you want to perform a full build with qt support, than run: <ul> - <li><code>yum install deltarpm ntp rubygem-rmagick bison xerces-c-devel psmisc yum-utils gdb unzip glibc-devel libasan bison redhat-lsb perl-Pod-Usage rubygems clang make patch libcgroup-devel ant setuptool system-config-network-tui system-config-firewall-tui lcov gnuplot java-1.8.0-openjdk git-svn perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git telnet GitPython NetworkManager wget mailx</code></li> + <li><code>yum install deltarpm ntp rubygem-rmagick bison xerces-c-devel psmisc yum-utils gdb unzip glibc-devel libasan bison redhat-lsb perl-Pod-Usage rubygems clang make patch libcgroup-devel ant setuptool system-config-network-tui system-config-firewall-tui lcov gnuplot java-1.8.0-openjdk perl screen automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git telnet GitPython NetworkManager wget mailx</code></li> </ul> For some optional i686 packages run <ul> @@ -185,9 +185,6 @@ TAO/tao/Version.h</li> ace/Version.h</li> </code> </ul> - In most cases, a<br> - <code>svn revert -R *</code><br> - from DOC_ROOT will suffice.<br /> The tag will also need to be removed (both in Middleware and MPC): ACE+TAO-X_Y_Z (where X is the ACE Major version number, and Y & Z are the Minor and Micro release numbers of the release that is to be restarted).<p> @@ -298,7 +295,7 @@ rm -rf doxygen<br> mkdir doxygen<br> cd doxygen<br> - git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_4_5 ACE_TAO<br> + git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_5_2 ACE_TAO<br> cd ACE_TAO<br> export ACE_ROOT=$PWD/ACE<br> export TAO_ROOT=$PWD/TAO<br> @@ -422,16 +419,13 @@ <li> Update the ACE/NEWS and TAO/NEWS files to have a new section for the next release.</li> <li> - Update OpenSuSE Build service using + Update openSUSE Build service using<br> <code> - osc checkout devel:libraries:ACE - osc add <new release> - cp rpmbuild/ace-tao.spec . - cp debian/control debian.control - cp debian/dsc ace.dsc - cp debian/changelog debian.changelog - cp debian/rules debian.rules - osc commit + osc checkout devel:libraries:ACE:micro ACE<br> + cd "devel:libraries:ACE:micro/ACE"<br> + osc rm ACE+TAO-src-*.tar.gz<br> + cp $DOC_ROOT/package-<PID>/ACE+TAO-src-*.tar.gz .<br> + osc commit<br> </code> </li> <li> @@ -456,8 +450,8 @@ Tips to being a Build Czar</h2> <p><ol> <li>Trust no one.</li> - <li>Be careful with <a href="http://www.cs.wustl.edu/~schmidt">this guy</a>, he - is notorious in breaking builds (and fixing them as well...Rumour has it that + <li>Be careful with <a href="http://www.dre.vanderbilt.edu/~schmidt/">this guy</a>, he + is notorious in breaking builds (and fixing them as well...rumour has it that it's actually a super-scalar, super-pipelined processor capable of out-of-order execution, in human incarnation).</li> <li>Don't forgive people who break ACE :-)</li> @@ -467,20 +461,12 @@ <li>Think of the group who wrote the scoreboard update script, every time you catch an otherwise not so obvious error with the help of the scoreboard. Tell <a href="mailto:devo-group@list.isis.vanderbilt.edu"> DEVO group</a> about it.</li> - <li>Send a note to <a href="mailto:sysadmin@isis.vanderbilt.edu">sysadmin@isis.vanderbilt.edu</a> asking for the repo to be frozen. Provide them a list of names, including yourself and bczar to be granted write permission. - </li> - <li>Compile once on Win32, Linux and Solaris before cutting a micro.</li> + <li>Compile once on Win32 and Linux before cutting a micro.</li> <li>Trust the release script when making a release. Don't make tar balls by hand.</li> <li>When all hell breaks loose, don't wait for the nightly builds to monitor improvement. Instead manually start the builds.</li> - <li>Maintain private up-to-date workspaces for problem platforms (read as - Solaris).</li> <li>Don't hesitate to ask for help.</li> - <li>When you get an account to access the svn repo, make sure you are added to - the correct groups, for example, - gid=100(users),5000(doc),5002(acetaodev),5003(cvs). Otherwise you will have - problem to checkout various modules.</li> <li>Install your public key to the different machines you have frequent access to avoid typing password.</li> <li>Update this page if you have any more tips for future build czars :-). This diff --git a/ACE/docs/index.html b/ACE/docs/index.html index fde8d24d2ec..fac33571284 100644 --- a/ACE/docs/index.html +++ b/ACE/docs/index.html @@ -19,12 +19,12 @@ ask. <P> <h3>ACE Documentation</h3> <ul> - <li><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">Overview of ACE</a> - + <li><a href="http://www.dre.vanderbilt.edu/~schmidt/ACE-overview.html">Overview of ACE</a> - a high-level view. <li><A - HREF="http://www.cs.wustl.edu/~schmidt/ACE-documentation.html">ACE online documentation</a>. + HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE-documentation.html">ACE online documentation</a>. <li><A - <LI><A HREF="http://www.cs.wustl.edu/~schmidt/ACE/">Books on ACE</A>. + <LI><A HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE/">Books on ACE</A>. </ul> <hr> @@ -43,7 +43,7 @@ ask. <P> <h3>Technical Papers and Tutorials</h3> <ul> - <li><a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html">Technical Papers</a> - + <li><a href="http://www.dre.vanderbilt.edu/ACE-papers.html">Technical Papers</a> - Postscript versions of many ACE papers. <li>Tutorial on C++ Network Programming with Patterns, Frameworks, and ACE<a href="http://www.cs.wustl.edu/~schmidt/PDF/ACE-tutorial.pdf">[pdf]</a> <a href="http://www.cs.wustl.edu/~schmidt/ACE-tutorial.ps.gz">[ps.gz]</a> diff --git a/ACE/docs/msvc_notes.txt b/ACE/docs/msvc_notes.txt index 6594fa079fc..65a48f01292 100644 --- a/ACE/docs/msvc_notes.txt +++ b/ACE/docs/msvc_notes.txt @@ -14,7 +14,7 @@ main two are Debug and Release. Debug produces libraries and executables with debugging symbols and doesn't enable inlining. The Release configuration enables optimizations and leaves out debugging symbols. All projects contain both configurations. If you want to -build static or mfc versions of th elibrary you need to use different +build static or mfc versions of the library you need to use different project and solution files. Project files with _Static extension denote workspaces for building static libraries. @@ -131,4 +131,4 @@ required. One thing you might notice is that TAO_IDL will display a message if ACE_ROOT isn't set, but it is only a problem if the IDL file includes <orb.idl> and you don't use -I to specify where orb.idl is. -*/
\ No newline at end of file +*/ diff --git a/ACE/etc/ace.doxygen b/ACE/etc/ace.doxygen index 97b356c4045..0a460e15941 100644 --- a/ACE/etc/ace.doxygen +++ b/ACE/etc/ace.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -793,7 +794,7 @@ INPUT = docs \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -1004,7 +1005,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1149,7 +1150,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1185,6 +1186,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1208,12 +1220,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1329,7 +1341,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1337,8 +1349,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1346,23 +1357,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1455,7 +1464,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1467,7 +1476,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1494,8 +1503,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1556,7 +1565,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1569,7 +1578,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1756,7 +1765,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1939,9 +1948,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/ACE/etc/ace_inet.doxygen b/ACE/etc/ace_inet.doxygen index e24ead597b6..5edfaac5d0d 100644 --- a/ACE/etc/ace_inet.doxygen +++ b/ACE/etc/ace_inet.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = protocols/ace/INet # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/ACE/etc/ace_qos.doxygen b/ACE/etc/ace_qos.doxygen index 5e2a3117944..3c5be42bd7b 100644 --- a/ACE/etc/ace_qos.doxygen +++ b/ACE/etc/ace_qos.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = ace/QoS # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1139,7 +1140,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1175,6 +1176,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1198,12 +1210,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1319,7 +1331,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1327,8 +1339,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1336,23 +1347,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1445,7 +1454,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1457,7 +1466,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1484,8 +1493,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1546,7 +1555,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1559,7 +1568,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1746,7 +1755,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1929,9 +1938,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/ACE/etc/ace_rmcast.doxygen b/ACE/etc/ace_rmcast.doxygen index 465bdf15af3..3bcc6183894 100644 --- a/ACE/etc/ace_rmcast.doxygen +++ b/ACE/etc/ace_rmcast.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = protocols/ace/RMCast # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/ACE/etc/ace_ssl.doxygen b/ACE/etc/ace_ssl.doxygen index 0d8b5ea88f6..3b39c30c21b 100644 --- a/ACE/etc/ace_ssl.doxygen +++ b/ACE/etc/ace_ssl.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = ace/SSL # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/ACE/etc/acexml.doxygen b/ACE/etc/acexml.doxygen index e160cf550df..1ad03159246 100644 --- a/ACE/etc/acexml.doxygen +++ b/ACE/etc/acexml.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = ACEXML # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -994,7 +995,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1139,7 +1140,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1175,6 +1176,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1198,12 +1210,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1319,7 +1331,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1327,8 +1339,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1336,23 +1347,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1445,7 +1454,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1457,7 +1466,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1484,8 +1493,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1546,7 +1555,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1559,7 +1568,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1746,7 +1755,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1929,9 +1938,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/ACE/etc/index.html b/ACE/etc/index.html index 6c6cf344dd1..ca2b70783da 100644 --- a/ACE/etc/index.html +++ b/ACE/etc/index.html @@ -30,6 +30,12 @@ <hr> We do have the documentation for previous releases <ul> + <LI><P><A HREF="6.5.2/html">6.5.2</A></P></LI> + <LI><P><A HREF="6.5.1/html">6.5.1</A></P></LI> + <LI><P><A HREF="6.5.0/html">6.5.0</A></P></LI> + <LI><P><A HREF="6.4.8/html">6.4.8</A></P></LI> + <LI><P><A HREF="6.4.7/html">6.4.7</A></P></LI> + <LI><P><A HREF="6.4.6/html">6.4.6</A></P></LI> <LI><P><A HREF="6.4.5/html">6.4.5</A></P></LI> <LI><P><A HREF="6.4.4/html">6.4.4</A></P></LI> <LI><P><A HREF="6.4.3/html">6.4.3</A></P></LI> diff --git a/ACE/examples/Map_Manager/test_hash_map_manager.cpp b/ACE/examples/Map_Manager/test_hash_map_manager.cpp index 255e6d2fa20..4f60194758c 100644 --- a/ACE/examples/Map_Manager/test_hash_map_manager.cpp +++ b/ACE/examples/Map_Manager/test_hash_map_manager.cpp @@ -7,8 +7,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/os_include/os_assert.h" - - const int MAX_KEY_LEN = 1000; typedef ACE_Hash_Map_Manager<ACE_TString, ACE_TString, ACE_SYNCH_RW_MUTEX> MAP_MANAGER; @@ -75,4 +73,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp index fc4bf1c263c..a0e512a6fc5 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp @@ -21,8 +21,6 @@ #include "ace/WFMO_Reactor.h" - - class Event_Handler : public ACE_Event_Handler { public: @@ -55,6 +53,8 @@ private: ACE_Manual_Event event_; }; +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_WFMO_Reactor_Test { public: @@ -81,6 +81,8 @@ public: } }; +ACE_END_VERSIONED_NAMESPACE_DECL + int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp index f2093f0e3e7..72c4307d8a6 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp @@ -17,8 +17,6 @@ #include "ace/Reactor.h" #include "ace/WFMO_Reactor.h" - - class Event_Handler : public ACE_Event_Handler { public: @@ -31,6 +29,8 @@ public: ACE_Event event_; }; +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_WFMO_Reactor_Test { public: @@ -47,6 +47,8 @@ public: } }; +ACE_END_VERSIONED_NAMESPACE_DECL + int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -54,9 +56,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) ACE_WFMO_Reactor reactor; ACE_Reactor base_reactor (&reactor); - //FUZZ: disable check_for_lack_ACE_OS - ACE_Time_Value time (1); - //FUZZ: enable check_for_lack_ACE_OS + ACE_Time_Value sleep_time (1); int result = reactor.register_handler (&handler); @@ -74,7 +74,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) ACE_WFMO_Reactor_Test::check_for_valid_state (reactor, 1, 0, 0, 1); - result = base_reactor.run_reactor_event_loop (time); + result = base_reactor.run_reactor_event_loop (sleep_time); ACE_TEST_ASSERT (result != -1); ACE_WFMO_Reactor_Test::check_for_valid_state (reactor, @@ -87,7 +87,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) ACE_WFMO_Reactor_Test::check_for_valid_state (reactor, 1, 0, 0, 0); - result = base_reactor.run_reactor_event_loop (time); + result = base_reactor.run_reactor_event_loop (sleep_time); ACE_TEST_ASSERT (result != -1); ACE_WFMO_Reactor_Test::check_for_valid_state (reactor, @@ -109,7 +109,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) ACE_WFMO_Reactor_Test::check_for_valid_state (reactor, 0, 0, 0, 1); - result = base_reactor.run_reactor_event_loop (time); + result = base_reactor.run_reactor_event_loop (sleep_time); ACE_TEST_ASSERT (result != -1); ACE_WFMO_Reactor_Test::check_for_valid_state (reactor, @@ -129,7 +129,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) ACE_WFMO_Reactor_Test::check_for_valid_state (reactor, 1, 1, 0, 0); - result = base_reactor.run_reactor_event_loop (time); + result = base_reactor.run_reactor_event_loop (sleep_time); ACE_TEST_ASSERT (result != -1); ACE_WFMO_Reactor_Test::check_for_valid_state (reactor, @@ -151,7 +151,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) ACE_WFMO_Reactor_Test::check_for_valid_state (reactor, 0, 0, 0, 1); - result = base_reactor.run_reactor_event_loop (time); + result = base_reactor.run_reactor_event_loop (sleep_time); ACE_TEST_ASSERT (result != -1); ACE_WFMO_Reactor_Test::check_for_valid_state (reactor, diff --git a/ACE/include/makeinclude/platform_aix_g++.GNU b/ACE/include/makeinclude/platform_aix_g++.GNU index 141aa9272c7..a5f876e3bf5 100644 --- a/ACE/include/makeinclude/platform_aix_g++.GNU +++ b/ACE/include/makeinclude/platform_aix_g++.GNU @@ -83,6 +83,7 @@ endif LIBS += -lxti -ldl ARFLAGS += cruv RANLIB = ranlib +LD_RPATH = -Wl,-R, # Test for template instantiation, add to SOFLAGS if versioned_so set, # add -E to LDFLAGS if using GNU ld diff --git a/ACE/include/makeinclude/platform_freebsd.GNU b/ACE/include/makeinclude/platform_freebsd.GNU index 4edb4bc907d..402f7d9a8dc 100644 --- a/ACE/include/makeinclude/platform_freebsd.GNU +++ b/ACE/include/makeinclude/platform_freebsd.GNU @@ -13,7 +13,7 @@ optimize ?= 1 threads ?= 1 versioned_so ?= 1 -ifeq ($(OSMAJOR),10) +ifneq ($(filter 10 11,$(OSMAJOR)),) CC ?= clang CXX ?= clang++ CCFLAGS += -fdelayed-template-parsing diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index c465a3d6946..4a455c67996 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -55,27 +55,27 @@ endif ifeq ($(c++17),1) CCFLAGS += -std=c++17 # This is needed due to the use of the deprecated auto_ptr class - no_deprecated = 1 + no_deprecated ?= 1 else ifeq ($(c++14),1) CCFLAGS += -std=c++14 # This is needed due to the use of the deprecated auto_ptr class - no_deprecated = 1 + no_deprecated ?= 1 else ifeq ($(c++1y),1) CCFLAGS += -std=c++1y # This is needed due to the use of the deprecated auto_ptr class - no_deprecated = 1 + no_deprecated ?= 1 else ifeq ($(c++11),1) CCFLAGS += -std=c++11 # This is needed due to the use of the deprecated auto_ptr class - no_deprecated = 1 + no_deprecated ?= 1 else ifeq ($(c++0x),1) CCFLAGS += -std=c++0x # This is needed due to the use of the deprecated auto_ptr class - no_deprecated = 1 + no_deprecated ?= 1 endif # c++0x endif # c++11 endif # c++1y diff --git a/ACE/include/makeinclude/platform_gnuwin32_common.GNU b/ACE/include/makeinclude/platform_gnuwin32_common.GNU index c16d4d8d094..a217f03b579 100644 --- a/ACE/include/makeinclude/platform_gnuwin32_common.GNU +++ b/ACE/include/makeinclude/platform_gnuwin32_common.GNU @@ -10,10 +10,6 @@ ifneq ($(mingw32),1) endif endif -# Choose your target CPU (by default we set it to pentiumpro. In your -# platform_macros.GNU file you can override this to pentium, i486 or i386 -TCPU ?= pentiumpro - # Cygwin/MinGW doesn't allow to add the version number of ACE to the dll name # because ace.dll.6.0.1 isn't a valid dll name versioned_so = 0 @@ -52,6 +48,10 @@ ifeq ($(threads),1) FLAGS_C_CC += -mthreads endif # threads +ifneq ($(CROSS_COMPILE),) + COMPARCH ?= $(CROSS_COMPILE) +endif + CC = ${COMPARCH}gcc CXX = ${COMPARCH}g++ RC = ${COMPARCH}windres diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index c7358aa5bf0..303cc580393 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -31,19 +31,15 @@ endif ifeq ($(c++0x),1) CCFLAGS += -std=c++0x - deprecated_declarations ?= 0 + no_deprecated ?= 1 else ifeq ($(c++11),1) CCFLAGS += -std=c++11 - deprecated_declarations ?= 0 + no_deprecated ?= 1 endif endif -# If the user doesn't set a default we default show -# deprecated declarations -deprecated_declarations ?= 1 - -ifeq ($(deprecated_declarations),0) +ifeq ($(no_deprecated),1) CCFLAGS += -Wno-deprecated-declarations endif diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 4636074a7bc..f318adace60 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -19,12 +19,13 @@ MACOS_CODENAME_VER_10_10 := yosemite MACOS_CODENAME_VER_10_11 := elcapitan MACOS_CODENAME_VER_10_12 := sierra MACOS_CODENAME_VER_10_13 := highsierra -MACOS_CODENAME_VER_latest := highsierra +MACOS_CODENAME_VER_10_14 := mojave +MACOS_CODENAME_VER_latest := mojave MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) ifeq ($(MACOS_MAJOR_VERSION),10) - ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 13; echo $$?),0) + ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 14; echo $$?),0) ## if the detected version is greater than the latest know version, ## just use the latest known version MACOS_CODENAME = $(MACOS_CODENAME_VER_latest) diff --git a/ACE/include/makeinclude/platform_macosx_mojave.GNU b/ACE/include/makeinclude/platform_macosx_mojave.GNU new file mode 100644 index 00000000000..908d2971bfd --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_mojave.GNU @@ -0,0 +1,2 @@ +include $(ACE_ROOT)/include/makeinclude/platform_macosx_highsierra.GNU + diff --git a/ACE/include/makeinclude/platform_sunos5_g++.GNU b/ACE/include/makeinclude/platform_sunos5_g++.GNU index 26d5603a365..f5f0b990bb6 100644 --- a/ACE/include/makeinclude/platform_sunos5_g++.GNU +++ b/ACE/include/makeinclude/platform_sunos5_g++.GNU @@ -44,6 +44,7 @@ RANLIB = @true SOFLAGS += -shared $(CPPFLAGS) SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< PRELIB = @true +LD_RPATH = -Wl,-R, # Get common Solaris settings include $(ACE_ROOT)/include/makeinclude/platform_sunos5_common.GNU diff --git a/ACE/protocols/ace/TMCast/TransactionController.hpp b/ACE/protocols/ace/TMCast/TransactionController.hpp index 43ff7a9ee8c..3165f551931 100644 --- a/ACE/protocols/ace/TMCast/TransactionController.hpp +++ b/ACE/protocols/ace/TMCast/TransactionController.hpp @@ -342,7 +342,8 @@ namespace ACE_TMCast MessagePtr m (in_.front ()); in_.pop (); - if (typeid (*m) == typeid (Send)) + Message const &msg = *m; // avoid warning for side-effects in typeid + if (typeid (msg) == typeid (Send)) { send_ = SendPtr (m); } diff --git a/ACE/rpmbuild/ace-tao-macros.patch b/ACE/rpmbuild/ace-tao-macros.patch deleted file mode 100644 index ca494dfa5c4..00000000000 --- a/ACE/rpmbuild/ace-tao-macros.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- ACE_wrappers/include/makeinclude/wrapper_macros.GNU.ORIG 2008-11-18 16:12:14.000000000 -0800 -+++ ACE_wrappers/include/makeinclude/wrapper_macros.GNU 2008-11-23 10:16:32.000000000 -0800 -@@ -299,13 +299,13 @@ - - #### Set up the build ACE version in case the platform_macros.GNU wants it. - ifeq (cmd,$(findstring cmd,$(SHELL))) --ACE_MAJOR_VERSION := $(shell awk "/ACE_MAJOR_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) --ACE_MINOR_VERSION := $(shell awk "/ACE_MINOR_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) --ACE_BETA_VERSION := $(shell awk "/ACE_BETA_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) --else --ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) --ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) --ACE_BETA_VERSION := $(shell awk '/ACE_BETA_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) -+ACE_MAJOR_VERSION := $(shell awk "/ACE_MAJOR_VERSION/ { print $$3}" ${ACE_ROOT}/include/ace/Version.h) -+ACE_MINOR_VERSION := $(shell awk "/ACE_MINOR_VERSION/ { print $$3}" ${ACE_ROOT}/include/ace/Version.h) -+ACE_BETA_VERSION := $(shell awk "/ACE_BETA_VERSION/ { print $$3}" ${ACE_ROOT}/include/ace/Version.h) -+else -+ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3}' ${ACE_ROOT}/include/ace/Version.h) -+ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3}' ${ACE_ROOT}/include/ace/Version.h) -+ACE_BETA_VERSION := $(shell awk '/ACE_BETA_VERSION/ { print $$3}' ${ACE_ROOT}/include/ace/Version.h) - endif - - # Define some variables to silence warnings -@@ -381,9 +381,11 @@ - IDL_SERVER_TSRC_EXT ?= S_T.cpp - - ifeq (,$(findstring -I$(ACE_ROOT),$(INCLDIRS))) -- INCLDIRS += -I$(ACE_ROOT) -+ifneq ("$(ACE_ROOT)","/usr") -+ INCLDIRS += -I$(ACE_ROOT)/include - endif --INSINC ?= $(ACE_ROOT)/ace -+endif -+INSINC ?= $(ACE_ROOT)/include/ace - INSLIB ?= $(ACE_ROOT)/lib - INSMAN ?= $(ACE_ROOT)/man - ifeq (,$(findstring -L$(INSLIB),$(LDFLAGS))) ---- ACE_wrappers/TAO/rules.tao.GNU.ORIG 2008-11-23 10:13:02.000000000 -0800 -+++ ACE_wrappers/TAO/rules.tao.GNU 2008-11-22 20:43:49.000000000 -0800 -@@ -138,13 +138,13 @@ - # with different minor or major or beta versions to fail. - # - ifeq (cmd,$(findstring cmd,$(SHELL))) --TAO_MAJOR_VERSION := $(shell awk "/TAO_MAJOR_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h) --TAO_MINOR_VERSION := $(shell awk "/TAO_MINOR_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h) --TAO_BETA_VERSION := $(shell awk "/TAO_BETA_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h) -+TAO_MAJOR_VERSION := $(shell awk "/TAO_MAJOR_VERSION/ { print $$3}" ${TAO_ROOT}/include/tao/Version.h) -+TAO_MINOR_VERSION := $(shell awk "/TAO_MINOR_VERSION/ { print $$3}" ${TAO_ROOT}/include/tao/Version.h) -+TAO_BETA_VERSION := $(shell awk "/TAO_BETA_VERSION/ { print $$3}" ${TAO_ROOT}/include/tao/Version.h) - else --TAO_MAJOR_VERSION := $(shell awk '/TAO_MAJOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h) --TAO_MINOR_VERSION := $(shell awk '/TAO_MINOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h) --TAO_BETA_VERSION := $(shell awk '/TAO_BETA_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h) -+TAO_MAJOR_VERSION := $(shell awk '/TAO_MAJOR_VERSION/ { print $$3}' ${TAO_ROOT}/include/tao/Version.h) -+TAO_MINOR_VERSION := $(shell awk '/TAO_MINOR_VERSION/ { print $$3}' ${TAO_ROOT}/include/tao/Version.h) -+TAO_BETA_VERSION := $(shell awk '/TAO_BETA_VERSION/ { print $$3}' ${TAO_ROOT}/include/tao/Version.h) - endif - # Version number of the libraries - # diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index c354eb471fa..152fe30e408 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,6 +1,6 @@ # Set the version number here. -%define ACEVER 6.4.6 -%define TAOVER 2.4.6 +%define ACEVER 6.5.2 +%define TAOVER 2.5.2 # Conditional build # Default values are @@ -83,7 +83,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define _extension .gz -%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: redhat-rpm-config elfutils sendmail %endif @@ -112,7 +112,7 @@ BuildRequires: zlib-devel BuildRequires: bzip2 %endif -BuildRequires: perl +BuildRequires: perl perl(Data::Dumper) %if %{?_with_fltk:1}%{!?_with_fltk:0} BuildRequires: fltk-devel @@ -1947,12 +1947,10 @@ fi %{_libdir}/libACE_Compression.so.%{ACEVERSO} %{_libdir}/libACE_RLECompression.so.%{ACEVERSO} -%doc ACE-INSTALL.html %doc AUTHORS %doc COPYING %doc PROBLEM-REPORT-FORM %doc README -%doc THANKS %doc VERSION # ---------------- ace-devel ---------------- @@ -1990,6 +1988,7 @@ fi %endif %exclude %{_libdir}/libACEXML*.so +%doc ACE-INSTALL.html %doc AUTHORS %doc COPYING %doc PROBLEM-REPORT-FORM diff --git a/ACE/tests/.gitignore b/ACE/tests/.gitignore index adc665e4a4c..c2402c11670 100644 --- a/ACE/tests/.gitignore +++ b/ACE/tests/.gitignore @@ -217,6 +217,7 @@ /Sigset_Ops_Test /Simple_Message_Block_Test /Singleton_Test +/Singleton_Restart_Test /SOCK_Connector_Test /SOCK_Dgram_Bcast_Test /SOCK_Dgram_Test diff --git a/ACE/tests/ACE.bsp b/ACE/tests/ACE.bsp deleted file mode 100644 index 58959b48998..00000000000 --- a/ACE/tests/ACE.bsp +++ /dev/null @@ -1,25 +0,0 @@ -# Target description File for the Integrate utility for use with the -# INTEGRITY real-time operating system by Green Hills Software. -# Before editing this file, refer to your Integrate documentation. - -# ACE.bsp is only appropriate for dynamic download INTEGRITY applications -# built for use with ACE/TAO - -Target - MinimumAddress 0x0 - MaximumAddress 0x2fffffff - Clock StandardTick - EndClock - Clock HighResTimer - EndClock - Clock RealTimeClock - EndClock - InitialKernelObjects 50 - DefaultStartIt false - DefaultMaxPriority 255 - DefaultPriority 127 - DefaultWeight 255 - DefaultMaxWeight 255 - DefaultStackSize 0x10000 - DefaultMemoryRegionSize 0x100000 -EndTarget diff --git a/ACE/tests/Bound_Ptr_Test.cpp b/ACE/tests/Bound_Ptr_Test.cpp index 9014cf37c24..08e15f74937 100644 --- a/ACE/tests/Bound_Ptr_Test.cpp +++ b/ACE/tests/Bound_Ptr_Test.cpp @@ -464,9 +464,13 @@ run_main (int, ACE_TCHAR *[]) Printer ("I am printer 2"), -1); +#if !defined (ACE_HAS_CPP11) // Ownership is transferred from the auto_ptr to the strong pointer. auto_ptr<Printer> a (printer2); Printer_var r (a); +#else + Printer_var r (printer2); +#endif /* !ACE_HAS_CPP11 */ for (int i = 0; i < n_loops; i++) // Spawn off the methods, which run in a separate thread as diff --git a/ACE/tests/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp index 2cb5467a68c..ed088cf2c29 100644 --- a/ACE/tests/CDR_Array_Test.cpp +++ b/ACE/tests/CDR_Array_Test.cpp @@ -969,14 +969,6 @@ run_main (int argc, ACE_TCHAR *argv[]) for (use_array = 0; use_array < 2; use_array++) { { - CDR_Test<ACE_CDR::Double, DoubleHelper> - test (dtotal, niter, use_array); - } - { - CDR_Test<ACE_CDR::Float, FloatHelper> - test (ftotal, niter, use_array); - } - { CDR_Test<ACE_CDR::LongLong, LongLongHelper> test (qtotal, niter, use_array); } @@ -992,6 +984,14 @@ run_main (int argc, ACE_TCHAR *argv[]) CDR_Test<ACE_CDR::Char, CharHelper> test (ctotal, niter, use_array); } + { + CDR_Test<ACE_CDR::Double, DoubleHelper> + test (dtotal, niter, use_array); + } + { + CDR_Test<ACE_CDR::Float, FloatHelper> + test (ftotal, niter, use_array); + } } ACE_END_TEST; diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp index cdb099b4c75..f07a7ea9928 100644 --- a/ACE/tests/CDR_Test.cpp +++ b/ACE/tests/CDR_Test.cpp @@ -35,6 +35,10 @@ struct CDR_Test_Types ACE_CDR::Long l; const ACE_CDR::Char *str; const ACE_CDR::WChar *wstr; + const std::string std_str; +#if !defined(ACE_LACKS_STD_WSTRING) + const std::wstring std_wstr; +#endif ACE_CDR::Double d; ACE_CDR::Short reps; ACE_CDR::UShort repus; @@ -67,6 +71,10 @@ CDR_Test_Types::CDR_Test_Types (void) l (4), str ("abc"), wstr (0), + std_str ("xyz"), +#if !defined(ACE_LACKS_STD_WSTRING) + std_wstr (L"xyz"), +#endif d (8), reps (-123), repus (456), @@ -103,6 +111,10 @@ short_stream (void) ACE_CDR::WChar wchar2[] = {'\x00'}; // empty wide string ACE_CDR::WChar *wstr = wchar2; ACE_CString str ("Test String"); + std::string std_str ("std string"); +#if !defined(ACE_LACKS_STD_WSTRING) + std::wstring std_wstr (L"std wstring"); +#endif ACE_CDR::Short s = -123; ACE_CDR::UShort us = 123; ACE_CDR::Long l = -65800L; @@ -124,6 +136,10 @@ short_stream (void) os << fwc; os << str; os << wstr; + os << std_str; +#if !defined(ACE_LACKS_STD_WSTRING) + os << std_wstr; +#endif os << s; os << us; os << l; @@ -142,6 +158,10 @@ short_stream (void) ss << fwc; ss << str; ss << wstr; + ss << std_str; +#if !defined(ACE_LACKS_STD_WSTRING) + ss << std_wstr; +#endif ss << s; ss << us; ss << l; @@ -195,6 +215,10 @@ short_stream (void) ACE_CDR::WChar wch1 = '\x00'; ACE_CDR::WChar *wstr1 = 0; ACE_CString str1; + std::string std_str1; +#if !defined(ACE_LACKS_STD_WSTRING) + std::wstring std_wstr1; +#endif ACE_CDR::Short s1 = 0; ACE_CDR::UShort us1 = 0; ACE_CDR::Long l1 = 0L; @@ -222,6 +246,10 @@ short_stream (void) // @todo Lose the ACE_Auto_Array_Ptr. We should be using a // std::string, or the like. ACE_Auto_Array_Ptr<ACE_CDR::WChar> safe_wstr (wstr1); + is >> std_str1; +#if !defined(ACE_LACKS_STD_WSTRING) + is >> std_wstr1; +#endif is >> s1; is >> us1; is >> l1; @@ -258,6 +286,19 @@ short_stream (void) ACE_TEXT ("wide string transfer error")), 1); + if (std_str1 != std_str) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("std::string transfer error")), + 1); + +#if !defined(ACE_LACKS_STD_WSTRING) + if (std_wstr1 != std_wstr) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("std::wstring transfer error")), + 1); +#endif if (s1 != s) ACE_ERROR_RETURN ((LM_ERROR, @@ -375,6 +416,19 @@ CDR_Test_Types::test_put (ACE_OutputCDR &cdr) i), 1); + if (cdr.write_string (this->std_str) == 0) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("write_string(std)[%d] failed\n"), + i), + 1); + +#if !defined(ACE_LACKS_STD_WSTRING) + if (cdr.write_wstring (this->std_wstr) == 0) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("write_wstring(std)[%d] failed\n"), + i), + 1); +#endif } return 0; @@ -465,6 +519,32 @@ CDR_Test_Types::test_get (ACE_InputCDR &cdr) const ACE_TEXT ("wstring[%d] differs\n"), i), 1); + + std::string std_xstr; + if (cdr.read_string (std_xstr) == 0) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("read_string(std)[%d] failed\n"), + i), + 1); + if (std_xstr != this->std_str) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("std::string[%d] differs\n"), + i), + 1); + +#if !defined(ACE_LACKS_STD_WSTRING) + std::wstring std_xwstr; + if (cdr.read_wstring (std_xwstr) == 0) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("read_wstring(std)[%d] failed\n"), + i), + 1); + if (std_xwstr != this->std_wstr) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("std::wstring[%d] differs\n"), + i), + 1); +#endif } return 0; } diff --git a/ACE/tests/Compiler_Features_24_Test.cpp b/ACE/tests/Compiler_Features_24_Test.cpp index e923bd913e5..d4d0697ed26 100644 --- a/ACE/tests/Compiler_Features_24_Test.cpp +++ b/ACE/tests/Compiler_Features_24_Test.cpp @@ -71,17 +71,26 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT("Compiler_Features_24_Test")); - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("Compiler Feature 24 Test does compile and run.\n"))); - FOO::o_r<FOO::A> l = FOO::create(); + +#if defined __clang__ && \ + (defined __apple_build_version__ && __apple_build_version__ < 9100000 \ + || __clang_major__ < 5) + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: This version of clang doesn't") + ACE_TEXT (" compile the C++11 code in this test.\n"))); + ACE_END_TEST; + return 1; +#else FOO::o_r<FOO::A> l2 = FOO::make_f<FOO::A>(); // next line doesn't compile and shouldn't //FOO::o_r<FOO::B> l3 = FOO::make_f<FOO::B>(); + ACE_DEBUG ((LM_INFO, + ACE_TEXT ("Compiler Feature 24 Test does compile and run.\n"))); ACE_END_TEST; return 0; +#endif } #else diff --git a/ACE/tests/Compiler_Features_27_Test.cpp b/ACE/tests/Compiler_Features_27_Test.cpp index 3e0dbfc3e75..d8a58d0ee78 100644 --- a/ACE/tests/Compiler_Features_27_Test.cpp +++ b/ACE/tests/Compiler_Features_27_Test.cpp @@ -25,7 +25,7 @@ run_main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT("Compiler_Features_27_Test")); // Visual Studio 2015 has a small issue with this construct -#if !defined (ACE_WIN32_VC14) +#if !(defined (_MSC_VER) && (_MSC_VER < 1910)) Foo any; any <<= std::move("abc"); #endif diff --git a/ACE/tests/Compiler_Features_32_Test.cpp b/ACE/tests/Compiler_Features_32_Test.cpp index f6e20e32427..4a3790bebc7 100644 --- a/ACE/tests/Compiler_Features_32_Test.cpp +++ b/ACE/tests/Compiler_Features_32_Test.cpp @@ -41,6 +41,17 @@ A::u_type_::~u_type_ () void A::clear () { +#if defined __clang__ && \ + (defined __apple_build_version__ && __apple_build_version__ < 9100000 \ + || __clang_major__ <= 7) +#define CLANG_WORKAROUND +#endif + +#ifdef CLANG_WORKAROUND + // clang requires one of two workarounds: + // 1. the name after ~ must be in scope + using std::string; +#endif this->u_.string_member_.std::string::~string (); } @@ -49,7 +60,12 @@ struct B { std::string m; } u_; void clear() { - u_.m.std::string::~string(); +#ifdef CLANG_WORKAROUND + // 2. actual class name instead of typedef + u_.m.std::string::~basic_string (); +#else + u_.m.std::string::~string (); +#endif } }; diff --git a/ACE/tests/Compiler_Features_38_Test.cpp b/ACE/tests/Compiler_Features_38_Test.cpp new file mode 100644 index 00000000000..0d6466479db --- /dev/null +++ b/ACE/tests/Compiler_Features_38_Test.cpp @@ -0,0 +1,42 @@ +/** + * This program checks if the compiler doesn't have a certain bug + * that we encountered when testing with TAO + */ + +#include "test_config.h" + +template <typename T> +class Foo_T +{ +public: + Foo_T () : member() {}; + typedef T& T_elem; + T_elem operator[] (long) { return member; } + operator T *& () { return & member; }; +private: + T member; +}; + +struct Foo2 +{ + long i; +}; +typedef Foo_T<Foo2> Foo2Seq; + +int +run_main (int, ACE_TCHAR *[]) +{ + ACE_START_TEST (ACE_TEXT("Compiler_Features_38_Test")); + + Foo2Seq f2; + long const j = f2[0L].i; + ACE_UNUSED_ARG(j); + + ACE_DEBUG ((LM_INFO, + ACE_TEXT ("C++ support ok\n"))); + + ACE_END_TEST; + + return 0; +} + diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 0b489116694..b0f31ddf21a 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -246,7 +246,7 @@ test_log_msg_features (const ACE_TCHAR *program) big[index] = alphabet[i % j]; } big[ACE_Log_Record::MAXLOGMSGLEN] = ACE_TEXT ('\0'); - ACE_DEBUG ((LM_INFO, ACE_TEXT ("This is too big: %s\n"), big)); + ACE_DEBUG ((LM_INFO, ACE_TEXT ("This is too big:%l %s\n"), big)); ACE_HEX_DUMP((LM_INFO, (const char*)big, ACE_Log_Record::MAXLOGMSGLEN )); diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp index 3d102d46a48..cbc994d4300 100644 --- a/ACE/tests/QtReactor_Test.cpp +++ b/ACE/tests/QtReactor_Test.cpp @@ -36,7 +36,6 @@ #include "test_config.h" #include <assert.h> -#include <QtGui/qapplication.h> #include <QtCore/qtimer.h> #include "ace/OS_NS_time.h" diff --git a/ACE/tests/QtReactor_Test.h b/ACE/tests/QtReactor_Test.h index 318ac7b0085..21d124208c0 100644 --- a/ACE/tests/QtReactor_Test.h +++ b/ACE/tests/QtReactor_Test.h @@ -2,7 +2,12 @@ #ifndef QTREACTOR_TEST_H #define QTREACTOR_TEST_H -#include <QtGui/qapplication.h> +#ifdef ACE_HAS_QT5 +#include /**/ <QtWidgets/QApplication> +#else +#include /**/ <QtGui/QApplication> +#endif + #include <QtCore/qtimer.h> class QTestApplication: public QApplication diff --git a/ACE/tests/README b/ACE/tests/README index f6bd9b5771b..16f00d86893 100644 --- a/ACE/tests/README +++ b/ACE/tests/README @@ -12,7 +12,7 @@ features. Building and running the tests is straightforward: 2. You then need to run all the tests, e.g., by running the perl script - ACE_ROOT/tests/run_test.pl + $ACE_ROOT/tests/run_test.pl Naturally, make sure that you've installed perl first! diff --git a/ACE/tests/SOCK_Acceptor_Test.cpp b/ACE/tests/SOCK_Acceptor_Test.cpp new file mode 100644 index 00000000000..a8791bc9d9f --- /dev/null +++ b/ACE/tests/SOCK_Acceptor_Test.cpp @@ -0,0 +1,99 @@ + +//============================================================================= +/** + * @file SOCK_Acceptor_Test.cpp + * + * This is a test of the <ACE_SOCK_Acceptor> class. + * + * @author Steve Huston <shuston@riverace.com> + */ +//============================================================================= + + +#include "test_config.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_wait.h" +#include "ace/Time_Value.h" +#include "ace/SOCK_Connector.h" +#include "ace/SOCK_Acceptor.h" + + +static int +test_accept (ACE_Addr listen_addr, int v6_only) +{ + int status = 0; + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) starting listen, ipv6-only %d\n"), + v6_only)); + // Bind listener to any port and then find out what the port was. + ACE_SOCK_Acceptor acceptor; + ACE_INET_Addr listening_at; + if (acceptor.open (listen_addr, + 0, + PF_UNSPEC, + ACE_DEFAULT_BACKLOG, + 0, + v6_only) == -1 + || acceptor.get_local_addr (listening_at) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("open")), + -1); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) listening at port %d\n"), + listening_at.get_port_number ())); + + // Try IPv4 and, if v6 is available, v6. If v6-capable and v6-only + // is selected, v4 should NOT work and v6 should. If not v6-capable + // just try v4 and it should work regardless of v6-only. + ACE_SOCK_Connector connector; + + ACE_INET_Addr v4_addr (listening_at.get_port_number(), + ACE_LOCALHOST, + PF_INET); + ACE_SOCK_Stream v4_stream; + bool v4_ok = (connector.connect (v4_stream, v4_addr) == 0); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("v4 connect %s\n"), + v4_ok ? ACE_TEXT ("OK") : ACE_TEXT ("FAIL"))); + v4_stream.close(); + +#if defined (ACE_HAS_IPV6) + ACE_INET_Addr v6_addr (listening_at.get_port_number(), + ACE_IPV6_LOCALHOST, + PF_INET6); + ACE_SOCK_Stream v6_stream; + bool v6_ok = (connector.connect (v6_stream, v6_addr) == 0); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("v6 connect %s\n"), + v6_ok ? ACE_TEXT ("OK") : ACE_TEXT ("FAIL"))); + v6_stream.close(); + + if (v6_only && v4_ok) + status = 1; + if (!v6_only && !v4_ok) + status = 1; + if (!v6_ok) + status = 1; +#else + status = v4_ok ? 0 : 1; +#endif /* ACE_HAS_IPV6 */ + acceptor.close (); + return status; +} + +int +run_main (int, ACE_TCHAR *[]) +{ + ACE_START_TEST (ACE_TEXT ("SOCK_Acceptor_Test")); + + int status = 0; + + if (test_accept (ACE_Addr::sap_any, 1) != 0) + status = 1; + if (test_accept (ACE_Addr::sap_any, 0) != 0) + status = 1; + + ACE_END_TEST; + return status; +} diff --git a/ACE/tests/Singleton_Restart_Test.cpp b/ACE/tests/Singleton_Restart_Test.cpp new file mode 100644 index 00000000000..9d1e69b5ab9 --- /dev/null +++ b/ACE/tests/Singleton_Restart_Test.cpp @@ -0,0 +1,54 @@ +#define ACE_DOESNT_DEFINE_MAIN + +#include "test_config.h" + +#include "ace/Init_ACE.h" +#include "ace/Singleton.h" + +int restart_test_logging (const ACE_TCHAR *program) +{ + if (ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM | + ACE_Log_Msg::VERBOSE_LITE) != 0) + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("open log_msg failed")), -1); + if (ace_file_stream::instance()->set_output (program, 1) != 0) + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("set_output failed")), -1); + return 0; +} + +void report_error (const ACE_TCHAR *lock) +{ + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Singleton<int, %s> ") + ACE_TEXT ("failed to allocate\n"), lock)); +} + +typedef ACE_Singleton<int, ACE_SYNCH_MUTEX> Singleton1; +typedef ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX> Singleton2; + +int main () +{ + ACE::init (); + ACE_START_TEST (ACE_TEXT ("Singleton_Restart_Test")); + + *Singleton1::instance () = 1; + *Singleton2::instance () = 2; + + ACE::fini (); + ACE::init (); + if (restart_test_logging (program) != 0) // program defined in ACE_START_TEST + return -1; + + int *i1 = Singleton1::instance (); + if (!i1) + report_error (ACE_TEXT ("ACE_SYNCH_MUTEX")); + + int *i2 = Singleton2::instance (); + if (!i2) + report_error (ACE_TEXT ("ACE_SYNCH_RECURSIVE_MUTEX")); + + ACE_END_TEST; + ACE::fini (); + + return (i1 && i2) ? 0 : 1; +} diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index 927bfcda235..0f4f88de61f 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -108,6 +108,7 @@ Compiler_Features_34_Test Compiler_Features_35_Test Compiler_Features_36_Test Compiler_Features_37_Test +Compiler_Features_38_Test Config_Test: !LynxOS !VxWorks !ACE_FOR_TAO Conn_Test: !ACE_FOR_TAO DLL_Test: !STATIC Linux @@ -217,6 +218,7 @@ Reverse_Lock_Test RW_Process_Mutex_Test: !VxWorks !ACE_FOR_TAO !PHARLAP !Cygwin Sendfile_Test: !QNX !NO_NETWORK !VxWorks !LabVIEW_RT Signal_Test: !VxWorks !Cygwin +SOCK_Acceptor_Test: !NO_NETWORK SOCK_Connector_Test: !NO_NETWORK SOCK_Netlink_Test: !ACE_FOR_TAO SOCK_Send_Recv_Test: !NO_NETWORK @@ -232,6 +234,7 @@ Service_Config_Stream_Test: !STATIC !FIXED_BUGS_ONLY Sigset_Ops_Test Simple_Message_Block_Test Singleton_Test +Singleton_Restart_Test Svc_Handler_Test: !ACE_FOR_TAO Task_Wait_Test TP_Reactor_Test: !ACE_FOR_TAO diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index f633fb629ee..04e1c9e8949 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -13,7 +13,6 @@ project(Test_Output) : acelib, script { Resource_Files { } Script_Files { - run_test.pl run_test.lst } } @@ -844,6 +843,13 @@ project(Compiler_Features_37_Test) : acetest { } } +project(Compiler_Features_38_Test) : acetest { + exename = Compiler_Features_38_Test + Source_Files { + Compiler_Features_38_Test.cpp + } +} + project(Config Test) : acetest { avoids += ace_for_tao exename = Config_Test @@ -1609,6 +1615,30 @@ project(Singleton Test) : acetest { } } +project(Singleton Restart Test) : aceexe { + exename = Singleton_Restart_Test + after += Test_Output + libs += Test_Output + Source_Files { + Singleton_Restart_Test.cpp + } + Header_Files { + } + Template_Files { + } + Resource_Files { + } + Svc_Conf_Files { + } +} + +project(SOCK Acceptor_Test) : acetest { + exename = SOCK_Acceptor_Test + Source_Files { + SOCK_Acceptor_Test.cpp + } +} + project(SOCK Test) : acetest { exename = SOCK_Test Source_Files { @@ -2127,7 +2157,7 @@ project(SOCK_SEQPACK_SCTP_Test) : acetest { } } -project(QtReactor Test) : acetest, ace_qt4reactor { +project(QtReactor Test) : acetest, ace_qtreactor { exename = QtReactor_Test MOC_Files { QtReactor_Test.h diff --git a/README.md b/README.md index e5a3396ade0..7587c76571d 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [](https://travis-ci.org/DOCGroup/ACE_TAO) [](https://ci.appveyor.com/project/jwillemsen/ace-tao) [](https://scan.coverity.com/projects/1) +[](https://dev.azure.com/docgroup/ACE_TAO/_build/latest?definitionId=1) # ACE/TAO # diff --git a/TAO/COPYING b/TAO/COPYING index 87a1661d7a0..67fc56322e6 100644 --- a/TAO/COPYING +++ b/TAO/COPYING @@ -8,7 +8,7 @@ (henceforth referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, [8]University of California, Irvine, and [9]Vanderbilt - University, Copyright (c) 1993-2017, all rights reserved. Since DOC + University, Copyright (c) 1993-2018, all rights reserved. Since DOC software is open-source, freely available software, you are free to use, modify, copy, and distribute--perpetually and irrevocably--the DOC software source code and object code produced from the source, as diff --git a/TAO/ChangeLogs/TAO-2_4_7 b/TAO/ChangeLogs/TAO-2_4_7 new file mode 100644 index 00000000000..65d37fbae34 --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_4_7 @@ -0,0 +1,283 @@ +commit b1228f4bfd1be92b1590de65fe49c8511c2b71e1 +Author: Adam Mitz <mitza@ociweb.com> +Date: Tue Mar 13 10:58:36 2018 -0500 + + TAO test list: mark tests that won't run with CORBA/e compact + +commit 5a4a08e16062d6ecbf0e599fc2bdb26f103e72d3 +Author: Adam Mitz <mitza@ociweb.com> +Date: Mon Mar 12 11:19:23 2018 -0500 + + TAO NEWS for shmiop change + +commit 66e84f43246a74b1efadf60ff7aef1146a853c98 +Author: Adam Mitz <mitza@ociweb.com> +Date: Tue Mar 6 11:06:41 2018 -0600 + + Bug 1220 fix applied to SHMIOP (fixed for IIOP long ago). + + Also added a SHMIOP test, IPv6 compatibility, and fixed wrong indent in Synch_Invocation.cpp. + +commit 71a517bfb38858939cecc4e021dc3805663ff07a +Merge: 7aadef4fc59 d4c520ce4cf +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Mon Feb 26 14:12:55 2018 -0600 + + Merge pull request #582 from mitza-oci/master + + NEWS for upcoming release + +commit d4c520ce4cf5fc14aa296936e6c80cccbc12757e +Author: Adam Mitz <mitza@ociweb.com> +Date: Mon Feb 26 11:24:58 2018 -0600 + + NEWS for upcoming release + +commit 73307efb832657d40b3c39492a2c4ae4b0b47762 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Feb 26 18:20:26 2018 +0100 + + Doxygen fixes and fixed some typos + + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h: + * TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h: + * TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h: + * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h: + * TAO/tests/Bug_2953_Regression/client.cpp: + * TAO/tests/Bug_2953_Regression/server.cpp: + * TAO/tests/Smart_Proxies/Benchmark/client.cpp: + * TAO/tests/Smart_Proxies/Policy/client.cpp: + * TAO/tests/Smart_Proxies/client.cpp: + +commit dded6e0e48ee7e1c6c39240d60fb0b3111ceddf2 +Author: Oliver Kellogg <okellogg@users.sourceforge.net> +Date: Fri Feb 23 09:05:06 2018 +0100 + + TAO/tests/Bug_3940_Regression/test.idl + - Address issue #571 comment by jwillemsen: Disable content of IDL file + for Borland C++ Builder. The cpp32 preprocessor apparently strips out + all @ characters which inhibits processing of annotations. + +commit 35218a474eeb88b4288df227a98f04cbf0865f8b +Author: Oliver Kellogg <okellogg@users.sourceforge.net> +Date: Sun Feb 18 02:30:07 2018 +0100 + + Address https://github.com/DOCGroup/ACE_TAO/issues/571 : + Shift handling of annotation applications from lexer to parser. + + TAO/TAO_IDL/fe/idl.ll + - Remove rule matching annotation applications. + + TAO/TAO_IDL/fe/idl.ypp + - Define %type <idval> defining_id. + - Duplicate rule `id' as defining_id. + In defining_id allow for annotation applications. + - Substitute `id' by defining_id in following rules: + template_module_ref, template_module_inst, interface_decl, value_decl, + const_dcl, simple_declarator, struct_decl, union_decl, enum_type, + array_declarator, exception, component_forward_decl, component_header, + home_header, factory_decl, finder_decl, event_concrete_forward_decl, + event_abs_forward_decl, event_abs_header, event_custom_header, + event_plain_header. + - Allow for annotation applications in following rules: + definitions, at_least_one_definition, tpl_definitions, member_i, + case_branch, case_labels, enumerator, operation, init_decl, + porttype_decl, at_least_one_actual_parameter, actual_parameters, + connector_header. + - New rule `annotations' implements sequence of 0 or more annotation_appl. + - New rules annotation_appl, annotation_appl_params, annotation_appl_param + implement rules 225, 226, 227 from IDL 4.2 section 7.4.15.3. + - New rule at_least_one_annotation_appl_param implements 2nd alternative + on RHS of rule 226. + - New rule annotation_appl_named_params is auxiliary to + at_least_one_annotation_appl_param. + It implements a sequence of 0 or more annotation_appl_param. + + TAO/TAO_IDL/fe/idl.yy.cpp + - Regenerate from idl.ll using TAO/TAO_IDL/regen.sh with flex-2.6.4. + + TAO/TAO_IDL/fe/idl.tab.cpp + - Regenerate from idl.ypp using TAO/TAO_IDL/regen.sh with bison-3.0.2. + +commit cb29bd46571e428d1d71c860ec9010d29a3a1fe4 +Merge: 4665969af11 d14029823bf +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Feb 16 16:05:33 2018 +0100 + + Merge pull request #573 from jwillemsen/jwi-taoidlleak + + Add new C++ compiler test for testing a feature TAO is using + +commit 4473a426454c16a2d7af7328778369d603d701ca +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Feb 16 10:23:41 2018 +0100 + + Fixed typo in comment + + * TAO/tests/Bug_3683_Regression/Simple_util.h: + +commit 0b1e33835dcdb9397c9eeb23eef5db53908d87e0 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Feb 16 10:23:28 2018 +0100 + + Convert to doxygen style comments + + * TAO/tests/Bug_3683_Regression/Echo.idl: + +commit 4665969af11545a831900244fd4ac6fa6f30a155 +Merge: cbb40b5f6f2 c8d9edf5117 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Feb 15 10:32:39 2018 +0100 + + Merge pull request #572 from jwillemsen/jwi-taoidlleak + + Fixed memory leak when we have a wstrval + +commit c8d9edf5117f6aa7334bd63e351e816d4946aece +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Feb 13 19:23:59 2018 +0100 + + Fixed memory leak when we have a wstrval + + * TAO/TAO_IDL/ast/ast_expression.cpp: + +commit e1f507ba668b0373e2ef3ab6fb74a9f792374fb3 +Author: Oliver Kellogg <okellogg@users.sourceforge.net> +Date: Sun Feb 4 19:43:06 2018 +0100 + + Followup to commit 3f751cb addresses + https://github.com/DOCGroup/ACE_TAO/pull/567#issuecomment-360504123 , + + > [...] the Solaris/SunCC build failed because its preprocessor splits + > the @ from the following token: + > + > $ echo '@foo' > /tmp/foo.c && /opt/compilers/suncc5.12/bin/CC -E \ + > /tmp/foo.c && rm /tmp/foo.c + > #1 "/tmp/foo.c" + > @ foo + + TAO/TAO_IDL/fe/idl.ll + - Modify the rule matching annotations to include an optional space + after the '@', + @ ?[A-Za-z][A-Za-z0-9_]*[ \t]*(\([^)]+\))? + +commit be871ac59565386b582b41e48ef129d509c354fc +Author: Oliver Kellogg <okellogg@users.sourceforge.net> +Date: Wed Jan 24 22:24:13 2018 +0100 + + Followup to PR #565: Address new conversion warning at + http://buildlogs.remedy.nl/win_msvc15_opendds_debug/index.html , + > fe\idl.yy.cpp(1383): warning C4267: 'argument': conversion from + > 'size_t' to 'int' + + TAO/TAO_IDL/tao_idl_fe.mpc rule lex.yy + - In the sed regexes, replace the fread related substitution by an + #include <errno.h> substitution. + As a marginal cosmetic improvement, adjust the tab substitution + to produce 4 spaces per tab. + - In the error message of the else-part, increase the minimum required + flex version to 2.6.4. + + TAO/TAO_IDL/fe/idl.yy.cpp + - Regenerate using regen.sh with flex 2.6.4. + +commit a2f4310d1beb46927e396cbfb1f563abf390eb8f +Author: Oliver Kellogg <okellogg@users.sourceforge.net> +Date: Fri Jan 19 21:43:43 2018 +0100 + + Follow suggestion by mitza-oci at + https://github.com/DOCGroup/ACE_TAO/pull/565 : + > Since it's a compile-only test, it shouldn't need a run_test.pl or a + > test.cpp (build a library instead of an executable). + + TAO/tests/Bug_3940_Regression/Bug_3940_Regression.mpc + - Change superproject to taolib_with_idl. + - Remove exename and Source_Files. + + TAO/tests/Bug_3940_Regression/test.cpp + TAO/tests/Bug_3940_Regression/run_test.pl + - Remove files. + +commit 383454e6ee7d814cbfa3e1758f506a90f96b7d13 +Author: Oliver Kellogg <okellogg@users.sourceforge.net> +Date: Wed Jan 17 22:01:45 2018 +0100 + + * TAO/tests/Bug_3940_Regression : + New test verifies that tao_idl tolerates IDL4 annotations. + +commit 3f751cb31255f9916a5b5ec31f572f4aa1758c96 +Author: Oliver Kellogg <okellogg@users.sourceforge.net> +Date: Tue Jan 16 22:09:36 2018 +0100 + + http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=3940#c4 + Attachment 1524: Patch to make tao_idl ignore IDL4 annotations + + TAO/TAO_IDL/fe/idl.ll + - Add rule @[A-Za-z][A-Za-z0-9_]*[ \t]*(\([^)]+\))? with action "break". + + TAO/TAO_IDL/fe/idl.tab.cpp + TAO/TAO_IDL/fe/idl.tab.hpp + TAO/TAO_IDL/fe/idl.yy.cpp + - In directory TAO/TAO_IDL execute script regen.sh using flex 2.6.0 and + bison 3.0.2. + + TAO/TAO_IDL/fe/idl.ypp + - Fix typo in comment. + +commit 2a2491926e1a1e044da01f979dcaa4e1e2032c51 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jan 15 18:14:06 2018 +0100 + + Removed reference to CIAO, moved to a separate repo, added msvc 14.1 (Visual Studio 2017) + + * TAO/TAO-INSTALL.html: + +commit 57a3da79bd35109aadaa74110f58440e4a5eab86 +Author: Oliver Kellogg <okellogg@users.sourceforge.net> +Date: Fri Jan 12 00:03:25 2018 +0100 + + - In section "Building and Installing TAO from git", mention that the + ACE_ROOT and TAO_ROOT env vars are set different from ACE_wrappers. + - Fix a few typos. + - Add a few missing </LI> tags. + +commit 6fbf5788f0589ae7cde5448baeda0d6e9b1bfc79 +Merge: ac9ffb65e75 4ac686684c6 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Tue Jan 2 09:36:50 2018 -0600 + + Merge pull request #555 from mitza-oci/singleton-restart + + ACE_Singleton should work after ACE::fini, ACE::init (fixes issue #554) + +commit dff4439b18379b9008ee696303be492d84d794dd +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jan 1 11:24:13 2018 +0100 + + Updated copyright to 2018 + + * ACE/tests/ACE.bsp: + Deleted, not used anymore + + * ACE/COPYING: + * TAO/COPYING: + +commit 5bbbaacd283951886642a5113300f0c0543e51c0 +Author: Adam Mitz <mitza@ociweb.com> +Date: Thu Dec 21 10:18:10 2017 -0600 + + fixed issue #554 ACE_Singleton use after ACE::fini, ACE::init + +commit 52618c6f2a83446eb15ecd95e98e9d178a013d47 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Dec 8 09:38:58 2017 +0100 + + Make ACE 6.4.6 and TAO 2.4.6 public + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/debian/debian.control: + * ACE/docs/Download.html: + * ACE/docs/bczar/bczar.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/TAO/ChangeLogs/TAO-2_4_8 b/TAO/ChangeLogs/TAO-2_4_8 new file mode 100644 index 00000000000..767106c8a67 --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_4_8 @@ -0,0 +1,262 @@ +commit 8e254f653cf8820f37003989764939592a840a34 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon May 14 09:09:22 2018 +0200 + + Document changes + +commit 8a255fc4ed1cbc37d608e93536ffbaf40a194fc9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed May 2 14:32:56 2018 +0200 + + Catch exception by reference + + * TAO/tao/Storable_File_Guard.cpp: + +commit c0ff874332e13f5c2f4bb76235dad1b6c7d1598a +Author: Adam Mitz <mitza@ociweb.com> +Date: Wed Apr 18 10:13:54 2018 -0500 + + A few more MPC "duplicated files" issues + +commit 6e99fc7a46b1ae2ce212998e65a21eb55dc28711 +Author: Adam Mitz <mitza@ociweb.com> +Date: Tue Apr 17 17:29:00 2018 -0500 + + Invocation_Retry_Params.h: add required #include + +commit ccdabd4707ec683bd704f3ca82162fab92b8c1e9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 14:25:50 2018 +0200 + + Documentation and whitespace changes + + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h: + * TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h: + * TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h: + * TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h: + * TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h: + * TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h: + * TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h: + * TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h: + * TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h: + * TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h: + * TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h: + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h: + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h: + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h: + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp: + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h: + +commit 3612891a2307281151d9789fd7418e0465cea8c0 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 12:45:54 2018 +0200 + + Whitespace changes + + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp: + +commit 025dcfb3852fe64b3b69689ea1dc85deb1ef6837 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 12:39:48 2018 +0200 + + Doxygen fix + + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h: + +commit 657865f97f242c1377304d0970b592df4f45f2ee +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 12:29:03 2018 +0200 + + Use true/false instead of 1/0 for connected checks + + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp: + +commit fe1fa2d58972d22ccc6b228060279ac6bcbeb929 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 10:39:43 2018 +0200 + + Fixed links + +commit 2c6096185f882b3b685d80520697180ec3da5d6c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 10:35:14 2018 +0200 + + Removed trailing whitespaces and corrected links to bugzilla + +commit 6a04b1e7cedd54f78f779750d98579f97dccdfba +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 10:30:19 2018 +0200 + + Fixed typo + +commit b3177982ce28246e24576046a2a19b52392c7983 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 10:28:55 2018 +0200 + + Remove obsolete options + + * TAO/docs/ec_options.html: + * TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: + +commit 23c29ff162fdf719920cfb3db1ef944ed1228d3a +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 10:07:13 2018 +0200 + + Fixed typos + + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h: + +commit d2ef61d179632c2c98917a423d3ce9a3d2b613af +Merge: db9809559cd bedd53e8747 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 09:53:08 2018 +0200 + + gerge branch 'master' of https://github.com/DOCGroup/ACE_TAO + +commit db9809559cd9351a3c783e56de6340e82e434f37 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Apr 13 09:52:42 2018 +0200 + + Documentation changes, fixed some typos + + * TAO/docs/ec_options.html: + * TAO/docs/pluggable_protocols/index.html: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h: + * TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h: + * TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h: + * TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h: + * TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp: + * TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp: + * TAO/tao/IORInterceptor/IORInfo.h: + * TAO/tao/ORB_Core.h: + * TAO/tao/Service_Context.cpp: + * TAO/tao/Stub.cpp: + * TAO/tao/Tagged_Components.cpp: + +commit 31740fc585aa2c0fcdad4bfbde110fabd31796f2 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Apr 12 14:06:48 2018 +0200 + + Don't use auto_ptr for the fragmentation strategy, that was the only one that used this in the ORB interface. With C++17 auto_ptr has been removed completely + + * TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp: + * TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp: + * TAO/tao/GIOP_Fragmentation_Strategy.cpp: + * TAO/tao/GIOP_Message_Base.cpp: + * TAO/tao/GIOP_Message_Base.h: + * TAO/tao/IIOP_Acceptor.cpp: + * TAO/tao/ORB_Core.cpp: + * TAO/tao/ORB_Core.h: + * TAO/tao/Resource_Factory.h: + * TAO/tao/default_resource.cpp: + * TAO/tao/default_resource.h: + +commit 2855e7d3bebfcab8a443d923224e6412968f02ad +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Apr 10 09:54:43 2018 +0200 + + Combine two logging lines into one + + * TAO/tao/Object.cpp: + +commit 7053d9eede98769be570c1ac192298270f71eb11 +Merge: e6349f5df34 17cb3ec57b3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Apr 9 19:45:08 2018 +0200 + + Merge pull request #611 from jwillemsen/jwi-connectorregistry + + Add some more error logic for the cases the create_profile fails + +commit 17cb3ec57b3b9dd537fea4d156384623360d1ae8 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Apr 9 18:30:56 2018 +0200 + + Add some more error logic for the cases the create_profile fails + + * TAO/tao/Connector_Registry.cpp: + +commit effd803b7b9badcd4414e1dc1d8dfdf6021a99e8 +Merge: b085ae3be0e 6f8b356f4ac +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Apr 4 18:01:47 2018 +0200 + + Merge pull request #607 from jwillemsen/master + + Small docu changes and only set no_deprecated=1 in our GNU make rules when it is not set yet + +commit 110a761b4731a561fbc04a62f98bc35863d4a64f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Apr 4 11:03:29 2018 +0200 + + Minor documentation changes and remove old cvs date tags + +commit 6d5ecfa9873a5612940057f2ee852a3c6ec08660 +Author: reicesar <reicesar@gmail.com> +Date: Wed Mar 28 11:07:58 2018 -0300 + + Fix 64bit issue on load registry data diff --git a/TAO/ChangeLogs/TAO-2_5_0 b/TAO/ChangeLogs/TAO-2_5_0 new file mode 100644 index 00000000000..2e71b46bc8e --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_5_0 @@ -0,0 +1,303 @@ +commit cf42f2ce36123105d52cfeff3d736775436cd96a +Merge: 7d72360c4d6 7bd7f6cfe57 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Jun 7 21:09:16 2018 +0200 + + Merge pull request #637 from jwillemsen/master + + Fixed typo and removed some empty lines + +commit 7bd7f6cfe5764bc2bb9f6fb7204bdf773d693c05 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Jun 7 13:02:49 2018 +0200 + + Removed empty lines + + * TAO/tests/Portable_Interceptors/AdvSlot/client.cpp: + * TAO/tests/Portable_Interceptors/AdvSlot/server.cpp: + * TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp: + * TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h: + +commit ec9ea2cb073f98e1f56f23f23ede885c5e4d831e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Jun 7 13:02:39 2018 +0200 + + Fixed typo in comment + + * TAO/tao/PI/ClientRequestInfo.cpp: + +commit 7a03ab755914edbf2494d5fe3f9b3eb9bd5bf2dd +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jun 2 09:55:50 2018 +0200 + + Fixed compile errors + + * TAO/examples/PluggableUDP/tests/Performance/server.cpp: + * TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp: + +commit 4bb2475504a0f1b85d1358f8daeedb4c65f9f548 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 1 17:02:27 2018 +0200 + + Add unit test for issue #570 + + * TAO/tests/Bug_3845_Regression/issue570.idl: + Added. + + * TAO/tests/Bug_3845_Regression/run_test.pl: + +commit 0e06e1e74355e86aeda52bf2a2ca8f4dd2cde954 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 1 16:59:44 2018 +0200 + + Fix issue #570, crash of TAO_IDL on invalid IDL + + * TAO/TAO_IDL/util/utl_scope.cpp: + +commit 80bce7afb0cccdb9dbf82b24aebdcb36f918f2aa +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 1 14:34:35 2018 +0200 + + Fixed CodeFactor issues + +commit 8956a849cf8ccd48dacaf8db7b2add3df2c4a84d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 1 14:28:30 2018 +0200 + + Layout changes + + * TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp: + * TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp: + * TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp: + * TAO/TAO_IDL/ast/ast_interface.cpp: + * TAO/TAO_IDL/ast/ast_union.cpp: + * TAO/TAO_IDL/be/be_global.cpp: + * TAO/examples/Advanced/ch_18/client.cpp: + * TAO/examples/Advanced/ch_18/server.h: + * TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp: + * TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h: + * TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp: + * TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp: + * TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h: + * TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp: + * TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h: + * TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp: + * TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp: + * TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp: + * TAO/examples/PluggableUDP/tests/Performance/client.cpp: + * TAO/examples/PluggableUDP/tests/Performance/server.cpp: + * TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp: + * TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp: + * TAO/orbsvcs/IFR_Service/be_global.cpp: + * TAO/orbsvcs/IFR_Service/be_produce.cpp: + * TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp: + * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp: + * TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp: + * TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp: + * TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp: + * TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * TAO/orbsvcs/orbsvcs/AV/TCP.cpp: + * TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp: + * TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp: + * TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h: + * TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp: + * TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h: + * TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h: + +commit 10b5846921aa7d988936cdc21057a592b51d7690 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 1 14:18:32 2018 +0200 + + Layout change + + * TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp: + +commit b870908ba95d171f8d2ffbc456ab8a7b659c4433 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 1 11:24:20 2018 +0200 + + Removed last TAO env macros and some layout changes + +commit 51d87f3608962ffe1fb12e7a1de31e4c9fa7d729 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed May 30 11:51:07 2018 +0200 + + Next release will be minor + + * ACE/NEWS: + * TAO/NEWS: + +commit 98b95510000b4da8460034b8936422e98527740f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed May 16 18:27:21 2018 +0200 + + List std::unique_ptr usage + +commit 03ead678354f6e07c988a46e158b997896f8aeca +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 19:09:14 2018 +0200 + + Make use of std::unique_ptr + + * TAO/tao/PortableServer/Object_Adapter.cpp: + +commit 43bdfc0437da6a2e78732f072253c9725818d556 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 17:15:22 2018 +0200 + + Layout changes + + * TAO/tao/IORManipulation/IORManipulation.cpp: + * TAO/tao/Valuetype/ValueBase.inl: + +commit 774e7f6ef1630fc42d3bf45d45e37fbaeb101659 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 17:01:11 2018 +0200 + + Make use of std::unique_ptr when we have C++11 + + * TAO/tao/IORManipulation/IORManipulation.cpp: + +commit 330d868ab419f28e24dfe1b9d29500eafac66b7e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 16:24:30 2018 +0200 + + Use std::unique_ptr when usign C++11 + + * TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp: + * TAO/tao/PortableServer/Object_Adapter.cpp: + * TAO/tao/PortableServer/Root_POA.cpp: + * TAO/tao/PortableServer/ServantRetentionStrategyRetain.h: + +commit c4a7434d85ec752a5939bfafc35384534fc4705d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 15:32:58 2018 +0200 + + Make use of std::unique_ptr with C++11 + + * TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp: + +commit 2201a11b5acbbe38c86f72e8e444b1932196d38e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 15:04:20 2018 +0200 + + Use std::unique_ptr with C++11 + + * TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp: + * TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp: + * TAO/tao/AnyTypeCode/Any_SystemException.cpp: + * TAO/tao/AnyTypeCode/NVList.cpp: + * TAO/tao/IORManipulation/IORManipulation.cpp: + +commit 074ca6ccfcbd44a76620ef52a42d644a32737eb0 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 15:00:27 2018 +0200 + + Fixed typo in error message + + * TAO/tao/PortableServer/Active_Object_Map.cpp: + * TAO/tao/PortableServer/Object_Adapter.cpp: + +commit c32cb0f99e00b506c78644fcaa0098f3b72c912d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 14:38:57 2018 +0200 + + Further changes for using std::unique_ptr + + * TAO/tao/PortableServer/Active_Object_Map.cpp: + +commit df6d9751d3bf1a45c22c6282fe404ba2857f6ff4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 14:07:19 2018 +0200 + + No need to initialise auto_ptr/unique_ptr to 0 in the constructor + + * TAO/tao/PortableServer/Active_Object_Map.cpp: + +commit 80f2464b6e7f72016db991dbd12e87ba1fd83271 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 13:43:53 2018 +0200 + + Make use of std::unique_ptr when we have C++11 + + * TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp: + * TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp: + +commit b361514d8bea5de5bd984bb10205ecf0843c04c6 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 13:12:51 2018 +0200 + + Make use of std::unique_ptr when we have C++11 + + * TAO/tao/PortableServer/Active_Object_Map.h: + +commit afa546317cb4ad800e4337edd4ea98f91135e7c9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 13:03:34 2018 +0200 + + Use std::unique_ptr when using C++11 + + * TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp: + * TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp: + * TAO/tao/AnyTypeCode/Any_Impl_T.cpp: + * TAO/tao/Connector_Registry.cpp: + * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp: + * TAO/tao/Load_Protocol_Factory_T.h: + * TAO/tao/ORB_Core.cpp: + * TAO/tao/RTCORBA/Thread_Pool.cpp: + * TAO/tao/Stub.cpp: + * TAO/tao/Synch_Invocation.cpp: + +commit e915b48fcd7eee34bf661673b532bfa0b6e9cccb +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 12:28:55 2018 +0200 + + Make use of std::unique_ptr when we have C++11 + + * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp: + * TAO/tao/Load_Protocol_Factory_T.h: + +commit 880d4ee94da593dedaa766e0ded0cb09eb15394b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 11:56:40 2018 +0200 + + Make use of std::unique_ptr when we have C++11 + + * TAO/tao/RTCORBA/Thread_Pool.cpp: + +commit 7344ff452a10010a88fa937d85ebaed40eddb638 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 11:46:45 2018 +0200 + + Make use of std::unique_ptr when we have C++11 + + * TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp: + +commit c3953feb3a48473bc0b78691e7fe18d08f477df8 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue May 15 11:07:52 2018 +0200 + + When we have C++11 make use of std::unique_ptr + + * TAO/tao/AnyTypeCode/Any_Impl_T.cpp: + * TAO/tao/Connector_Registry.cpp: + * TAO/tao/ORB_Core.cpp: + * TAO/tao/Stub.cpp: + * TAO/tao/Synch_Invocation.cpp: + +commit c560110d8f3206a7866866cff325489eb2ea88db +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon May 14 16:27:08 2018 +0200 + + ACE+TAO x.4.8 release + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/docs/bczar/bczar.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/TAO/ChangeLogs/TAO-2_5_1 b/TAO/ChangeLogs/TAO-2_5_1 new file mode 100644 index 00000000000..ed7eaf9d92c --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_5_1 @@ -0,0 +1,293 @@ +commit d6b268e7eee10aabaa775065f72e283e2ce053f0 +Merge: 15c371e5493 c7571f5ff80 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 6 09:42:41 2018 +0200 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO + +commit 15c371e5493f0d727cd0bd395fe218b064bc4f16 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 6 09:41:29 2018 +0200 + + List important changes for the upcoming release + + * ACE/NEWS: + * TAO/NEWS: + +commit c7571f5ff80763484bf073f37dabfed0cb7983cc +Merge: f475da3f322 4a09b0b10cb +Author: mcorino <mcorino@remedy.nl> +Date: Sun Aug 5 17:45:31 2018 +0200 + + Merge pull request #656 from mcorino/mco-feature-4310-string-cdr-optimize + + add full support for streaming std::(w)string + +commit f475da3f3220f507ce3d9b21793819a1aee65a48 +Merge: 81d3d81c4cf 36ea9ed6bdd +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Aug 5 13:03:33 2018 +0200 + + Merge pull request #657 from jwillemsen/master + + When we log that there is a new ORB add the TAO version number and some unicode logging fixes + +commit 00889d546822fd839b75a1259c66f92be16ac5a4 +Merge: 36ea9ed6bdd 81d3d81c4cf +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Aug 5 11:38:04 2018 +0200 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO + +commit 36ea9ed6bdd8cccc357464284673f3c3088245d2 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Aug 5 11:37:12 2018 +0200 + + Unicode logging fixes + + * TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp: + +commit 87a6798992b9a811f0cc18518eb67d1ad2eacdb9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Aug 5 11:36:54 2018 +0200 + + When logging that we are a new ORB add the TAO version number so that we can easily determine what TAO version is being used + + * TAO/tao/TAO_Internal.cpp: + +commit 4a09b0b10cbea1fdcb16161583ee22f7d151784b +Author: Martin Corino <mcorino@remedy.nl> +Date: Fri Aug 3 14:15:38 2018 +0200 + + add full support for streaming std::(w)string + + (optimized for C++11 and onwards) + added tests for optimized std::(w)string support + extend character translators with std::(w)string support also + +commit 81d3d81c4cf0904cd8d5b4c0872cd1821b5d874e +Merge: 7dc5afd1290 4fd91ecdac2 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jul 27 10:42:13 2018 +0200 + + Merge pull request #653 from jwillemsen/master + + Documentation enhancements + +commit 4fd91ecdac261befa4210db0f40512e33a02b0a5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jul 27 09:15:34 2018 +0200 + + Removed references to CIDLC + +commit 217c6a22c82831e68367cce43967610a5fb2c9e3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jul 27 09:10:18 2018 +0200 + + Document -GX flag + + * TAO/TAO_IDL/be/be_util.cpp: + +commit 8a9912c18c61fcb3141d661a6536370091a6fc67 +Author: Adam Mitz <mitza@ociweb.com> +Date: Mon Jul 9 10:08:30 2018 -0500 + + Removed duplicated project files (MPC issue 50) + +commit 99c9779877f85f1201b50b1d4e1e49cd552ad9aa +Merge: d271d46ebb2 29b0969b1ca +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Jun 27 21:35:29 2018 +0200 + + Merge pull request #649 from jwillemsen/jwi-catchbyref + + Catch exceptions by reference, not by value + +commit 29b0969b1ca474cc83e8499faabafd0d9d162ec0 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Jun 27 19:48:34 2018 +0200 + + Catch exceptions by reference, not by value + + * TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp: + * TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp: + * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp: + * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp: + * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp: + * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp: + * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp: + * TAO/tests/Bug_2241_Regression/Client_Task.cpp: + * TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp: + * TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp: + * TAO/tests/UNKNOWN_Exception/client.cpp: + +commit 7165c10ea6079dd7a01d5e490a4399d40d6f26f7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Jun 27 08:44:05 2018 +0200 + + Moved location of new define + + * TAO/tao/Object.h: + +commit 5cbcb4433ea1a1d193c4d9febc8f368473c15f49 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Wed Jun 27 08:43:48 2018 +0200 + + Set a new define when we use atomic refcount so that we can use that in OpenDDS + + * TAO/tao/Object.h: + +commit 1a4ad4bce2baf938893b004b267dd2a9740bf05c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jun 26 08:17:36 2018 +0200 + + Revert rename of ref_count_ to refcount_ + + * TAO/tao/PortableServer/Servant_Base.cpp: + * TAO/tao/PortableServer/Servant_Base.h: + +commit 5bcb4583a4d36e392cf41c6b47ccdb04fd55d504 +Merge: 15917ee2583 e1d2dd92025 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jun 25 18:27:03 2018 +0200 + + Merge pull request #643 from jwillemsen/jwi-atomicservantrefcount + + Make use of std::atomic for the refcount when we have C++11 enabled + +commit 15917ee25836f6704604a49e2aa76f8fb1423734 +Merge: 1e957f1a2ec c970fefc424 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jun 25 18:26:29 2018 +0200 + + Merge pull request #644 from jwillemsen/jwi-incorrectportablserverlogging + + Fixed incorrect ascii logging + +commit c970fefc4240a16c613ac35abd99f533c2fb8256 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jun 25 16:48:06 2018 +0200 + + Layout change + + * TAO/tao/PortableServer/IdUniquenessStrategyUnique.h: + +commit 5c09ab8d5f38438847a7a490a579840eea07d58a +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jun 25 16:46:47 2018 +0200 + + Fixed incorrect logging of ascii strings in portableserver + + * TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp: + +commit e1d2dd92025037f1fac37a85a6bf465238e5c296 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jun 25 10:00:23 2018 +0200 + + Fixed another refcount issue where the ec event count was intended + + * TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp: + +commit 65a1833f81bf3f84d4bd33d3944a9733f37aae94 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Jun 25 09:14:51 2018 +0200 + + Fixed compile errors due to rename in the base, make clear that ec has its own refcount + + * TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h: + * TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp: + +commit 36d7aee1a214c14b1621bf773e9aae82c9971af5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Jun 24 19:23:50 2018 +0200 + + Make use of std::atomic when C++11 has been enabled + + * TAO/tao/AnyTypeCode/Any_Impl.cpp: + * TAO/tao/AnyTypeCode/Any_Impl.h: + * TAO/tao/AnyTypeCode/NVList.h: + * TAO/tao/AnyTypeCode/True_RefCount_Policy.h: + * TAO/tao/DynamicInterface/Context.cpp: + * TAO/tao/DynamicInterface/Context.h: + * TAO/tao/DynamicInterface/ExceptionList.cpp: + * TAO/tao/DynamicInterface/ExceptionList.h: + * TAO/tao/DynamicInterface/ExceptionList.inl: + * TAO/tao/DynamicInterface/Request.h: + * TAO/tao/DynamicInterface/Server_Request.h: + * TAO/tao/Intrusive_Ref_Count_Base_T.h: + * TAO/tao/Intrusive_Ref_Count_Base_T.inl: + * TAO/tao/ORB.h: + * TAO/tao/ORB.inl: + * TAO/tao/ORB_Core.h: + * TAO/tao/ORB_Core.inl: + * TAO/tao/Object.cpp: + * TAO/tao/Object.h: + * TAO/tao/PortableServer/Servant_Base.cpp: + * TAO/tao/PortableServer/Servant_Base.h: + * TAO/tao/Principal.h: + * TAO/tao/Profile.h: + * TAO/tao/Refcounted_ObjectKey.cpp: + * TAO/tao/Refcounted_ObjectKey.h: + * TAO/tao/Refcounted_ObjectKey.inl: + * TAO/tao/Reply_Dispatcher.cpp: + * TAO/tao/Reply_Dispatcher.h: + * TAO/tao/Stub.h: + * TAO/tao/Valuetype/AbstractBase.h: + * TAO/tao/Valuetype/ValueBase.cpp: + * TAO/tao/Valuetype/ValueBase.h: + * TAO/tao/Valuetype/ValueFactory.cpp: + * TAO/tao/Valuetype/ValueFactory.h: + +commit 9d5ca158661004ec2ecabc64f2ff8297c4c2e1b4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jun 23 21:21:17 2018 +0200 + + MacOSX doesn't have a std::atomic_uint32_t + + * TAO/tao/Intrusive_Ref_Count_Base_T.h: + * TAO/tao/PortableServer/Servant_Base.h: + * TAO/tao/Profile.h: + * TAO/tao/Stub.h: + +commit 2aeaf51d0efe793cf67281262260b906a5b0f21c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Jun 23 11:41:51 2018 +0200 + + Make use of std::atomic for the refcount when we have C++11 enabled + + * TAO/tao/PortableServer/Servant_Base.cpp: + * TAO/tao/PortableServer/Servant_Base.h: + +commit 89543cbe78f86834c54e053cd2d87516b50df585 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 22 12:51:09 2018 +0200 + + List empty PIDL_Files section to not generate DynamicANy.pidl twice + + * TAO/tao/DynamicAny/DynamicAny.mpc: + +commit 86fc71497323f80410c9fe0afe5d82fffb044c20 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Jun 15 08:37:26 2018 +0200 + + Add missing include of ace/Auto_Ptr.h + + * TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h: + +commit 9f9cbdf71f7ef7c30c4b288de7f7b48f2a8c046e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Jun 12 10:04:59 2018 +0200 + + Make x.5.0 public + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/TAO/ChangeLogs/TAO-2_5_2 b/TAO/ChangeLogs/TAO-2_5_2 new file mode 100644 index 00000000000..70d1c654951 --- /dev/null +++ b/TAO/ChangeLogs/TAO-2_5_2 @@ -0,0 +1,903 @@ +commit 7bb903ff16f80a6bd7b6a0d9779162bb0ee43ed6 +Merge: 06f7c45a665 53b3dd4d14e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Sep 16 14:11:31 2018 +0100 + + Merge pull request #709 from jwillemsen/jwi-constexceptiondata + + Use const exception data pointer when using invoke, not changed by th… + +commit 53b3dd4d14ef7f317394d2cb0d0bc72212b52d09 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Sep 16 13:49:49 2018 +0200 + + Use const exception data pointer when using invoke, not changed by the implementation, only used + + * TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c: + * TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp: + * TAO/tao/DynamicInterface/DII_Invocation_Adapter.h: + * TAO/tao/Invocation_Adapter.cpp: + * TAO/tao/Invocation_Adapter.h: + * TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp: + * TAO/tao/Messaging/Asynch_Invocation_Adapter.h: + * TAO/tao/operation_details.h: + * TAO/tao/operation_details.inl: + +commit 07537d121db79a027dea811939fba8b13c2c44c3 +Author: Adam Mitz <mitza@ociweb.com> +Date: Fri Sep 14 10:37:21 2018 -0500 + + Updated SSLECName option (see PR #683) for compatibility with OpenSSL libraries built without EC support; applied style guidelines + +commit aaeeeb818dff6826cca42d1a5d63eb106fa8ab02 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Sep 11 09:01:13 2018 +0200 + + Removed comment at top of mpc file + +commit fcfe2830f8f8790a4f044d5cd3d12c6b2ae8edd7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Sep 11 09:00:09 2018 +0200 + + Layout changes + + * TAO/tao/CodecFactory/CDR_Encaps_Codec.h: + * TAO/tao/CodecFactory/CodecFactory_impl.h: + +commit d8991068db5dfcb98a703323d7469da9615c43e2 +Merge: a752608aaa7 06a00d65352 +Author: Adam Mitz <mitza@objectcomputing.com> +Date: Mon Sep 10 18:17:32 2018 -0500 + + Merge pull request #697 from mitza-oci/qt5 + + Qt5 support + +commit 95bf013bd3bccdada189c038efbd93c87b774b1b +Author: Adam Mitz <mitza@ociweb.com> +Date: Fri Sep 7 16:29:56 2018 -0500 + + Qt5 support + +commit 8024f9ae9fc8acce347ebd765cf08e550823c111 +Author: Adam Mitz <mitza@ociweb.com> +Date: Fri Sep 7 16:24:55 2018 -0500 + + Fixing warnings from clang by using up-to-date lex and yacc + +commit 43f29d07196a29b536b8b0dc934c7877e93d16c7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Sep 7 16:59:33 2018 +0200 + + Layout changes + + * ACE/ace/QtReactor/QtReactor.h: + * TAO/tao/BiDir_GIOP/BiDirGIOP.h: + * TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h: + * TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h: + * TAO/tao/BiDir_GIOP/BiDir_Policy_i.h: + * TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h: + * TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h: + * TAO/tao/EndpointPolicy/EndpointPolicy_i.h: + * TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h: + * TAO/tao/IORInterceptor/IORInfo.h: + * TAO/tao/QtResource/QtResource_Factory.h: + +commit 1cd6a89f603e5c6942f8decb6390a7ba1321c730 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Sep 4 17:19:31 2018 +0200 + + Layout changes + + * TAO/tao/DynamicInterface/DII_Invocation.h: + * TAO/tao/DynamicInterface/DII_Reply_Handler.h: + +commit 5181314f8b8e80f23fe9289fdf7ccbfc5d950405 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Sep 4 15:45:10 2018 +0200 + + Layout changes + + * TAO/tao/ImR_Client/ServerObject.idl: + +commit 15ba1c53b779239d11e3451c196efff0855b17b7 +Merge: e1e2fd98b9b d81e9fe526d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Sep 4 13:05:37 2018 +0100 + + Merge pull request #692 from jwillemsen/jwi-imrlogging + + Only log errors when we have a debugging level set + +commit d81e9fe526d94121a583d93ae73beff22bc34ee3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Sep 4 13:17:02 2018 +0200 + + Only log errors when we have a debugging level set + + * TAO/tao/ImR_Client/ImR_Client.cpp: + +commit e1e2fd98b9bdf875ccca86fbe16c09ae54ffb948 +Merge: 982ff2069c2 4a37c070ec5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Sep 3 18:23:58 2018 +0100 + + Merge pull request #691 from jwillemsen/jwi-typo + + Fixed typo in comment + +commit eeceb693bd5dc1349f0094c1f925fc8c160e5e9e +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Sep 3 16:23:23 2018 +0200 + + Layout change + + * TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp: + +commit 9f3efb4dae088e53fadfdacb66acc0647b5bc9d0 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Sep 3 13:45:38 2018 +0200 + + Layout changes + + * TAO/tao/PortableServer/PortableServer.cpp: + * TAO/tao/PortableServer/Root_POA.h: + * TAO/tao/PortableServer/Upcall_Command.h: + * TAO/tao/PortableServer/Upcall_Wrapper.h: + +commit d5a11aab8e8ac24aaa5bd70069092208c3752c20 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Sep 3 13:45:25 2018 +0200 + + Make TAO_Requires_POA_Initializer a const int as attempt to let C++Builder be used with precompiled headers + + * TAO/tao/PortableServer/PortableServer.h: + +commit b019a5bdcd18b04b9c175c9bb79eb515178b75b2 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Sep 3 09:40:00 2018 +0200 + + Layout changes + + * TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp: + * TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp: + * TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp: + * TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp: + * TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp: + * TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp: + * TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp: + * TAO/tao/PortableServer/Network_Priority_Hook.cpp: + * TAO/tao/PortableServer/Object_Adapter_Factory.cpp: + * TAO/tao/PortableServer/Policy_Strategy.h: + * TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp: + * TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h: + * TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp: + * TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp: + * TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h: + * TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp: + * TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp: + * TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp: + * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/ThreadStrategyORBControl.cpp: + * TAO/tao/PortableServer/ThreadStrategySingle.cpp: + * TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp: + +commit 407ffcd7ae65dccd6c203d12474697ca90f39dbc +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Sep 3 09:33:43 2018 +0200 + + Layout changes + + * TAO/tao/PortableServer/IdAssignmentStrategyFactory.h: + * TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h: + * TAO/tao/PortableServer/IdUniquenessStrategyFactory.h: + * TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h: + * TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h: + * TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h: + * TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h: + * TAO/tao/PortableServer/LifespanStrategyFactory.h: + * TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h: + * TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h: + * TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h: + * TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h: + * TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h: + * TAO/tao/PortableServer/RequestProcessingStrategyFactory.h: + * TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h: + * TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h: + * TAO/tao/PortableServer/ServantRetentionStrategyFactory.h: + * TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h: + * TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h: + * TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h: + * TAO/tao/PortableServer/ThreadStrategyFactory.h: + * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h: + * TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h: + +commit 8dcfb4d004aa2644c306ace0960f3349bfba4488 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Sep 3 09:07:34 2018 +0200 + + Some more unicode related changes + + * TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h: + * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h: + * TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp: + +commit 5d4650e1fb199403206cd8ef5ea41f2b095f1b6f +Merge: 9d8f3669be7 79f53f320db +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 31 21:12:05 2018 +0100 + + Merge pull request #687 from jwillemsen/jwi-ifr + + Unicode and layout fixes to the IFR + +commit 79f53f320db28270d2d4d21a46d514e65e22af44 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 31 18:50:05 2018 +0200 + + Unicode and layout fixes to the IFR + + * TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h: + * TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h: + * TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h: + +commit 2682046ca800ec414414af8fee13b9d2aa136bc4 +Author: Doug Lewis <lewisdo@objectcomputing.com> +Date: Fri Aug 31 09:10:54 2018 -0500 + + SSLIOP ECDH: Updated NEWS file to include modifications for pull request #683. + +commit b02c157ba9049f5405ec889463cf290e97fd50c8 +Author: Doug Lewis <lewisdo@objectcomputing.com> +Date: Thu Aug 30 12:43:33 2018 -0500 + + SSLIOP ECDH: Reduced the scope of the variable ec_nid. + +commit 3ff3e337f1b70600b9ebc9c02c1bcc2e0c8d33f2 +Author: Doug Lewis <lewisdo@objectcomputing.com> +Date: Thu Aug 30 12:14:33 2018 -0500 + + SSLIOP ECDH: Removed id line at top of file. + +commit 7d870b7618398f3e3caa477df8d13b2ac44e1485 +Author: Doug Lewis <lewisdo@objectcomputing.com> +Date: Thu Aug 30 10:18:49 2018 -0500 + + SSLIOP ECDH: Updated to execute test using ECDH. + +commit 1c48b797177a0494b3e976058890b47f5348b1da +Author: Doug Lewis <lewisdo@objectcomputing.com> +Date: Thu Aug 30 09:39:43 2018 -0500 + + Added Eliptic Curve support to SSLIOP. + +commit 4c3a606f281cdd7774d30e9c5332b0c77916f2ba +Merge: abc4ad2d92d 73b03c94fe5 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 13 21:23:15 2018 +0200 + + Merge pull request #669 from jwillemsen/jwi-aamserverstatus + + For per client activated servers store the server reference within the AAM + +commit cc7af2a7494f2d3780d546b727ef4e2dcb1f34d9 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 13 16:02:22 2018 +0200 + + Remove old security files + +commit 73b03c94fe505229f6b65049b1e63fd79b1d68d7 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 13 12:11:02 2018 +0200 + + Layout changes + + * TAO/DevGuideExamples/GettingStarted/README: + * TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp: + * TAO/DevGuideExamples/ValueTypes/Messenger/README: + +commit ef21fb3d8291aa9ee52e015dc27f9799213f3bc3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 13 12:10:52 2018 +0200 + + Destroy the ORB at the end of main + + * TAO/DevGuideExamples/AMH/MessengerClient.cpp: + * TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp: + +commit 7025278b0f67b8fd708ca200190700096a72ab20 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 13 12:01:35 2018 +0200 + + List ImR changes + + * TAO/NEWS: + +commit 2e6128b2a163baf87b47c1cdfafdb6cfd0cc67fb +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 13 12:01:22 2018 +0200 + + Const fix + + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + +commit 020071fb0b2ac9695189c7f0ada32f43a06669a4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 13 09:51:19 2018 +0200 + + Active_Pid_Setter is only required on Windows + + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h: + +commit 56745c6aa5a41f32c5f579374c11026da512c0ed +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 13 09:49:46 2018 +0200 + + Shutdown the ORB at the end of the test + + * TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp: + * TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp: + * TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp: + * TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp: + * TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp: + * TAO/orbsvcs/tests/ImplRepo/link_poas/README: + * TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale/client.cpp: + * TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp: + +commit 2ebdd3122e41b5248ce980f9a7e1feba36e13b95 +Merge: 866e66604d7 83f60cc01e3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 13 09:29:48 2018 +0200 + + Merge branch 'master' into jwi-aamserverstatus + +commit 83f60cc01e3507d4f62c96cb6ec92283637e63a9 +Merge: 89254264ab9 1c187c24033 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Mon Aug 13 09:16:32 2018 +0200 + + Merge pull request #673 from jwillemsen/jwi-anyarrayuniqueptr + + Make use of std::unique_ptr when C++11 or newer is enabled + +commit 1c187c2403375db21b15bd7d5d73f50ee109cde6 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Aug 12 19:25:53 2018 +0200 + + Make use of std::unique_ptr when C++11 or newer is enabled + + * TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp: + +commit bf184730dcc870979f5e2cdbd974576c18eb2ae4 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Aug 12 19:22:49 2018 +0200 + + Catch exceptions by reference + + * TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp: + * TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h: + * TAO/tests/ZIOP/client.cpp: + +commit 866e66604d7b80c6847ff82895ff594f95048ae2 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sun Aug 12 11:12:19 2018 +0200 + + In a per client mode each server only gets one request and it is the responsibility of the client to shutdown the server at that moment + + * TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h: + * TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp: + +commit 0594c965df6cd3537b10ae152cc47d6786bc9abf +Merge: 09272a89da2 cfcc4c2fa50 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Aug 11 11:06:12 2018 +0200 + + Merge pull request #671 from jwillemsen/jwi-imractivator-loggingfix + + Fixed incorrect order of arguments to logging macro + +commit 3a468cb9498ceb79b53b595da51c41fe2f7b5f59 +Merge: 5e6bac19742 cfcc4c2fa50 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Aug 11 09:14:47 2018 +0200 + + Merge branch 'jwi-imractivator-loggingfix' into jwi-aamserverstatus + +commit cfcc4c2fa5082a72f69802679a45809d651057c8 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Aug 11 09:14:07 2018 +0200 + + Fixed incorrect order of arguments to logging macro + + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + +commit 5e6bac19742e4f86be8310857c046eb7a83da9ca +Merge: 5f46c339eff 6f4b009d2fb +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Aug 11 09:01:00 2018 +0200 + + Merge branch 'jwi-imrwindows-fix' into jwi-aamserverstatus + +commit 5f46c339eff94c16cdabe5abcc4c695d080d94c4 +Merge: 741d9ae10dc f061bb71b6b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Aug 11 09:00:54 2018 +0200 + + Merge branch 'master' into jwi-aamserverstatus + +commit 6f4b009d2fbdf9387ade953d0839b49889fd0884 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Sat Aug 11 09:00:20 2018 +0200 + + Fixed windows runtime issue + + * TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp: + +commit f061bb71b6b58cc51aeae57fd99e10e6de286c1c +Merge: 68381f0376d fb7aa2fd418 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 21:30:29 2018 +0200 + + Merge pull request #668 from jwillemsen/jwi-imr-enhancements + + Logging enhancements to the ImR + +commit 68381f0376d2d15399c41a6d6f87c84158019b82 +Merge: 4cae0e9397e aaa64c96bcc +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 16:33:39 2018 +0200 + + Merge pull request #667 from jwillemsen/jwi-valuetypeamh-uniqueptr + + Make use of std::unique_ptr when we have C++11 or newer + +commit 741d9ae10dc93e259ffc1374101cf5714b1d0936 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 16:33:22 2018 +0200 + + Store the server status for per client activation within the AAM + + * TAO/orbsvcs/DevGuideExamples/ImplRepo/README: + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp: + +commit fb7aa2fd4182de6fc7b736de2b6818ab8caeec58 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 15:43:31 2018 +0200 + + Pass -ORBDebugLevel to the imr with the user specified level (-debug) + + * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: + +commit f956338f34bb7e4692e8237f6f056c2989850556 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 15:43:12 2018 +0200 + + Fixed compile error + + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + +commit d7aa752a85bcbab5479d688bb848109584bc1370 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 15:41:31 2018 +0200 + + Revert some test changes, the AAM for multiple parallel spawned servers for per client mode will share the same Server_Info struct, aligned logging of the AAM + + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + +commit c0be713cc78355a3c314ebcd0dd1fec4e6009b88 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 15:26:58 2018 +0200 + + Check for self assignment in assignment operator + + * TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp: + +commit 7527844612ad3476f1d9a3d4de94cf2b59227f99 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 15:26:33 2018 +0200 + + Docu change + + * TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h: + +commit ae4fd13501edbe7a1dcdd5765499805b5739a9c6 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 15:26:16 2018 +0200 + + Removed get_info method, not used, const changes + + * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp: + * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h: + +commit 4f304ec1d6443641c2b64a1adc2c56f0a6e84c5d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 15:25:34 2018 +0200 + + Initialise pointer to zero + +commit 786e4ceb66569c307edcd4fd27290e4c7cbb192a +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 15:01:53 2018 +0200 + + Initialise pointer with zero + + * TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp: + +commit aaa64c96bcc4a3807ffeb709390c31dbf3036cb6 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 14:01:15 2018 +0200 + + Make use of std::unique_ptr when we have C++11 or newer + + * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + +commit 2de77538d1c27db849df7f0febeeca1a711227aa +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 14:00:08 2018 +0200 + + Enhanced logging and use more const + + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + +commit 9626700e4e3fa997bb1e9e9a2a399eca3960bde6 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 13:31:24 2018 +0200 + + Fixed typos + + * ACE/ace/Connector.h: + * TAO/docs/pluggable_messaging.html: + * TAO/examples/Persistent_Grid/Grid_Client_i.cpp: + * TAO/examples/Persistent_Grid/Persistent_Client_i.cpp: + * TAO/examples/Simple/grid/Grid_Client_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp: + * TAO/tao/ImR_Client/ImplRepo.idl: + +commit dfadfdb61a81156c29843b1f109efb26b16fa777 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 12:53:57 2018 +0200 + + Layout changes + + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + +commit 216262946e5a3cbd2aee32466a7df8389ffda232 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 12:53:35 2018 +0200 + + Pass the server id to the LifeEntry so that we have it in our log + + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + +commit 06c60787c7ef2e522430a674d21834561954dc3f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 12:15:58 2018 +0200 + + Logging enhancements + + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp: + * TAO/orbsvcs/ImplRepo_Service/Server_Info.h: + * TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: + +commit 6137b63daec938fd3db13a36f26ab5df072e9477 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 11:29:14 2018 +0200 + + Logging enhancements + + * TAO/orbsvcs/ImplRepo_Service/Activator_Options.h: + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: + +commit 59b8c6ab8b8f508c84ef40f9dc1f0504e83d17b1 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 10:44:43 2018 +0200 + + Fixed typo + + * TAO/orbsvcs/ImplRepo_Service/README: + +commit a9845587e6bb5d310e4d8bbec421ef102327576f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 10:41:39 2018 +0200 + + Logging and const changes + + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + +commit 1cf406cdd07dd66a51d5a78dcbf65499fe21be92 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 10:32:26 2018 +0200 + + Logging enhancements + + * TAO/bin/tao_other_tests.lst: + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.h: + * TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp: + * TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp: + +commit c534c7d92cb95fe9424eeceec259836455f9b432 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 09:53:07 2018 +0200 + + Logging enhancements + + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp: + +commit 9f673be240c9e845ed051d9a225e6729332bf5f8 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 09:52:50 2018 +0200 + + Added ability to control the server activation mode + + * TAO/orbsvcs/tests/ImplRepo/scale_clients/README: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: + +commit d26426d12efd557b6bb0a2da07adf0d77471f5f6 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 09:25:48 2018 +0200 + + Logging enhancements + + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + +commit 584e9af5b1a9655551f0bcd92b1510631da59ab3 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 09:19:34 2018 +0200 + + Tab changes and add a -imrdebug commandline argument to set the ImR Locator/Activator log level + + * TAO/orbsvcs/tests/ImplRepo/scale_clients/README: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: + +commit 1f163d5c9ba2bb3764ce1b836a78bf5546a5bd70 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 09:04:47 2018 +0200 + + Layout changes + + * TAO/orbsvcs/tests/ImplRepo/double_start/README: + * TAO/orbsvcs/tests/ImplRepo/manual_start/README: + * TAO/orbsvcs/tests/ImplRepo/scale/client.conf: + * TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/README: + * TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp: + +commit b708a29934c1707886f0979468c6d5b713c662da +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Fri Aug 10 09:00:45 2018 +0200 + + Logging enhancements + + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp: + +commit 3dedafeb6acafeb5701375bd765b04357e5a921c +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 20:46:56 2018 +0200 + + Const and unicode fixes + + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp: + * TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp: + * TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp: + * TAO/tao/ImR_Client/ImR_Client.cpp: + +commit 5351dea3eb3fd7c32819ada82049403d8cae6a7f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 17:05:07 2018 +0200 + + Unicode logging fixes + + * TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp: + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * TAO/orbsvcs/ImplRepo_Service/Replicator.cpp: + * TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp: + +commit 136779585933c715d25f599be3117c152e06590d +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 16:59:11 2018 +0200 + + Logging enhancements + + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + +commit 695b624dedc17593410c5da9461c5b91bd1dc6a8 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 16:53:50 2018 +0200 + + Indent changes + + * TAO/orbsvcs/tests/ImplRepo/scale_clients/README: + +commit 2a69dbad94ef395afb52bad8fc5bcb970bb3c4bf +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 16:53:35 2018 +0200 + + Fixed unicode logging error + + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + +commit 47fe3755c2bd041357b2221dcca9c03a5bc4f064 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 16:38:51 2018 +0200 + + Log the POA name when we log that we inform the ImR + + * TAO/tao/ImR_Client/ImR_Client.cpp: + +commit a50ed09ff10fa87ff882cf5e9db866a333162e0f +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 16:28:13 2018 +0200 + + Only log when debug is set and simplify logging of commandline + + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + +commit ac938136f2327c15a229472ba30a564861732535 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 16:26:13 2018 +0200 + + Use const for a variable we don't change + + * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + +commit 1c5b397ef2b387c1cf1d8f90e73b9b5d86edad9a +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 15:33:29 2018 +0200 + + Fixed typo in comment + + * TAO/orbsvcs/ImplRepo_Service/LiveCheck.h: + +commit 82fd4e96534ec4ea055e557cdac5aa7da7393ceb +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 15:30:40 2018 +0200 + + Simplified logging + + * TAO/tao/ImR_Client/ImR_Client.cpp: + +commit 78a0a7d39437c57f68a4a5f1d459d2bf4694bdee +Merge: b1a50e57b5a 134ed84e9c2 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 11:41:59 2018 +0200 + + Merge pull request #664 from jwillemsen/jwi-doxygenfixes + + Doxygen fixes to PortableGroup + +commit b1a50e57b5a499472a299a29067e1268adac2359 +Merge: 1c46338c59b beb0ff66f84 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 11:40:59 2018 +0200 + + Merge pull request #661 from jwillemsen/jwi-corbaomglinks + + Fixed links to the OMG website + +commit 134ed84e9c281a5482b454a0d4ac80344501cf73 +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 11:05:48 2018 +0200 + + Fix doxygen warnings + + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h: + +commit f92154b03a1dda2440d9be98219fea996623029b +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Thu Aug 9 10:48:41 2018 +0200 + + Make x.5.1 public and prepare for the next release + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: + +commit beb0ff66f84c1a2d37de0b02bb447468bac903ff +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Aug 7 13:00:05 2018 +0200 + + Fixed some more links + + * TAO/docs/rtcorba/omg_issues.html: + * TAO/docs/rtcorba/status.html: + +commit 4a32b32d47986c4c017b7da7101e74654fcb5cfa +Author: Johnny Willemsen <jwillemsen@remedy.nl> +Date: Tue Aug 7 12:50:45 2018 +0200 + + Fixed links to the OMG website + + * TAO/docs/rtcorba/status.html: + * TAO/tests/RTCORBA/README: diff --git a/TAO/DevGuideExamples/AMH/MessengerClient.cpp b/TAO/DevGuideExamples/AMH/MessengerClient.cpp index ed1b5ca729f..efa1bce7988 100644 --- a/TAO/DevGuideExamples/AMH/MessengerClient.cpp +++ b/TAO/DevGuideExamples/AMH/MessengerClient.cpp @@ -60,6 +60,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // Print the Messenger's reply. std::cout << "Reply: " << msg.in() << std::endl; + orb->destroy(); + return 0; } catch(const CORBA::Exception& ex) { diff --git a/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp b/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp index 6f0c98be0d0..a355424de26 100644 --- a/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp +++ b/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp @@ -62,6 +62,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // Print the Messenger's reply. std::cout << "Reply: " << msg.in() << std::endl; + orb->destroy(); + return 0; } catch(const CORBA::Exception& ex) { diff --git a/TAO/DevGuideExamples/GettingStarted/README b/TAO/DevGuideExamples/GettingStarted/README index 1ef1739d84b..6453845d699 100644 --- a/TAO/DevGuideExamples/GettingStarted/README +++ b/TAO/DevGuideExamples/GettingStarted/README @@ -1,5 +1,3 @@ - - File: DevGuideExamples/GettingStarted/README @@ -40,6 +38,3 @@ NOTE: script via following command: perl ../run_test.pl - - - diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp index 24eb1aab429..77880838f4f 100644 --- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp +++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp @@ -14,8 +14,7 @@ Messenger_i::~Messenger_i (void) CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, - char *& message - ) + char *& message) { std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp index ce9097d59b7..170f0499f31 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp @@ -24,12 +24,9 @@ Messenger_i::~Messenger_i (void) { } -CORBA::Boolean Messenger_i::send_message ( - const char * user_name, +CORBA::Boolean Messenger_i::send_message (const char * user_name, const char * subject, - char *& message - ) - + char *& message) { //Add your implementation here std::cerr << "Message from: " << user_name << std::endl; diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h index f4467924f58..8ab4755edce 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h @@ -29,9 +29,7 @@ public: virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, - char *& message - ); - + char *& message); }; diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp index 8324a171429..5bb6f8ea7c7 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp @@ -7,18 +7,13 @@ ClientInitializer::ClientInitializer (void) } void -ClientInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ) +ClientInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) { } void -ClientInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ) +ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { - // get Codec factory IOP::CodecFactory_var codec_factory = info->codec_factory(); diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp index b812a1851f3..84dae2a1ed6 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp @@ -6,18 +6,13 @@ ClientInitializer::ClientInitializer (void) } void -ClientInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ) +ClientInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) { } void -ClientInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ) +ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { - // get Codec factory IOP::CodecFactory_var codec_factory = info->codec_factory(); diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/README b/TAO/DevGuideExamples/ValueTypes/Messenger/README index 307faf36d2b..c5405c2afb4 100644 --- a/TAO/DevGuideExamples/ValueTypes/Messenger/README +++ b/TAO/DevGuideExamples/ValueTypes/Messenger/README @@ -1,5 +1,3 @@ - - This directory contains a CORBA example illustrating a simple client and a server with a Interface Messenger. The Messenger Interface has an operation for sending a message (send_message). The MessengerClient @@ -41,6 +39,3 @@ NOTE: script via following command: perl ../run_test.pl - - - @@ -1,3 +1,44 @@ +USER VISIBLE CHANGES BETWEEN TAO-2.5.2 and TAO-2.5.3 +==================================================== + +USER VISIBLE CHANGES BETWEEN TAO-2.5.1 and TAO-2.5.2 +==================================================== + +. Enhance logging within the ImR + +. Enhance the behavior of the ImR with a per-client + activation mode and multiple clients starting in + parallel + +. Modified the SSLIOP::Protocol_Factory::init to + process an "-SSLEcName" argument to set the ECDH + curve name. + +USER VISIBLE CHANGES BETWEEN TAO-2.5.0 and TAO-2.5.1 +==================================================== + +. Make use of std::atomic when C++11 or newer is enabled + for the CORBA reference counting + +USER VISIBLE CHANGES BETWEEN TAO-2.4.8 and TAO-2.5.0 +==================================================== + +. The TAO core libraries now use std::unique_ptr instead + of std::auto_ptr when C++11 or newer is enabled + +USER VISIBLE CHANGES BETWEEN TAO-2.4.7 and TAO-2.4.8 +==================================================== + +. Logging enhancements to the TAO core for some possible + error situations + +USER VISIBLE CHANGES BETWEEN TAO-2.4.6 and TAO-2.4.7 +==================================================== + +. TAO_IDL parses and discards IDLv4 annotations (applying, not defining) + +. Fixed Bug 1220 as it applies to the SHMIOP transport. + USER VISIBLE CHANGES BETWEEN TAO-2.4.5 and TAO-2.4.6 ==================================================== diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM index 7d6bc051567..fac2b5b6d35 100644 --- a/TAO/PROBLEM-REPORT-FORM +++ b/TAO/PROBLEM-REPORT-FORM @@ -40,8 +40,8 @@ To: tao-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - TAO VERSION: 2.4.6 - ACE VERSION: 6.4.6 + TAO VERSION: 2.5.2 + ACE VERSION: 6.5.2 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html index 878cbc3e590..3f9fb886448 100644 --- a/TAO/TAO-INSTALL.html +++ b/TAO/TAO-INSTALL.html @@ -31,7 +31,7 @@ to run TAO on:<P> <table width="100%" border=1> <tr valign=top> <td><b>Fully supported, i.e., continually tested and used daily</b></td> - <td>Solaris 9, Windows (Microsoft Visual C++ 7.1, 9.0, 10.0, 11.0, 12, and 14.0), + <td>Solaris 9, Windows (Microsoft Visual C++ 7.1, 9.0, 10.0, 11.0, 12, 14.0, and 14.1), Linux/Intel (Redhat, Debian, and SuSe), Android </td> </tr> @@ -143,7 +143,7 @@ bundle as a single piece instead of trying to mix and match things up.<P> <LI>Create config.h and platform_macros.GNU at the right places</LI> <LI>Delete all the GNUmakefiles (or sln and - vproj file as the case may be) from the TAO distrbution using + vproj file as the case may be) from the TAO distribution using the 'find' command.</LI> <LI>Change directory to $TAO_ROOT.</LI> <LI>Run MPC like this, $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc -type gnuace </LI> @@ -538,26 +538,36 @@ If users are building from our <a href="https://github.com/DOCGroup/ACE_TAO">git archive</a> the GNUmakefiles, and project files for building on various platforms will not be available. Users from git are expected to generate them -using <a href="../MPC/docs/README">MPC</a> before building ACE, TAO or -CIAO. We point out some suggestions below to get bootstrapped +using <a href="../MPC/docs/README">MPC</a> before building ACE or TAO. +We point out some suggestions below to get bootstrapped quickly. <UL> <LI> Please see <a href="#MPC"> instructions </a> above to download - MPC from our git repository <p> + MPC from our git repository</LI><p/> <LI>Please make sure that you have <a href="http://www.perl.org"> perl</a> installed, preferably perl 5.8 or higher. Users on Win32 based platforms are recommended to use <a href="http://www.activestate.com/Products/ActivePerl/"> Active State Perl </a>. We use active state perl without problems. We have ran into problems trying to use the cygwin version of perl on Win32 - based platforms. <p> + based platforms.</LI><p/> + <LI>When building from git, the ACE_ROOT and TAO_ROOT environment + variable settings differ from their settings in the ACE_wrappers + prepackaged source distribution: + <UL> + <LI>ACE_ROOT should point to the ACE subdirectory of the top level + ACE_TAO directory</LI> + <LI>TAO_ROOT should point to the TAO subdirectory of the top level + ACE_TAO directory</LI> + </UL> + </LI><p/> <LI>If you just want to build TAO and associated tests, examples, and associated utility libraries, we recommend the following alternatives: <UL> <LI> Build ACE and TAO separately. ACE needs to be built first and - instructins for building ACE are available at <a + instructions for building ACE are available at <a href="../ACE/ACE-INSTALL.html#MPC">ACE-INSTALL</a>. GNUmakefiles and project files for TAO can be generated by using the following commands:<p> @@ -565,7 +575,7 @@ quickly. from <CODE> $TAO_ROOT </CODE> to generate GNUmakefiles. Use <CODE> -type vc71 </CODE> to generate VC71 project and solution files, or <CODE>-type vc8</CODE> for VC8 project and solution files, or - <CODE>-type bmake</CODE> for Borland C++ make files.<p> + <CODE>-type bmake</CODE> for Borland C++ make files.</LI><p/> <LI> Build ACE+TAO together in one shot. To do that please issue the following commands: <p> <CODE> $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc </CODE> <p> @@ -576,13 +586,11 @@ quickly. generate VC71 project and workspace files. <CODE>TAO_ACE.sln</CODE> can be used by users to build ACE+TAO from a single workspace file. Users can use <CODE> -type vc8 </CODE> to generate the VC8 - solutions files. <p> - </UL> - <LI>If you want to build CIAO and its associated libraries - please see <a href="CIAO/CIAO-INSTALL.html"> CIAO-INSTALL <a> for - details. - - </UL> + solutions files. + </LI> + </UL> + </LI><p/> +</UL> <HR><P> diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp index 8f27b0346a0..aac7235ff2c 100644 --- a/TAO/TAO_IDL/ast/ast_expression.cpp +++ b/TAO/TAO_IDL/ast/ast_expression.cpp @@ -3179,11 +3179,19 @@ AST_Expression::ast_accept (ast_visitor *visitor) void AST_Expression::destroy (void) { - if (0 != this->pd_ev && EV_string == this->pd_ev->et) + if (0 != this->pd_ev) { - this->pd_ev->u.strval->destroy (); - delete this->pd_ev->u.strval; - this->pd_ev->u.strval = 0; + if (EV_string == this->pd_ev->et) + { + this->pd_ev->u.strval->destroy (); + delete this->pd_ev->u.strval; + this->pd_ev->u.strval = 0; + } + else if (EV_wstring == this->pd_ev->et) + { + ACE::strdelete (this->pd_ev->u.wstrval); + this->pd_ev->u.wstrval = 0; + } } delete this->pd_ev; diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index 9031cc249d5..5537fdfb139 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -410,8 +410,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i, // Only redefinition of the same kind. if (i->is_local () != fd->is_local () || i_nt != fd_nt - || i->is_abstract () != fd->is_abstract () - ) + || i->is_abstract () != fd->is_abstract ()) { idl_global->err ()->error2 (UTL_Error::EIDL_REDEF, i, diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp index e7f26ff7936..eec05414e03 100644 --- a/TAO/TAO_IDL/ast/ast_union.cpp +++ b/TAO/TAO_IDL/ast/ast_union.cpp @@ -736,8 +736,7 @@ AST_Union::compute_default_value (void) LM_ERROR, ACE_TEXT ("(%N:%l) AST_Union::") ACE_TEXT ("compute_default_value - ") - ACE_TEXT ("Bad case label value\n") - ), + ACE_TEXT ("Bad case label value\n")), -1 ); } diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 41c14dc6714..32d6caf4ecc 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -2319,9 +2319,7 @@ BE_GlobalData::messaging_exceptionholder (void) // Notice the valuetype "ExceptionHolder" that it is defined in the // "Messaging" module this->messaging_exceptionholder_->set_defined_in (msg); - this->messaging_exceptionholder_->set_prefix_with_typeprefix ( - "omg.org" - ); + this->messaging_exceptionholder_->set_prefix_with_typeprefix ("omg.org"); idl_global->scopes ().pop (); @@ -2812,7 +2810,6 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - break; case 'b': if (av[i][2] == '\0') @@ -2857,7 +2854,6 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - break; // = Various 's'erver side skeleton file name endings. case 's': @@ -2895,7 +2891,6 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - break; // Operation lookup strategy. // <perfect_hash>, <dynamic_hash> or <binary_search> @@ -2910,27 +2905,19 @@ BE_GlobalData::parse_args (long &i, char **av) } else if (ACE_OS::strcmp (av[i+1], "dynamic_hash") == 0) { - be_global->lookup_strategy ( - BE_GlobalData::TAO_DYNAMIC_HASH - ); + be_global->lookup_strategy (BE_GlobalData::TAO_DYNAMIC_HASH); } else if (ACE_OS::strcmp (av[i + 1], "perfect_hash") == 0) { - be_global->lookup_strategy ( - BE_GlobalData::TAO_PERFECT_HASH - ); + be_global->lookup_strategy (BE_GlobalData::TAO_PERFECT_HASH); } else if (ACE_OS::strcmp (av[i + 1], "binary_search") == 0) { - be_global->lookup_strategy ( - BE_GlobalData::TAO_BINARY_SEARCH - ); + be_global->lookup_strategy (BE_GlobalData::TAO_BINARY_SEARCH); } else if (ACE_OS::strcmp (av[i + 1], "linear_search") == 0) { - be_global->lookup_strategy ( - BE_GlobalData::TAO_LINEAR_SEARCH - ); + be_global->lookup_strategy (BE_GlobalData::TAO_LINEAR_SEARCH); } else { diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp index de20ddce5ea..14813ba4f6b 100644 --- a/TAO/TAO_IDL/be/be_util.cpp +++ b/TAO/TAO_IDL/be/be_util.cpp @@ -742,6 +742,10 @@ be_util::usage (void) )); ACE_DEBUG (( LM_DEBUG, + ACE_TEXT (" -GX\t\t\tgenerate empty A.h file\n") + )); + ACE_DEBUG (( + LM_DEBUG, ACE_TEXT (" -hc\t\t\tClient's header file name ending.") ACE_TEXT (" Default is C.h\n") )); diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp index 0bc958f26d8..220bbc8daf3 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp @@ -12,8 +12,7 @@ #include "exception.h" be_visitor_exception_any_op_ch::be_visitor_exception_any_op_ch ( - be_visitor_context *ctx - ) + be_visitor_context *ctx) : be_visitor_scope (ctx) { } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 9a2d3172eb0..9426f4f5e19 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -472,12 +472,15 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node) // explicitly take care of both cases (platforms with // and without native exception support). *os << be_nl - << "{" << be_nl + << "{" + << "\n#if defined (ACE_HAS_CPP11)" << be_idt_nl + << "std::unique_ptr< ::CORBA::Exception> safety (this->exception);" + << "\n#else" << be_nl << "auto_ptr< ::CORBA::Exception> safety (this->exception);" - << be_nl + << "\n#endif /* ACE_HAS_CPP11 */" << be_nl << "this->exception->_raise ();" << be_uidt_nl << "}" - << be_uidt_nl; + << be_nl; return 0; } diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index c35aec6ab0c..ce29e2c5206 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -70,7 +70,7 @@ #define yychar tao_yychar /* Copy the first part of user declarations. */ -#line 73 "fe/idl.ypp" /* yacc.c:339 */ +#line 71 "fe/idl.ypp" /* yacc.c:339 */ #include "utl_identifier.h" #include "utl_err.h" @@ -273,7 +273,7 @@ extern int tao_yydebug; typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 154 "fe/idl.ypp" /* yacc.c:355 */ +#line 152 "fe/idl.ypp" /* yacc.c:355 */ AST_Decl *dcval; /* Decl value */ UTL_StrList *slval; /* String list */ @@ -568,16 +568,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1339 +#define YYLAST 1285 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 107 +#define YYNTOKENS 108 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 382 +#define YYNNTS 389 /* YYNRULES -- Number of rules. */ -#define YYNRULES 567 +#define YYNRULES 578 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 817 +#define YYNSTATES 848 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -597,10 +597,10 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 101, 96, 2, 103, 104, 99, 97, 92, 98, 2, 100, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 91, 86, - 89, 93, 90, 2, 2, 2, 2, 2, 2, 2, + 89, 93, 90, 2, 105, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 105, 2, 106, 95, 2, 2, 2, 2, 2, + 2, 106, 2, 107, 95, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 87, 94, 88, 102, 2, 2, 2, @@ -632,63 +632,64 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 361, 361, 364, 365, 369, 372, 375, 381, 386, - 385, 396, 395, 406, 405, 416, 415, 426, 425, 436, - 435, 446, 445, 456, 455, 466, 465, 476, 475, 486, - 485, 496, 495, 506, 505, 516, 515, 530, 529, 542, - 581, 586, 541, 603, 611, 626, 636, 667, 671, 610, - 695, 699, 700, 704, 705, 710, 716, 709, 804, 810, - 803, 881, 882, 887, 926, 931, 886, 949, 948, 962, - 1000, 1031, 1065, 1064, 1076, 1083, 1084, 1085, 1086, 1090, - 1101, 1106, 1150, 1155, 1105, 1184, 1228, 1233, 1182, 1252, - 1250, 1292, 1291, 1305, 1311, 1318, 1325, 1332, 1358, 1385, - 1450, 1451, 1455, 1456, 1457, 1463, 1462, 1473, 1472, 1485, - 1486, 1491, 1490, 1501, 1500, 1511, 1510, 1521, 1520, 1531, - 1530, 1541, 1540, 1551, 1550, 1561, 1560, 1574, 1587, 1585, - 1613, 1620, 1631, 1630, 1658, 1656, 1683, 1695, 1741, 1769, - 1800, 1805, 1810, 1815, 1799, 1886, 1887, 1888, 1889, 1890, - 1891, 1892, 1904, 1909, 1978, 1980, 1982, 1983, 1997, 1998, - 2012, 2013, 2026, 2027, 2037, 2050, 2051, 2061, 2074, 2075, - 2085, 2095, 2108, 2109, 2119, 2129, 2142, 2193, 2194, 2203, - 2208, 2214, 2222, 2227, 2232, 2238, 2242, 2247, 2252, 2260, - 2330, 2329, 2340, 2345, 2350, 2355, 2382, 2391, 2390, 2462, - 2463, 2467, 2475, 2476, 2504, 2505, 2506, 2507, 2508, 2509, - 2510, 2511, 2515, 2516, 2517, 2518, 2522, 2523, 2524, 2528, - 2529, 2533, 2546, 2544, 2572, 2579, 2580, 2584, 2597, 2595, - 2623, 2630, 2647, 2666, 2667, 2671, 2676, 2681, 2689, 2694, - 2699, 2707, 2712, 2717, 2725, 2733, 2738, 2746, 2754, 2762, - 2770, 2779, 2778, 2794, 2828, 2833, 2793, 2852, 2855, 2856, - 2860, 2860, 2870, 2875, 2869, 2938, 2937, 2952, 2951, 2966, - 2971, 3007, 3012, 3069, 3074, 2965, 3098, 3106, 3120, 3130, - 3138, 3139, 3247, 3250, 3251, 3256, 3261, 3255, 3297, 3296, - 3310, 3321, 3341, 3349, 3348, 3364, 3369, 3363, 3386, 3385, - 3438, 3462, 3487, 3492, 3525, 3530, 3486, 3556, 3561, 3559, - 3566, 3570, 3607, 3612, 3605, 3693, 3754, 3764, 3753, 3777, - 3787, 3792, 3785, 3839, 3865, 3875, 3880, 3873, 3916, 3941, - 3950, 3949, 3991, 4002, 4022, 4030, 4035, 4029, 4097, 4098, - 4103, 4108, 4113, 4118, 4102, 4187, 4192, 4197, 4202, 4186, - 4280, 4285, 4315, 4320, 4279, 4338, 4343, 4408, 4413, 4336, - 4450, 4456, 4463, 4470, 4471, 4483, 4489, 4531, 4482, 4553, - 4552, 4563, 4562, 4575, 4580, 4578, 4585, 4590, 4595, 4589, - 4636, 4635, 4646, 4645, 4658, 4663, 4661, 4668, 4673, 4678, - 4672, 4725, 4733, 4734, 4735, 4845, 4850, 4855, 4864, 4869, - 4863, 4881, 4889, 4894, 4888, 4906, 4914, 4919, 4913, 4931, - 4939, 4944, 4938, 4956, 4963, 4976, 4974, 5000, 5007, 5036, - 5074, 5075, 5079, 5109, 5149, 5154, 5108, 5173, 5178, 5171, - 5221, 5220, 5231, 5238, 5239, 5244, 5243, 5254, 5253, 5264, - 5263, 5274, 5273, 5284, 5283, 5294, 5293, 5304, 5303, 5315, - 5406, 5413, 5439, 5546, 5556, 5562, 5568, 5641, 5714, 5789, - 5788, 5838, 5843, 5848, 5853, 5858, 5863, 5837, 5918, 5917, - 5928, 5935, 5942, 5950, 5955, 5949, 5967, 5968, 5972, 5974, - 5973, 5984, 5983, 5998, 6022, 5996, 6050, 6078, 6048, 6104, - 6105, 6106, 6110, 6111, 6115, 6143, 6174, 6219, 6224, 6172, - 6241, 6251, 6270, 6282, 6281, 6321, 6371, 6376, 6319, 6393, - 6398, 6406, 6411, 6416, 6421, 6426, 6431, 6436, 6441, 6446, - 6451, 6460, 6495, 6494, 6516, 6523, 6549, 6567, 6578, 6598, - 6605, 6616, 6621, 6640, 6645, 6615, 6660, 6667, 6672, 6679, - 6678, 6687, 6686, 6695, 6694, 6706, 6776, 6827, 6843, 6857, - 6864, 6924, 6929, 6934, 6928, 6995, 7000, 6994, 7015, 7016, - 7021, 7020, 7031, 7030, 7041, 7040, 7051, 7050 + 0, 360, 360, 363, 364, 368, 371, 374, 380, 392, + 391, 402, 401, 412, 411, 422, 421, 432, 431, 442, + 441, 452, 451, 462, 461, 472, 471, 482, 481, 492, + 491, 502, 501, 512, 511, 522, 521, 536, 535, 548, + 587, 592, 547, 609, 617, 632, 642, 673, 677, 616, + 701, 705, 706, 710, 711, 716, 722, 715, 810, 816, + 809, 887, 888, 893, 932, 937, 892, 955, 954, 968, + 1006, 1037, 1071, 1070, 1082, 1089, 1090, 1091, 1092, 1096, + 1107, 1112, 1156, 1161, 1111, 1190, 1234, 1239, 1188, 1258, + 1256, 1298, 1297, 1311, 1317, 1324, 1331, 1338, 1364, 1391, + 1456, 1457, 1461, 1462, 1463, 1469, 1468, 1479, 1478, 1491, + 1492, 1497, 1496, 1507, 1506, 1517, 1516, 1527, 1526, 1537, + 1536, 1547, 1546, 1557, 1556, 1567, 1566, 1580, 1593, 1591, + 1619, 1626, 1637, 1636, 1664, 1662, 1689, 1700, 1713, 1759, + 1787, 1818, 1823, 1828, 1833, 1817, 1904, 1905, 1906, 1907, + 1908, 1909, 1910, 1922, 1927, 1996, 1998, 2000, 2001, 2015, + 2016, 2030, 2031, 2044, 2045, 2055, 2068, 2069, 2079, 2092, + 2093, 2103, 2113, 2126, 2127, 2137, 2147, 2160, 2211, 2212, + 2221, 2226, 2232, 2240, 2245, 2250, 2256, 2260, 2265, 2270, + 2278, 2352, 2353, 2357, 2358, 2362, 2363, 2367, 2371, 2372, + 2376, 2381, 2380, 2391, 2396, 2401, 2406, 2433, 2442, 2441, + 2513, 2514, 2518, 2526, 2527, 2555, 2556, 2557, 2558, 2559, + 2560, 2561, 2562, 2566, 2567, 2568, 2569, 2573, 2574, 2575, + 2579, 2580, 2584, 2597, 2595, 2623, 2630, 2631, 2635, 2648, + 2646, 2674, 2681, 2698, 2717, 2718, 2722, 2727, 2732, 2740, + 2745, 2750, 2758, 2763, 2768, 2776, 2784, 2789, 2797, 2805, + 2813, 2821, 2830, 2829, 2845, 2879, 2884, 2844, 2903, 2906, + 2907, 2911, 2911, 2922, 2927, 2920, 2990, 2989, 3004, 3003, + 3018, 3023, 3059, 3064, 3121, 3126, 3017, 3150, 3158, 3172, + 3182, 3190, 3191, 3299, 3302, 3303, 3308, 3313, 3307, 3349, + 3348, 3362, 3373, 3393, 3401, 3400, 3416, 3421, 3415, 3438, + 3437, 3490, 3514, 3539, 3544, 3577, 3582, 3538, 3608, 3613, + 3611, 3618, 3622, 3659, 3664, 3657, 3745, 3806, 3816, 3805, + 3829, 3839, 3844, 3837, 3891, 3917, 3927, 3932, 3925, 3968, + 3993, 4002, 4001, 4043, 4054, 4074, 4082, 4087, 4081, 4149, + 4150, 4155, 4160, 4165, 4170, 4154, 4239, 4244, 4249, 4254, + 4238, 4332, 4337, 4367, 4372, 4331, 4390, 4395, 4460, 4465, + 4388, 4502, 4508, 4515, 4522, 4523, 4535, 4541, 4583, 4534, + 4605, 4604, 4615, 4614, 4627, 4632, 4630, 4637, 4642, 4647, + 4641, 4688, 4687, 4698, 4697, 4710, 4715, 4713, 4720, 4725, + 4730, 4724, 4777, 4785, 4786, 4787, 4897, 4902, 4907, 4916, + 4921, 4915, 4933, 4941, 4946, 4940, 4958, 4966, 4971, 4965, + 4983, 4991, 4996, 4990, 5008, 5015, 5028, 5026, 5052, 5059, + 5088, 5126, 5127, 5131, 5161, 5201, 5206, 5160, 5225, 5230, + 5223, 5273, 5272, 5283, 5290, 5291, 5296, 5295, 5306, 5305, + 5316, 5315, 5326, 5325, 5336, 5335, 5346, 5345, 5356, 5355, + 5367, 5458, 5465, 5491, 5598, 5608, 5614, 5620, 5693, 5766, + 5841, 5840, 5890, 5895, 5900, 5905, 5910, 5915, 5889, 5970, + 5969, 5980, 5987, 5994, 6002, 6007, 6001, 6019, 6020, 6024, + 6026, 6025, 6036, 6035, 6050, 6074, 6048, 6102, 6130, 6100, + 6156, 6157, 6158, 6162, 6163, 6167, 6195, 6226, 6271, 6276, + 6224, 6293, 6303, 6322, 6334, 6333, 6373, 6423, 6428, 6371, + 6445, 6450, 6458, 6463, 6468, 6473, 6478, 6483, 6488, 6493, + 6498, 6503, 6512, 6547, 6546, 6568, 6575, 6601, 6619, 6630, + 6650, 6657, 6668, 6673, 6692, 6697, 6667, 6712, 6719, 6724, + 6731, 6730, 6739, 6738, 6747, 6746, 6758, 6828, 6879, 6895, + 6909, 6916, 6976, 6981, 6986, 6980, 7047, 7052, 7046, 7067, + 7068, 7073, 7072, 7083, 7082, 7093, 7092, 7103, 7102 }; #endif @@ -718,8 +719,8 @@ static const char *const yytname[] = "IDL_FALSETOK", "IDL_SCOPE_DELIMITOR", "IDL_LEFT_SHIFT", "IDL_RIGHT_SHIFT", "IDL_WCHAR_LITERAL", "IDL_WSTRING_LITERAL", "';'", "'{'", "'}'", "'<'", "'>'", "':'", "','", "'='", "'|'", "'^'", "'&'", - "'+'", "'-'", "'*'", "'/'", "'%'", "'~'", "'('", "')'", "'['", "']'", - "$accept", "start", "definitions", "definition", + "'+'", "'-'", "'*'", "'/'", "'%'", "'~'", "'('", "')'", "'@'", "'['", + "']'", "$accept", "start", "definitions", "definition", "at_least_one_definition", "fixed_definition", "$@1", "$@2", "$@3", "$@4", "$@5", "$@6", "$@7", "$@8", "$@9", "$@10", "$@11", "$@12", "$@13", "$@14", "module_header", "$@15", "module", "$@16", "$@17", "$@18", @@ -736,24 +737,27 @@ static const char *const yytname[] = "@41", "@42", "exports", "export", "$@43", "$@44", "$@45", "$@46", "$@47", "$@48", "$@49", "$@50", "at_least_one_scoped_name", "scoped_names", "$@51", "scoped_name", "$@52", "$@53", "id", - "interface_forward", "const_dcl", "$@54", "$@55", "$@56", "$@57", - "const_type", "expression", "const_expr", "or_expr", "xor_expr", + "defining_id", "interface_forward", "const_dcl", "$@54", "$@55", "$@56", + "$@57", "const_type", "expression", "const_expr", "or_expr", "xor_expr", "and_expr", "shift_expr", "add_expr", "mult_expr", "unary_expr", - "primary_expr", "literal", "positive_int_expr", "type_dcl", "$@58", - "type_declarator", "$@59", "type_spec", "simple_type_spec", - "base_type_spec", "template_type_spec", "constructed_type_spec", - "constructed_forward_type_spec", "at_least_one_declarator", - "declarators", "$@60", "declarator", "at_least_one_simple_declarator", - "simple_declarators", "$@61", "simple_declarator", "complex_declarator", - "integer_type", "signed_int", "unsigned_int", "floating_pt_type", - "fixed_type", "char_type", "octet_type", "boolean_type", "any_type", - "object_type", "struct_decl", "$@62", "struct_type", "$@63", "$@64", - "$@65", "at_least_one_member", "members", "member", "@66", "member_i", - "$@67", "$@68", "$@69", "union_decl", "$@70", "union_type", "$@71", - "$@72", "$@73", "$@74", "$@75", "$@76", "switch_type_spec", - "at_least_one_case_branch", "case_branches", "case_branch", "$@77", - "$@78", "$@79", "at_least_one_case_label", "case_labels", "case_label", - "$@80", "$@81", "$@82", "element_spec", "$@83", "struct_forward_type", + "primary_expr", "literal", "positive_int_expr", "annotations", + "annotation_appl", "annotation_appl_params", + "at_least_one_annotation_appl_param", "annotation_appl_named_params", + "annotation_appl_param", "type_dcl", "$@58", "type_declarator", "$@59", + "type_spec", "simple_type_spec", "base_type_spec", "template_type_spec", + "constructed_type_spec", "constructed_forward_type_spec", + "at_least_one_declarator", "declarators", "$@60", "declarator", + "at_least_one_simple_declarator", "simple_declarators", "$@61", + "simple_declarator", "complex_declarator", "integer_type", "signed_int", + "unsigned_int", "floating_pt_type", "fixed_type", "char_type", + "octet_type", "boolean_type", "any_type", "object_type", "struct_decl", + "$@62", "struct_type", "$@63", "$@64", "$@65", "at_least_one_member", + "members", "member", "@66", "member_i", "$@67", "$@68", "$@69", + "union_decl", "$@70", "union_type", "$@71", "$@72", "$@73", "$@74", + "$@75", "$@76", "switch_type_spec", "at_least_one_case_branch", + "case_branches", "case_branch", "$@77", "$@78", "$@79", + "at_least_one_case_label", "case_labels", "case_label", "$@80", "$@81", + "$@82", "element_spec", "$@83", "struct_forward_type", "union_forward_type", "enum_type", "$@84", "$@85", "$@86", "$@87", "at_least_one_enumerator", "enumerators", "$@88", "enumerator", "sequence_type_spec", "$@89", "$@90", "seq_head", "$@91", "$@92", @@ -814,16 +818,16 @@ static const yytype_uint16 yytoknum[] = 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 59, 123, 125, 60, 62, 58, 44, 61, 124, 94, 38, 43, 45, 42, - 47, 37, 126, 40, 41, 91, 93 + 47, 37, 126, 40, 41, 64, 91, 93 }; # endif -#define YYPACT_NINF -589 +#define YYPACT_NINF -597 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-589))) + (!!((Yystate) == (-597))) -#define YYTABLE_NINF -508 +#define YYTABLE_NINF -519 #define yytable_value_is_error(Yytable_value) \ 0 @@ -832,88 +836,91 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -589, 52, 1190, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, 65, 86, 146, 12, -589, 65, 65, - -589, 37, 37, -589, -589, -589, -589, 9, -589, 534, - 54, 74, -589, -589, 56, -589, -589, -589, -589, -589, - -589, 167, -589, -589, -589, -589, -589, -589, 108, -589, - 82, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -589, 58, - -589, -589, -589, 58, -589, -589, 69, 116, 200, 37, - 65, 312, 65, 65, 65, 65, -589, -589, -589, 64, - 65, 72, -589, 136, 65, -589, 58, 65, 138, 161, - 65, -589, 5, -589, 16, 252, 254, -589, 201, 216, - 632, 36, -589, -589, 228, 271, -589, 255, 261, 262, - 34, -589, 67, -589, -589, -589, -589, -589, -589, 263, - -589, -589, -589, -589, -589, -589, 269, -589, -589, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, -589, 82, -589, -589, -589, 140, -589, - -589, 265, -589, 266, 267, 270, 272, -589, 274, 275, - 279, 282, 289, 291, 296, 301, -589, -589, -589, 304, - 305, -589, -589, -589, -589, 269, -589, -589, -589, -589, - -589, -589, -589, -589, -589, 269, -589, -589, -589, -589, - -589, -589, -589, -589, 306, -589, 307, -589, -589, 260, - -589, 65, -589, -589, -589, -589, -589, -589, -589, 200, - -589, -589, -589, -589, 268, -589, -589, -589, -589, 355, - -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, 51, 51, 51, 36, 269, -589, -589, 302, - 303, 313, 91, 3, 105, -589, -589, -589, 309, -589, - -589, -589, -589, -589, -589, -589, -589, -589, 354, -589, - 36, 277, 350, -589, -589, -589, -589, -589, -589, -589, - 298, -589, -589, -589, -589, -589, -589, -589, -589, -589, - 350, 315, 321, -589, -589, -589, 65, 65, 323, 324, - -589, -589, -589, 322, -589, 65, 325, 260, -589, -589, - 411, -589, 326, 329, -589, -589, -589, 311, 36, 36, - 36, 36, 36, 36, 36, 36, 36, 36, -589, 331, - 37, -589, -589, -589, -589, 333, -589, 37, -589, 36, - 36, 36, -589, -589, -589, -589, -589, -589, -589, 229, - -589, 328, -589, -589, -589, -589, -589, -589, -589, -589, - 37, 350, -589, -589, -589, -589, -589, 1268, -589, 327, - -589, -589, -589, 303, 313, 91, 3, 3, 105, 105, - -589, -589, -589, 65, 36, -589, 269, 1024, 778, 36, - 225, -589, -589, -589, -589, -589, -589, 253, 80, 413, - 942, -589, -589, -589, -589, 38, 360, 37, 37, -589, - -589, -589, -589, -589, 38, -589, 339, -589, 336, 330, - 338, 428, -589, 1059, 269, -589, 37, 350, 215, 346, - 348, 434, 351, 632, -589, -589, 353, -589, -589, -589, - 358, -589, -589, -589, -589, -589, -589, 581, -589, -589, - -589, -589, -589, 359, -589, -589, -589, 364, 361, -589, - 366, 370, 371, 378, 379, -589, -589, -589, 460, 269, - -589, -589, -589, -589, -589, -589, 37, 37, 37, -589, - 384, -589, -589, -589, -589, -589, -589, -589, 65, 65, - -589, 389, -589, -589, -589, 1141, 860, 452, 489, -589, - 269, 65, -589, -589, 41, 63, 398, 400, 403, 65, - 405, -589, -589, -589, -589, -589, -589, -589, -589, -589, - 397, 406, 269, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, -589, 407, -589, 409, 423, 424, 425, - 426, -589, 269, -589, -589, -589, -589, -589, 427, 430, - 516, 253, 253, -589, -589, -589, -589, -589, -589, -589, - -589, 439, 65, 416, 70, 70, 70, 444, -589, 445, - 448, 449, 450, 451, 453, -589, -589, -589, 455, 456, - 457, 458, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, 36, 36, 330, 65, 459, 464, 462, -589, - 477, 473, 474, 476, 475, 215, 1243, 37, -589, -589, - -589, -589, -589, -589, 541, -589, -589, -589, -589, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, 461, 461, -589, -589, -589, -589, 489, - 65, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, -589, 37, -589, -589, -589, -589, 480, - 269, -589, 461, 481, 482, 513, -589, -589, -589, -589, - -589, 465, 428, 37, 269, 484, 399, -589, 471, -589, - -589, -589, 472, 533, 537, 537, 65, 522, 486, -589, - -589, 269, 490, -589, -589, 498, -589, 537, 168, -589, - -589, 499, -589, -589, -589, -589, -589, -589, -589, -589, - 521, 578, 500, 264, 537, -589, -589, -589, -589, -589, - -589, -589, -589, 489, -589, 493, 483, 537, 502, 546, - 65, 37, -589, -589, 519, -589, -589, -589, -589, -589, - 506, -589, -589, -589, 525, 36, 526, 524, 35, 312, - 192, -589, -589, -589, -589, -589, -589, -589, -589, 269, - -589, 530, -589, 538, 489, 574, -589, -589, -589, -589, - -589, -589, -589, -589, 65, 533, 37, 37, 515, 65, - 578, -589, -589, -589, -589, 535, 65, 539, -589, -589, - 512, 527, -589, -589, -589, 264, 65, 529, -589, -589, - -589, -589, -589, 37, -589, -589, -589, 536, 554, -589, - -589, 540, 542, -589, -589, 558, -589 + -597, 49, 56, -597, 187, -597, -597, -597, -597, -597, + -597, -597, -597, -597, -597, 77, 193, 62, -597, -597, + -597, -597, 42, 42, -597, -597, 42, -597, -597, 29, + -597, 308, 17, 44, -597, -597, 2, -597, -597, -597, + -597, -597, -597, 564, -597, -597, -597, -597, -597, -597, + -597, 78, -597, 181, -597, -597, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597, -597, + -597, -597, 98, -597, -597, -597, 98, -597, -597, 100, + 132, 923, 42, -597, 598, -597, -597, -597, -597, -597, + 47, -597, 104, -597, 114, -597, 115, -597, -597, 98, + -597, 145, 225, -597, -597, -597, -2, -597, 99, -597, + -597, 9, -597, 232, 235, 776, -597, -597, -597, 238, + 278, -597, 240, 247, 250, 171, -597, 236, -597, -597, + -597, -597, -597, -597, 245, -597, -597, -597, -597, -597, + -597, 258, -597, -597, -597, -597, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597, 181, + -597, -597, -597, 149, -597, -597, 251, -597, 253, 262, + 263, 257, -597, 270, 273, 274, 276, 271, 277, 283, + 285, -597, -597, -597, 287, 288, -597, -597, -597, -597, + 258, -597, -597, -597, -597, -597, -597, -597, -597, -597, + 258, -597, -597, -597, -597, -597, -597, -597, -597, -597, + 290, -597, 291, -597, -597, 292, -597, 376, -597, -597, + -597, 52, 58, 342, -597, -597, 923, -597, -597, -597, + -597, 295, -597, -597, -597, -597, 378, -597, -597, 220, + 296, -597, -597, -597, -597, -597, -597, -597, -597, 377, + -597, 402, 299, 344, -597, -597, -597, -597, -597, -597, + -597, 289, -597, -597, -597, -597, -597, -597, -597, -597, + -597, 344, 310, 313, -597, -597, -597, -597, -597, 315, + 317, -597, -597, -597, 316, -597, 376, -597, -597, 318, + -597, -597, -597, -597, -597, -597, -597, -597, -597, -597, + 451, 451, 451, 402, 258, -597, 312, 314, 328, 165, + 167, 116, -597, -597, -597, 306, -597, -597, -597, -597, + 409, -597, 324, 336, -597, -597, -597, -597, 42, -597, + -597, -597, -597, 337, -597, 42, -597, 402, 402, 402, + -597, -597, -597, -597, -597, -597, -597, 222, -597, 325, + -597, -597, -597, -597, -597, -597, -597, -597, 42, 344, + -597, -597, -597, 343, 292, 402, -597, -597, -597, 329, + 402, 402, 402, 402, 402, 402, 402, 402, 402, 402, + -597, 340, -597, -597, 345, -597, -597, 346, -597, -597, + 258, 1047, 801, 402, 650, -597, -597, -597, -597, -597, + -597, 130, 548, 890, 965, -597, -597, -597, -597, 38, + 379, 42, 42, -597, -597, -597, -597, -597, 38, -597, + 348, -597, 341, 335, 350, -597, -597, 1082, 258, -597, + 42, 344, -597, -597, -597, -597, 314, 328, 165, 167, + 167, 116, 116, -597, -597, -597, 452, 187, 368, 454, + 371, 776, -597, -597, 367, -597, -597, -597, 380, -597, + -597, -597, -597, -597, -597, 702, -597, -597, -597, -597, + -597, 381, -597, -597, -597, 384, 374, -597, 398, 399, + 400, 383, 403, -597, 260, -597, 459, 258, -597, -597, + -597, -597, -597, -597, 42, 42, 42, -597, 404, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597, 405, + -597, -597, -597, 1164, 883, 466, 841, -597, 258, 376, + -597, -597, 51, 92, 412, 415, 416, 376, 417, -597, + -597, -597, -597, -597, -597, 60, -597, -597, 418, 419, + 258, -597, 202, 318, -597, 420, -597, -597, -597, -597, + 220, -597, 423, -597, 424, 425, 426, 428, 429, -597, + 258, -597, -597, -597, -597, -597, 430, 431, -597, 130, + 130, -597, -597, -597, -597, -597, -597, -597, -597, 432, + -597, 433, 96, 96, 96, 434, -597, 435, 436, 437, + 447, 448, 453, -597, -597, -597, 455, 456, 450, 457, + -597, -597, -597, -597, -597, -597, -597, -597, -597, -597, + 402, 402, 335, -597, -597, 458, 427, 460, -597, 474, + -597, -597, -597, -597, -597, 1213, -597, 42, -597, -597, + -597, -597, -597, -597, -597, -597, -597, 61, -597, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597, -597, + -597, -597, -597, 440, 440, -597, -597, -597, -597, 841, + -597, -597, -597, -597, -597, -597, -597, -597, -597, 461, + 463, 464, 465, 202, 42, -597, -597, -597, -597, 469, + 258, 63, -597, -597, 473, 509, -597, -597, -597, -597, + -597, 445, -597, 42, -597, -597, -597, -597, -597, 258, + 477, 478, -597, -597, 440, 500, -597, 487, 559, 557, + 557, -597, 541, 505, -597, -597, 258, 510, -597, 64, + 495, -597, -597, 184, -597, -597, 496, -597, -597, -597, + -597, -597, -597, -597, -597, 543, 600, -597, 516, -597, + 557, -597, -597, -597, -597, -597, -597, -597, 841, -597, + 512, 522, 557, 523, 565, -597, 42, -597, -597, 538, + -597, 526, 189, 557, -597, 545, 402, 542, 544, 93, + -597, 73, -597, -597, -597, -597, -597, -597, -597, -597, + 258, -597, 550, -597, -597, -597, -597, 531, -597, -597, + -597, -597, -597, -597, -597, -597, 260, 97, -597, 559, + 42, 42, 533, -597, 600, -597, 554, 841, 601, 556, + -597, -597, -597, -597, -597, 547, 552, -597, -597, -597, + -597, -597, -597, -597, -597, -597, 562, -597, -597, 42, + 189, -597, 551, -597, -597, 566, -597, -597, -597, -597, + 597, -597, 569, 585, -597, -597, 603, -597 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -921,176 +928,179 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 4, 0, 0, 1, 35, 140, 37, 67, 190, 251, - 267, 302, 350, 0, 0, 0, 0, 91, 0, 0, - 461, 0, 0, 531, 552, 3, 5, 39, 21, 58, - 0, 0, 19, 61, 74, 63, 23, 75, 80, 76, - 81, 74, 77, 78, 62, 15, 9, 196, 253, 192, - 301, 193, 219, 220, 194, 17, 11, 13, 25, 421, - 420, 423, 27, 459, 29, 491, 493, 492, 490, 74, - 509, 510, 489, 74, 31, 33, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 136, 231, 195, 74, - 0, 74, 85, 74, 0, 79, 74, 0, 427, 502, - 0, 132, 0, 131, 0, 0, 0, 43, 0, 0, - 0, 0, 6, 7, 0, 94, 69, 0, 0, 0, - 235, 237, 0, 241, 242, 245, 246, 247, 248, 244, - 249, 250, 316, 324, 329, 89, 203, 99, 199, 201, - 202, 200, 204, 233, 234, 205, 209, 206, 208, 207, - 210, 211, 253, 216, 0, 217, 218, 212, 0, 215, - 213, 323, 214, 328, 0, 0, 0, 269, 0, 0, - 0, 0, 0, 0, 0, 0, 503, 496, 505, 0, - 0, 555, 551, 36, 244, 153, 141, 145, 149, 150, - 146, 147, 148, 151, 152, 38, 68, 191, 197, 252, - 268, 303, 351, 70, 500, 71, 0, 501, 92, 432, - 462, 0, 418, 134, 419, 532, 553, 40, 22, 0, - 516, 512, 513, 518, 515, 519, 517, 514, 511, 0, - 45, 524, 179, 180, 181, 183, 186, 185, 187, 188, - 184, 182, 0, 0, 0, 0, 176, 550, 154, 155, - 156, 158, 160, 162, 165, 168, 172, 177, 0, 549, - 20, 93, 72, 64, 24, 82, 236, 243, 238, 240, - 0, 0, 96, 315, 312, 320, 325, 16, 10, 254, - 0, 18, 12, 14, 26, 424, 28, 473, 460, 30, - 96, 0, 0, 32, 34, 559, 0, 0, 0, 0, - 86, 430, 428, 470, 133, 0, 0, 432, 4, 520, - 0, 525, 0, 521, 173, 174, 175, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 59, 547, - 0, 110, 101, 239, 189, 0, 317, 0, 90, 0, - 0, 0, 260, 270, 434, 477, 504, 497, 506, 556, - 142, 231, 198, 224, 225, 226, 232, 304, 352, 110, - 0, 96, 468, 463, 135, 533, 554, 0, 41, 0, - 46, 522, 178, 157, 159, 161, 163, 164, 166, 167, - 169, 170, 171, 0, 0, 73, 130, 0, 0, 0, - 0, 95, 313, 321, 326, 255, 259, 0, 0, 425, - 0, 110, 101, 340, 345, 0, 455, 0, 0, 564, - 338, 339, 560, 562, 0, 566, 0, 558, 0, 0, - 221, 0, 259, 0, 431, 429, 0, 96, 0, 3, - 0, 0, 0, 0, 60, 548, 127, 125, 360, 361, - 0, 109, 117, 111, 121, 119, 123, 0, 113, 115, - 365, 107, 105, 0, 100, 102, 103, 0, 0, 318, - 0, 0, 0, 0, 260, 265, 262, 261, 235, 281, - 276, 277, 278, 279, 271, 280, 0, 0, 0, 445, - 0, 433, 435, 437, 439, 441, 443, 447, 0, 0, - 478, 0, 476, 479, 481, 0, 0, 0, 0, 451, - 450, 0, 454, 453, 0, 0, 0, 0, 0, 0, - 0, 557, 143, 335, 331, 334, 222, 311, 305, 310, - 260, 0, 469, 464, 543, 539, 541, 534, 538, 42, - 526, 47, 523, 128, 0, 66, 0, 0, 0, 0, - 0, 364, 394, 391, 392, 393, 355, 363, 0, 0, - 0, 0, 0, 84, 104, 319, 314, 322, 327, 256, - 258, 0, 0, 0, 0, 0, 0, 0, 426, 0, - 0, 0, 0, 0, 0, 483, 486, 475, 0, 0, - 0, 0, 341, 346, 449, 545, 546, 565, 561, 563, - 452, 567, 0, 0, 332, 0, 0, 307, 0, 88, - 0, 0, 0, 0, 0, 536, 0, 0, 126, 118, - 112, 122, 120, 124, 0, 114, 116, 366, 108, 106, - 266, 263, 272, 458, 456, 457, 446, 436, 438, 440, - 442, 444, 448, 0, 0, 480, 482, 499, 508, 0, - 0, 144, 336, 333, 223, 306, 308, 354, 465, 544, - 540, 542, 535, 537, 0, 53, 39, 48, 52, 0, - 129, 356, 0, 0, 0, 369, 484, 487, 342, 347, - 230, 0, 0, 0, 55, 0, 0, 54, 0, 367, - 264, 273, 0, 0, 401, 401, 0, 405, 227, 337, - 309, 466, 0, 49, 51, 382, 357, 401, 0, 370, - 377, 0, 376, 398, 485, 488, 343, 402, 348, 228, - 472, 0, 0, 0, 401, 368, 288, 295, 293, 274, - 284, 285, 292, 0, 372, 373, 0, 401, 0, 409, - 0, 0, 467, 530, 0, 529, 381, 395, 396, 397, - 0, 387, 388, 358, 0, 0, 0, 0, 0, 0, - 290, 378, 374, 399, 344, 403, 406, 349, 229, 471, - 56, 527, 383, 384, 0, 413, 289, 296, 294, 275, - 283, 298, 286, 291, 0, 0, 0, 0, 0, 0, - 0, 385, 389, 410, 359, 0, 0, 0, 379, 375, - 0, 0, 407, 57, 528, 0, 0, 0, 297, 299, - 287, 400, 404, 0, 386, 390, 411, 0, 0, 408, - 417, 0, 414, 412, 415, 0, 416 + 4, 0, 192, 1, 0, 35, 141, 37, 67, 201, + 262, 278, 313, 361, 192, 0, 0, 0, 91, 192, + 192, 472, 0, 0, 542, 563, 0, 3, 5, 39, + 21, 58, 0, 0, 19, 61, 74, 63, 23, 75, + 80, 76, 81, 74, 77, 78, 62, 15, 191, 9, + 207, 264, 203, 312, 204, 230, 231, 205, 17, 11, + 13, 25, 432, 431, 434, 27, 470, 29, 502, 504, + 503, 501, 74, 520, 521, 500, 74, 31, 33, 0, + 0, 0, 0, 192, 0, 192, 192, 192, 192, 242, + 0, 206, 74, 192, 74, 85, 74, 192, 79, 74, + 192, 438, 513, 192, 136, 132, 0, 131, 0, 192, + 192, 194, 43, 0, 0, 0, 192, 6, 7, 0, + 94, 69, 0, 0, 0, 246, 248, 0, 252, 253, + 256, 257, 258, 259, 255, 260, 261, 327, 335, 340, + 89, 214, 99, 210, 212, 213, 211, 215, 244, 245, + 216, 220, 217, 219, 218, 221, 222, 264, 227, 0, + 228, 229, 223, 0, 226, 224, 334, 225, 339, 0, + 0, 0, 280, 0, 0, 0, 0, 0, 0, 0, + 0, 514, 507, 516, 0, 0, 566, 562, 36, 255, + 154, 142, 146, 150, 151, 147, 148, 149, 152, 153, + 38, 68, 202, 208, 263, 279, 314, 362, 137, 70, + 511, 71, 0, 512, 92, 443, 473, 0, 429, 134, + 430, 0, 0, 0, 40, 22, 0, 527, 523, 524, + 529, 526, 530, 528, 525, 522, 0, 45, 535, 0, + 0, 20, 93, 72, 64, 24, 82, 247, 254, 249, + 251, 0, 0, 96, 326, 323, 331, 336, 16, 10, + 265, 0, 18, 12, 14, 26, 435, 28, 484, 471, + 30, 96, 0, 0, 32, 34, 570, 192, 192, 0, + 0, 86, 441, 439, 481, 133, 0, 543, 564, 136, + 180, 181, 182, 184, 187, 186, 188, 189, 185, 183, + 0, 0, 0, 0, 177, 195, 156, 157, 159, 161, + 163, 166, 169, 173, 178, 0, 196, 199, 4, 531, + 0, 536, 0, 532, 561, 155, 560, 59, 0, 110, + 101, 250, 190, 0, 328, 0, 90, 0, 0, 0, + 271, 281, 445, 488, 515, 508, 517, 567, 143, 242, + 209, 235, 236, 237, 243, 315, 363, 110, 0, 96, + 479, 474, 135, 0, 443, 0, 174, 175, 176, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 193, 197, 192, 41, 0, 46, 533, 558, 192, 73, + 130, 0, 0, 0, 0, 95, 324, 332, 337, 266, + 270, 0, 0, 436, 0, 110, 101, 351, 356, 0, + 466, 0, 0, 575, 349, 350, 571, 573, 0, 577, + 0, 569, 0, 0, 232, 192, 270, 0, 442, 440, + 0, 96, 544, 565, 200, 179, 158, 160, 162, 164, + 165, 167, 168, 170, 171, 172, 0, 0, 0, 0, + 0, 0, 192, 60, 127, 125, 371, 372, 0, 109, + 117, 111, 121, 119, 123, 0, 113, 115, 376, 107, + 105, 0, 100, 102, 103, 0, 0, 329, 0, 0, + 0, 0, 271, 276, 0, 272, 246, 292, 287, 288, + 289, 290, 282, 291, 0, 0, 0, 456, 0, 444, + 446, 448, 450, 452, 454, 458, 192, 192, 489, 0, + 487, 490, 492, 0, 0, 0, 0, 462, 461, 0, + 465, 464, 0, 0, 0, 0, 0, 0, 0, 568, + 144, 346, 342, 345, 233, 0, 316, 321, 271, 0, + 480, 475, 0, 0, 198, 3, 42, 537, 47, 534, + 0, 128, 0, 66, 0, 0, 0, 0, 0, 375, + 405, 402, 403, 404, 366, 374, 0, 0, 192, 0, + 0, 84, 104, 330, 325, 333, 338, 267, 269, 0, + 273, 0, 0, 0, 0, 0, 437, 0, 0, 0, + 0, 0, 0, 494, 497, 486, 0, 0, 0, 0, + 352, 357, 460, 556, 557, 576, 572, 574, 463, 578, + 0, 0, 343, 192, 322, 0, 318, 0, 88, 0, + 554, 550, 552, 545, 549, 0, 559, 0, 126, 118, + 112, 122, 120, 124, 192, 114, 116, 0, 108, 106, + 277, 192, 283, 469, 467, 468, 457, 447, 449, 451, + 453, 455, 459, 0, 0, 491, 493, 510, 519, 0, + 192, 145, 347, 344, 234, 317, 319, 365, 476, 0, + 0, 0, 0, 547, 0, 53, 39, 48, 52, 0, + 129, 0, 377, 274, 0, 380, 495, 498, 353, 358, + 241, 0, 192, 0, 555, 551, 553, 546, 548, 55, + 0, 192, 54, 367, 0, 0, 284, 0, 0, 412, + 412, 192, 416, 238, 348, 320, 477, 0, 49, 0, + 0, 378, 275, 0, 381, 388, 0, 387, 409, 496, + 499, 354, 413, 359, 239, 483, 0, 51, 393, 368, + 412, 299, 306, 304, 285, 295, 296, 303, 0, 383, + 384, 0, 412, 0, 420, 192, 0, 478, 541, 0, + 540, 0, 0, 412, 379, 0, 0, 0, 0, 0, + 192, 301, 389, 385, 410, 355, 414, 417, 360, 240, + 482, 56, 538, 392, 406, 407, 408, 0, 398, 399, + 369, 300, 307, 305, 286, 294, 0, 0, 192, 0, + 0, 0, 0, 192, 0, 394, 395, 0, 424, 0, + 309, 297, 302, 390, 386, 0, 0, 418, 57, 539, + 396, 400, 421, 370, 308, 192, 0, 411, 415, 0, + 0, 192, 0, 310, 298, 0, 397, 401, 422, 419, + 0, 428, 0, 425, 423, 426, 0, 427 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -589, -589, 334, 278, -589, -569, -589, -589, -589, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -528, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, -589, -589, -39, -589, -589, -589, -589, - -589, -589, -589, -589, -589, -589, -589, 276, -589, -589, - 68, -589, -589, -589, 623, -589, -589, -589, -589, -589, - -589, -589, 626, -589, 280, -589, -589, -255, -589, -589, - 244, -589, -589, -589, -589, -316, -350, -589, -589, -589, - -589, -589, -589, -589, -589, -323, -589, -589, -19, -589, - -589, -13, -589, 8, -589, -589, -589, -589, 429, 55, - -102, -589, 332, 341, 343, -9, -7, -22, 66, -589, - -307, 13, -589, -589, -589, -33, 281, -416, -589, -589, - -589, 89, -589, -589, -567, -21, -589, -589, -12, -589, - -55, -589, -589, -57, -48, -54, -53, -52, -589, -589, - -30, -589, -28, -589, -589, -589, -589, 236, 319, -589, - -212, -589, -589, -589, -25, -589, -23, -589, -589, -589, - -589, -589, -589, -589, -589, -589, -84, -589, -589, -589, - -589, -589, -83, -589, -589, -589, -589, -589, -589, -589, - -34, -589, -589, -589, -589, -589, -589, -589, -6, -589, - -589, -589, -589, -589, -589, -589, -74, -589, -589, -589, - -66, -589, -589, -589, -589, -589, -589, -589, 75, -589, - -589, -320, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, 15, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -588, -589, - -589, -589, -589, -589, -107, -589, -589, -589, -589, -589, - -589, -589, -589, -125, -589, -589, -471, -589, -496, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, 17, 18, -589, -589, -589, -589, -589, - -589, -589, -589, -589, 365, -589, -589, -589, -589, -589, - -589, -589, -589, -589, -589, -300, 273, -294, -589, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -589, 602, - -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, - 243, -589, -589, -103, -589, -589, -589, -589, -589, -589, - -589, 73, -589, -589, -589, 283, -589, -589, 295, -589, - -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, - -589, -589 + -597, -597, 362, 237, -597, -582, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597, -597, + -558, -597, -597, -597, -597, -597, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -34, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -597, -597, 244, -597, -597, + 162, -597, -597, -597, 666, -597, -597, -597, -597, -597, + -597, -597, 670, -597, 272, -597, -597, -235, -597, -597, + 281, -597, -597, -597, -597, -276, -352, -597, -597, -597, + -597, -597, -597, -597, -597, -316, -597, -597, -22, -597, + -597, -189, -11, -597, 13, -597, -597, -597, -597, 462, + 79, -207, -597, 320, 322, 319, -65, -73, -24, 66, + -597, -304, 0, -597, -597, -597, -597, 248, 14, -597, + -597, -597, -71, 301, -438, -597, -597, -597, 55, -597, + -597, -576, -14, -597, -597, -3, -597, -56, -597, -597, + -43, -42, -55, -51, -50, -597, -597, -37, -597, -36, + -597, -597, -597, -597, 280, 358, -597, -254, -597, -597, + -597, -33, -597, -31, -597, -597, -597, -597, -597, -597, + -597, -597, -597, -70, -597, -597, -597, -597, -597, -95, + -597, -597, -597, -597, -597, -597, -597, -38, -597, -597, + -597, -597, -597, -597, -597, 11, -597, -597, -597, -597, + -597, -597, -597, -67, -597, -597, -597, -66, -597, -597, + -597, -597, -597, -597, -597, 95, -597, -597, -323, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597, 16, + -597, -597, -597, -597, -597, -597, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -596, -597, -597, -597, -597, + -597, -90, -597, -597, -597, -597, -597, -597, -597, -597, + -126, -597, -597, -487, -597, -543, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597, -597, + 18, 19, -597, -597, -597, -597, -597, -597, -597, -597, + -597, 359, -597, -597, -597, -597, -597, -597, -597, -597, + -597, -597, -305, 304, -303, -597, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -597, 648, -597, -597, -597, + -597, -597, -597, -597, -597, -597, -597, 279, -597, -597, + -75, -597, -597, -597, -597, -597, -597, -597, 69, -597, + -597, -597, 347, -597, -597, 195, -597, -597, -597, -597, + -597, -597, -597, -597, -597, -597, -597, -597, -597 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 25, 368, 26, 165, 169, 170, 164, - 168, 114, 109, 118, 171, 173, 175, 179, 180, 77, - 27, 79, 28, 108, 308, 430, 29, 30, 110, 312, - 432, 606, 675, 657, 676, 658, 659, 692, 779, 31, - 111, 383, 32, 33, 117, 331, 440, 34, 80, 35, - 135, 330, 36, 37, 38, 119, 332, 453, 39, 206, - 359, 521, 40, 272, 41, 97, 262, 338, 42, 43, - 388, 454, 455, 552, 551, 387, 441, 537, 548, 549, - 536, 539, 538, 540, 534, 385, 436, 607, 246, 211, - 305, 103, 44, 442, 78, 296, 418, 592, 186, 247, - 334, 249, 250, 251, 252, 253, 254, 255, 256, 257, - 335, 443, 81, 197, 297, 466, 138, 139, 140, 141, - 47, 352, 420, 595, 353, 669, 688, 730, 354, 355, - 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, - 48, 82, 49, 166, 342, 463, 395, 464, 560, 397, - 467, 562, 663, 561, 50, 83, 51, 280, 398, 563, - 664, 698, 747, 474, 719, 748, 720, 749, 787, 744, - 721, 750, 722, 746, 745, 785, 772, 786, 52, 53, - 54, 84, 298, 421, 596, 518, 597, 672, 519, 157, - 339, 460, 158, 271, 390, 159, 160, 340, 461, 161, - 162, 341, 462, 163, 356, 419, 514, 594, 515, 593, - 671, 444, 410, 497, 639, 686, 727, 411, 498, 640, - 687, 729, 445, 85, 299, 422, 598, 446, 614, 678, - 714, 765, 447, 546, 457, 550, 662, 697, 666, 682, - 683, 701, 725, 775, 702, 723, 774, 696, 712, 713, - 740, 763, 795, 741, 764, 796, 547, 742, 704, 726, - 776, 708, 728, 777, 757, 778, 803, 784, 797, 808, - 811, 812, 815, 448, 449, 58, 59, 60, 172, 344, - 480, 61, 209, 361, 302, 360, 399, 481, 569, 570, - 571, 572, 573, 567, 574, 525, 501, 526, 414, 503, - 484, 485, 486, 62, 174, 63, 100, 303, 427, 600, - 673, 710, 363, 426, 732, 288, 345, 491, 400, 492, - 578, 579, 493, 633, 684, 494, 634, 685, 64, 65, - 66, 67, 68, 291, 401, 580, 69, 70, 71, 177, - 290, 72, 292, 402, 581, 73, 229, 230, 313, 433, - 231, 734, 761, 735, 74, 105, 306, 428, 604, 527, - 605, 528, 602, 603, 601, 415, 258, 329, 259, 75, - 76, 106, 307, 182, 295, 416, 349, 417, 507, 508, - 506, 510 + -1, 1, 2, 27, 383, 28, 170, 174, 175, 169, + 173, 119, 114, 123, 176, 178, 180, 184, 185, 80, + 29, 82, 30, 113, 318, 448, 31, 32, 115, 322, + 450, 625, 700, 677, 701, 678, 679, 717, 803, 33, + 116, 388, 34, 35, 122, 329, 458, 36, 83, 37, + 140, 328, 38, 39, 40, 124, 330, 471, 41, 212, + 357, 539, 42, 253, 43, 100, 243, 336, 44, 45, + 392, 472, 473, 570, 569, 391, 459, 555, 566, 567, + 554, 557, 556, 558, 552, 389, 454, 627, 304, 217, + 286, 107, 349, 46, 460, 81, 277, 422, 610, 191, + 324, 332, 306, 307, 308, 309, 310, 311, 312, 313, + 314, 333, 90, 48, 315, 316, 381, 317, 461, 84, + 202, 278, 142, 143, 144, 145, 146, 50, 350, 424, + 613, 351, 689, 713, 755, 352, 353, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 51, 85, 52, + 171, 340, 481, 399, 482, 578, 401, 485, 641, 705, + 579, 53, 86, 54, 261, 402, 581, 684, 723, 768, + 492, 744, 769, 745, 770, 826, 765, 746, 771, 747, + 767, 766, 809, 811, 825, 55, 56, 57, 87, 279, + 425, 615, 536, 616, 692, 537, 162, 337, 478, 163, + 252, 394, 164, 165, 338, 479, 166, 167, 339, 480, + 168, 354, 423, 532, 612, 533, 611, 691, 462, 414, + 515, 659, 711, 752, 415, 516, 660, 712, 754, 463, + 88, 280, 426, 617, 464, 634, 720, 763, 808, 465, + 564, 475, 568, 704, 740, 686, 707, 708, 726, 750, + 799, 727, 748, 798, 739, 761, 762, 787, 806, 830, + 788, 807, 831, 565, 789, 729, 751, 800, 733, 753, + 801, 778, 802, 829, 823, 832, 840, 842, 843, 846, + 466, 467, 61, 62, 63, 177, 342, 498, 64, 215, + 359, 283, 358, 403, 499, 587, 588, 589, 590, 591, + 585, 592, 621, 519, 622, 418, 521, 502, 503, 504, + 65, 179, 66, 103, 284, 431, 619, 693, 735, 361, + 430, 757, 269, 343, 509, 404, 510, 596, 597, 511, + 653, 709, 512, 654, 710, 67, 68, 69, 70, 71, + 272, 405, 598, 72, 73, 74, 182, 271, 75, 273, + 406, 599, 76, 236, 237, 323, 451, 238, 759, 782, + 760, 77, 109, 363, 542, 672, 623, 673, 624, 670, + 671, 669, 419, 240, 387, 326, 78, 79, 110, 364, + 187, 276, 420, 347, 421, 525, 526, 524, 528 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1098,439 +1108,433 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 87, 88, 102, 104, 193, 98, 99, 156, 137, 248, - 45, 152, 194, 153, 391, 46, 154, 55, 155, 56, - 57, 188, 136, 187, 190, 191, 192, 583, 644, 409, - 189, 543, 392, 393, 394, 346, 716, 655, 456, 86, - 86, 86, 266, 423, 585, 267, 667, 156, 198, 412, - 490, 152, 3, 153, 86, 413, 154, 499, 155, 185, - 195, 17, 136, 717, 718, 94, 586, 196, 86, 199, - 200, 201, 202, 86, 679, 268, 269, 204, 656, 479, - 212, 207, 543, 86, 208, 495, 213, 210, 468, 121, - 122, 214, 7, 125, 126, 127, 128, 213, 107, 482, - 323, 324, 116, 11, 167, 483, 425, 655, 524, 232, - 233, 234, 235, 236, 237, 238, 239, 101, 101, 101, - 240, 241, 213, -282, 232, 233, 234, 235, 236, 237, - 238, 239, 101, 242, 243, 240, 241, 176, 244, 245, - 112, 176, -137, 317, 213, 193, 456, 115, 656, 115, - -138, 213, 7, 194, 245, 115, 181, 203, -139, 205, - 113, 101, 188, 115, 187, 190, 191, 192, 668, 716, - 86, 189, 523, 321, 322, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 9, 10, 705, - 11, 132, 133, 134, -300, 17, 717, 718, 304, 90, - 185, 715, 183, 86, 325, 326, 327, 788, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 184, 743, 799, - 717, 718, -97, 543, -422, 133, 134, 115, 86, 805, - 273, 754, 274, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 403, 404, -494, 101, 132, - 133, 134, 751, -98, 465, 215, 86, 216, 115, 403, - 404, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 9, 10, 405, 11, 132, 133, 134, - 406, 101, 248, 350, 351, 524, 642, 458, 217, 405, - 89, 91, 364, 782, 406, 93, 96, 407, 408, 737, - 738, 739, 218, 380, 381, 382, 101, 543, 314, 315, - 316, 386, 376, 377, 260, 86, 378, 379, 386, 261, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 9, 10, 101, 11, 132, 133, 134, 618, - 619, 424, 263, 470, 471, 472, 473, 264, 543, 265, - 213, 301, 270, 277, 275, 276, 278, 310, 311, 279, - 281, 282, 333, 156, 475, 283, 336, 152, 284, 153, - 434, 136, 154, 544, 155, 45, 285, 286, 136, 469, - 46, 545, 55, 287, 56, 57, 500, 289, 504, 505, - 293, 294, -495, 101, 300, 500, 318, 337, 319, 328, - 4, 343, 347, 5, 6, 7, 8, 522, 348, 320, - 357, 358, 365, 362, 369, 372, 370, 431, 502, 9, - 10, 371, 11, 384, 544, 389, 12, 511, 542, 512, - 516, 517, 545, -330, -8, 513, 529, 530, 531, 13, - 14, 15, 16, 403, 404, 533, 535, 553, 17, 18, - 554, 555, 19, 790, 791, 20, 556, 564, 565, 566, - 557, 558, 21, 22, 476, 477, 559, -257, 266, 23, - 24, 654, 568, 405, 478, 575, 576, 577, 406, 542, - 807, 407, 408, 582, 587, -353, 588, -50, 584, 589, - 248, 591, 86, 608, 599, 609, 590, 120, 121, 122, - 123, 124, 125, 126, 127, 128, 184, 130, 131, 610, - 611, 612, 613, 615, 133, 134, 616, 156, 156, 617, - 622, 152, 152, 153, 153, 620, 154, 154, 155, 155, - 626, 627, 136, 136, 628, 629, 630, 631, -44, 632, - -44, 635, 636, 648, 661, 637, 638, 645, -371, 351, - 647, 623, 624, 625, -44, -44, 646, -44, -44, 649, - 650, -44, 651, 652, 665, 544, 677, 680, 700, 681, - 101, 689, 693, 545, 695, 703, 699, 707, 709, 711, - 731, 733, 351, -44, 86, 752, 753, -44, 660, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 184, 130, - 131, -44, -380, 724, 736, 755, 133, 134, 756, 760, - 762, 766, 769, 783, 45, 541, 801, 768, 792, 46, - 542, 55, 780, 56, 57, 800, 798, 87, 670, 810, - 781, 802, 806, 816, 814, 674, 219, 694, 220, 95, - 809, 92, 367, 767, 813, 429, 496, 641, 309, 544, - 373, 621, 221, 222, 691, 223, 224, 545, 520, 225, - 374, 396, 101, 375, 770, 706, 690, 773, 789, 643, - 804, 459, 366, 87, 670, 178, 532, 794, 653, 435, - 0, 226, 487, 0, 45, 227, 0, 509, 0, 46, - 544, 55, 0, 56, 57, 0, 0, 0, 545, 228, - 0, 0, 0, 0, 542, 0, 0, 0, 0, 0, - 0, 0, 759, 0, 0, 156, 771, 87, 758, 152, - 0, 153, 0, 0, 154, 0, 155, 0, 0, 0, - 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 542, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 386, 386, 0, - 0, 351, 0, 0, 0, 0, 793, 0, 0, 0, - 0, 0, 0, 351, 0, 0, 0, 0, 0, 437, - 0, -362, 5, 351, 386, 8, -362, -362, -362, -362, - -362, -362, -362, -362, -362, -362, -362, -362, 9, 10, - 0, 11, 0, -362, -362, 12, 0, 0, 403, 404, - 438, 439, -362, 0, 0, 0, 0, 0, 13, 0, - 0, 0, 450, 451, 452, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 21, 22, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, -362, - 0, 437, 0, -362, 5, 0, -83, 8, -362, -362, - -362, -362, -362, -362, -362, -362, -362, -362, -362, -362, - 9, 10, 0, 11, 0, -362, -362, 12, 0, 0, - 403, 404, 438, 439, -362, 0, 0, 0, 0, 0, - 13, 0, 0, 0, 450, 451, 452, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 21, 22, 0, 0, 0, 0, 0, + 106, 108, 4, 89, 111, 161, 157, 158, 101, 102, + 159, 91, 160, 203, 198, 199, 305, 47, 49, 395, + 58, 141, 59, 60, 413, 192, 195, 561, 285, 601, + 196, 197, 325, 396, 397, 398, 344, 664, 193, 194, + 474, 104, 416, 675, 417, 104, 161, 157, 158, 3, + 208, 159, 508, 160, 603, 287, -2, 517, 687, 190, + 200, 288, 141, 614, 682, 5, 703, 676, 6, 7, + 8, 9, 201, 218, 204, 205, 206, 207, 561, 219, + 497, 427, 210, 8, 10, 11, 213, 12, -138, 214, + 219, 13, 216, 120, 741, 604, 369, 362, 500, 104, + 501, -192, -192, 117, 14, 15, 16, 17, 721, 221, + 222, 18, 223, 18, 19, 97, 239, 20, 112, 105, + 21, 742, 743, 105, 429, 742, 743, 22, 23, 513, + 118, 483, 219, -192, 24, 25, 674, 675, -192, -192, + -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, + -192, -192, 26, -192, -192, -192, -192, 26, 434, 198, + 199, 676, 474, 26, -311, 26, 26, 730, 26, 26, + 192, 195, 688, 219, 220, 196, 197, 219, -192, 247, + 219, -293, 248, 193, 194, 741, 476, 186, 5, 120, + -139, 6, 7, 8, 9, 120, 541, 764, 121, 8, + -140, -97, 26, 172, 190, 120, 120, 10, 11, 775, + 12, -192, 742, 743, 13, 377, 378, 379, 188, 620, + 790, 561, 813, 104, 784, 785, 786, 14, 15, 16, + 17, -433, 407, 408, 181, -192, 18, 19, 181, 254, + 20, 255, 18, 21, 249, 250, 93, 373, 374, 833, + 22, 23, 407, 408, 209, 837, 211, 24, 25, 92, + 94, 772, 409, 104, 375, 376, 348, 410, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 10, 11, 409, 12, 137, 138, 139, 410, 96, 99, + 411, 412, 26, 290, 291, 292, 293, 294, 295, 296, + 297, 105, 441, 442, 298, 299, 390, 662, 439, 440, + 561, -505, -44, 390, -44, 638, 639, 300, 301, 224, + 821, 225, 302, 303, 241, 26, 242, 244, -44, -44, + 602, -44, -44, 245, 251, -44, 428, 246, 608, 219, + 256, 105, 257, 325, 260, 289, 488, 489, 258, 259, + 620, 490, 491, 443, 444, 445, 262, -44, 266, 263, + 264, -44, 265, 267, 493, 26, 366, 367, 368, 561, + 268, 270, 141, 274, 275, -44, -506, 453, 281, 104, + 487, 321, 447, 282, 320, 331, 327, 518, 334, 522, + 523, 335, 341, 643, 644, 645, 518, 345, 562, 563, + 346, 484, 355, 325, 356, 104, 370, 360, 540, 371, + 380, 365, 384, 580, 385, 290, 291, 292, 293, 294, + 295, 296, 297, 105, 372, 535, 298, 299, 386, 393, + 432, -341, 446, 435, 530, 449, 529, 520, 452, 300, + 301, 531, 534, 560, 302, 303, 161, 157, 158, 562, + 563, 159, 550, 160, 104, 543, 546, 547, 548, 551, + 47, 49, 141, 58, 573, 59, 60, 247, 553, 571, + 572, 577, 582, 583, 584, 290, 291, 292, 293, 294, + 295, 296, 297, 105, 815, 816, 298, 299, 574, 575, + 576, -268, 586, 595, 560, 593, 594, 600, 605, 300, + 301, 606, 607, 609, 302, 303, -364, 618, -8, 628, + 629, 630, 631, 835, 632, 633, 635, 636, 640, 666, + 646, 647, 648, 649, 290, 291, 292, 293, 294, 295, + 296, 297, 105, 650, 651, 298, 299, 642, 657, 652, + 668, 655, 656, 685, -382, 658, 665, 694, 667, 695, + 696, 104, 714, 697, 303, 702, 486, 126, 127, 792, + 706, 130, 131, 132, 133, 718, -50, 104, 637, 484, + 484, 12, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 10, 11, 722, 12, 137, 138, + 139, 724, 562, 563, 725, 728, 732, 734, 738, 736, + 749, 104, 756, 758, 773, 680, 125, 126, 127, 128, + 129, 130, 131, 132, 133, 134, 135, 136, 10, 11, + -391, 12, 137, 138, 139, 774, 776, 777, 781, 105, + 783, 791, 794, 793, 681, 805, 817, 560, 47, 49, + 822, 58, 804, 59, 60, 105, 820, 824, 834, 89, + -98, 827, 699, 104, 838, 120, 828, 690, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 839, 716, 841, 844, 137, 138, 139, 845, 847, 105, + 382, 562, 563, 98, 545, 737, 95, 514, 319, 661, + 436, 438, 535, 437, 544, 477, 683, 731, 400, 795, + 89, 719, 812, 715, 836, 104, 538, 663, 690, 814, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 189, + 135, 136, 527, 433, 183, 810, 560, 138, 139, 819, + 549, 105, 47, 49, 780, 58, 559, 59, 60, 0, + 562, 563, 698, 0, 89, 626, 0, 0, 0, 0, + 505, 0, 779, 0, 0, 0, 0, 0, 161, 157, + 158, 0, 0, 159, 0, 160, 0, 0, 0, 0, + 796, 797, 0, 0, 141, 0, 0, 0, 390, 390, + 226, 0, 227, 105, 0, 560, 0, 0, 0, 0, + 0, 0, 818, 0, 0, 0, 228, 229, 0, 230, + 231, 0, 455, 232, -373, 6, 0, 390, 9, -373, + -373, -373, -373, -373, -373, -373, -373, -373, -373, -373, + -373, 10, 11, 0, 12, 233, -373, -373, 13, 234, + 0, 407, 408, 456, 457, -373, 0, 0, 0, 0, + 0, 14, 0, 235, 104, 468, 469, 470, 0, 125, + 126, 127, 128, 129, 130, 131, 132, 133, 189, 135, + 136, 0, 0, 0, 22, 23, 138, 139, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -362, 0, 437, 0, -362, 5, 0, -507, 8, - -362, -362, -362, -362, -362, -362, -362, -362, -362, -362, - -362, -362, 9, 10, 0, 11, 0, -362, -362, 12, - 0, 0, 403, 404, 438, 439, -362, 0, 0, 0, - 0, 0, 13, 0, 0, 0, 488, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 489, 0, 0, 0, - 0, 0, 0, 0, 0, 21, 22, 0, 0, 0, + 0, 0, -373, 0, 455, 0, -373, 6, 0, -83, + 9, -373, -373, -373, -373, -373, -373, -373, -373, -373, + -373, -373, -373, 10, 11, 0, 12, 0, -373, -373, + 13, 0, 0, 407, 408, 456, 457, -373, 0, 0, + 407, 408, 105, 14, 0, 0, 104, 468, 469, 470, + 0, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 189, 494, 495, 0, 0, 0, 22, 23, 138, 139, + 409, 496, 0, 0, 0, 410, 0, 0, 411, 412, + 0, 0, 0, 0, -373, 0, 455, 0, -373, 6, + 0, -518, 9, -373, -373, -373, -373, -373, -373, -373, + -373, -373, -373, -373, -373, 10, 11, 0, 12, 0, + -373, -373, 13, 0, 0, 407, 408, 456, 457, -373, + 0, 0, 0, 0, 105, 14, 0, 0, 0, 506, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 507, + 0, 0, 0, 0, 0, 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -362, 0, 437, 0, -362, 5, 0, - -474, 8, -362, -362, -362, -362, -362, -362, -362, -362, - -362, -362, -362, -362, 9, 10, 0, 11, 0, -362, - -362, 12, 0, 0, 403, 404, 438, 439, -362, 0, - 437, 0, -362, 5, 13, 0, 8, -362, -362, -362, - -362, -362, -362, -362, -362, -362, -362, -362, -362, 9, - 10, 0, 11, 0, -362, -362, 12, 21, 22, 403, - 404, 438, 439, -362, 0, 0, 0, 0, 0, 13, - 0, 0, 0, 0, 0, -362, 0, 0, 0, 0, - 0, 0, -65, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 21, 22, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -373, 0, 455, 0, + -373, 6, 0, -485, 9, -373, -373, -373, -373, -373, + -373, -373, -373, -373, -373, -373, -373, 10, 11, 0, + 12, 0, -373, -373, 13, 0, 0, 407, 408, 456, + 457, -373, 0, 455, 0, -373, 6, 14, 0, 9, + -373, -373, -373, -373, -373, -373, -373, -373, -373, -373, + -373, -373, 10, 11, 0, 12, 0, -373, -373, 13, + 22, 23, 407, 408, 456, 457, -373, 0, 0, 0, + 0, 0, 14, 0, 0, 0, 0, 0, -373, 0, + 0, 0, 0, 0, 0, -65, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -362, 0, 437, 0, -362, 5, 0, -87, 8, -362, - -362, -362, -362, -362, -362, -362, -362, -362, -362, -362, - -362, 9, 10, 0, 11, 0, -362, -362, 12, 0, - 0, 403, 404, 438, 439, -362, 0, 0, 0, 0, - 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, - -2, 4, 0, 0, 5, 6, 7, 8, 0, 0, - 0, 0, 0, 0, 21, 22, 0, 0, 0, 0, - 9, 10, 0, 11, 0, 0, 0, 12, 0, 0, - 0, 0, -362, 0, 0, 0, 0, 0, 0, -498, - 13, 14, 15, 16, 0, 0, 0, 0, 0, 17, - 18, 0, 0, 19, 4, 0, 20, 5, 6, 7, - 8, 0, 0, 21, 22, 0, 0, 0, 0, 0, - 23, 24, 0, 9, 10, 0, 11, 0, 0, 4, - 12, 0, 5, 6, 7, 8, 0, 0, 0, 0, - 0, 0, 0, 13, 14, 15, 16, 0, 9, 10, - 0, 11, 17, 18, 0, 12, 19, 0, 0, 20, - 0, 0, 0, 0, 0, 0, 21, 22, 13, 14, - 15, 16, 0, 23, 24, 654, 0, 17, 18, 0, - 0, 19, 0, 0, 20, 0, 0, 0, 0, 0, - 0, 21, 22, 0, 0, 0, 0, 0, 23, 24 + 0, 0, 0, -373, 0, 455, 0, -373, 6, 0, + -87, 9, -373, -373, -373, -373, -373, -373, -373, -373, + -373, -373, -373, -373, 10, 11, 0, 12, 0, -373, + -373, 13, 0, 0, 407, 408, 456, 457, -373, 0, + 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, 6, 7, 8, + 9, 0, 0, 0, 0, 0, 0, 22, 23, 0, + 0, 0, 0, 10, 11, 0, 12, 0, 0, 0, + 13, 0, 0, 0, 0, -373, 0, 0, 0, 0, + 0, 0, -509, 14, 15, 16, 17, 0, 0, 0, + 0, 0, 18, 19, 0, 0, 20, 0, 0, 21, + 0, 0, 0, 0, 0, 0, 22, 23, 0, 0, + 0, 0, 0, 24, 25, 674 }; static const yytype_int16 yycheck[] = { - 13, 13, 21, 22, 78, 18, 19, 41, 41, 111, - 2, 41, 78, 41, 337, 2, 41, 2, 41, 2, - 2, 78, 41, 78, 78, 78, 78, 498, 595, 349, - 78, 447, 339, 340, 341, 290, 1, 606, 388, 3, - 3, 3, 8, 359, 3, 11, 634, 81, 81, 349, - 400, 81, 0, 81, 3, 349, 81, 19, 81, 78, - 79, 49, 81, 28, 29, 53, 3, 80, 3, 82, - 83, 84, 85, 3, 662, 8, 9, 90, 606, 399, - 75, 94, 498, 3, 97, 401, 81, 100, 8, 9, - 10, 75, 6, 13, 14, 15, 16, 81, 89, 399, - 97, 98, 34, 23, 22, 399, 361, 676, 428, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 81, 81, - 84, 85, 81, 88, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 97, 98, 84, 85, 69, 102, 103, - 86, 73, 86, 245, 81, 219, 496, 91, 676, 91, - 86, 81, 6, 219, 103, 91, 87, 89, 86, 91, - 86, 81, 219, 91, 219, 219, 219, 219, 639, 1, - 3, 219, 427, 82, 83, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 685, - 23, 24, 25, 26, 86, 49, 28, 29, 211, 53, - 219, 697, 86, 3, 99, 100, 101, 774, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 714, 786, - 28, 29, 86, 639, 86, 25, 26, 91, 3, 796, - 90, 727, 92, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 30, 31, 86, 81, 24, - 25, 26, 723, 86, 1, 3, 3, 3, 91, 30, - 31, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 60, 23, 24, 25, 26, - 65, 81, 384, 296, 297, 605, 593, 389, 87, 60, - 14, 15, 305, 764, 65, 15, 16, 68, 69, 35, - 36, 37, 86, 325, 326, 327, 81, 723, 242, 243, - 244, 330, 321, 322, 86, 3, 323, 324, 337, 48, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 81, 23, 24, 25, 26, 551, - 552, 360, 87, 398, 398, 398, 398, 86, 764, 87, - 81, 91, 89, 86, 89, 89, 86, 89, 3, 87, - 86, 86, 8, 397, 398, 86, 89, 397, 86, 397, - 383, 390, 397, 447, 397, 367, 87, 86, 397, 398, - 367, 447, 367, 87, 367, 367, 405, 86, 407, 408, - 86, 86, 86, 81, 87, 414, 94, 47, 95, 90, - 1, 103, 87, 4, 5, 6, 7, 426, 87, 96, - 87, 87, 87, 91, 3, 104, 90, 90, 58, 20, - 21, 92, 23, 92, 498, 92, 27, 88, 447, 93, - 92, 3, 498, 105, 88, 105, 88, 3, 87, 40, - 41, 42, 43, 30, 31, 92, 88, 88, 49, 50, - 86, 90, 53, 776, 777, 56, 90, 476, 477, 478, - 90, 90, 63, 64, 51, 52, 88, 88, 8, 70, - 71, 72, 88, 60, 61, 488, 489, 88, 65, 498, - 803, 68, 69, 31, 86, 88, 86, 88, 501, 86, - 592, 86, 3, 86, 88, 86, 509, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 86, - 86, 86, 86, 86, 25, 26, 86, 551, 552, 3, - 104, 551, 552, 551, 552, 86, 551, 552, 551, 552, - 86, 86, 551, 552, 86, 86, 86, 86, 4, 86, - 6, 86, 86, 66, 3, 88, 88, 88, 35, 562, - 88, 564, 565, 566, 20, 21, 92, 23, 24, 86, - 86, 27, 86, 88, 103, 639, 86, 86, 35, 87, - 81, 106, 88, 639, 103, 38, 104, 55, 92, 89, - 59, 3, 595, 49, 3, 92, 103, 53, 607, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 67, 104, 104, 104, 103, 25, 26, 62, 90, - 104, 86, 88, 39, 606, 34, 104, 91, 103, 606, - 639, 606, 92, 606, 606, 86, 91, 640, 640, 75, - 92, 104, 103, 75, 92, 654, 4, 676, 6, 16, - 104, 15, 308, 745, 104, 367, 402, 592, 219, 723, - 318, 562, 20, 21, 673, 23, 24, 723, 422, 27, - 319, 342, 81, 320, 748, 686, 672, 750, 775, 594, - 795, 390, 307, 686, 686, 73, 433, 780, 605, 384, - -1, 49, 399, -1, 676, 53, -1, 414, -1, 676, - 764, 676, -1, 676, 676, -1, -1, -1, 764, 67, - -1, -1, -1, -1, 723, -1, -1, -1, -1, -1, - -1, -1, 731, -1, -1, 749, 749, 730, 730, 749, - -1, 749, -1, -1, 749, -1, 749, -1, -1, -1, - 749, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 764, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 776, 777, -1, - -1, 774, -1, -1, -1, -1, 779, -1, -1, -1, - -1, -1, -1, 786, -1, -1, -1, -1, -1, 1, - -1, 3, 4, 796, 803, 7, 8, 9, 10, 11, + 22, 23, 2, 14, 26, 43, 43, 43, 19, 20, + 43, 14, 43, 84, 81, 81, 223, 4, 4, 335, + 4, 43, 4, 4, 347, 81, 81, 465, 217, 516, + 81, 81, 239, 337, 338, 339, 271, 613, 81, 81, + 392, 3, 347, 625, 347, 3, 84, 84, 84, 0, + 3, 84, 404, 84, 3, 3, 0, 19, 654, 81, + 82, 3, 84, 3, 3, 1, 3, 625, 4, 5, + 6, 7, 83, 75, 85, 86, 87, 88, 516, 81, + 403, 357, 93, 6, 20, 21, 97, 23, 86, 100, + 81, 27, 103, 91, 1, 3, 303, 286, 403, 3, + 403, 28, 29, 86, 40, 41, 42, 43, 704, 109, + 110, 49, 103, 49, 50, 53, 116, 53, 89, 81, + 56, 28, 29, 81, 359, 28, 29, 63, 64, 405, + 86, 1, 81, 3, 70, 71, 72, 719, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 105, 23, 24, 25, 26, 105, 365, 226, + 226, 719, 514, 105, 86, 105, 105, 710, 105, 105, + 226, 226, 659, 81, 75, 226, 226, 81, 105, 8, + 81, 88, 11, 226, 226, 1, 393, 87, 1, 91, + 86, 4, 5, 6, 7, 91, 431, 740, 36, 6, + 86, 86, 105, 22, 226, 91, 91, 20, 21, 752, + 23, 81, 28, 29, 27, 99, 100, 101, 86, 542, + 763, 659, 798, 3, 35, 36, 37, 40, 41, 42, + 43, 86, 30, 31, 72, 105, 49, 50, 76, 90, + 53, 92, 49, 56, 8, 9, 53, 82, 83, 825, + 63, 64, 30, 31, 92, 831, 94, 70, 71, 15, + 16, 748, 60, 3, 97, 98, 277, 65, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 60, 23, 24, 25, 26, 65, 16, 17, + 68, 69, 105, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 375, 376, 84, 85, 328, 611, 373, 374, + 748, 86, 4, 335, 6, 569, 570, 97, 98, 87, + 807, 86, 102, 103, 86, 105, 48, 87, 20, 21, + 519, 23, 24, 86, 89, 27, 358, 87, 527, 81, + 89, 81, 89, 550, 87, 3, 402, 402, 86, 86, + 673, 402, 402, 377, 378, 379, 86, 49, 87, 86, + 86, 53, 86, 86, 402, 105, 300, 301, 302, 807, + 87, 86, 394, 86, 86, 67, 86, 388, 87, 3, + 402, 3, 382, 91, 89, 8, 90, 409, 89, 411, + 412, 47, 103, 582, 583, 584, 418, 87, 465, 465, + 87, 401, 87, 610, 87, 3, 94, 91, 430, 95, + 104, 93, 3, 484, 90, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 96, 425, 84, 85, 92, 92, + 87, 106, 92, 104, 93, 90, 88, 58, 92, 97, + 98, 106, 92, 465, 102, 103, 484, 484, 484, 516, + 516, 484, 452, 484, 3, 3, 88, 3, 87, 92, + 447, 447, 484, 447, 90, 447, 447, 8, 88, 88, + 86, 88, 494, 495, 496, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 800, 801, 84, 85, 90, 90, + 90, 88, 88, 88, 516, 506, 507, 31, 86, 97, + 98, 86, 86, 86, 102, 103, 88, 88, 88, 86, + 86, 86, 86, 829, 86, 86, 86, 86, 86, 92, + 86, 86, 86, 86, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 86, 86, 84, 85, 104, 88, 86, + 66, 86, 86, 103, 35, 88, 88, 86, 88, 86, + 86, 3, 107, 88, 103, 86, 8, 9, 10, 766, + 87, 13, 14, 15, 16, 88, 88, 3, 568, 569, + 570, 23, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 86, 23, 24, 25, + 26, 104, 659, 659, 35, 38, 55, 92, 103, 89, + 104, 3, 59, 3, 92, 627, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - -1, 23, -1, 25, 26, 27, -1, -1, 30, 31, - 32, 33, 34, -1, -1, -1, -1, -1, 40, -1, - -1, -1, 44, 45, 46, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, - -1, 1, -1, 3, 4, -1, 88, 7, 8, 9, + 104, 23, 24, 25, 26, 103, 103, 62, 90, 81, + 104, 86, 88, 91, 634, 104, 103, 659, 625, 625, + 39, 625, 92, 625, 625, 81, 92, 91, 86, 660, + 86, 104, 674, 3, 103, 91, 104, 660, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, -1, 23, -1, 25, 26, 27, -1, -1, - 30, 31, 32, 33, 34, -1, -1, -1, -1, -1, - 40, -1, -1, -1, 44, 45, 46, -1, -1, -1, + 104, 693, 75, 104, 24, 25, 26, 92, 75, 81, + 318, 748, 748, 17, 447, 719, 16, 406, 226, 610, + 370, 372, 692, 371, 446, 394, 641, 711, 340, 769, + 711, 701, 797, 692, 830, 3, 426, 612, 711, 799, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 418, 364, 76, 796, 748, 25, 26, 804, + 451, 81, 719, 719, 756, 719, 34, 719, 719, -1, + 807, 807, 673, -1, 755, 550, -1, -1, -1, -1, + 403, -1, 755, -1, -1, -1, -1, -1, 796, 796, + 796, -1, -1, 796, -1, 796, -1, -1, -1, -1, + 770, 771, -1, -1, 796, -1, -1, -1, 800, 801, + 4, -1, 6, 81, -1, 807, -1, -1, -1, -1, + -1, -1, 803, -1, -1, -1, 20, 21, -1, 23, + 24, -1, 1, 27, 3, 4, -1, 829, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, -1, 23, 49, 25, 26, 27, 53, + -1, 30, 31, 32, 33, 34, -1, -1, -1, -1, + -1, 40, -1, 67, 3, 44, 45, 46, -1, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, -1, -1, -1, 63, 64, 25, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 63, 64, -1, -1, -1, -1, -1, + -1, -1, 81, -1, 1, -1, 3, 4, -1, 88, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, -1, 23, -1, 25, 26, + 27, -1, -1, 30, 31, 32, 33, 34, -1, -1, + 30, 31, 81, 40, -1, -1, 3, 44, 45, 46, + -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 51, 52, -1, -1, -1, 63, 64, 25, 26, + 60, 61, -1, -1, -1, 65, -1, -1, 68, 69, + -1, -1, -1, -1, 81, -1, 1, -1, 3, 4, + -1, 88, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, + 25, 26, 27, -1, -1, 30, 31, 32, 33, 34, + -1, -1, -1, -1, 81, 40, -1, -1, -1, 44, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, + -1, -1, -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 81, -1, 1, -1, 3, 4, -1, 88, 7, + -1, -1, -1, -1, -1, -1, 81, -1, 1, -1, + 3, 4, -1, 88, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, + 23, -1, 25, 26, 27, -1, -1, 30, 31, 32, + 33, 34, -1, 1, -1, 3, 4, 40, -1, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, - -1, -1, 30, 31, 32, 33, 34, -1, -1, -1, - -1, -1, 40, -1, -1, -1, 44, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 54, -1, -1, -1, + 63, 64, 30, 31, 32, 33, 34, -1, -1, -1, + -1, -1, 40, -1, -1, -1, -1, -1, 81, -1, + -1, -1, -1, -1, -1, 88, -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, -1, 1, -1, 3, 4, -1, 88, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, -1, -1, 30, 31, 32, 33, 34, -1, - 1, -1, 3, 4, 40, -1, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, -1, 23, -1, 25, 26, 27, 63, 64, 30, - 31, 32, 33, 34, -1, -1, -1, -1, -1, 40, - -1, -1, -1, -1, -1, 81, -1, -1, -1, -1, - -1, -1, 88, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 63, 64, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 81, -1, 1, -1, 3, 4, -1, 88, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, -1, 23, -1, 25, 26, 27, -1, - -1, 30, 31, 32, 33, 34, -1, -1, -1, -1, - -1, 40, -1, -1, -1, -1, -1, -1, -1, -1, - 0, 1, -1, -1, 4, 5, 6, 7, -1, -1, - -1, -1, -1, -1, 63, 64, -1, -1, -1, -1, - 20, 21, -1, 23, -1, -1, -1, 27, -1, -1, - -1, -1, 81, -1, -1, -1, -1, -1, -1, 88, - 40, 41, 42, 43, -1, -1, -1, -1, -1, 49, - 50, -1, -1, 53, 1, -1, 56, 4, 5, 6, - 7, -1, -1, 63, 64, -1, -1, -1, -1, -1, - 70, 71, -1, 20, 21, -1, 23, -1, -1, 1, - 27, -1, 4, 5, 6, 7, -1, -1, -1, -1, - -1, -1, -1, 40, 41, 42, 43, -1, 20, 21, - -1, 23, 49, 50, -1, 27, 53, -1, -1, 56, - -1, -1, -1, -1, -1, -1, 63, 64, 40, 41, - 42, 43, -1, 70, 71, 72, -1, 49, 50, -1, - -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, - -1, 63, 64, -1, -1, -1, -1, -1, 70, 71 + -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 1, -1, -1, 4, 5, 6, + 7, -1, -1, -1, -1, -1, -1, 63, 64, -1, + -1, -1, -1, 20, 21, -1, 23, -1, -1, -1, + 27, -1, -1, -1, -1, 81, -1, -1, -1, -1, + -1, -1, 88, 40, 41, 42, 43, -1, -1, -1, + -1, -1, 49, 50, -1, -1, 53, -1, -1, 56, + -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, + -1, -1, -1, 70, 71, 72 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 108, 109, 0, 1, 4, 5, 6, 7, 20, - 21, 23, 27, 40, 41, 42, 43, 49, 50, 53, - 56, 63, 64, 70, 71, 110, 112, 127, 129, 133, - 134, 146, 149, 150, 154, 156, 159, 160, 161, 165, - 169, 171, 175, 176, 199, 200, 218, 227, 247, 249, - 261, 263, 285, 286, 287, 329, 380, 381, 382, 383, - 384, 388, 410, 412, 435, 436, 437, 438, 439, 443, - 444, 445, 448, 452, 461, 476, 477, 126, 201, 128, - 155, 219, 248, 262, 288, 330, 3, 198, 235, 154, - 53, 154, 169, 171, 53, 161, 171, 172, 198, 198, - 413, 81, 195, 198, 195, 462, 478, 89, 130, 119, - 135, 147, 86, 86, 118, 91, 157, 151, 120, 162, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 24, 25, 26, 157, 195, 222, 223, 224, - 225, 226, 237, 238, 239, 240, 241, 242, 243, 244, - 245, 246, 247, 249, 261, 263, 287, 296, 299, 302, - 303, 306, 307, 310, 116, 113, 250, 22, 117, 114, - 115, 121, 385, 122, 411, 123, 157, 446, 446, 124, - 125, 87, 480, 86, 17, 195, 205, 237, 240, 241, - 242, 243, 244, 303, 307, 195, 198, 220, 222, 198, - 198, 198, 198, 157, 198, 157, 166, 198, 198, 389, - 198, 196, 75, 81, 75, 3, 3, 87, 86, 4, - 6, 20, 21, 23, 24, 27, 49, 53, 67, 453, - 454, 457, 73, 74, 75, 76, 77, 78, 79, 80, - 84, 85, 97, 98, 102, 103, 195, 206, 207, 208, - 209, 210, 211, 212, 213, 214, 215, 216, 473, 475, - 86, 48, 173, 87, 86, 87, 8, 11, 8, 9, - 89, 300, 170, 90, 92, 89, 89, 86, 86, 87, - 264, 86, 86, 86, 86, 87, 86, 87, 422, 86, - 447, 440, 449, 86, 86, 481, 202, 221, 289, 331, - 87, 91, 391, 414, 198, 197, 463, 479, 131, 205, - 89, 3, 136, 455, 215, 215, 215, 207, 94, 95, - 96, 82, 83, 97, 98, 99, 100, 101, 90, 474, - 158, 152, 163, 8, 207, 217, 89, 47, 174, 297, - 304, 308, 251, 103, 386, 423, 174, 87, 87, 483, - 198, 198, 228, 231, 235, 236, 311, 87, 87, 167, - 392, 390, 91, 419, 198, 87, 391, 109, 111, 3, - 90, 92, 104, 209, 210, 211, 212, 212, 213, 213, - 214, 214, 214, 148, 92, 192, 195, 182, 177, 92, - 301, 192, 217, 217, 217, 253, 255, 256, 265, 393, - 425, 441, 450, 30, 31, 60, 65, 68, 69, 318, - 319, 324, 402, 404, 405, 472, 482, 484, 203, 312, - 229, 290, 332, 182, 195, 174, 420, 415, 464, 110, - 132, 90, 137, 456, 198, 475, 193, 1, 32, 33, - 153, 183, 200, 218, 318, 329, 334, 339, 380, 381, - 44, 45, 46, 164, 178, 179, 183, 341, 207, 223, - 298, 305, 309, 252, 254, 1, 222, 257, 8, 195, - 237, 242, 243, 244, 270, 287, 51, 52, 61, 318, - 387, 394, 402, 404, 407, 408, 409, 472, 44, 54, - 183, 424, 426, 429, 432, 182, 177, 320, 325, 19, - 195, 403, 58, 406, 195, 195, 487, 485, 486, 403, - 488, 88, 93, 105, 313, 315, 92, 3, 292, 295, - 254, 168, 195, 174, 318, 402, 404, 466, 468, 88, - 3, 87, 457, 92, 191, 88, 187, 184, 189, 188, - 190, 34, 195, 224, 303, 307, 340, 363, 185, 186, - 342, 181, 180, 88, 86, 90, 90, 90, 90, 88, - 255, 260, 258, 266, 195, 195, 195, 400, 88, 395, - 396, 397, 398, 399, 401, 198, 198, 88, 427, 428, - 442, 451, 31, 363, 198, 3, 3, 86, 86, 86, - 198, 86, 204, 316, 314, 230, 291, 293, 333, 88, - 416, 471, 469, 470, 465, 467, 138, 194, 86, 86, - 86, 86, 86, 86, 335, 86, 86, 3, 257, 257, - 86, 228, 104, 198, 198, 198, 86, 86, 86, 86, - 86, 86, 86, 430, 433, 86, 86, 88, 88, 321, - 326, 206, 217, 315, 231, 88, 92, 88, 66, 86, - 86, 86, 88, 468, 72, 112, 127, 140, 142, 143, - 195, 3, 343, 259, 267, 103, 345, 345, 363, 232, - 235, 317, 294, 417, 195, 139, 141, 86, 336, 345, - 86, 87, 346, 347, 431, 434, 322, 327, 233, 106, - 295, 195, 144, 88, 142, 103, 354, 344, 268, 104, - 35, 348, 351, 38, 365, 365, 232, 55, 368, 92, - 418, 89, 355, 356, 337, 365, 1, 28, 29, 271, - 273, 277, 279, 352, 104, 349, 366, 323, 369, 328, - 234, 59, 421, 3, 458, 460, 104, 35, 36, 37, - 357, 360, 364, 365, 276, 281, 280, 269, 272, 274, - 278, 363, 92, 103, 365, 103, 62, 371, 235, 195, - 90, 459, 104, 358, 361, 338, 86, 207, 91, 88, - 273, 222, 283, 279, 353, 350, 367, 370, 372, 145, - 92, 92, 363, 39, 374, 282, 284, 275, 231, 351, - 192, 192, 103, 198, 460, 359, 362, 375, 91, 231, - 86, 104, 104, 373, 360, 231, 103, 192, 376, 104, - 75, 377, 378, 104, 92, 379, 75 + 0, 109, 110, 0, 220, 1, 4, 5, 6, 7, + 20, 21, 23, 27, 40, 41, 42, 43, 49, 50, + 53, 56, 63, 64, 70, 71, 105, 111, 113, 128, + 130, 134, 135, 147, 150, 151, 155, 157, 160, 161, + 162, 166, 170, 172, 176, 177, 201, 202, 221, 226, + 235, 255, 257, 269, 271, 293, 294, 295, 337, 388, + 389, 390, 391, 392, 396, 418, 420, 443, 444, 445, + 446, 447, 451, 452, 453, 456, 460, 469, 484, 485, + 127, 203, 129, 156, 227, 256, 270, 296, 338, 200, + 220, 243, 155, 53, 155, 170, 172, 53, 162, 172, + 173, 200, 200, 421, 3, 81, 196, 199, 196, 470, + 486, 196, 89, 131, 120, 136, 148, 86, 86, 119, + 91, 158, 152, 121, 163, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 24, 25, 26, + 158, 196, 230, 231, 232, 233, 234, 245, 246, 247, + 248, 249, 250, 251, 252, 253, 254, 255, 257, 269, + 271, 295, 304, 307, 310, 311, 314, 315, 318, 117, + 114, 258, 22, 118, 115, 116, 122, 393, 123, 419, + 124, 158, 454, 454, 125, 126, 87, 488, 86, 17, + 196, 207, 245, 248, 249, 250, 251, 252, 311, 315, + 196, 200, 228, 230, 200, 200, 200, 200, 3, 158, + 200, 158, 167, 200, 200, 397, 200, 197, 75, 81, + 75, 220, 220, 103, 87, 86, 4, 6, 20, 21, + 23, 24, 27, 49, 53, 67, 461, 462, 465, 220, + 481, 86, 48, 174, 87, 86, 87, 8, 11, 8, + 9, 89, 308, 171, 90, 92, 89, 89, 86, 86, + 87, 272, 86, 86, 86, 86, 87, 86, 87, 430, + 86, 455, 448, 457, 86, 86, 489, 204, 229, 297, + 339, 87, 91, 399, 422, 199, 198, 3, 3, 3, + 73, 74, 75, 76, 77, 78, 79, 80, 84, 85, + 97, 98, 102, 103, 196, 209, 210, 211, 212, 213, + 214, 215, 216, 217, 218, 222, 223, 225, 132, 207, + 89, 3, 137, 463, 208, 209, 483, 90, 159, 153, + 164, 8, 209, 219, 89, 47, 175, 305, 312, 316, + 259, 103, 394, 431, 175, 87, 87, 491, 200, 200, + 236, 239, 243, 244, 319, 87, 87, 168, 400, 398, + 91, 427, 199, 471, 487, 93, 217, 217, 217, 209, + 94, 95, 96, 82, 83, 97, 98, 99, 100, 101, + 104, 224, 110, 112, 3, 90, 92, 482, 149, 193, + 196, 183, 178, 92, 309, 193, 219, 219, 219, 261, + 263, 264, 273, 401, 433, 449, 458, 30, 31, 60, + 65, 68, 69, 326, 327, 332, 410, 412, 413, 480, + 490, 492, 205, 320, 237, 298, 340, 183, 196, 175, + 428, 423, 87, 399, 209, 104, 211, 212, 213, 214, + 214, 215, 215, 216, 216, 216, 92, 220, 133, 90, + 138, 464, 92, 200, 194, 1, 32, 33, 154, 184, + 202, 226, 326, 337, 342, 347, 388, 389, 44, 45, + 46, 165, 179, 180, 184, 349, 209, 231, 306, 313, + 317, 260, 262, 1, 220, 265, 8, 196, 245, 250, + 251, 252, 278, 295, 51, 52, 61, 326, 395, 402, + 410, 412, 415, 416, 417, 480, 44, 54, 184, 432, + 434, 437, 440, 183, 178, 328, 333, 19, 196, 411, + 58, 414, 196, 196, 495, 493, 494, 411, 496, 88, + 93, 106, 321, 323, 92, 220, 300, 303, 262, 169, + 196, 175, 472, 3, 225, 111, 88, 3, 87, 465, + 220, 92, 192, 88, 188, 185, 190, 189, 191, 34, + 196, 232, 311, 315, 348, 371, 186, 187, 350, 182, + 181, 88, 86, 90, 90, 90, 90, 88, 263, 268, + 230, 274, 196, 196, 196, 408, 88, 403, 404, 405, + 406, 407, 409, 200, 200, 88, 435, 436, 450, 459, + 31, 371, 199, 3, 3, 86, 86, 86, 199, 86, + 206, 324, 322, 238, 3, 299, 301, 341, 88, 424, + 326, 410, 412, 474, 476, 139, 483, 195, 86, 86, + 86, 86, 86, 86, 343, 86, 86, 220, 265, 265, + 86, 266, 104, 199, 199, 199, 86, 86, 86, 86, + 86, 86, 86, 438, 441, 86, 86, 88, 88, 329, + 334, 208, 219, 323, 239, 88, 92, 88, 66, 479, + 477, 478, 473, 475, 72, 113, 128, 141, 143, 144, + 196, 220, 3, 236, 275, 103, 353, 353, 371, 240, + 243, 325, 302, 425, 86, 86, 86, 88, 476, 196, + 140, 142, 86, 3, 351, 267, 87, 354, 355, 439, + 442, 330, 335, 241, 107, 303, 196, 145, 88, 220, + 344, 353, 86, 276, 104, 35, 356, 359, 38, 373, + 373, 240, 55, 376, 92, 426, 89, 143, 103, 362, + 352, 1, 28, 29, 279, 281, 285, 287, 360, 104, + 357, 374, 331, 377, 336, 242, 59, 429, 3, 466, + 468, 363, 364, 345, 373, 284, 289, 288, 277, 280, + 282, 286, 371, 92, 103, 373, 103, 62, 379, 243, + 196, 90, 467, 104, 35, 36, 37, 365, 368, 372, + 373, 86, 209, 91, 88, 281, 220, 220, 361, 358, + 375, 378, 380, 146, 92, 104, 366, 369, 346, 290, + 230, 291, 287, 239, 359, 193, 193, 103, 200, 468, + 92, 371, 39, 382, 91, 292, 283, 104, 104, 381, + 367, 370, 383, 239, 86, 193, 368, 239, 103, 104, + 384, 75, 385, 386, 104, 92, 387, 75 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 107, 108, 109, 109, 110, 110, 110, 111, 113, - 112, 114, 112, 115, 112, 116, 112, 117, 112, 118, - 112, 119, 112, 120, 112, 121, 112, 122, 112, 123, - 112, 124, 112, 125, 112, 126, 112, 128, 127, 130, - 131, 132, 129, 133, 135, 136, 137, 138, 139, 134, - 140, 141, 141, 142, 142, 144, 145, 143, 147, 148, - 146, 149, 149, 151, 152, 153, 150, 155, 154, 156, - 156, 156, 158, 157, 157, 159, 159, 159, 159, 160, - 160, 162, 163, 164, 161, 166, 167, 168, 165, 170, - 169, 172, 171, 173, 173, 174, 174, 175, 175, 176, - 177, 177, 178, 178, 178, 180, 179, 181, 179, 182, - 182, 184, 183, 185, 183, 186, 183, 187, 183, 188, - 183, 189, 183, 190, 183, 191, 183, 192, 194, 193, - 193, 195, 196, 195, 197, 195, 198, 199, 199, 199, - 201, 202, 203, 204, 200, 205, 205, 205, 205, 205, - 205, 205, 205, 205, 206, 207, 208, 208, 209, 209, - 210, 210, 211, 211, 211, 212, 212, 212, 213, 213, - 213, 213, 214, 214, 214, 214, 215, 215, 215, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 217, - 219, 218, 218, 218, 218, 218, 218, 221, 220, 222, - 222, 223, 223, 223, 224, 224, 224, 224, 224, 224, - 224, 224, 225, 225, 225, 225, 226, 226, 226, 227, - 227, 228, 230, 229, 229, 231, 231, 232, 234, 233, - 233, 235, 236, 237, 237, 238, 238, 238, 239, 239, - 239, 240, 240, 240, 241, 242, 242, 243, 244, 245, - 246, 248, 247, 250, 251, 252, 249, 253, 254, 254, - 256, 255, 258, 259, 257, 260, 257, 262, 261, 264, - 265, 266, 267, 268, 269, 263, 270, 270, 270, 270, - 270, 270, 271, 272, 272, 274, 275, 273, 276, 273, - 277, 278, 278, 280, 279, 281, 282, 279, 284, 283, - 285, 286, 288, 289, 290, 291, 287, 292, 294, 293, - 293, 295, 297, 298, 296, 296, 300, 301, 299, 302, - 304, 305, 303, 303, 306, 308, 309, 307, 307, 310, - 312, 311, 313, 314, 314, 316, 317, 315, 318, 318, - 320, 321, 322, 323, 319, 325, 326, 327, 328, 324, - 330, 331, 332, 333, 329, 335, 336, 337, 338, 334, - 339, 339, 339, 340, 340, 342, 343, 344, 341, 346, - 345, 347, 345, 348, 350, 349, 349, 352, 353, 351, - 355, 354, 356, 354, 357, 359, 358, 358, 361, 362, - 360, 363, 363, 363, 363, 364, 364, 364, 366, 367, - 365, 365, 369, 370, 368, 368, 372, 373, 371, 371, - 375, 376, 374, 374, 377, 379, 378, 378, 380, 381, - 382, 382, 383, 385, 386, 387, 384, 389, 390, 388, - 392, 391, 391, 393, 393, 395, 394, 396, 394, 397, - 394, 398, 394, 399, 394, 400, 394, 401, 394, 402, - 403, 403, 404, 405, 406, 406, 407, 408, 409, 411, - 410, 413, 414, 415, 416, 417, 418, 412, 420, 419, - 419, 421, 421, 423, 424, 422, 425, 425, 426, 427, - 426, 428, 426, 430, 431, 429, 433, 434, 432, 435, - 435, 435, 436, 436, 437, 438, 440, 441, 442, 439, - 443, 444, 445, 447, 446, 449, 450, 451, 448, 452, - 452, 453, 453, 453, 453, 453, 453, 453, 453, 453, - 453, 454, 456, 455, 455, 457, 457, 458, 459, 459, - 460, 462, 463, 464, 465, 461, 466, 467, 467, 469, - 468, 470, 468, 471, 468, 472, 472, 473, 474, 474, - 475, 476, 478, 479, 477, 481, 482, 480, 483, 483, - 485, 484, 486, 484, 487, 484, 488, 484 + 0, 108, 109, 110, 110, 111, 111, 111, 112, 114, + 113, 115, 113, 116, 113, 117, 113, 118, 113, 119, + 113, 120, 113, 121, 113, 122, 113, 123, 113, 124, + 113, 125, 113, 126, 113, 127, 113, 129, 128, 131, + 132, 133, 130, 134, 136, 137, 138, 139, 140, 135, + 141, 142, 142, 143, 143, 145, 146, 144, 148, 149, + 147, 150, 150, 152, 153, 154, 151, 156, 155, 157, + 157, 157, 159, 158, 158, 160, 160, 160, 160, 161, + 161, 163, 164, 165, 162, 167, 168, 169, 166, 171, + 170, 173, 172, 174, 174, 175, 175, 176, 176, 177, + 178, 178, 179, 179, 179, 181, 180, 182, 180, 183, + 183, 185, 184, 186, 184, 187, 184, 188, 184, 189, + 184, 190, 184, 191, 184, 192, 184, 193, 195, 194, + 194, 196, 197, 196, 198, 196, 199, 200, 201, 201, + 201, 203, 204, 205, 206, 202, 207, 207, 207, 207, + 207, 207, 207, 207, 207, 208, 209, 210, 210, 211, + 211, 212, 212, 213, 213, 213, 214, 214, 214, 215, + 215, 215, 215, 216, 216, 216, 216, 217, 217, 217, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 219, 220, 220, 221, 221, 222, 222, 223, 224, 224, + 225, 227, 226, 226, 226, 226, 226, 226, 229, 228, + 230, 230, 231, 231, 231, 232, 232, 232, 232, 232, + 232, 232, 232, 233, 233, 233, 233, 234, 234, 234, + 235, 235, 236, 238, 237, 237, 239, 239, 240, 242, + 241, 241, 243, 244, 245, 245, 246, 246, 246, 247, + 247, 247, 248, 248, 248, 249, 250, 250, 251, 252, + 253, 254, 256, 255, 258, 259, 260, 257, 261, 262, + 262, 264, 263, 266, 267, 265, 268, 265, 270, 269, + 272, 273, 274, 275, 276, 277, 271, 278, 278, 278, + 278, 278, 278, 279, 280, 280, 282, 283, 281, 284, + 281, 285, 286, 286, 288, 287, 289, 290, 287, 292, + 291, 293, 294, 296, 297, 298, 299, 295, 300, 302, + 301, 301, 303, 305, 306, 304, 304, 308, 309, 307, + 310, 312, 313, 311, 311, 314, 316, 317, 315, 315, + 318, 320, 319, 321, 322, 322, 324, 325, 323, 326, + 326, 328, 329, 330, 331, 327, 333, 334, 335, 336, + 332, 338, 339, 340, 341, 337, 343, 344, 345, 346, + 342, 347, 347, 347, 348, 348, 350, 351, 352, 349, + 354, 353, 355, 353, 356, 358, 357, 357, 360, 361, + 359, 363, 362, 364, 362, 365, 367, 366, 366, 369, + 370, 368, 371, 371, 371, 371, 372, 372, 372, 374, + 375, 373, 373, 377, 378, 376, 376, 380, 381, 379, + 379, 383, 384, 382, 382, 385, 387, 386, 386, 388, + 389, 390, 390, 391, 393, 394, 395, 392, 397, 398, + 396, 400, 399, 399, 401, 401, 403, 402, 404, 402, + 405, 402, 406, 402, 407, 402, 408, 402, 409, 402, + 410, 411, 411, 412, 413, 414, 414, 415, 416, 417, + 419, 418, 421, 422, 423, 424, 425, 426, 420, 428, + 427, 427, 429, 429, 431, 432, 430, 433, 433, 434, + 435, 434, 436, 434, 438, 439, 437, 441, 442, 440, + 443, 443, 443, 444, 444, 445, 446, 448, 449, 450, + 447, 451, 452, 453, 455, 454, 457, 458, 459, 456, + 460, 460, 461, 461, 461, 461, 461, 461, 461, 461, + 461, 461, 462, 464, 463, 463, 465, 465, 466, 467, + 467, 468, 470, 471, 472, 473, 469, 474, 475, 475, + 477, 476, 478, 476, 479, 476, 480, 480, 481, 482, + 482, 483, 484, 486, 487, 485, 489, 490, 488, 491, + 491, 493, 492, 494, 492, 495, 492, 496, 492 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { - 0, 2, 1, 2, 0, 1, 2, 2, 2, 0, + 0, 2, 1, 3, 0, 1, 2, 2, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 0, 0, 7, 2, 0, 0, 0, 0, 0, 11, - 2, 2, 0, 1, 2, 0, 0, 8, 0, 0, + 2, 3, 0, 1, 2, 0, 0, 8, 0, 0, 6, 1, 1, 0, 0, 0, 7, 0, 3, 2, 3, 3, 0, 4, 0, 1, 1, 1, 1, 2, 1, 0, 0, 0, 7, 0, 0, 0, 8, 0, @@ -1538,50 +1542,51 @@ static const yytype_uint8 yyr2[] = 2, 0, 1, 1, 2, 0, 3, 0, 3, 2, 0, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 2, 0, 4, - 0, 1, 0, 3, 0, 4, 1, 1, 2, 2, - 0, 0, 0, 0, 9, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, - 1, 3, 1, 3, 3, 1, 3, 3, 1, 3, - 3, 3, 1, 2, 2, 2, 1, 1, 3, 1, + 0, 1, 0, 3, 0, 4, 1, 2, 1, 2, + 2, 0, 0, 0, 0, 9, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, + 3, 1, 3, 1, 3, 3, 1, 3, 3, 1, + 3, 3, 3, 1, 2, 2, 2, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 3, 1, 1, 1, 2, 1, 0, 3, 1, + 1, 2, 0, 5, 2, 1, 1, 2, 3, 0, + 3, 0, 3, 1, 1, 1, 2, 1, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 0, 4, 0, 1, 1, 2, 0, 4, - 0, 1, 1, 1, 1, 1, 2, 1, 2, 3, - 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, - 1, 0, 3, 0, 0, 0, 7, 2, 2, 0, - 0, 2, 0, 0, 5, 0, 3, 0, 3, 0, - 0, 0, 0, 0, 0, 14, 1, 1, 1, 1, - 1, 1, 2, 2, 0, 0, 0, 5, 0, 3, - 2, 2, 0, 0, 3, 0, 0, 5, 0, 3, - 1, 1, 0, 0, 0, 0, 9, 2, 0, 4, - 0, 1, 0, 0, 6, 2, 0, 0, 5, 6, - 0, 0, 6, 1, 1, 0, 0, 6, 1, 1, - 0, 3, 2, 2, 0, 0, 0, 5, 1, 1, - 0, 0, 0, 0, 9, 0, 0, 0, 0, 9, - 0, 0, 0, 0, 9, 0, 0, 0, 0, 10, - 1, 1, 0, 1, 1, 0, 0, 0, 7, 0, - 3, 0, 4, 2, 0, 4, 0, 0, 0, 5, + 1, 1, 2, 0, 4, 0, 1, 1, 2, 0, + 4, 0, 1, 1, 1, 1, 1, 2, 1, 2, + 3, 2, 1, 1, 2, 1, 1, 1, 1, 1, + 1, 1, 0, 3, 0, 0, 0, 7, 2, 2, + 0, 0, 2, 0, 0, 6, 0, 3, 0, 3, + 0, 0, 0, 0, 0, 0, 14, 1, 1, 1, + 1, 1, 1, 2, 2, 0, 0, 0, 6, 0, + 3, 2, 3, 0, 0, 3, 0, 0, 5, 0, + 3, 1, 1, 0, 0, 0, 0, 9, 2, 0, + 4, 0, 2, 0, 0, 6, 2, 0, 0, 5, + 6, 0, 0, 6, 1, 1, 0, 0, 6, 1, + 1, 0, 3, 2, 2, 0, 0, 0, 5, 1, + 1, 0, 0, 0, 0, 9, 0, 0, 0, 0, + 9, 0, 0, 0, 0, 9, 0, 0, 0, 0, + 11, 1, 1, 0, 1, 1, 0, 0, 0, 8, 0, 3, 0, 4, 2, 0, 4, 0, 0, 0, - 5, 1, 1, 1, 1, 1, 1, 1, 0, 0, - 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, - 0, 0, 6, 0, 2, 0, 4, 0, 3, 3, - 1, 1, 2, 0, 0, 0, 7, 0, 0, 6, - 0, 3, 0, 2, 0, 0, 3, 0, 3, 0, - 3, 0, 3, 0, 3, 0, 3, 0, 3, 3, - 1, 1, 3, 2, 1, 0, 3, 3, 3, 0, - 3, 0, 0, 0, 0, 0, 0, 13, 0, 3, - 0, 2, 0, 0, 0, 5, 2, 0, 1, 0, - 3, 0, 3, 0, 0, 6, 0, 0, 6, 1, - 1, 1, 1, 1, 2, 3, 0, 0, 0, 8, - 3, 3, 2, 0, 3, 0, 0, 0, 8, 1, + 5, 0, 3, 0, 4, 2, 0, 4, 0, 0, + 0, 5, 1, 1, 1, 1, 1, 1, 1, 0, + 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, + 0, 0, 0, 6, 0, 2, 0, 4, 0, 3, + 3, 1, 1, 2, 0, 0, 0, 7, 0, 0, + 6, 0, 3, 0, 2, 0, 0, 3, 0, 3, + 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, + 3, 1, 1, 3, 2, 1, 0, 3, 3, 3, + 0, 3, 0, 0, 0, 0, 0, 0, 13, 0, + 3, 0, 2, 0, 0, 0, 5, 2, 0, 1, + 0, 3, 0, 3, 0, 0, 6, 0, 0, 6, + 1, 1, 1, 1, 1, 2, 3, 0, 0, 0, + 8, 3, 3, 2, 0, 3, 0, 0, 0, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 0, 4, 0, 2, 5, 2, 3, 0, - 1, 0, 0, 0, 0, 9, 2, 2, 0, 0, - 3, 0, 3, 0, 3, 3, 3, 2, 3, 0, - 1, 2, 0, 0, 5, 0, 0, 5, 2, 0, - 0, 3, 0, 3, 0, 3, 0, 3 + 1, 2, 2, 0, 4, 0, 2, 5, 2, 3, + 0, 1, 0, 0, 0, 0, 10, 2, 2, 0, + 0, 3, 0, 3, 0, 3, 3, 3, 3, 4, + 0, 1, 2, 0, 0, 6, 0, 0, 5, 2, + 0, 0, 3, 0, 3, 0, 3, 0, 3 }; @@ -2258,298 +2263,298 @@ yyreduce: switch (yyn) { case 5: -#line 370 "fe/idl.ypp" /* yacc.c:1646 */ +#line 369 "fe/idl.ypp" /* yacc.c:1646 */ { } -#line 2265 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2270 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 6: -#line 373 "fe/idl.ypp" /* yacc.c:1646 */ +#line 372 "fe/idl.ypp" /* yacc.c:1646 */ { } -#line 2272 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2277 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 7: -#line 376 "fe/idl.ypp" /* yacc.c:1646 */ +#line 375 "fe/idl.ypp" /* yacc.c:1646 */ { } -#line 2279 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2284 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 9: -#line 386 "fe/idl.ypp" /* yacc.c:1646 */ +#line 392 "fe/idl.ypp" /* yacc.c:1646 */ { // fixed_definition : type_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 2288 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2293 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 10: -#line 391 "fe/idl.ypp" /* yacc.c:1646 */ +#line 397 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2297 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2302 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 11: -#line 396 "fe/idl.ypp" /* yacc.c:1646 */ +#line 402 "fe/idl.ypp" /* yacc.c:1646 */ { // | typeid_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 2306 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2311 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 12: -#line 401 "fe/idl.ypp" /* yacc.c:1646 */ +#line 407 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2315 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2320 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 13: -#line 406 "fe/idl.ypp" /* yacc.c:1646 */ +#line 412 "fe/idl.ypp" /* yacc.c:1646 */ { // | typeprefix_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 2324 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2329 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 14: -#line 411 "fe/idl.ypp" /* yacc.c:1646 */ +#line 417 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2333 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2338 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 15: -#line 416 "fe/idl.ypp" /* yacc.c:1646 */ +#line 422 "fe/idl.ypp" /* yacc.c:1646 */ { // | const_dcl idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 2342 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2347 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 16: -#line 421 "fe/idl.ypp" /* yacc.c:1646 */ +#line 427 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2351 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2356 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 17: -#line 426 "fe/idl.ypp" /* yacc.c:1646 */ +#line 432 "fe/idl.ypp" /* yacc.c:1646 */ { // | exception idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 2360 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2365 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 18: -#line 431 "fe/idl.ypp" /* yacc.c:1646 */ +#line 437 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2369 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2374 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 19: -#line 436 "fe/idl.ypp" /* yacc.c:1646 */ +#line 442 "fe/idl.ypp" /* yacc.c:1646 */ { // | interface_def idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen); } -#line 2378 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2383 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 20: -#line 441 "fe/idl.ypp" /* yacc.c:1646 */ +#line 447 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2387 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2392 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 21: -#line 446 "fe/idl.ypp" /* yacc.c:1646 */ +#line 452 "fe/idl.ypp" /* yacc.c:1646 */ { // | module idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen); } -#line 2396 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2401 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 22: -#line 451 "fe/idl.ypp" /* yacc.c:1646 */ +#line 457 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2405 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2410 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 23: -#line 456 "fe/idl.ypp" /* yacc.c:1646 */ +#line 462 "fe/idl.ypp" /* yacc.c:1646 */ { // | value_def idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen); } -#line 2414 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2419 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 24: -#line 461 "fe/idl.ypp" /* yacc.c:1646 */ +#line 467 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2423 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2428 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 25: -#line 466 "fe/idl.ypp" /* yacc.c:1646 */ +#line 472 "fe/idl.ypp" /* yacc.c:1646 */ { // | component idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen); } -#line 2432 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2437 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 26: -#line 471 "fe/idl.ypp" /* yacc.c:1646 */ +#line 477 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2441 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2446 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 27: -#line 476 "fe/idl.ypp" /* yacc.c:1646 */ +#line 482 "fe/idl.ypp" /* yacc.c:1646 */ { // | home_decl idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen); } -#line 2450 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2455 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 28: -#line 481 "fe/idl.ypp" /* yacc.c:1646 */ +#line 487 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2459 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2464 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 29: -#line 486 "fe/idl.ypp" /* yacc.c:1646 */ +#line 492 "fe/idl.ypp" /* yacc.c:1646 */ { // | event idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen); } -#line 2468 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2473 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 30: -#line 491 "fe/idl.ypp" /* yacc.c:1646 */ +#line 497 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2477 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2482 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 31: -#line 496 "fe/idl.ypp" /* yacc.c:1646 */ +#line 502 "fe/idl.ypp" /* yacc.c:1646 */ { // | porttype_decl idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen); } -#line 2486 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2491 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 32: -#line 501 "fe/idl.ypp" /* yacc.c:1646 */ +#line 507 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2495 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2500 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 33: -#line 506 "fe/idl.ypp" /* yacc.c:1646 */ +#line 512 "fe/idl.ypp" /* yacc.c:1646 */ { // | connector_decl idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen); } -#line 2504 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2509 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 34: -#line 511 "fe/idl.ypp" /* yacc.c:1646 */ +#line 517 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2513 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2518 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 35: -#line 516 "fe/idl.ypp" /* yacc.c:1646 */ +#line 522 "fe/idl.ypp" /* yacc.c:1646 */ { // | error idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 2522 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2527 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 36: -#line 521 "fe/idl.ypp" /* yacc.c:1646 */ +#line 527 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 2532 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2537 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 37: -#line 530 "fe/idl.ypp" /* yacc.c:1646 */ +#line 536 "fe/idl.ypp" /* yacc.c:1646 */ { // module_header : IDL_MODULE idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen); } -#line 2541 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2546 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 38: -#line 535 "fe/idl.ypp" /* yacc.c:1646 */ +#line 541 "fe/idl.ypp" /* yacc.c:1646 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 2549 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2554 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 39: -#line 542 "fe/idl.ypp" /* yacc.c:1646 */ +#line 548 "fe/idl.ypp" /* yacc.c:1646 */ { // module : module_header idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen); @@ -2588,29 +2593,29 @@ yyreduce: */ idl_global->scopes ().push (m); } -#line 2592 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2597 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 40: -#line 581 "fe/idl.ypp" /* yacc.c:1646 */ +#line 587 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen); } -#line 2601 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2606 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 41: -#line 586 "fe/idl.ypp" /* yacc.c:1646 */ +#line 592 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_definition idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen); } -#line 2610 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2615 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 42: -#line 591 "fe/idl.ypp" /* yacc.c:1646 */ +#line 597 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_ModuleQsSeen); @@ -2620,19 +2625,19 @@ yyreduce: idl_global->scopes ().pop (); } -#line 2624 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2629 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 43: -#line 604 "fe/idl.ypp" /* yacc.c:1646 */ +#line 610 "fe/idl.ypp" /* yacc.c:1646 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen); } -#line 2632 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2637 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 44: -#line 611 "fe/idl.ypp" /* yacc.c:1646 */ +#line 617 "fe/idl.ypp" /* yacc.c:1646 */ { // template_module : template_module_header // The module_header rule is common to template module, fixed @@ -2647,11 +2652,11 @@ yyreduce: IDL_GlobalData::PS_ModuleIDSeen); } } -#line 2651 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2656 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 45: -#line 626 "fe/idl.ypp" /* yacc.c:1646 */ +#line 632 "fe/idl.ypp" /* yacc.c:1646 */ { if (FE_Utils::duplicate_param_id ((yyvsp[0].plval))) { @@ -2661,11 +2666,11 @@ yyreduce: return 1; } } -#line 2665 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2670 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 46: -#line 636 "fe/idl.ypp" /* yacc.c:1646 */ +#line 642 "fe/idl.ypp" /* yacc.c:1646 */ { // '>' idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleParamsSeen); @@ -2696,27 +2701,27 @@ yyreduce: // of the template module. idl_global->current_params ((yyvsp[-2].plval)); } -#line 2700 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2705 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 47: -#line 667 "fe/idl.ypp" /* yacc.c:1646 */ +#line 673 "fe/idl.ypp" /* yacc.c:1646 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen); } -#line 2708 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2713 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 48: -#line 671 "fe/idl.ypp" /* yacc.c:1646 */ +#line 677 "fe/idl.ypp" /* yacc.c:1646 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen); } -#line 2716 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2721 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 49: -#line 675 "fe/idl.ypp" /* yacc.c:1646 */ +#line 681 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen); @@ -2734,33 +2739,33 @@ yyreduce: // that we are no longer in a template module scope. idl_global->current_params (0); } -#line 2738 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2743 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 55: -#line 710 "fe/idl.ypp" /* yacc.c:1646 */ +#line 716 "fe/idl.ypp" /* yacc.c:1646 */ { // template_module_ref : IDL_ALIAS scoped_name idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefSeen); } -#line 2748 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2753 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 56: -#line 716 "fe/idl.ypp" /* yacc.c:1646 */ +#line 722 "fe/idl.ypp" /* yacc.c:1646 */ { // '<' at_least_one_formal_parameter_name '>' idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefParamsSeen); } -#line 2758 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2763 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 57: -#line 722 "fe/idl.ypp" /* yacc.c:1646 */ +#line 728 "fe/idl.ypp" /* yacc.c:1646 */ { -// id +// defining_id idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefIDSeen); @@ -2837,33 +2842,33 @@ yyreduce: idl_global->in_tmpl_mod_no_alias (itmna_flag); idl_global->in_tmpl_mod_alias (false); } -#line 2841 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2846 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 58: -#line 804 "fe/idl.ypp" /* yacc.c:1646 */ +#line 810 "fe/idl.ypp" /* yacc.c:1646 */ { // template_module_inst : template_module_header idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleSeen); } -#line 2851 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2856 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 59: -#line 810 "fe/idl.ypp" /* yacc.c:1646 */ +#line 816 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_actual_parameter '>' idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleArgsSeen); } -#line 2861 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2866 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 60: -#line 816 "fe/idl.ypp" /* yacc.c:1646 */ +#line 822 "fe/idl.ypp" /* yacc.c:1646 */ { -// id +// defining_id idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleIDSeen); @@ -2924,11 +2929,11 @@ yyreduce: idl_global->set_err_count (idl_global->err_count () + 1); } } -#line 2928 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2933 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 63: -#line 887 "fe/idl.ypp" /* yacc.c:1646 */ +#line 893 "fe/idl.ypp" /* yacc.c:1646 */ { // interface : interface_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -2967,29 +2972,29 @@ yyreduce: */ idl_global->scopes ().push (i); } -#line 2971 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2976 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 64: -#line 926 "fe/idl.ypp" /* yacc.c:1646 */ +#line 932 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen); } -#line 2980 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2985 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 65: -#line 931 "fe/idl.ypp" /* yacc.c:1646 */ +#line 937 "fe/idl.ypp" /* yacc.c:1646 */ { // exports idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen); } -#line 2989 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2994 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 66: -#line 936 "fe/idl.ypp" /* yacc.c:1646 */ +#line 942 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen); @@ -2999,30 +3004,30 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3003 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3008 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 67: -#line 949 "fe/idl.ypp" /* yacc.c:1646 */ +#line 955 "fe/idl.ypp" /* yacc.c:1646 */ { // interface_decl : IDL_INTERFACE idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen); } -#line 3012 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3017 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 68: -#line 954 "fe/idl.ypp" /* yacc.c:1646 */ +#line 960 "fe/idl.ypp" /* yacc.c:1646 */ { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3022 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3027 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 69: -#line 963 "fe/idl.ypp" /* yacc.c:1646 */ +#line 969 "fe/idl.ypp" /* yacc.c:1646 */ { // interface_header : interface_decl inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3059,11 +3064,11 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3063 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3068 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 70: -#line 1001 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1007 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_LOCAL interface_decl inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3093,11 +3098,11 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3097 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3102 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 71: -#line 1032 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1038 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_ABSTRACT interface_decl inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3127,39 +3132,39 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3131 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3136 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 72: -#line 1065 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1071 "fe/idl.ypp" /* yacc.c:1646 */ { // inheritance_spec : ':' opt_truncatable idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 3140 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3145 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 73: -#line 1070 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1076 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_scoped_name (yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval)); (yyval.nlval) = (yyvsp[0].nlval); } -#line 3150 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3155 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 74: -#line 1076 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1082 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.nlval) = 0; } -#line 3159 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3164 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 79: -#line 1091 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1097 "fe/idl.ypp" /* yacc.c:1646 */ { // valuetype : IDL_CUSTOM value_concrete_decl ACE_DEBUG ((LM_DEBUG, @@ -3170,11 +3175,11 @@ yyreduce: ACE_TEXT ("Sorry, I (TAO_IDL) can't handle") ACE_TEXT (" custom yet\n"))); } -#line 3174 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3179 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 81: -#line 1106 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1112 "fe/idl.ypp" /* yacc.c:1646 */ { // value_concrete_decl : value_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3218,29 +3223,29 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3222 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3227 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 82: -#line 1150 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1156 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3231 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3236 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 83: -#line 1155 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1161 "fe/idl.ypp" /* yacc.c:1646 */ { // value_elements idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3240 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3245 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 84: -#line 1160 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1166 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); @@ -3260,11 +3265,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3264 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3269 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 85: -#line 1184 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1190 "fe/idl.ypp" /* yacc.c:1646 */ { // value_abs_decl : IDL_ABSTRACT value_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3308,29 +3313,29 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3312 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3317 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 86: -#line 1228 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1234 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3321 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3326 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 87: -#line 1233 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1239 "fe/idl.ypp" /* yacc.c:1646 */ { // exports idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3330 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3335 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 88: -#line 1238 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1244 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); @@ -3340,20 +3345,20 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3344 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3349 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 89: -#line 1252 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1258 "fe/idl.ypp" /* yacc.c:1646 */ { // value_header : value_decl inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 3353 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3358 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 90: -#line 1257 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1263 "fe/idl.ypp" /* yacc.c:1646 */ { // supports_spec idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -3385,66 +3390,66 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 3389 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3394 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 91: -#line 1292 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1298 "fe/idl.ypp" /* yacc.c:1646 */ { // value_decl : IDL_VALUETYPE idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen); } -#line 3398 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3403 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 92: -#line 1297 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1303 "fe/idl.ypp" /* yacc.c:1646 */ { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3408 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3413 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 93: -#line 1306 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1312 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_truncatable : IDL_TRUNCATABLE (yyval.bval) = true; } -#line 3417 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3422 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 94: -#line 1311 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1317 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.bval) = false; } -#line 3426 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3431 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 95: -#line 1320 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1326 "fe/idl.ypp" /* yacc.c:1646 */ { // supports_spec : IDL_SUPPORTS at_least_one_scoped_name (yyval.nlval) = (yyvsp[0].nlval); } -#line 3435 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3440 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 96: -#line 1325 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1331 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.nlval) = 0; } -#line 3444 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3449 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 97: -#line 1334 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1340 "fe/idl.ypp" /* yacc.c:1646 */ { // value_forward_decl : IDL_ABSTRACT value_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3468,11 +3473,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3472 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3477 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 98: -#line 1359 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1365 "fe/idl.ypp" /* yacc.c:1646 */ { // | value_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3496,11 +3501,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3500 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3505 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 99: -#line 1386 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1392 "fe/idl.ypp" /* yacc.c:1646 */ { // value_box_decl : value_decl type_spec idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen); @@ -3562,192 +3567,192 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 3566 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3571 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 105: -#line 1463 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1469 "fe/idl.ypp" /* yacc.c:1646 */ { // state_member : IDL_PUBLIC /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_PUBLIC; } -#line 3576 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3581 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 106: -#line 1469 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1475 "fe/idl.ypp" /* yacc.c:1646 */ { // member_i } -#line 3584 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3589 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 107: -#line 1473 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1479 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_PRIVATE /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_PRIVATE; } -#line 3594 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3599 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 108: -#line 1479 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1485 "fe/idl.ypp" /* yacc.c:1646 */ { // member_i } -#line 3602 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3607 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 111: -#line 1491 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1497 "fe/idl.ypp" /* yacc.c:1646 */ { // export : type_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 3611 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3616 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 112: -#line 1496 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1502 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3620 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3625 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 113: -#line 1501 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1507 "fe/idl.ypp" /* yacc.c:1646 */ { // | typeid_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 3629 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3634 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 114: -#line 1506 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1512 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3638 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3643 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 115: -#line 1511 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1517 "fe/idl.ypp" /* yacc.c:1646 */ { // | typeprefix_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 3647 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3652 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 116: -#line 1516 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1522 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3656 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3661 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 117: -#line 1521 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1527 "fe/idl.ypp" /* yacc.c:1646 */ { // | const_dcl idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 3665 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3670 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 118: -#line 1526 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1532 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } -#line 3674 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3679 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 119: -#line 1531 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1537 "fe/idl.ypp" /* yacc.c:1646 */ { // | exception idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 3683 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3688 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 120: -#line 1536 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1542 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3692 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3697 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 121: -#line 1541 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1547 "fe/idl.ypp" /* yacc.c:1646 */ { // | attribute idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 3701 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3706 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 122: -#line 1546 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1552 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3710 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3715 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 123: -#line 1551 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1557 "fe/idl.ypp" /* yacc.c:1646 */ { // | operation idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen); } -#line 3719 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3724 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 124: -#line 1556 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1562 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3728 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3733 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 125: -#line 1561 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1567 "fe/idl.ypp" /* yacc.c:1646 */ { // | error idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 3737 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3742 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 126: -#line 1566 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1572 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 3747 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3752 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 127: -#line 1575 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1581 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_scoped_name : scoped_name scoped_names ACE_NEW_RETURN ((yyval.nlval), @@ -3755,20 +3760,20 @@ yyreduce: (yyvsp[0].nlval)), 1); } -#line 3759 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3764 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 128: -#line 1587 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1593 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_names : scoped_names ',' idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen); } -#line 3768 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3773 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 129: -#line 1592 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1598 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_name idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen); @@ -3789,20 +3794,20 @@ yyreduce: (yyval.nlval) = (yyvsp[-3].nlval); } } -#line 3793 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3798 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 130: -#line 1613 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1619 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.nlval) = 0; } -#line 3802 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3807 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 131: -#line 1621 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1627 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_name : id idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3812,20 +3817,20 @@ yyreduce: 0), 1); } -#line 3816 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3821 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 132: -#line 1631 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1637 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_SCOPE_DELIMITOR idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); } -#line 3825 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3830 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 133: -#line 1636 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1642 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3846,11 +3851,11 @@ yyreduce: sn), 1); } -#line 3850 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3855 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 134: -#line 1658 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1664 "fe/idl.ypp" /* yacc.c:1646 */ { // | scoped_name IDL_SCOPE_DELIMITOR idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); @@ -3861,11 +3866,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3865 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3870 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 135: -#line 1669 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1675 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3878,11 +3883,11 @@ yyreduce: (yyvsp[-3].idlist)->nconc (sn); (yyval.idlist) = (yyvsp[-3].idlist); } -#line 3882 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3887 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 136: -#line 1684 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1690 "fe/idl.ypp" /* yacc.c:1646 */ { // id: IDENTIFIER ACE_NEW_RETURN ((yyval.idval), @@ -3891,11 +3896,25 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3895 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3900 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 137: -#line 1696 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1701 "fe/idl.ypp" /* yacc.c:1646 */ + { + /* defining_id is a defining identifier + whereas id is usually a reference to a defining identifier */ + ACE_NEW_RETURN ((yyval.idval), + Identifier ((yyvsp[0].strval)), + 1); + ACE::strdelete ((yyvsp[0].strval)); + (yyvsp[0].strval) = 0; + } +#line 3914 "fe/idl.tab.cpp" /* yacc.c:1646 */ + break; + + case 138: +#line 1714 "fe/idl.ypp" /* yacc.c:1646 */ { // interface_forward : interface_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3940,11 +3959,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3944 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3963 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 138: -#line 1742 "fe/idl.ypp" /* yacc.c:1646 */ + case 139: +#line 1760 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_LOCAL interface_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3971,11 +3990,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3975 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3994 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 139: -#line 1770 "fe/idl.ypp" /* yacc.c:1646 */ + case 140: +#line 1788 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_ABSTRACT interface_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -4002,47 +4021,47 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4006 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4025 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 140: -#line 1800 "fe/idl.ypp" /* yacc.c:1646 */ + case 141: +#line 1818 "fe/idl.ypp" /* yacc.c:1646 */ { // const_dcl : IDL_CONST idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen); } -#line 4015 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4034 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 141: -#line 1805 "fe/idl.ypp" /* yacc.c:1646 */ + case 142: +#line 1823 "fe/idl.ypp" /* yacc.c:1646 */ { // const_type idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen); } -#line 4024 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4043 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 142: -#line 1810 "fe/idl.ypp" /* yacc.c:1646 */ + case 143: +#line 1828 "fe/idl.ypp" /* yacc.c:1646 */ { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen); } -#line 4033 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4052 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 143: -#line 1815 "fe/idl.ypp" /* yacc.c:1646 */ + case 144: +#line 1833 "fe/idl.ypp" /* yacc.c:1646 */ { // '=' idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen); } -#line 4042 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4061 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 144: -#line 1820 "fe/idl.ypp" /* yacc.c:1646 */ + case 145: +#line 1838 "fe/idl.ypp" /* yacc.c:1646 */ { // expression UTL_ScopedName n ((yyvsp[-4].idval), @@ -4106,11 +4125,11 @@ yyreduce: result = 0; } } -#line 4110 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4129 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 151: -#line 1893 "fe/idl.ypp" /* yacc.c:1646 */ + case 152: +#line 1911 "fe/idl.ypp" /* yacc.c:1646 */ { // const_type // : integer_type @@ -4122,20 +4141,20 @@ yyreduce: // | string_type_spec (yyval.etval) = AST_Expression::EV_string; } -#line 4126 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4145 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 152: -#line 1905 "fe/idl.ypp" /* yacc.c:1646 */ + case 153: +#line 1923 "fe/idl.ypp" /* yacc.c:1646 */ { // | wstring_type_spec (yyval.etval) = AST_Expression::EV_wstring; } -#line 4135 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4154 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 153: -#line 1910 "fe/idl.ypp" /* yacc.c:1646 */ + case 154: +#line 1928 "fe/idl.ypp" /* yacc.c:1646 */ { // | scoped_name UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -4202,11 +4221,11 @@ yyreduce: sn = 0; (yyvsp[0].idlist) = 0; } -#line 4206 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4225 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 157: -#line 1984 "fe/idl.ypp" /* yacc.c:1646 */ + case 158: +#line 2002 "fe/idl.ypp" /* yacc.c:1646 */ { // or_expr : xor_expr // | or_expr '|' xor_expr @@ -4217,11 +4236,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4221 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4240 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 159: -#line 1999 "fe/idl.ypp" /* yacc.c:1646 */ + case 160: +#line 2017 "fe/idl.ypp" /* yacc.c:1646 */ { // xor_expr : and_expr // | xor_expr '^' and_expr @@ -4232,11 +4251,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4236 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4255 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 161: -#line 2014 "fe/idl.ypp" /* yacc.c:1646 */ + case 162: +#line 2032 "fe/idl.ypp" /* yacc.c:1646 */ { // and_expr : shift_expr | and_expr '&' shift_expr (yyval.exval) = @@ -4246,11 +4265,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4250 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4269 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 163: -#line 2028 "fe/idl.ypp" /* yacc.c:1646 */ + case 164: +#line 2046 "fe/idl.ypp" /* yacc.c:1646 */ { // shift_expr : add_expr | shift_expr IDL_LEFT_SHIFT add_expr (yyval.exval) = @@ -4260,11 +4279,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4264 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4283 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 164: -#line 2038 "fe/idl.ypp" /* yacc.c:1646 */ + case 165: +#line 2056 "fe/idl.ypp" /* yacc.c:1646 */ { // | shift_expr IDL_RIGHT_SHIFT add_expr (yyval.exval) = @@ -4274,11 +4293,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4278 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4297 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 166: -#line 2052 "fe/idl.ypp" /* yacc.c:1646 */ + case 167: +#line 2070 "fe/idl.ypp" /* yacc.c:1646 */ { // add_expr : mult_expr | add_expr '+' mult_expr (yyval.exval) = @@ -4288,11 +4307,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4292 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4311 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 167: -#line 2062 "fe/idl.ypp" /* yacc.c:1646 */ + case 168: +#line 2080 "fe/idl.ypp" /* yacc.c:1646 */ { // | add_expr '-' mult_expr (yyval.exval) = @@ -4302,11 +4321,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4306 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4325 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 169: -#line 2076 "fe/idl.ypp" /* yacc.c:1646 */ + case 170: +#line 2094 "fe/idl.ypp" /* yacc.c:1646 */ { // mult_expr : unary_expr | mult_expr '*' unary_expr (yyval.exval) = @@ -4316,11 +4335,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4320 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4339 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 170: -#line 2086 "fe/idl.ypp" /* yacc.c:1646 */ + case 171: +#line 2104 "fe/idl.ypp" /* yacc.c:1646 */ { // | mult_expr '/' unary_expr (yyval.exval) = @@ -4330,11 +4349,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4334 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4353 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 171: -#line 2096 "fe/idl.ypp" /* yacc.c:1646 */ + case 172: +#line 2114 "fe/idl.ypp" /* yacc.c:1646 */ { // | mult_expr '%' unary_expr (yyval.exval) = @@ -4344,11 +4363,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4348 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4367 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 173: -#line 2110 "fe/idl.ypp" /* yacc.c:1646 */ + case 174: +#line 2128 "fe/idl.ypp" /* yacc.c:1646 */ { // unary_expr : primary_expr | '+' primary_expr (yyval.exval) = @@ -4358,11 +4377,11 @@ yyreduce: 0 ); } -#line 4362 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4381 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 174: -#line 2120 "fe/idl.ypp" /* yacc.c:1646 */ + case 175: +#line 2138 "fe/idl.ypp" /* yacc.c:1646 */ { // | '-' primary_expr (yyval.exval) = @@ -4372,11 +4391,11 @@ yyreduce: 0 ); } -#line 4376 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4395 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 175: -#line 2130 "fe/idl.ypp" /* yacc.c:1646 */ + case 176: +#line 2148 "fe/idl.ypp" /* yacc.c:1646 */ { // | '~' primary_expr (yyval.exval) = @@ -4386,11 +4405,11 @@ yyreduce: 0 ); } -#line 4390 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4409 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 176: -#line 2143 "fe/idl.ypp" /* yacc.c:1646 */ + case 177: +#line 2161 "fe/idl.ypp" /* yacc.c:1646 */ { // primary_expr : scoped_name /* @@ -4441,40 +4460,40 @@ yyreduce: delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 4445 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4464 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 178: -#line 2195 "fe/idl.ypp" /* yacc.c:1646 */ + case 179: +#line 2213 "fe/idl.ypp" /* yacc.c:1646 */ { // | literal // | '(' const_expr ')' (yyval.exval) = (yyvsp[-1].exval); } -#line 4455 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4474 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 179: -#line 2204 "fe/idl.ypp" /* yacc.c:1646 */ + case 180: +#line 2222 "fe/idl.ypp" /* yacc.c:1646 */ { // literal : IDL_INTEGER_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival)); } -#line 4464 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4483 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 180: -#line 2209 "fe/idl.ypp" /* yacc.c:1646 */ + case 181: +#line 2227 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_UINTEGER_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].uival)); } -#line 4474 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4493 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 181: -#line 2215 "fe/idl.ypp" /* yacc.c:1646 */ + case 182: +#line 2233 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_STRING_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval)); @@ -4482,74 +4501,74 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 4486 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4505 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 182: -#line 2223 "fe/idl.ypp" /* yacc.c:1646 */ + case 183: +#line 2241 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_WSTRING_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].wsval)); } -#line 4495 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4514 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 183: -#line 2228 "fe/idl.ypp" /* yacc.c:1646 */ + case 184: +#line 2246 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_CHARACTER_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval)); } -#line 4504 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4523 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 184: -#line 2233 "fe/idl.ypp" /* yacc.c:1646 */ + case 185: +#line 2251 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_WCHAR_LITERAL ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval)); (yyval.exval) = idl_global->gen ()->create_expr (wc); } -#line 4514 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4533 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 185: -#line 2239 "fe/idl.ypp" /* yacc.c:1646 */ + case 186: +#line 2257 "fe/idl.ypp" /* yacc.c:1646 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval)); } -#line 4522 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4541 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 186: -#line 2243 "fe/idl.ypp" /* yacc.c:1646 */ + case 187: +#line 2261 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_FLOATING_PT_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval)); } -#line 4531 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4550 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 187: -#line 2248 "fe/idl.ypp" /* yacc.c:1646 */ + case 188: +#line 2266 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_TRUETOK (yyval.exval) = idl_global->gen ()->create_expr (true); } -#line 4540 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4559 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 188: -#line 2253 "fe/idl.ypp" /* yacc.c:1646 */ + case 189: +#line 2271 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_FALSETOK (yyval.exval) = idl_global->gen ()->create_expr (false); } -#line 4549 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4568 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 189: -#line 2261 "fe/idl.ypp" /* yacc.c:1646 */ + case 190: +#line 2279 "fe/idl.ypp" /* yacc.c:1646 */ { // positive_int_expr : const_expr int good_expression = 1; @@ -4615,57 +4634,57 @@ yyreduce: idl_global->err ()->syntax_error (idl_global->parse_state ()); } } -#line 4619 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4638 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 190: -#line 2330 "fe/idl.ypp" /* yacc.c:1646 */ + case 201: +#line 2381 "fe/idl.ypp" /* yacc.c:1646 */ { // type_dcl : IDL_TYPEDEF idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 4629 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4648 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 191: -#line 2336 "fe/idl.ypp" /* yacc.c:1646 */ + case 202: +#line 2387 "fe/idl.ypp" /* yacc.c:1646 */ { // type_declarator (yyval.dcval) = 0; } -#line 4638 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4657 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 192: -#line 2341 "fe/idl.ypp" /* yacc.c:1646 */ + case 203: +#line 2392 "fe/idl.ypp" /* yacc.c:1646 */ { // | struct_type (yyval.dcval) = 0; } -#line 4647 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4666 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 193: -#line 2346 "fe/idl.ypp" /* yacc.c:1646 */ + case 204: +#line 2397 "fe/idl.ypp" /* yacc.c:1646 */ { // | union_type (yyval.dcval) = 0; } -#line 4656 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4675 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 194: -#line 2351 "fe/idl.ypp" /* yacc.c:1646 */ + case 205: +#line 2402 "fe/idl.ypp" /* yacc.c:1646 */ { // | enum_type (yyval.dcval) = 0; } -#line 4665 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4684 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 195: -#line 2356 "fe/idl.ypp" /* yacc.c:1646 */ + case 206: +#line 2407 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_NATIVE simple_declarator UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -4692,29 +4711,29 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 4696 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4715 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 196: -#line 2383 "fe/idl.ypp" /* yacc.c:1646 */ + case 207: +#line 2434 "fe/idl.ypp" /* yacc.c:1646 */ { // | constructed_forward_type_spec (yyval.dcval) = 0; } -#line 4705 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4724 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 197: -#line 2391 "fe/idl.ypp" /* yacc.c:1646 */ + case 208: +#line 2442 "fe/idl.ypp" /* yacc.c:1646 */ { // type_declarator : type_spec idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen); } -#line 4714 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4733 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 198: -#line 2396 "fe/idl.ypp" /* yacc.c:1646 */ + case 209: +#line 2447 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_declarator UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -4778,11 +4797,11 @@ yyreduce: (yyvsp[0].dlval) = 0; } } -#line 4782 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4801 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 201: -#line 2468 "fe/idl.ypp" /* yacc.c:1646 */ + case 212: +#line 2519 "fe/idl.ypp" /* yacc.c:1646 */ { // simple_type_spec : base_type_spec (yyval.dcval) = @@ -4790,11 +4809,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 4794 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4813 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 203: -#line 2477 "fe/idl.ypp" /* yacc.c:1646 */ + case 214: +#line 2528 "fe/idl.ypp" /* yacc.c:1646 */ { // | template_type_spec // | scoped_name @@ -4819,11 +4838,11 @@ yyreduce: (yyval.dcval) = d; } -#line 4823 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4842 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 221: -#line 2534 "fe/idl.ypp" /* yacc.c:1646 */ + case 232: +#line 2585 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_declarator : declarator declarators ACE_NEW_RETURN ((yyval.dlval), @@ -4831,20 +4850,20 @@ yyreduce: (yyvsp[0].dlval)), 1); } -#line 4835 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4854 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 222: -#line 2546 "fe/idl.ypp" /* yacc.c:1646 */ + case 233: +#line 2597 "fe/idl.ypp" /* yacc.c:1646 */ { // declarators : declarators ',' idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 4844 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4863 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 223: -#line 2551 "fe/idl.ypp" /* yacc.c:1646 */ + case 234: +#line 2602 "fe/idl.ypp" /* yacc.c:1646 */ { // declarator idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -4865,20 +4884,20 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 4869 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4888 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 224: -#line 2572 "fe/idl.ypp" /* yacc.c:1646 */ + case 235: +#line 2623 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.dlval) = 0; } -#line 4878 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4897 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 227: -#line 2585 "fe/idl.ypp" /* yacc.c:1646 */ + case 238: +#line 2636 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_simple_declarator : simple_declarator simple_declarators ACE_NEW_RETURN ((yyval.dlval), @@ -4886,20 +4905,20 @@ yyreduce: (yyvsp[0].dlval)), 1); } -#line 4890 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4909 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 228: -#line 2597 "fe/idl.ypp" /* yacc.c:1646 */ + case 239: +#line 2648 "fe/idl.ypp" /* yacc.c:1646 */ { // simple_declarators : simple_declarators ',' idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 4899 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4918 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 229: -#line 2602 "fe/idl.ypp" /* yacc.c:1646 */ + case 240: +#line 2653 "fe/idl.ypp" /* yacc.c:1646 */ { // simple_declarator idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -4920,22 +4939,22 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 4924 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4943 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 230: -#line 2623 "fe/idl.ypp" /* yacc.c:1646 */ + case 241: +#line 2674 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.dlval) = 0; } -#line 4933 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4952 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 231: -#line 2631 "fe/idl.ypp" /* yacc.c:1646 */ + case 242: +#line 2682 "fe/idl.ypp" /* yacc.c:1646 */ { -// simple_declarator : id +// simple_declarator : defining_id UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, UTL_ScopedName ((yyvsp[0].idval), @@ -4947,11 +4966,11 @@ yyreduce: 0), 1); } -#line 4951 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4970 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 232: -#line 2648 "fe/idl.ypp" /* yacc.c:1646 */ + case 243: +#line 2699 "fe/idl.ypp" /* yacc.c:1646 */ { // complex_declarator : array_declarator UTL_ScopedName *sn = 0; @@ -4967,174 +4986,174 @@ yyreduce: (yyvsp[0].dcval)), 1); } -#line 4971 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4990 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 235: -#line 2672 "fe/idl.ypp" /* yacc.c:1646 */ + case 246: +#line 2723 "fe/idl.ypp" /* yacc.c:1646 */ { // signed_int : IDL_LONG (yyval.etval) = AST_Expression::EV_long; } -#line 4980 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4999 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 236: -#line 2677 "fe/idl.ypp" /* yacc.c:1646 */ + case 247: +#line 2728 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_LONG IDL_LONG (yyval.etval) = AST_Expression::EV_longlong; } -#line 4989 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5008 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 237: -#line 2682 "fe/idl.ypp" /* yacc.c:1646 */ + case 248: +#line 2733 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_SHORT (yyval.etval) = AST_Expression::EV_short; } -#line 4998 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5017 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 238: -#line 2690 "fe/idl.ypp" /* yacc.c:1646 */ + case 249: +#line 2741 "fe/idl.ypp" /* yacc.c:1646 */ { // unsigned_int : IDL_UNSIGNED IDL_LONG (yyval.etval) = AST_Expression::EV_ulong; } -#line 5007 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5026 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 239: -#line 2695 "fe/idl.ypp" /* yacc.c:1646 */ + case 250: +#line 2746 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_UNSIGNED IDL_LONG IDL_LONG (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5016 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5035 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 240: -#line 2700 "fe/idl.ypp" /* yacc.c:1646 */ + case 251: +#line 2751 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_UNSIGNED IDL_SHORT (yyval.etval) = AST_Expression::EV_ushort; } -#line 5025 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5044 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 241: -#line 2708 "fe/idl.ypp" /* yacc.c:1646 */ + case 252: +#line 2759 "fe/idl.ypp" /* yacc.c:1646 */ { // floating_pt_type : IDL_DOUBLE (yyval.etval) = AST_Expression::EV_double; } -#line 5034 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5053 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 242: -#line 2713 "fe/idl.ypp" /* yacc.c:1646 */ + case 253: +#line 2764 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_FLOAT (yyval.etval) = AST_Expression::EV_float; } -#line 5043 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5062 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 243: -#line 2718 "fe/idl.ypp" /* yacc.c:1646 */ + case 254: +#line 2769 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_LONG IDL_DOUBLE (yyval.etval) = AST_Expression::EV_longdouble; } -#line 5052 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5071 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 244: -#line 2726 "fe/idl.ypp" /* yacc.c:1646 */ + case 255: +#line 2777 "fe/idl.ypp" /* yacc.c:1646 */ { // fixed_type : IDL_FIXED (yyval.etval) = AST_Expression::EV_fixed; } -#line 5061 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5080 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 245: -#line 2734 "fe/idl.ypp" /* yacc.c:1646 */ + case 256: +#line 2785 "fe/idl.ypp" /* yacc.c:1646 */ { // char_type : IDL_CHAR (yyval.etval) = AST_Expression::EV_char; } -#line 5070 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5089 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 246: -#line 2739 "fe/idl.ypp" /* yacc.c:1646 */ + case 257: +#line 2790 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_WCHAR (yyval.etval) = AST_Expression::EV_wchar; } -#line 5079 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5098 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 247: -#line 2747 "fe/idl.ypp" /* yacc.c:1646 */ + case 258: +#line 2798 "fe/idl.ypp" /* yacc.c:1646 */ { // octet_type : IDL_OCTET (yyval.etval) = AST_Expression::EV_octet; } -#line 5088 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5107 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 248: -#line 2755 "fe/idl.ypp" /* yacc.c:1646 */ + case 259: +#line 2806 "fe/idl.ypp" /* yacc.c:1646 */ { // boolean_type : IDL_BOOLEAN (yyval.etval) = AST_Expression::EV_bool; } -#line 5097 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5116 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 249: -#line 2763 "fe/idl.ypp" /* yacc.c:1646 */ + case 260: +#line 2814 "fe/idl.ypp" /* yacc.c:1646 */ { // any_type : IDL_ANY (yyval.etval) = AST_Expression::EV_any; } -#line 5106 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5125 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 250: -#line 2771 "fe/idl.ypp" /* yacc.c:1646 */ + case 261: +#line 2822 "fe/idl.ypp" /* yacc.c:1646 */ { // object_type : IDL_OBJECT (yyval.etval) = AST_Expression::EV_object; } -#line 5115 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5134 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 251: -#line 2779 "fe/idl.ypp" /* yacc.c:1646 */ + case 262: +#line 2830 "fe/idl.ypp" /* yacc.c:1646 */ { // struct_decl : IDL_STRUCT idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen); } -#line 5124 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5143 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 252: -#line 2784 "fe/idl.ypp" /* yacc.c:1646 */ + case 263: +#line 2835 "fe/idl.ypp" /* yacc.c:1646 */ { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5134 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5153 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 253: -#line 2794 "fe/idl.ypp" /* yacc.c:1646 */ + case 264: +#line 2845 "fe/idl.ypp" /* yacc.c:1646 */ { // struct_type : struct_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5168,29 +5187,29 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5172 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5191 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 254: -#line 2828 "fe/idl.ypp" /* yacc.c:1646 */ + case 265: +#line 2879 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); } -#line 5181 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5200 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 255: -#line 2833 "fe/idl.ypp" /* yacc.c:1646 */ + case 266: +#line 2884 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_member idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); } -#line 5190 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5209 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 256: -#line 2838 "fe/idl.ypp" /* yacc.c:1646 */ + case 267: +#line 2889 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); @@ -5203,39 +5222,39 @@ yyreduce: ); idl_global->scopes ().pop (); } -#line 5207 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5226 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 260: -#line 2860 "fe/idl.ypp" /* yacc.c:1646 */ + case 271: +#line 2911 "fe/idl.ypp" /* yacc.c:1646 */ { // member : /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_NA; } -#line 5217 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5236 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 262: -#line 2870 "fe/idl.ypp" /* yacc.c:1646 */ + case 273: +#line 2922 "fe/idl.ypp" /* yacc.c:1646 */ { // member_i : type_spec idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen); } -#line 5226 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5245 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 263: -#line 2875 "fe/idl.ypp" /* yacc.c:1646 */ + case 274: +#line 2927 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_declarator idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen); } -#line 5235 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5254 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 264: -#line 2880 "fe/idl.ypp" /* yacc.c:1646 */ + case 275: +#line 2932 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5283,7 +5302,7 @@ yyreduce: idl_global->gen ()->create_field ( tp, d->name (), - (yyvsp[-5].vival) + (yyvsp[-6].vival) ); (void) s->fe_add_field (f); } @@ -5293,58 +5312,58 @@ yyreduce: delete (yyvsp[-2].dlval); (yyvsp[-2].dlval) = 0; } -#line 5297 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5316 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 265: -#line 2938 "fe/idl.ypp" /* yacc.c:1646 */ + case 276: +#line 2990 "fe/idl.ypp" /* yacc.c:1646 */ { // | error idl_global->err()->syntax_error (idl_global->parse_state ()); } -#line 5306 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5325 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 266: -#line 2943 "fe/idl.ypp" /* yacc.c:1646 */ + case 277: +#line 2995 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5316 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5335 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 267: -#line 2952 "fe/idl.ypp" /* yacc.c:1646 */ + case 278: +#line 3004 "fe/idl.ypp" /* yacc.c:1646 */ { // union_decl : IDL_UNION idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen); } -#line 5325 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5344 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 268: -#line 2957 "fe/idl.ypp" /* yacc.c:1646 */ + case 279: +#line 3009 "fe/idl.ypp" /* yacc.c:1646 */ { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5335 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5354 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 269: -#line 2966 "fe/idl.ypp" /* yacc.c:1646 */ + case 280: +#line 3018 "fe/idl.ypp" /* yacc.c:1646 */ { // union_type : union_decl IDL_SWITCH idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen); } -#line 5344 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5363 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 270: -#line 2971 "fe/idl.ypp" /* yacc.c:1646 */ + case 281: +#line 3023 "fe/idl.ypp" /* yacc.c:1646 */ { // '(' UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5380,24 +5399,24 @@ yyreduce: * Don't delete $1 yet; we'll need it a bit later. */ } -#line 5384 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5403 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 271: -#line 3007 "fe/idl.ypp" /* yacc.c:1646 */ + case 282: +#line 3059 "fe/idl.ypp" /* yacc.c:1646 */ { // switch_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen); } -#line 5393 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5412 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 272: -#line 3012 "fe/idl.ypp" /* yacc.c:1646 */ + case 283: +#line 3064 "fe/idl.ypp" /* yacc.c:1646 */ { // ')' /* - * The top of the scopes must an empty union we added after we + * The top of the scopes must be an empty union we added after we * encountered 'union <id> switch ('. Now we are ready to add a * correct one. Temporarily remove the top so that we setup the * correct union in a right scope. @@ -5450,29 +5469,29 @@ yyreduce: delete (yyvsp[-7].idval); (yyvsp[-7].idval) = 0; } -#line 5454 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5473 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 273: -#line 3069 "fe/idl.ypp" /* yacc.c:1646 */ + case 284: +#line 3121 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen); } -#line 5463 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5482 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 274: -#line 3074 "fe/idl.ypp" /* yacc.c:1646 */ + case 285: +#line 3126 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_case_branch idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen); } -#line 5472 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5491 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 275: -#line 3079 "fe/idl.ypp" /* yacc.c:1646 */ + case 286: +#line 3131 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen); @@ -5489,11 +5508,11 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 5493 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5512 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 276: -#line 3099 "fe/idl.ypp" /* yacc.c:1646 */ + case 287: +#line 3151 "fe/idl.ypp" /* yacc.c:1646 */ { // switch_type_spec : integer_type (yyval.dcval) = @@ -5501,11 +5520,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5505 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5524 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 277: -#line 3107 "fe/idl.ypp" /* yacc.c:1646 */ + case 288: +#line 3159 "fe/idl.ypp" /* yacc.c:1646 */ { // | char_type /* wchars are not allowed. */ @@ -5519,11 +5538,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5523 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5542 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 278: -#line 3121 "fe/idl.ypp" /* yacc.c:1646 */ + case 289: +#line 3173 "fe/idl.ypp" /* yacc.c:1646 */ { // | octet_type /* octets are not allowed. */ @@ -5533,11 +5552,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5537 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5556 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 279: -#line 3131 "fe/idl.ypp" /* yacc.c:1646 */ + case 290: +#line 3183 "fe/idl.ypp" /* yacc.c:1646 */ { // | boolean_type (yyval.dcval) = @@ -5545,11 +5564,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5549 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5568 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 281: -#line 3140 "fe/idl.ypp" /* yacc.c:1646 */ + case 292: +#line 3192 "fe/idl.ypp" /* yacc.c:1646 */ { // | enum_type // | scoped_name @@ -5655,29 +5674,29 @@ yyreduce: delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 5659 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5678 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 285: -#line 3256 "fe/idl.ypp" /* yacc.c:1646 */ + case 296: +#line 3308 "fe/idl.ypp" /* yacc.c:1646 */ { // case_branch : at_least_one_case_label idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen); } -#line 5668 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5687 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 286: -#line 3261 "fe/idl.ypp" /* yacc.c:1646 */ + case 297: +#line 3313 "fe/idl.ypp" /* yacc.c:1646 */ { -// element_spec +// annotations element_spec idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen); } -#line 5677 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5696 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 287: -#line 3266 "fe/idl.ypp" /* yacc.c:1646 */ + case 298: +#line 3318 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5690,12 +5709,12 @@ yyreduce: * Add them to the enclosing scope (the union scope) */ if (s != 0 - && (yyvsp[-4].llval) != 0 + && (yyvsp[-5].llval) != 0 && (yyvsp[-2].ffval) != 0) { b = idl_global->gen ()->create_union_branch ( - (yyvsp[-4].llval), + (yyvsp[-5].llval), f->field_type (), f->name () ); @@ -5708,30 +5727,30 @@ yyreduce: f = 0; } } -#line 5712 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5731 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 288: -#line 3297 "fe/idl.ypp" /* yacc.c:1646 */ + case 299: +#line 3349 "fe/idl.ypp" /* yacc.c:1646 */ { // | error idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 5721 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5740 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 289: -#line 3302 "fe/idl.ypp" /* yacc.c:1646 */ + case 300: +#line 3354 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5731 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5750 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 290: -#line 3311 "fe/idl.ypp" /* yacc.c:1646 */ + case 301: +#line 3363 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_case_label : case_label case_labels ACE_NEW_RETURN ((yyval.llval), @@ -5739,52 +5758,52 @@ yyreduce: (yyvsp[0].llval)), 1); } -#line 5743 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5762 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 291: -#line 3322 "fe/idl.ypp" /* yacc.c:1646 */ + case 302: +#line 3374 "fe/idl.ypp" /* yacc.c:1646 */ { -// case_labels : case_labels case_label +// case_labels : case_labels annotations case_label UTL_LabelList *ll = 0; ACE_NEW_RETURN (ll, UTL_LabelList ((yyvsp[0].ulval), 0), 1); - if ((yyvsp[-1].llval) == 0) + if ((yyvsp[-2].llval) == 0) { (yyval.llval) = ll; } else { - (yyvsp[-1].llval)->nconc (ll); - (yyval.llval) = (yyvsp[-1].llval); + (yyvsp[-2].llval)->nconc (ll); + (yyval.llval) = (yyvsp[-2].llval); } } -#line 5766 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5785 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 292: -#line 3341 "fe/idl.ypp" /* yacc.c:1646 */ + case 303: +#line 3393 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.llval) = 0; } -#line 5775 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5794 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 293: -#line 3349 "fe/idl.ypp" /* yacc.c:1646 */ + case 304: +#line 3401 "fe/idl.ypp" /* yacc.c:1646 */ { // case_label : IDL_DEFAULT idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen); } -#line 5784 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5803 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 294: -#line 3354 "fe/idl.ypp" /* yacc.c:1646 */ + case 305: +#line 3406 "fe/idl.ypp" /* yacc.c:1646 */ { // ':' idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -5794,28 +5813,28 @@ yyreduce: 0 ); } -#line 5798 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5817 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 295: -#line 3364 "fe/idl.ypp" /* yacc.c:1646 */ + case 306: +#line 3416 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_CASE idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen); } -#line 5807 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5826 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 296: -#line 3369 "fe/idl.ypp" /* yacc.c:1646 */ + case 307: +#line 3421 "fe/idl.ypp" /* yacc.c:1646 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen); } -#line 5815 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5834 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 297: -#line 3373 "fe/idl.ypp" /* yacc.c:1646 */ + case 308: +#line 3425 "fe/idl.ypp" /* yacc.c:1646 */ { // const_expr idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -5825,20 +5844,20 @@ yyreduce: (yyvsp[-2].exval) ); } -#line 5829 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5848 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 298: -#line 3386 "fe/idl.ypp" /* yacc.c:1646 */ + case 309: +#line 3438 "fe/idl.ypp" /* yacc.c:1646 */ { // element_spec : type_spec idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen); } -#line 5838 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5857 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 299: -#line 3391 "fe/idl.ypp" /* yacc.c:1646 */ + case 310: +#line 3443 "fe/idl.ypp" /* yacc.c:1646 */ { // declarator idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen); @@ -5883,11 +5902,11 @@ yyreduce: (yyvsp[0].deval) = 0; } } -#line 5887 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5906 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 300: -#line 3439 "fe/idl.ypp" /* yacc.c:1646 */ + case 311: +#line 3491 "fe/idl.ypp" /* yacc.c:1646 */ { // struct_forward_type : struct_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5908,11 +5927,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5912 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5931 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 301: -#line 3463 "fe/idl.ypp" /* yacc.c:1646 */ + case 312: +#line 3515 "fe/idl.ypp" /* yacc.c:1646 */ { // union_forward_type : union_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5933,22 +5952,22 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5937 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5956 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 302: -#line 3487 "fe/idl.ypp" /* yacc.c:1646 */ + case 313: +#line 3539 "fe/idl.ypp" /* yacc.c:1646 */ { // enum_type : IDL_ENUM idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen); } -#line 5946 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5965 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 303: -#line 3492 "fe/idl.ypp" /* yacc.c:1646 */ + case 314: +#line 3544 "fe/idl.ypp" /* yacc.c:1646 */ { -// id +// defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -5979,29 +5998,29 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5983 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6002 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 304: -#line 3525 "fe/idl.ypp" /* yacc.c:1646 */ + case 315: +#line 3577 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen); } -#line 5992 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6011 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 305: -#line 3530 "fe/idl.ypp" /* yacc.c:1646 */ + case 316: +#line 3582 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_enumerator idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen); } -#line 6001 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6020 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 306: -#line 3535 "fe/idl.ypp" /* yacc.c:1646 */ + case 317: +#line 3587 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen); @@ -6021,22 +6040,22 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 6025 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6044 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 308: -#line 3561 "fe/idl.ypp" /* yacc.c:1646 */ + case 319: +#line 3613 "fe/idl.ypp" /* yacc.c:1646 */ { // enumerators : enumerators ',' idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen); } -#line 6034 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6053 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 311: -#line 3571 "fe/idl.ypp" /* yacc.c:1646 */ + case 322: +#line 3623 "fe/idl.ypp" /* yacc.c:1646 */ { -// enumerator : IDENTIFIER +// enumerator : annotations IDENTIFIER UTL_Scope *s = idl_global->scopes ().top_non_null (); Identifier id ((yyvsp[0].strval)); ACE::strdelete ((yyvsp[0].strval)); @@ -6066,29 +6085,29 @@ yyreduce: (void) s->fe_add_enum_val (e); } } -#line 6070 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6089 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 312: -#line 3607 "fe/idl.ypp" /* yacc.c:1646 */ + case 323: +#line 3659 "fe/idl.ypp" /* yacc.c:1646 */ { // sequence_type_spec : seq_head ',' idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen); } -#line 6079 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6098 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 313: -#line 3612 "fe/idl.ypp" /* yacc.c:1646 */ + case 324: +#line 3664 "fe/idl.ypp" /* yacc.c:1646 */ { // positive_int_expr idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen); } -#line 6088 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6107 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 314: -#line 3617 "fe/idl.ypp" /* yacc.c:1646 */ + case 325: +#line 3669 "fe/idl.ypp" /* yacc.c:1646 */ { // '>' idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -6165,11 +6184,11 @@ yyreduce: delete ev; ev = 0; } -#line 6169 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6188 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 315: -#line 3695 "fe/idl.ypp" /* yacc.c:1646 */ + case 326: +#line 3747 "fe/idl.ypp" /* yacc.c:1646 */ { // | seq_head '>' idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -6225,11 +6244,11 @@ yyreduce: } } } -#line 6229 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6248 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 316: -#line 3754 "fe/idl.ypp" /* yacc.c:1646 */ + case 327: +#line 3806 "fe/idl.ypp" /* yacc.c:1646 */ { // seq_head : IDL_SEQUENCE idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen); @@ -6239,57 +6258,57 @@ yyreduce: */ idl_global->scopes ().push (0); } -#line 6243 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6262 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 317: -#line 3764 "fe/idl.ypp" /* yacc.c:1646 */ + case 328: +#line 3816 "fe/idl.ypp" /* yacc.c:1646 */ { // '<' idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen); } -#line 6252 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6271 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 318: -#line 3769 "fe/idl.ypp" /* yacc.c:1646 */ + case 329: +#line 3821 "fe/idl.ypp" /* yacc.c:1646 */ { // simple_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen); (yyval.dcval) = (yyvsp[0].dcval); } -#line 6262 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6281 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 319: -#line 3778 "fe/idl.ypp" /* yacc.c:1646 */ + case 330: +#line 3830 "fe/idl.ypp" /* yacc.c:1646 */ { (yyvsp[-1].exval)->evaluate (AST_Expression::EK_positive_int); (yyval.dcval) = idl_global->gen ()->create_fixed ((yyvsp[-3].exval), (yyvsp[-1].exval)); } -#line 6271 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6290 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 320: -#line 3787 "fe/idl.ypp" /* yacc.c:1646 */ + case 331: +#line 3839 "fe/idl.ypp" /* yacc.c:1646 */ { // string_type_spec : string_head '<' idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6280 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6299 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 321: -#line 3792 "fe/idl.ypp" /* yacc.c:1646 */ + case 332: +#line 3844 "fe/idl.ypp" /* yacc.c:1646 */ { // positive_int_expr idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6289 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6308 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 322: -#line 3797 "fe/idl.ypp" /* yacc.c:1646 */ + case 333: +#line 3849 "fe/idl.ypp" /* yacc.c:1646 */ { // '>' idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -6332,11 +6351,11 @@ yyreduce: delete ev; ev = 0; } -#line 6336 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6355 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 323: -#line 3840 "fe/idl.ypp" /* yacc.c:1646 */ + case 334: +#line 3892 "fe/idl.ypp" /* yacc.c:1646 */ { // | string_head idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -6359,38 +6378,38 @@ yyreduce: ) ); } -#line 6363 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6382 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 324: -#line 3866 "fe/idl.ypp" /* yacc.c:1646 */ + case 335: +#line 3918 "fe/idl.ypp" /* yacc.c:1646 */ { // string_head : IDL_STRING idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6372 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6391 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 325: -#line 3875 "fe/idl.ypp" /* yacc.c:1646 */ + case 336: +#line 3927 "fe/idl.ypp" /* yacc.c:1646 */ { // wstring_type_spec : wstring_head '<' idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6381 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6400 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 326: -#line 3880 "fe/idl.ypp" /* yacc.c:1646 */ + case 337: +#line 3932 "fe/idl.ypp" /* yacc.c:1646 */ { // positive_int_expr idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6390 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6409 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 327: -#line 3885 "fe/idl.ypp" /* yacc.c:1646 */ + case 338: +#line 3937 "fe/idl.ypp" /* yacc.c:1646 */ { // '>' idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -6422,11 +6441,11 @@ yyreduce: } } } -#line 6426 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6445 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 328: -#line 3917 "fe/idl.ypp" /* yacc.c:1646 */ + case 339: +#line 3969 "fe/idl.ypp" /* yacc.c:1646 */ { // | wstring_head idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -6448,29 +6467,29 @@ yyreduce: AST_String::narrow_from_decl ((yyval.dcval)) ); } -#line 6452 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6471 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 329: -#line 3942 "fe/idl.ypp" /* yacc.c:1646 */ + case 340: +#line 3994 "fe/idl.ypp" /* yacc.c:1646 */ { // wstring_head : IDL_WSTRING idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6461 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6480 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 330: -#line 3950 "fe/idl.ypp" /* yacc.c:1646 */ + case 341: +#line 4002 "fe/idl.ypp" /* yacc.c:1646 */ { -// array_declarator : id +// array_declarator : defining_id idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } -#line 6470 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6489 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 331: -#line 3955 "fe/idl.ypp" /* yacc.c:1646 */ + case 342: +#line 4007 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_array_dim idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted); @@ -6504,11 +6523,11 @@ yyreduce: } } } -#line 6508 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6527 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 332: -#line 3992 "fe/idl.ypp" /* yacc.c:1646 */ + case 343: +#line 4044 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_array_dim : array_dim array_dims ACE_NEW_RETURN ((yyval.elval), @@ -6516,11 +6535,11 @@ yyreduce: (yyvsp[0].elval)), 1); } -#line 6520 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6539 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 333: -#line 4003 "fe/idl.ypp" /* yacc.c:1646 */ + case 344: +#line 4055 "fe/idl.ypp" /* yacc.c:1646 */ { // array_dims : array_dims array_dim UTL_ExprList *el = 0; @@ -6539,38 +6558,38 @@ yyreduce: (yyval.elval) = (yyvsp[-1].elval); } } -#line 6543 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6562 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 334: -#line 4022 "fe/idl.ypp" /* yacc.c:1646 */ + case 345: +#line 4074 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.elval) = 0; } -#line 6552 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6571 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 335: -#line 4030 "fe/idl.ypp" /* yacc.c:1646 */ + case 346: +#line 4082 "fe/idl.ypp" /* yacc.c:1646 */ { // array_dim : '[' idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen); } -#line 6561 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6580 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 336: -#line 4035 "fe/idl.ypp" /* yacc.c:1646 */ + case 347: +#line 4087 "fe/idl.ypp" /* yacc.c:1646 */ { // positive_int_expr idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen); } -#line 6570 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6589 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 337: -#line 4040 "fe/idl.ypp" /* yacc.c:1646 */ + case 348: +#line 4092 "fe/idl.ypp" /* yacc.c:1646 */ { // ']' idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen); @@ -6625,47 +6644,47 @@ yyreduce: delete ev; ev = 0; } -#line 6629 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6648 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 340: -#line 4103 "fe/idl.ypp" /* yacc.c:1646 */ + case 351: +#line 4155 "fe/idl.ypp" /* yacc.c:1646 */ { // attribute_readonly : IDL_READONLY idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen); } -#line 6638 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6657 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 341: -#line 4108 "fe/idl.ypp" /* yacc.c:1646 */ + case 352: +#line 4160 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_ATTRIBUTE idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6647 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6666 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 342: -#line 4113 "fe/idl.ypp" /* yacc.c:1646 */ + case 353: +#line 4165 "fe/idl.ypp" /* yacc.c:1646 */ { // param_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6656 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6675 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 343: -#line 4118 "fe/idl.ypp" /* yacc.c:1646 */ + case 354: +#line 4170 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_simple_declarator idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6665 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6684 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 344: -#line 4123 "fe/idl.ypp" /* yacc.c:1646 */ + case 355: +#line 4175 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -6726,47 +6745,47 @@ yyreduce: delete (yyvsp[-2].dlval); (yyvsp[-2].dlval) = 0; } -#line 6730 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6749 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 345: -#line 4187 "fe/idl.ypp" /* yacc.c:1646 */ + case 356: +#line 4239 "fe/idl.ypp" /* yacc.c:1646 */ { // attribute_readwrite : IDL_ATTRIBUTE idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6739 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6758 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 346: -#line 4192 "fe/idl.ypp" /* yacc.c:1646 */ + case 357: +#line 4244 "fe/idl.ypp" /* yacc.c:1646 */ { // param_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6748 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6767 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 347: -#line 4197 "fe/idl.ypp" /* yacc.c:1646 */ + case 358: +#line 4249 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_simple_declarator idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6757 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6776 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 348: -#line 4202 "fe/idl.ypp" /* yacc.c:1646 */ + case 359: +#line 4254 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_getraises idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted); } -#line 6766 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6785 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 349: -#line 4207 "fe/idl.ypp" /* yacc.c:1646 */ + case 360: +#line 4259 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_setraises UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -6836,22 +6855,22 @@ yyreduce: delete (yyvsp[-4].dlval); (yyvsp[-4].dlval) = 0; } -#line 6840 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6859 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 350: -#line 4280 "fe/idl.ypp" /* yacc.c:1646 */ + case 361: +#line 4332 "fe/idl.ypp" /* yacc.c:1646 */ { // exception : IDL_EXCEPTION idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen); } -#line 6849 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6868 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 351: -#line 4285 "fe/idl.ypp" /* yacc.c:1646 */ + case 362: +#line 4337 "fe/idl.ypp" /* yacc.c:1646 */ { -// id +// defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -6879,29 +6898,29 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6883 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6902 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 352: -#line 4315 "fe/idl.ypp" /* yacc.c:1646 */ + case 363: +#line 4367 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen); } -#line 6892 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6911 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 353: -#line 4320 "fe/idl.ypp" /* yacc.c:1646 */ + case 364: +#line 4372 "fe/idl.ypp" /* yacc.c:1646 */ { // members idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen); } -#line 6901 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6920 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 354: -#line 4325 "fe/idl.ypp" /* yacc.c:1646 */ + case 365: +#line 4377 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen); @@ -6910,22 +6929,22 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 6914 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6933 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 355: -#line 4338 "fe/idl.ypp" /* yacc.c:1646 */ + case 366: +#line 4390 "fe/idl.ypp" /* yacc.c:1646 */ { // operation : opt_op_attribute op_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 6923 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6942 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 356: -#line 4343 "fe/idl.ypp" /* yacc.c:1646 */ + case 367: +#line 4395 "fe/idl.ypp" /* yacc.c:1646 */ { -// IDENTIFIER +// annotations IDENTIFIER UTL_Scope *s = idl_global->scopes ().top_non_null (); Identifier id ((yyvsp[0].strval)); ACE::strdelete ((yyvsp[0].strval)); @@ -6939,18 +6958,18 @@ yyreduce: * Create a node representing an operation on an interface * and add it to its enclosing scope. */ - if (s != 0 && (yyvsp[-2].dcval) != 0) + if (s != 0 && (yyvsp[-3].dcval) != 0) { AST_Type *tp = - AST_Type::narrow_from_decl ((yyvsp[-2].dcval)); + AST_Type::narrow_from_decl ((yyvsp[-3].dcval)); if (tp == 0) { - idl_global->err ()->not_a_type ((yyvsp[-2].dcval)); + idl_global->err ()->not_a_type ((yyvsp[-3].dcval)); } else if (tp->node_type () == AST_Decl::NT_except) { - idl_global->err ()->not_a_type ((yyvsp[-2].dcval)); + idl_global->err ()->not_a_type ((yyvsp[-3].dcval)); } else { @@ -6964,7 +6983,7 @@ yyreduce: o = idl_global->gen ()->create_operation ( tp, - (yyvsp[-3].ofval), + (yyvsp[-4].ofval), &n, local, s->is_abstract ()); @@ -6988,29 +7007,29 @@ yyreduce: */ idl_global->scopes ().push (o); } -#line 6992 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7011 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 357: -#line 4408 "fe/idl.ypp" /* yacc.c:1646 */ + case 368: +#line 4460 "fe/idl.ypp" /* yacc.c:1646 */ { // parameter_list idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7001 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7020 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 358: -#line 4413 "fe/idl.ypp" /* yacc.c:1646 */ + case 369: +#line 4465 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); } -#line 7010 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7029 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 359: -#line 4418 "fe/idl.ypp" /* yacc.c:1646 */ + case 370: +#line 4470 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_context UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7040,40 +7059,40 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7044 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7063 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 360: -#line 4451 "fe/idl.ypp" /* yacc.c:1646 */ + case 371: +#line 4503 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_op_attribute : IDL_ONEWAY idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_oneway; } -#line 7054 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7073 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 361: -#line 4457 "fe/idl.ypp" /* yacc.c:1646 */ + case 372: +#line 4509 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_IDEMPOTENT idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_idempotent; } -#line 7064 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7083 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 362: -#line 4463 "fe/idl.ypp" /* yacc.c:1646 */ + case 373: +#line 4515 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.ofval) = AST_Operation::OP_noflags; } -#line 7073 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7092 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 364: -#line 4472 "fe/idl.ypp" /* yacc.c:1646 */ + case 375: +#line 4524 "fe/idl.ypp" /* yacc.c:1646 */ { // op_type_spec : param_type_spec | IDL_VOID (yyval.dcval) = @@ -7081,23 +7100,23 @@ yyreduce: AST_Expression::EV_void ); } -#line 7085 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7104 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 365: -#line 4483 "fe/idl.ypp" /* yacc.c:1646 */ + case 376: +#line 4535 "fe/idl.ypp" /* yacc.c:1646 */ { // init_decl : IDL_FACTORY //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7095 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7114 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 366: -#line 4489 "fe/idl.ypp" /* yacc.c:1646 */ + case 377: +#line 4541 "fe/idl.ypp" /* yacc.c:1646 */ { -// IDENTIFIER +// annotations IDENTIFIER UTL_Scope *s = idl_global->scopes ().top_non_null (); if (s->is_abstract ()) @@ -7137,20 +7156,20 @@ yyreduce: */ idl_global->scopes ().push (factory); } -#line 7141 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7160 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 367: -#line 4531 "fe/idl.ypp" /* yacc.c:1646 */ + case 378: +#line 4583 "fe/idl.ypp" /* yacc.c:1646 */ { // init_parameter_list idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7150 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7169 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 368: -#line 4536 "fe/idl.ypp" /* yacc.c:1646 */ + case 379: +#line 4588 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -7164,74 +7183,74 @@ yyreduce: idl_global->scopes ().pop (); } -#line 7168 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7187 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 369: -#line 4553 "fe/idl.ypp" /* yacc.c:1646 */ + case 380: +#line 4605 "fe/idl.ypp" /* yacc.c:1646 */ { // init_parameter_list : '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7177 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7196 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 370: -#line 4558 "fe/idl.ypp" /* yacc.c:1646 */ + case 381: +#line 4610 "fe/idl.ypp" /* yacc.c:1646 */ { // ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7186 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7205 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 371: -#line 4563 "fe/idl.ypp" /* yacc.c:1646 */ + case 382: +#line 4615 "fe/idl.ypp" /* yacc.c:1646 */ { // | '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7195 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7214 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 372: -#line 4569 "fe/idl.ypp" /* yacc.c:1646 */ + case 383: +#line 4621 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_in_parameter ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7204 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7223 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 374: -#line 4580 "fe/idl.ypp" /* yacc.c:1646 */ + case 385: +#line 4632 "fe/idl.ypp" /* yacc.c:1646 */ { // in_parameters : in_parameters ',' idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7213 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7232 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 377: -#line 4590 "fe/idl.ypp" /* yacc.c:1646 */ + case 388: +#line 4642 "fe/idl.ypp" /* yacc.c:1646 */ { // in_parameter : IDL_IN idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7222 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7241 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 378: -#line 4595 "fe/idl.ypp" /* yacc.c:1646 */ + case 389: +#line 4647 "fe/idl.ypp" /* yacc.c:1646 */ { // param_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7231 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7250 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 379: -#line 4600 "fe/idl.ypp" /* yacc.c:1646 */ + case 390: +#line 4652 "fe/idl.ypp" /* yacc.c:1646 */ { // declarator UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7264,74 +7283,74 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7268 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7287 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 380: -#line 4636 "fe/idl.ypp" /* yacc.c:1646 */ + case 391: +#line 4688 "fe/idl.ypp" /* yacc.c:1646 */ { // parameter_list : '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7277 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7296 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 381: -#line 4641 "fe/idl.ypp" /* yacc.c:1646 */ + case 392: +#line 4693 "fe/idl.ypp" /* yacc.c:1646 */ { // ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7286 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7305 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 382: -#line 4646 "fe/idl.ypp" /* yacc.c:1646 */ + case 393: +#line 4698 "fe/idl.ypp" /* yacc.c:1646 */ { // | '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7295 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7314 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 383: -#line 4652 "fe/idl.ypp" /* yacc.c:1646 */ + case 394: +#line 4704 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_parameter ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7304 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7323 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 385: -#line 4663 "fe/idl.ypp" /* yacc.c:1646 */ + case 396: +#line 4715 "fe/idl.ypp" /* yacc.c:1646 */ { // parameters : parameters ',' idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7313 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7332 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 388: -#line 4673 "fe/idl.ypp" /* yacc.c:1646 */ + case 399: +#line 4725 "fe/idl.ypp" /* yacc.c:1646 */ { // parameter : direction idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7322 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7341 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 389: -#line 4678 "fe/idl.ypp" /* yacc.c:1646 */ + case 400: +#line 4730 "fe/idl.ypp" /* yacc.c:1646 */ { // param_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7331 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7350 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 390: -#line 4683 "fe/idl.ypp" /* yacc.c:1646 */ + case 401: +#line 4735 "fe/idl.ypp" /* yacc.c:1646 */ { // declarator UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7371,11 +7390,11 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7375 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7394 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 391: -#line 4726 "fe/idl.ypp" /* yacc.c:1646 */ + case 402: +#line 4778 "fe/idl.ypp" /* yacc.c:1646 */ { // param_type_spec : base_type_spec (yyval.dcval) = @@ -7383,11 +7402,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 7387 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7406 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 394: -#line 4736 "fe/idl.ypp" /* yacc.c:1646 */ + case 405: +#line 4788 "fe/idl.ypp" /* yacc.c:1646 */ { // | string_type_spec // | wstring_type_spec @@ -7494,186 +7513,186 @@ yyreduce: (yyval.dcval) = d; } -#line 7498 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7517 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 395: -#line 4846 "fe/idl.ypp" /* yacc.c:1646 */ + case 406: +#line 4898 "fe/idl.ypp" /* yacc.c:1646 */ { // direction : IDL_IN (yyval.dival) = AST_Argument::dir_IN; } -#line 7507 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7526 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 396: -#line 4851 "fe/idl.ypp" /* yacc.c:1646 */ + case 407: +#line 4903 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_OUT (yyval.dival) = AST_Argument::dir_OUT; } -#line 7516 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7535 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 397: -#line 4856 "fe/idl.ypp" /* yacc.c:1646 */ + case 408: +#line 4908 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_INOUT (yyval.dival) = AST_Argument::dir_INOUT; } -#line 7525 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7544 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 398: -#line 4864 "fe/idl.ypp" /* yacc.c:1646 */ + case 409: +#line 4916 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises : IDL_RAISES idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen); } -#line 7534 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7553 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 399: -#line 4869 "fe/idl.ypp" /* yacc.c:1646 */ + case 410: +#line 4921 "fe/idl.ypp" /* yacc.c:1646 */ { // '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen); } -#line 7543 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7562 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 400: -#line 4875 "fe/idl.ypp" /* yacc.c:1646 */ + case 411: +#line 4927 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_scoped_name ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7553 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7572 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 401: -#line 4881 "fe/idl.ypp" /* yacc.c:1646 */ + case 412: +#line 4933 "fe/idl.ypp" /* yacc.c:1646 */ { (yyval.nlval) = 0; /* | EMPTY */ } -#line 7562 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7581 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 402: -#line 4889 "fe/idl.ypp" /* yacc.c:1646 */ + case 413: +#line 4941 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_getraises : IDL_GETRAISES idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen); } -#line 7571 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7590 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 403: -#line 4894 "fe/idl.ypp" /* yacc.c:1646 */ + case 414: +#line 4946 "fe/idl.ypp" /* yacc.c:1646 */ { // '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen); } -#line 7580 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7599 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 404: -#line 4900 "fe/idl.ypp" /* yacc.c:1646 */ + case 415: +#line 4952 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_scoped_name ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7590 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7609 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 405: -#line 4906 "fe/idl.ypp" /* yacc.c:1646 */ + case 416: +#line 4958 "fe/idl.ypp" /* yacc.c:1646 */ { (yyval.nlval) = 0; /* | EMPTY */ } -#line 7599 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7618 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 406: -#line 4914 "fe/idl.ypp" /* yacc.c:1646 */ + case 417: +#line 4966 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_setraises : IDL_SETRAISES idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen); } -#line 7608 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7627 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 407: -#line 4919 "fe/idl.ypp" /* yacc.c:1646 */ + case 418: +#line 4971 "fe/idl.ypp" /* yacc.c:1646 */ { // '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen); } -#line 7617 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7636 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 408: -#line 4925 "fe/idl.ypp" /* yacc.c:1646 */ + case 419: +#line 4977 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_scoped_name ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7627 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7646 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 409: -#line 4931 "fe/idl.ypp" /* yacc.c:1646 */ + case 420: +#line 4983 "fe/idl.ypp" /* yacc.c:1646 */ { (yyval.nlval) = 0; /* | EMPTY */ } -#line 7636 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7655 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 410: -#line 4939 "fe/idl.ypp" /* yacc.c:1646 */ + case 421: +#line 4991 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_context : IDL_CONTEXT idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen); } -#line 7645 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7664 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 411: -#line 4944 "fe/idl.ypp" /* yacc.c:1646 */ + case 422: +#line 4996 "fe/idl.ypp" /* yacc.c:1646 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen); // '(' } -#line 7654 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7673 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 412: -#line 4950 "fe/idl.ypp" /* yacc.c:1646 */ + case 423: +#line 5002 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_string_literal ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen); (yyval.slval) = (yyvsp[-1].slval); } -#line 7664 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7683 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 413: -#line 4956 "fe/idl.ypp" /* yacc.c:1646 */ + case 424: +#line 5008 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.slval) = 0; } -#line 7673 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7692 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 414: -#line 4964 "fe/idl.ypp" /* yacc.c:1646 */ + case 425: +#line 5016 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_string_literal : IDL_STRING_LITERAL string_literals ACE_NEW_RETURN ((yyval.slval), @@ -7681,20 +7700,20 @@ yyreduce: (yyvsp[0].slval)), 1); } -#line 7685 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7704 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 415: -#line 4976 "fe/idl.ypp" /* yacc.c:1646 */ + case 426: +#line 5028 "fe/idl.ypp" /* yacc.c:1646 */ { // string_literals : string_literals ',' idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen); } -#line 7694 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7713 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 416: -#line 4981 "fe/idl.ypp" /* yacc.c:1646 */ + case 427: +#line 5033 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_STRING_LITERAL UTL_StrList *sl = 0; @@ -7713,20 +7732,20 @@ yyreduce: (yyval.slval) = (yyvsp[-3].slval); } } -#line 7717 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7736 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 417: -#line 5000 "fe/idl.ypp" /* yacc.c:1646 */ + case 428: +#line 5052 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.slval) = 0; } -#line 7726 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7745 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 418: -#line 5008 "fe/idl.ypp" /* yacc.c:1646 */ + case 429: +#line 5060 "fe/idl.ypp" /* yacc.c:1646 */ { // typeid_dcl : IDL_TYPEID scoped_name IDL_STRING_LITERAL UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7752,11 +7771,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7756 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7775 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 419: -#line 5037 "fe/idl.ypp" /* yacc.c:1646 */ + case 430: +#line 5089 "fe/idl.ypp" /* yacc.c:1646 */ { // typeprefix_dcl : IDL_TYPEPREFIX scoped_name IDL_STRING_LITERAL UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7791,13 +7810,13 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7795 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7814 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 422: -#line 5081 "fe/idl.ypp" /* yacc.c:1646 */ + case 433: +#line 5133 "fe/idl.ypp" /* yacc.c:1646 */ { -// component_forward_decl : IDL_COMPONENT id +// component_forward_decl : IDL_COMPONENT defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -7820,11 +7839,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 7824 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7843 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 423: -#line 5109 "fe/idl.ypp" /* yacc.c:1646 */ + case 434: +#line 5161 "fe/idl.ypp" /* yacc.c:1646 */ { // component_decl : component_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7864,29 +7883,29 @@ yyreduce: */ idl_global->scopes ().push (c); } -#line 7868 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7887 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 424: -#line 5149 "fe/idl.ypp" /* yacc.c:1646 */ + case 435: +#line 5201 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen); } -#line 7877 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7896 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 425: -#line 5154 "fe/idl.ypp" /* yacc.c:1646 */ + case 436: +#line 5206 "fe/idl.ypp" /* yacc.c:1646 */ { // component_exports idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen); } -#line 7886 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7905 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 426: -#line 5159 "fe/idl.ypp" /* yacc.c:1646 */ + case 437: +#line 5211 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen); @@ -7896,29 +7915,29 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7900 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7919 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 427: -#line 5173 "fe/idl.ypp" /* yacc.c:1646 */ + case 438: +#line 5225 "fe/idl.ypp" /* yacc.c:1646 */ { -// component_header: IDL_COMPONENT id +// component_header: IDL_COMPONENT defining_id idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen); } -#line 7909 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7928 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 428: -#line 5178 "fe/idl.ypp" /* yacc.c:1646 */ + case 439: +#line 5230 "fe/idl.ypp" /* yacc.c:1646 */ { // component_inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 7918 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7937 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 429: -#line 5183 "fe/idl.ypp" /* yacc.c:1646 */ + case 440: +#line 5235 "fe/idl.ypp" /* yacc.c:1646 */ { // supports_spec idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -7953,164 +7972,164 @@ yyreduce: (yyvsp[-2].idlist) = 0; } } -#line 7957 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7976 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 430: -#line 5221 "fe/idl.ypp" /* yacc.c:1646 */ + case 441: +#line 5273 "fe/idl.ypp" /* yacc.c:1646 */ { // component_inheritance_spec : ':' idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 7966 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7985 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 431: -#line 5226 "fe/idl.ypp" /* yacc.c:1646 */ + case 442: +#line 5278 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_name (yyval.idlist) = (yyvsp[0].idlist); } -#line 7975 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7994 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 432: -#line 5231 "fe/idl.ypp" /* yacc.c:1646 */ + case 443: +#line 5283 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.idlist) = 0; } -#line 7984 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8003 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 435: -#line 5244 "fe/idl.ypp" /* yacc.c:1646 */ + case 446: +#line 5296 "fe/idl.ypp" /* yacc.c:1646 */ { // component_export : provides_decl idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 7993 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8012 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 436: -#line 5249 "fe/idl.ypp" /* yacc.c:1646 */ + case 447: +#line 5301 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8002 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8021 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 437: -#line 5254 "fe/idl.ypp" /* yacc.c:1646 */ + case 448: +#line 5306 "fe/idl.ypp" /* yacc.c:1646 */ { // | uses_decl idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 8011 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8030 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 438: -#line 5259 "fe/idl.ypp" /* yacc.c:1646 */ + case 449: +#line 5311 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8020 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8039 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 439: -#line 5264 "fe/idl.ypp" /* yacc.c:1646 */ + case 450: +#line 5316 "fe/idl.ypp" /* yacc.c:1646 */ { // | emits_decl idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen); } -#line 8029 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8048 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 440: -#line 5269 "fe/idl.ypp" /* yacc.c:1646 */ + case 451: +#line 5321 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8038 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8057 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 441: -#line 5274 "fe/idl.ypp" /* yacc.c:1646 */ + case 452: +#line 5326 "fe/idl.ypp" /* yacc.c:1646 */ { // | publishes_decl idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen); } -#line 8047 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8066 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 442: -#line 5279 "fe/idl.ypp" /* yacc.c:1646 */ + case 453: +#line 5331 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8056 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8075 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 443: -#line 5284 "fe/idl.ypp" /* yacc.c:1646 */ + case 454: +#line 5336 "fe/idl.ypp" /* yacc.c:1646 */ { // | consumes_decl idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen); } -#line 8065 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8084 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 444: -#line 5289 "fe/idl.ypp" /* yacc.c:1646 */ + case 455: +#line 5341 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8074 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8093 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 445: -#line 5294 "fe/idl.ypp" /* yacc.c:1646 */ + case 456: +#line 5346 "fe/idl.ypp" /* yacc.c:1646 */ { // | attribute idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 8083 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8102 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 446: -#line 5299 "fe/idl.ypp" /* yacc.c:1646 */ + case 457: +#line 5351 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8092 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8111 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 447: -#line 5304 "fe/idl.ypp" /* yacc.c:1646 */ + case 458: +#line 5356 "fe/idl.ypp" /* yacc.c:1646 */ { // | extended_port_decl idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 8101 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8120 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 448: -#line 5309 "fe/idl.ypp" /* yacc.c:1646 */ + case 459: +#line 5361 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8110 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8129 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 449: -#line 5316 "fe/idl.ypp" /* yacc.c:1646 */ + case 460: +#line 5368 "fe/idl.ypp" /* yacc.c:1646 */ { // provides_decl : IDL_PROVIDES interface_type id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8198,22 +8217,22 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8202 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8221 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 450: -#line 5407 "fe/idl.ypp" /* yacc.c:1646 */ + case 461: +#line 5459 "fe/idl.ypp" /* yacc.c:1646 */ { // interface_type : scoped_name // Lookups and checking are done where the 'interface_type' // token is used, in 'provides_decl' and 'uses_decl'. (yyval.idlist) = (yyvsp[0].idlist); } -#line 8213 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8232 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 451: -#line 5414 "fe/idl.ypp" /* yacc.c:1646 */ + case 462: +#line 5466 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_OBJECT Identifier *corba_id = 0; @@ -8237,11 +8256,11 @@ yyreduce: conc_name), 1); } -#line 8241 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8260 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 452: -#line 5440 "fe/idl.ypp" /* yacc.c:1646 */ + case 463: +#line 5492 "fe/idl.ypp" /* yacc.c:1646 */ { // uses_decl : uses_opt_multiple interface_type id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8345,40 +8364,40 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8349 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8368 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 453: -#line 5547 "fe/idl.ypp" /* yacc.c:1646 */ + case 464: +#line 5599 "fe/idl.ypp" /* yacc.c:1646 */ { // uses_opt_multiple : IDL_USES opt_multiple // We use this extra rule here to use in both uses_decl and // extended_uses_decl, so the LALR(1) parser can avoid conflicts. (yyval.bval) = (yyvsp[0].bval); } -#line 8360 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8379 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 454: -#line 5557 "fe/idl.ypp" /* yacc.c:1646 */ + case 465: +#line 5609 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_multiple : IDL_MULTIPLE (yyval.bval) = true; } -#line 8369 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8388 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 455: -#line 5562 "fe/idl.ypp" /* yacc.c:1646 */ + case 466: +#line 5614 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.bval) = false; } -#line 8378 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8397 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 456: -#line 5569 "fe/idl.ypp" /* yacc.c:1646 */ + case 467: +#line 5621 "fe/idl.ypp" /* yacc.c:1646 */ { // emits_decl : IDL_EMITS scoped_name id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8449,11 +8468,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8453 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8472 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 457: -#line 5642 "fe/idl.ypp" /* yacc.c:1646 */ + case 468: +#line 5694 "fe/idl.ypp" /* yacc.c:1646 */ { // publishes_decl : IDL_PUBLISHES scoped_name id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8524,11 +8543,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8528 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8547 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 458: -#line 5715 "fe/idl.ypp" /* yacc.c:1646 */ + case 469: +#line 5767 "fe/idl.ypp" /* yacc.c:1646 */ { // consumes_decl : IDL_CONSUMES scoped_name id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8599,11 +8618,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8603 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8622 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 459: -#line 5789 "fe/idl.ypp" /* yacc.c:1646 */ + case 470: +#line 5841 "fe/idl.ypp" /* yacc.c:1646 */ { // home_decl : home_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8641,11 +8660,11 @@ yyreduce: */ idl_global->scopes ().push (h); } -#line 8645 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8664 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 460: -#line 5827 "fe/idl.ypp" /* yacc.c:1646 */ + case 471: +#line 5879 "fe/idl.ypp" /* yacc.c:1646 */ { // home_body /* @@ -8653,65 +8672,65 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8657 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8676 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 461: -#line 5838 "fe/idl.ypp" /* yacc.c:1646 */ + case 472: +#line 5890 "fe/idl.ypp" /* yacc.c:1646 */ { // home_header : IDL_HOME idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } -#line 8666 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8685 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 462: -#line 5843 "fe/idl.ypp" /* yacc.c:1646 */ + case 473: +#line 5895 "fe/idl.ypp" /* yacc.c:1646 */ { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen); } -#line 8675 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8694 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 463: -#line 5848 "fe/idl.ypp" /* yacc.c:1646 */ + case 474: +#line 5900 "fe/idl.ypp" /* yacc.c:1646 */ { // home_inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8684 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8703 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 464: -#line 5853 "fe/idl.ypp" /* yacc.c:1646 */ + case 475: +#line 5905 "fe/idl.ypp" /* yacc.c:1646 */ { // supports_spec idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); } -#line 8693 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8712 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 465: -#line 5858 "fe/idl.ypp" /* yacc.c:1646 */ + case 476: +#line 5910 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_MANAGES idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen); } -#line 8702 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8721 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 466: -#line 5863 "fe/idl.ypp" /* yacc.c:1646 */ + case 477: +#line 5915 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_name idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen); } -#line 8711 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8730 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 467: -#line 5868 "fe/idl.ypp" /* yacc.c:1646 */ + case 478: +#line 5920 "fe/idl.ypp" /* yacc.c:1646 */ { // primary_key_spec idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen); @@ -8758,121 +8777,121 @@ yyreduce: (yyvsp[-6].nlval) = 0; } } -#line 8762 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8781 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 468: -#line 5918 "fe/idl.ypp" /* yacc.c:1646 */ + case 479: +#line 5970 "fe/idl.ypp" /* yacc.c:1646 */ { // home_inheritance_spec ':' idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8771 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8790 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 469: -#line 5923 "fe/idl.ypp" /* yacc.c:1646 */ + case 480: +#line 5975 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_name (yyval.idlist) = (yyvsp[0].idlist); } -#line 8780 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8799 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 470: -#line 5928 "fe/idl.ypp" /* yacc.c:1646 */ + case 481: +#line 5980 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.idlist) = 0; } -#line 8789 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8808 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 471: -#line 5937 "fe/idl.ypp" /* yacc.c:1646 */ + case 482: +#line 5989 "fe/idl.ypp" /* yacc.c:1646 */ { // primary_key_spec : IDL_PRIMARYKEY scoped_name (yyval.idlist) = (yyvsp[0].idlist); } -#line 8798 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8817 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 472: -#line 5942 "fe/idl.ypp" /* yacc.c:1646 */ + case 483: +#line 5994 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.idlist) = 0; } -#line 8807 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8826 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 473: -#line 5950 "fe/idl.ypp" /* yacc.c:1646 */ + case 484: +#line 6002 "fe/idl.ypp" /* yacc.c:1646 */ { // home_body : '{' idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen); } -#line 8816 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8835 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 474: -#line 5955 "fe/idl.ypp" /* yacc.c:1646 */ + case 485: +#line 6007 "fe/idl.ypp" /* yacc.c:1646 */ { // home_exports idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen); } -#line 8825 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8844 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 475: -#line 5960 "fe/idl.ypp" /* yacc.c:1646 */ + case 486: +#line 6012 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen); } -#line 8834 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8853 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 479: -#line 5974 "fe/idl.ypp" /* yacc.c:1646 */ + case 490: +#line 6026 "fe/idl.ypp" /* yacc.c:1646 */ { // home_export : factory_decl idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen); } -#line 8843 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8862 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 480: -#line 5979 "fe/idl.ypp" /* yacc.c:1646 */ + case 491: +#line 6031 "fe/idl.ypp" /* yacc.c:1646 */ { // | ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8852 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8871 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 481: -#line 5984 "fe/idl.ypp" /* yacc.c:1646 */ + case 492: +#line 6036 "fe/idl.ypp" /* yacc.c:1646 */ { // | finder_decl idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen); } -#line 8861 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8880 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 482: -#line 5989 "fe/idl.ypp" /* yacc.c:1646 */ + case 493: +#line 6041 "fe/idl.ypp" /* yacc.c:1646 */ { // | ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8870 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8889 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 483: -#line 5998 "fe/idl.ypp" /* yacc.c:1646 */ + case 494: +#line 6050 "fe/idl.ypp" /* yacc.c:1646 */ { -// factory_decl : IDL_FACTORY id +// factory_decl : IDL_FACTORY defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -8894,20 +8913,20 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 8898 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8917 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 484: -#line 6022 "fe/idl.ypp" /* yacc.c:1646 */ + case 495: +#line 6074 "fe/idl.ypp" /* yacc.c:1646 */ { // init_parameter_list idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 8907 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8926 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 485: -#line 6027 "fe/idl.ypp" /* yacc.c:1646 */ + case 496: +#line 6079 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8926,13 +8945,13 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8930 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8949 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 486: -#line 6050 "fe/idl.ypp" /* yacc.c:1646 */ + case 497: +#line 6102 "fe/idl.ypp" /* yacc.c:1646 */ { -// finder_decl : IDL_FINDER id +// finder_decl : IDL_FINDER defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -8958,20 +8977,20 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 8962 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8981 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 487: -#line 6078 "fe/idl.ypp" /* yacc.c:1646 */ + case 498: +#line 6130 "fe/idl.ypp" /* yacc.c:1646 */ { // init_parameter_list idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 8971 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8990 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 488: -#line 6083 "fe/idl.ypp" /* yacc.c:1646 */ + case 499: +#line 6135 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8990,13 +9009,13 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8994 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9013 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 494: -#line 6117 "fe/idl.ypp" /* yacc.c:1646 */ + case 505: +#line 6169 "fe/idl.ypp" /* yacc.c:1646 */ { -// event_concrete_forward_decl : IDL_EVENTTYPE id +// event_concrete_forward_decl : IDL_EVENTTYPE defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -9018,13 +9037,13 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9022 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9041 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 495: -#line 6146 "fe/idl.ypp" /* yacc.c:1646 */ + case 506: +#line 6198 "fe/idl.ypp" /* yacc.c:1646 */ { -// event_abs_forward_decl : IDL_ABSTRACT IDL_EVENTTYPE id +// event_abs_forward_decl : IDL_ABSTRACT IDL_EVENTTYPE defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -9046,11 +9065,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9050 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9069 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 496: -#line 6174 "fe/idl.ypp" /* yacc.c:1646 */ + case 507: +#line 6226 "fe/idl.ypp" /* yacc.c:1646 */ { // event_abs_decl : event_abs_header event_rest_of_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9095,29 +9114,29 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 9099 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9118 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 497: -#line 6219 "fe/idl.ypp" /* yacc.c:1646 */ + case 508: +#line 6271 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9108 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9127 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 498: -#line 6224 "fe/idl.ypp" /* yacc.c:1646 */ + case 509: +#line 6276 "fe/idl.ypp" /* yacc.c:1646 */ { // exports idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9117 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9136 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 499: -#line 6229 "fe/idl.ypp" /* yacc.c:1646 */ + case 510: +#line 6281 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9127,22 +9146,22 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9131 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9150 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 500: -#line 6244 "fe/idl.ypp" /* yacc.c:1646 */ + case 511: +#line 6296 "fe/idl.ypp" /* yacc.c:1646 */ { -// event_abs_header : IDL_ABSTRACT IDL_EVENTTYPE id +// event_abs_header : IDL_ABSTRACT IDL_EVENTTYPE defining_id (yyval.idval) = (yyvsp[0].idval); } -#line 9140 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9159 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 501: -#line 6254 "fe/idl.ypp" /* yacc.c:1646 */ + case 512: +#line 6306 "fe/idl.ypp" /* yacc.c:1646 */ { -// event_custom_header : IDL_CUSTOM IDL_EVENTTYPE id +// event_custom_header : IDL_CUSTOM IDL_EVENTTYPE defining_id idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); ACE_DEBUG ((LM_DEBUG, @@ -9154,31 +9173,31 @@ yyreduce: ACE_TEXT (" custom yet\n"))); (yyval.idval) = 0; } -#line 9158 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9177 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 502: -#line 6272 "fe/idl.ypp" /* yacc.c:1646 */ + case 513: +#line 6324 "fe/idl.ypp" /* yacc.c:1646 */ { -// event_plain_header : IDL_EVENTTYPE id +// event_plain_header : IDL_EVENTTYPE defining_id idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 9169 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9188 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 503: -#line 6282 "fe/idl.ypp" /* yacc.c:1646 */ + case 514: +#line 6334 "fe/idl.ypp" /* yacc.c:1646 */ { // event_rest_of_header : inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 9178 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9197 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 504: -#line 6287 "fe/idl.ypp" /* yacc.c:1646 */ + case 515: +#line 6339 "fe/idl.ypp" /* yacc.c:1646 */ { // supports_spec idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -9208,11 +9227,11 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 9212 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9231 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 505: -#line 6321 "fe/idl.ypp" /* yacc.c:1646 */ + case 516: +#line 6373 "fe/idl.ypp" /* yacc.c:1646 */ { // event_decl : event_header event_rest_of_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9262,29 +9281,29 @@ yyreduce: */ idl_global->scopes ().push (e); } -#line 9266 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9285 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 506: -#line 6371 "fe/idl.ypp" /* yacc.c:1646 */ + case 517: +#line 6423 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9275 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9294 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 507: -#line 6376 "fe/idl.ypp" /* yacc.c:1646 */ + case 518: +#line 6428 "fe/idl.ypp" /* yacc.c:1646 */ { // value_elements idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9284 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9303 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 508: -#line 6381 "fe/idl.ypp" /* yacc.c:1646 */ + case 519: +#line 6433 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9294,120 +9313,120 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9298 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9317 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 509: -#line 6394 "fe/idl.ypp" /* yacc.c:1646 */ + case 520: +#line 6446 "fe/idl.ypp" /* yacc.c:1646 */ { // event_header : event_custom_header (yyval.idval) = (yyvsp[0].idval); } -#line 9307 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9326 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 510: -#line 6399 "fe/idl.ypp" /* yacc.c:1646 */ + case 521: +#line 6451 "fe/idl.ypp" /* yacc.c:1646 */ { // event_header : event_plain_header (yyval.idval) = (yyvsp[0].idval); } -#line 9316 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9335 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 511: -#line 6407 "fe/idl.ypp" /* yacc.c:1646 */ + case 522: +#line 6459 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameter_type : IDL_TYPENAME (yyval.ntval) = AST_Decl::NT_type; } -#line 9325 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9344 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 512: -#line 6412 "fe/idl.ypp" /* yacc.c:1646 */ + case 523: +#line 6464 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_STRUCT (yyval.ntval) = AST_Decl::NT_struct; } -#line 9334 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9353 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 513: -#line 6417 "fe/idl.ypp" /* yacc.c:1646 */ + case 524: +#line 6469 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_UNION (yyval.ntval) = AST_Decl::NT_union; } -#line 9343 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9362 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 514: -#line 6422 "fe/idl.ypp" /* yacc.c:1646 */ + case 525: +#line 6474 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_EVENTTYPE (yyval.ntval) = AST_Decl::NT_eventtype; } -#line 9352 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9371 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 515: -#line 6427 "fe/idl.ypp" /* yacc.c:1646 */ + case 526: +#line 6479 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_SEQUENCE (yyval.ntval) = AST_Decl::NT_sequence; } -#line 9361 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9380 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 516: -#line 6432 "fe/idl.ypp" /* yacc.c:1646 */ + case 527: +#line 6484 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_INTERFACE (yyval.ntval) = AST_Decl::NT_interface; } -#line 9370 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9389 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 517: -#line 6437 "fe/idl.ypp" /* yacc.c:1646 */ + case 528: +#line 6489 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_VALUETYPE (yyval.ntval) = AST_Decl::NT_valuetype; } -#line 9379 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9398 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 518: -#line 6442 "fe/idl.ypp" /* yacc.c:1646 */ + case 529: +#line 6494 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_ENUM (yyval.ntval) = AST_Decl::NT_enum; } -#line 9388 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9407 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 519: -#line 6447 "fe/idl.ypp" /* yacc.c:1646 */ + case 530: +#line 6499 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_EXCEPTION (yyval.ntval) = AST_Decl::NT_except; } -#line 9397 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9416 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 520: -#line 6452 "fe/idl.ypp" /* yacc.c:1646 */ + case 531: +#line 6504 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_CONST const_type (yyval.ntval) = AST_Decl::NT_const; t_param_const_type = (yyvsp[0].etval); } -#line 9407 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9426 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 521: -#line 6461 "fe/idl.ypp" /* yacc.c:1646 */ + case 532: +#line 6513 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_formal_parameter : formal_parameter formal_parameters if ((yyvsp[0].plval) == 0) @@ -9438,20 +9457,20 @@ yyreduce: (yyval.plval) = (yyvsp[0].plval); } -#line 9442 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9461 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 522: -#line 6495 "fe/idl.ypp" /* yacc.c:1646 */ + case 533: +#line 6547 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameters : formal_parameters ',' // Maybe add a new parse state to set here. } -#line 9451 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9470 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 523: -#line 6500 "fe/idl.ypp" /* yacc.c:1646 */ + case 534: +#line 6552 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameter if ((yyvsp[-3].plval) == 0) @@ -9467,20 +9486,20 @@ yyreduce: delete (yyvsp[0].pival); (yyvsp[0].pival) = 0; } -#line 9471 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9490 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 524: -#line 6516 "fe/idl.ypp" /* yacc.c:1646 */ + case 535: +#line 6568 "fe/idl.ypp" /* yacc.c:1646 */ { // /* EMPTY */ (yyval.plval) = 0; } -#line 9480 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9499 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 525: -#line 6524 "fe/idl.ypp" /* yacc.c:1646 */ + case 536: +#line 6576 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameter : formal_parameter_type IDENTIFIER @@ -9506,11 +9525,11 @@ yyreduce: tao_enum_constant_decl = 0; } } -#line 9510 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9529 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 526: -#line 6550 "fe/idl.ypp" /* yacc.c:1646 */ + case 537: +#line 6602 "fe/idl.ypp" /* yacc.c:1646 */ { ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, @@ -9525,11 +9544,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 9529 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9548 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 527: -#line 6568 "fe/idl.ypp" /* yacc.c:1646 */ + case 538: +#line 6620 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_formal_parameter_name : formal_parameter_name formal_parameter_names ACE_NEW_RETURN ((yyval.slval), @@ -9537,11 +9556,11 @@ yyreduce: (yyvsp[0].slval)), 1); } -#line 9541 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9560 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 528: -#line 6579 "fe/idl.ypp" /* yacc.c:1646 */ + case 539: +#line 6631 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameter_names : formal_parameter_names ',' formal_parameter_name UTL_StrList *sl = 0; @@ -9560,42 +9579,42 @@ yyreduce: (yyval.slval) = (yyvsp[-2].slval); } } -#line 9564 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9583 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 529: -#line 6598 "fe/idl.ypp" /* yacc.c:1646 */ + case 540: +#line 6650 "fe/idl.ypp" /* yacc.c:1646 */ { // /* EMPTY */ (yyval.slval) = 0; } -#line 9573 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9592 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 530: -#line 6606 "fe/idl.ypp" /* yacc.c:1646 */ + case 541: +#line 6658 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameter_name : IDENTIFIER ACE_NEW_RETURN ((yyval.sval), UTL_String ((yyvsp[0].strval), true), 1); } -#line 9584 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9603 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 531: -#line 6616 "fe/idl.ypp" /* yacc.c:1646 */ + case 542: +#line 6668 "fe/idl.ypp" /* yacc.c:1646 */ { // porttype_decl : IDL_PORTTYPE idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } -#line 9593 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9612 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 532: -#line 6621 "fe/idl.ypp" /* yacc.c:1646 */ + case 543: +#line 6673 "fe/idl.ypp" /* yacc.c:1646 */ { -// IDENTIFIER +// annotations IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9612,29 +9631,29 @@ yyreduce: // Push it on the scopes stack. idl_global->scopes ().push (p); } -#line 9616 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9635 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 533: -#line 6640 "fe/idl.ypp" /* yacc.c:1646 */ + case 544: +#line 6692 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen); } -#line 9625 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9644 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 534: -#line 6645 "fe/idl.ypp" /* yacc.c:1646 */ + case 545: +#line 6697 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_port_export idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen); } -#line 9634 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9653 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 535: -#line 6650 "fe/idl.ypp" /* yacc.c:1646 */ + case 546: +#line 6702 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeQsSeen); @@ -9642,84 +9661,84 @@ yyreduce: // Done with this port type - pop it off the scopes stack. idl_global->scopes ().pop (); } -#line 9646 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9665 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 536: -#line 6661 "fe/idl.ypp" /* yacc.c:1646 */ + case 547: +#line 6713 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_port_export : port_export port_exports } -#line 9654 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9673 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 537: -#line 6668 "fe/idl.ypp" /* yacc.c:1646 */ + case 548: +#line 6720 "fe/idl.ypp" /* yacc.c:1646 */ { // port_exports : port_exports port_export } -#line 9662 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9681 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 538: -#line 6672 "fe/idl.ypp" /* yacc.c:1646 */ + case 549: +#line 6724 "fe/idl.ypp" /* yacc.c:1646 */ { // | /* EMPTY */ } -#line 9670 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9689 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 539: -#line 6679 "fe/idl.ypp" /* yacc.c:1646 */ + case 550: +#line 6731 "fe/idl.ypp" /* yacc.c:1646 */ { // port_export : provides_decl } -#line 9678 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9697 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 540: -#line 6683 "fe/idl.ypp" /* yacc.c:1646 */ + case 551: +#line 6735 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' } -#line 9686 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9705 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 541: -#line 6687 "fe/idl.ypp" /* yacc.c:1646 */ + case 552: +#line 6739 "fe/idl.ypp" /* yacc.c:1646 */ { // | uses_decl } -#line 9694 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9713 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 542: -#line 6691 "fe/idl.ypp" /* yacc.c:1646 */ + case 553: +#line 6743 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' } -#line 9702 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9721 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 543: -#line 6695 "fe/idl.ypp" /* yacc.c:1646 */ + case 554: +#line 6747 "fe/idl.ypp" /* yacc.c:1646 */ { // | attribute idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 9711 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9730 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 544: -#line 6700 "fe/idl.ypp" /* yacc.c:1646 */ + case 555: +#line 6752 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' } -#line 9719 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9738 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 545: -#line 6707 "fe/idl.ypp" /* yacc.c:1646 */ + case 556: +#line 6759 "fe/idl.ypp" /* yacc.c:1646 */ { // extended_port_decl : IDL_PORT scoped_name IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); @@ -9789,11 +9808,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9793 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9812 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 546: -#line 6777 "fe/idl.ypp" /* yacc.c:1646 */ + case 557: +#line 6829 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_MIRRORPORT scoped_name IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen); @@ -9841,13 +9860,13 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9845 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9864 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 547: -#line 6828 "fe/idl.ypp" /* yacc.c:1646 */ + case 558: +#line 6880 "fe/idl.ypp" /* yacc.c:1646 */ { -// at_least_one_actual_parameter : actual_parameter actual_parameters +// at_least_one_actual_parameter : annotations actual_parameter actual_parameters if ((yyvsp[0].alval) == 0) { ACE_NEW_RETURN ((yyvsp[0].alval), @@ -9858,37 +9877,37 @@ yyreduce: (yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval)); (yyval.alval) = (yyvsp[0].alval); } -#line 9862 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9881 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 548: -#line 6844 "fe/idl.ypp" /* yacc.c:1646 */ + case 559: +#line 6896 "fe/idl.ypp" /* yacc.c:1646 */ { -// actual_parameters : actual_parameters ',' actual_parameter - if ((yyvsp[-2].alval) == 0) +// actual_parameters : actual_parameters ',' annotations actual_parameter + if ((yyvsp[-3].alval) == 0) { - ACE_NEW_RETURN ((yyvsp[-2].alval), + ACE_NEW_RETURN ((yyvsp[-3].alval), FE_Utils::T_ARGLIST, 1); } - (yyvsp[-2].alval)->enqueue_tail ((yyvsp[0].dcval)); - (yyval.alval) = (yyvsp[-2].alval); + (yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval)); + (yyval.alval) = (yyvsp[-3].alval); } -#line 9879 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9898 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 549: -#line 6857 "fe/idl.ypp" /* yacc.c:1646 */ + case 560: +#line 6909 "fe/idl.ypp" /* yacc.c:1646 */ { // | /* EMPTY */ (yyval.alval) = 0; } -#line 9888 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9907 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 550: -#line 6865 "fe/idl.ypp" /* yacc.c:1646 */ + case 561: +#line 6917 "fe/idl.ypp" /* yacc.c:1646 */ { // actual_parameter : expression // To avoid grammar conflicts with this LALR(1) parser, @@ -9945,29 +9964,29 @@ yyreduce: 0); } } -#line 9949 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9968 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 552: -#line 6929 "fe/idl.ypp" /* yacc.c:1646 */ + case 563: +#line 6981 "fe/idl.ypp" /* yacc.c:1646 */ { // connector_header : IDL_CONNECTOR idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen); } -#line 9958 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9977 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 553: -#line 6934 "fe/idl.ypp" /* yacc.c:1646 */ + case 564: +#line 6986 "fe/idl.ypp" /* yacc.c:1646 */ { -// IDENTIFIER +// annotations IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen); } -#line 9967 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9986 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 554: -#line 6939 "fe/idl.ypp" /* yacc.c:1646 */ + case 565: +#line 6991 "fe/idl.ypp" /* yacc.c:1646 */ { // component_inheritance_spec UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -10020,29 +10039,29 @@ yyreduce: idl_global->scopes ().push (c); } } -#line 10024 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10043 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 555: -#line 6995 "fe/idl.ypp" /* yacc.c:1646 */ + case 566: +#line 7047 "fe/idl.ypp" /* yacc.c:1646 */ { // connector_body " '{' idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen); } -#line 10033 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10052 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 556: -#line 7000 "fe/idl.ypp" /* yacc.c:1646 */ + case 567: +#line 7052 "fe/idl.ypp" /* yacc.c:1646 */ { // connector_exports idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen); } -#line 10042 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10061 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 557: -#line 7005 "fe/idl.ypp" /* yacc.c:1646 */ + case 568: +#line 7057 "fe/idl.ypp" /* yacc.c:1646 */ { // '} idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorQsSeen); @@ -10050,83 +10069,83 @@ yyreduce: // Done with this connector - pop it off the scope stack. idl_global->scopes ().pop (); } -#line 10054 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10073 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 560: -#line 7021 "fe/idl.ypp" /* yacc.c:1646 */ + case 571: +#line 7073 "fe/idl.ypp" /* yacc.c:1646 */ { // connector_export : provides_decl idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 10063 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10082 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 561: -#line 7026 "fe/idl.ypp" /* yacc.c:1646 */ + case 572: +#line 7078 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10072 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10091 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 562: -#line 7031 "fe/idl.ypp" /* yacc.c:1646 */ + case 573: +#line 7083 "fe/idl.ypp" /* yacc.c:1646 */ { // | uses_decl idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 10081 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10100 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 563: -#line 7036 "fe/idl.ypp" /* yacc.c:1646 */ + case 574: +#line 7088 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10090 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10109 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 564: -#line 7041 "fe/idl.ypp" /* yacc.c:1646 */ + case 575: +#line 7093 "fe/idl.ypp" /* yacc.c:1646 */ { // | attribute idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 10099 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10118 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 565: -#line 7046 "fe/idl.ypp" /* yacc.c:1646 */ + case 576: +#line 7098 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10108 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10127 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 566: -#line 7051 "fe/idl.ypp" /* yacc.c:1646 */ + case 577: +#line 7103 "fe/idl.ypp" /* yacc.c:1646 */ { // | extended_port_decl idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 10117 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10136 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 567: -#line 7056 "fe/idl.ypp" /* yacc.c:1646 */ + case 578: +#line 7108 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10126 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10145 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; -#line 10130 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10149 "fe/idl.tab.cpp" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -10354,7 +10373,7 @@ yyreturn: #endif return yyresult; } -#line 7062 "fe/idl.ypp" /* yacc.c:1906 */ +#line 7114 "fe/idl.ypp" /* yacc.c:1906 */ /* programs */ diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp index 6a6cf292f4a..a14c0d7cc86 100644 --- a/TAO/TAO_IDL/fe/idl.tab.hpp +++ b/TAO/TAO_IDL/fe/idl.tab.hpp @@ -136,7 +136,7 @@ extern int tao_yydebug; typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 154 "fe/idl.ypp" /* yacc.c:1909 */ +#line 152 "fe/idl.ypp" /* yacc.c:1909 */ AST_Decl *dcval; /* Decl value */ UTL_StrList *slval; /* String list */ diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp index d186fa2b832..0fb4ac1ac93 100644 --- a/TAO/TAO_IDL/fe/idl.ypp +++ b/TAO/TAO_IDL/fe/idl.ypp @@ -339,6 +339,7 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; %type <bval> opt_truncatable opt_multiple uses_opt_multiple %type <idval> interface_decl value_decl union_decl struct_decl id +%type <idval> defining_id %type <idval> event_header event_plain_header event_custom_header %type <idval> event_abs_header @@ -359,7 +360,7 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; start : definitions ; definitions - : definitions definition + : definitions annotations definition | /* EMPTY */ ; @@ -376,11 +377,18 @@ definition ; at_least_one_definition - : definitions definition + : definitions annotations definition ; fixed_definition - : type_dcl + : + /* TODO: + annotation_dcl + { + idl_global->set_parse_state (IDL_GlobalData::PS_AnnotationDeclSeen); + } + | */ + type_dcl { // fixed_definition : type_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); @@ -694,7 +702,7 @@ at_least_one_tpl_definition ; tpl_definitions - : tpl_definitions tpl_definition + : tpl_definitions annotations tpl_definition | /* EMPTY */ ; @@ -716,9 +724,9 @@ template_module_ref idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefParamsSeen); } - id + defining_id { -// id +// defining_id idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefIDSeen); @@ -810,9 +818,9 @@ template_module_inst idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleArgsSeen); } - id + defining_id { -// id +// defining_id idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleIDSeen); @@ -948,9 +956,9 @@ interface_decl: // interface_decl : IDL_INTERFACE idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen); } - id + defining_id { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen); $$ = $3; } @@ -1291,9 +1299,9 @@ value_decl // value_decl : IDL_VALUETYPE idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen); } - id + defining_id { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen); $$ = $3; } @@ -1689,6 +1697,18 @@ id : IDENTIFIER } ; +defining_id : annotations IDENTIFIER + { + /* defining_id is a defining identifier + whereas id is usually a reference to a defining identifier */ + ACE_NEW_RETURN ($$, + Identifier ($2), + 1); + ACE::strdelete ($2); + $2 = 0; + } + ; + interface_forward : interface_decl { @@ -1804,9 +1824,9 @@ const_dcl : // const_type idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen); } - id + defining_id { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen); } '=' @@ -2323,6 +2343,39 @@ positive_int_expr : } ; +/* Annotations + TODO: actions + TODO: annotation_dcl and friends + */ + +annotations + : annotations annotation_appl + | /* EMPTY */ + ; + +annotation_appl + : '@' scoped_name '(' annotation_appl_params ')' + | '@' scoped_name + ; + +annotation_appl_params + : const_expr + | at_least_one_annotation_appl_param + ; + +at_least_one_annotation_appl_param : + annotation_appl_param annotation_appl_named_params + ; + +annotation_appl_named_params + : annotation_appl_named_params ',' annotation_appl_param + | /* EMPTY */ + ; + +annotation_appl_param + : IDENTIFIER '=' const_expr + ; + type_dcl : IDL_TYPEDEF { @@ -2625,9 +2678,9 @@ simple_declarators ; simple_declarator : - id + defining_id { -// simple_declarator : id +// simple_declarator : defining_id UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, UTL_ScopedName ($1, @@ -2778,9 +2831,9 @@ struct_decl : // struct_decl : IDL_STRUCT idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen); } - id + defining_id { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen); $$ = $3; } @@ -2864,6 +2917,7 @@ member : ; member_i : + annotations type_spec { // member_i : type_spec @@ -2885,21 +2939,21 @@ member_i : /* * Check for illegal recursive use of type. */ - if ($1 != 0 - && AST_illegal_recursive_type ($1)) + if ($2 != 0 + && AST_illegal_recursive_type ($2)) { idl_global->err ()->error1 (UTL_Error::EIDL_RECURSIVE_TYPE, - $1); + $2); } /* * Create a node representing a struct or exception member * Add it to the enclosing scope. */ else if (s != 0 - && $1 != 0 - && $3 != 0) + && $2 != 0 + && $4 != 0) { - for (UTL_DecllistActiveIterator l ($3); + for (UTL_DecllistActiveIterator l ($4); !l.is_done (); l.next ()) { @@ -2910,7 +2964,7 @@ member_i : continue; } - AST_Type *tp = d->compose ($1); + AST_Type *tp = d->compose ($2); if (tp == 0) { @@ -2928,9 +2982,9 @@ member_i : } } - $3->destroy (); - delete $3; - $3 = 0; + $4->destroy (); + delete $4; + $4 = 0; } | error { @@ -2951,9 +3005,9 @@ union_decl : // union_decl : IDL_UNION idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen); } - id + defining_id { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen); $$ = $3; } @@ -3010,7 +3064,7 @@ union_type { // ')' /* - * The top of the scopes must an empty union we added after we + * The top of the scopes must be an empty union we added after we * encountered 'union <id> switch ('. Now we are ready to add a * correct one. Temporarily remove the top so that we setup the * correct union in a right scope. @@ -3255,9 +3309,9 @@ case_branch : // case_branch : at_least_one_case_label idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen); } - element_spec + annotations element_spec { -// element_spec +// annotations element_spec idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen); } ';' @@ -3265,7 +3319,7 @@ case_branch : // ';' UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_UnionBranch *b = 0; - AST_Field *f = $3; + AST_Field *f = $4; idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemCompleted); /* @@ -3274,7 +3328,7 @@ case_branch : */ if (s != 0 && $1 != 0 - && $3 != 0) + && $4 != 0) { b = idl_global->gen ()->create_union_branch ( @@ -3316,12 +3370,12 @@ at_least_one_case_label : ; case_labels - : case_labels case_label + : case_labels annotations case_label { -// case_labels : case_labels case_label +// case_labels : case_labels annotations case_label UTL_LabelList *ll = 0; ACE_NEW_RETURN (ll, - UTL_LabelList ($2, + UTL_LabelList ($3, 0), 1); @@ -3486,9 +3540,9 @@ enum_type : // enum_type : IDL_ENUM idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen); } - id + defining_id { -// id +// defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ($3, 0); @@ -3565,13 +3619,13 @@ enumerators ; enumerator : - IDENTIFIER + annotations IDENTIFIER { -// enumerator : IDENTIFIER +// enumerator : annotations IDENTIFIER UTL_Scope *s = idl_global->scopes ().top_non_null (); - Identifier id ($1); - ACE::strdelete ($1); - $1 = 0; + Identifier id ($2); + ACE::strdelete ($2); + $2 = 0; UTL_ScopedName n (&id, 0); AST_EnumVal *e = 0; @@ -3944,9 +3998,9 @@ wstring_head : ; array_declarator : - id + defining_id { -// array_declarator : id +// array_declarator : defining_id idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } at_least_one_array_dim @@ -4279,9 +4333,9 @@ exception : // exception : IDL_EXCEPTION idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen); } - id + defining_id { -// id +// defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ($3, 0); @@ -4337,13 +4391,13 @@ operation : // operation : opt_op_attribute op_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } - IDENTIFIER + annotations IDENTIFIER { -// IDENTIFIER +// annotations IDENTIFIER UTL_Scope *s = idl_global->scopes ().top_non_null (); - Identifier id ($4); - ACE::strdelete ($4); - $4 = 0; + Identifier id ($5); + ACE::strdelete ($5); + $5 = 0; UTL_ScopedName n (&id, 0); AST_Operation *o = 0; @@ -4426,14 +4480,14 @@ operation : { o = AST_Operation::narrow_from_scope (s); - if ($8 != 0 && o != 0) + if ($9 != 0 && o != 0) { - (void) o->fe_add_exceptions ($8); + (void) o->fe_add_exceptions ($9); } - if ($10 != 0) + if ($11 != 0) { - (void) o->fe_add_context ($10); + (void) o->fe_add_context ($11); } } @@ -4483,9 +4537,9 @@ init_decl //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } - IDENTIFIER + annotations IDENTIFIER { -// IDENTIFIER +// annotations IDENTIFIER UTL_Scope *s = idl_global->scopes ().top_non_null (); if (s->is_abstract ()) @@ -4501,9 +4555,9 @@ init_decl idl_global->set_err_count (idl_global->err_count () + 1); } - Identifier id ($3); - ACE::strdelete ($3); - $3 = 0; + Identifier id ($4); + ACE::strdelete ($4); + $4 = 0; UTL_ScopedName n (&id, 0); @@ -4535,11 +4589,11 @@ init_decl // opt_raises idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); - if ($7 != 0) + if ($8 != 0) { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Factory *f = AST_Factory::narrow_from_scope (s); - (void) f->fe_add_exceptions ($7); + (void) f->fe_add_exceptions ($8); } idl_global->scopes ().pop (); @@ -5075,9 +5129,9 @@ component component_forward_decl : IDL_COMPONENT - id + defining_id { -// component_forward_decl : IDL_COMPONENT id +// component_forward_decl : IDL_COMPONENT defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ($2, 0); @@ -5167,9 +5221,9 @@ component_decl : component_header : IDL_COMPONENT - id + defining_id { -// component_header: IDL_COMPONENT id +// component_header: IDL_COMPONENT defining_id idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen); } component_inheritance_spec @@ -5837,9 +5891,9 @@ home_header : // home_header : IDL_HOME idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } - id + defining_id { -// id +// defining_id idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen); } home_inheritance_spec @@ -5992,9 +6046,9 @@ home_export factory_decl : IDL_FACTORY - id + defining_id { -// factory_decl : IDL_FACTORY id +// factory_decl : IDL_FACTORY defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ($2, 0); @@ -6044,9 +6098,9 @@ factory_decl : finder_decl : IDL_FINDER - id + defining_id { -// finder_decl : IDL_FINDER id +// finder_decl : IDL_FINDER defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ($2, 0); @@ -6111,9 +6165,9 @@ event_forward_decl event_concrete_forward_decl : IDL_EVENTTYPE - id + defining_id { -// event_concrete_forward_decl : IDL_EVENTTYPE id +// event_concrete_forward_decl : IDL_EVENTTYPE defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ($2, 0); @@ -6140,9 +6194,9 @@ event_concrete_forward_decl : event_abs_forward_decl : IDL_ABSTRACT IDL_EVENTTYPE - id + defining_id { -// event_abs_forward_decl : IDL_ABSTRACT IDL_EVENTTYPE id +// event_abs_forward_decl : IDL_ABSTRACT IDL_EVENTTYPE defining_id UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ($3, 0); @@ -6238,9 +6292,9 @@ event_abs_decl : event_abs_header : IDL_ABSTRACT IDL_EVENTTYPE - id + defining_id { -// event_abs_header : IDL_ABSTRACT IDL_EVENTTYPE id +// event_abs_header : IDL_ABSTRACT IDL_EVENTTYPE defining_id $$ = $3; } ; @@ -6248,9 +6302,9 @@ event_abs_header : event_custom_header : IDL_CUSTOM IDL_EVENTTYPE - id + defining_id { -// event_custom_header : IDL_CUSTOM IDL_EVENTTYPE id +// event_custom_header : IDL_CUSTOM IDL_EVENTTYPE defining_id idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); ACE_DEBUG ((LM_DEBUG, @@ -6266,9 +6320,9 @@ event_custom_header : event_plain_header : IDL_EVENTTYPE - id + defining_id { -// event_plain_header : IDL_EVENTTYPE id +// event_plain_header : IDL_EVENTTYPE defining_id idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); $$ = $2; @@ -6615,15 +6669,15 @@ porttype_decl // porttype_decl : IDL_PORTTYPE idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } - IDENTIFIER + annotations IDENTIFIER { -// IDENTIFIER +// annotations IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); - Identifier id ($3); - ACE::strdelete ($3); - $3 = 0; + Identifier id ($4); + ACE::strdelete ($4); + $4 = 0; UTL_ScopedName sn (&id, 0); AST_PortType *p = @@ -6822,25 +6876,25 @@ extended_port_decl ; at_least_one_actual_parameter - : actual_parameter actual_parameters + : annotations actual_parameter actual_parameters { -// at_least_one_actual_parameter : actual_parameter actual_parameters - if ($2 == 0) +// at_least_one_actual_parameter : annotations actual_parameter actual_parameters + if ($3 == 0) { - ACE_NEW_RETURN ($2, + ACE_NEW_RETURN ($3, FE_Utils::T_ARGLIST, 1); } - $2->enqueue_head ($1); - $<alval>$ = $2; + $3->enqueue_head ($2); + $<alval>$ = $3; } ; actual_parameters - : actual_parameters ',' actual_parameter + : actual_parameters ',' annotations actual_parameter { -// actual_parameters : actual_parameters ',' actual_parameter +// actual_parameters : actual_parameters ',' annotations actual_parameter if ($1 == 0) { ACE_NEW_RETURN ($1, @@ -6848,7 +6902,7 @@ actual_parameters 1); } - $1->enqueue_tail ($3); + $1->enqueue_tail ($4); $<alval>$ = $1; } | /* EMPTY */ @@ -6928,9 +6982,9 @@ connector_header // connector_header : IDL_CONNECTOR idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen); } - IDENTIFIER + annotations IDENTIFIER { -// IDENTIFIER +// annotations IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen); } component_inheritance_spec @@ -6940,20 +6994,20 @@ connector_header AST_Connector *parent = 0; bool so_far_so_good = true; - Identifier id ($3); - ACE::strdelete ($3); - $3 = 0; + Identifier id ($4); + ACE::strdelete ($4); + $4 = 0; UTL_ScopedName sn (&id, 0); - if ($5 != 0) + if ($6 != 0) { AST_Decl *d = - s->lookup_by_name ($5); + s->lookup_by_name ($6); if (d == 0) { - idl_global->err ()->lookup_error ($5); + idl_global->err ()->lookup_error ($6); so_far_so_good = false; } @@ -6969,9 +7023,9 @@ connector_header so_far_so_good = false; } - $5->destroy (); - delete $5; - $5 = 0; + $6->destroy (); + delete $6; + $6 = 0; } if (so_far_so_good) diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index 15644ea96d1..5a7237f40ef 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -1,6 +1,6 @@ -#line 2 "fe/idl.yy.cpp" +#line 1 "fe/idl.yy.cpp" -#line 4 "fe/idl.yy.cpp" +#line 3 "fe/idl.yy.cpp" #define YY_INT_ALIGNED short int @@ -8,11 +8,17 @@ #define yy_create_buffer tao_yy_create_buffer #define yy_delete_buffer tao_yy_delete_buffer -#define yy_flex_debug tao_yy_flex_debug +#define yy_scan_buffer tao_yy_scan_buffer +#define yy_scan_string tao_yy_scan_string +#define yy_scan_bytes tao_yy_scan_bytes #define yy_init_buffer tao_yy_init_buffer #define yy_flush_buffer tao_yy_flush_buffer #define yy_load_buffer_state tao_yy_load_buffer_state #define yy_switch_to_buffer tao_yy_switch_to_buffer +#define yypush_buffer_state tao_yypush_buffer_state +#define yypop_buffer_state tao_yypop_buffer_state +#define yyensure_buffer_stack tao_yyensure_buffer_stack +#define yy_flex_debug tao_yy_flex_debug #define yyin tao_yyin #define yyleng tao_yyleng #define yylex tao_yylex @@ -27,16 +33,251 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define tao_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer tao_yy_create_buffer +#endif + +#ifdef yy_delete_buffer +#define tao_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer tao_yy_delete_buffer +#endif + +#ifdef yy_scan_buffer +#define tao_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer tao_yy_scan_buffer +#endif + +#ifdef yy_scan_string +#define tao_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string tao_yy_scan_string +#endif + +#ifdef yy_scan_bytes +#define tao_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes tao_yy_scan_bytes +#endif + +#ifdef yy_init_buffer +#define tao_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer tao_yy_init_buffer +#endif + +#ifdef yy_flush_buffer +#define tao_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer tao_yy_flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define tao_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state tao_yy_load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define tao_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer tao_yy_switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define tao_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state tao_yypush_buffer_state +#endif + +#ifdef yypop_buffer_state +#define tao_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state tao_yypop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define tao_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack tao_yyensure_buffer_stack +#endif + +#ifdef yylex +#define tao_yylex_ALREADY_DEFINED +#else +#define yylex tao_yylex +#endif + +#ifdef yyrestart +#define tao_yyrestart_ALREADY_DEFINED +#else +#define yyrestart tao_yyrestart +#endif + +#ifdef yylex_init +#define tao_yylex_init_ALREADY_DEFINED +#else +#define yylex_init tao_yylex_init +#endif + +#ifdef yylex_init_extra +#define tao_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra tao_yylex_init_extra +#endif + +#ifdef yylex_destroy +#define tao_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy tao_yylex_destroy +#endif + +#ifdef yyget_debug +#define tao_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug tao_yyget_debug +#endif + +#ifdef yyset_debug +#define tao_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug tao_yyset_debug +#endif + +#ifdef yyget_extra +#define tao_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra tao_yyget_extra +#endif + +#ifdef yyset_extra +#define tao_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra tao_yyset_extra +#endif + +#ifdef yyget_in +#define tao_yyget_in_ALREADY_DEFINED +#else +#define yyget_in tao_yyget_in +#endif + +#ifdef yyset_in +#define tao_yyset_in_ALREADY_DEFINED +#else +#define yyset_in tao_yyset_in +#endif + +#ifdef yyget_out +#define tao_yyget_out_ALREADY_DEFINED +#else +#define yyget_out tao_yyget_out +#endif + +#ifdef yyset_out +#define tao_yyset_out_ALREADY_DEFINED +#else +#define yyset_out tao_yyset_out +#endif + +#ifdef yyget_leng +#define tao_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng tao_yyget_leng +#endif + +#ifdef yyget_text +#define tao_yyget_text_ALREADY_DEFINED +#else +#define yyget_text tao_yyget_text +#endif + +#ifdef yyget_lineno +#define tao_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno tao_yyget_lineno +#endif + +#ifdef yyset_lineno +#define tao_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno tao_yyset_lineno +#endif + +#ifdef yywrap +#define tao_yywrap_ALREADY_DEFINED +#else +#define yywrap tao_yywrap +#endif + +#ifdef yyalloc +#define tao_yyalloc_ALREADY_DEFINED +#else +#define yyalloc tao_yyalloc +#endif + +#ifdef yyrealloc +#define tao_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc tao_yyrealloc +#endif + +#ifdef yyfree +#define tao_yyfree_ALREADY_DEFINED +#else +#define yyfree tao_yyfree +#endif + +#ifdef yytext +#define tao_yytext_ALREADY_DEFINED +#else +#define yytext tao_yytext +#endif + +#ifdef yyleng +#define tao_yyleng_ALREADY_DEFINED +#else +#define yyleng tao_yyleng +#endif + +#ifdef yyin +#define tao_yyin_ALREADY_DEFINED +#else +#define yyin tao_yyin +#endif + +#ifdef yyout +#define tao_yyout_ALREADY_DEFINED +#else +#define yyout tao_yyout +#endif + +#ifdef yy_flex_debug +#define tao_yy_flex_debug_ALREADY_DEFINED +#else +#define yy_flex_debug tao_yy_flex_debug +#endif + +#ifdef yylineno +#define tao_yylineno_ALREADY_DEFINED +#else +#define yylineno tao_yylineno +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_errno.h" /* end standard C headers. */ @@ -100,60 +341,48 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST +/* begin standard C++ headers. */ -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE tao_yyrestart(tao_yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -178,100 +407,100 @@ typedef unsigned int flex_uint32_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -extern int tao_yyleng; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern int yyleng; -extern FILE *tao_yyin, *tao_yyout; +extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ - do \ - { \ - /* Undo effects of setting up tao_yytext. */ \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ int yyless_macro_arg = (n); \ YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = (yy_hold_char); \ - YY_RESTORE_YY_MORE_OFFSET \ - (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up tao_yytext again */ \ - } \ - while ( 0 ) - + *yy_cp = (yy_hold_char); \ + YY_RESTORE_YY_MORE_OFFSET \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + } \ + while ( 0 ) #define unput(c) yyunput( c, (yytext_ptr) ) -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state - { - FILE *yy_input_file; + { + FILE *yy_input_file; - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + int yy_buf_size; - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + int yy_n_chars; - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of static_cast<int> (fread()), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; - int yy_buffer_status; + int yy_buffer_status; #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via tao_yyrestart()), so that the user can continue scanning by - * just pointing tao_yyin at a new input file. - */ + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. + */ #define YY_BUFFER_EOF_PENDING 2 - }; + }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ /* Stack of input buffers. */ @@ -288,115 +517,107 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : 0) - /* Same as previous macro, but useful when we know that the buffer stack is not * 0 or when we need an lvalue. For internal use only. */ #define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] -/* yy_hold_char holds the character lost when tao_yytext is formed. */ +/* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int tao_yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; -static int yy_init = 0; /* whether we need to initialize */ -static int yy_start = 0; /* start state number */ +static char *yy_c_buf_p = 0; +static int yy_init = 0; /* whether we need to initialize */ +static int yy_start = 0; /* start state number */ -/* Flag which is used to allow tao_yywrap()'s to do buffer switches - * instead of setting up a fresh tao_yyin. A bit of a hack ... +/* Flag which is used to allow yywrap()'s to do buffer switches + * instead of setting up a fresh yyin. A bit of a hack ... */ static int yy_did_buffer_switch_on_eof; -void tao_yyrestart (FILE *input_file ); -void tao_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE tao_yy_create_buffer (FILE *file,int size ); -void tao_yy_delete_buffer (YY_BUFFER_STATE b ); -void tao_yy_flush_buffer (YY_BUFFER_STATE b ); -void tao_yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void tao_yypop_buffer_state (void ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -static void tao_yyensure_buffer_stack (void ); -static void tao_yy_load_buffer_state (void ); -static void tao_yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -#define YY_FLUSH_BUFFER tao_yy_flush_buffer(YY_CURRENT_BUFFER ) +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -YY_BUFFER_STATE tao_yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE tao_yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE tao_yy_scan_bytes (yyconst char *bytes,int len ); - -void *tao_yyalloc (yy_size_t ); -void *tao_yyrealloc (void *,yy_size_t ); -void tao_yyfree (void * ); - -#define yy_new_buffer tao_yy_create_buffer +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); +#define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - tao_yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - tao_yy_create_buffer(tao_yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } - + { \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + } #define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - tao_yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - tao_yy_create_buffer(tao_yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } - + { \ + if ( ! YY_CURRENT_BUFFER ){\ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + } #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ +typedef flex_uint8_t YY_CHAR; -typedef unsigned char YY_CHAR; - -FILE *tao_yyin = (FILE *) 0, *tao_yyout = (FILE *) 0; +FILE *yyin = 0, *yyout = 0; typedef int yy_state_type; -extern int tao_yylineno; +extern int yylineno; +int yylineno = 1; -int tao_yylineno = 1; +extern char yytext[]; -extern char tao_yytext[]; - -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the - * corresponding action - sets up tao_yytext. + * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ - (yytext_ptr) = yy_bp; \ - tao_yyleng = (int) (yy_cp - yy_bp); \ - (yy_hold_char) = *yy_cp; \ - *yy_cp = '\0'; \ - if ( tao_yyleng >= YYLMAX ) \ - YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \ - yy_flex_strncpy( tao_yytext, (yytext_ptr), tao_yyleng + 1 ); \ - (yy_c_buf_p) = yy_cp; - + (yytext_ptr) = yy_bp; \ + yyleng = (int) (yy_cp - yy_bp); \ + (yy_hold_char) = *yy_cp; \ + *yy_cp = '\0'; \ + if ( yyleng >= YYLMAX ) \ + YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \ + yy_flex_strncpy( yytext, (yytext_ptr), yyleng + 1 ); \ + (yy_c_buf_p) = yy_cp; #define YY_NUM_RULES 111 #define YY_END_OF_BUFFER 112 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[593] = + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static const flex_int16_t yy_accept[593] = { 0, 108, 108, 112, 110, 108, 109, 109, 110, 110, 110, 110, 110, 83, 79, 110, 110, 110, 74, 74, 74, @@ -466,7 +687,7 @@ static yyconst flex_int16_t yy_accept[593] = } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, @@ -498,7 +719,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[61] = +static const YY_CHAR yy_meta[61] = { 0, 1, 1, 2, 1, 1, 3, 1, 4, 1, 1, 1, 1, 1, 5, 5, 6, 1, 1, 1, 1, @@ -508,7 +729,7 @@ static yyconst flex_int32_t yy_meta[61] = 7, 7, 8, 7, 8, 9, 8, 7, 8, 7 } ; -static yyconst flex_int16_t yy_base[621] = +static const flex_int16_t yy_base[621] = { 0, 0, 59, 1177, 1178, 60, 1178, 1178, 57, 1141, 55, 58, 66, 81, 74, 1158, 1156, 1153, 0, 1150, 70, @@ -580,7 +801,7 @@ static yyconst flex_int16_t yy_base[621] = 834, 840, 846, 852, 861, 870, 879, 888, 897, 906 } ; -static yyconst flex_int16_t yy_def[621] = +static const flex_int16_t yy_def[621] = { 0, 592, 1, 592, 592, 592, 592, 592, 593, 594, 592, 592, 592, 592, 592, 592, 592, 592, 595, 595, 595, @@ -652,7 +873,7 @@ static yyconst flex_int16_t yy_def[621] = 592, 592, 592, 592, 592, 592, 592, 592, 592, 592 } ; -static yyconst flex_int16_t yy_nxt[1239] = +static const flex_int16_t yy_nxt[1239] = { 0, 4, 5, 6, 7, 5, 8, 4, 9, 4, 4, 10, 11, 12, 13, 14, 14, 15, 16, 4, 17, @@ -792,7 +1013,7 @@ static yyconst flex_int16_t yy_nxt[1239] = 592, 592, 592, 592, 592, 592, 592, 592 } ; -static yyconst flex_int16_t yy_chk[1239] = +static const flex_int16_t yy_chk[1239] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -935,8 +1156,8 @@ static yyconst flex_int16_t yy_chk[1239] = static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; -extern int tao_yy_flex_debug; -int tao_yy_flex_debug = 0; +extern int yy_flex_debug; +int yy_flex_debug = 0; /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. @@ -949,7 +1170,7 @@ int tao_yy_flex_debug = 0; #define YYLMAX 8192 #endif -char tao_yytext[YYLMAX]; +char yytext[YYLMAX]; char *yytext_ptr; #line 1 "fe/idl.ll" #line 2 "fe/idl.ll" @@ -1055,7 +1276,7 @@ static char * idl_get_pragma_string (char *); static bool idl_valid_version (char *); static AST_Decl * idl_find_node (const char *); -#define ace_yytext tao_yytext +#define ace_yytext yytext #ifdef USE_MCPP_BUFFER_LEXING #include "mcpp_yyinput.h" @@ -1065,8 +1286,9 @@ static AST_Decl * idl_find_node (const char *); #undef ECHO #endif +#line 1291 "fe/idl.yy.cpp" /* SO we don't choke on files that use \r\n */ -#line 1073 "fe/idl.yy.cpp" +#line 1293 "fe/idl.yy.cpp" #define INITIAL 0 @@ -1082,36 +1304,36 @@ static AST_Decl * idl_find_node (const char *); #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int tao_yylex_destroy (void ); +int yylex_destroy ( void ); -int tao_yyget_debug (void ); +int yyget_debug ( void ); -void tao_yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE tao_yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void tao_yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *tao_yyget_in (void ); +FILE *yyget_in ( void ); -void tao_yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *tao_yyget_out (void ); +FILE *yyget_out ( void ); -void tao_yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -int tao_yyget_leng (void ); + int yyget_leng ( void ); -char *tao_yyget_text (void ); +char *yyget_text ( void ); -int tao_yyget_lineno (void ); +int yyget_lineno ( void ); -void tao_yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1119,28 +1341,31 @@ void tao_yyset_lineno (int line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int tao_yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int tao_yywrap (void ); +extern int yywrap ( void ); #endif #endif - static void yyunput (int c,char *buf_ptr ); +#ifndef YY_NO_UNPUT + + static void yyunput ( int c, char *buf_ptr ); + +#endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif @@ -1160,7 +1385,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( tao_yytext, tao_yyleng, 1, tao_yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1168,33 +1393,33 @@ static int input (void ); */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + { \ + int c = '*'; \ + int n; \ + for ( n = 0; n < max_size && \ + (c = ACE_OS::getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ + if ( c == '\n' ) \ + buf[n++] = (char) c; \ + if ( c == EOF && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + result = n; \ + } \ + else \ + { \ + errno=0; \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ { \ - int c = '*'; \ - size_t n; \ - for ( n = 0; n < max_size && \ - (c = ACE_OS::getc( tao_yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( tao_yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = static_cast<int> (n); \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ } \ - else \ - { \ - errno=0; \ - while ( (result = static_cast<int> (fread(buf, 1, max_size, tao_yyin)))==0 && ferror(tao_yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(tao_yyin); \ - } \ - }\ + errno=0; \ + clearerr(yyin); \ + } \ + }\ \ #endif @@ -1225,12 +1450,12 @@ static int input (void ); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int tao_yylex (void); +extern int yylex (void); -#define YY_DECL int tao_yylex (void) +#define YY_DECL int yylex (void) #endif /* !YY_DECL */ -/* Code executed at the beginning of each rule, after tao_yytext and tao_yyleng +/* Code executed at the beginning of each rule, after yytext and yyleng * have been set up. */ #ifndef YY_USER_ACTION @@ -1239,466 +1464,467 @@ extern int tao_yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK ACE_NOTREACHED (break;) +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ - if ( tao_yyleng > 0 ) \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \ - (tao_yytext[tao_yyleng - 1] == '\n'); \ - YY_USER_ACTION + if ( yyleng > 0 ) \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \ + (yytext[yyleng - 1] == '\n'); \ + YY_USER_ACTION /** The main scanner function which does all the work. */ YY_DECL { - yy_state_type yy_current_state; - char *yy_cp, *yy_bp; - int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; -#line 122 "fe/idl.ll" + if ( !(yy_init) ) + { + (yy_init) = 1; +#ifdef YY_USER_INIT + YY_USER_INIT; +#endif -#line 1266 "fe/idl.yy.cpp" + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ - if ( !(yy_init) ) - { - (yy_init) = 1; + if ( ! yyin ) + yyin = stdin; -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif + if ( ! yyout ) + yyout = stdout; - if ( ! (yy_start) ) - (yy_start) = 1; /* first start state */ + if ( ! YY_CURRENT_BUFFER ) { + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer( yyin, YY_BUF_SIZE ); + } - if ( ! tao_yyin ) - tao_yyin = stdin; + yy_load_buffer_state( ); + } - if ( ! tao_yyout ) - tao_yyout = stdout; + { +#line 122 "fe/idl.ll" - if ( ! YY_CURRENT_BUFFER ) { - tao_yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - tao_yy_create_buffer(tao_yyin,YY_BUF_SIZE ); - } - tao_yy_load_buffer_state( ); - } +#line 1516 "fe/idl.yy.cpp" - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = (yy_c_buf_p); + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ + { + yy_cp = (yy_c_buf_p); - /* Support of tao_yytext. */ - *yy_cp = (yy_hold_char); + /* Support of yytext. */ + *yy_cp = (yy_hold_char); - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; + /* yy_bp points to the position in yy_ch_buf of the start of + * the current run. + */ + yy_bp = yy_cp; - yy_current_state = (yy_start); - yy_current_state += YY_AT_BOL(); + yy_current_state = (yy_start); + yy_current_state += YY_AT_BOL(); yy_match: - do - { - YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 593 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_current_state != 592 ); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); + do + { + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 593 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + ++yy_cp; + } + while ( yy_current_state != 592 ); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); yy_find_action: - yy_act = yy_accept[yy_current_state]; + yy_act = yy_accept[yy_current_state]; - YY_DO_BEFORE_ACTION; + YY_DO_BEFORE_ACTION; -do_action: /* This label is used only to access EOF actions. */ +do_action: /* This label is used only to access EOF actions. */ - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = (yy_hold_char); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - goto yy_find_action; + switch ( yy_act ) + { /* beginning of action switch */ + case 0: /* must back up */ + /* undo the effects of YY_DO_BEFORE_ACTION */ + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + goto yy_find_action; case 1: YY_RULE_SETUP #line 124 "fe/idl.ll" return IDL_ANY; - YY_BREAK + YY_BREAK case 2: YY_RULE_SETUP #line 125 "fe/idl.ll" return IDL_OBJECT; - YY_BREAK + YY_BREAK case 3: YY_RULE_SETUP #line 126 "fe/idl.ll" return IDL_MODULE; - YY_BREAK + YY_BREAK case 4: YY_RULE_SETUP #line 127 "fe/idl.ll" return IDL_RAISES; - YY_BREAK + YY_BREAK case 5: YY_RULE_SETUP #line 128 "fe/idl.ll" return IDL_READONLY; - YY_BREAK + YY_BREAK case 6: YY_RULE_SETUP #line 129 "fe/idl.ll" return IDL_ATTRIBUTE; - YY_BREAK + YY_BREAK case 7: YY_RULE_SETUP #line 130 "fe/idl.ll" return IDL_EXCEPTION; - YY_BREAK + YY_BREAK case 8: YY_RULE_SETUP #line 131 "fe/idl.ll" return IDL_CONTEXT; - YY_BREAK + YY_BREAK case 9: YY_RULE_SETUP #line 132 "fe/idl.ll" return IDL_INTERFACE; - YY_BREAK + YY_BREAK case 10: YY_RULE_SETUP #line 133 "fe/idl.ll" return IDL_CONST; - YY_BREAK + YY_BREAK case 11: YY_RULE_SETUP #line 134 "fe/idl.ll" return IDL_TYPEDEF; - YY_BREAK + YY_BREAK case 12: YY_RULE_SETUP #line 135 "fe/idl.ll" return IDL_STRUCT; - YY_BREAK + YY_BREAK case 13: YY_RULE_SETUP #line 136 "fe/idl.ll" return IDL_ENUM; - YY_BREAK + YY_BREAK case 14: YY_RULE_SETUP #line 137 "fe/idl.ll" return IDL_STRING; - YY_BREAK + YY_BREAK case 15: YY_RULE_SETUP #line 138 "fe/idl.ll" return IDL_WSTRING; - YY_BREAK + YY_BREAK case 16: YY_RULE_SETUP #line 139 "fe/idl.ll" return IDL_SEQUENCE; - YY_BREAK + YY_BREAK case 17: YY_RULE_SETUP #line 140 "fe/idl.ll" return IDL_UNION; - YY_BREAK + YY_BREAK case 18: YY_RULE_SETUP #line 141 "fe/idl.ll" return IDL_FIXED; - YY_BREAK + YY_BREAK case 19: YY_RULE_SETUP #line 142 "fe/idl.ll" return IDL_SWITCH; - YY_BREAK + YY_BREAK case 20: YY_RULE_SETUP #line 143 "fe/idl.ll" return IDL_CASE; - YY_BREAK + YY_BREAK case 21: YY_RULE_SETUP #line 144 "fe/idl.ll" return IDL_DEFAULT; - YY_BREAK + YY_BREAK case 22: YY_RULE_SETUP #line 145 "fe/idl.ll" return IDL_FLOAT; - YY_BREAK + YY_BREAK case 23: YY_RULE_SETUP #line 146 "fe/idl.ll" return IDL_DOUBLE; - YY_BREAK + YY_BREAK case 24: YY_RULE_SETUP #line 147 "fe/idl.ll" return IDL_LONG; - YY_BREAK + YY_BREAK case 25: YY_RULE_SETUP #line 148 "fe/idl.ll" return IDL_SHORT; - YY_BREAK + YY_BREAK case 26: YY_RULE_SETUP #line 149 "fe/idl.ll" return IDL_UNSIGNED; - YY_BREAK + YY_BREAK case 27: YY_RULE_SETUP #line 150 "fe/idl.ll" return IDL_CHAR; - YY_BREAK + YY_BREAK case 28: YY_RULE_SETUP #line 151 "fe/idl.ll" return IDL_WCHAR; - YY_BREAK + YY_BREAK case 29: YY_RULE_SETUP #line 152 "fe/idl.ll" return IDL_BOOLEAN; - YY_BREAK + YY_BREAK case 30: YY_RULE_SETUP #line 153 "fe/idl.ll" return IDL_OCTET; - YY_BREAK + YY_BREAK case 31: YY_RULE_SETUP #line 154 "fe/idl.ll" return IDL_VOID; - YY_BREAK + YY_BREAK case 32: YY_RULE_SETUP #line 155 "fe/idl.ll" return IDL_NATIVE; - YY_BREAK + YY_BREAK case 33: YY_RULE_SETUP #line 156 "fe/idl.ll" return IDL_LOCAL; - YY_BREAK + YY_BREAK case 34: YY_RULE_SETUP #line 157 "fe/idl.ll" return IDL_ABSTRACT; - YY_BREAK + YY_BREAK case 35: YY_RULE_SETUP #line 159 "fe/idl.ll" return IDL_CUSTOM; - YY_BREAK + YY_BREAK case 36: YY_RULE_SETUP #line 160 "fe/idl.ll" return IDL_FACTORY; - YY_BREAK + YY_BREAK case 37: YY_RULE_SETUP #line 161 "fe/idl.ll" return IDL_PRIVATE; - YY_BREAK + YY_BREAK case 38: YY_RULE_SETUP #line 162 "fe/idl.ll" return IDL_PUBLIC; - YY_BREAK + YY_BREAK case 39: YY_RULE_SETUP #line 163 "fe/idl.ll" return IDL_SUPPORTS; - YY_BREAK + YY_BREAK case 40: YY_RULE_SETUP #line 164 "fe/idl.ll" return IDL_TRUNCATABLE; - YY_BREAK + YY_BREAK case 41: YY_RULE_SETUP #line 165 "fe/idl.ll" return IDL_VALUETYPE; - YY_BREAK + YY_BREAK case 42: YY_RULE_SETUP #line 167 "fe/idl.ll" return IDL_COMPONENT; - YY_BREAK + YY_BREAK case 43: YY_RULE_SETUP #line 168 "fe/idl.ll" return IDL_CONSUMES; - YY_BREAK + YY_BREAK case 44: YY_RULE_SETUP #line 169 "fe/idl.ll" return IDL_EMITS; - YY_BREAK + YY_BREAK case 45: YY_RULE_SETUP #line 170 "fe/idl.ll" return IDL_EVENTTYPE; - YY_BREAK + YY_BREAK case 46: YY_RULE_SETUP #line 171 "fe/idl.ll" return IDL_FINDER; - YY_BREAK + YY_BREAK case 47: YY_RULE_SETUP #line 172 "fe/idl.ll" return IDL_GETRAISES; - YY_BREAK + YY_BREAK case 48: YY_RULE_SETUP #line 173 "fe/idl.ll" return IDL_HOME; - YY_BREAK + YY_BREAK case 49: YY_RULE_SETUP #line 174 "fe/idl.ll" return IDL_IMPORT; - YY_BREAK + YY_BREAK case 50: YY_RULE_SETUP #line 175 "fe/idl.ll" return IDL_MULTIPLE; - YY_BREAK + YY_BREAK case 51: YY_RULE_SETUP #line 176 "fe/idl.ll" return IDL_PRIMARYKEY; - YY_BREAK + YY_BREAK case 52: YY_RULE_SETUP #line 177 "fe/idl.ll" return IDL_PROVIDES; - YY_BREAK + YY_BREAK case 53: YY_RULE_SETUP #line 178 "fe/idl.ll" return IDL_PUBLISHES; - YY_BREAK + YY_BREAK case 54: YY_RULE_SETUP #line 179 "fe/idl.ll" return IDL_SETRAISES; - YY_BREAK + YY_BREAK case 55: YY_RULE_SETUP #line 180 "fe/idl.ll" return IDL_TYPEID; - YY_BREAK + YY_BREAK case 56: YY_RULE_SETUP #line 181 "fe/idl.ll" return IDL_TYPEPREFIX; - YY_BREAK + YY_BREAK case 57: YY_RULE_SETUP #line 182 "fe/idl.ll" return IDL_USES; - YY_BREAK + YY_BREAK case 58: YY_RULE_SETUP #line 183 "fe/idl.ll" return IDL_MANAGES; - YY_BREAK + YY_BREAK case 59: YY_RULE_SETUP #line 185 "fe/idl.ll" return IDL_TYPENAME; - YY_BREAK + YY_BREAK case 60: YY_RULE_SETUP #line 186 "fe/idl.ll" return IDL_PORT; - YY_BREAK + YY_BREAK case 61: YY_RULE_SETUP #line 187 "fe/idl.ll" return IDL_MIRRORPORT; - YY_BREAK + YY_BREAK case 62: YY_RULE_SETUP #line 188 "fe/idl.ll" return IDL_PORTTYPE; - YY_BREAK + YY_BREAK case 63: YY_RULE_SETUP #line 189 "fe/idl.ll" return IDL_CONNECTOR; - YY_BREAK + YY_BREAK case 64: YY_RULE_SETUP #line 190 "fe/idl.ll" return IDL_ALIAS; - YY_BREAK + YY_BREAK case 65: YY_RULE_SETUP #line 192 "fe/idl.ll" return IDL_TRUETOK; - YY_BREAK + YY_BREAK case 66: YY_RULE_SETUP #line 193 "fe/idl.ll" return IDL_FALSETOK; - YY_BREAK + YY_BREAK case 67: YY_RULE_SETUP #line 195 "fe/idl.ll" return IDL_INOUT; - YY_BREAK + YY_BREAK case 68: YY_RULE_SETUP #line 196 "fe/idl.ll" return IDL_IN; - YY_BREAK + YY_BREAK case 69: YY_RULE_SETUP #line 197 "fe/idl.ll" return IDL_OUT; - YY_BREAK + YY_BREAK case 70: YY_RULE_SETUP #line 198 "fe/idl.ll" return IDL_ONEWAY; - YY_BREAK + YY_BREAK case 71: YY_RULE_SETUP #line 200 "fe/idl.ll" return IDL_LEFT_SHIFT; - YY_BREAK + YY_BREAK case 72: YY_RULE_SETUP #line 201 "fe/idl.ll" return IDL_RIGHT_SHIFT; - YY_BREAK + YY_BREAK case 73: YY_RULE_SETUP #line 202 "fe/idl.ll" @@ -1706,7 +1932,7 @@ YY_RULE_SETUP tao_yylval.strval = ACE::strnew ("::"); return IDL_SCOPE_DELIMITOR; } - YY_BREAK + YY_BREAK case 74: YY_RULE_SETUP #line 207 "fe/idl.ll" @@ -1742,7 +1968,7 @@ YY_RULE_SETUP return IDENTIFIER; } - YY_BREAK + YY_BREAK case 75: YY_RULE_SETUP #line 240 "fe/idl.ll" @@ -1750,7 +1976,7 @@ YY_RULE_SETUP tao_yylval.dval = idl_atof (ace_yytext); return IDL_FLOATING_PT_LITERAL; } - YY_BREAK + YY_BREAK case 76: YY_RULE_SETUP #line 244 "fe/idl.ll" @@ -1758,7 +1984,7 @@ YY_RULE_SETUP tao_yylval.dval = idl_atof (ace_yytext); return IDL_FLOATING_PT_LITERAL; } - YY_BREAK + YY_BREAK case 77: YY_RULE_SETUP #line 249 "fe/idl.ll" @@ -1766,7 +1992,7 @@ YY_RULE_SETUP tao_yylval.fixval = ACE_CDR::Fixed::from_string (ace_yytext); return IDL_FIXED_PT_LITERAL; } - YY_BREAK + YY_BREAK case 78: YY_RULE_SETUP #line 254 "fe/idl.ll" @@ -1774,7 +2000,7 @@ YY_RULE_SETUP tao_yylval.ival = idl_atoi (ace_yytext, 10); return IDL_INTEGER_LITERAL; } - YY_BREAK + YY_BREAK case 79: YY_RULE_SETUP #line 258 "fe/idl.ll" @@ -1782,7 +2008,7 @@ YY_RULE_SETUP tao_yylval.uival = idl_atoui (ace_yytext, 10); return IDL_UINTEGER_LITERAL; } - YY_BREAK + YY_BREAK case 80: YY_RULE_SETUP #line 262 "fe/idl.ll" @@ -1790,7 +2016,7 @@ YY_RULE_SETUP tao_yylval.ival = idl_atoi (ace_yytext, 16); return IDL_INTEGER_LITERAL; } - YY_BREAK + YY_BREAK case 81: YY_RULE_SETUP #line 266 "fe/idl.ll" @@ -1798,7 +2024,7 @@ YY_RULE_SETUP tao_yylval.uival = idl_atoui (ace_yytext, 16); return IDL_UINTEGER_LITERAL; } - YY_BREAK + YY_BREAK case 82: YY_RULE_SETUP #line 270 "fe/idl.ll" @@ -1806,7 +2032,7 @@ YY_RULE_SETUP tao_yylval.ival = idl_atoi (ace_yytext, 8); return IDL_INTEGER_LITERAL; } - YY_BREAK + YY_BREAK case 83: YY_RULE_SETUP #line 274 "fe/idl.ll" @@ -1814,7 +2040,7 @@ YY_RULE_SETUP tao_yylval.uival = idl_atoui (ace_yytext, 8); return IDL_UINTEGER_LITERAL; } - YY_BREAK + YY_BREAK case 84: /* rule 84 can match eol */ YY_RULE_SETUP @@ -1839,7 +2065,7 @@ YY_RULE_SETUP IDL_STRING_LITERAL); return IDL_STRING_LITERAL; } - YY_BREAK + YY_BREAK case 85: /* rule 85 can match eol */ YY_RULE_SETUP @@ -1862,7 +2088,7 @@ YY_RULE_SETUP tao_yylval.wsval = idl_wstring_escape_reader (tmp + 2); return IDL_WSTRING_LITERAL; } - YY_BREAK + YY_BREAK case 86: YY_RULE_SETUP #line 317 "fe/idl.ll" @@ -1870,7 +2096,7 @@ YY_RULE_SETUP tao_yylval.cval = ace_yytext[1]; return IDL_CHARACTER_LITERAL; } - YY_BREAK + YY_BREAK case 87: YY_RULE_SETUP #line 321 "fe/idl.ll" @@ -1879,7 +2105,7 @@ YY_RULE_SETUP tao_yylval.cval = idl_escape_reader (ace_yytext + 1); return IDL_CHARACTER_LITERAL; } - YY_BREAK + YY_BREAK case 88: YY_RULE_SETUP #line 326 "fe/idl.ll" @@ -1888,7 +2114,7 @@ YY_RULE_SETUP tao_yylval.cval = idl_escape_reader (ace_yytext + 1); return IDL_CHARACTER_LITERAL; } - YY_BREAK + YY_BREAK case 89: YY_RULE_SETUP #line 331 "fe/idl.ll" @@ -1896,7 +2122,7 @@ YY_RULE_SETUP tao_yylval.cval = idl_escape_reader (ace_yytext + 1); return IDL_CHARACTER_LITERAL; } - YY_BREAK + YY_BREAK case 90: YY_RULE_SETUP #line 335 "fe/idl.ll" @@ -1905,7 +2131,7 @@ YY_RULE_SETUP tao_yylval.wcval = ace_yytext[2]; return IDL_WCHAR_LITERAL; } - YY_BREAK + YY_BREAK case 91: YY_RULE_SETUP #line 340 "fe/idl.ll" @@ -1914,7 +2140,7 @@ YY_RULE_SETUP tao_yylval.wcval = idl_wchar_escape_reader (ace_yytext + 2); return IDL_WCHAR_LITERAL; } - YY_BREAK + YY_BREAK case 92: /* rule 92 can match eol */ #line 346 "fe/idl.ll" @@ -1927,7 +2153,7 @@ YY_RULE_SETUP idl_store_pragma (ace_yytext); break; } - YY_BREAK + YY_BREAK case 94: /* rule 94 can match eol */ #line 352 "fe/idl.ll" @@ -1939,7 +2165,7 @@ YY_RULE_SETUP idl_global->set_lineno(idl_global->lineno () + 1); break; } - YY_BREAK + YY_BREAK case 96: /* rule 96 can match eol */ #line 357 "fe/idl.ll" @@ -1951,7 +2177,7 @@ YY_RULE_SETUP idl_parse_line_and_file (ace_yytext); break; } - YY_BREAK + YY_BREAK case 98: /* rule 98 can match eol */ #line 362 "fe/idl.ll" @@ -1963,7 +2189,7 @@ YY_RULE_SETUP idl_parse_line_and_file (ace_yytext); break; } - YY_BREAK + YY_BREAK case 100: /* rule 100 can match eol */ #line 367 "fe/idl.ll" @@ -1975,7 +2201,7 @@ YY_RULE_SETUP idl_parse_line_and_file (ace_yytext); break; } - YY_BREAK + YY_BREAK case 102: /* rule 102 can match eol */ #line 372 "fe/idl.ll" @@ -1987,7 +2213,7 @@ YY_RULE_SETUP idl_parse_line_and_file (ace_yytext); break; } - YY_BREAK + YY_BREAK case 104: /* rule 104 can match eol */ #line 377 "fe/idl.ll" @@ -2000,7 +2226,7 @@ YY_RULE_SETUP idl_global->set_lineno (idl_global->lineno () + 1); break; } - YY_BREAK + YY_BREAK case 106: /* rule 106 can match eol */ YY_RULE_SETUP @@ -2010,7 +2236,7 @@ YY_RULE_SETUP idl_global->set_lineno(idl_global->lineno () + 1); break; } - YY_BREAK + YY_BREAK case 107: YY_RULE_SETUP #line 387 "fe/idl.ll" @@ -2033,12 +2259,12 @@ YY_RULE_SETUP } break; } - YY_BREAK + YY_BREAK case 108: YY_RULE_SETUP #line 406 "fe/idl.ll" break; - YY_BREAK + YY_BREAK case 109: /* rule 109 can match eol */ YY_RULE_SETUP @@ -2047,385 +2273,394 @@ YY_RULE_SETUP idl_global->set_lineno (idl_global->lineno () + 1); break; } - YY_BREAK + YY_BREAK case 110: YY_RULE_SETUP #line 411 "fe/idl.ll" return ace_yytext[0]; - YY_BREAK + YY_BREAK case 111: YY_RULE_SETUP #line 413 "fe/idl.ll" ECHO; - YY_BREAK -#line 2065 "fe/idl.yy.cpp" + YY_BREAK +#line 2289 "fe/idl.yy.cpp" case YY_STATE_EOF(INITIAL): - yyterminate(); + yyterminate(); + + case YY_END_OF_BUFFER: + { + /* Amount of text matched not including the EOB char. */ + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; - case YY_END_OF_BUFFER: + /* Undo the effects of YY_DO_BEFORE_ACTION. */ + *yy_cp = (yy_hold_char); + YY_RESTORE_YY_MORE_OFFSET + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) + { + /* We're scanning a new file or input source. It's + * possible that this happened because the user + * just pointed yyin at a new source and called + * yylex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our + * globals. Here is the right place to do so, because + * this is the first action (other than possibly a + * back-up) that will match for the new input source. + */ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + } + + /* Note that here we test for yy_c_buf_p "<=" to the position + * of the first EOB in the buffer, since yy_c_buf_p will + * already have been incremented past the NUL character + * (since all states make transitions on EOB to the + * end-of-buffer state). Contrast this with the test + * in input(). + */ + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + { /* This was really a NUL. */ + yy_state_type yy_next_state; + + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( ); + + /* Okay, we're now positioned to make the NUL + * transition. We couldn't have + * yy_get_previous_state() go ahead and do it + * for us because it doesn't know how to deal + * with the possibility of jamming (and we don't + * want to build jamming into it because then it + * will run more slowly). + */ + + yy_next_state = yy_try_NUL_trans( yy_current_state ); + + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + + if ( yy_next_state ) { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; + /* Consume the NUL. */ + yy_cp = ++(yy_c_buf_p); + yy_current_state = yy_next_state; + goto yy_match; + } - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = (yy_hold_char); - YY_RESTORE_YY_MORE_OFFSET + else + { + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); + goto yy_find_action; + } + } - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed tao_yyin at a new source and called - * tao_yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = tao_yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } + else switch ( yy_get_next_buffer( ) ) + { + case EOB_ACT_END_OF_FILE: + { + (yy_did_buffer_switch_on_eof) = 0; - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state ); - - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++(yy_c_buf_p); - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - goto yy_find_action; - } - } + if ( yywrap( ) ) + { + /* Note: because we've taken care in + * yy_get_next_buffer() to have set up + * yytext, we can now set up + * yy_c_buf_p so that if some total + * hoser (like flex itself) wants to + * call the scanner after we return the + * YY_NULL, it'll still work - another + * YY_NULL will get returned. + */ + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; + + yy_act = YY_STATE_EOF(YY_START); + goto do_action; + } - else switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_END_OF_FILE: - { - (yy_did_buffer_switch_on_eof) = 0; - - if ( tao_yywrap( ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * tao_yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = - (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - (yy_c_buf_p) = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_find_action; - } + else + { + if ( ! (yy_did_buffer_switch_on_eof) ) + YY_NEW_FILE; + } break; } - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ -} /* end of tao_yylex */ + case EOB_ACT_CONTINUE_SCAN: + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( ); + + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + goto yy_match; + + case EOB_ACT_LAST_MATCH: + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; + + yy_current_state = yy_get_previous_state( ); + + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + goto yy_find_action; + } + break; + } + + default: + YY_FATAL_ERROR( + "fatal flex scanner internal error--no action found" ); + } /* end of action switch */ + } /* end of scanning one token */ + } /* end of user's declarations */ +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file + * EOB_ACT_LAST_MATCH - + * EOB_ACT_CONTINUE_SCAN - continue scanning from current position + * EOB_ACT_END_OF_FILE - end of file */ static int yy_get_next_buffer (void) { char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - char *source = (yytext_ptr); - int number_to_move, i; - int ret_val; + char *source = (yytext_ptr); + int number_to_move, i; + int ret_val; - if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) + YY_FATAL_ERROR( + "fatal flex scanner internal error--end of buffer missed" ); - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) + { /* Don't try to fill the buffer, so this is an EOF. */ + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) + { + /* We matched a single character, the EOB, so + * treat this as a final EOF. + */ + return EOB_ACT_END_OF_FILE; + } - /* Try to read more data. */ + else + { + /* We matched some text prior to the EOB, first + * process it. + */ + return EOB_ACT_LAST_MATCH; + } + } - /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + /* Try to read more data. */ - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); + /* First move last chars to start of buffer. */ + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; + for ( i = 0; i < number_to_move; ++i ) + *(dest++) = *(source++); - else - { - int num_to_read = (int) - (YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1); + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + /* don't do the read, it's not guaranteed to return an EOF, + * just force an EOF + */ + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ + else + { + int num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + while ( num_to_read <= 0 ) + { /* Not enough room in the buffer - grow it. */ - int yy_c_buf_p_offset = - (int) ((yy_c_buf_p) - b->yy_ch_buf); + /* just a shorter name for the current buffer */ + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; - if ( b->yy_is_our_buffer ) - { - int new_size = (int)(b->yy_buf_size * 2); + int yy_c_buf_p_offset = + (int) ((yy_c_buf_p) - b->yy_ch_buf); - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; + if ( b->yy_is_our_buffer ) + { + int new_size = b->yy_buf_size * 2; - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - tao_yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + if ( new_size <= 0 ) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; - (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( + "fatal error - scanner input buffer overflow" ); - num_to_read = (int)(YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1); + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - } + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + number_to_move - 1; - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; + } - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), (size_t) num_to_read ); + if ( num_to_read > YY_READ_BUF_SIZE ) + num_to_read = YY_READ_BUF_SIZE; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } + /* Read in more data. */ + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), num_to_read ); - if ( (yy_n_chars) == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - tao_yyrestart(tao_yyin ); - } + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } + if ( (yy_n_chars) == 0 ) + { + if ( number_to_move == YY_MORE_ADJ ) + { + ret_val = EOB_ACT_END_OF_FILE; + yyrestart( yyin ); + } else - ret_val = EOB_ACT_CONTINUE_SCAN; - - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { - /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) tao_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + { + ret_val = EOB_ACT_LAST_MATCH; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = + YY_BUFFER_EOF_PENDING; + } } - (yy_n_chars) += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; + else + ret_val = EOB_ACT_CONTINUE_SCAN; + + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); + } + + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - return ret_val; + return ret_val; } /* yy_get_previous_state - get the state just before the EOB char was reached */ static yy_state_type yy_get_previous_state (void) { - yy_state_type yy_current_state; - char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; - yy_current_state = (yy_start); - yy_current_state += YY_AT_BOL(); + yy_current_state = (yy_start); + yy_current_state += YY_AT_BOL(); - for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) - { - YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 593 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - } + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) + { + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 593 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + } - return yy_current_state; + return yy_current_state; } /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis - * next_state = yy_try_NUL_trans( current_state ); + * next_state = yy_try_NUL_trans( current_state ); */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - int yy_is_jam; + int yy_is_jam; char *yy_cp = (yy_c_buf_p); - YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 593 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 592); + YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 593 ) + yy_c = yy_meta[yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + yy_is_jam = (yy_current_state == 592); return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + static void yyunput (int c, char * yy_bp ) { char *yy_cp; yy_cp = (yy_c_buf_p); - /* undo effects of setting up tao_yytext */ - *yy_cp = (yy_hold_char); + /* undo effects of setting up yytext */ + *yy_cp = (yy_hold_char); + + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ + int number_to_move = (yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; + char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + *--dest = *--source; + + yy_cp += (int) (dest - source); + yy_bp += (int) (dest - source); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + (yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size; if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) - { /* need to shift things up to make room */ - /* +2 for EOB chars. */ - int number_to_move = (yy_n_chars) + 2; - char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - char *source = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - - while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - *--dest = *--source; - - yy_cp += (int) (dest - source); - yy_bp += (int) (dest - source); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = static_cast<int> (YY_CURRENT_BUFFER_LVALUE->yy_buf_size); - - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) - YY_FATAL_ERROR( "flex scanner push-back overflow" ); - } + YY_FATAL_ERROR( "flex scanner push-back overflow" ); + } - *--yy_cp = (char) c; + *--yy_cp = (char) c; - (yytext_ptr) = yy_bp; - (yy_hold_char) = *yy_cp; - (yy_c_buf_p) = yy_cp; + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; } +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -2434,133 +2669,133 @@ static int yy_get_next_buffer (void) #endif { - int c; + int c; - *(yy_c_buf_p) = (yy_hold_char); + *(yy_c_buf_p) = (yy_hold_char); - if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) + { + /* yy_c_buf_p now points to the character we want to return. + * If this occurs *before* the EOB characters, then it's a + * valid NUL; if not, then we've hit the end of the buffer. + */ + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + /* This was really a NUL. */ + *(yy_c_buf_p) = '\0'; + + else + { /* need more input */ + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); + ++(yy_c_buf_p); + + switch ( yy_get_next_buffer( ) ) { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - /* This was really a NUL. */ - *(yy_c_buf_p) = '\0'; + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + yyrestart( yyin ); + + /*FALLTHROUGH*/ + + case EOB_ACT_END_OF_FILE: + { + if ( yywrap( ) ) + return 0; - else - { /* need more input */ - int offset = static_cast<int> ((yy_c_buf_p) - (yytext_ptr)); - ++(yy_c_buf_p); - - switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - tao_yyrestart(tao_yyin ); - - /*FALLTHROUGH*/ - - case EOB_ACT_END_OF_FILE: - { - if ( tao_yywrap( ) ) - return EOF; - - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; + if ( ! (yy_did_buffer_switch_on_eof) ) + YY_NEW_FILE; #ifdef __cplusplus - return yyinput(); + return yyinput(); #else - return input(); + return input(); #endif - } + } - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = (yytext_ptr) + offset; - break; - } - } + case EOB_ACT_CONTINUE_SCAN: + (yy_c_buf_p) = (yytext_ptr) + offset; + break; } + } + } - c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ - *(yy_c_buf_p) = '\0'; /* preserve tao_yytext */ - (yy_hold_char) = *++(yy_c_buf_p); + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve yytext */ + (yy_hold_char) = *++(yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n'); + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n'); - return c; + return c; } -#endif /* ifndef YY_NO_INPUT */ +#endif /* ifndef YY_NO_INPUT */ /** Immediately switch to a different input stream. * @param input_file A readable stream. * * @note This function does not reset the start condition to @c INITIAL . */ - void tao_yyrestart (FILE * input_file ) + void yyrestart (FILE * input_file ) { - if ( ! YY_CURRENT_BUFFER ){ - tao_yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - tao_yy_create_buffer(tao_yyin,YY_BUF_SIZE ); - } + if ( ! YY_CURRENT_BUFFER ){ + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer( yyin, YY_BUF_SIZE ); + } - tao_yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - tao_yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. * @param new_buffer The new input buffer. * */ - void tao_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) { - /* TODO. We should be able to replace this entire function body - * with - * tao_yypop_buffer_state(); - * tao_yypush_buffer_state(new_buffer); + /* TODO. We should be able to replace this entire function body + * with + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); */ - tao_yyensure_buffer_stack (); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; + yyensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) + return; - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } - YY_CURRENT_BUFFER_LVALUE = new_buffer; - tao_yy_load_buffer_state( ); + YY_CURRENT_BUFFER_LVALUE = new_buffer; + yy_load_buffer_state( ); - /* We don't actually know whether we did this switch during - * EOF (tao_yywrap()) processing, but the only time this flag - * is looked at is after tao_yywrap() is called, so it's safe - * to go ahead and always set it. - */ - (yy_did_buffer_switch_on_eof) = 1; + /* We don't actually know whether we did this switch during + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe + * to go ahead and always set it. + */ + (yy_did_buffer_switch_on_eof) = 1; } -static void tao_yy_load_buffer_state (void) +static void yy_load_buffer_state (void) { - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - tao_yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - (yy_hold_char) = *(yy_c_buf_p); + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); } /** Allocate and initialize an input buffer state. @@ -2569,65 +2804,65 @@ static void tao_yy_load_buffer_state (void) * * @return the allocated buffer state. */ - YY_BUFFER_STATE tao_yy_create_buffer (FILE * file, int size ) + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) { - YY_BUFFER_STATE b; + YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) tao_yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = size; + b->yy_buf_size = size; - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) tao_yyalloc(b->yy_buf_size + 2 ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" ); + /* yy_ch_buf has to be 2 characters longer than the size given because + * we need to put in 2 end-of-buffer characters. + */ + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_is_our_buffer = 1; + b->yy_is_our_buffer = 1; - tao_yy_init_buffer(b,file ); + yy_init_buffer( b, file ); - return b; + return b; } /** Destroy the buffer. - * @param b a buffer created with tao_yy_create_buffer() + * @param b a buffer created with yy_create_buffer() * */ - void tao_yy_delete_buffer (YY_BUFFER_STATE b ) + void yy_delete_buffer (YY_BUFFER_STATE b ) { - if ( ! b ) - return; + if ( ! b ) + return; - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - if ( b->yy_is_our_buffer ) - tao_yyfree((void *) b->yy_ch_buf ); + if ( b->yy_is_our_buffer ) + yyfree( (void *) b->yy_ch_buf ); - tao_yyfree((void *) b ); + yyfree( (void *) b ); } /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, - * such as during a tao_yyrestart() or at EOF. + * such as during a yyrestart() or at EOF. */ - static void tao_yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) { - int oerrno = errno; + int oerrno = errno; - tao_yy_flush_buffer(b ); + yy_flush_buffer( b ); - b->yy_input_file = file; - b->yy_fill_buffer = 1; + b->yy_input_file = file; + b->yy_fill_buffer = 1; - /* If b is the current buffer, then tao_yy_init_buffer was _probably_ - * called from tao_yyrestart() or through yy_get_next_buffer. + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. * In that case, we don't want to reset the lineno or column. */ if (b != YY_CURRENT_BUFFER){ @@ -2637,34 +2872,34 @@ static void tao_yy_load_buffer_state (void) b->yy_is_interactive = 0; - errno = oerrno; + errno = oerrno; } /** Discard all buffered characters. On the next scan, YY_INPUT will be called. * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. * */ - void tao_yy_flush_buffer (YY_BUFFER_STATE b ) + void yy_flush_buffer (YY_BUFFER_STATE b ) { - if ( ! b ) - return; + if ( ! b ) + return; - b->yy_n_chars = 0; + b->yy_n_chars = 0; - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; + /* We always need two end-of-buffer characters. The first causes + * a transition to the end-of-buffer state. The second causes + * a jam in that state. + */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; + b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - b->yy_buf_pos = &b->yy_ch_buf[0]; + b->yy_buf_pos = &b->yy_ch_buf[0]; - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == YY_CURRENT_BUFFER ) - tao_yy_load_buffer_state( ); + if ( b == YY_CURRENT_BUFFER ) + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -2673,96 +2908,96 @@ static void tao_yy_load_buffer_state (void) * @param new_buffer The new state. * */ -void tao_yypush_buffer_state (YY_BUFFER_STATE new_buffer ) +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) { - if (new_buffer == 0) - return; + if (new_buffer == 0) + return; - tao_yyensure_buffer_stack(); + yyensure_buffer_stack(); - /* This block is copied from tao_yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } + /* This block is copied from yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - (yy_buffer_stack_top)++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; - /* copied from tao_yy_switch_to_buffer. */ - tao_yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; } /** Removes and deletes the top of the stack, if present. * The next element becomes the new top. * */ -void tao_yypop_buffer_state (void) +void yypop_buffer_state (void) { - if (!YY_CURRENT_BUFFER) - return; + if (!YY_CURRENT_BUFFER) + return; - tao_yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = 0; - if ((yy_buffer_stack_top) > 0) - --(yy_buffer_stack_top); + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = 0; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); - if (YY_CURRENT_BUFFER) { - tao_yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; - } + if (YY_CURRENT_BUFFER) { + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; + } } /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void tao_yyensure_buffer_stack (void) +static void yyensure_buffer_stack (void) { - int num_to_alloc; + yy_size_t num_to_alloc; - if (!(yy_buffer_stack)) { + if (!(yy_buffer_stack)) { - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. */ - num_to_alloc = 1; - (yy_buffer_stack) = (struct yy_buffer_state**)tao_yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in tao_yyensure_buffer_stack()" ); - - memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - (yy_buffer_stack_max) = num_to_alloc; - (yy_buffer_stack_top) = 0; - return; - } + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ + (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; + } - if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + /* Increase the buffer to prepare for a possible push. */ + yy_size_t grow_size = 8 /* arbitrary grow size */; - num_to_alloc = static_cast<int> (yy_buffer_stack_max) + grow_size; - (yy_buffer_stack) = (struct yy_buffer_state**)tao_yyrealloc - ((yy_buffer_stack), - num_to_alloc * sizeof(struct yy_buffer_state*) - ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in tao_yyensure_buffer_stack()" ); + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - /* zero only the new slots.*/ - memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); - (yy_buffer_stack_max) = num_to_alloc; - } + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } } /** Setup the input buffer state to scan directly from a user-specified character buffer. @@ -2771,238 +3006,238 @@ static void tao_yyensure_buffer_stack (void) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE tao_yy_scan_buffer (char * base, yy_size_t size ) +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return 0; - - b = (YY_BUFFER_STATE) tao_yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_buffer()" ); - - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = 0; - b->yy_n_chars = static_cast<int> (b->yy_buf_size); - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - tao_yy_switch_to_buffer(b ); - - return b; + YY_BUFFER_STATE b; + + if ( size < 2 || + base[size-2] != YY_END_OF_BUFFER_CHAR || + base[size-1] != YY_END_OF_BUFFER_CHAR ) + /* They forgot to leave room for the EOB's. */ + return 0; + + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ + b->yy_buf_pos = b->yy_ch_buf = base; + b->yy_is_our_buffer = 0; + b->yy_input_file = 0; + b->yy_n_chars = b->yy_buf_size; + b->yy_is_interactive = 0; + b->yy_at_bol = 1; + b->yy_fill_buffer = 0; + b->yy_buffer_status = YY_BUFFER_NEW; + + yy_switch_to_buffer( b ); + + return b; } -/** Setup the input buffer state to scan a string. The next call to tao_yylex() will +/** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use - * tao_yy_scan_bytes() instead. + * yy_scan_bytes() instead. */ -YY_BUFFER_STATE tao_yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return tao_yy_scan_bytes(yystr, static_cast<int> (strlen(yystr)) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } -/** Setup the input buffer state to scan the given bytes. The next call to tao_yylex() will +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE tao_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - int i; + YY_BUFFER_STATE b; + char *buf; + yy_size_t n; + int i; - /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) tao_yyalloc(n ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_bytes()" ); + /* Get memory for full buffer, including space for trailing EOB's. */ + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); + if ( ! buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = tao_yy_scan_buffer(buf,n ); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in tao_yy_scan_bytes()" ); + b = yy_scan_buffer( buf, n ); + if ( ! b ) + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; - return b; + return b; } #ifndef YY_EXIT_FAILURE #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); + fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); } /* Redefine yyless() so it works in section 3 code. */ #undef yyless #define yyless(n) \ - do \ - { \ - /* Undo effects of setting up tao_yytext. */ \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ int yyless_macro_arg = (n); \ YY_LESS_LINENO(yyless_macro_arg);\ - tao_yytext[tao_yyleng] = (yy_hold_char); \ - (yy_c_buf_p) = tao_yytext + yyless_macro_arg; \ - (yy_hold_char) = *(yy_c_buf_p); \ - *(yy_c_buf_p) = '\0'; \ - tao_yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) + yytext[yyleng] = (yy_hold_char); \ + (yy_c_buf_p) = yytext + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + yyleng = yyless_macro_arg; \ + } \ + while ( 0 ) /* Accessor methods (get/set functions) to struct members. */ /** Get the current line number. * */ -int tao_yyget_lineno (void) +int yyget_lineno (void) { - return tao_yylineno; + return yylineno; } /** Get the input stream. * */ -FILE *tao_yyget_in (void) +FILE *yyget_in (void) { - return tao_yyin; + return yyin; } /** Get the output stream. * */ -FILE *tao_yyget_out (void) +FILE *yyget_out (void) { - return tao_yyout; + return yyout; } /** Get the length of the current token. * */ -int tao_yyget_leng (void) +int yyget_leng (void) { - return tao_yyleng; + return yyleng; } /** Get the current token. * */ -char *tao_yyget_text (void) +char *yyget_text (void) { - return tao_yytext; + return yytext; } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void tao_yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - tao_yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * - * @see tao_yy_switch_to_buffer + * @see yy_switch_to_buffer */ -void tao_yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - tao_yyin = in_str ; + yyin = _in_str ; } -void tao_yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - tao_yyout = out_str ; + yyout = _out_str ; } -int tao_yyget_debug (void) +int yyget_debug (void) { - return tao_yy_flex_debug; + return yy_flex_debug; } -void tao_yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - tao_yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) { /* Initialization is the same as for the non-reentrant scanner. - * This function is called from tao_yylex_destroy(), so don't allocate here. + * This function is called from yylex_destroy(), so don't allocate here. */ (yy_buffer_stack) = 0; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = 0; (yy_init) = 0; (yy_start) = 0; /* Defined in main.c */ #ifdef YY_STDINIT - tao_yyin = stdin; - tao_yyout = stdout; + yyin = stdin; + yyout = stdout; #else - tao_yyin = (FILE *) 0; - tao_yyout = (FILE *) 0; + yyin = 0; + yyout = 0; #endif /* For future reference: Set errno on error, since we are called by - * tao_yylex_init() + * yylex_init() */ return 0; } -/* tao_yylex_destroy is for both reentrant and non-reentrant scanners. */ -int tao_yylex_destroy (void) +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (void) { /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - tao_yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = 0; - tao_yypop_buffer_state(); - } + while(YY_CURRENT_BUFFER){ + yy_delete_buffer( YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = 0; + yypop_buffer_state(); + } - /* Destroy the stack itself. */ - tao_yyfree((yy_buffer_stack) ); - (yy_buffer_stack) = 0; + /* Destroy the stack itself. */ + yyfree((yy_buffer_stack) ); + (yy_buffer_stack) = 0; /* Reset the globals. This is important in a non-reentrant scanner so the next time - * tao_yylex() is called, initialization will occur. */ + * yylex() is called, initialization will occur. */ yy_init_globals( ); return 0; @@ -3013,52 +3248,53 @@ int tao_yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; + + int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { - int n; - for ( n = 0; s[n]; ++n ) - ; + int n; + for ( n = 0; s[n]; ++n ) + ; - return n; + return n; } #endif -void *tao_yyalloc (yy_size_t size ) +void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } -void *tao_yyrealloc (void * ptr, yy_size_t size ) +void *yyrealloc (void * ptr, yy_size_t size ) { - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); + + /* The cast to (char *) in the following accommodates both + * implementations that use char* generic pointers, and those + * that use void* generic pointers. It works with the latter + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return realloc(ptr, size); } -void tao_yyfree (void * ptr ) +void yyfree (void * ptr ) { - free( (char *) ptr ); /* see tao_yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" #line 413 "fe/idl.ll" - /* subroutines */ static bool diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc index fac0aa7b49b..8feb6d337b2 100644 --- a/TAO/TAO_IDL/tao_idl_fe.mpc +++ b/TAO/TAO_IDL/tao_idl_fe.mpc @@ -25,10 +25,10 @@ project(TAO_IDL_GEN) { "ifeq ($(notdir $(LEX)), flex)" " $(LEX) -t -P tao_yy -ofe/idl.yy.cpp fe/idl.ll | \\" " sed -e 's/ NULL/ 0/g' \\" - " -e 's/ / /g' \\" + " -e 's/ / /g' \\" " -e 's/ *$$\/\/g' \\" " -e 's/YY_BREAK break;/YY_BREAK ACE_NOTREACHED (break;)/g' \\" - " -e 's/fread\([^\)]*\)/static_cast<int> (&)/g' \\" + " -e 's@#include <errno\.h>@#include \"ace/OS_NS_errno.h\"@' \\" " -e 's@#include <stdio\.h>@#include \"ace/OS_NS_stdio.h\"@' \\" " -e 's@#include <unistd\.h>@#include \"ace/os_include/os_ctype.h\"@' \\" " -e 's@c = getc@c = ACE_OS::getc@' \\" @@ -36,7 +36,7 @@ project(TAO_IDL_GEN) { " -e '/#include <[seu]/d' \\" " > fe/idl.yy.cpp" "else" - " @echo 'ERROR: You must use flex 2.5.35 or higher to process this file'" + " @echo 'ERROR: You must use flex 2.6.4 or higher to process this file'" " @/bin/false" "endif" diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index 6a909093d90..f8b25ec0f32 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -1215,8 +1215,14 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, const bool global_scope_name = work->is_global_name (name); if (global_scope_name) { + // No tail, exit directly + UTL_List* tail = e->tail (); + if (!tail) + { + return 0; + } // Remove the preceeding "::" or "" from the scopename - e = static_cast<UTL_ScopedName *> (e->tail ()); + e = static_cast<UTL_ScopedName *> (tail); name = e->head (); // Move directly to the root scope diff --git a/TAO/VERSION b/TAO/VERSION index b1072b15d50..f332d8a2106 100644 --- a/TAO/VERSION +++ b/TAO/VERSION @@ -1,4 +1,4 @@ -This is TAO version 2.4.6, released Fri Dec 08 08:48:59 CET 2017 +This is TAO version 2.5.2, released Tue Sep 18 09:25:49 CEST 2018 If you have any problems with or questions about TAO, please send e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu), diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst index fc10728010b..6e087048ee9 100644 --- a/TAO/bin/tao_orb_tests.lst +++ b/TAO/bin/tao_orb_tests.lst @@ -203,12 +203,12 @@ TAO/tests/Bug_3919_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI TAO/tests/Bug_3926_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS TAO/tests/Bug_3941_Regression/run_test.pl: !CORBA_E_MICRO TAO/tests/Bug_3942_Regression/run_test.pl: !FIXED_BUGS_ONLY -TAO/tests/Bug_3953_Regression/run_test.pl: !CORBA_E_MICRO +TAO/tests/Bug_3953_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Bug_3954_Regression/run_test.pl: TAO/tests/Bug_4010_Regression/run_test.pl: TAO/tests/Bug_4059_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Bug_4082_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Bug_4097_Regression/run_test.pl: !CORBA_E_MICRO +TAO/tests/Bug_4097_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRRO TAO/tests/DIOP/run_test.pl: !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO TAO/tests/DIOP/run_test_ipv6.pl: IPV6 !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST @@ -267,6 +267,9 @@ TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT ! TAO/tests/Connect_Strategy_Test/run_test.pl: # DISABLED TAO/tests/Client_Leaks/run_test.pl: !VxWorks !ST !Tru64 TAO/tests/Server_Leaks/run_test.pl: !ANDROID +TAO/tests/SHMIOP/run_test_collocated.pl: !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/SHMIOP/run_test.pl: !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/SHMIOP/run_test.pl with_collocated: !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Smart_Proxies/Policy/run_test.pl: TAO/tests/Smart_Proxies/run_test.pl: TAO/tests/Smart_Proxies/dtor/run_test.pl: diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index dbb65c31e9e..9cc7c20e94e 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -145,6 +145,7 @@ TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_ TAO/orbsvcs/tests/ImplRepo/manual_start/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO !OpenVMS TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl -servers 5 -objects 5: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl -clients 3 -secs_between_clients 0 -activationmode per_client: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO @@ -217,6 +218,7 @@ TAO/orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl: SSL !STATIC !DISABLE TAO/orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/Security/Big_Request/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl -ecdh: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/Security/Callback/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO diff --git a/TAO/docs/HISTORY b/TAO/docs/HISTORY index d97a8e35b2e..1aca43401f8 100644 --- a/TAO/docs/HISTORY +++ b/TAO/docs/HISTORY @@ -1,5 +1,3 @@ -@(#)HISTORY 1.1 95/09/13 - Mmmmmmmm DD, 1995 -- RELEASE 1.3: --------------------------------- Release 1.3 includes bugfixes, and support for the COM binary interface diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html index 44b3aed365a..eecd1c81cc5 100644 --- a/TAO/docs/ORBEndpoint.html +++ b/TAO/docs/ORBEndpoint.html @@ -29,7 +29,7 @@ <blockquote><CODE> protocol://V.v@addr1,...,W.w@addrN </CODE></blockquote> - where <CODE>V.v</CODE> and <CODE>W.w</CODE> are optional protcol + where <CODE>V.v</CODE> and <CODE>W.w</CODE> are optional protocol versions for each address. An example of an IIOP endpoint is: <blockquote><CODE> iiop://<I><EM>hostname</EM></I>:<I><EM>port</EM></I> @@ -488,7 +488,7 @@ <P> Options are separated from the addresses by a vertical bar - '<CODE>|</CODE>'. For instance, if an IIOP endpoint should have + '<CODE>|</CODE>'. For instance, if an UIOP endpoint should have a property foobar of 50 associated with it, then the following endpoint specification could be used <BLOCKQUOTE> @@ -638,11 +638,6 @@ SSLIOP pluggable protocol is used. <hr> - <address><a href="mailto:ossama@dre.vanderbilt.edu">Ossama Othman</a></address> -<!-- Created: Thu May 18 08:37:25 PDT 2000 --> -<!-- hhmts start --> -Last modified: Fri Jun 11 16:51:59 PDT 2004 -<!-- hhmts end --> </body> </html> diff --git a/TAO/docs/ORB_Internals.html b/TAO/docs/ORB_Internals.html index 2535e1e3314..74ec0e1e51c 100644 --- a/TAO/docs/ORB_Internals.html +++ b/TAO/docs/ORB_Internals.html @@ -17,8 +17,8 @@ </P> <P>New ORB developers are expected to read this document and document here all the things that they find hard to understand, - surprizing or event broken. - New members of the ORB core team are expected to fill in details + surprising or event broken. + New members of the ORB core team are expected to fill in details that were not explained before. </P> @@ -30,7 +30,7 @@ documented at this point. </P> - <P>Assume the application invokes a method on an object reference, + <P>Assume the application invokes a method on an object reference, in the generated stub for that method the following sequence is started: <UL> @@ -43,7 +43,7 @@ <UL> <LI>finds the profile to use for this invocation </LI> - <LI>passes the profile to Connector Registry to obtain + <LI>passes the profile to Connector Registry to obtain TAO_Transport object (wrapper around Service_Handler) </LI> <LI>generates and marshalls GIOP & Request headers for this @@ -51,12 +51,12 @@ </LI> </UL> </LI> - + <LI>marshalls request parameters </LI> <LI>calls invoke method on the invocation object </LI> - + <LI>TAO_GIOP_Twoway_Invocation::invoke: <UL> <LI>sets TAO_Reply_Dispatcher (this is used to make both @@ -79,9 +79,5 @@ <hr> <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address> -<!-- Created: Fri Sep 10 16:34:44 CDT 1999 --> -<!-- hhmts start --> -Last modified: Fri Sep 10 18:00:18 CDT 1999 -<!-- hhmts end --> </body> </html> diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html index 88f1d914e10..fe7b40b8814 100644 --- a/TAO/docs/Options.html +++ b/TAO/docs/Options.html @@ -667,7 +667,7 @@ is <code>0</code>. This option is disabled (<code>0</code>) by default.</td> <td><code>-ORBListenEndpoints</code> <em>endpoint</em></td> <td><a name="-ORBListenEndpoints"></a> This option was introduced with the CORBA <a - href="http://www.omg.org/docs/orbos/01-01-04.pdf">Object + href="https://www.omg.org/cgi-bin/doc?orbos/01-01-04">Object Reference Template</A> (ORT) specification. It instructs a server ORB to listen for requests on the interface specified by <code>endpoint</code>. When used with Real-time CORBA, the option diff --git a/TAO/docs/Security/SSLIOP-USAGE.html b/TAO/docs/Security/SSLIOP-USAGE.html index e70f1d2c697..24297ac067c 100644 --- a/TAO/docs/Security/SSLIOP-USAGE.html +++ b/TAO/docs/Security/SSLIOP-USAGE.html @@ -187,6 +187,10 @@ function MM_nbGroup(event, grpName) { //v3.0 <td><code>-SSLCheckHost</code></td> <td>Adds a verification of the peer address to the connection completion process. This feature requires OpenSSL 1.0.2 or newer and performs a reverse DNS lookup to find the originating hostname. If the version of ssl used does not support <code>X509_check_host()</code>, the peer address does not map to a cannonical host name, or the peer did not provide an X.509 certificate, the connection will fail. </td> </tr> + <tr> + <td><code>-SSLEcName</code> <em>curve_name</em></td> + <td>Provide the name of the Elliptic Curve to use for ECDH cipher. To see a list of the available curve names use the command <em>openssl ecparam -list_curves</em> </td> + </tr> </table> <h4>Environment variables</h4> diff --git a/TAO/docs/cec_options.html b/TAO/docs/cec_options.html index e91ac919a4e..1e5db2f4db5 100644 --- a/TAO/docs/cec_options.html +++ b/TAO/docs/cec_options.html @@ -452,13 +452,5 @@ static CEC_Factory "-CECDispatching reactive ....." <P><HR><P> Back to the TAO <A HREF="index.html">components documentation</A>. - - <!--#include virtual="/~schmidt/cgi-sig.html" --> - - <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address> -<!-- Created: Thu Jul 1 21:44:28 CDT 1999 --> -<!-- hhmts start --> -Last modified: Fri Apr 20 15:24:09 CDT 2001 -<!-- hhmts end --> </body> </html> diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index bd50cd5ba8b..cd98f422004 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -31,8 +31,8 @@ Developer's Guide</A>.<P> <h3>Optional CIAO Functionality</h3> For users of the <b>Component Integrated ACE ORB</b> -(<a href="http://www.cs.wustl.edu/~schmidt/CIAO.html"> CIAO</a>), it is -important to note that, in keeping with recent developements in +(<a href="http://www.dre.vanderbilt.edu/~schmidt/CIAO.html"> CIAO</a>), it is +important to note that, in keeping with recent developments in the OMG's Lightweight CORBA Component Model (<a href="http://www.omg.org/technology/documents/formal/components.htm"> LwCCM</a>) specification, CIAO's <i>Component Implementation Definition Language</i> (CIDL) compiler, @@ -70,15 +70,14 @@ these files:) <P> <LI> <B><EM>CIAO servant files</EM></B>, <EM>i.e.</EM>, <tt>*_svnt.h</tt>, and <tt>*_svnt.cpp</tt>. Optionally generated files, containing component and home servant implementations, as well as factory fuctions to create - components and homes. Formerly generated by the CIAO CIDL compiler. + components and homes. <LI> <B><EM>Executor IDL file</EM></B>, <EM>i.e.</EM>, <tt>*E.idl</tt>. IDL file containing local interfaces used for component and home - executors, optionally generated (formerly by the CIAO CIDL compiler). + executors, optionally generated. <LI> <B><EM>Executor implementation files</EM></B>, <EM>i.e.</EM>, <tt>*_exec.h</tt>, and <tt>*_exec.cpp</tt>. Optionally generated files containing executor implementation classes with empty function bodies for facet, supported and inherited operations, as well as factory functions to create component and home executors. - These files were formerly generated by the CIAO CIDL compiler. <LI> <B><EM>Connector implementation files</EM></B>, <EM>i.e.</EM>, <tt>*_conn.h</tt>, and <tt>*_conn.cpp</tt>. Optionally generated files containing connector implementation classes with complete function bodies. The function implementations are specialized @@ -222,7 +221,7 @@ described in the CORBA 3.0.3 specification. TAO_IDL can generate collocated stubs using two different collocation strategies. It also allows you to supress/enable the generation of the stubs of a particular strategy. To gain great flexibility at -run-time, you can gereate stubs for both collocation strategies +run-time, you can generate stubs for both collocation strategies (using both '<a href="#Gp"><code>-Gp</code></a>' and '<a href="#Gd"><code>-Gd</code></a>' flags at the same time) and defer the determination of collocation strategy until run-time. On the other @@ -1030,15 +1029,13 @@ also receives other options that are specific to it.<p> <td><tt>-Gsv</tt></td> <td>Generate CIAO servant code for component and home IDL declarations</td> - <td>Replaces code generation formerly done by the CIAO CIDL compiler.</td> </tr> <tr><a name="Gex"> <td><tt>-Gex</tt></td> <td>Generate CIAO executor implementation code for component and home IDL declarations</td> - <td>Replaces code generation formerly done by the CIAO CIDL compiler. This code generation - was optional, and triggered by the CIDLcompiler option <tt>--gen-exec-impl</tt>. + <td> These files have empty function bodies for all facet, suported and inherited operations, to be filled in by the developer.</td> </tr> @@ -1074,7 +1071,6 @@ also receives other options that are specific to it.<p> <td><tt>-Glem</tt></td> <td>Generate CIAO executor IDL for component and home IDL declarations</td> - <td>Replaces code generation formerly done by the CIAO CIDL compiler.</td> </tr> <tr><a name="Gsw"> diff --git a/TAO/docs/documentation.html b/TAO/docs/documentation.html index 39e70620173..38bfe9d57db 100644 --- a/TAO/docs/documentation.html +++ b/TAO/docs/documentation.html @@ -25,7 +25,7 @@ bgcolor="#ffffff"> <dt> <img alt="o" src="redball.gif"> <a HREF="http://www.theaceorb.com/product/index.html">OCI TAO Developer's Guide</a> </dt><P> - <dt> <img alt="o" src="redball.gif"> <a HREF="http://www.remedy.nl/opensource/corbapg.html">Remedy TAO Programmer's Guide</a> </dt><P> + <dt> <img alt="o" src="redball.gif"> <a HREF="https://www.remedy.nl/opensource/corbapg.html">Remedy IT CORBA Programmer's Guide</a> </dt><P> <dt> <img alt="o" src="redball.gif"> <a HREF="orbsvcs.html">Online ORB Services Documentation</a> </dt><P> diff --git a/TAO/docs/ec_options.html b/TAO/docs/ec_options.html index fbdfc703813..3b9430614b7 100644 --- a/TAO/docs/ec_options.html +++ b/TAO/docs/ec_options.html @@ -166,7 +166,7 @@ static EC_QueueFullSimpleActions "[wait | discard]" <p> The table below describes all of the options (and values) supported by - these factories. + these factories. <P>All the event service factory options start with <CODE>-EC</CODE></P> @@ -323,7 +323,7 @@ static EC_QueueFullSimpleActions "[wait | discard]" The user can disable this feature by selecting the <EM>null</EM> strategy; whereas the <EM>basic</EM> strategy provides a simple, yet - efficient implementation. <EM>reactive</EM> provides a + efficient implementation. <EM>reactive</EM> provides a strategy in which an observer that is unreachable is removed from the observer list. <BR><B>NOTE:<B> The default is to have the feature disabled. @@ -404,8 +404,8 @@ static EC_QueueFullSimpleActions "[wait | discard]" <EM>period</EM> </TD> <TD>Set the period (in microseconds) used by the reactive - consumer control policy (set <EM>ECConsumerControl</EM> to - <EM>reactive</EM>) to poll the state of the consumers. + consumer control policy (set <EM>ECConsumerControl</EM> to + <EM>reactive</EM>) to poll the state of the consumers. When set to 0 there is no polling but the reactive strategy is in place. </TD> @@ -417,7 +417,7 @@ static EC_QueueFullSimpleActions "[wait | discard]" <EM>period</EM> </TD> <TD>Set the period (in microseconds) used by the reactive - supplier control policy (set <EM>ECSupplierControl</EM> to + supplier control policy (set <EM>ECSupplierControl</EM> to <EM>reactive</EM>) to poll the state of the suppliers. When set to 0 there is no polling but the reactive strategy is in place. @@ -430,7 +430,7 @@ static EC_QueueFullSimpleActions "[wait | discard]" <EM>timeout</EM> </TD> <TD>Set the timeout period (in microseconds) used by the reactive - consumer control policy (set <EM>ECConsumerControl</EM> to + consumer control policy (set <EM>ECConsumerControl</EM> to <EM>reactive</EM>) to detect a timeout when polling the state of the consumers. </TD> @@ -442,13 +442,13 @@ static EC_QueueFullSimpleActions "[wait | discard]" <EM>timeout</EM> </TD> <TD>Set the timeout period (in microseconds) used by the reactive - supplier control policy (set <EM>ECSupplierControl</EM> to - <EM>reactive</EM>) to detect a timeout when polling the state + supplier control policy (set <EM>ECSupplierControl</EM> to + <EM>reactive</EM>) to detect a timeout when polling the state of the suppliers. </TD> </TR> - <!-- <TR NAME="ECProxyPushConsumerCollection"> --> + <!-- <TR NAME="ECProxyPushConsumerCollection"> --> <TR> <TD><CODE>-ECProxyPushConsumerCollection</CODE> <EM>flag[:flags]</EM> @@ -546,47 +546,22 @@ static EC_QueueFullSimpleActions "[wait | discard]" </TD> </TR> - <!-- <TR NAME="ECPushSupplierSet"> --> - <TR> - <TD><CODE>-ECPushSupplierSet</CODE> - </TD> - <TD><P>Obsolete option, ignored. - </P> - </TD> - </TR> - - <!-- <TR NAME="ECConsumerAdminLock"> --> - <TR> - <TD><CODE>-ECConsumerAdminLock</CODE> - </TD> - <TD>Obsolete option, ignored in the current version. - </TD> - </TR> - - <!-- <TR NAME="ECSupplierAdminLock"> --> - <TR> - <TD><CODE>-ECSupplierAdminLock</CODE> - </TD> - <TD>Obsolete option, ignored in the current version. - </TD> - </TR> - <!-- <TR NAME="ECConsumerValidateConnection"> --> <TR> <TD><CODE>-ECConsumerValidateConnection</CODE> <EM>validate_connection: 0 | 1</EM> </TD> - <TD>When this option is set the connection from the Event Channel - to the consumer will be created during the connect of the + <TD>When this option is set the connection from the Event Channel + to the consumer will be created during the connect of the consumer, just before the consumer is added to the consumer - list. By default + list. By default the Event Channel will create the connection to the consumer at - the moment the first event is pushed to the consumer. - When the network is heavily loaded during this connect and a new event - is pushed before the connection is establed, a new create connection - request is done. When having very high connection establishment + the moment the first event is pushed to the consumer. + When the network is heavily loaded during this connect and a new event + is pushed before the connection is establed, a new create connection + request is done. When having very high connection establishment time (for example running on a WAN) and an interval that is much - smaller than the connection establishment time it is wise to + smaller than the connection establishment time it is wise to set this option. Else you get dozens of new connection request that can result in a stack overflow. Another option is to use BiDIR GIOP so that there is only one connection between Rtec and consumer @@ -678,7 +653,7 @@ static EC_QueueFullSimpleActions "[wait | discard]" not require an scheduler. If any of the strategies that require an scheduling service is selected then this attribute should be set - appropiately. + appropriately. </TD> </TR> @@ -710,9 +685,9 @@ static EC_QueueFullSimpleActions "[wait | discard]" <H3>Configuring the IIOP Gateway</H3> - <P>The <CODE>TAO_EC_Gateway_IIOP_Factory</CODE> is the factory for - the <CODE>TAO_EC_Gateway_IIOP</CODE> class. This factory can be - used to configure the settings of the IIOP Gateway using the + <P>The <CODE>TAO_EC_Gateway_IIOP_Factory</CODE> is the factory for + the <CODE>TAO_EC_Gateway_IIOP</CODE> class. This factory can be + used to configure the settings of the IIOP Gateway using the svc.conf file. The contents looks like this: </P> @@ -737,7 +712,7 @@ static EC_Gateway_IIOP_Factory "-ECGIIOPConsumerECControl null ....." <EM>policy</EM> </TD> <TD>Select the consumer ec control policy (<EM>null</EM> or - <EM>reactive</EM> or <EM>reconnect</EM>) to detect and handle + <EM>reactive</EM> or <EM>reconnect</EM>) to detect and handle broken consumer ec's. </TD> </TR> @@ -747,7 +722,7 @@ static EC_Gateway_IIOP_Factory "-ECGIIOPConsumerECControl null ....." <EM>period</EM> </TD> <TD>Set the period (in microseconds) used by the reactive and reconnect - consumer ec control policy (set <EM>ECGIIOPConsumerECControl</EM> to + consumer ec control policy (set <EM>ECGIIOPConsumerECControl</EM> to <EM>reactive</EM> or <EM>reconnect</EM>) to poll the state of the consumer ec. When set to 0 there is no polling but the reactive strategy is in place. @@ -760,7 +735,7 @@ static EC_Gateway_IIOP_Factory "-ECGIIOPConsumerECControl null ....." <EM>timeout</EM> </TD> <TD>Set the timeout period (in microseconds) used by the reactive and reconnect - consumer ec control policy (set <EM>ECGIIOPConsumerECControl</EM> to + consumer ec control policy (set <EM>ECGIIOPConsumerECControl</EM> to <EM>reactive</EM> or <EM>reconnect</EM>) to detect a timeout when polling the state of the consumer ec. </TD> @@ -782,11 +757,11 @@ static EC_Gateway_IIOP_Factory "-ECGIIOPConsumerECControl null ....." <TD><CODE>-ECGIIOPUseTTL</CODE> <EM>use_ttl: 0 | 1</EM> </TD> - <TD>Set whether the IIOP Gateway uses the TTL or not. - This is 1 by default. When set to 0 make sure that - no recursive structure is build between ec's, else an + <TD>Set whether the IIOP Gateway uses the TTL or not. + This is 1 by default. When set to 0 make sure that + no recursive structure is build between ec's, else an event can keep looping for ever. Useful when there are no - recursive structures and we want the gateway to + recursive structures and we want the gateway to transfer all events independent of their TTL because suppliers can be unaware about the maximum number of hops. In case this option is 0, the TTL in the event isn't decremented @@ -799,12 +774,12 @@ static EC_Gateway_IIOP_Factory "-ECGIIOPConsumerECControl null ....." <TD><CODE>-ECGIIOPUseConsumerProxyMap</CODE> <EM>use_consumer_proxy_map: 0 | 1</EM> </TD> - <TD>Set whether the IIOP Gateway uses a map with a proxy + <TD>Set whether the IIOP Gateway uses a map with a proxy push consumer for each unique source id or not. This is 1 - by default meaning that a map is used. When set to 0 the + by default meaning that a map is used. When set to 0 the gateway will just use one proxy push consumer to push - events to the consumer ec. This options is useful when - a lot of different source id's are used but there is no + events to the consumer ec. This options is useful when + a lot of different source id's are used but there is no need for a different proxy push consumer for each source id. Setting this option to 0 then improves the performance. </TD> @@ -814,7 +789,7 @@ static EC_Gateway_IIOP_Factory "-ECGIIOPConsumerECControl null ....." <H3>The commandline arguments</H3> - The Event_Service executable has several commandline arguments you can use. + The Event_Service executable has several commandline arguments you can use. The following arguments are available. <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0"> @@ -829,7 +804,7 @@ static EC_Gateway_IIOP_Factory "-ECGIIOPConsumerECControl null ....." <EM>service_name</EM> </TD> <TD>The name with which the Event Service registers itself in the - Naming Service. + Naming Service. </TD> </TR> <!-- <TR NAME="-o"> --> @@ -884,7 +859,7 @@ static EC_Gateway_IIOP_Factory "-ECGIIOPConsumerECControl null ....." <TD><CODE>-s</CODE> <EM>global|local|none</EM> </TD> - <TD>Which scheduler should be used. The default is <CODE>none</CODE>. + <TD>Which scheduler should be used. The default is <CODE>none</CODE>. With <CODE>local</CODE> an in process scheduler is created. With <CODE>global</CODE> a scheduler is retrieved from the Naming Service </TD> diff --git a/TAO/docs/events_tutorial.html b/TAO/docs/events_tutorial.html index 099bf1bd3ef..932407266c6 100644 --- a/TAO/docs/events_tutorial.html +++ b/TAO/docs/events_tutorial.html @@ -16,7 +16,7 @@ bgcolor="#ffffff"> <h1>Using the Real-Time Event Service</h1><P> <A HREF="http://www.cs.wustl.edu/~cdgill/">Chris Gill</a>, -<A HREF="http://www.cs.wustl.edu/~harrison/">Tim Harrison</a>, and +<A HREF="http://www.cs.wustl.edu/~harrison/">Tim Harrison</a>, and <A HREF="http://www.cs.wustl.edu/~coryan/">Carlos O'Ryan</a><br><br> <A HREF="mailto:cdgill@cs.wustl.edu">cdgill@cs.wustl.edu</a>, @@ -55,12 +55,12 @@ bgcolor="#ffffff"> <tr><td> <h3>Introduction</h3> <BR> -This material is intended to provide an introduction to the COS Event Model, +This material is intended to provide an introduction to the COS Event Model, the Real-Time extensions to that model in TAO, and a set of examples that illustrate the techniques used to build systems using these models. The CORBA Event Service provides a flexible model for asynchronous communication among objects. However, the standard CORBAEvent Service specification lacks -important features required by real-time applications. These features include +important features required by real-time applications. These features include event filtering, event correlation, and periodic event processing.<P> The standard CORBA operation invocation model supports twoway, oneway, @@ -78,7 +78,7 @@ models lack asynchronous message delivery, do not support timed invocations or group communication, and can lead to excessive polling by clients. Moreover, standard oneway invocations might not implement reliable delivery and deferred synchronous invocations require the use -of the CORBA Dynamic Invocation Interface (DII), which yields +of the CORBA Dynamic Invocation Interface (DII), which yields <A HREF="http://www.cs.wustl.edu/~schmidt/GLOBECOM-96.ps.gz">excessive overhead</A> for most real-time applications. <P> @@ -124,36 +124,36 @@ The role of each component in the COS Event Model is outlined below:<P> <ul> - <li> <b><i>EventChannel</i></b> -- The EventChannel interface provides + <li> <b><i>EventChannel</i></b> -- The EventChannel interface provides two factory methods, which allow applications to obtain consumer and supplier administration objects, respectively, and use them to create the other objects described below, to connect to the event channel. <P> - <li> <b><i>SupplierAdmin</i></b> -- The SupplierAdmin interface provides + <li> <b><i>SupplierAdmin</i></b> -- The SupplierAdmin interface provides factory methods which create the appropriate supplier proxy objects. <P> <li> <b><i>ConsumerAdmin</i></b> -- The ConsumerAdmin interface provides factory methods which create the appropriate consumer proxy objects. <P> - <li> <b><i>ProxyPullSupplier</i></b> -- The ProxyPullSupplier + <li> <b><i>ProxyPullSupplier</i></b> -- The ProxyPullSupplier interface is used by consumers in the pull model to connect and disconnect from the channel. This interface inherits from the PullSupplier interface, and acts as a proxy for the suppliers from which the channel will pull events. <P> - <li> <b><i>ProxyPushSupplier</i></b> -- The ProxyPushSupplier + <li> <b><i>ProxyPushSupplier</i></b> -- The ProxyPushSupplier interface is used by consumers in the push model to connect and disconnect from the channel. This interface inherits from the PushSupplier interface, and acts as a proxy for the suppliers which will push events to the channel. <P> - <li> <b><i>ProxyPullConsumer</i></b> -- The ProxyPullConsumer + <li> <b><i>ProxyPullConsumer</i></b> -- The ProxyPullConsumer interface is used by suppliers in the pull model to connect and disconnect from the channel. This interface inherits from the PullConsumer interface, and acts as a proxy for the consumers on whose behalf the channel will pull events. <P> - <li> <b><i>ProxyPushConsumer</i></b> -- The ProxyPushConsumer + <li> <b><i>ProxyPushConsumer</i></b> -- The ProxyPushConsumer interface is used by suppliers in the push model to connect and disconnect from the channel. This interface inherits from the PushConsumer interface, and acts as a proxy for the consumers @@ -214,7 +214,7 @@ below:<P> <li> <b><i>Suspend/resume</i></b> -- If a consumer's event dependencies change at run-time, it can utilize the - suspend/resume functionality through the new + suspend/resume functionality through the new <code>ProxyPushSupplier::suspend</code> and <code>ProxyPushSupplier::resume</code> methods. When a consumer invokes <code>ProxyPushSupplier::suspend</code>, the @@ -234,7 +234,7 @@ based on these registrations, to ensure efficient event delivery.<P> <LI> <B><I>Event correlation</I></B> -- Consumers may register for event delivery based on conjunctive or disjunctive sets of events. Conjunctive -registrations cause the event channel to notify the consumer when <I>all</I> +registrations cause the event channel to notify the consumer when <I>all</I> events in the set have arrived. Disjunctive registrations cause the event channel to notify the consumer when <I>any</I> event in the set has arrived.<P> @@ -242,7 +242,7 @@ to notify the consumer when <I>any</I> event in the set has arrived.<P> may register for suppliers based on timed events. Periodic suppliers push events into the channel at well defined intervals.<P> - <LI> <B><I>Active consumers and suppliers</I></B> -- See + <LI> <B><I>Active consumers and suppliers</I></B> -- See <a href="events_tutorial.html#Section3">The Real-Time Event Service</a><P>. </ul> @@ -274,7 +274,7 @@ into the channel at well defined intervals.<P> <LI> Source/type-based filtering<P> <LI> Conjunction/Disjunction (AND/OR) correlations<P> </ul> - + <li> Periodic and Aperiodic processing <P> <UL> <LI> Canonical timeouts<P> @@ -302,30 +302,30 @@ into the channel at well defined intervals.<P> <h3>Characteristics of Real-Time Push Event Service Participants</h3> <tr><td> -Two major roles are played by the participants in a real-time push event -service.<P> +Two major roles are played by the participants in a real-time push event +service.<P> <tr><td> -The first role is that of an event consumer, which receives events from the +The first role is that of an event consumer, which receives events from the event channel. A consumer specifies the type and/or source id for each event it is interested in receiving.<P> -In hard real-time applications, a consumer must also specify RT_Info data for +In hard real-time applications, a consumer must also specify RT_Info data for each event it is interested in receiving, and any other events on which that event depends. The RT_Info structure resides in the Scheduler, and is -accessed through the scheduler interface. A unique handle is returned to the -consumer when an RT_Info is created, which can then be used to set the +accessed through the scheduler interface. A unique handle is returned to the +consumer when an RT_Info is created, which can then be used to set the information in the RT_Info. An RT_Info handle may also be obtained via the Scheduler's lookup method.<P> <tr><td> -The second role is that of an event supplier, which generates events and +The second role is that of an event supplier, which generates events and passes them into the event channel. A supplier must specify its source id, and the type of each event it will generate. <tr><td> In hard real-time applications, a supplier must also specify RT_Info data for -the events it will generate. In particular, it must specify the maximum rate +the events it will generate. In particular, it must specify the maximum rate at which it will generate each event. This information is used by a real-time scheduler to assign appropriate dispatch priorities.<P> @@ -349,7 +349,7 @@ which produces events in its own thread. Both consume events and produce events. <tr> <th>EC Roles <th>RT_Info Contents -<th>Domain Examples +<th>Domain Examples </tr> <tr> @@ -373,7 +373,7 @@ which produces events in its own thread. Both consume events and produce events. <tr> <td> Supplier <td> rate -<td> Operator Control Panel, EC Reactor Threads +<td> Operator Control Panel, EC Reactor Threads </tr> </table></center> @@ -400,7 +400,7 @@ which produces events in its own thread. Both consume events and produce events. </tr> <tr> -<td> Supplier/Consumer +<td> Supplier/Consumer <td> internal node </tr> @@ -507,26 +507,26 @@ which produces events in its own thread. Both consume events and produce events. <center><h3><a name="Section4_1">Providing QoS Information</a><h3></center><p> <tr><td> -The following steps are only necessary for applications that make use of the -Event Service's hard real-time features. Applications that do not need these -features and are configured with a null scheduler may skip the following +The following steps are only necessary for applications that make use of the +Event Service's hard real-time features. Applications that do not need these +features and are configured with a null scheduler may skip the following operations on the scheduling server. <tr><td> -For each operation, a Consumer should provide the worst case, expected, and -cached execution time for that operation. It must also specify criticality and -importance values for each operation. A real-time scheduler uses this information +For each operation, a Consumer should provide the worst case, expected, and +cached execution time for that operation. It must also specify criticality and +importance values for each operation. A real-time scheduler uses this information to order dispatches within a set of operations whose dependencies have been met. <tr><td> -If it is a Consumer/Supplier (one which consumes an event and passively generates +If it is a Consumer/Supplier (one which consumes an event and passively generates one or more events from the thread in which it was called, as illustrated in the tables above), it must provide dependencies on one or more other events to the -scheduler. +scheduler. <tr><td> -If it is a Supplier/Consumer (one which consumes an event and actively generates -one or more events from its own thread, as illustrated in the tables above), it +If it is a Supplier/Consumer (one which consumes an event and actively generates +one or more events from its own thread, as illustrated in the tables above), it must also specify the rate at which it will generate the new events by passing a positive value in the period argument to the scheduler set method. It may also indicate a positive number of threads in which the dispatch will be made. If the @@ -548,24 +548,18 @@ defaults to 1. // Create new RT_Info descriptors for three events. - RtecScheduler::handle_t handle1 = - server->create ("event_1", // Name of entry point - TAO_TRY_ENV // Environment - ); - - RtecScheduler::handle_t handle2 = - server->create ("event_2", // Name of entry point - TAO_TRY_ENV // Environment - ); + RtecScheduler::handle_t handle1 = + server->create ("event_1"); // Name of entry point + + RtecScheduler::handle_t handle2 = + server->create ("event_2"); // Name of entry point - RtecScheduler::handle_t handle3 = - server->create ("event_3", // Name of entry point - TAO_TRY_ENV // Environment - ); + RtecScheduler::handle_t handle3 = + server->create ("event_3"); // Name of entry point // Register as a consumer/supplier: act as a supplier of event_1 but with - // a consumer dependency on event_3. Therefore, the actual period and + // a consumer dependency on event_3. Therefore, the actual period and // number of threads for event_1 depends on the characteristics of event_3. server->set (handle1, // RT_Info handle RtecScheduler::HIGH_CRITICALITY, // Criticality @@ -576,8 +570,7 @@ defaults to 1. RtecScheduler::LOW_IMPORTANCE, // Importance 0, // Quantum (unused) 0, // Threads - will depend on event_3 - RtecScheduler::OPERATION, // Info type - TAO_TRY_ENV); + RtecScheduler::OPERATION); // Info type // Register as a producer of event_2. server->set (handle2, // RT_Info handle @@ -589,8 +582,7 @@ defaults to 1. RtecScheduler::LOW_IMPORTANCE, // Importance 0, // Quantum (unused) 1, // Threads - RtecScheduler::OPERATION, // Info type - TAO_TRY_ENV); + RtecScheduler::OPERATION); // Info type // Register as a consumer of event_3. server->set (handle3, // RT_Info handle @@ -602,17 +594,13 @@ defaults to 1. RtecScheduler::LOW_IMPORTANCE, // Importance 0, // Quantum (unused) 0, // Threads - will depend on supplier - RtecScheduler::OPERATION, // Info type - TAO_TRY_ENV); + RtecScheduler::OPERATION); // Info type // Establish a dependency of event_1 on event_3. server->add_dependency (handle1, // handle that depends handle3, // handle that is depended on - 1, // number of calls per event occurance - TAO_TRY_ENV // environment - ); - + 1); // number of calls per event occurrence </pre> </table> @@ -626,8 +614,8 @@ defaults to 1. </h3> <tr><td> -The following code is derived from the EC_Throughput consumer code, which can be -found in TAO in the file: +The following code is derived from the EC_Throughput consumer code, which can be +found in TAO in the file: <A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp"> $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp</a> @@ -647,7 +635,7 @@ Test_Consumer::connect (const char* name, // configured with a null scheduler may skip the following operations on the // scheduling server. - // Obtain a reference to the scheduler from the ACE_Scheduler_Factory. + // Obtain a reference to the scheduler from the ACE_Scheduler_Factory. RtecScheduler::Scheduler_ptr server = ACE_Scheduler_Factory::server (); @@ -657,7 +645,7 @@ Test_Consumer::connect (const char* name, server->create (name, _env); TAO_CHECK_ENV_RETURN_VOID(_env); - // Set the attributes for the RT_Info. + // Set the attributes for the RT_Info. ACE_Time_Value tv (0, 2000); TimeBase::TimeT time; ORBSVCS_Time::Time_Value_to_TimeT (time, tv); @@ -673,7 +661,7 @@ Test_Consumer::connect (const char* name, TAO_CHECK_ENV_RETURN_VOID(_env); // Specify a disjunctive dependency on the arrival of event_a, the arrival - // of event b, OR the arrival of an event service shutdown event. Note that + // of event b, OR the arrival of an event service shutdown event. Note that // the same RT_Info is used for each event. This can be used to simplify // code in applications using a null scheduler, or to consolidate events // with identical characteristics in hard real-time applications. @@ -710,7 +698,7 @@ Test_Consumer::connect (const char* name, <tr><td> The following code is derived from the EC_Throughput consumer driver code, which -can be found in TAO in the file: +can be found in TAO in the file: <A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp"> $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp</a> @@ -738,8 +726,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) // Initialize the ORB reference. this->orb_ = - CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV); - TAO_CHECK_ENV; + CORBA::ORB_init (argc, argv, ""); // Initialize the root POA reference. CORBA::Object_var poa_object = @@ -751,13 +738,11 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) // Obtain the narrowed root POA reference. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + PortableServer::POA::_narrow (poa_object.in ()); // Obtain a reference to the POA manager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_TRY_ENV); - TAO_CHECK_ENV; + root_poa->the_POAManager (); // Now some boiler plate code to obtain a reference to the // naming service..... @@ -772,12 +757,11 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) // Narrow the naming service reference. CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + CosNaming::NamingContext::_narrow (naming_obj.in ()); // Use the Naming Service to locate the Scheduling Service and // use the Scheduler_Factory to keep a global pointer to the - // latter. + // latter. // Initialize the scheduler factory to operate in configuration mode. if (ACE_Scheduler_Factory::use_config (naming_context.in ()) == -1) @@ -792,27 +776,22 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) // Resolve a reference to the event service. CORBA::Object_var ec_obj = - naming_context->resolve (name, TAO_TRY_ENV); - TAO_CHECK_ENV; + naming_context->resolve (name); // Narrow the reference to the event service. RtecEventChannelAdmin::EventChannel_var channel; if (CORBA::is_nil (ec_obj.in ())) channel = RtecEventChannelAdmin::EventChannel::_nil (); else - channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (), - TAO_TRY_ENV); - TAO_CHECK_ENV; + channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()); // Activate the POA so we can start receiving requests... // Activate the POA manager. - poa_manager->activate (TAO_TRY_ENV); - TAO_CHECK_ENV; + poa_manager->activate (); // Connect consumers to the event service. - this->connect_consumers (channel.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + this->connect_consumers (channel.in ()); ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n")); ACE_DEBUG ((LM_DEBUG, "running the test\n")); @@ -825,22 +804,19 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) this->dump_results (); // Disconnect consumers from the event service. - this->disconnect_consumers (TAO_TRY_ENV); - TAO_CHECK_ENV; + this->disconnect_consumers (); // Destroy the event service. - channel->destroy (TAO_TRY_ENV); - TAO_CHECK_ENV; + channel->destroy (); } - TAO_CATCH (CORBA::SystemException, sys_ex) + catch (const CORBA::SystemException& sys_ex) { - TAO_TRY_ENV.print_exception ("SYS_EX"); + sys_ex.print_exception ("SYS_EX"); } - TAO_CATCHANY + catch (const CORBA::Exception& any_ex) { - TAO_TRY_ENV.print_exception ("NON SYS EX"); + any_ex.print_exception ("NON SYS EX"); } - TAO_ENDTRY; return 0; } @@ -857,7 +833,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) <tr><td> The following code is derived from the EC_Throughput consumer code, which -can be found in TAO in the file: +can be found in TAO in the file: <A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp"> $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp</a> @@ -922,8 +898,8 @@ Test_Consumer::push (const RtecEventComm::EventSet& events, </h3> <tr><td> -The following code is derived from the EC_Throughput consumer code, which can be -found in TAO in the file: +The following code is derived from the EC_Throughput consumer code, which can be +found in TAO in the file: <A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp"> $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp</a> @@ -954,11 +930,11 @@ Test_Consumer::disconnect (CORBA::Environment &_env) // transit. // Without a flushing protocol we need to deactivate the - // servant to stop accepting push () requests for any + // servant to stop accepting push () requests for any // incoming events. // Deactivate the servant - PortableServer::POA_var poa = + PortableServer::POA_var poa = this->_default_POA (_env); TAO_CHECK_ENV_RETURN_VOID (_env); PortableServer::ObjectId_var id = @@ -1010,7 +986,7 @@ set of operations whose dependencies have been met. The Event Service matches supplier publications with consumer subscriptions to provide efficient event filtering. Providing incorrect publications or subscriptions will result in missed events. The Event Service also uses the -subscription information to create additional dependencies between registered +subscription information to create additional dependencies between registered RT_Infos. Thus, providing correct supplier publication and consumer subscription information is also critical for correct scheduling in hard real-time applications. @@ -1037,15 +1013,11 @@ server. // Create new RT_Info descriptors for two events. - RtecScheduler::handle_t handle0 = - server->create ("event_0", // Name of entry point - TAO_TRY_ENV // Environment - ); + RtecScheduler::handle_t handle0 = + server->create ("event_0"); // Name of entry point - RtecScheduler::handle_t handle1 = - server->create ("event_1", // Name of entry point - TAO_TRY_ENV // Environment - ); + RtecScheduler::handle_t handle1 = + server->create ("event_1"); // Name of entry point // Register as a producer of event_0. server->set (handle0, // RT_Info handle @@ -1057,8 +1029,7 @@ server. RtecScheduler::LOW_IMPORTANCE, // Importance 0, // Quantum (unused) 1, // Threads - RtecScheduler::OPERATION, // Info type - TAO_TRY_ENV); + RtecScheduler::OPERATION); // Info type // Register as a producer of event_1. server->set (handle1, // RT_Info handle @@ -1070,8 +1041,7 @@ server. RtecScheduler::LOW_IMPORTANCE, // Importance 0, // Quantum (unused) 1, // Threads - RtecScheduler::OPERATION, // Info type - TAO_TRY_ENV); + RtecScheduler::OPERATION); // Info type </pre> </table> @@ -1086,7 +1056,7 @@ server. <tr><td> The following code is derived from the EC_Throughput supplier code, which -can be found in TAO in the file: +can be found in TAO in the file: <A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp"> $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp</a> @@ -1114,18 +1084,18 @@ Test_Supplier::connect (const char* name, this->burst_pause_ = burst_pause; this->event_a_ = event_a; this->event_b_ = event_b; - + // Register operations with the scheduling service. The following steps are // only necessary for applications that make use of the Event Service's hard // real-time features. Applications that do not need these features and are // configured with a null scheduler may skip the following operations on the // scheduling server. - // Obtain a reference to the scheduling service. + // Obtain a reference to the scheduling service. RtecScheduler::Scheduler_ptr server = ACE_Scheduler_Factory::server (); - // Create an RT_Info descriptor for the passed operation name. + // Create an RT_Info descriptor for the passed operation name. RtecScheduler::handle_t rt_info = server->create (name, _env); TAO_CHECK_ENV_RETURN_VOID (_env); @@ -1149,7 +1119,7 @@ Test_Supplier::connect (const char* name, _env); TAO_CHECK_ENV_RETURN_VOID (_env); - // Now, create a supplier id, and publish the events + // Now, create a supplier id, and publish the events // that will be supplied under this id. // Create a supplier id from the passed name @@ -1169,7 +1139,7 @@ Test_Supplier::connect (const char* name, ACE_ES_EVENT_SHUTDOWN, rt_info, 1); - // And finally, some boiler plate code to connect a supplier + // And finally, some boiler plate code to connect a supplier // to the Event Service. This is where the connection is // actually made. @@ -1200,7 +1170,7 @@ Test_Supplier::connect (const char* name, <tr><td> The following code is derived from the EC_Throughput supplier driver code, which -can be found in TAO in the file: +can be found in TAO in the file: <A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp"> $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp</a> @@ -1228,8 +1198,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) // Initialize the ORB reference. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV); - TAO_CHECK_ENV; + CORBA::ORB_init (argc, argv, ""); // Initialize the root POA reference. CORBA::Object_var poa_object = @@ -1241,14 +1210,11 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) // Obtain the narrowed root POA reference. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + PortableServer::POA::_narrow (poa_object.in ()); // Obtain a reference to the POA manager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_TRY_ENV); - TAO_CHECK_ENV; - + root_poa->the_POAManager (); // Now some boiler plate code to obtain a reference to the // naming service..... @@ -1263,12 +1229,11 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) // Narrow the naming service reference. CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + CosNaming::NamingContext::_narrow (naming_obj.in ()); // Use the Naming Service to locate the Scheduling Service and // use the Scheduler_Factory to keep a global pointer to the - // latter. + // latter. // Initialize the scheduler factory to operate in configuration mode. if (ACE_Scheduler_Factory::use_config (naming_context.in ()) == -1) @@ -1283,33 +1248,27 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) // Resolve a reference to the event service. CORBA::Object_var ec_obj = - naming_context->resolve (name, TAO_TRY_ENV); - TAO_CHECK_ENV; + naming_context->resolve (name); // Narrow the reference to the event service. RtecEventChannelAdmin::EventChannel_var channel; if (CORBA::is_nil (ec_obj.in ())) channel = RtecEventChannelAdmin::EventChannel::_nil (); else - channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (), - TAO_TRY_ENV); - TAO_CHECK_ENV; + channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()); // Activate the POA so we can start receiving requests... // Activate the POA manager. - poa_manager->activate (TAO_TRY_ENV); - TAO_CHECK_ENV; + poa_manager->activate (); // Connect suppliers to the event service. - this->connect_suppliers (channel.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + this->connect_suppliers (channel.in ()); ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n")); // Activate the supplier objects - this->activate_suppliers (TAO_TRY_ENV); - TAO_CHECK_ENV; + this->activate_suppliers (); ACE_DEBUG ((LM_DEBUG, "suppliers are active\n")); @@ -1325,18 +1284,16 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) this->dump_results (); // Disconnect suppliers from the event service. - this->disconnect_suppliers (TAO_TRY_ENV); - TAO_CHECK_ENV; + this->disconnect_suppliers (); } - TAO_CATCH (CORBA::SystemException, sys_ex) + catch (const CORBA::SystemException& sys_ex) { - TAO_TRY_ENV.print_exception ("SYS_EX"); + sys_ex.print_exception ("SYS_EX"); } - TAO_CATCHANY + catch (const CORBA::Exception& any_ex) { - TAO_TRY_ENV.print_exception ("NON SYS EX"); + any_ex.print_exception ("NON SYS EX"); } - TAO_ENDTRY; return 0; } @@ -1351,7 +1308,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) <tr><td> The following code is derived from the EC_Throughput supplier code, which -can be found in TAO in the file: +can be found in TAO in the file: <A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp"> $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp</a> @@ -1411,34 +1368,30 @@ Test_Supplier::svc () event[0].header.type = this->event_b_; // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n")); - this->consumer_proxy ()->push (event, TAO_TRY_ENV); - - TAO_CHECK_ENV; + this->consumer_proxy ()->push (event); } - + // Sleep until it's time to send the next burst. ACE_OS::sleep (tv); } - // Send a "magic" type of event to inform the consumer that we are + // Send a "magic" type of event to inform the consumer that we are // not sending anything else... // Send one event shutdown from each supplier event[0].header.type = ACE_ES_EVENT_SHUTDOWN; - this->consumer_proxy ()->push(event, TAO_TRY_ENV); - TAO_CHECK_ENV; + this->consumer_proxy ()->push(event); this->timer_.stop (); - + } - TAO_CATCH (CORBA::SystemException, sys_ex) + catch (CORBA::SystemException& sys_ex) { - TAO_TRY_ENV.print_exception ("SYS_EX"); + sys_ex.print_exception ("SYS_EX"); } - TAO_CATCHANY + catch (CORBA::Exception& any_ex) { - TAO_TRY_ENV.print_exception ("NON SYS EX"); + any_ex.print_exception ("NON SYS EX"); } - TAO_ENDTRY; return 0; } @@ -1455,7 +1408,7 @@ Test_Supplier::svc () <tr><td> The following code is derived from the EC_Throughput supplier code, which -can be found in TAO in the file: +can be found in TAO in the file: <A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp"> $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp</a> @@ -1478,13 +1431,13 @@ Test_Supplier::disconnect (CORBA::Environment &_env) this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); - // We need to stop accepting disconnect_push_supplier () requests + // We need to stop accepting disconnect_push_supplier () requests // for this supplier, before it is safe to destroy the supplier. // As required by the CORBA spec, you must explicitly deactivate // a servant before destroying it. // Deactivate the servant - PortableServer::POA_var poa = + PortableServer::POA_var poa = this->supplier_._default_POA (_env); TAO_CHECK_ENV_RETURN_VOID (_env); PortableServer::ObjectId_var id = @@ -1511,7 +1464,7 @@ Test_Supplier::disconnect (CORBA::Environment &_env) <BR> The following code is derived from the Event_Service executable, which can be -found in TAO in the file: +found in TAO in the file: <A HREF="../orbsvcs/Event_Service/Event_Service.cpp"> $TAO_ROOT/orbsvcs/Event_Service/Event_Service.cpp</a> @@ -1530,8 +1483,7 @@ int main (int argc, char *argv[]) // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV); - TAO_CHECK_ENV; + CORBA::ORB_init (argc, argv, "internet"); if (parse_args (argc, argv) == -1) return 1; @@ -1544,12 +1496,10 @@ int main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_TRY_ENV); - TAO_CHECK_ENV; + root_poa->the_POAManager (); CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService"); @@ -1559,8 +1509,7 @@ int main (int argc, char *argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + CosNaming::NamingContext::_narrow (naming_obj.in ()); // Notice the use of auto_ptr<> to automagically manage the // destruction of the servant. When the auto_ptr goes out @@ -1571,8 +1520,8 @@ int main (int argc, char *argv[]) RtecScheduler::Scheduler_var scheduler; - // Create a new servant to implement the Scheduling Service, - // register it with the Naming Service, and use the + // Create a new servant to implement the Scheduling Service, + // register it with the Naming Service, and use the // Scheduler_Factory to keep a global pointer to the new // Scheduling Service. @@ -1587,19 +1536,15 @@ int main (int argc, char *argv[]) scheduler_impl = auto_ptr<POA_RtecScheduler::Scheduler>(new ACE_Config_Scheduler); if (scheduler_impl.get () == 0) - return 1; - scheduler = scheduler_impl->_this (TAO_TRY_ENV); - TAO_CHECK_ENV; - - CORBA::String_var str = - orb->object_to_string (scheduler.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; - ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n", - str.in ())); - - // Register the servant with the Naming Context.... - naming_context->bind (schedule_name, scheduler.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + return 1; + scheduler = scheduler_impl->_this (); + + CORBA::String_var str = + orb->object_to_string (scheduler.in ()); + ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%C>\n", str.in ())); + + // Register the servant with the Naming Context.... + naming_context->bind (schedule_name, scheduler.in ()); } ACE_Scheduler_Factory::use_config (naming_context.in ()); @@ -1626,59 +1571,51 @@ int main (int argc, char *argv[]) // Obtain an object reference to the new channel. RtecEventChannelAdmin::EventChannel_var ec = - ec_impl._this (TAO_TRY_ENV); - TAO_CHECK_ENV; + ec_impl._this (); // Convert the EC object reference to a string. CORBA::String_var str = - orb->object_to_string (ec.in (), TAO_TRY_ENV); + orb->object_to_string (ec.in ()); // Output the EC object reference string (debug only). - ACE_DEBUG ((LM_DEBUG, - "The EC IOR is <%s>\n", str.in ())); + ACE_DEBUG ((LM_DEBUG, "The EC IOR is <%C>\n", str.in ())); // Register the EC with the Naming Service. CosNaming::Name channel_name (1); channel_name.length (1); channel_name[0].id = CORBA::string_dup (service_name); - naming_context->bind (channel_name, ec.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + naming_context->bind (channel_name, ec.in ()); // Activate the POA so we can start receiving requests... // Activate the POA manager. - poa_manager->activate (TAO_TRY_ENV); - TAO_CHECK_ENV; + poa_manager->activate (); // Run the ORB event loop ACE_DEBUG ((LM_DEBUG, "%s; running event service\n", __FILE__)); if (orb->run () == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1); - // Now the Event Service is finished. We could deactivate the - // EC and SS here, but we don't need to, as the server is + // Now the Event Service is finished. We could deactivate the + // EC and SS here, but we don't need to, as the server is // going down anyway. // Remove the event service and the scheduling service from // the Naming Service. - naming_context->unbind (channel_name, TAO_TRY_ENV); - TAO_CHECK_ENV; + naming_context->unbind (channel_name); if (global_scheduler == 0) - { - naming_context->unbind (schedule_name, TAO_TRY_ENV); - TAO_CHECK_ENV; - } + { + naming_context->unbind (schedule_name); + } } - TAO_CATCHANY + catch (const CORBA::Exception& ex) { - TAO_TRY_ENV.print_exception ("EC"); + ex.print_exception ("EC"); } - TAO_ENDTRY; - return 0; } @@ -1696,30 +1633,30 @@ int main (int argc, char *argv[]) <tr><td> <h2><a name="Section7">Sample Applications</a></h2> -<tr><td> -A number of sample applications are available in the directories under +<tr><td> +A number of sample applications are available in the directories under <a href="../orbsvcs/tests/"> TAO's ORB Services tests</a>. <tr><td> In particular, much of the code shown in this tutorial was drawn from the -<a href="../orbsvcs/tests/EC_Throughput/"> +<a href="../orbsvcs/tests/EC_Throughput/"> EC_Throughput</a> test. This test exercises the Event Service and measures its throughput capabilities. <tr><td> A similar test, -<a href="../orbsvcs/tests/Event_Latency/"> +<a href="../orbsvcs/tests/Event_Latency/"> Event_Latency</a>, measures the latency of events through the Event Service. <tr><td> The -<a href="../orbsvcs/tests/EC_Basic/"> +<a href="../orbsvcs/tests/EC_Basic/"> EC_Basic</a> test demonstrates the basic use the Event Service. <tr><td> The -<a href="../orbsvcs/tests/EC_Multiple/"> +<a href="../orbsvcs/tests/EC_Multiple/"> EC_Multiple</a> test shows a number of ways to connect multiple Event Channels. @@ -1742,27 +1679,27 @@ and <tr><td> <h2><a name="Section8">Reference Materials</a></h2> -<tr><td> +<tr><td> The following materials were used in developing this tutorial: please refer to them for further information. -<tr><td> +<tr><td> <br> -<tr><td> +<tr><td> <h3>Books</h3> -<tr><td> -Mowbray, T. and Zahavi, R. The Essential CORBA, Systems Integration Using Distributed Objects. Wiley, 1995. +<tr><td> +Mowbray, T. and Zahavi, R. The Essential CORBA, Systems Integration Using Distributed Objects. Wiley, 1995. ISBN 0-471-10611-9 -<tr><td> +<tr><td> <br> -<tr><td> +<tr><td> Baker, S. CORBA Distributed Objects Using Orbix. Addison-Wesley, 1997. ISBN 0-201-92475-7 -<tr><td> +<tr><td> <br> -<tr><td> +<tr><td> <h3>Papers</h3> <tr><td> @@ -1792,7 +1729,6 @@ Design of the TAO Real-Time Object Request Broker</a> <center><table cellpadding=1 border=0 cellspacing=4> <tr><td> -Last modified 10:50:30 CST 22 December 1998 by Chris Gill </table></center> </body></html> diff --git a/TAO/docs/ior_parsing.html b/TAO/docs/ior_parsing.html index ad9250f59b7..a18b8e01f54 100644 --- a/TAO/docs/ior_parsing.html +++ b/TAO/docs/ior_parsing.html @@ -218,9 +218,5 @@ static Resource_Factory "-ORBIORPaser HTTP_Parser" <hr> <address><a href="mailto:coryan@uci.edu">Carlos O'Ryan</a></address> -<!-- Created: Tue Feb 20 08:42:57 PST 2001 --> -<!-- hhmts start --> -Last modified: Tue Feb 20 16:32:13 PST 2001 -<!-- hhmts end --> </body> </html> diff --git a/TAO/docs/pluggable_messaging.html b/TAO/docs/pluggable_messaging.html index 4db9d3edbde..82c8d6efc04 100644 --- a/TAO/docs/pluggable_messaging.html +++ b/TAO/docs/pluggable_messaging.html @@ -4,17 +4,17 @@ <head> <title>Pluggable Messaging framework</title> </head> - + <BODY text = "#000000" link="#0000ff" vlink="#cc0000" bgcolor="#ffffff"> - + <body> <HR> - <h1>Pluggable Messaging Framework</h1> - <HR> - <h2>Context</h2> + <h1>Pluggable Messaging Framework</h1> + <HR> + <h2>Context</h2> TAO uses GIOP message formats to exchange messages between inter-operating ORBs. GIOP, essentially specifies formats of messages exchanged between ORBs. It has only a few message @@ -26,30 +26,30 @@ different protocols. The framework,though not complete in itself, has been used for implementing GIOP and GIOPlite. The framework would be re-factored and reworked - depending on the use cases our users come across. - - <h2>Idea</h2> + depending on the use cases our users come across. + + <h2>Idea</h2> We wanted to give a flexibility to the user to load the message formatting protocol by selecting a protocol during the - bootstrapping process. So, we tried to leverage the work + bootstrapping process. So, we tried to leverage the work that has already been done for the <a HREF = - "pluggable_protocols/index.html"> pluggable_protocols</a>. + "pluggable_protocols/index.html"> pluggable_protocols</a>. The fundamental idea that we followed was to isolate all of the ORB code from the message formatting details. The framework is constrained by the type of marshalling scheme. The framework now completely relies on CDR - formatted streams. - - + formatted streams. + + <h2>Implementation of GIOP</h2> <P>The common interface that has been defined is the class Pluggable_Messaging_Interface forms the core class for the implementation of a concrete messaging protocol. We have - been able to implement the GIOP & GIOPlite succesfully using + been able to implement the GIOP & GIOPlite successfully using this minimal interface. The different versions of GIOP have - been managed succesfully within this implementation.</P> + been managed successfully within this implementation.</P> <P>When the user loads protocols like IIOP he/she in turn is loading the TCP/IP mapping of GIOP formatted message. The @@ -58,11 +58,11 @@ the user behind the scene. If an user wants to use GIOPlite mapped on to TCP/IP he would load IIOP_Lite using the svc.conf file. The format is given below </P> - + <P><code>dynamic IIOP_Lite_Factory Service_Object * TAO:_make_TAO_IIOP_Lite_Protocol_Factory() ""</code></P> <P><code>static Resource_Factory "-ORBProtocolFactory IIOP_Lite_Factory". </code></P> - <P>At the moment the TAO Strategies library is used the + <P>At the moment the TAO Strategies library is used the svc.conf file should contain: </P> <P><code>dynamic IIOP_Lite_Factory Service_Object * TAO:_make_TAO_IIOP_Lite_Protocol_Factory() ""</code></P> @@ -71,7 +71,7 @@ <P>Please see the documentation of the pluggable protocol framework for exact meaning of the above syntax. The same applies to GIOPlite mapping on UIOP too.</P> - + <P>The class GIOP_Message_Base derives from the Pluggable_Messaging_Interface. This class holds most of the common code needed for the GIOP classes. GIOP places a @@ -84,7 +84,7 @@ <P>The GIOP_Message_Connector and the derived classes implements the different types of messages that can originate from the client. In GIOP 1.2, with the - specification of Bi-Directional GIOP, this disticntion + specification of Bi-Directional GIOP, this distinction between the client and server would decrease. But, this would be applicable only for GIOP 1.2. The present inheritance model, allows us to implement some of the roles @@ -112,16 +112,16 @@ <P> Uses only CDR formats. </P> <P> Need more ise cases to make the interface more flexible and better. </P> - - - <HR> - For more details and questions, - <p> - - <address><a href="mailto:bala@cs.wustl.edu">Balachandran - Natarajan</a></address> - <p> - <address><a href="mailto:fredk@cs.wustl.edu">Fred Kuhns</a></address> + + + <HR> + For more details and questions, + <p> + + <address><a href="mailto:bala@cs.wustl.edu">Balachandran + Natarajan</a></address> + <p> + <address><a href="mailto:fredk@cs.wustl.edu">Fred Kuhns</a></address> </body> </html> @@ -131,11 +131,6 @@ <body> <h1></h1> - - <hr> <address></address> -<!-- hhmts start --> -Last modified: Thu Mar 16 11:23:03 CST 2000 -<!-- hhmts end --> </body> </html> diff --git a/TAO/docs/pluggable_protocols/index.html b/TAO/docs/pluggable_protocols/index.html index 3c277c19852..7f3da9d177b 100644 --- a/TAO/docs/pluggable_protocols/index.html +++ b/TAO/docs/pluggable_protocols/index.html @@ -1317,7 +1317,7 @@ as follows: <DD>uioploc:///tmp/foobar/some_other_object_key</DD> </DL> <P> -it then becomes impossible to tell if the rendezous point is ``<TT>/tmp</TT>'' +it then becomes impossible to tell if the rendezvous point is ``<TT>/tmp</TT>'' or ``<TT>/tmp/foobar</TT>,'' and similarly for the object key, hence the need for an object key delimiter other than `<TT>/</TT>.' @@ -1329,7 +1329,7 @@ that contains the object key delimiter appropriate for the given pluggable proto </DD> <DT><STRONG><TT>create_profile</TT>.</STRONG></DT> <DD>This method creates and initializes a profile using -the provided CDR stream. Most of this code is also ``boilerblate.'' As such, +the provided CDR stream. Most of this code is also ``boilerplate.'' As such, it may be factored out in future TAO releases.</DD> <P> <DT><STRONG><TT>make_profile</TT>.</STRONG></DT> @@ -2370,7 +2370,7 @@ public: <BR> // Using this method, instead of send(), allows the transport (and <BR> - // wait strategy) to take appropiate action. + // wait strategy) to take appropriate action. <BR> <BR> @@ -2468,7 +2468,7 @@ useful for clients.</DD> <DD>Depending on the concurrency strategy used by the transport it may be required to setup state to receive a reply before the request is sent. Using this method, instead of <TT>send</TT>, allows the transport (and wait -strategy) to take appropiate action. This method is closely tied to TAO's GIOP +strategy) to take appropriate action. This method is closely tied to TAO's GIOP implementation. <TT>send_request</TT> implementations should essentially be the same in all pluggable protocol implementations. The only thing that should differ is the type of <TT>Profile</TT> being used. Note that this method is diff --git a/TAO/docs/releasenotes/PSS.html b/TAO/docs/releasenotes/PSS.html index 6b021fe8e06..de4907bf3ea 100644 --- a/TAO/docs/releasenotes/PSS.html +++ b/TAO/docs/releasenotes/PSS.html @@ -15,7 +15,7 @@ <p>Last Update: 2002/07/29 </p> </center> - <p>Persistent State Service (PSS) desribes a way of making a + <p>Persistent State Service (PSS) describes a way of making a service persistent. The fact that PSS is being used by a service is known only to the service (server) and not to the client which makes use of the service. PSS presents persistent diff --git a/TAO/docs/releasenotes/TODO.html b/TAO/docs/releasenotes/TODO.html index 75e33df01e6..65e12cbc427 100644 --- a/TAO/docs/releasenotes/TODO.html +++ b/TAO/docs/releasenotes/TODO.html @@ -17,10 +17,6 @@ Bugzilla </A> now. </P> - <P> - Last Updated: $Date$ $Revision$ - </P> - <HR> <P>Back to the TAO <A HREF="../index.html">documentation index</A>. <!--#include virtual="/~schmidt/cgi-sig.html" --> diff --git a/TAO/docs/releasenotes/amh.html b/TAO/docs/releasenotes/amh.html index 141d1a4eabe..556692c3d16 100644 --- a/TAO/docs/releasenotes/amh.html +++ b/TAO/docs/releasenotes/amh.html @@ -9,11 +9,10 @@ <h3>TAO's Asynchronous Method Handling (AMH) Feature</h3> Point of contact: <a href="mailto:coryan@uci.edu">Carlos O'Ryan, </a> <a href="mailto:mayur@ics.uci.edu">Mayur Deshpande</a> - <h4>Last Updated: $Date$</h4> - <p> The purpose of this document is to provide a guide to using the AMH -capability available in TAO. This capability is not specified by any -CORBA specification (as of date). This document lists the motivation for AMH, + <p> The purpose of this document is to provide a guide to using the AMH +capability available in TAO. This capability is not specified by any +CORBA specification (as of date). This document lists the motivation for AMH, how to use it and its current implementation status. </p> <HR SIZE=4 WIDTH="100%"> @@ -21,42 +20,42 @@ how to use it and its current implementation status. </p> <h3>Context</h3> For many types of distributed systems, the CORBA asynchronous method -invocation -<a href="index.html/#ami"> (AMI) </a> -mechanism can improve concurrency, scalability, and -responsiveness significantly. AMI allows clients to invoke multiple +invocation +<a href="index.html/#ami"> (AMI) </a> +mechanism can improve concurrency, scalability, and +responsiveness significantly. AMI allows clients to invoke multiple two-way requests without waiting for responses. The time normally spent waiting for replies can therefore be used to perform other -useful work. The TAO asynchronous method handling (AMH) is a -mechanism, which extends the concepts of AMI from clients to -servers. Servers with AMH capability can return immediately -from (potentially) long, blocking requests. This makes the -servers capable of higher throughput. For a detailed description -for the motivation and potential use-cases of AMH, please refer to +useful work. The TAO asynchronous method handling (AMH) is a +mechanism, which extends the concepts of AMI from clients to +servers. Servers with AMH capability can return immediately +from (potentially) long, blocking requests. This makes the +servers capable of higher throughput. For a detailed description +for the motivation and potential use-cases of AMH, please refer to <a href="http://www.cs.wustl.edu/~schmidt/PDF/AMH.pdf">AMH-Motivation. </a> <HR SIZE=4 WIDTH="100%"> <h3>Using AMH</h3> -Servers that want to take advantage of AMH capability must use -AMH-servants derived from AMH-skeletons. Invoking the +Servers that want to take advantage of AMH capability must use +AMH-servants derived from AMH-skeletons. Invoking the <a href="index.html#idl">IDL-Compiler </a> with the "-GH" option causes the IDL-Compiler to generate -AMH-skeletons for all interfaces in the ".idl" file. The signatures -of the AMH-methods differ from the original interfaces as per the -rules described in +AMH-skeletons for all interfaces in the ".idl" file. The signatures +of the AMH-methods differ from the original interfaces as per the +rules described in <a href="http://www.cs.wustl.edu/~schmidt/PDF/DOA-02.pdf"">AMH-In-Detail. </a> -Servants derived from the AMH-skeletons are registered with the POA in the usual manner -and appear to clients as "normal" servants for the corresponding -interfaces; Thus even while being transparent to the client, these -servants are now capable of handling requests asynchronously. -AMH-servants can be registered in any POA and can intermix with -"normal" servants in the same POA. The granularity of AMH is at +Servants derived from the AMH-skeletons are registered with the POA in the usual manner +and appear to clients as "normal" servants for the corresponding +interfaces; Thus even while being transparent to the client, these +servants are now capable of handling requests asynchronously. +AMH-servants can be registered in any POA and can intermix with +"normal" servants in the same POA. The granularity of AMH is at the interface level and not at the method level; Thus for an interface -compiled with the "-GH" option, all operations in that interface are +compiled with the "-GH" option, all operations in that interface are asynchronous. Currently, AMH doesn't work in conjunction with -<a href="index.html#interceptor">Interceptors </a> +<a href="index.html#interceptor">Interceptors </a> and behaviour is undefined if both are used together. <HR SIZE=4 WIDTH="100%"> @@ -73,7 +72,7 @@ and behaviour is undefined if both are used together. <li>Generation of AMH ResponseHandlers.</li> <li>AMH Exceptions.</li> <li>Fix the narrow method bug for AMH skeletons : Fixed -<li>Sending intelligent exception codes back to client in case +<li>Sending intelligent exception codes back to client in case something nasty happens in the AMH server.</li> <li>Example of using AMH available at ACE_wrappers/TAO/examples/AMH/Sink_Server.</li> <li>Test for AMH : ACE_wrappers/TAO/performance-tests/Latency/AMH</li> @@ -85,17 +84,17 @@ something nasty happens in the AMH server.</li> <h3>Credits</h3> -Original idea first proposed by -<a href="mailto:coryan@uci.edu">Carlos O'Ryan </a> -and changes to ORB for AMH first attempted by -<a href="mailto:brucetrask@aol.com">Bruce Trask. </a> -First go to get the IDL-Compiler to generate AMH code attempted by -<a href="mailto:brunsch@doc.ece.uci.edu"> Darrell Brunsch. </a> -ORB changes for AMH as they stand today put in by -<a href="mailto:mayur@ics.uci.edu">Mayur Deshpande. </a> -Second go at getting IDL-compiler to generate code attempted by Mayur and -<a href="mailto:parsons@cs.wustl.edu">Jeff Parsons. </a> -Getting the IDL-Compiler beast to generate the right AMH code finally +Original idea first proposed by +<a href="mailto:coryan@uci.edu">Carlos O'Ryan </a> +and changes to ORB for AMH first attempted by +<a href="mailto:brucetrask@aol.com">Bruce Trask. </a> +First go to get the IDL-Compiler to generate AMH code attempted by +<a href="mailto:brunsch@doc.ece.uci.edu"> Darrell Brunsch. </a> +ORB changes for AMH as they stand today put in by +<a href="mailto:mayur@ics.uci.edu">Mayur Deshpande. </a> +Second go at getting IDL-compiler to generate code attempted by Mayur and +<a href="mailto:parsons@cs.wustl.edu">Jeff Parsons. </a> +Getting the IDL-Compiler beast to generate the right AMH code finally achieved by Carlos. <HR SIZE=4 WIDTH="100%"> diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html index 3a6a3bca6cb..43c142707db 100644 --- a/TAO/docs/releasenotes/ec.html +++ b/TAO/docs/releasenotes/ec.html @@ -8,7 +8,6 @@ <H3>TAO's Real-time Event Service</H3> Point of contact: <A HREF="mailto:jwillemsen@remedy.nl">Johnny Willemsen</A> - <H4>Last Updated: $Date$</H4> Documentation for the command line and service configurator options used to configure the real-time event service is available <A diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html index a529c8898a2..f676bdf3c39 100644 --- a/TAO/docs/releasenotes/index.html +++ b/TAO/docs/releasenotes/index.html @@ -185,24 +185,6 @@ Notification Service </td> <td VALIGN=TOP> -<ul> -<b>CCM Related</b> -<br><BR> -<li> -<a href="../../../CIAO/docs/releasenotes/index.html">CORBA Component Model (CIAO)</a></li> -<li> -<a href="../../../CIAO/docs/releasenotes/dance.html">Deployment and - Configuration Engine (DAnCE)</a></li> -<li> -<a href="../../../CIAO/CIDLC/README.html">Component Implementation -Definition Language Compiler (CIDLC)</a></li> -<li> -<a href="../../../CIAO/docs/static_ciao_contents.html">Static Configuration - Support for Real-Time Platforms</a></li> -</ul> -</td> - -<td VALIGN=TOP> </td> </tr> </table> @@ -215,7 +197,7 @@ Definition Language Compiler (CIDLC)</a></li> </table> -A complete list of all modifications to TAO is available in the <a href="../../ChangeLog">ChangeLog</a>. +A complete list of all modifications to TAO is available in the <a href="../../ChangeLogs">ChangeLogs</a>. <p> <hr> <h3> @@ -2555,6 +2537,5 @@ Need to test local object support more systematically and comprehensively. <hr> <p>Back to the TAO <a href="../index.html">documentation index</a>.<!--#include virtual="/~schmidt/cgi-sig.html" --> -<hr><!-- hhmts start -->Last modified: Thu May 4 13:08:35 UTC 2006<!-- hhmts end --> </body> </html> diff --git a/TAO/docs/releasenotes/orbcore.html b/TAO/docs/releasenotes/orbcore.html index 611fb321c69..60aad951879 100644 --- a/TAO/docs/releasenotes/orbcore.html +++ b/TAO/docs/releasenotes/orbcore.html @@ -23,7 +23,6 @@ Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a> -<p>Last Update: $Date$</p> </center> <!-- ============================================================ --> diff --git a/TAO/docs/rtcorba/architecture.html b/TAO/docs/rtcorba/architecture.html index a88c762f940..b160c6fb7cf 100644 --- a/TAO/docs/rtcorba/architecture.html +++ b/TAO/docs/rtcorba/architecture.html @@ -112,6 +112,5 @@ and deposit the requests into the right queue for processing. </p> is an easier design to implement, integrate and test piece-by-piece.</li> </ul> <hr> -<p><i>Last modified: $Date$</i></p> </body> </html> diff --git a/TAO/docs/rtcorba/faq.html b/TAO/docs/rtcorba/faq.html index ac0ec52cfb4..efd90ea90c7 100644 --- a/TAO/docs/rtcorba/faq.html +++ b/TAO/docs/rtcorba/faq.html @@ -33,8 +33,6 @@ <hr> <i> -<p>Last modified: $Date$ </i></p> - <p> </p> </body> </html> diff --git a/TAO/docs/rtcorba/features.html b/TAO/docs/rtcorba/features.html index a8d1edc5d3b..c1a16aa8f28 100644 --- a/TAO/docs/rtcorba/features.html +++ b/TAO/docs/rtcorba/features.html @@ -208,7 +208,7 @@ ThreadPools are now fully supported. Endpoint priorities are no longer supported.</li> <li> By default dynamic RTCorba threads live forever after they are created. -When using the <code>RTORBDynamicThreadIdleTimeout</code> from the +When using the <code>RTORBDynamicThreadIdleTimeout</code> from the <code>RT_ORB_Loader</code> it can be specified that the dynamic threads should end after a given idle time. Timeout must be specified in microseconds, 0 means the threads @@ -838,7 +838,7 @@ priority</tt> map the RTCORBA priority to the network priority. </ul> <br> -<i>Last Modified: $Date$</i></dl> +</dl> </body> </html> diff --git a/TAO/docs/rtcorba/issues.html b/TAO/docs/rtcorba/issues.html index 9aadf5c3eb6..c94a48f40ef 100644 --- a/TAO/docs/rtcorba/issues.html +++ b/TAO/docs/rtcorba/issues.html @@ -225,7 +225,7 @@ the guidelines are followed, of course ;-) )</p> <i> -<p>Last modified: $Date$ </i></p> +</p> <p></p> </body> </html> diff --git a/TAO/docs/rtcorba/omg_issues.html b/TAO/docs/rtcorba/omg_issues.html index 33316e69210..3d17b3d9230 100644 --- a/TAO/docs/rtcorba/omg_issues.html +++ b/TAO/docs/rtcorba/omg_issues.html @@ -13,7 +13,7 @@ This document lists what we believe to be the shortcomings of the Real-Time CORBA 1.0 specification, which we uncovered while implementing it in TAO. -All items on this page refer to <a href="http://cgi.omg.org/cgi-bin/doc?ptc/99-05-03">ptc/99-05-03</a>, which was +All items on this page refer to <a href="http://www.omg.org/cgi-bin/doc?ptc/99-05-03">ptc/99-05-03</a>, which was the basis for our implementation. This material will be submitted to the OMG. <h3> @@ -25,7 +25,7 @@ Unnecessary <i>ClientProtocolPolicy</i> complexity</h3> in CORBA 2.4 cautions against defining policies that can be set in both places: <blockquote><br> - If the <b><font FACE="Arial" SIZE="2">Policy </font></b> can be + If the <b><font FACE="Arial" SIZE="2">Policy </font></b> can be used with <b><font FACE="Arial" SIZE="2">POA </font></b>creation to tune <b><font FACE="Arial" SIZE="2">IOR </font></b>contents and can also be specified (overridden) in the client, specify how to reconcile the policy's @@ -98,6 +98,6 @@ provide different semantics or be invalid when used in another ORB, with both ORBs being compliant with the specification. </p> <hr> -<p><i>Last Modified: $Date$</i></p> +</p> </body> </html> diff --git a/TAO/docs/rtcorba/status.html b/TAO/docs/rtcorba/status.html index 54be0cc28aa..953a9a3a7bc 100644 --- a/TAO/docs/rtcorba/status.html +++ b/TAO/docs/rtcorba/status.html @@ -13,18 +13,18 @@ <a name="status"> <p>Support for <a href="http://www.omg.org">OMG</a> <a -href="http://cgi.omg.org/cgi-bin/doc?ptc/99-05-03">Real-Time CORBA 1.0 +href="http://www.omg.org/cgi-bin/doc?ptc/99-05-03">Real-Time CORBA 1.0 specification</a> has been added to TAO. For an overview of Real-time CORBA features, please see the <A -HREF="http://www.cs.wustl.edu/~schmidt/report-doc.html#rt">C/C++ Users +HREF="http://www.dre.vanderbilt.edu/~schmidt/report-doc.html#rt">C/C++ Users Journal columns</A> written by <A -HREF="http://www.cs.wustl.edu/~schmidt/">Douglas Schmidt</A> and <A +HREF="http://www.dre.vanderbilt.edu/~schmidt/">Douglas Schmidt</A> and <A HREF="http://www.iona.com/hyplan/vinoski/">Steve Vinoski</a>. For a detailed design discussions and results of empirical performance analyzes of TAO's Real-time CORBA implementation, please see the <A -HREF="http://www.cs.wustl.edu/~schmidt/doc-group.html">DOC group's</a> +HREF="http://www.dre.vanderbilt.edu/">DOC group's</a> <A -HREF="http://www.cs.wustl.edu/~schmidt/corba-research-realtime.html">Real-time +HREF="http://www.dre.vanderbilt.edu/~schmidt/corba-research-realtime.html">Real-time CORBA research page</A>. <p>As usual, questions, comments, and contributions should be posted @@ -126,6 +126,6 @@ for their implementation: <hr> <i> -<p>Last modified: $Date$</i></p> +</p> </body> </html> diff --git a/TAO/docs/tutorials/Quoter/AMI/index.html b/TAO/docs/tutorials/Quoter/AMI/index.html index 4cf10eba649..d17b0ea1d5d 100644 --- a/TAO/docs/tutorials/Quoter/AMI/index.html +++ b/TAO/docs/tutorials/Quoter/AMI/index.html @@ -20,19 +20,19 @@ tool. In that case sending the requests in sequence is going to yield poor performance; we are not taking advantage of the natural - parallelism in distributed systems, since we are waiting for the + parallelism in distributed systems, since we are waiting for the first response to come back before sending the next query. Traditionally this problem has been attacked using either <CODE>oneway</CODE> calls or multiple threads. Both approaches can work, but they have some disadvantages: multi-threading programming can be hard and error-prone, - oneways are unreliable and require callback interfaces to return + oneways are unreliable and require callback interfaces to return the stock value. Recently the OMG approved the CORBA Messaging specification that extends the basic invocation model to include asynchronous calls. Unlike the old deferred synchronous model, the new model uses - the IDL compiler and the SII to achieve type safety and improved + the IDL compiler and the SII to achieve type safety and improved performance, but the application does not block waiting for a response. Instead, it gives the ORB a reference to a reply handler that will receive the response asynchronously. @@ -69,7 +69,7 @@ $ $ACE_ROOT/TAO/TAO_IDL/tao_idl -GC Quoter.idl AMI_Single_Query_StockHandler_ptr ami_handler ); </PRE> - <P>This is the operation used to send a request asynchronously. The + <P>This is the operation used to send a request asynchronously. The response is received in the handler object. This is a regular CORBA object with the following IDL interface: </P> @@ -85,7 +85,7 @@ interface AMI_Single_Query_StockHandler { constructs from your original IDL. Notice how the arguments are generated. The first argument is simply the return value, then the output arguments show up, but - as <EM>input</EM> only since the handler has to receive the + as <EM>input</EM> only since the handler has to receive the reply. </P> @@ -164,7 +164,7 @@ private: </P> <P>You can use the following files to complete your implementation: the <A HREF="Quoter.idl">Quoter.idl</A>, - <A HREF="Handler_i.h">Handler_i.h</A>, + <A HREF="Handler_i.h">Handler_i.h</A>, <A HREF="Handler_i.cpp">Handler_i.cpp</A>. Remember that the simple client main program (located @@ -211,18 +211,14 @@ static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED" </PRE> <P>There are many other configuration options, all of them documented in - <A HREF="http://ace.cs.wustl.edu/cvsweb/ace-latest.cgi/ACE_wrappers/TAO/docs/Options.html">Options.html</A>, - in - <A HREF="http://ace.cs.wustl.edu/cvsweb/ace-latest.cgi/ACE_wrappers/TAO/docs/configurations.html">configurations.html</A>, + <A HREF="../../../Options.html">Options.html</A>, + in + <A HREF="../../../configurations.html">configurations.html</A>, and in the Developer's Guide available from <A HREF="http://www.theaceorb.com/">OCI</A>. </P> <hr> <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address> -<!-- Created: Sat Nov 27 15:47:01 CST 1999 --> -<!-- hhmts start --> -Last modified: Thu Mar 29 16:04:44 PST 2001 -<!-- hhmts end --> </body> </html> diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/index.html b/TAO/docs/tutorials/Quoter/Naming_Service/index.html index 8e27fbb6b01..a6f05983019 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/index.html +++ b/TAO/docs/tutorials/Quoter/Naming_Service/index.html @@ -247,14 +247,10 @@ $ $TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming -f name_service.dat <P>Notice that this is little use unless your services are persistent too, or can be automatically restarted. That is the role of the - <A HREF="http://ace.cs.wustl.edu/cvsweb/ace-latest.cgi/ACE_wrappers/TAO/docs/implrepo/index.html">Implementation Repository</A>. + <A HREF="../../../../docs/implrepo/index.html">Implementation Repository</A>. </P> <hr> <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address> -<!-- Created: Sat Nov 27 15:47:01 CST 1999 --> -<!-- hhmts start --> -Last modified: Sun Apr 1 14:09:33 PDT 2001 -<!-- hhmts end --> </body> </html> diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen index 00529552e60..604027c0130 100644 --- a/TAO/etc/tao.doxygen +++ b/TAO/etc/tao.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -996,7 +997,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1141,7 +1142,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1177,6 +1178,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1200,12 +1212,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1321,7 +1333,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1329,8 +1341,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1338,23 +1349,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1447,7 +1456,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1459,7 +1468,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1486,8 +1495,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1548,7 +1557,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1561,7 +1570,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1748,7 +1757,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1931,9 +1940,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen index 9cd114be54e..bd72e78dda9 100644 --- a/TAO/etc/tao_anytypecode.doxygen +++ b/TAO/etc/tao_anytypecode.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/AnyTypeCode # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen index 8c630226385..f26c08c4b54 100644 --- a/TAO/etc/tao_av.doxygen +++ b/TAO/etc/tao_av.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -788,7 +789,7 @@ INPUT = TAO/orbsvcs/orbsvcs/AVStreams.idl \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -997,7 +998,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1142,7 +1143,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1178,6 +1179,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1201,12 +1213,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1322,7 +1334,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1330,8 +1342,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1339,23 +1350,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1448,7 +1457,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1460,7 +1469,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1487,8 +1496,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1549,7 +1558,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1562,7 +1571,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1749,7 +1758,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1932,9 +1941,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen index a5727185284..54040af035d 100644 --- a/TAO/etc/tao_compression.doxygen +++ b/TAO/etc/tao_compression.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/Compression # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen index 7abfbf04ee8..54adc66fd16 100644 --- a/TAO/etc/tao_cosevent.doxygen +++ b/TAO/etc/tao_cosevent.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -787,7 +788,7 @@ INPUT = TAO/orbsvcs/orbsvcs/CosEventComm.idl \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -996,7 +997,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1141,7 +1142,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1177,6 +1178,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1200,12 +1212,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1321,7 +1333,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1329,8 +1341,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1338,23 +1349,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1447,7 +1456,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1459,7 +1468,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1486,8 +1495,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1548,7 +1557,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1561,7 +1570,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1748,7 +1757,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1931,9 +1940,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen index 507cbf213f1..fcc98f75329 100644 --- a/TAO/etc/tao_cosnaming.doxygen +++ b/TAO/etc/tao_cosnaming.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -786,7 +787,7 @@ INPUT = TAO/orbsvcs/orbsvcs/CosNaming.idl \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -995,7 +996,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1140,7 +1141,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1176,6 +1177,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1199,12 +1211,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1320,7 +1332,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1328,8 +1340,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1337,23 +1348,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1446,7 +1455,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1458,7 +1467,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1485,8 +1494,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1547,7 +1556,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1560,7 +1569,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1747,7 +1756,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1930,9 +1939,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen index ca8648af969..ee0a940f956 100644 --- a/TAO/etc/tao_cosnotification.doxygen +++ b/TAO/etc/tao_cosnotification.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -792,7 +793,7 @@ INPUT = TAO/orbsvcs/orbsvcs/CosNotification.idl \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -1000,7 +1001,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1145,7 +1146,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1181,6 +1182,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1204,12 +1216,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1325,7 +1337,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1333,8 +1345,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1342,23 +1353,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1451,7 +1460,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1463,7 +1472,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1490,8 +1499,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1552,7 +1561,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1565,7 +1574,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1752,7 +1761,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1935,9 +1944,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen index 4cb211117a0..cfd1bc9a5ab 100644 --- a/TAO/etc/tao_costime.doxygen +++ b/TAO/etc/tao_costime.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -786,7 +787,7 @@ INPUT = TAO/orbsvcs/orbsvcs/TimeService.idl \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -995,7 +996,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1140,7 +1141,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1176,6 +1177,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1199,12 +1211,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1320,7 +1332,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1328,8 +1340,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1337,23 +1348,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1446,7 +1455,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1458,7 +1467,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1485,8 +1494,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1547,7 +1556,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1560,7 +1569,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1747,7 +1756,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1930,9 +1939,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen index ad5b29ab7c2..ad31f4feefe 100644 --- a/TAO/etc/tao_costrader.doxygen +++ b/TAO/etc/tao_costrader.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -788,7 +789,7 @@ INPUT = TAO/orbsvcs/orbsvcs/CosTrading.idl \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -996,7 +997,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1141,7 +1142,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1177,6 +1178,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1200,12 +1212,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1321,7 +1333,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1329,8 +1341,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1338,23 +1349,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1447,7 +1456,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1459,7 +1468,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1486,8 +1495,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1548,7 +1557,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1561,7 +1570,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1748,7 +1757,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1931,9 +1940,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen index 49330681b86..843f969ad68 100644 --- a/TAO/etc/tao_dynamicany.doxygen +++ b/TAO/etc/tao_dynamicany.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/DynamicAny # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen index 514cecdfea8..4b79885bbb9 100644 --- a/TAO/etc/tao_dynamicinterface.doxygen +++ b/TAO/etc/tao_dynamicinterface.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/DynamicInterface # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen index 5519751ff9d..67a4ddebb1b 100644 --- a/TAO/etc/tao_esf.doxygen +++ b/TAO/etc/tao_esf.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/orbsvcs/orbsvcs/ESF # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -994,7 +995,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1139,7 +1140,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1175,6 +1176,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1198,12 +1210,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1319,7 +1331,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1327,8 +1339,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1336,23 +1347,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1445,7 +1454,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1457,7 +1466,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1484,8 +1493,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1546,7 +1555,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1559,7 +1568,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1746,7 +1755,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1929,9 +1938,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen index b1a4f32b523..af53105da2f 100644 --- a/TAO/etc/tao_ifr.doxygen +++ b/TAO/etc/tao_ifr.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/orbsvcs/IFR_Service # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -991,7 +992,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1136,7 +1137,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1172,6 +1173,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1195,12 +1207,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1316,7 +1328,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1324,8 +1336,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1333,23 +1344,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1442,7 +1451,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1454,7 +1463,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1481,8 +1490,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1543,7 +1552,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1556,7 +1565,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1743,7 +1752,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1926,9 +1935,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen index eb7a6f52356..86f1eccfd33 100644 --- a/TAO/etc/tao_implrepo.doxygen +++ b/TAO/etc/tao_implrepo.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/orbsvcs/ImplRepo_Service # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen index 4a9689ca412..92e574c3fcf 100644 --- a/TAO/etc/tao_iormanip.doxygen +++ b/TAO/etc/tao_iormanip.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/IORManipulation # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen index 283a1ff1180..a0a53a597f9 100644 --- a/TAO/etc/tao_iortable.doxygen +++ b/TAO/etc/tao_iortable.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/IORTable # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen index 958c1c308cb..c1d8212d363 100644 --- a/TAO/etc/tao_pi.doxygen +++ b/TAO/etc/tao_pi.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/PI # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen index bd2c419e8fc..a9747710827 100644 --- a/TAO/etc/tao_pi_server.doxygen +++ b/TAO/etc/tao_pi_server.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/PI_Server # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen index 9a5cf862dc5..530ca0bd732 100644 --- a/TAO/etc/tao_portablegroup.doxygen +++ b/TAO/etc/tao_portablegroup.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -787,7 +788,7 @@ INPUT = TAO/orbsvcs/orbsvcs/miop.idl \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -995,7 +996,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1140,7 +1141,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1176,6 +1177,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1199,12 +1211,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1320,7 +1332,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1328,8 +1340,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1337,23 +1348,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1446,7 +1455,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1458,7 +1467,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1485,8 +1494,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1547,7 +1556,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1560,7 +1569,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1747,7 +1756,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1930,9 +1939,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen index 380ae4b662b..591e8ed9046 100644 --- a/TAO/etc/tao_portableserver.doxygen +++ b/TAO/etc/tao_portableserver.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/PortableServer # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen index 1e1c4006656..c22bc6998b3 100644 --- a/TAO/etc/tao_rtcorba.doxygen +++ b/TAO/etc/tao_rtcorba.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/RTCORBA # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen index 89133dea20c..38568c80101 100644 --- a/TAO/etc/tao_rtevent.doxygen +++ b/TAO/etc/tao_rtevent.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -794,7 +795,7 @@ INPUT = TAO/orbsvcs/orbsvcs/RtecEventComm.idl \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -1005,7 +1006,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1150,7 +1151,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1186,6 +1187,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1209,12 +1221,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1330,7 +1342,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1338,8 +1350,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1347,23 +1358,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1456,7 +1465,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1468,7 +1477,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1495,8 +1504,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1557,7 +1566,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1570,7 +1579,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1757,7 +1766,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1940,9 +1949,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen index 1c8b6d449c0..7f1af2550c0 100644 --- a/TAO/etc/tao_rtportableserver.doxygen +++ b/TAO/etc/tao_rtportableserver.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/RTPortableServer # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen index af2fe66ba34..dd3458c14e1 100644 --- a/TAO/etc/tao_security.doxygen +++ b/TAO/etc/tao_security.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -790,7 +791,7 @@ INPUT = TAO/orbsvcs/orbsvcs/Security.idl \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -999,7 +1000,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1144,7 +1145,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1180,6 +1181,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1203,12 +1215,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1324,7 +1336,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1332,8 +1344,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1341,23 +1352,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1450,7 +1459,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1462,7 +1471,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1489,8 +1498,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1551,7 +1560,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1564,7 +1573,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1751,7 +1760,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1934,9 +1943,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen index 7ce3e7a8d08..3adf711b6c7 100644 --- a/TAO/etc/tao_smartproxies.doxygen +++ b/TAO/etc/tao_smartproxies.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/SmartProxies # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen index 0b294e28f56..5ab0462b0b8 100644 --- a/TAO/etc/tao_ssliop.doxygen +++ b/TAO/etc/tao_ssliop.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -790,7 +791,7 @@ INPUT = TAO/orbsvcs/orbsvcs/Security.idl \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -999,7 +1000,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1144,7 +1145,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1180,6 +1181,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1203,12 +1215,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1324,7 +1336,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1332,8 +1344,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1341,23 +1352,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1450,7 +1459,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1462,7 +1471,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1489,8 +1498,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1551,7 +1560,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1564,7 +1573,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1751,7 +1760,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1934,9 +1943,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen index c4f912e4125..b55756944eb 100644 --- a/TAO/etc/tao_strategies.doxygen +++ b/TAO/etc/tao_strategies.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/Strategies # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen index e2cf6baa04e..c8efa104f6e 100644 --- a/TAO/etc/tao_transportcurrent.doxygen +++ b/TAO/etc/tao_transportcurrent.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/TransportCurrent # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen index d388b51eb8e..7ffa5880728 100644 --- a/TAO/etc/tao_ziop.doxygen +++ b/TAO/etc/tao_ziop.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 8 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -785,7 +786,7 @@ INPUT = TAO/tao/ZIOP # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -993,7 +994,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1138,7 +1139,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1174,6 +1175,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = NO +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1197,12 +1209,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1318,7 +1330,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1326,8 +1338,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1335,23 +1346,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1444,7 +1453,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1456,7 +1465,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1483,8 +1492,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest @@ -1545,7 +1554,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1558,7 +1567,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1745,7 +1754,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1928,9 +1937,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO diff --git a/TAO/examples/Advanced/ch_18/client.cpp b/TAO/examples/Advanced/ch_18/client.cpp index ca3f0ca4c89..c7603921699 100644 --- a/TAO/examples/Advanced/ch_18/client.cpp +++ b/TAO/examples/Advanced/ch_18/client.cpp @@ -236,9 +236,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Get reference to initial naming context. CosNaming::NamingContext_var inc - = resolve_init<CosNaming::NamingContext>( - orb.in(), "NameService" - ); + = resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"); // Look for controller in the Naming Service. CosNaming::Name n; diff --git a/TAO/examples/Advanced/ch_18/server.h b/TAO/examples/Advanced/ch_18/server.h index 4888e9a9389..bdb54aa4787 100644 --- a/TAO/examples/Advanced/ch_18/server.h +++ b/TAO/examples/Advanced/ch_18/server.h @@ -170,8 +170,7 @@ public: const PortableServer::ObjectId & oid, PortableServer::POA_ptr poa, const char * operation, - void * & cookie - ); + void * & cookie); virtual void postinvoke( @@ -179,8 +178,7 @@ public: PortableServer::POA_ptr /* poa */, const char * /* operation */, void * /* cookie */, - PortableServer::Servant /* servant */ - ) {} + PortableServer::Servant /* servant */) {} private: Controller_impl * m_ctrl; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp index 9e969f284cc..688e14eff77 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp @@ -308,8 +308,7 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t|%T): send_request : ") - ACE_TEXT ("about to call scheduler to inform block\n") - )); + ACE_TEXT ("about to call scheduler to inform block\n"))); #endif DSUI_EVENT_LOG (EDF_SCHED_FAM, CALL_KOKYU_DISPATCH_UPDATE_SCHEDULE, diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h index 9e66919b894..f29d4b42b52 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h @@ -72,8 +72,7 @@ public ::CORBA::LocalObject virtual EDF_Scheduling::SchedulingParameterPolicy_ptr - create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value - ); + create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value); void shutdown (void); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp index 58382e590b9..ba3caeee9c2 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp @@ -311,8 +311,7 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t|%T): send_request : ") - ACE_TEXT ("about to call scheduler to inform block\n") - )); + ACE_TEXT ("about to call scheduler to inform block\n"))); #endif kokyu_dispatcher_->update_schedule (guid.in (), diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp index 7ef371fe041..0639728d996 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp @@ -306,8 +306,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t|%T): send_request : ") - ACE_TEXT ("about to call scheduler to inform block\n") - )); + ACE_TEXT ("about to call scheduler to inform block\n"))); #endif kokyu_dispatcher_->update_schedule (guid.in (), diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h index 4989577cd04..bbd078cc7ec 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h @@ -72,8 +72,7 @@ public ::CORBA::LocalObject virtual MIF_Scheduling::SchedulingParameterPolicy_ptr - create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value - ); + create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value); void shutdown (void); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp index 94a2d5affd5..5193fbbae92 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp @@ -320,8 +320,7 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t|%T): send_request : ") - ACE_TEXT ("about to call scheduler to inform block\n") - )); + ACE_TEXT ("about to call scheduler to inform block\n"))); #endif kokyu_dispatcher_->update_schedule (guid.in (), diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h index 48ca109ea68..1ef90070061 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h @@ -88,8 +88,7 @@ public ::CORBA::LocalObject virtual MUF_Scheduling::SchedulingParameterPolicy_ptr - create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value - ); + create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value); void shutdown (void); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 7434ad5c740..01cf271ab38 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp @@ -122,8 +122,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { @@ -302,8 +301,7 @@ Worker::svc (void) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp index 0b4ad021f97..f4c54c08fff 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp @@ -122,8 +122,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { @@ -296,8 +295,7 @@ Worker::svc (void) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index ada335dc7f1..d6e1f1ae4c3 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -127,8 +127,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { @@ -366,8 +365,7 @@ Worker::svc (void) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp index 5514107d1ee..ddc3bae71cf 100644 --- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp @@ -74,7 +74,7 @@ Grid_Client_i::run (const char *name, height_); ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Made the grid succesfully\n")); + "(%P|%t) Made the grid successfully\n")); for (CORBA::Short index_ = 0; index_ < width_; index_++) { diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp index 30b6490e315..6073083f88f 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp @@ -65,7 +65,7 @@ Persistent_Client_i::run (const char *name, height_); ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Made the grid succesfully\n")); + "(%P|%t) Made the grid successfully\n")); for (CORBA::Short index_ = 0; index_ < height_; index_++) diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index 72f7bb4ebe0..eb6e6a10137 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp @@ -126,9 +126,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) client->wait (); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (1, // ethernalize objects + 0); // wait for completion orb->destroy (); diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index 87e563c6ab8..91741c7b2b2 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -162,9 +162,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (1, // ethernalize objects + 0); // wait for completion orb->destroy (); diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp index 7db658e5b40..c3405df96d7 100644 --- a/TAO/examples/Simple/grid/Grid_Client_i.cpp +++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp @@ -82,7 +82,7 @@ Grid_Client_i::run (const char *name, height_); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Made the grid succesfully\n"))); + ACE_TEXT ("(%P|%t) Made the grid successfully\n"))); // Set a value on the grid grid->set (setx_, diff --git a/TAO/examples/Simulator/DOVEBrowser/MTQueue.java b/TAO/examples/Simulator/DOVEBrowser/MTQueue.java index 6c995dc390b..e110a4c38cb 100644 --- a/TAO/examples/Simulator/DOVEBrowser/MTQueue.java +++ b/TAO/examples/Simulator/DOVEBrowser/MTQueue.java @@ -186,7 +186,7 @@ public class MTQueue class MTQueue_Node { public MTQueue_Node prev_ = null; - public MTQueue_Node next_ = null;; + public MTQueue_Node next_ = null; public Object data_; public MTQueue_Node(Object data) diff --git a/TAO/examples/Simulator/DOVEBrowser/Queue.java b/TAO/examples/Simulator/DOVEBrowser/Queue.java index 51a52c98aac..ffa15a882a1 100644 --- a/TAO/examples/Simulator/DOVEBrowser/Queue.java +++ b/TAO/examples/Simulator/DOVEBrowser/Queue.java @@ -134,7 +134,7 @@ public class Queue class Queue_Node { public Queue_Node prev_ = null; - public Queue_Node next_ = null;; + public Queue_Node next_ = null; public Object data_; public Queue_Node(Object data) diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc index 6cbb9fae704..8175d935c06 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc @@ -9,4 +9,7 @@ project : orbsvcsexe, install, concurrency_serv, naming, utils, svc_utils { InstallData_Files { README } + + Documentation_Files { + } } diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc index cb473488432..9309367eff7 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc @@ -9,4 +9,7 @@ project : orbsvcsexe, install, naming, event_serv, svc_utils, iortable, messagin InstallData_Files { README } + + Documentation_Files { + } } diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/README b/TAO/orbsvcs/DevGuideExamples/ImplRepo/README index f212d0cd511..cdef0f65b2f 100644 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/README +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/README @@ -1,5 +1,3 @@ - - DevGuideExamples/ImplRepo/README This directory contains a CORBA example illustrating use of the TAO @@ -16,13 +14,13 @@ $TAO_ROOT/orbsvcs/ImplRepo_Service/ImplRepo_Service -o implrepo.ior Register the server's POA name and start-up command with the ImplRepo: ---------------------------------------------------------------------- $TAO_ROOT/orbsvcs/ImplRepo_Service/tao_imr -ORBInitRef \ - ImplRepoService=file://implrepo.ior add MessengerService \ - -c "MessengerServer -ORBUseIMR 1 -ORBInitRef ImplRepoService=file://implrepo.ior" + ImplRepoService=file://implrepo.ior add MessengerService \ + -c "MessengerServer -ORBUseIMR 1 -ORBInitRef ImplRepoService=file://implrepo.ior" Generate an IMRified Object Reference for the MessengerService: --------------------------------------------------------------- $TAO_ROOT/orbsvcs/ImplRepo_Service/tao_imr -ORBInitRef \ - ImplRepoService=file://implrepo.ior ior MessengerService -f Messenger.ior + ImplRepoService=file://implrepo.ior ior MessengerService -f Messenger.ior Run the client (ImplRepo should automatically start the server): ---------------------------------------------------------------- diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp index ddc2a0b93ee..9e0a217a91a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp @@ -71,13 +71,10 @@ Messenger_i::~Messenger_i (void) { } -CORBA::Boolean Messenger_i::send_message ( - const char * user_name, +CORBA::Boolean Messenger_i::send_message (const char * user_name, const char * subject, - char *& message - ) + char *& message) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp index e80efb54cee..18b8b30e45b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp @@ -9,10 +9,8 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) void StructuredEventConsumer_i::push_structured_event( - const CosNotification::StructuredEvent &event - ) + const CosNotification::StructuredEvent &event) { - std::cout << "event received " << std::endl; const char *value; @@ -21,26 +19,22 @@ StructuredEventConsumer_i::push_structured_event( event.filterable_data[i].value >>= value; std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; } - } void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void StructuredEventConsumer_i::offer_change( const CosNotification::EventTypeSeq &, - const CosNotification::EventTypeSeq & - ) + const CosNotification::EventTypeSeq &) { } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h index caa915228d8..9220062f2f9 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h @@ -10,13 +10,11 @@ public: StructuredEventConsumer_i(CORBA::ORB_ptr orb); virtual void push_structured_event( - const CosNotification::StructuredEvent ¬ification - ); + const CosNotification::StructuredEvent ¬ification); virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); virtual void disconnect_structured_push_consumer(); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp index b11df7abb34..11cb57adaf5 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); @@ -22,8 +21,7 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () void StructuredEventSupplier_i::subscription_change ( const CosNotification::EventTypeSeq &, - const CosNotification::EventTypeSeq & - ) + const CosNotification::EventTypeSeq &) { } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h index 6921775d62e..3d586828ac1 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h @@ -13,8 +13,8 @@ public: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); + private: CORBA::ORB_var orb_; }; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp index 2def116b05a..ea1a56d9e66 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp @@ -117,13 +117,10 @@ Messenger_i::~Messenger_i (void) { } -CORBA::Boolean Messenger_i::send_message ( - const char * user_name, +CORBA::Boolean Messenger_i::send_message (const char * user_name, const char * subject, - char *& message - ) + char *& message) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index 3199efb2a53..1052ea3760e 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -450,8 +450,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) this->this_name_.length (1); this->this_name_[0].id = CORBA::string_dup (this->ns_name_); - this->naming_context_->rebind (this->this_name_, this_obj.in() //CORBA::Object::_duplicate(this_obj) - ); + this->naming_context_->rebind (this->this_name_, this_obj.in()); } } diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp index b1649c0eb44..fd630201645 100644 --- a/TAO/orbsvcs/IFR_Service/be_global.cpp +++ b/TAO/orbsvcs/IFR_Service/be_global.cpp @@ -170,8 +170,7 @@ BE_GlobalData::parse_args (long &i, char **av) ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("IDL: I don't understand the '%s' option\n"), - av[i] - )); + av[i])); ACE_OS::exit (99); } diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp index 79b85bd6728..3590aaad0f8 100644 --- a/TAO/orbsvcs/IFR_Service/be_produce.cpp +++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp @@ -175,8 +175,7 @@ BE_produce (void) ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("(%N:%l) BE_produce -") - ACE_TEXT (" failed to accept removing visitor\n") - )); + ACE_TEXT (" failed to accept removing visitor\n"))); BE_abort (); } @@ -192,8 +191,7 @@ BE_produce (void) ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("(%N:%l) BE_produce -") - ACE_TEXT (" failed to accept adding visitor\n") - )); + ACE_TEXT (" failed to accept adding visitor\n"))); BE_abort (); } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp index 12741f1a6ae..da0846fb285 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp @@ -87,8 +87,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node) ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -") - ACE_TEXT (" bad node in this scope\n") - ), + ACE_TEXT (" bad node in this scope\n")), -1 ); } @@ -106,8 +105,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node) ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -") - ACE_TEXT (" failed to accept visitor\n") - ), + ACE_TEXT (" failed to accept visitor\n")), -1 ); } @@ -125,9 +123,7 @@ ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node) try { this->ir_current_ = - be_global->repository ()->get_primitive ( - this->predefined_type_to_pkind (node) - ); + be_global->repository ()->get_primitive (this->predefined_type_to_pkind (node)); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp index ecfe8758e38..dcae5824b66 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp @@ -322,7 +322,7 @@ Activator_Options::load_registry_options () // If there aren't any saved parameters, then that's ok. return 0; } - char tmpstr[4096]; + ACE_TCHAR tmpstr[4096]; DWORD sz = sizeof (tmpstr); DWORD type = 0; err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("ORBInitOptions"), 0, &type, @@ -331,7 +331,7 @@ Activator_Options::load_registry_options () { ACE_ASSERT (type == REG_SZ); tmpstr[sz - 1] = '\0'; - this->cmdline_ = tmpstr; + this->cmdline_ = ACE_TEXT_ALWAYS_CHAR(tmpstr); } sz = sizeof(tmpstr); @@ -341,7 +341,7 @@ Activator_Options::load_registry_options () { ACE_ASSERT (type == REG_SZ); tmpstr[sz - 1] = '\0'; - this->ior_output_file_ = ACE_TEXT_CHAR_TO_TCHAR(tmpstr); + this->ior_output_file_ = tmpstr; } sz = sizeof(debug_); @@ -359,7 +359,7 @@ Activator_Options::load_registry_options () { ACE_ASSERT (type == REG_SZ); tmpstr[sz - 1] = '\0'; - this->name_ = tmpstr; + this->name_ = ACE_TEXT_ALWAYS_CHAR(tmpstr); } DWORD tmpint = 0; diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h index 7e9b375611a..e68d48075fc 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h @@ -57,7 +57,7 @@ public: bool service (void) const; /// Notify the ImR when server processes die. - /// Note : Currently this only works on Unix. + /// @note Currently this only works on Unix. bool notify_imr (void) const; /// When notifying of child death, pause this number of milliseconds @@ -110,8 +110,12 @@ private: /// Should we run as a service? bool service_; + /// Notify the ImR when server processes die. + /// @note Currently this only works on Unix. bool notify_imr_; + /// When notifying of child death, pause this number of milliseconds + /// to simulate a heavily loaded server. unsigned int induce_delay_; /// SC_NONE, SC_INSTALL, SC_REMOVE, ... diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp index 371fcc7943b..b5175d47571 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp @@ -26,9 +26,7 @@ AsyncAccessManager::AsyncAccessManager (UpdateableServerInfo &info, { if (ImR_Locator_i::debug () > 4) { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::ctor server = %C pid = %d, %d\n"), - this, info->ping_id (), info->pid, info_->pid)); + this->report ("AsyncAccessManager"); } this->prev_pid_ = info_->pid; } @@ -37,37 +35,54 @@ AsyncAccessManager::~AsyncAccessManager (void) { if (ImR_Locator_i::debug () > 4) { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::dtor server = %C\n"), - this, info_->ping_id ())); + this->report ("~AsyncAccessManager"); } } void AsyncAccessManager::started_running (void) { + if (ImR_Locator_i::debug () > 4) + { + this->report ("started_running"); + } + this->update_status(ImplementationRepository::AAM_SERVER_STARTED_RUNNING); } bool -AsyncAccessManager::is_terminating (void) +AsyncAccessManager::is_terminating (void) const { return this->status_ == ImplementationRepository::AAM_ACTIVE_TERMINATE || remove_on_death_rh_ != 0; } bool -AsyncAccessManager::has_server (const char *s) +AsyncAccessManager::is_running (void) const +{ + if (this->info_->is_mode (ImplementationRepository::PER_CLIENT)) + { + return !CORBA::is_nil (this->server_.in()); + } + else + { + return this->info_->is_running (); + } +} + +bool +AsyncAccessManager::has_server (const char *s) const { return ACE_OS::strcmp (this->info_->ping_id (), s) == 0; } void -AsyncAccessManager::report (void) +AsyncAccessManager::report (const char* operation) const { + const Server_Info* si = info_.operator->(); ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@) - Server: %C, pid: %d, lastpid: %d, status: %C, waiters: %d\n"), - this, info_->ping_id (), info_->pid, this->prev_pid_, status_name (this->status_), this->rh_list_ .size())); + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@:%@)::%C - Server <%C> pid <%d> lastpid <%d> status <%C> running <%d> waiters <%d>\n"), + this, si, operation, info_->ping_id (), info_->pid, this->prev_pid_, status_name (this->status_), this->is_running(), this->rh_list_.size())); } void @@ -96,10 +111,7 @@ AsyncAccessManager::add_interest (ImR_ResponseHandler *rh, bool manual) if (ImR_Locator_i::debug () > 4) { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::add_interest status = %s\n"), - this, - status_name (this->status_))); + this->report ("add_interest"); } this->info_.notify_remote_access (this->status_); @@ -191,7 +203,7 @@ AsyncAccessManager::remote_state (ImplementationRepository::AAM_Status state) void AsyncAccessManager::final_state (bool active) { - bool success = this->status_ == ImplementationRepository::AAM_SERVER_READY; + bool const success = this->status_ == ImplementationRepository::AAM_SERVER_READY; this->info_.edit (active)->started (success); this->retries_ = this->info_->start_limit_; if (active) @@ -212,7 +224,7 @@ AsyncAccessManager::final_state (bool active) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state ") - ACE_TEXT ("removing this from map, server = <%C>\n"), + ACE_TEXT ("removing this from map, server <%C>\n"), this, info_->ping_id ())); } if (this->remove_on_death_rh_ != 0) @@ -237,7 +249,14 @@ AsyncAccessManager::notify_waiters (void) { if (this->status_ == ImplementationRepository::AAM_SERVER_READY) { - rh->send_ior (this->info_->partial_ior.c_str()); + if (this->info_->is_mode (ImplementationRepository::PER_CLIENT)) + { + rh->send_ior (this->partial_ior_.c_str()); + } + else + { + rh->send_ior (this->info_->partial_ior.c_str()); + } } else { @@ -262,7 +281,7 @@ AsyncAccessManager::notify_waiters (void) ("Server terminating."); default: { ACE_CString reason = ACE_CString ("AAM_Status is ") + - ACE_TEXT_ALWAYS_CHAR (status_name (this->status_)); + status_name (this->status_); throw ImplementationRepository::CannotActivate (reason.c_str()); } } @@ -288,44 +307,44 @@ AsyncAccessManager::is_final (ImplementationRepository::AAM_Status s) s == ImplementationRepository::AAM_RETRIES_EXCEEDED); } -const ACE_TCHAR * +const char * AsyncAccessManager::status_name (ImplementationRepository::AAM_Status s) { switch (s) { case ImplementationRepository::AAM_INIT: - return ACE_TEXT ("INIT"); + return "INIT"; case ImplementationRepository::AAM_SERVER_STARTED_RUNNING: - return ACE_TEXT ("SERVER_STARTED_RUNNING"); + return "SERVER_STARTED_RUNNING"; case ImplementationRepository::AAM_ACTIVATION_SENT: - return ACE_TEXT ("ACTIVATION_SENT"); + return "ACTIVATION_SENT"; case ImplementationRepository::AAM_WAIT_FOR_RUNNING: - return ACE_TEXT ("WAIT_FOR_RUNNING"); + return "WAIT_FOR_RUNNING"; case ImplementationRepository::AAM_WAIT_FOR_PING: - return ACE_TEXT ("WAIT_FOR_PING"); + return "WAIT_FOR_PING"; case ImplementationRepository::AAM_WAIT_FOR_ALIVE: - return ACE_TEXT ("WAIT_FOR_ALIVE"); + return "WAIT_FOR_ALIVE"; case ImplementationRepository::AAM_WAIT_FOR_DEATH: - return ACE_TEXT ("WAIT_FOR_DEATH"); + return "WAIT_FOR_DEATH"; case ImplementationRepository::AAM_SERVER_READY: - return ACE_TEXT ("SERVER_READY"); + return "SERVER_READY"; case ImplementationRepository::AAM_SERVER_DEAD: - return ACE_TEXT ("SERVER_DEAD"); + return "SERVER_DEAD"; case ImplementationRepository::AAM_NOT_MANUAL: - return ACE_TEXT ("NOT_MANUAL"); + return "NOT_MANUAL"; case ImplementationRepository::AAM_NO_ACTIVATOR: - return ACE_TEXT ("NO_ACTIVATOR"); + return "NO_ACTIVATOR"; case ImplementationRepository::AAM_NO_COMMANDLINE: - return ACE_TEXT ("NO_COMMANDLINE"); + return "NO_COMMANDLINE"; case ImplementationRepository::AAM_RETRIES_EXCEEDED: - return ACE_TEXT ("RETRIES_EXCEEDED"); + return "RETRIES_EXCEEDED"; case ImplementationRepository::AAM_UPDATE_FAILED: - return ACE_TEXT ("UPDATE_FAILED"); + return "UPDATE_FAILED"; case ImplementationRepository::AAM_ACTIVE_TERMINATE: - return ACE_TEXT ("ACTIVE_TERMINATE"); + return "ACTIVE_TERMINATE"; } - return ACE_TEXT ("<undefined status>"); + return "<undefined status>"; } ImplementationRepository::AAM_Status @@ -365,10 +384,7 @@ AsyncAccessManager::activator_replied (bool success, int pid) { if (ImR_Locator_i::debug () > 4) { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::activator_replied with ") - ACE_TEXT ("pid = %d this pid = %d, status = %s\n"), - this, pid, this->info_->pid, status_name (this->status_))); + this->report ("activator_replied"); } this->update_status (ImplementationRepository::AAM_SERVER_READY); this->info_.edit()->pid = pid; @@ -387,10 +403,7 @@ AsyncAccessManager::shutdown_initiated (void) { if (ImR_Locator_i::debug () > 4) { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::shutdown_initiated ") - ACE_TEXT ("on server <%C> pid=%d current status = %s\n"), - this, this->info_->ping_id(), this->info_->pid, status_name (this->status_))); + this->report ("shutdown_initiated"); } this->prev_pid_ = this->info_->pid; this->status (ImplementationRepository::AAM_ACTIVE_TERMINATE); @@ -407,10 +420,7 @@ AsyncAccessManager::server_is_shutting_down (void) { if (ImR_Locator_i::debug () > 4) { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::server_is_shutting_down ") - ACE_TEXT ("on server <%C> pid = %d prev_pid = %d, current status = %s\n"), - this, this->info_->ping_id(), this->info_->pid, this->prev_pid_, status_name (this->status_))); + this->report ("server_is_shutting_down"); } this->prev_pid_ = this->info_->pid; this->status (ImplementationRepository::AAM_SERVER_DEAD); @@ -423,15 +433,22 @@ AsyncAccessManager::server_is_running (const char *partial_ior, { if (ImR_Locator_i::debug () > 4) { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::server_is_running\n"), - this)); + this->report ("server_is_running-start"); } this->update_status (ImplementationRepository::AAM_WAIT_FOR_ALIVE); - this->info_.edit ()->partial_ior = partial_ior; - this->info_.edit ()->server = - ImplementationRepository::ServerObject::_duplicate (ref); + // Only when we are not using per client activation we should store the + // information of the started server within our repository + if (this->info_->is_mode (ImplementationRepository::PER_CLIENT)) + { + this->partial_ior_ = partial_ior; + this->server_ = ImplementationRepository::ServerObject::_duplicate (ref); + } + else + { + this->info_.edit ()->partial_ior = partial_ior; + this->info_.edit ()->server = ImplementationRepository::ServerObject::_duplicate (ref); + } if (this->locator_.pinger().is_alive (this->info_->ping_id()) == LS_ALIVE) { @@ -445,7 +462,7 @@ AsyncAccessManager::server_is_running (const char *partial_ior, ACE_NEW (l, AccessLiveListener (this->info_->ping_id(), this, this->locator_.pinger(), - this->info_->active_info()->server.in())); + this->server_.in ())); } else { @@ -460,6 +477,11 @@ AsyncAccessManager::server_is_running (const char *partial_ior, this->status (ImplementationRepository::AAM_SERVER_DEAD); this->final_state (); } + + if (ImR_Locator_i::debug () > 4) + { + this->report ("server_is_running-end"); + } } bool @@ -468,8 +490,8 @@ AsyncAccessManager::notify_child_death (int pid) if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@), child death, pid = %d, status = %s ") - ACE_TEXT ("this info_.pid = %d, prev_pid = %d, waiter count = %d\n"), + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@), child death, pid <%d>, status <%C> ") + ACE_TEXT ("this info_.pid <%d> prev_pid <%d> waiter count <%d>\n"), this, pid, status_name (status_), this->info_->pid, this->prev_pid_, this->rh_list_.size() )); } @@ -493,10 +515,7 @@ AsyncAccessManager::listener_disconnected (void) { if (ImR_Locator_i::debug () > 4) { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::listener_disconnected,") - ACE_TEXT (" this status %s\n"), - this, status_name (this->status_))); + this->report ("listener_disconnected"); } this->status (ImplementationRepository::AAM_SERVER_DEAD); @@ -509,8 +528,8 @@ AsyncAccessManager::ping_replied (LiveStatus server) if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::ping_replied %s,") - ACE_TEXT (" this status %s\n"), + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::ping_replied <%C>,") + ACE_TEXT (" this status <%C>\n"), this, LiveEntry::status_name (server), status_name (this->status_))); } @@ -579,8 +598,8 @@ AsyncAccessManager::send_start_request (void) if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager::send_start_request, manual_start_ %d\n"), - this->manual_start_)); + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::send_start_request, manual_start <%d>\n"), + this, this->manual_start_)); } if ((this->locator_.opts ()->lockout () && !this->info_.edit ()->start_allowed ()) || @@ -700,7 +719,7 @@ ActivatorReceiver::start_server_excep (Messaging::ExceptionHolder *holder) { if (ACE_OS::strstr (ca.reason.in(),"pid:") == ca.reason.in()) { - int pid = ACE_OS::atoi (ca.reason.in()+4); + int const pid = ACE_OS::atoi (ca.reason.in()+4); this->aam_->activator_replied (true, pid); } else @@ -741,8 +760,8 @@ ActivatorReceiver::kill_server_excep (Messaging::ExceptionHolder * ) //--------------------------------------------------------------------------- AccessLiveListener::AccessLiveListener (const char *server, - AsyncAccessManager *aam, - LiveCheck &pinger) + AsyncAccessManager *aam, + LiveCheck &pinger) :LiveListener (server), aam_ (aam->_add_ref ()), pinger_ (pinger), @@ -753,9 +772,9 @@ AccessLiveListener::AccessLiveListener (const char *server, } AccessLiveListener::AccessLiveListener (const char *server, - AsyncAccessManager *aam, - LiveCheck &pinger, - ImplementationRepository::ServerObject_ptr ref) + AsyncAccessManager *aam, + LiveCheck &pinger, + ImplementationRepository::ServerObject_ptr ref) :LiveListener (server), aam_ (aam->_add_ref ()), pinger_ (pinger), @@ -776,7 +795,7 @@ AccessLiveListener::~AccessLiveListener (void) bool AccessLiveListener::start (void) { - bool started = this->per_client_ ? + bool const started = this->per_client_ ? this->pinger_.add_per_client_listener (this, srv_ref_.in()) : this->pinger_.add_listener (this); if (!started) diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h index 02688459cd0..27038e826e4 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h @@ -58,8 +58,9 @@ class Locator_Export AsyncAccessManager void started_running (void); - bool is_terminating (void); - bool has_server (const char *name); + bool is_terminating (void) const; + bool is_running (void) const; + bool has_server (const char *name) const ; void remote_state (ImplementationRepository::AAM_Status s); void add_interest (ImR_ResponseHandler *rh, bool manual); @@ -77,12 +78,12 @@ class Locator_Export AsyncAccessManager AsyncAccessManager *_add_ref (void); void _remove_ref (void); - static const ACE_TCHAR *status_name (ImplementationRepository::AAM_Status s); + static const char *status_name (ImplementationRepository::AAM_Status s); static bool is_final (ImplementationRepository::AAM_Status s); - void report (void); void update_prev_pid (void); private: + void report (const char* operation) const; void final_state (bool active = true); void notify_waiters (void); void status (ImplementationRepository::AAM_Status s); @@ -102,6 +103,11 @@ class Locator_Export AsyncAccessManager int refcount_; TAO_SYNCH_MUTEX lock_; int prev_pid_; + + /// The cached server object in case this is a per client activated AAM + ImplementationRepository::ServerObject_var server_; + /// Current endpoint used by the server in case this is a per client activated AAM + ACE_CString partial_ior_; }; typedef TAO_Intrusive_Ref_Count_Handle<AsyncAccessManager> AsyncAccessManager_ptr; @@ -135,20 +141,19 @@ private: PortableServer::POA_var poa_; }; - //---------------------------------------------------------------------------- class AccessLiveListener : public LiveListener { public: AccessLiveListener (const char * server, - AsyncAccessManager *aam, - LiveCheck &pinger, - ImplementationRepository::ServerObject_ptr ref); + AsyncAccessManager *aam, + LiveCheck &pinger, + ImplementationRepository::ServerObject_ptr ref); AccessLiveListener (const char * server, - AsyncAccessManager *aam, - LiveCheck &pinger); + AsyncAccessManager *aam, + LiveCheck &pinger); virtual ~AccessLiveListener (void); bool start (void); @@ -163,8 +168,4 @@ class AccessLiveListener : public LiveListener ImplementationRepository::ServerObject_var srv_ref_; }; - - - - #endif /* IMR_ASYNCACCESSMANGER_H_ */ diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp index 8ebeff1cc95..4823ed44345 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp @@ -300,8 +300,8 @@ AsyncListManager::ping_replied (CORBA::ULong index, LiveStatus status, int pid) if (ImR_Locator_i::debug() > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncListManager(%@)::ping_replied, index = %d ") - ACE_TEXT ("status = %C, server pid = %d, waiters = %d\n"), + ACE_TEXT ("(%P|%t) AsyncListManager(%@)::ping_replied, index <%d> ") + ACE_TEXT ("status <%C>, server pid <%d>, waiters <%d>\n"), this,index, LiveEntry::status_name (status), pid, this->waiters_)); } if (evaluate_status (index, status, pid)) diff --git a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp index 22db7c9a3db..796eedfa606 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp @@ -87,7 +87,7 @@ void Config_Backing_Store::loadActivators () const ACE_CString name_cstr = ACE_TEXT_ALWAYS_CHAR (name.c_str ()); - Activator_Info* ai; + Activator_Info* ai = 0; ACE_NEW (ai, Activator_Info (name_cstr, token, ior)); Activator_Info_Ptr info (ai); diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index 9954d2288c2..dc8f16cd468 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -206,7 +206,7 @@ ImR_DSI_ResponseHandler::send_ior (const char *pior) { ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ImR_ResponseHandler::send_ior (): Invalid corbaloc ior.\n") - ACE_TEXT ("\t<%s>\n"), + ACE_TEXT ("\t<%C>\n"), ior.c_str())); } diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp index f879909fc52..1a4242e0cb0 100644 --- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp @@ -47,7 +47,7 @@ INS_Locator::async_locate (::IORTable::Locate_ResponseHandler handler, ACE_CString full (object_key); if (this->imr_locator_.split_key (full, key, si)) { - ImR_ResponseHandler *rh; + ImR_ResponseHandler *rh = 0; ACE_NEW (rh, INS_Loc_ResponseHandler (key.c_str(), handler)); this->imr_locator_.activate_server_by_info (si, rh); } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp index 26da1d2d24d..d190a34fcb1 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp @@ -140,8 +140,7 @@ run_service_command (Activator_Options& opts) pathname, 0, // group 0, // tag - DEPENDS_ON - ); + DEPENDS_ON); } else { diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index 89095eb746d..9267d47a2c3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -23,6 +23,7 @@ static ACE_CString getHostName () return ACE_CString (host_name); } +#if defined (ACE_WIN32) Active_Pid_Setter::Active_Pid_Setter(ImR_Activator_i &owner, pid_t pid) :owner_(owner) { @@ -33,6 +34,7 @@ Active_Pid_Setter::~Active_Pid_Setter() { owner_.active_check_pid_ = ACE_INVALID_PID; } +#endif /* ACE_WIN32 */ ImR_Activator_i::ImR_Activator_i (void) : registration_token_(0) @@ -81,7 +83,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti try { if (this->debug_ > 1) - ORBSVCS_DEBUG( (LM_DEBUG, "ImR Activator: Contacting ImplRepoService...\n")); + ORBSVCS_DEBUG( (LM_DEBUG, "(%P|%t) ImR Activator: Contacting ImplRepoService...\n")); // First, resolve the ImR, without this we can go no further CORBA::Object_var obj = @@ -97,7 +99,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti if (this->debug_ > 9) { CORBA::String_var ior = orb_->object_to_string (obj.in ()); - ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: ImplRepoService ior=<%C>\n", + ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: ImplRepoService ior <%C>\n", ior.in())); } @@ -105,22 +107,21 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti locator_->register_activator (name_.c_str (), activator); if (debug_ > 0) - ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: Registered with ImR.\n")); + ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: Registered with ImR.\n")); return; } else if (this->debug_ > 1) - ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: ImplRepoService not found\n")); + ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: ImplRepoService not found\n")); } catch (const CORBA::Exception& ex) { if (debug_ > 1) - ex._tao_print_exception ( - "ImR Activator: Can't register with ImR."); + ex._tao_print_exception ("ImR Activator: Can't register with ImR."); } if (debug_ > 0) - ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Not registered with ImR.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Not registered with ImR.\n")); } int @@ -170,7 +171,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt CORBA::String_var ior = this->orb_->object_to_string (activator.in ()); if (this->debug_ > 0) - ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: Starting %C\n", name_.c_str ())); + ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: Starting <%C>\n", name_.c_str ())); // initialize our process manager. // This requires a reactor that has signal handling. @@ -180,7 +181,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, reactor) == -1) { ORBSVCS_ERROR_RETURN ((LM_ERROR, - "The ACE_Process_Manager didnt get initialized\n"), -1); + "(%P|%t) ImR Activator: The ACE_Process_Manager didn't get initialized\n"), -1); } } @@ -193,7 +194,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt if (this->debug_ > 1) { ORBSVCS_DEBUG ((LM_DEBUG, - "ImR Activator: The Activator IOR is: <%C>\n", ior.in ())); + "(%P|%t) ImR Activator: The Activator IOR is: <%C>\n", ior.in ())); } // The last thing we do is write out the ior so that a test program can assume @@ -204,7 +205,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt if (fp == 0) { ORBSVCS_ERROR_RETURN ((LM_ERROR, - "ImR Activator: Could not open file: %s\n", opts.ior_filename ().c_str ()), -1); + "(%P|%t) ImR Activator: Could not open file <%s>\n", opts.ior_filename ().c_str ()), -1); } ACE_OS::fprintf (fp, "%s", ior.in ()); ACE_OS::fclose (fp); @@ -212,8 +213,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ( - "ImR_Activator_i::init_with_orb"); + ex._tao_print_exception ("ImR_Activator_i::init_with_orb"); throw; } return 0; @@ -229,10 +229,9 @@ ImR_Activator_i::init (Activator_Options& opts) ACE_ARGV av (ACE_TEXT_CHAR_TO_TCHAR (cmdline.c_str ())); int argc = av.argc (); - CORBA::ORB_var orb = - CORBA::ORB_init (argc, av.argv (), "TAO_ImR_Activator"); + CORBA::ORB_var orb = CORBA::ORB_init (argc, av.argv (), "TAO_ImR_Activator"); - int ret = this->init_with_orb(orb.in (), opts); + int const ret = this->init_with_orb(orb.in (), opts); return ret; } @@ -243,7 +242,7 @@ ImR_Activator_i::fini (void) try { if (debug_ > 1) - ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Shutting down...\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Shutting down...\n")); this->process_mgr_.close (); @@ -259,13 +258,13 @@ ImR_Activator_i::fini (void) { if (debug_ > 1) ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR Activator: Unable to unregister from ImR.\n"))); + ACE_TEXT ("(%P|%t) ImR Activator: COMM_FAILURE, unable to unregister from ImR.\n"))); } catch (const CORBA::TRANSIENT&) { if (debug_ > 1) ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR Activator: Unable to unregister from ImR.\n"))); + ACE_TEXT ("(%P|%t) ImR Activator: TRANSIENT, unable to unregister from ImR.\n"))); } catch (const CORBA::Exception& ex) { @@ -278,7 +277,7 @@ ImR_Activator_i::fini (void) this->orb_->destroy (); if (debug_ > 0) - ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Shut down successfully.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Shut down successfully.\n")); } catch (const CORBA::Exception& ex) { @@ -322,7 +321,7 @@ ImR_Activator_i::shutdown (bool signaled) if (signaled && this->in_upcall ()) { if (debug_ > 0) - ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: ignoring signal during upcall.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: ignoring signal during upcall.\n")); return; } if (! CORBA::is_nil (this->locator_.in ()) && this->registration_token_ != 0) @@ -347,9 +346,9 @@ ImR_Activator_i::kill_server (const char* name, CORBA::Long lastpid, CORBA::Shor { if (debug_ > 1) ORBSVCS_DEBUG((LM_DEBUG, - "ImR Activator: Killing server <%C>, lastpid = %d\n", + "(%P|%t) ImR Activator: Killing server <%C>, lastpid <%d>\n", name, lastpid)); - pid_t lpid = static_cast<pid_t>(lastpid); + pid_t const lpid = static_cast<pid_t>(lastpid); pid_t pid = 0; bool found = false; int result = -1; @@ -385,8 +384,8 @@ ImR_Activator_i::kill_server (const char* name, CORBA::Long lastpid, CORBA::Shor if (debug_ > 1) ORBSVCS_DEBUG((LM_DEBUG, - "ImR Activator: Killing server <%C> " - "signal %d to pid %d, found %d, this->notify_imr_ %d, result = %d\n", + "(%P|%t) ImR Activator: Killing server <%C> " + "signal <%d> to pid <%d> found <%d> this->notify_imr_ <%d> result <%d>\n", name, signum, static_cast<int> (pid), found, this->notify_imr_, result)); if (!found && result == 0 && this->notify_imr_) { @@ -407,7 +406,7 @@ ImR_Activator_i::still_alive (CORBA::Long pid) #if defined (ACE_WIN32) if (is_running) { - pid_t waitp = this->process_mgr_.wait (pt, ACE_Time_Value::zero); + pid_t const waitp = this->process_mgr_.wait (pt, ACE_Time_Value::zero); is_running = (waitp != pt); } #endif /* ACE_WIN32 */ @@ -458,29 +457,33 @@ ImR_Activator_i::start_server(const char* name, name += unique_prefix_len; } - // if (debug_ > 1) - ORBSVCS_DEBUG((LM_DEBUG, - "ImR Activator: Starting %C <%C>...\n", - (unique ? "unique server" : "server"), name)); + if (debug_ > 0) + { + ORBSVCS_DEBUG((LM_DEBUG, + "(%P|%t) ImR Activator: Starting %C <%C>...\n", + (unique ? "unique server" : "server"), name)); + } + pid_t pid; if (unique && this->still_running_i (name, pid)) { - // if (debug_ > 1) - ORBSVCS_DEBUG((LM_DEBUG, - "ImR Activator: Unique instance already running %d\n", - static_cast<int> (pid))); + if (debug_ > 0) + { + ORBSVCS_DEBUG((LM_DEBUG, + "(%P|%t) ImR Activator: Unique instance already running pid <%d>\n", + static_cast<int> (pid))); + } char reason[32]; ACE_OS::snprintf (reason,32,"pid:%d",static_cast<int> (pid)); throw ImplementationRepository::CannotActivate( CORBA::string_dup (reason)); } - ACE_TString cmdline_tstr(ACE_TEXT_CHAR_TO_TCHAR(cmdline)); - size_t cmdline_buf_len = cmdline_tstr.length(); - if (debug_ > 1) + size_t const cmdline_buf_len = ACE_OS::strlen(cmdline); + if (debug_ > 0) ORBSVCS_DEBUG((LM_DEBUG, - "\tcommand line : len=%d <%s>\n\tdirectory : <%C>\n", - cmdline_buf_len, cmdline_tstr.c_str(), dir) ); + "(%P|%t) ImR Activator: command line len <%d> <%C> directory <%C>\n", + cmdline_buf_len, cmdline, dir) ); ACE_Process_Options proc_opts ( 1, @@ -526,18 +529,17 @@ ImR_Activator_i::start_server(const char* name, if (pid == ACE_INVALID_PID) { ORBSVCS_ERROR ((LM_ERROR, - "ImR Activator: Cannot start server <%C> using <%C>\n", name, cmdline)); + "(%P|%t) ImR Activator: Cannot start server <%C> using <%C>\n", name, cmdline)); - throw ImplementationRepository::CannotActivate( - CORBA::string_dup ( - "Process Creation Failed")); + throw ImplementationRepository::CannotActivate(CORBA::string_dup ("Process Creation Failed")); } else { if (debug_ > 1) { ORBSVCS_DEBUG((LM_DEBUG, - "ImR Activator: register death handler for process %d\n", + "(%P|%t) ImR Activator: Register death handler for server <%C> pid <%d>\n", + name, static_cast<int> (pid))); } this->process_map_.rebind (pid, name); @@ -564,7 +566,7 @@ ImR_Activator_i::start_server(const char* name, if (debug_ > 0) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR Activator: Successfully started <%C>, pid=%d\n"), + ACE_TEXT ("(%P|%t) ImR Activator: Successfully started <%C> pid <%d>\n"), name, static_cast<int> (pid))); } } @@ -575,7 +577,6 @@ ImR_Activator_i::handle_exit_i (pid_t pid) // We use the process_manager so that we're notified when // any of our launched processes die. We notify the locator // when this happens. - ACE_CString name; if (this->process_map_.find (pid, name) == 0) { @@ -592,8 +593,8 @@ ImR_Activator_i::handle_exit_i (pid_t pid) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR Activator: Notifying ImR that ") - ACE_TEXT ("server[%d], <%C> has exited.\n"), - static_cast<int> (pid), name.c_str())); + ACE_TEXT ("server <%C> pid <%d> has exited.\n"), + name.c_str(), static_cast<int> (pid))); } try { @@ -604,8 +605,10 @@ ImR_Activator_i::handle_exit_i (pid_t pid) if (debug_ > 1) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR Activator: caught %s from locator::child_death_pid\n"), - ex._name())); + ACE_TEXT ("(%P|%t) ImR Activator: caught <%C> from locator::child_death_pid for server <%C> pid <%d>\n"), + ex._name(), + name.c_str (), + static_cast<int> (pid))); } } } @@ -628,7 +631,7 @@ ImR_Activator_i::handle_exit (ACE_Process * process) { ACE_Reactor *r = this->orb_->orb_core()->reactor(); ACE_Time_Value dtv (0, this->induce_delay_ * 1000); - pid_t pid = process->getpid(); + pid_t const pid = process->getpid(); Act_token_type token = static_cast<Act_token_type>(pid); r->schedule_timer (this, reinterpret_cast<void *>(token), dtv ); } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h index 29e7452055b..845588745b1 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h @@ -158,6 +158,7 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac pid_t active_check_pid_; }; +#if defined (ACE_WIN32) class Active_Pid_Setter { public: @@ -167,6 +168,6 @@ public: ImR_Activator_i &owner_; }; - +#endif /* ACE_WIN32 */ #endif /* IMR_ACTIVATOR_I_H */ diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index dc66ae97d43..ab6170391e6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -559,16 +559,16 @@ ImR_Locator_i::spawn_pid const char* name, CORBA::Long pid) { if (debug_ > 1) - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Server[%d] spawned <%C>.\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Server<%d> spawned <%C>.\n"), pid, name)); UpdateableServerInfo info(this->repository_, name); - if (! info.null ()) + if (!info.null ()) { if (debug_ > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR: Spawn_pid prev pid was %d becoming %d\n"), + ACE_TEXT ("(%P|%t) ImR: Spawn_pid prev pid was <%d> becoming <%d>\n"), info.edit ()->active_info ()->pid, pid)); } @@ -588,7 +588,8 @@ ImR_Locator_i::spawn_pid { if (debug_ > 1) ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR: Failed to find server in repository.\n"))); + ACE_TEXT ("(%P|%t) ImR: Failed to find server <%C> in repository\n"), + name)); } this->pinger_.set_pid (name, pid); @@ -779,20 +780,20 @@ ImR_Locator_i::add_or_update_server } if (debug_ > 0) - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Add/Update server <%C>.\n"), server)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Add/Update server <%C>\n"), server)); UpdateableServerInfo info(this->repository_, server); if (info.null ()) { if (debug_ > 1) - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Adding server <%C>.\n"), server)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Adding server <%C>\n"), server)); this->repository_->add_server (server, options); } else { if (debug_ > 1) - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Updating server <%C>.\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Updating server <%C>\n"), server)); info.edit ()->update_options (options); @@ -803,12 +804,11 @@ ImR_Locator_i::add_or_update_server { // Note : The info var may be null, so we use options. ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Server: %C\n") - ACE_TEXT ("\tActivator: %C\n") - ACE_TEXT ("\tCommand Line: %C\n") - ACE_TEXT ("\tWorking Directory: %C\n") - ACE_TEXT ("\tActivation: %C\n") - ACE_TEXT ("\tStart Limit: %d\n") - ACE_TEXT ("\n"), + ACE_TEXT ("\tActivator: <%C>\n") + ACE_TEXT ("\tCommand Line: <%C>\n") + ACE_TEXT ("\tWorking Directory: <%C>\n") + ACE_TEXT ("\tActivation: <%C>\n") + ACE_TEXT ("\tStart Limit: <%d>\n"), server, options.activator.in (), options.command_line.in (), @@ -818,7 +818,7 @@ ImR_Locator_i::add_or_update_server )); for (CORBA::ULong i = 0; i < options.environment.length (); ++i) - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Environment variable %C=%C\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Environment variable <%C>=<%C>\n"), options.environment[i].name.in (), options.environment[i].value.in ())); } @@ -1269,7 +1269,7 @@ ImR_Locator_i::server_is_running if (debug_ > 0) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR: Server %C is running at %C.\n"), + ACE_TEXT ("(%P|%t) ImR: Server <%C> is running at <%C>\n"), id, partial_ior)); } CORBA::String_var sior = orb_->object_to_string (server_object); @@ -1277,7 +1277,7 @@ ImR_Locator_i::server_is_running if (debug_ > 1) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR: Server %C callback at %C.\n"), + ACE_TEXT ("(%P|%t) ImR: Server <%C> callback at <%C>\n"), id, sior.in ())); } @@ -1294,7 +1294,7 @@ ImR_Locator_i::server_is_running if (debug_ > 0) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR: Auto adding NORMAL server <%C>.\n"), + ACE_TEXT ("(%P|%t) ImR: Auto adding NORMAL server <%C>\n"), id)); } @@ -1325,21 +1325,37 @@ ImR_Locator_i::server_is_running } else { + if (ImR_Locator_i::debug () > 4) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) ImR_Locator_i::server_is_running <%C> has mode <%C>\n"), + id, ImR_Utils::activationModeToString(info->mode ()))); + } + + AsyncAccessManager_ptr aam; if (!info->is_mode(ImplementationRepository::PER_CLIENT)) { info.edit ()->set_contact (partial_ior, sior.in(), srvobj.in()); info.update_repo(); this->pinger_.add_server (info->ping_id(), true, srvobj.in()); + + aam = this->find_aam (info->ping_id ()); + } + else + { + // In case of a per client activation there could be multiple AAM for a specific server (ping_id) + // we need to make sure we take an AAM that is not running yet + aam = this->find_not_running_aam (info->ping_id ()); } - AsyncAccessManager_ptr aam(this->find_aam (info->ping_id ())); if (!aam.is_nil()) { if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR_Locator_i::server_is_running aam is not nil\n"))); + ACE_TEXT ("(%P|%t) ImR_Locator_i::server_is_running <%C> aam is not nil\n"), + id)); } aam->server_is_running (partial_ior, srvobj.in()); } @@ -1348,7 +1364,8 @@ ImR_Locator_i::server_is_running if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR_Locator_i::server_is_running aam is nil\n"))); + ACE_TEXT ("(%P|%t) ImR_Locator_i::server_is_running <%C> aam is nil\n"), + id)); } if (!info->is_mode(ImplementationRepository::PER_CLIENT)) { @@ -1372,7 +1389,7 @@ ImR_Locator_i::server_is_shutting_down { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR_Locator_i::server_is_shutting_down: ") - ACE_TEXT ("Unknown server: %C\n"), + ACE_TEXT ("Unknown server <%C>\n"), fqname)); } _tao_rh->server_is_shutting_down (); @@ -1381,7 +1398,7 @@ ImR_Locator_i::server_is_shutting_down if (debug_ > 0) ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR: Server <%C> is shutting down.\n"), + ACE_TEXT ("(%P|%t) ImR: Server <%C> is shutting down\n"), fqname)); if (!info->is_mode(ImplementationRepository::PER_CLIENT)) @@ -1417,7 +1434,7 @@ ImR_Locator_i::find imr_info = si->createImRServerInfo (); if (debug_ > 1) - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Found server %C.\n"), id)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Found server <%C>\n"), id)); } else { @@ -1705,6 +1722,20 @@ ImR_Locator_i::find_aam (const char *name, bool active) } AsyncAccessManager * +ImR_Locator_i::find_not_running_aam (const char *name, bool active) +{ + AAM_Set &set = active ? this->aam_active_ : this->aam_terminating_; + for (AAM_Set::ITERATOR i = set.begin(); i != set.end(); ++i) + { + if ((*i)->has_server (name) && (!(*i)->is_running ())) + { + return (*i)->_add_ref(); + } + } + return 0; +} + +AsyncAccessManager * ImR_Locator_i::create_aam (UpdateableServerInfo &info, bool running) { AsyncAccessManager_ptr aam; @@ -1713,9 +1744,7 @@ ImR_Locator_i::create_aam (UpdateableServerInfo &info, bool running) { aam->started_running (); } - { - this->aam_active_.insert_tail (aam); - } + this->aam_active_.insert_tail (aam); return aam._retn (); } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h index 3577dc69a51..92a54053b0e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h @@ -173,6 +173,7 @@ public: void remove_aam (AsyncAccessManager_ptr &aam); void remove_aam (const char *name); AsyncAccessManager *find_aam (const char *name, bool active = true); + AsyncAccessManager *find_not_running_aam (const char *name, bool active = true); AsyncAccessManager *create_aam (UpdateableServerInfo &info, bool running = false); void make_terminating (AsyncAccessManager_ptr &aam, const char *name, int pid); /// Receiving an update from remote peer @@ -182,9 +183,7 @@ public: CORBA::Object_ptr set_timeout_policy(CORBA::Object_ptr obj, const ACE_Time_Value& to); - private: - bool get_info_for_name (const char *name, Server_Info_Ptr &si); void activate_server_i (UpdateableServerInfo& info, diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h index 3bf450734a3..bc8ea58d0a8 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h @@ -29,7 +29,7 @@ public: ImR_ResponseHandler (void); virtual ~ImR_ResponseHandler (void); - // dummy implementations used for internal operations + // Dummy implementations used for internal operations virtual void send_ior (const char *pior); virtual void send_exception (CORBA::Exception *ex); }; diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index 57efc1f6315..2f2d1bafca6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -191,4 +191,7 @@ project(tao_imr) : orbsvcsexe, install, avoids_minimum_corba, avoids_corba_e_com InstallData_Files { README } + + Documentation_Files { + } } diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index 0e3f7f88ec7..576c744eb74 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -35,7 +35,7 @@ LiveListener::_add_ref (void) if (ImR_Locator_i::debug () > 5) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("LiveListener::add_ref, %s, count = %d\n"), + ACE_TEXT ("(%P|%t) LiveListener::add_ref <%C> count <%d>\n"), server_.c_str(), refcount_)); } return this; @@ -51,7 +51,7 @@ LiveListener::_remove_ref (void) if (ImR_Locator_i::debug () > 5) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("LiveListener::remove_ref, %s, count = %d\n"), + ACE_TEXT ("(%P|%t) LiveListener::remove_ref <%C> count <%d>\n"), server_.c_str(), count)); } } @@ -67,31 +67,31 @@ LiveListener::_remove_ref (void) const int LiveEntry::reping_msec_[] = {10, 100, 500, 1000, 1000, 2000, 2000, 5000, 5000}; int LiveEntry::reping_limit_ = sizeof (LiveEntry::reping_msec_) / sizeof (int); -const ACE_TCHAR * +const char * LiveEntry::status_name (LiveStatus s) { switch (s) { case LS_INIT: - return ACE_TEXT ("INIT"); + return "INIT"; case LS_UNKNOWN: - return ACE_TEXT ("UNKNOWN"); + return "UNKNOWN"; case LS_PING_AWAY: - return ACE_TEXT ("PING_AWAY"); + return "PING_AWAY"; case LS_DEAD: - return ACE_TEXT ("DEAD"); + return "DEAD"; case LS_ALIVE: - return ACE_TEXT ("ALIVE"); + return "ALIVE"; case LS_TRANSIENT: - return ACE_TEXT ("TRANSIENT"); + return "TRANSIENT"; case LS_LAST_TRANSIENT: - return ACE_TEXT ("LAST_TRANSIENT"); + return "LAST_TRANSIENT"; case LS_TIMEDOUT: - return ACE_TEXT ("TIMEDOUT"); + return "TIMEDOUT"; case LS_CANCELED: - return ACE_TEXT ("CANCELED"); + return "CANCELED"; } - return ACE_TEXT ("<undefined status>"); + return "<undefined status>"; } void @@ -146,7 +146,7 @@ LiveEntry::LiveEntry (LiveCheck *owner, if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveEntry::ctor server = <%C>, may_ping = %d\n"), + ACE_TEXT ("(%P|%t) LiveEntry::ctor server <%C> may_ping <%d>\n"), server, may_ping)); } } @@ -174,7 +174,14 @@ LiveEntry::add_listener (LiveListener *ll) { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); LiveListener_ptr llp(ll->_add_ref()); - this->listeners_.insert (llp); + int const result = this->listeners_.insert (llp); + if (ImR_Locator_i::debug() > 4) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) LiveEntry::add_listener server <%C> result <%d>\n"), + this->server_.c_str(), + result)); + } } void @@ -182,11 +189,12 @@ LiveEntry::remove_listener (LiveListener *ll) { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); LiveListener_ptr llp(ll->_add_ref()); - int result = this->listeners_.remove (llp); + int const result = this->listeners_.remove (llp); if (ImR_Locator_i::debug() > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveEntry::remove_listener, result = %d\n"), + ACE_TEXT ("(%P|%t) LiveEntry::remove_listener server <%C> result <%d>\n"), + this->server_.c_str(), result)); } } @@ -206,8 +214,8 @@ LiveEntry::reset_status (void) if (ImR_Locator_i::debug () > 2) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveEntry::reset_status this = %x, ") - ACE_TEXT ("server = %C status = %s\n"), + ACE_TEXT ("(%P|%t) LiveEntry::reset_status this <%x>, ") + ACE_TEXT ("server <%C> status <%C>\n"), this, this->server_.c_str(), status_name (this->liveliness_))); } @@ -289,7 +297,7 @@ LiveEntry::status (LiveStatus l) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::status change, ") - ACE_TEXT ("server = %C status = %s\n"), + ACE_TEXT ("server <%C> status <%C>\n"), this->server_.c_str(), status_name (this->liveliness_))); } @@ -339,7 +347,7 @@ LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::validate_ping, status ") - ACE_TEXT ("= %s, listeners = %d server %C\n"), + ACE_TEXT ("<%C>, listeners <%d> server <%C>\n"), status_name (this->liveliness_), this->listeners_.size (), this->server_.c_str())); } @@ -359,8 +367,8 @@ LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::validate_ping, ") - ACE_TEXT ("status = %s, listeners = %d, ") - ACE_TEXT ("msec = %d server %C\n"), + ACE_TEXT ("status <%C>, listeners <%d>, ") + ACE_TEXT ("msec <%d> server <%C>\n"), status_name (this->liveliness_), this->listeners_.size (), msec, this->server_.c_str())); } @@ -395,8 +403,8 @@ LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::validate_ping, ") - ACE_TEXT ("transient, reping in %d ms, ") - ACE_TEXT ("server %C\n"), + ACE_TEXT ("transient, reping in <%d> ms, ") + ACE_TEXT ("server <%C>\n"), ms, this->server_.c_str())); } } @@ -412,7 +420,7 @@ LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::validate_ping, ") ACE_TEXT ("transient, no more repings, ") - ACE_TEXT ("server %C\n"), + ACE_TEXT ("server <%C>\n"), this->server_.c_str())); } if (this->listeners_.size() > 0) @@ -447,7 +455,8 @@ LiveEntry::do_ping (PortableServer::POA_ptr poa) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::do_ping, ") - ACE_TEXT ("sendc_ping returned OK\n"))); + ACE_TEXT ("sendc_ping for server <%C> returned OK\n"), + this->server_.c_str())); } } catch (const CORBA::Exception &ex) @@ -456,7 +465,8 @@ LiveEntry::do_ping (PortableServer::POA_ptr poa) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::do_ping, ") - ACE_TEXT ("sendc_ping threw %C\n"), ex._name())); + ACE_TEXT ("sendc_ping for server <%C> threw <%C>\n"), + this->server_.c_str(), ex._name())); } this->status (LS_DEAD); } @@ -480,13 +490,13 @@ PingReceiver::cancel (void) { if (ImR_Locator_i::debug () > 4) { - const char *server = "<not available>"; + const char *server = "not available"; if (this->entry_ != 0) { server = this->entry_->server_name (); } ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) PingReceiver::cancel server = <%C>\n"), + ACE_TEXT ("(%P|%t) PingReceiver::cancel server <%C>\n"), server)); } @@ -501,7 +511,7 @@ PingReceiver::cancel (void) if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) PingReceiver::cancel caught %C\n"), + ACE_TEXT ("(%P|%t) PingReceiver::cancel caught <%C>\n"), ex._name ())); } } @@ -515,7 +525,7 @@ PingReceiver::ping (void) if (ImR_Locator_i::debug () > 5) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) PingReceiver::ping received from %C\n"), + ACE_TEXT ("(%P|%t) PingReceiver::ping received from <%C>\n"), this->entry_->server_name ())); } this->entry_->release_callback (); @@ -534,7 +544,7 @@ PingReceiver::ping_excep (Messaging::ExceptionHolder * excep_holder) if (ImR_Locator_i::debug () > 5) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) PingReceiver::ping_excep received from %C\n"), + ACE_TEXT ("(%P|%t) PingReceiver::ping_excep received from <%C>\n"), this->entry_->server_name ())); } excep_holder->raise_exception (); @@ -621,7 +631,7 @@ LC_TimeoutGuard::~LC_TimeoutGuard (void) ACE_Time_Value delay = ACE_Time_Value::zero; if (owner_->deferred_timeout_ != ACE_Time_Value::zero) { - ACE_Time_Value now (ACE_OS::gettimeofday()); + ACE_Time_Value const now (ACE_OS::gettimeofday()); if (owner_->deferred_timeout_ > now) delay = owner_->deferred_timeout_ - now; } @@ -736,7 +746,7 @@ LiveCheck::handle_timeout (const ACE_Time_Value &, { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveCheck::handle_timeout(%d), ") - ACE_TEXT ("running = %d\n"), + ACE_TEXT ("running <%d>\n"), token, this->running_)); } if (!this->running_) @@ -787,7 +797,7 @@ LiveCheck::handle_timeout (const ACE_Time_Value &, { entry->do_ping (poa_.in ()); } - LiveStatus status = entry->status (); + LiveStatus const status = entry->status (); if (status != LS_PING_AWAY && status != LS_TRANSIENT) { this->per_client_.remove (entry); @@ -804,7 +814,7 @@ LiveCheck::has_server (const char *server) { ACE_CString s (server); LiveEntry *entry = 0; - int result = entry_map_.find (s, entry); + int const result = entry_map_.find (s, entry); return (result == 0 && entry != 0); } @@ -813,6 +823,14 @@ LiveCheck::add_server (const char *server, bool may_ping, ImplementationRepository::ServerObject_ptr ref) { + if (ImR_Locator_i::debug () > 2) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) LiveCheck::add_server <%C> ") + ACE_TEXT ("running <%d>\n"), + server, this->running_)); + } + if (!this->running_) return; @@ -837,7 +855,7 @@ LiveCheck::set_pid (const char *server, int pid) { ACE_CString s(server); LiveEntry *entry = 0; - int result = entry_map_.find (s, entry); + int const result = entry_map_.find (s, entry); if (result != -1 && entry != 0) { entry->set_pid (pid); @@ -849,7 +867,7 @@ LiveCheck::remove_server (const char *server, int pid) { ACE_CString s(server); LiveEntry *entry = 0; - int result = entry_map_.find (s, entry); + int const result = entry_map_.find (s, entry); if (result != -1 && entry->has_pid (pid)) { if (!this->in_handle_timeout ()) @@ -876,7 +894,7 @@ LiveCheck::remove_server (const char *server, int pid) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveCheck::remove_server <%C> ") - ACE_TEXT ("pid %d does not match entry\n"), + ACE_TEXT ("pid <%d> does not match entry\n"), server, pid)); } } @@ -897,10 +915,10 @@ LiveCheck::remove_deferred_servers (void) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveCheck::remove_deferred_entries ") - ACE_TEXT ("removing %s\n"), (*re).c_str())); + ACE_TEXT ("removing <%C>\n"), (*re).c_str())); } LiveEntry *entry = 0; - int result = entry_map_.unbind (*re, entry); + int const result = entry_map_.unbind (*re, entry); if (result == 0) { delete entry; @@ -924,7 +942,7 @@ LiveCheck::add_per_client_listener (LiveListener *l, return false; LiveEntry *entry = 0; - ACE_NEW_RETURN (entry, LiveEntry (this, 0, true, ref), false); + ACE_NEW_RETURN (entry, LiveEntry (this, l->server (), true, ref), false); if (this->per_client_.insert_tail(entry) == 0) { @@ -955,7 +973,7 @@ LiveCheck::add_poll_listener (LiveListener *l) LiveEntry *entry = 0; ACE_CString key (l->server()); - int result = entry_map_.find (key, entry); + int const result = entry_map_.find (key, entry); if (result == -1 || entry == 0) { return false; @@ -975,7 +993,7 @@ LiveCheck::add_listener (LiveListener *l) LiveEntry *entry = 0; ACE_CString key (l->server()); - int result = entry_map_.find (key, entry); + int const result = entry_map_.find (key, entry); if (result == -1 || entry == 0) { return false; @@ -993,7 +1011,7 @@ LiveCheck::remove_listener (LiveListener *l) LiveEntry *entry = 0; ACE_CString key (l->server()); - int result = entry_map_.find (key, entry); + int const result = entry_map_.find (key, entry); if (result != -1 && entry != 0) { entry->remove_listener (l); @@ -1086,7 +1104,7 @@ LiveCheck::is_alive (const char *server) ACE_CString s(server); LiveEntry *entry = 0; - int result = entry_map_.find (s, entry); + int const result = entry_map_.find (s, entry); if (result == 0 && entry != 0) { return entry->status (); diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h index 3a0bb2368d7..6bf8b811b06 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h @@ -71,7 +71,7 @@ enum LiveStatus { class Locator_Export LiveListener { public: - /// Construct a new listener. The server name suppled is used to + /// Construct a new listener. The server name supplied is used to /// look up a listener entry in the LiveCheck map. LiveListener (const char *server); @@ -125,7 +125,7 @@ class Locator_Export LiveEntry void reset_status (void); /// the current state value as text - static const ACE_TCHAR *status_name (LiveStatus s); + static const char *status_name (LiveStatus s); void update_listeners (void); bool validate_ping (bool &want_reping, ACE_Time_Value &next); diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp index ff32bcf6faa..391ed6e9600 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp @@ -64,7 +64,7 @@ Locator_Repository::report_ior (PortableServer::POA_ptr ) if (this->opts_.debug () > 0) { - ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("(%P|%t) report_ior <%C>\n"), + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("(%P|%t) ImR: report_ior <%C>\n"), this->imr_ior_.in ())); } @@ -165,7 +165,7 @@ Locator_Repository::recover_ior (void) } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("Attempting to read combined_ior for ImR_Locator\n"); + ex._tao_print_exception ("ImR: Attempting to read combined_ior for ImR_Locator\n"); return -1; } @@ -282,8 +282,8 @@ Locator_Repository::unregister_if_address_reused (const ACE_CString& fqname, if (this->opts_.debug() > 0) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t)ImR: checking reuse address ") - ACE_TEXT ("for server \"%C\" ior \"%C\"\n"), + ACE_TEXT ("(%P|%t) ImR: checking reuse address ") + ACE_TEXT ("for server <%C> ior <%C>\n"), fqname.c_str(), partial_ior)); } @@ -314,8 +314,8 @@ Locator_Repository::unregister_if_address_reused (const ACE_CString& fqname, if (this->opts_.debug() > 0) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t)ImR: iterating - registered server") - ACE_TEXT ("\"%C:%C\" key = <%C> ior \"%C\"\n"), info->server_id.c_str(), + ACE_TEXT ("(%P|%t) ImR: iterating - registered server") + ACE_TEXT ("<%C:%C> key <%C> ior <%C>\n"), info->server_id.c_str(), info->poa_name.c_str (), info->key_name_.c_str(), info->partial_ior.c_str ())); } bool same_server = info->server_id == server_id; @@ -328,7 +328,7 @@ Locator_Repository::unregister_if_address_reused (const ACE_CString& fqname, if (this->opts_.debug() > 0) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t)ImR: reuse address %C so remove server %C \n"), + ACE_TEXT ("(%P|%t) ImR: reuse address <%C> so remove server <%C>\n"), info->partial_ior.c_str (), info->poa_name.c_str ())); } imr_locator->pinger ().remove_server (info->key_name_.c_str()); @@ -474,7 +474,7 @@ Locator_Repository::get_active_server (const ACE_CString& name, int pid) if (this->opts_.debug() > 5) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) get_active_server could not find %C\n"), + ACE_TEXT ("(%P|%t) ImR: get_active_server could not find <%C>\n"), name.c_str())); } si = find_by_poa (key); @@ -508,8 +508,8 @@ Locator_Repository::get_active_server (const ACE_CString& name, int pid) if (this->opts_.debug() > 5) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) get_active_server could not") - ACE_TEXT (" find %C, %d != %d\n"), + ACE_TEXT ("(%P|%t) ImR: get_active_server could not") + ACE_TEXT (" find <%C>, pid <%d> != <%d>\n"), name.c_str(), pid, si->pid)); } si.reset (); @@ -517,16 +517,6 @@ Locator_Repository::get_active_server (const ACE_CString& name, int pid) return si; } -Server_Info_Ptr -Locator_Repository::get_info (const ACE_CString& name) -{ - sync_load (); - - Server_Info_Ptr si; - servers ().find (name, si); - return si; -} - int Locator_Repository::remove_server (const ACE_CString& name, ImR_Locator_i* imr_locator) @@ -538,7 +528,7 @@ Locator_Repository::remove_server (const ACE_CString& name, } Server_Info_Ptr si; this->servers().find (name, si); - int ret = this->servers().unbind (name); + int const ret = this->servers().unbind (name); if (ret != 0) { return ret; @@ -585,12 +575,12 @@ Locator_Repository::link_peers (Server_Info_Ptr base, const CORBA::StringSeq p) { sync_load (); - CORBA::ULong len = base->peers.length(); + CORBA::ULong const len = base->peers.length(); base->peers.length (len + p.length()); for (CORBA::ULong i = 0; i < p.length(); i++) { base->peers[len + i] = p[i]; - Server_Info *si; + Server_Info *si = 0; ACE_CString peer(p[i]); ACE_NEW_RETURN (si, Server_Info (base->server_id, peer, base->is_jacorb, base), @@ -628,13 +618,13 @@ Locator_Repository::has_activator (const ACE_CString& name) int Locator_Repository::remove_activator (const ACE_CString& name) { - int err = sync_load (); + int const err = sync_load (); if (err != 0) { return err; } - int ret = activators().unbind (lcase(name)); + int const ret = activators().unbind (lcase(name)); if (ret != 0) { return ret; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h index fa31bb5d99e..aef0d6c3983 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h @@ -75,8 +75,8 @@ public: ImplementationRepository::ServerObject_ptr svrobj); int add_server_i (Server_Info *si); - /// create new records for poas that share a server instance. This is - /// a two step process, first the base poa must be registered then a + /// create new records for POAs that share a server instance. This is + /// a two step process, first the base POA must be registered then a /// list of peers may be added. int link_peers (Server_Info_Ptr base, const CORBA::StringSeq peers); @@ -100,7 +100,7 @@ public: /// Returns information related to startup. Server_Info_Ptr get_active_server (const ACE_CString& name, int pid = 0); - Server_Info_Ptr get_info (const ACE_CString& name); + /// Returns information related to startup. Activator_Info_Ptr get_activator (const ACE_CString& name); @@ -119,10 +119,10 @@ public: AIMap& activators(void); const AIMap& activators(void) const; - /// indicate the persistence mode for the repository + /// Indicate the persistence mode for the repository virtual const ACE_TCHAR* repo_mode(void) const = 0; - /// convert to lower case + /// Convert to lower case static ACE_CString lcase (const ACE_CString& s); /// Initialize the repo diff --git a/TAO/orbsvcs/ImplRepo_Service/README b/TAO/orbsvcs/ImplRepo_Service/README index 024f6baf10e..fb14aa12a33 100644 --- a/TAO/orbsvcs/ImplRepo_Service/README +++ b/TAO/orbsvcs/ImplRepo_Service/README @@ -90,7 +90,7 @@ Commandline Arguments that can be passed to tao_imr_locator -o <filename> write the ior to the file. -t <timeout> specify a startup timeout value (default 60 seconds) -i periodically ping servers to check liveness. --v the minimum succcessful ping interval. (default 10 seconds) +-v the minimum successful ping interval. (default 10 seconds) -g the timeout for ping attempts. (default 1 second) -s run as a winNT service -c <command> execute the named service command: install, remove diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp index 97f333ca9ad..dc4017895ee 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp @@ -341,7 +341,7 @@ Replicator::send_registration (char *&imr_ior) catch (const ImplementationRepository::InvalidPeer& ip) { ORBSVCS_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("Error: Replicator::send_registration invalid ImR replica because %s\n"), + ACE_TEXT("Error: Replicator::send_registration invalid ImR replica because %C\n"), ip.reason.in()), -1); } @@ -362,7 +362,7 @@ Replicator::init_peer (const ACE_CString &replica_ior_file) if (this->debug_ > 1) { ORBSVCS_DEBUG ((LM_INFO, - ACE_TEXT("Resolving ImR replica %s\n"), + ACE_TEXT("Resolving ImR replica %C\n"), replica_ior_file.c_str())); } diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp index 6a63926e0e1..293d0f9511a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp @@ -13,25 +13,28 @@ Server_Info::Server_Info (const Server_Info &other) Server_Info& Server_Info::operator= (const Server_Info &other) { - server_id = other.server_id; - poa_name = other.poa_name; - is_jacorb = other.is_jacorb; - key_name_ = other.key_name_; - activator = other.activator; - cmdline = other.cmdline; - dir = other.dir; - activation_mode_ = other.activation_mode_; - start_limit_ = other.start_limit_; - start_count_ = other.start_count_; - partial_ior = other.partial_ior; - ior = other.ior; - last_ping = other.last_ping; - server = other.server; - alt_info_ = other.alt_info_; - pid = other.pid; - death_notify = other.death_notify; - peers = other.peers; - env_vars = other.env_vars; + if (this != &other) + { + server_id = other.server_id; + poa_name = other.poa_name; + is_jacorb = other.is_jacorb; + key_name_ = other.key_name_; + activator = other.activator; + cmdline = other.cmdline; + dir = other.dir; + activation_mode_ = other.activation_mode_; + start_limit_ = other.start_limit_; + start_count_ = other.start_count_; + partial_ior = other.partial_ior; + ior = other.ior; + last_ping = other.last_ping; + server = other.server; + alt_info_ = other.alt_info_; + pid = other.pid; + death_notify = other.death_notify; + peers = other.peers; + env_vars = other.env_vars; + } return *this; } @@ -119,6 +122,12 @@ Server_Info::is_mode (ImplementationRepository::ActivationMode m) const return this->active_info ()->activation_mode_ == m; } +ImplementationRepository::ActivationMode +Server_Info::mode (void) const +{ + return this->active_info ()->activation_mode_; +} + bool Server_Info::has_peer (const char *name) const { diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h index f3465b0b8d5..823f136e7e1 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h +++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h @@ -60,6 +60,8 @@ struct Server_Info bool is_server (const char *name) const; bool has_peer (const char *name) const; bool is_mode (ImplementationRepository::ActivationMode m) const; + ImplementationRepository::ActivationMode mode (void) const; + bool is_running (void) const; bool start_allowed (void); void started (bool success); diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp index 83c983e88a3..eebec0f1b3f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp @@ -90,7 +90,7 @@ namespace { ((flags_ & O_RDWR) != 0) ? ACE_TEXT ("r+") : (((flags_ & O_WRONLY) != 0) ? ACE_TEXT ("w") : ACE_TEXT ("r")); this->filename_ = file; -#ifdef ACE_WIN32 +#if defined (ACE_WIN32) this->file_ = ACE_OS::fopen (file.c_str(), flags_str); #else this->file_lock_.reset @@ -111,7 +111,7 @@ namespace { ACE_OS::fflush (this->file_); ACE_OS::fclose (this->file_); this->file_ = 0; -#ifdef ACE_WIN32 +#if defined (ACE_WIN32) if (this->unlink_in_destructor_) { ACE_OS::unlink (this->filename_.c_str ()); @@ -122,7 +122,7 @@ namespace { void lock (void) { -#ifndef ACE_WIN32 +#if !defined (ACE_WIN32) if (this->locked_) return; @@ -1042,7 +1042,7 @@ Shared_Backing_Store::process_updates (void) if (this->opts_.debug() > 4) { ORBSVCS_DEBUG ((LM_INFO, - ACE_TEXT("(%P|%t) notify_access_state_update, %C now %s\n"), + ACE_TEXT("(%P|%t) notify_access_state_update, <%C> now <%C>\n"), entity.name.in (), AsyncAccessManager::status_name (entity.action.state ()))); } @@ -1146,7 +1146,7 @@ Shared_Backing_Store::gen_ior (char*& ft_imr_ior) // give back the original pointer and don't clean it up ft_imr_ior = ior._retn(); ORBSVCS_ERROR((LM_ERROR, - "ERROR: Failed to create Fault Tolerant ImR, reason=%s\n", + "ERROR: Failed to create Fault Tolerant ImR, reason=%C\n", reason.in())); throw ImplementationRepository::InvalidPeer(reason.in()); } @@ -1263,11 +1263,11 @@ Shared_Backing_Store::LocatorListings_XMLHandler::remove_unmatched( Locator_Repository::SIMap::CONST_ITERATOR siit (this->unmatched_servers_); for (; siit.next (sientry); siit.advance() ) { - int ret = repo.servers().unbind (sientry->ext_id_); + int const ret = repo.servers().unbind (sientry->ext_id_); if (ret != 0) { ORBSVCS_ERROR((LM_ERROR, - ACE_TEXT ("ERROR: could not remove server: %s\n"), + ACE_TEXT ("ERROR: could not remove server: %C\n"), sientry->int_id_->key_name_.c_str())); } } @@ -1280,7 +1280,7 @@ Shared_Backing_Store::LocatorListings_XMLHandler::remove_unmatched( if (ret != 0) { ORBSVCS_ERROR((LM_ERROR, - ACE_TEXT ("ERROR: could not remove activator: %s\n"), + ACE_TEXT ("ERROR: could not remove activator: %C\n"), aientry->int_id_->name.c_str())); } } diff --git a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h index ef33fb092a5..9c5234063f9 100644 --- a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h +++ b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h @@ -25,7 +25,7 @@ typedef ACE_Strong_Bound_Ptr<Locator_Repository, ACE_Null_Mutex> Repository_Ptr; class UpdateableServerInfo { public: - /// constructor + /// Constructor /// @param repo the repo to report updates to /// @param name the name of the server to retrieve /// @param pid an optional process id to further discriminate the server @@ -33,7 +33,7 @@ public: const ACE_CString& name, int pid = 0); - /// constructor + /// Constructor /// @param repo the repo to report updates to /// @param si an already retrieved Server_Info_Ptr /// @param reset_start_count controls the reset of the start count value @@ -43,16 +43,16 @@ public: UpdateableServerInfo(UpdateableServerInfo& other ); - /// destructor (updates repo if needed) + /// Destructor (updates repo if needed) ~UpdateableServerInfo(void); - /// explicitly update repo if needed + /// Explicitly update repo if needed void update_repo(void); - /// update remote access state + /// Update remote access state void notify_remote_access (ImplementationRepository::AAM_Status state); - /// assign a server info + /// Assign a server info void server_info (const Server_Info_Ptr& si); /// const Server_Info access @@ -61,23 +61,23 @@ public: /// const Server_Info& access const Server_Info& operator*() const; - /// retrieve smart pointer to non-const Server_Info + /// Retrieve smart pointer to non-const Server_Info /// and indicate repo update required const Server_Info_Ptr& edit(bool active = true); - /// indicate it Server_Info_Ptr is null + /// Indicate it Server_Info_Ptr is null bool null(void) const; private: const UpdateableServerInfo& operator=(const UpdateableServerInfo& ); - /// the repo + /// The repo Repository_Ptr repo_; - /// the retrieved, passed, or non-stored server info + /// The retrieved, passed, or non-stored server info Server_Info_Ptr si_; - /// the server info has changes and needs to be updated to the repo + /// The server info has changes and needs to be updated to the repo bool needs_update_; }; diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp index 8a84e881653..11256716029 100644 --- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp @@ -320,7 +320,7 @@ XML_Backing_Store::load_activator (const ACE_CString& activator_name, const ACE_CString& ior, const NameValues& ) { - Activator_Info *ai; + Activator_Info *ai = 0; ACE_NEW (ai, Activator_Info (activator_name, token, ior)); diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index c5eaa18069f..80795493a74 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -1365,7 +1365,7 @@ TAO_IMR_Op_Register::run (void) if (!this->quiet_) { ORBSVCS_DEBUG((LM_DEBUG, - "Server <%C> already registered.\n", + "(%P|%t) ImR: Server <%C> already registered.\n", this->server_name_.c_str ())); } return ALREADY_REGISTERED; @@ -1379,7 +1379,7 @@ TAO_IMR_Op_Register::run (void) if (!this->quiet_) { ORBSVCS_DEBUG((LM_DEBUG, - "Adding Server <%C> on update command.\n", + "(%P|%t) Adding Server <%C> on update command.\n", this->server_name_.c_str ())); } is_add_ = true; @@ -1415,8 +1415,8 @@ TAO_IMR_Op_Register::run (void) if (!this->quiet_) { ORBSVCS_DEBUG ((LM_DEBUG, - "Updating Server <%C> with default " - "activator of <%C>.\n", + "(%P|%t) ImR: Updating Server <%C> with default " + "activator of <%C>\n", this->server_name_.c_str (), options->activator.in ())); } @@ -1426,13 +1426,13 @@ TAO_IMR_Op_Register::run (void) if (!this->quiet_) { ORBSVCS_DEBUG((LM_DEBUG, - "Successfully registered <%C>.\n", + "(%P|%t) ImR: Successfully registered <%C>\n", this->server_name_.c_str ())); } } catch (const CORBA::NO_PERMISSION&) { - ORBSVCS_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n")); + ORBSVCS_ERROR ((LM_ERROR, "(%P|%t) ImR: No Permission: ImplRepo is in Locked mode\n")); return TAO_IMR_Op::NO_PERMISSION; } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc index a2a8d8de9bb..e28bd7f2084 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc @@ -8,4 +8,7 @@ project: namingexe, iortable, install, dslogadmin_serv, valuetype { InstallData_Files { README } + + Documentation_Files { + } } diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc index 087ace3a93d..1d65cbbd075 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc @@ -13,6 +13,9 @@ project : orbsvcsexe, install, naming_serv, imr_client, svc_utils { InstallData_Files { README } + + Documentation_Files { + } } project(NT_Naming_Service) : orbsvcsexe, install, naming_serv, svc_utils { @@ -23,8 +26,12 @@ project(NT_Naming_Service) : orbsvcsexe, install, naming_serv, svc_utils { NT_Naming_Server.cpp NT_Naming_Service.cpp } + InstallData_Files { gendir = tao-naming README } + + Documentation_Files { + } } diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc index 731d6735299..2e28b7b03d0 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc @@ -27,6 +27,9 @@ project(Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monito InstallData_Files { README } + + Documentation_Files { + } } project(NT_Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monitor_control { @@ -44,4 +47,6 @@ project(NT_Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_mon gendir = tao-notify README } + Documentation_Files { + } } diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc index 0ac011e7c1b..111724109a1 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service.mpc +++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc @@ -13,6 +13,9 @@ project(Time_Service_Server) : orbsvcsexe, install, time_serv, naming, utils, av InstallData_Files { README } + + Documentation_Files { + } } project(Time_Service_Clerk) : orbsvcsexe, install, time_serv, naming, utils, avoids_corba_e_micro { diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc index 1e8942ef415..ae7514ba5d0 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc @@ -9,5 +9,8 @@ project : orbsvcsexe, utils, install, naming, trading_serv { InstallData_Files { README } + + Documentation_Files { + } } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp index 94fcde603e3..4e7356da398 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp @@ -314,8 +314,7 @@ void CosEC_ServantBase::init_ConsumerQOS (RtecBase::handle_t cons_handle, ACE_ConsumerQOS_Factory &consumer_qos, ACE_TCHAR *eventTypeIds, - ACE_TCHAR *eventSourceIds - ) + ACE_TCHAR *eventSourceIds) { // @@ Pradeep: ditto here, make the set of sources (and/or type) // a parameter, and make sure the user can specify multiple of diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp index a98e8540d7e..deb993c4de8 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp @@ -36,9 +36,7 @@ Country_i::get_typed_consumer (void) } void -Country_i::push (const CORBA::Any & /* data */ - ) - +Country_i::push (const CORBA::Any & /* data */) { //Add your implementation here } diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index ba5eb9eb0b1..853644a3477 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -225,7 +225,7 @@ ReplicaController::tao_ft_interception_point ( extract_context (ri)); ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Received request from %s with rid %i\n", + "(%P|%t) Received request from %C with rid %i\n", ftr->client_id.in (), ftr->retention_id)); @@ -236,7 +236,7 @@ ReplicaController::tao_ft_interception_point ( if (log_.contains (rid)) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Replaying reply for %s with rid %i\n", + "(%P|%t) Replaying reply for %C with rid %i\n", ftr->client_id.in (), ftr->retention_id)); diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h index 8991eda73bc..e81bf681048 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h @@ -21,8 +21,7 @@ public: ::CORBA::Long thread, ::CORBA::Long iter, ::CORBA::Long obj, - ::CORBA::Long req - ); + ::CORBA::Long req); virtual void shutdownOrb (); diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp index effc8779607..28543b33482 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp @@ -92,7 +92,7 @@ int TestClient::parseCommands (int argc, ACE_TCHAR *argv[]) "\t-t <number of threads>\n" "\t-i <number of iterations per thread>\n" "\t-r <r><number of requests per string_to_object>\n" - "\t-x 'shutdown server orb at end of a string_to_object'\n" + "\t-x shutdown server orb at end of a string_to_object\n" "\t-e <h><n> 'catch holding or no profile exceptions'\n" "\n", argv[0]), diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp index 243b53b8b11..1b5f39bdc88 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp @@ -70,8 +70,7 @@ TAO_Notify_Lanes_Consumer::disconnect (void) void TAO_Notify_Lanes_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, - const CosNotification::EventTypeSeq & /*removed*/ - ) + const CosNotification::EventTypeSeq & /*removed*/) { // No-Op. } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h index b5c62497ab3..6945eb99a24 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h @@ -76,16 +76,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp index 1dd31a372c0..9d5fef0101d 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp @@ -135,8 +135,7 @@ TAO_Notify_Lanes_Supplier::deactivate (void) void TAO_Notify_Lanes_Supplier::subscription_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & /*removed */ - ) + const CosNotification::EventTypeSeq & /*removed */) { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); diff --git a/TAO/orbsvcs/examples/Notify/README b/TAO/orbsvcs/examples/Notify/README index 72bc09d2199..bf54386a0f7 100644 --- a/TAO/orbsvcs/examples/Notify/README +++ b/TAO/orbsvcs/examples/Notify/README @@ -1,5 +1,3 @@ - - Notification Service examples: This directory has examples to illustrate how to use the Notification Service diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index 94bd93658fc..a6f96cbe249 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -387,8 +387,7 @@ Subscribe_StructuredPushSupplier::disconnect (void) void Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, - const CosNotification::EventTypeSeq & /*removed */ - ) + const CosNotification::EventTypeSeq & /*removed */) { //No-Op. } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h index eaa628f76b6..75e6abe17a3 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h @@ -12,8 +12,6 @@ #include "ace/Task.h" #include "ace/SString.h" -/// @@Pradeep, pragma please... - #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp index 8defbca6e3b..d58430352d4 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp @@ -136,8 +136,7 @@ TAO_Notify_ThreadPool_Supplier::deactivate (void) void TAO_Notify_ThreadPool_Supplier::subscription_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & /*removed */ - ) + const CosNotification::EventTypeSeq & /*removed */) { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h index 4ccf785450c..37548e5d2b3 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h @@ -60,8 +60,7 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier (void); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index ce2d91a40a7..8fe87a8af5e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -9,8 +9,6 @@ #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" - - TAO_Notify_ThreadPool_Supplier_Client::TAO_Notify_ThreadPool_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) , supplier_ (0) diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 6da3603d0c6..1fad41a8e47 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -3669,8 +3669,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, { ACE_INET_Addr mcast_addr; mcast_addr.set (this->mcast_port_, - this->mcast_addr_.c_str () - ); + this->mcast_addr_.c_str ()); ACE_TCHAR buf [BUFSIZ]; mcast_addr.addr_to_string (buf, BUFSIZ); diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index b0b10f58da8..afe9e424271 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -486,8 +486,7 @@ TAO_AV_TCP_Acceptor::make_svc_handler (TAO_AV_TCP_Flow_Handler *&tcp_handler) { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, - "TAO_AV_TCP_Acceptor::make_svc_handler\n" - )); + "TAO_AV_TCP_Acceptor::make_svc_handler\n")); if (this->endpoint_ != 0) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 14f0a607937..96ce57e6d30 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -36,7 +36,7 @@ class TAO_CEC_EventChannel; * * Implements the ConsumerAdmin interface, i.e. the factory for * ProxyPushSupplier objects. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * It does not assume ownership of the TAO_CEC_EventChannel * object; but it *does* assume ownership of the * TAO_CEC_ProxyPushSupplier_Set object. @@ -50,13 +50,13 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin { public: /** - * constructor. If <supplier_set> is nil then it builds one using + * Constructor. If <supplier_set> is nil then it builds one using * the @a event_channel argument. * In any case it assumes ownership. */ TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel* event_channel); - /// destructor... + /// Destructor... virtual ~TAO_CEC_ConsumerAdmin (void); /// For each elements call <worker->work()>. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index 20402bb87c6..e21474a5230 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -40,18 +40,17 @@ namespace CORBA * * Defines the interface for the consumer control strategy. * This strategy handles misbehaving or failing consumers. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * = LOCKING * = TODO */ class TAO_Event_Serv_Export TAO_CEC_ConsumerControl { public: - /// Constructor. It does not assume ownership of the <event_channel> - /// parameter. + /// Constructor TAO_CEC_ConsumerControl (void); - /// destructor... + /// Destructor virtual ~TAO_CEC_ConsumerControl (void); /// Activate any internal threads or timers used to poll the state of diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index 6ecde1dd993..c8703df70c7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -54,8 +54,7 @@ TAO_CEC_Default_Factory::init_svcs (void) { return ACE_Service_Config::static_svcs ()->insert ( - &ace_svc_desc_TAO_CEC_Default_Factory - ); + &ace_svc_desc_TAO_CEC_Default_Factory); } int diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index 10bc975df9d..ec12e35c7ff 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -37,7 +37,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * can specify which strategies will this factory generate. * Since the class can be dynamically loaded the strategies can be * set in the service configurator file. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT */ class TAO_Event_Serv_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory { @@ -93,26 +93,22 @@ public: create_proxy_push_consumer_collection (TAO_CEC_EventChannel*); virtual void destroy_proxy_push_consumer_collection ( - TAO_CEC_ProxyPushConsumer_Collection* - ); + TAO_CEC_ProxyPushConsumer_Collection*); virtual TAO_CEC_ProxyPullConsumer_Collection* create_proxy_pull_consumer_collection (TAO_CEC_EventChannel*); virtual void destroy_proxy_pull_consumer_collection ( - TAO_CEC_ProxyPullConsumer_Collection* - ); + TAO_CEC_ProxyPullConsumer_Collection*); virtual TAO_CEC_ProxyPushSupplier_Collection* create_proxy_push_supplier_collection (TAO_CEC_EventChannel*); virtual void destroy_proxy_push_supplier_collection ( - TAO_CEC_ProxyPushSupplier_Collection* - ); + TAO_CEC_ProxyPushSupplier_Collection*); virtual TAO_CEC_ProxyPullSupplier_Collection* create_proxy_pull_supplier_collection (TAO_CEC_EventChannel*); virtual void destroy_proxy_pull_supplier_collection ( - TAO_CEC_ProxyPullSupplier_Collection* - ); + TAO_CEC_ProxyPullSupplier_Collection*); virtual ACE_Lock* create_consumer_lock (void); virtual void destroy_consumer_lock (ACE_Lock*); @@ -151,8 +147,7 @@ public: create_proxy_push_consumer_collection (TAO_CEC_TypedEventChannel*); virtual void destroy_proxy_push_consumer_collection ( - TAO_CEC_TypedProxyPushConsumer_Collection* - ); + TAO_CEC_TypedProxyPushConsumer_Collection*); virtual TAO_CEC_ConsumerControl* create_consumer_control (TAO_CEC_TypedEventChannel*); virtual TAO_CEC_SupplierControl* diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp index a72aa1280ff..a98e625c404 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -1,8 +1,6 @@ #include "orbsvcs/CosEvent/CEC_Dispatching.h" #include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 6a5cb720758..2a92dd1fde7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -57,7 +57,7 @@ public: */ virtual void shutdown (void) = 0; - /// The consumer represented by <proxy> should receive <event>. + /// The consumer represented by @a proxy should receive @a event. virtual void push (TAO_CEC_ProxyPushSupplier *proxy, const CORBA::Any &event) = 0; virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index b46ef5986cb..4ee21c30070 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -4,7 +4,6 @@ #include "tao/ORB_Constants.h" #include "ace/OS_NS_errno.h" - #if ! defined (__ACE_INLINE__) #include "orbsvcs/CosEvent/CEC_Dispatching_Task.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index 63b3407fecf..522f8e5506b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -11,8 +11,6 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.inl" #endif /* __ACE_INLINE__ */ - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_EventChannel:: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 1f2030e0866..89b23490c51 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -54,7 +54,7 @@ public: /** * The basic constructor. * The attributes listed as arguments are *required* by the EC, and - * no appropiate defaults are available for them. + * no appropriate defaults are available for them. */ TAO_CEC_EventChannel_Attributes (PortableServer::POA_ptr supplier_poa, PortableServer::POA_ptr consumer_poa); @@ -117,7 +117,7 @@ public: /** * constructor - * If <own_factory> is not 0 it assumes ownership of the factory. + * If @a own_factory is not 0 it assumes ownership of the factory. * If the factory is <nil> it uses the Service_Configurator to load * the Factory, if not found it uses TAO_CEC_Default_Resource_Factory */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp index 50fe4fd1094..6eef61ef41a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp @@ -1,8 +1,6 @@ #include "orbsvcs/CosEvent/CEC_Factory.h" #include "ace/Dynamic_Service.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_Factory::~TAO_CEC_Factory (void) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index ab38cc5b208..27cdd6becc9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -73,7 +73,7 @@ typedef TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullSupplier> TAO_CEC_ProxyPullSup * initialization time through several strategies and * components. This class defines the interface of an Abstract * Factory that creates all such components. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * The objects it creates are owned by this class, the client must * invoke the corresponding destroy() method to release them. * Some implementations may require a different instance for the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index 1b12a134671..6d80809278b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -1,13 +1,8 @@ #include "orbsvcs/Log_Macros.h" #include "orbsvcs/CosEvent/CEC_MT_Dispatching.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads, int thread_creation_flags, int thread_priority, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index 581cb057475..8d8e725998d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -39,7 +39,7 @@ class TAO_Event_Serv_Export TAO_CEC_MT_Dispatching : public TAO_CEC_Dispatching { public: /// Constructor - /// It will create <nthreads> servicing threads... + /// It will create @a nthreads servicing threads... TAO_CEC_MT_Dispatching (int nthreads, int thread_creation_flags, int thread_priority, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 625fade23c1..a12bdf9b683 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -89,7 +89,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) return 0; // ACE_THROW (CosEventComm::Disconnected ());???? supplier = @@ -135,7 +135,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier () CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) return 0; // ACE_THROW (CosEventComm::Disconnected ());???? supplier = @@ -168,15 +168,15 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - disconnected = 0; - if (this->is_connected_i () == 0) + disconnected = false; + if (!this->is_connected_i ()) { - disconnected = 1; - return 0; + disconnected = true; + return false; } if (CORBA::is_nil (this->nopolicy_supplier_.in ())) { - return 0; + return false; } supplier = CORBA::Object::_duplicate (this->nopolicy_supplier_.in ()); } @@ -184,7 +184,7 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent ( #if (TAO_HAS_MINIMUM_CORBA == 0) return supplier->_non_existent (); #else - return 0; + return false; #endif /* TAO_HAS_MINIMUM_CORBA */ } @@ -332,7 +332,7 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer () CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) throw CORBA::BAD_INV_ORDER (); // @@ add user exception? supplier = this->supplier_._retn (); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 9621fa6a8a7..1aee32c5be7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -37,7 +37,7 @@ class TAO_CEC_ProxyPullSupplier; * remember that this class is used to communicate with a * PullSupplier, so, in effect, this is the ambassador for a * supplier inside the event channel. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * The object commits suicide when disconnect_pull_consumer() is * called. */ @@ -75,7 +75,7 @@ public: /** * Invoke the _non_existent() pseudo-operation on the supplier. If * it is disconnected then it returns true and sets the - * <disconnected> flag. + * @a disconnected flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected); @@ -114,7 +114,7 @@ protected: (CosEventComm::PullSupplier_ptr s); private: - /// The supplier admin, used for activation and memory managment. + /// The supplier admin, used for activation and memory management. TAO_CEC_EventChannel* event_channel_; ACE_Time_Value timeout_; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl index 67bb6e354ef..d0a626e9b03 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl @@ -10,7 +10,7 @@ TAO_CEC_ProxyPullConsumer::is_connected_i (void) const ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPullConsumer::is_connected (void) const { - ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false); return this->is_connected_i (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 305920b65ee..db840f03ee5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -113,15 +113,15 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - disconnected = 0; - if (this->is_connected_i () == 0) + disconnected = false; + if (!this->is_connected_i ()) { - disconnected = 1; - return 0; + disconnected = true; + return false; } if (CORBA::is_nil (this->nopolicy_consumer_.in ())) { - return 0; + return false; } consumer = CORBA::Object::_duplicate (this->nopolicy_consumer_.in ()); } @@ -129,7 +129,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent ( #if (TAO_HAS_MINIMUM_CORBA == 0) return consumer->_non_existent (); #else - return 0; + return false; #endif /* TAO_HAS_MINIMUM_CORBA */ } @@ -300,7 +300,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier () CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) throw CORBA::BAD_INV_ORDER (); consumer = this->consumer_._retn (); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index ba5c870193f..a7bc5e5c17c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -40,7 +40,7 @@ class TAO_CEC_ProxyPullConsumer; * remember that this class is used to communicate with a * PullConsumer, so, in effect, this is the ambassador for a * consumer inside the event channel. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * It does not assume ownership of the TAO_CEC_Dispatching object. * It makes a copy of the ConsumerQOS and the consumer object * reference. @@ -74,7 +74,7 @@ public: /** * Return the consumer object reference. It returns nil() if it has * not connected yet. - * NOTE: This method does not return a new reference!!! Doing so + * @note This method does not return a new reference!!! Doing so * will increase the locking overhead on the critical path. */ CosEventComm::PullConsumer_ptr consumer (void) const; @@ -85,7 +85,7 @@ public: /** * Invoke the _non_existent() pseudo-operation on the consumer. If * it is disconnected then it returns true and sets the - * <disconnected> flag. + * @a disconnected flag. */ CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl index 96c4591583e..9101a57bc0b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl @@ -10,7 +10,7 @@ TAO_CEC_ProxyPullSupplier::is_connected_i (void) const ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPullSupplier::is_connected (void) const { - ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false); return this->is_connected_i (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 4b6157f1016..e6bcd1b2178 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -38,7 +38,7 @@ class TAO_CEC_ProxyPushSupplier; * remember that this class is used to communicate with a * PushSupplier, so, in effect, this is the ambassador for a * supplier inside the event channel. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * The object commits suicide when disconnect_push_consumer() is * called. */ @@ -73,7 +73,7 @@ public: /** * Invoke the _non_existent() pseudo-operation on the supplier. If * it is disconnected then it returns true and sets the - * <disconnected> flag. + * @ disconnected flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected); @@ -116,7 +116,7 @@ protected: (CosEventComm::PushSupplier_ptr s); private: - /// The supplier admin, used for activation and memory managment. + /// The supplier admin, used for activation and memory management. TAO_CEC_EventChannel* event_channel_; ACE_Time_Value timeout_; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl index 0f865f9b440..d93fc640172 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl @@ -10,7 +10,7 @@ TAO_CEC_ProxyPushConsumer::is_connected_i (void) const ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPushConsumer::is_connected (void) const { - ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false); return this->is_connected_i (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index f8891b2e576..b1a1569031a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -207,7 +207,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event) { ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) return; TAO_ESF_RefCount_Guard<CORBA::ULong> cnt_mon (this->refcount_); @@ -235,7 +235,7 @@ TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event) ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) return; TAO_ESF_RefCount_Guard<CORBA::ULong> cnt_mon (this->refcount_); @@ -261,7 +261,7 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event) { ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) return; TAO_ESF_RefCount_Guard<CORBA::ULong> cnt_mon (this->refcount_); @@ -518,7 +518,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier () CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) throw CORBA::BAD_INV_ORDER (); #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) @@ -603,7 +603,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event) CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) return; // ACE_THROW (CosEventComm::Disconnected ());???? consumer = @@ -640,7 +640,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( CosEventComm::PushConsumer_var consumer; { ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) return; // TAO_THROW (CosEventComm::Disconnected ());???? consumer = @@ -697,7 +697,7 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) return; // ACE_THROW (CosEventComm::Disconnected ());???? typed_consumer_obj = @@ -765,7 +765,7 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer ( { ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) { return; // TAO_THROW (CosEventComm::Disconnected ());???? } @@ -838,11 +838,11 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - disconnected = 0; - if (this->is_connected_i () == 0) + disconnected = false; + if (!this->is_connected_i ()) { - disconnected = 1; - return 0; + disconnected = true; + return false; } #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) @@ -850,7 +850,7 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( { if (CORBA::is_nil (this->nopolicy_typed_consumer_.in ())) { - return 0; + return false; } consumer = CORBA::Object::_duplicate (this->nopolicy_typed_consumer_.in ()); @@ -860,7 +860,7 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ if (CORBA::is_nil (this->nopolicy_consumer_.in ())) { - return 0; + return false; } consumer = CORBA::Object::_duplicate (this->nopolicy_consumer_.in ()); #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) @@ -871,7 +871,7 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( #if (TAO_HAS_MINIMUM_CORBA == 0) return consumer->_non_existent (); #else - return 0; + return false; #endif /* TAO_HAS_MINIMUM_CORBA */ } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 8a8a0563c64..7be8914cb03 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -45,7 +45,7 @@ class TAO_CEC_TypedEventChannel; * remember that this class is used to communicate with a * PushConsumer, so, in effect, this is the ambassador for a * consumer inside the event channel. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * It does not assume ownership of the TAO_CEC_Dispatching object. * It makes a copy of the ConsumerQOS and the consumer object * reference. @@ -112,7 +112,7 @@ public: /** * Invoke the _non_existent() pseudo-operation on the consumer. If * it is disconnected then it returns true and sets the - * <disconnected> flag. + * @a disconnected flag. */ CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl index 79be8659d44..995109cfb53 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl @@ -21,7 +21,7 @@ TAO_CEC_ProxyPushSupplier::is_connected_i (void) const ACE_INLINE CORBA::Boolean TAO_CEC_ProxyPushSupplier::is_connected (void) const { - ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false); return this->is_connected_i (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp index d66d3bbd78a..4cafb289b22 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp @@ -1,7 +1,5 @@ #include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy (void) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index c00fa8365bc..88a17ffeb22 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -72,7 +72,7 @@ private: * * Defines the interface for the consumer control strategy. * This strategy handles misbehaving or failing consumers. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * = LOCKING * = TODO */ @@ -80,7 +80,7 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_ConsumerControl : public TAO_CEC_ConsumerControl { public: - /// Constructor. It does not assume ownership of the <event_channel> + /// Constructor. It does not assume ownership of the @a event_channel /// parameter. TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, @@ -95,8 +95,7 @@ public: const ACE_Time_Value &timeout, unsigned int retries, TAO_CEC_TypedEventChannel *typed_event_channel, - CORBA::ORB_ptr orb - ); + CORBA::ORB_ptr orb); #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ /// destructor... diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index 8cff927de90..1d0b3ad00cb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -18,9 +18,6 @@ #include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl" #endif /* __ACE_INLINE__ */ - - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_Reactive_Pulling_Strategy:: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index 5d985ce4a85..cabd907629c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -70,7 +70,7 @@ private: * * Defines the interface for the supplier control strategy. * This strategy handles misbehaving or failing suppliers. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * = LOCKING * = TODO */ @@ -78,7 +78,7 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_SupplierControl : public TAO_CEC_SupplierControl { public: - /// Constructor. It does not assume ownership of the <event_channel> + /// Constructor. It does not assume ownership of the @a event_channel /// parameter. TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate, const ACE_Time_Value &timeout, @@ -93,8 +93,7 @@ public: const ACE_Time_Value &timeout, unsigned int retries, TAO_CEC_TypedEventChannel *typed_event_channel, - CORBA::ORB_ptr orb - ); + CORBA::ORB_ptr orb); #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ /// destructor... diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 71e4d8ea49b..9441c9087ad 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -41,7 +41,7 @@ class TAO_CEC_EventChannel; * Implement the CosEventChannelAdmin::SupplierAdmin interface. * This class is an Abstract Factory for the * TAO_CEC_ProxyPushConsumer. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * It does not assume ownership of the TAO_CEC_EventChannel object * = LOCKING * @@ TODO @@ -77,13 +77,13 @@ public: /// this virtual void shutdown (void); - // = The CosEventChannelAdmin::SupplierAdmin methods... + /// The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (void); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer (void); - // = The PortableServer::ServantBase methods + /// The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); private: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index 865725f8b6b..a359fd9549a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -1,7 +1,5 @@ #include "orbsvcs/CosEvent/CEC_SupplierControl.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index e66bc40b5f5..33ddb1892b4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -49,15 +49,14 @@ namespace CORBA * * Defines the interface for the supplier control strategy. * This strategy handles misbehaving or failing suppliers. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * = LOCKING * = TODO */ class TAO_Event_Serv_Export TAO_CEC_SupplierControl { public: - /// Constructor. It does not assume ownership of the <event_channel> - /// parameter. + /// Constructor TAO_CEC_SupplierControl (void); /// destructor... diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index 816f9893014..ca290520a07 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -1,13 +1,11 @@ // -*- C++ -*- #include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" - #include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" #if ! defined (__ACE_INLINE__) #include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl" #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Implementation skeleton constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 88aa6cdd3da..fa7a864fef8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -99,9 +99,6 @@ public: private: /// The typed event const TAO_CEC_TypedEvent typed_event_; - - /// The typed EC - // TAO_CEC_TypedEventChannel* typed_event_channel_; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index ef0bd7613c9..76ddff0af4a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -15,7 +15,6 @@ #include "orbsvcs/CosEvent/CEC_TypedEventChannel.inl" #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Implementation skeleton constructor diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index 0a3ad7bbe82..727e1a03872 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -59,7 +59,7 @@ public: /** * The basic constructor. * The attributes listed as arguments are *required* by the EC, and - * no appropiate defaults are available for them. + * no appropriate defaults are available for them. */ TAO_CEC_TypedEventChannel_Attributes (PortableServer::POA_ptr typed_supplier_poa, PortableServer::POA_ptr typed_consumer_poa, @@ -86,7 +86,7 @@ public: /** * If not zero the event channel will deactive its Impl and call - * orb->shutdown(0), when destoy is invoked. + * orb->shutdown(0), when destroy is invoked. */ int destroy_on_shutdown; @@ -127,8 +127,8 @@ public: /** * Constructor - * If <own_factory> is not 0 it assumes ownership of the factory. - * If the factory is <nil> it uses the Service_Configurator to load + * If @a own_factory is not 0 it assumes ownership of the factory. + * If the @a factory is <nil> it uses the Service_Configurator to load * the Factory, if not found it uses TAO_CEC_Default_Resource_Factory */ TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attributes, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index 74b83b68e39..93b02abfe2f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -115,15 +115,15 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - disconnected = 0; - if (this->is_connected_i () == 0) + disconnected = false; + if (!this->is_connected_i ()) { - disconnected = 1; - return 0; + disconnected = true; + return false; } if (CORBA::is_nil (this->nopolicy_typed_supplier_.in ())) { - return 0; + return false; } supplier = CORBA::Object::_duplicate (this->nopolicy_typed_supplier_.in ()); @@ -132,7 +132,7 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent ( #if (TAO_HAS_MINIMUM_CORBA == 0) return supplier->_non_existent (); #else - return 0; + return false; #endif /* TAO_HAS_MINIMUM_CORBA */ } @@ -284,7 +284,7 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer () CORBA::INTERNAL ()); // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); - if (this->is_connected_i () == 0) + if (!this->is_connected_i ()) throw CORBA::BAD_INV_ORDER (); // @@ add user exception? supplier = this->typed_supplier_._retn (); @@ -374,7 +374,7 @@ TAO_CEC_TypedProxyPushConsumer_Guard:: // @@ Returning something won't work either, the error should be // logged though! - if (proxy->is_connected_i () == 0) + if (!proxy->is_connected_i ()) return; this->locked_ = 1; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index dbe96ca226b..17905ab6d3e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -55,7 +55,7 @@ public: /** * Invoke the _non_existent() pseudo-operation on the supplier. If * it is disconnected then it returns true and sets the - * <disconnected> flag. + * @a disconnected flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected); @@ -100,7 +100,7 @@ protected: (CosEventComm::PushSupplier_ptr pre); private: - /// The typed supplier admin, used for activation and memory managment. + /// The typed supplier admin, used for activation and memory management. TAO_CEC_TypedEventChannel* typed_event_channel_; ACE_Time_Value timeout_; @@ -153,8 +153,7 @@ public: ACE_Lock *lock, CORBA::ULong &refcount, TAO_CEC_TypedEventChannel *ec, - TAO_CEC_TypedProxyPushConsumer *proxy - ); + TAO_CEC_TypedProxyPushConsumer *proxy); /// Destructor ~TAO_CEC_TypedProxyPushConsumer_Guard (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index c0e73d0ad34..f5dc2ce81bc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -1,5 +1,4 @@ #include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" - #include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" #if ! defined (__ACE_INLINE__) @@ -54,8 +53,7 @@ TAO_CEC_TypedSupplierAdmin::shutdown (void) CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer ( - const char * supported_interface - ) + const char * supported_interface) { int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface); @@ -70,8 +68,7 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer ( CosEventChannelAdmin::ProxyPullConsumer_ptr TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer ( - const char * /* uses_interface */ - ) + const char * /* uses_interface */) { throw CosTypedEventChannelAdmin::NoSuchImplementation (); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index 2f72fb8b17e..3fd23168cfe 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -35,10 +35,10 @@ class TAO_Event_Serv_Export TAO_CEC_TypedSupplierAdmin : public POA_CosTypedEventChannelAdmin::TypedSupplierAdmin { public: - //Constructor + /// Constructor TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChannel* event_channel); - //Destructor + /// Destructor virtual ~TAO_CEC_TypedSupplierAdmin (void); /// For each elements call <worker->work()>. diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 6b2243c4e03..03c9e5d9fa3 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -126,19 +126,16 @@ project(CosTrading_Serv) : orbsvcslib, orbsvcs_output, install, trading_skel, dy .PHONY: Constraint_l Constraint_l: " echo '#define YY_NO_UNPUT' > Trader/Constraint_l.cpp" - " echo '#define YY_NO_INPUT' > Trader/Constraint_l.cpp" + " echo '#define YY_NO_INPUT' >> Trader/Constraint_l.cpp" " $(LEX) -L -t Trader/constraint.l | \\" " sed -e 's/ NULL/ 0/g' \\" " -e 's/int offset /size_t offset /g' \\" " -e 's/isatty/ACE_OS::isatty/g' \\" - " -e 's/YY_BREAK break;/YY_BREAK ACE_NOTREACHED (break;)/g' \\" " -e 's/ECHO/TAO_TRADER_ECHO/' \\" - " -e 's/\\$$Hea''der.*\\$$/$$I''d$$/' \\" - " -e 's@#include <stdio\.h>@#include \"ace/os_include/os_stdio.h\"@' \\" - " -e 's@#include <unistd\.h>@#include \"ace/OS_NS_unistd.h\"@' \\" + " -e 's/ / /g' \\" + " -e 's/ *$$\/\/g' \\" " -e '/#include </d' \\" " >> Trader/Constraint_l.cpp" - " (cd Trader; patch < Constraint_l.cpp.diff)" Trader/Constraint_y.cpp: Trader/constraint.y " @echo 'INFORMATION: Potentially outdated $@'" @@ -148,27 +145,19 @@ project(CosTrading_Serv) : orbsvcslib, orbsvcs_output, install, trading_skel, dy .PHONY: Constraint_y Constraint_y: - " yacc -l -d Trader/constraint.y" - " sed -e 's/ / /g' \\" - " -e 's/int newsize, i/size_t newsize, i/g' \\" - " -e 's/static *int *yygrowstack();/ /g' \\" + " byacc -l -d Trader/constraint.y" + " sed -e 's/ NULL/ 0/g' \\" + " -e 's/ / /g' \\" " -e 's/ *$$\/\/g' \\" - " -e 's/\|\| defined(__GNUC__)/|| defined(__GNUC__) || defined (WIN32) || defined (__HP_aCC)/g' \\" - " -e 's/memcpy/ACE_OS::memcpy/g' \\" - " -e 's/getenv/ACE_OS::getenv/g' \\" - " -e 's/free/ACE_OS::free/g' \\" - " -e 's/malloc/ACE_OS::malloc/g' \\" - " -e 's/realloc/ACE_OS::realloc/g' < y.tab.c > Trader/Constraint_y.cpp" + " < y.tab.c > Trader/Constraint_y.cpp" " echo TAO_END_VERSIONED_NAMESPACE_DECL >> Trader/Constraint_y.cpp" - " echo '\/\/ $$I''d$$' > Trader/Constraint_Tokens.h" - " echo '' >> Trader/Constraint_Tokens.h" - " echo '#ifndef CONSTRAINT_TOKEN_H' >> Trader/Constraint_Tokens.h" - " echo '#define CONSTRAINT_TOKEN_H' >> Trader/Constraint_Tokens.h" + " echo '#ifndef CONSTRAINT_TOKENS_H' > Trader/Constraint_Tokens.h" + " echo '#define CONSTRAINT_TOKENS_H' >> Trader/Constraint_Tokens.h" " echo '#include /**/ \"ace/pre.h\"' >> Trader/Constraint_Tokens.h" " echo '' >> Trader/Constraint_Tokens.h" " cat y.tab.h >> Trader/Constraint_Tokens.h" " echo '#include /**/ \"ace/post.h\"' >> Trader/Constraint_Tokens.h" - " echo '#endif /* CONSTRAINT_TOKEN_H */' >> Trader/Constraint_Tokens.h" + " echo '#endif /* CONSTRAINT_TOKENS_H */' >> Trader/Constraint_Tokens.h" " $(RM) y.tab.h y.tab.c" } } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index cdbbc1b3df9..3250eee56ad 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -62,7 +62,7 @@ template<class Target> class TAO_ESF_Worker; * cleanup operations). * * The class must also collaborate with other components of the - * EC to efficiently and safely perform memory managment of the + * EC to efficiently and safely perform memory management of the * members in the collection. * * The PROXY object must be reference counted with the following diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h index fce7c9f55f1..2ec41e62347 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h @@ -37,7 +37,7 @@ class TAO_ECG_CDR_Processor public: virtual ~TAO_ECG_CDR_Processor (void); - /// Extracts data from <cdr>. Returns 0 on success, -1 on error. + /// Extracts data from @a cdr. Returns 0 on success, -1 on error. virtual int decode (TAO_InputCDR &cdr) = 0; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h index bb02508d45a..b36c12ff164 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h @@ -152,7 +152,7 @@ private: * Count the number of fragments that will be required to send the * message blocks in the range [begin,end) * The maximum fragment payload (i.e. the size without the header is - * also required); <total_length> returns the total message size. + * also required); @a total_length returns the total message size. */ CORBA::ULong compute_fragment_count (const ACE_Message_Block* begin, const ACE_Message_Block* end, @@ -167,7 +167,7 @@ private: /// The MTU for this sender... CORBA::ULong mtu_; - /// Should crc checksum be caluclated and sent? + /// Should crc checksum be calculated and sent? CORBA::Boolean checksum_; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index aa97dee5e1a..6f90a5b6935 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -60,7 +60,7 @@ public: /// Destructor virtual ~TAO_ECG_Complex_Address_Server (void); - /// Initializes the mapping from the <arg> string. See class notes + /// Initializes the mapping from the @a arg string. See class notes /// for the expected format. int init (const char *arg); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h index 64135ed9b9f..c11544fae06 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h @@ -47,10 +47,10 @@ public: /// Initialization and termination methods. //@{ /// Constructor. - /// Messages received by this EH will be forwarded to the <recv>. + /// Messages received by this EH will be forwarded to the @a recv. /* * See comments for <receiver_> data member on why raw pointer is - * used for the <recv> argument. + * used for the @a recv argument. */ TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 520b1001f2b..0d659652791 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -179,7 +179,7 @@ public: /// TAO_ECG_Dgram_Handler method. /** * UDP/Multicast Event_Handlers call this method when data is - * available at the socket - the <dgram> is ready for reading. + * available at the socket - the @a dgram is ready for reading. * Data is read from the socket, and, if complete message is * received, the event is pushed to the local Event Channel. */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 91fdf765749..9aeb0fd5bee 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -1,7 +1,5 @@ #include "orbsvcs/Event/EC_And_Filter.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_And_Filter::TAO_EC_And_Filter (TAO_EC_Filter* children[], diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index 1b9b0b086cd..a108503b0e5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -13,9 +13,6 @@ #include "orbsvcs/Event/EC_Basic_Filter_Builder.inl" #endif /* __ACE_INLINE__ */ - - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index 8a7ca6dac53..0db4efa2b44 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -1,7 +1,5 @@ #include "orbsvcs/Event/EC_Bitmask_Filter.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Bitmask_Filter::TAO_EC_Bitmask_Filter (CORBA::ULong source_mask, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index 84fdb2899bc..251a43c8732 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -1,7 +1,5 @@ #include "orbsvcs/Event/EC_Conjunction_Filter.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL const int bits_per_word = sizeof(TAO_EC_Conjunction_Filter::Word) * CHAR_BIT; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp index 88687550c3e..9b2e00add98 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp @@ -1,7 +1,5 @@ #include "orbsvcs/Event/EC_ConsumerControl.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index be407512e4b..baf9a4b7055 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -38,8 +38,6 @@ #include "orbsvcs/Event/EC_Default_Factory.inl" #endif /* __ACE_INLINE__ */ - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void) @@ -468,14 +466,6 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECPushSupplierSet")) == 0) - { - ORBSVCS_ERROR ((LM_ERROR, - "EC_Default_Factory - " - "obsolete option <%s>, ignored\n", arg)); - arg_shifter.consume_arg (); - } - else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECQueueFullServiceObject")) == 0) { arg_shifter.consume_arg (); @@ -487,22 +477,6 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECConsumerAdminLock")) == 0) - { - ORBSVCS_ERROR ((LM_ERROR, - "EC_Default_Factory - " - "obsolete option <%s>, ignored\n", arg)); - arg_shifter.consume_arg (); - } - - else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECSupplierAdminLock")) == 0) - { - ORBSVCS_ERROR ((LM_ERROR, - "EC_Default_Factory - " - "obsolete option <%s>, ignored\n", arg)); - arg_shifter.consume_arg (); - } - else if (ACE_OS::strncmp (arg, ACE_TEXT("-EC"), 3) == 0) { arg_shifter.consume_arg (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp index a4a3ab1b358..a4f22d857e1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp @@ -4,8 +4,6 @@ #include "orbsvcs/Event/EC_Supplier_Filter.h" #include "ace/Reverse_Lock_T.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock; @@ -83,7 +81,7 @@ void TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, - this->refcount_, + this->ec_refcount_, this->event_channel_, this); if (!ace_mon.locked ()) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index 4654957fd54..ea7da34ac34 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -1,7 +1,5 @@ #include "orbsvcs/Event/EC_Disjunction_Filter.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Disjunction_Filter:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp index b5859e21960..61e9dd657be 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp @@ -1,8 +1,6 @@ #include "orbsvcs/Event/EC_Dispatching.h" #include "orbsvcs/Event/EC_ProxySupplier.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Dispatching::~TAO_EC_Dispatching (void) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp index 233169439f6..799f234f402 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp @@ -2,8 +2,6 @@ #include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Dynamic_Service.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Event_Channel:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp index d0c5572b99e..d1ccf21bc5f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp @@ -12,8 +12,6 @@ #include "orbsvcs/Event/EC_Event_Channel_Base.inl" #endif /* __ACE_INLINE__ */ - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Event_Channel_Base:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index 7abaa611148..2ca67d3e4a3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -54,7 +54,7 @@ public: /** * The basic constructor. * The attributes listed as arguments are *required* by the EC, and - * no appropiate defaults are available for them. + * no appropriate defaults are available for them. */ TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr supplier_poa, PortableServer::POA_ptr consumer_poa); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp index f3d296bed6b..d4e94f46eb7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp @@ -1,8 +1,6 @@ #include "orbsvcs/Event/EC_Factory.h" #include "ace/Dynamic_Service.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RTEvent_Serv_Export unsigned short TAO_EC_debug_level; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp index 01770ba6105..3c1c2c12db8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp @@ -5,8 +5,6 @@ #include "orbsvcs/Event/EC_Filter_Builder.inl" #endif /* __ACE_INLINE__ */ - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder (void) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp index e88563d6522..5d860f5603b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp @@ -6,8 +6,6 @@ #include "orbsvcs/Event/EC_Group_Scheduling.inl" #endif /* __ACE_INLINE__ */ - - void TAO_EC_Group_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp index d7298071032..033b9aa4a4f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp @@ -2,8 +2,6 @@ #include "orbsvcs/Event/EC_QOS_Info.h" #include "orbsvcs/Log_Macros.h" - - TAO_EC_Kokyu_Filter:: TAO_EC_Kokyu_Filter (const char* name, RtecScheduler::handle_t rt_info, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp index 7d42ab54663..0e86459dc4c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp @@ -8,8 +8,6 @@ #include "orbsvcs/Event/EC_Kokyu_Scheduling.inl" #endif /* __ACE_INLINE__ */ - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling (void) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index 8260288b13d..9ca4c7a410a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -16,7 +16,7 @@ typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock; TAO_EC_ProxyPushConsumer:: TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec) : event_channel_ (ec), - refcount_ (1), + ec_refcount_ (1), connected_ (false), filter_ (0) { @@ -70,7 +70,7 @@ void TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, - this->refcount_, + this->ec_refcount_, this->event_channel_, this); if (!ace_mon.locked ()) @@ -83,7 +83,7 @@ void TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, - this->refcount_, + this->ec_refcount_, this->event_channel_, this); if (!ace_mon.locked ()) @@ -96,7 +96,7 @@ void TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, - this->refcount_, + this->ec_refcount_, this->event_channel_, this); if (!ace_mon.locked ()) @@ -201,7 +201,7 @@ CORBA::ULong TAO_EC_ProxyPushConsumer::_incr_refcnt (void) { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); - return this->refcount_++; + return this->ec_refcount_++; } void @@ -216,9 +216,9 @@ TAO_EC_ProxyPushConsumer::_decr_refcnt (void) { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); - this->refcount_--; - if (this->refcount_ != 0) - return this->refcount_; + this->ec_refcount_--; + if (this->ec_refcount_ != 0) + return this->ec_refcount_; } this->refcount_zero_hook (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 6655cd7159c..c6ec73de326 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -88,7 +88,7 @@ public: /** * Invoke the _non_existent() pseudo-operation on the supplier. If * it is disconnected then it returns true and sets the - * <disconnected> flag. + * @a disconnected flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected); @@ -134,14 +134,14 @@ protected: /// Release the filter and the supplier void cleanup_i (void); - /// The supplier admin, used for activation and memory managment. + /// The supplier admin, used for activation and memory management. TAO_EC_Event_Channel_Base* event_channel_; /// The locking strategy. ACE_Lock* lock_; /// The reference count. - CORBA::ULong refcount_; + CORBA::ULong ec_refcount_; /// The supplier.... RtecEventComm::PushSupplier_var supplier_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index bb0d14d02c7..68b378bcb3e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -119,7 +119,7 @@ public: /** * Invoke the _non_existent() pseudo-operation on the consumer. If * it is disconnected then it returns true and sets the - * <disconnected> flag. + * @a disconnected flag. */ CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index 42931c188f7..d932bb3c9ac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -4,8 +4,6 @@ #include <ace/Dynamic_Service.h> - - #if !defined(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE) #define TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE 32 #endif diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h index 36b6b1e88cf..d5af34899bf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h @@ -62,9 +62,6 @@ private: // Use our own thread manager ACE_Thread_Manager thread_manager_; - /// The number of active tasks - // int nthreads_; - /// The flags (THR_BOUND, THR_NEW_LWP, etc.) used to create the /// dispatching threads. int thread_creation_flags_; @@ -72,10 +69,6 @@ private: /// The priority of the dispatching threads. int thread_priority_; - /// If activation at the requested priority fails then we fallback on - /// the defaults for thread activation. - // int force_activate_; - typedef ACE_Hash_Map_Manager_Ex<RtecEventComm::PushConsumer_ptr,TAO_EC_Dispatching_Task*,ACE_Pointer_Hash<RtecEventComm::PushConsumer_ptr>,ACE_Equal_To<RtecEventComm::PushConsumer_ptr>,ACE_Null_Mutex> MAPTYPE; // Tweak the default size of this map by #defining diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp index 0668ec73009..b6603da5c79 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp @@ -1,6 +1,5 @@ #include "orbsvcs/Event/EC_TPC_Dispatching_Task.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_TPC_Dispatching_Task::TAO_EC_TPC_Dispatching_Task diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp index cb1164d14a3..0b60d49d1cf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -1,8 +1,5 @@ #include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_TPC_ProxyConsumer.h" - - - #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/Event/EC_TPC_Dispatching.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp index e234f48dcab..a45da4bd065 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -5,8 +5,6 @@ #include "orbsvcs/Event/EC_TPC_ProxySupplier.inl" #endif /* __ACE_INLINE__ */ - - #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/Event/EC_TPC_Dispatching.h" @@ -16,16 +14,14 @@ extern unsigned long TAO_EC_TPC_debug_level; TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void) { - } void TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void) { if (TAO_EC_TPC_debug_level > 0) - ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): refcount=%u,consumer=%@\n", + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): consumer=%@\n", this, - this->refcount_, this->consumer_.in())); if (this->is_connected_i ()) @@ -54,8 +50,8 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer ( BASECLASS::connect_push_consumer (push_consumer, qos); if (TAO_EC_TPC_debug_level > 0) - ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n", - this, this->refcount_, this->consumer_.in())); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): consumer=%@\n", + this, this->consumer_.in())); TAO_EC_TPC_Dispatching* tpcdispatcher = this->tpc_dispatching (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h index 8541241158d..5fd466c2f11 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h @@ -30,7 +30,7 @@ public: /// Dtor virtual ~TAO_EC_TPC_ProxyPushSupplier (void); - /*! These are overriden from the base class in order to maintain the + /*! These are overridden from the base class in order to maintain the map in the dispatcher class. */ // = The RtecEventChannelAdmin::ProxyPushSupplier methods... diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h index 12f5e89f9f3..32f0a576ed5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h @@ -83,7 +83,7 @@ public: TAO_EC_Timeout_Adapter (void); private: - /// Casts <act> to EC_Filter and dispatches an event to it. + /// Casts @a act to EC_Filter and dispatches an event to it. virtual int handle_timeout (const ACE_Time_Value &tv, const void *act); }; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h index 481243af069..d1a51e63f52 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h @@ -41,9 +41,7 @@ namespace TAO { public: /** - * Constructor. <arg> parameter is used to pass any special - * state/info to the service handler upon creation. - + * Constructor. */ Creation_Strategy (TAO_ORB_Core *orb_core); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h index c63dc78b81a..ce4dcfa6b34 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h @@ -56,16 +56,15 @@ namespace TAO public: Completion_Handler (ACE_Thread_Manager* t = 0); - /// Constructor. <arg> parameter is used by the Acceptor to pass the - /// protocol configuration properties for this connection. + /// Constructor. Completion_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean = 0 ); + CORBA::Boolean = false); /// Destructor. ~Completion_Handler (void); /// Called by the <Strategy_Acceptor> when the handler is completely - /// connected. Argument is unused. + /// connected. Argument is unused. virtual int open (void *); //@{ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h index be29273a9e3..7d78bb653ea 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h @@ -52,8 +52,7 @@ namespace TAO Connection_Handler (ACE_Thread_Manager* t = 0); - /// Constructor. <arg> parameter is used by the Acceptor to pass the - /// protocol configuration properties for this connection. + /// Constructor. Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index c599bddeeba..e513b06caea 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -317,7 +317,7 @@ TAO::HTIOP::Connector::cancel_svc_handler ( /** * @brief Create a profile and initialize it based on the - * encapsulation in <cdr> + * encapsulation in @a cdr */ TAO_Profile * TAO::HTIOP::Connector::create_profile (TAO_InputCDR& cdr) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h index 3e8e39971db..7369d51747d 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h @@ -46,13 +46,11 @@ namespace TAO * creation time. * */ - template <class SVC_HANDLER> class Connect_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER> { public: - - /// Constructor. <arg> parameter is used to pass any special + /// Constructor. @a arg parameter is used to pass any special /// state/info to the service handler upon creation. Currently used /// by HTIOP to pass protocol configuration properties. Connect_Creation_Strategy (ACE_Thread_Manager * = 0, @@ -65,7 +63,6 @@ namespace TAO private: - /// Pointer to the ORB_Core on which we are activated TAO_ORB_Core* orb_core_; @@ -73,8 +70,6 @@ namespace TAO void *arg_; }; - - /** * @class HTIOP_Connect_Concurrency_Strategy * @@ -90,21 +85,17 @@ namespace TAO public ACE_Concurrency_Strategy<SVC_HANDLER> { public: - /// Constructor. Connect_Concurrency_Strategy (TAO_ORB_Core *orb_core); - /// Activates the Svc_Handler, and if the right wait strategy is in /// use, registers the handle with the reactor. int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg); private: - /// Pointer to the ORB Core. TAO_ORB_Core *orb_core_; - }; } } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 64c18c3bbf4..9a581fe1c5a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -62,9 +62,9 @@ TAO_AliasDef_i::type_i (void) CORBA::TypeCode_var tc = impl->type_i (); - return this->repo_->tc_factory ()->create_alias_tc (id.c_str (), - name.c_str (), - ACE_TEXT_ALWAYS_CHAR (tc.in ())); + return this->repo_->tc_factory ()->create_alias_tc (ACE_TEXT_ALWAYS_CHAR (id.c_str ()), + ACE_TEXT_ALWAYS_CHAR (name.c_str ()), + tc.in ()); } CORBA::IDLType_ptr @@ -110,7 +110,7 @@ TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def) this->repo_->config ()->set_string_value (this->section_key_, ACE_TEXT("original_type"), - original_type); + ACE_TEXT_CHAR_TO_TCHAR(original_type)); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index bbecccf97f4..7c685d9fc06 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -40,7 +40,7 @@ TAO_ArrayDef_i::destroy_i (void) ACE_TString name; this->repo_->config ()->get_string_value (this->section_key_, - "name", + ACE_TEXT("name"), name); this->repo_->config ()->remove_section (this->repo_->arrays_key (), @@ -97,7 +97,7 @@ TAO_ArrayDef_i::length_i (void) { u_int length = 0; this->repo_->config ()->get_integer_value (this->section_key_, - "length", + ACE_TEXT("length"), length); return static_cast<CORBA::ULong> (length); @@ -117,7 +117,7 @@ void TAO_ArrayDef_i::length_i (CORBA::ULong length) { this->repo_->config ()->set_integer_value (this->section_key_, - "length", + ACE_TEXT("length"), length); } @@ -136,7 +136,7 @@ TAO_ArrayDef_i::element_type_i (void) { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, - "element_path", + ACE_TEXT("element_path"), element_path); TAO_IDLType_i *impl = TAO_IFR_Service_Utils::path_to_idltype (element_path, @@ -160,7 +160,7 @@ TAO_ArrayDef_i::element_type_def_i (void) { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, - "element_path", + ACE_TEXT("element_path"), element_path); CORBA::Object_var obj = @@ -189,8 +189,8 @@ TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def) TAO_IFR_Service_Utils::reference_to_path (element_type_def); this->repo_->config ()->set_string_value (this->section_key_, - "element_path", - new_element_path); + ACE_TEXT("element_path"), + ACE_TEXT_CHAR_TO_TCHAR(new_element_path)); } void @@ -199,7 +199,7 @@ TAO_ArrayDef_i::destroy_element_type ( { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, - "element_path", + ACE_TEXT("element_path"), element_path); ACE_Configuration_Section_Key element_key; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h index 0df1d67eef8..a653c332502 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h @@ -1,6 +1,5 @@ // -*- C++ -*- - //============================================================================= /** * @file ArrayDef_i.h @@ -11,7 +10,6 @@ */ //============================================================================= - #ifndef TAO_ARRAYDEF_I_H #define TAO_ARRAYDEF_I_H diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index 0691ca9449c..6f56fed7bc1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -72,7 +72,7 @@ TAO_AttributeDef_i::type_i (void) { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, - "type_path", + ACE_TEXT("type_path"), type_path); TAO_IDLType_i *impl = @@ -97,7 +97,7 @@ TAO_AttributeDef_i::type_def_i (void) { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, - "type_path", + ACE_TEXT("type_path"), type_path); CORBA::Object_var obj = @@ -126,8 +126,8 @@ TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def) TAO_IFR_Service_Utils::reference_to_path (type_def); this->repo_->config ()->set_string_value (this->section_key_, - "type_path", - type_path); + ACE_TEXT("type_path"), + ACE_TEXT_CHAR_TO_TCHAR(type_path)); } CORBA::AttributeMode @@ -145,7 +145,7 @@ TAO_AttributeDef_i::mode_i (void) { u_int mode = 0; this->repo_->config ()->get_integer_value (this->section_key_, - "mode", + ACE_TEXT("mode"), mode); return static_cast<CORBA::AttributeMode> (mode); @@ -165,14 +165,13 @@ void TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode) { this->repo_->config ()->set_integer_value (this->section_key_, - "mode", + ACE_TEXT("mode"), mode); } void TAO_AttributeDef_i::make_description ( - CORBA::AttributeDescription &ad - ) + CORBA::AttributeDescription &ad) { ad.name = this->name_i (); @@ -180,10 +179,10 @@ TAO_AttributeDef_i::make_description ( ACE_TString container_id; this->repo_->config ()->get_string_value (this->section_key_, - "container_id", + ACE_TEXT("container_id"), container_id); - ad.defined_in = container_id.c_str (); + ad.defined_in = ACE_TEXT_ALWAYS_CHAR(container_id.c_str ()); ad.version = this->version_i (); @@ -203,7 +202,7 @@ TAO_AttributeDef_i::get_exceptions (void) ACE_Configuration_Section_Key get_excepts_key; int status = this->repo_->config ()->open_section (this->section_key_, - "get_excepts", + ACE_TEXT("get_excepts"), 0, get_excepts_key); @@ -254,7 +253,7 @@ TAO_AttributeDef_i::get_exceptions (void) CORBA::Object_var obj = TAO_IFR_Service_Utils::create_objref (CORBA::dk_Exception, - path.c_str (), + ACE_TEXT_ALWAYS_CHAR(path.c_str ()), this->repo_); retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()); @@ -274,7 +273,7 @@ TAO_AttributeDef_i::put_exceptions (void) ACE_Configuration_Section_Key put_excepts_key; int status = this->repo_->config ()->open_section (this->section_key_, - "put_excepts", + ACE_TEXT("put_excepts"), 0, put_excepts_key); @@ -325,7 +324,7 @@ TAO_AttributeDef_i::put_exceptions (void) CORBA::Object_var obj = TAO_IFR_Service_Utils::create_objref (CORBA::dk_Exception, - path.c_str (), + ACE_TEXT_ALWAYS_CHAR(path.c_str ()), this->repo_); retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h index ded783388f4..bbb11c6e549 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h @@ -1,6 +1,5 @@ // -*- C++ -*- - //============================================================================= /** * @file AttributeDef_i.h @@ -47,63 +46,42 @@ public: virtual ~TAO_AttributeDef_i (void); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe ( - ); + virtual CORBA::Contained::Description *describe (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe_i ( - ); + virtual CORBA::Contained::Description *describe_i (); - virtual CORBA::TypeCode_ptr type ( - ); + virtual CORBA::TypeCode_ptr type (); - CORBA::TypeCode_ptr type_i ( - ); + CORBA::TypeCode_ptr type_i (); - virtual CORBA::IDLType_ptr type_def ( - ); + virtual CORBA::IDLType_ptr type_def (); - CORBA::IDLType_ptr type_def_i ( - ); + CORBA::IDLType_ptr type_def_i (); - virtual void type_def ( - CORBA::IDLType_ptr type_def - ); + virtual void type_def (CORBA::IDLType_ptr type_def); - void type_def_i ( - CORBA::IDLType_ptr type_def - ); + void type_def_i (CORBA::IDLType_ptr type_def); - virtual CORBA::AttributeMode mode ( - ); + virtual CORBA::AttributeMode mode (); - CORBA::AttributeMode mode_i ( - ); + CORBA::AttributeMode mode_i (); - virtual void mode ( - CORBA::AttributeMode mode - ); + virtual void mode (CORBA::AttributeMode mode); - void mode_i ( - CORBA::AttributeMode mode - ); + void mode_i (CORBA::AttributeMode mode); /// Common code for InterfaceDef to call in /// making its own description. - void make_description ( - CORBA::AttributeDescription &ad - ); + void make_description (CORBA::AttributeDescription &ad); // These two are called by Contained::move(). - CORBA::ExceptionDefSeq *get_exceptions ( - ); + CORBA::ExceptionDefSeq *get_exceptions (); - CORBA::ExceptionDefSeq *put_exceptions ( - ); + CORBA::ExceptionDefSeq *put_exceptions (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp index 481e7e98677..fb5870084af 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp @@ -91,7 +91,7 @@ TAO_ComponentContainer_i::create_component_i ( // "id", // base_id); this->repo_->config ()->set_string_value (new_key, - "base_component", + ACE_TEXT("base_component"), base_path); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h index c3de3850f4f..1ee5a6dbb29 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h @@ -49,16 +49,14 @@ public: const char *name, const char *version, CORBA::ComponentIR::ComponentDef_ptr base_component, - const CORBA::InterfaceDefSeq &supports_interfaces - ); + const CORBA::InterfaceDefSeq &supports_interfaces); CORBA::ComponentIR::ComponentDef_ptr create_component_i ( const char *id, const char *name, const char *version, CORBA::ComponentIR::ComponentDef_ptr base_component, - const CORBA::InterfaceDefSeq &supports_interfaces - ); + const CORBA::InterfaceDefSeq &supports_interfaces); virtual CORBA::ComponentIR::HomeDef_ptr create_home ( const char *id, @@ -67,8 +65,7 @@ public: CORBA::ComponentIR::HomeDef_ptr base_home, CORBA::ComponentIR::ComponentDef_ptr managed_component, const CORBA::InterfaceDefSeq &supports_interfaces, - CORBA::ValueDef_ptr primary_key - ); + CORBA::ValueDef_ptr primary_key); CORBA::ComponentIR::HomeDef_ptr create_home_i ( const char *id, @@ -77,8 +74,7 @@ public: CORBA::ComponentIR::HomeDef_ptr base_home, CORBA::ComponentIR::ComponentDef_ptr managed_component, const CORBA::InterfaceDefSeq &supports_interfaces, - CORBA::ValueDef_ptr primary_key - ); + CORBA::ValueDef_ptr primary_key); virtual CORBA::ComponentIR::EventDef_ptr create_event ( const char *id, @@ -90,8 +86,7 @@ public: CORBA::Boolean is_truncatable, const CORBA::ValueDefSeq &abstract_base_values, const CORBA::InterfaceDefSeq &supported_interfaces, - const CORBA::ExtInitializerSeq &initializers - ); + const CORBA::ExtInitializerSeq &initializers); CORBA::ComponentIR::EventDef_ptr create_event_i ( const char *id, @@ -103,8 +98,7 @@ public: CORBA::Boolean is_truncatable, const CORBA::ValueDefSeq &abstract_base_values, const CORBA::InterfaceDefSeq &supported_interfaces, - const CORBA::ExtInitializerSeq &initializers - ); + const CORBA::ExtInitializerSeq &initializers); /// Called from TAO_IFR_Service_Utils::name_exisits. static int same_as_tmp_name (const char *name); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index bbbf8a5519e..783a6093cab 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -152,7 +152,7 @@ TAO_ComponentDef_i::describe_i (void) ACE_TString holder; int status = this->repo_->config ()->get_string_value (this->section_key_, - "base_component", + ACE_TEXT("base_component"), holder); if (status == 0) @@ -163,7 +163,7 @@ TAO_ComponentDef_i::describe_i (void) base_key, 0); this->repo_->config ()->get_string_value (base_key, - "id", + ACE_TEXT("id"), holder); } @@ -292,12 +292,12 @@ TAO_ComponentDef_i::type_i (void) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, - "id", + ACE_TEXT("id"), id); ACE_TString name; this->repo_->config ()->get_string_value (this->section_key_, - "name", + ACE_TEXT("name"), name); return this->repo_->tc_factory ()->create_component_tc ( @@ -436,7 +436,7 @@ TAO_ComponentDef_i::base_component_i (void) ACE_TString base_path; int status = this->repo_->config ()->get_string_value (this->section_key_, - "base_component", + ACE_TEXT("base_component"), base_path); if (status != 0) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h index 8fa16003e95..f7b5e715e7a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h @@ -46,132 +46,103 @@ public: virtual ~TAO_ComponentDef_i (void); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind (); /// Remove the repository entry. - virtual void destroy ( - ); + virtual void destroy (); /// Remove the repository entry. - void destroy_i ( - ); + void destroy_i (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe ( - ); + virtual CORBA::Contained::Description *describe (); /// From Contained_i's pure virtual function. - CORBA::Contained::Description *describe_i ( - ); + CORBA::Contained::Description *describe_i (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type ( - ); + virtual CORBA::TypeCode_ptr type (); /// From IDLType_i's pure virtual function. - CORBA::TypeCode_ptr type_i ( - ); + CORBA::TypeCode_ptr type_i (); - virtual CORBA::InterfaceDefSeq *supported_interfaces ( - ); + virtual CORBA::InterfaceDefSeq *supported_interfaces (); - CORBA::InterfaceDefSeq *supported_interfaces_i ( - ); + CORBA::InterfaceDefSeq *supported_interfaces_i (); - virtual void supported_interfaces ( - const CORBA::InterfaceDefSeq &supported_interfaces - ); + virtual void supported_interfaces (const CORBA::InterfaceDefSeq &supported_interfaces); - void supported_interfaces_i ( - const CORBA::InterfaceDefSeq &supported_interfaces - ); + void supported_interfaces_i (const CORBA::InterfaceDefSeq &supported_interfaces); - virtual CORBA::ComponentIR::ComponentDef_ptr base_component ( - ); + virtual CORBA::ComponentIR::ComponentDef_ptr base_component (); - CORBA::ComponentIR::ComponentDef_ptr base_component_i ( - ); + CORBA::ComponentIR::ComponentDef_ptr base_component_i (); - virtual void base_component ( - CORBA::ComponentIR::ComponentDef_ptr base_component - ); + virtual void base_component (CORBA::ComponentIR::ComponentDef_ptr base_component); - void base_component_i ( - CORBA::ComponentIR::ComponentDef_ptr base_component - ); + void base_component_i (CORBA::ComponentIR::ComponentDef_ptr base_component); virtual CORBA::ComponentIR::ProvidesDef_ptr create_provides ( const char *id, const char *name, const char *version, - CORBA::InterfaceDef_ptr interface_type - ); + CORBA::InterfaceDef_ptr interface_type); CORBA::ComponentIR::ProvidesDef_ptr create_provides_i ( const char *id, const char *name, const char *version, - CORBA::InterfaceDef_ptr interface_type - ); + CORBA::InterfaceDef_ptr interface_type); virtual CORBA::ComponentIR::UsesDef_ptr create_uses ( const char *id, const char *name, const char *version, CORBA::InterfaceDef_ptr interface_type, - CORBA::Boolean is_multiple - ); + CORBA::Boolean is_multiple); CORBA::ComponentIR::UsesDef_ptr create_uses_i ( const char *id, const char *name, const char *version, CORBA::InterfaceDef_ptr interface_type, - CORBA::Boolean is_multiple - ); + CORBA::Boolean is_multiple); virtual CORBA::ComponentIR::EmitsDef_ptr create_emits ( const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ); + CORBA::ValueDef_ptr value); CORBA::ComponentIR::EmitsDef_ptr create_emits_i ( const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ); + CORBA::ValueDef_ptr value); virtual CORBA::ComponentIR::PublishesDef_ptr create_publishes ( const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ); + CORBA::ValueDef_ptr value); CORBA::ComponentIR::PublishesDef_ptr create_publishes_i ( const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ); + CORBA::ValueDef_ptr value); virtual CORBA::ComponentIR::ConsumesDef_ptr create_consumes ( const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ); + CORBA::ValueDef_ptr value); CORBA::ComponentIR::ConsumesDef_ptr create_consumes_i ( const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ); + CORBA::ValueDef_ptr value); /// Called from TAO_IFR_Service_Utils::name_exists() when we /// are a base component. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h index ff0a7b42303..c07c5684322 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h @@ -67,20 +67,12 @@ public: virtual int create_servants_and_poas (void); /// Return one of our servants for internal use. - virtual TAO_IDLType_i *select_idltype ( - CORBA::DefinitionKind def_kind - ) const; - virtual TAO_Container_i *select_container ( - CORBA::DefinitionKind def_kind - ) const; - virtual TAO_Contained_i *select_contained ( - CORBA::DefinitionKind def_kind - ) const; + virtual TAO_IDLType_i *select_idltype (CORBA::DefinitionKind def_kind) const; + virtual TAO_Container_i *select_container (CORBA::DefinitionKind def_kind) const; + virtual TAO_Contained_i *select_contained (CORBA::DefinitionKind def_kind) const; /// Select the right POA for object creation. - virtual PortableServer::POA_ptr select_poa ( - CORBA::DefinitionKind def_kind - ) const; + virtual PortableServer::POA_ptr select_poa (CORBA::DefinitionKind def_kind) const; protected: diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index 59229c7818e..f91f727f4ba 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -56,7 +56,7 @@ TAO_ConstantDef_i::describe_i (void) ACE_TString container_id; this->repo_->config ()->get_string_value (this->section_key_, - "container_id", + ACE_TEXT("container_id"), container_id); cd.defined_in = container_id.c_str (); @@ -87,7 +87,7 @@ TAO_ConstantDef_i::type_i (void) { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, - "type_path", + ACE_TEXT("type_path"), type_path); TAO_IDLType_i *impl = TAO_IFR_Service_Utils::path_to_idltype (type_path, @@ -111,7 +111,7 @@ TAO_ConstantDef_i::type_def_i (void) { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, - "type_path", + ACE_TEXT("type_path"), type_path); CORBA::Object_var obj = diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index 360c1395929..975ade416ab 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -34,7 +34,7 @@ TAO_Contained_i::destroy_i (void) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, - "id", + ACE_TEXT("id"), id); // We'll get the last segment of this below. @@ -99,7 +99,7 @@ TAO_Contained_i::id_i (void) { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, - "id", + ACE_TEXT("id"), retval); return CORBA::string_dup (retval.c_str ()); @@ -122,9 +122,7 @@ TAO_Contained_i::id_i (const char *id) if (this->repo_->config ()->get_string_value ( this->repo_->repo_ids_key (), id, - tmp - ) - == 0) + tmp) == 0) { // Repository id already exists. throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); @@ -133,7 +131,7 @@ TAO_Contained_i::id_i (const char *id) // Get the old id. ACE_TString old_id; this->repo_->config ()->get_string_value (this->section_key_, - "id", + ACE_TEXT("id"), old_id); ACE_TString path; @@ -173,7 +171,7 @@ TAO_Contained_i::name_i (void) { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, - "name", + ACE_TEXT("name"), retval); return CORBA::string_dup (retval.c_str ()); @@ -194,7 +192,7 @@ TAO_Contained_i::version_i (void) { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, - "version", + ACE_TEXT("version"), retval); return CORBA::string_dup (retval.c_str ()); @@ -229,7 +227,7 @@ TAO_Contained_i::name_i (const char *name) // Update the absolute name. ACE_TString absolute_name; this->repo_->config ()->get_string_value (this->section_key_, - "absolute_name", + ACE_TEXT("absolute_name"), absolute_name); absolute_name = absolute_name.substr (0, absolute_name.rfind (':') + 1); @@ -276,7 +274,7 @@ TAO_Contained_i::defined_in_i (void) { ACE_TString container_id; this->repo_->config ()->get_string_value (this->section_key_, - "container_id", + ACE_TEXT("container_id"), container_id); if (container_id == "") @@ -314,7 +312,7 @@ TAO_Contained_i::absolute_name_i (void) { ACE_TString absolute_name; this->repo_->config ()->get_string_value (this->section_key_, - "absolute_name", + ACE_TEXT("absolute_name"), absolute_name); return CORBA::string_dup (absolute_name.c_str ()); @@ -362,7 +360,7 @@ TAO_Contained_i::name_exists (const char *name) { ACE_TString container_id; this->repo_->config ()->get_string_value (this->section_key_, - "container_id", + ACE_TEXT("container_id"), container_id); if (container_id == "") @@ -409,7 +407,7 @@ TAO_Contained_i::name_exists (const char *name) ACE_TString defn_name; this->repo_->config ()->get_string_value (defn_key, - "name", + ACE_TEXT("name"), defn_name); if (defn_name == name) @@ -451,7 +449,7 @@ TAO_Contained_i::contents_name_update (ACE_TString stem, ACE_TString name; this->repo_->config ()->get_string_value (defn_key, - "name", + ACE_TEXT("name"), name); ACE_TString absolute_name = stem + "::" + name; @@ -889,7 +887,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container, ACE_Configuration_Section_Key parent_key; this->repo_->config ()->get_string_value (old_section_key, - "container_id", + ACE_TEXT("container_id"), container_id); if (container_id == "") @@ -902,8 +900,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container, this->repo_->config ()->get_string_value ( this->repo_->repo_ids_key (), container_id.c_str (), - parent_path - ); + parent_path); this->repo_->config ()->expand_path (this->repo_->root_key (), parent_path, @@ -959,12 +956,12 @@ TAO_Contained_i::move_pre_process (CORBA::Container_ptr container, ACE_TString ref_name; this->repo_->config ()->get_string_value (ref_key, - "name", + ACE_TEXT("name"), ref_name); ACE_TString path; this->repo_->config ()->get_string_value (ref_key, - "path", + ACE_TEXT("path"), path); if (ref_name == name && path == contained_path) @@ -1012,15 +1009,15 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container) if (status == 0) { this->repo_->config ()->get_string_value (defn_key, - "name", + ACE_TEXT("name"), name); this->repo_->config ()->get_string_value (defn_key, - "version", + ACE_TEXT("version"), version); u_int kind = 0; this->repo_->config ()->get_integer_value (defn_key, - "def_kind", + ACE_TEXT("def_kind"), kind); CORBA::DefinitionKind def_kind = static_cast<CORBA::DefinitionKind> (kind); @@ -1066,11 +1063,11 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container) attr_key); this->repo_->config ()->get_string_value (attr_key, - "name", + ACE_TEXT("name"), name); this->repo_->config ()->get_string_value (attr_key, - "version", + ACE_TEXT("version"), version); TAO_AttributeDef_i impl (this->repo_); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h index 8c834e44759..d3c07d80c08 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h @@ -47,79 +47,52 @@ public: virtual ~TAO_Contained_i (void); /// Remove the repository entry. - virtual void destroy ( - ); + virtual void destroy (); - virtual void destroy_i ( - ); + virtual void destroy_i (); - virtual char *id ( - ); + virtual char *id (); - char *id_i ( - ); + char *id_i (); - virtual void id ( - const char *id - ); + virtual void id (const char *id); - void id_i ( - const char *id - ); + void id_i (const char *id); - virtual char *name ( - ); + virtual char *name (); - char *name_i ( - ); + char *name_i (); - virtual void name ( - const char *name - ); + virtual void name (const char *name); - void name_i ( - const char *name - ); + void name_i (const char *name); - virtual char *version ( - ); + virtual char *version (); - char *version_i ( - ); + char *version_i (); - virtual void version ( - const char *version - ); + virtual void version (const char *version); - void version_i ( - const char *version - ); + void version_i (const char *version); - virtual CORBA::Container_ptr defined_in ( - ); + virtual CORBA::Container_ptr defined_in (); - CORBA::Container_ptr defined_in_i ( - ); + CORBA::Container_ptr defined_in_i (); - virtual char *absolute_name ( - ); + virtual char *absolute_name (); - char *absolute_name_i ( - ); + char *absolute_name_i (); - virtual CORBA::Repository_ptr containing_repository ( - ); + virtual CORBA::Repository_ptr containing_repository (); - virtual CORBA::Contained::Description *describe ( - ); + virtual CORBA::Contained::Description *describe (); virtual CORBA::Contained::Description *describe_i (); virtual void move ( CORBA::Container_ptr new_container, const char *new_name, - const char *new_version - ); + const char *new_version); /// Called from TAO_IFR_Service_Utils::name_exists. static int same_as_tmp_name (const char *name); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h index d20b48285d6..f083df51766 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h @@ -44,8 +44,7 @@ public: virtual ~TAO_EmitsDef_i (void); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h index eff8e113c55..a26db003ccf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h @@ -47,31 +47,22 @@ public: virtual ~TAO_EventDef_i (void); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind (); /// Remove the repository entry. - virtual void destroy ( - ); + virtual void destroy (); - virtual void destroy_i ( - ); + virtual void destroy_i (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe ( - ); + virtual CORBA::Contained::Description *describe (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe_i ( - ); + virtual CORBA::Contained::Description *describe_i (); - virtual CORBA::Boolean is_a ( - const char *event_id - ); + virtual CORBA::Boolean is_a (const char *event_id); - CORBA::Boolean is_a_i ( - const char *event_id - ); + CORBA::Boolean is_a_i (const char *event_id); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h index 80d5c1ee423..813fea9382e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h @@ -48,8 +48,7 @@ public: /// Destructor virtual ~TAO_ExtLocalInterfaceDef_i (void); - virtual void destroy ( - ); + virtual void destroy (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index fea208127a4..e2386bbf087 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -836,7 +836,7 @@ TAO_ExtValueDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions, exceptions[i].type = impl.type_i (); this->repo_->config ()->get_string_value (except_key, - "container_id", + ACE_TEXT("container_id"), holder); exceptions[i].defined_in = holder.fast_rep (); this->repo_->config ()->get_string_value (except_key, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h index e1c05698123..a1f381abbe5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h @@ -46,25 +46,17 @@ public: /// Destructor virtual ~TAO_ExtValueDef_i (void); - virtual CORBA::ExtInitializerSeq *ext_initializers ( - ); + virtual CORBA::ExtInitializerSeq *ext_initializers (); - CORBA::ExtInitializerSeq *ext_initializers_i ( - ); + CORBA::ExtInitializerSeq *ext_initializers_i (); - virtual void ext_initializers ( - const CORBA::ExtInitializerSeq &ext_initializers - ); + virtual void ext_initializers (const CORBA::ExtInitializerSeq &ext_initializers); - void ext_initializers_i ( - const CORBA::ExtInitializerSeq &ext_initializers - ); + void ext_initializers_i (const CORBA::ExtInitializerSeq &ext_initializers); - virtual CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value ( - ); + virtual CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value ( ); - CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value_i ( - ); + CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value_i (); virtual CORBA::ExtAttributeDef_ptr create_ext_attribute ( const char *id, @@ -73,8 +65,7 @@ public: CORBA::IDLType_ptr type, CORBA::AttributeMode mode, const CORBA::ExceptionDefSeq &get_exceptions, - const CORBA::ExceptionDefSeq &set_exceptions - ); + const CORBA::ExceptionDefSeq &set_exceptions); CORBA::ExtAttributeDef_ptr create_ext_attribute_i ( const char *id, @@ -83,8 +74,7 @@ public: CORBA::IDLType_ptr type, CORBA::AttributeMode mode, const CORBA::ExceptionDefSeq &get_exceptions, - const CORBA::ExceptionDefSeq &set_exceptions - ); + const CORBA::ExceptionDefSeq &set_exceptions); //// Public because it's also called from //// TAO_Container_i::create_ext_value_i. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h index a7717e81524..39dfd6aaaf2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h @@ -46,8 +46,7 @@ public: virtual ~TAO_FactoryDef_i (void); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind ( ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h index f240456eb94..f6296e13b07 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h @@ -47,8 +47,7 @@ public: virtual ~TAO_FinderDef_i (void); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h index 718c1d584f9..af08c6e6d21 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h @@ -46,51 +46,34 @@ public: virtual ~TAO_FixedDef_i (void); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind (); /// Remove the repository entry. - virtual void destroy ( - ); + virtual void destroy (); - virtual void destroy_i ( - ); + virtual void destroy_i (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type ( - ); + virtual CORBA::TypeCode_ptr type (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type_i ( - ); + virtual CORBA::TypeCode_ptr type_i (); - virtual CORBA::UShort digits ( - ); + virtual CORBA::UShort digits (); - CORBA::UShort digits_i ( - ); + CORBA::UShort digits_i (); - virtual void digits ( - CORBA::UShort digits - ); + virtual void digits (CORBA::UShort digits); - void digits_i ( - CORBA::UShort digits - ); + void digits_i (CORBA::UShort digits); - virtual CORBA::Short scale ( - ); + virtual CORBA::Short scale (); - CORBA::Short scale_i ( - ); + CORBA::Short scale_i (); - virtual void scale ( - CORBA::Short scale - ); + virtual void scale (CORBA::Short scale); - void scale_i ( - CORBA::Short scale - ); + void scale_i (CORBA::Short scale); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h index 6cd2b403c07..85d58bb7496 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h @@ -48,13 +48,9 @@ public: /// Destructor. virtual ~TAO_IDLType_i (void); /// Defined in concrete classes. - virtual CORBA::TypeCode_ptr type () - - = 0; + virtual CORBA::TypeCode_ptr type () = 0; /// Defined in concrete classes. - virtual CORBA::TypeCode_ptr type_i () - - = 0; + virtual CORBA::TypeCode_ptr type_i () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index fe21ede6f1e..cafbd7cdb62 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -475,10 +475,10 @@ TAO_IFR_Service_Utils::~TAO_IFR_Service_Utils (void) ACE_Configuration_Section_Key TAO_IFR_Service_Utils::tmp_key_; -char * +ACE_TCHAR * TAO_IFR_Service_Utils::int_to_string (CORBA::ULong number) { - static char hex_string[9]; + static ACE_TCHAR hex_string[9]; ACE_OS::sprintf (hex_string, "%8.8X", number); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index 8fb9f31fc59..b43dd6ac43a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -105,7 +105,7 @@ public: typedef int (*name_clash_checker)(const char *); /// Convert the hex form of an 4-byte unsigned int to a string. - static char *int_to_string (CORBA::ULong number); + static ACE_TCHAR *int_to_string (CORBA::ULong number); /// The error-checking methods below all return void because /// they throw a spec-defined exception for every error case @@ -158,16 +158,14 @@ public: const char *name, name_clash_checker checker, const char *version, - const char *sub_section_name - ); + const char *sub_section_name); /// Common to Container::create_value() and ValueDef::supported_interfaces(), /// Container::create_component() and Component::supported_interfaces(). static void set_supported_interfaces ( const CORBA::InterfaceDefSeq &supported_interfaces, ACE_Configuration *config, - ACE_Configuration_Section_Key &key - ); + ACE_Configuration_Section_Key &key); /// Common code for operations, attributes, and valuetype initializers. static void set_exceptions (ACE_Configuration *config, @@ -178,15 +176,14 @@ public: /// Implemented here to avoid recursion in the servant classes. static CORBA::TypeCode_ptr gen_valuetype_tc_r ( ACE_Configuration_Section_Key &, - TAO_Repository_i * - ); + TAO_Repository_i *); /// Called from the above function. static void fill_valuemember_seq (CORBA::ValueMemberSeq &, ACE_Configuration_Section_Key &, TAO_Repository_i *); - /// Converison from IR Object reference to key location path. + /// Conversion from IR Object reference to key location path. static char *reference_to_path (CORBA::IRObject_ptr obj); /// Conversion from key location path to CORBA::DefinitionKind. @@ -196,8 +193,7 @@ public: /// Conversion from IR Object reference to CORBA::DefinitionKind. static CORBA::DefinitionKind reference_to_def_kind ( CORBA::IRObject_ptr obj, - TAO_Repository_i *repo - ); + TAO_Repository_i *repo); /// Converion from key location path to IDLType. static TAO_IDLType_i *path_to_idltype (ACE_TString &path, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp index 4832fe1fb27..0141e56b96c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> void -TAO_IFR_Generic_Utils<T>::destroy_special (const char *section_name, +TAO_IFR_Generic_Utils<T>::destroy_special (const ACE_TCHAR *section_name, TAO_Repository_i *repo, ACE_Configuration_Section_Key &key) { @@ -30,10 +30,10 @@ TAO_IFR_Generic_Utils<T>::destroy_special (const char *section_name, CORBA::ULong count = 0; repo->config ()->get_integer_value (sub_key, - "count", + ACE_TEXT("count"), count); - char *stringified = 0; + ACE_TCHAR *stringified = 0; ACE_Configuration_Section_Key special_key; ACE_TString holder; @@ -67,11 +67,11 @@ TAO_IFR_Generic_Utils<T>::set_initializers ( ACE_Configuration_Section_Key initializers_key; config->open_section (key, - "initializers", + ACE_TEXT("initializers"), 1, initializers_key); config->set_integer_value (initializers_key, - "count", + ACE_TEXT("count"), length); CORBA::ULong arg_count = 0; @@ -82,13 +82,13 @@ TAO_IFR_Generic_Utils<T>::set_initializers ( for (CORBA::ULong i = 0; i < length; ++i) { - char *stringified = TAO_IFR_Service_Utils::int_to_string (i); + ACE_TCHAR *stringified = TAO_IFR_Service_Utils::int_to_string (i); config->open_section (initializers_key, stringified, 1, initializer_key); config->set_string_value (initializer_key, - "name", + ACE_TEXT("name"), initializers[i].name.in ()); arg_count = initializers[i].members.length (); @@ -96,16 +96,16 @@ TAO_IFR_Generic_Utils<T>::set_initializers ( if (arg_count > 0) { config->open_section (initializer_key, - "params", + ACE_TEXT("params"), 1, params_key); config->set_integer_value (params_key, - "count", + ACE_TEXT("count"), arg_count); for (CORBA::ULong j = 0; j < arg_count; ++j) { - char *stringified = + ACE_TCHAR *stringified = TAO_IFR_Service_Utils::int_to_string (j); config->open_section (params_key, stringified, @@ -121,7 +121,7 @@ TAO_IFR_Generic_Utils<T>::set_initializers ( initializers[i].members[j].type_def.in () ); config->set_string_value (arg_key, - "arg_path", + ACE_TEXT("arg_path"), arg_path); } } @@ -133,8 +133,7 @@ void TAO_IFR_Desc_Utils<T_desc,T_impl>::fill_desc_begin ( T_desc &desc, TAO_Repository_i *repo, - ACE_Configuration_Section_Key &key - ) + ACE_Configuration_Section_Key &key) { T_impl impl (repo); impl.section_key (key); @@ -145,7 +144,7 @@ TAO_IFR_Desc_Utils<T_desc,T_impl>::fill_desc_begin ( ACE_TString holder; repo->config ()->get_string_value (key, - "container_id", + ACE_TEXT("container_id"), holder); desc.defined_in = holder.fast_rep (); @@ -158,8 +157,7 @@ TAO_IFR_Strseq_Utils<T_strseq> ::fill_string_seq ( const char *section_name, ACE_Configuration *config, ACE_Configuration_Section_Key &key, - T_strseq &seq - ) + T_strseq &seq) { ACE_Configuration_Section_Key section_key; int status = config->open_section (key, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h index 1948067a749..4c00273e01e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h @@ -37,7 +37,7 @@ template<typename T> class TAO_IFR_Generic_Utils { public: - static void destroy_special (const char *section_name, + static void destroy_special (const ACE_TCHAR *section_name, TAO_Repository_i *repo, ACE_Configuration_Section_Key &key); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h index 9aa0f3989db..9fd8d8213c6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h @@ -52,18 +52,13 @@ public: /// Destructor. virtual ~TAO_IRObject_i (void); - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind (); /// Pure virtual. - virtual void destroy ( - ) - = 0; + virtual void destroy () = 0; /// Pure virtual - the unlocked version called by the destroy() wrapper. - virtual void destroy_i ( - ) - = 0; + virtual void destroy_i () = 0; /// Plug in the section key. void section_key (ACE_Configuration_Section_Key &key); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp index 5a7cffef327..50f496b0dba 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp @@ -24,8 +24,7 @@ TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i (void) CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * -TAO_InterfaceAttrExtension_i::describe_ext_interface ( - ) +TAO_InterfaceAttrExtension_i::describe_ext_interface () { TAO_IFR_READ_GUARD_RETURN (0); @@ -35,8 +34,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface ( } CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * -TAO_InterfaceAttrExtension_i::describe_ext_interface_i ( - ) +TAO_InterfaceAttrExtension_i::describe_ext_interface_i () { CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *fifd = 0; ACE_NEW_RETURN (fifd, @@ -232,8 +230,7 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute ( CORBA::IDLType_ptr type, CORBA::AttributeMode mode, const CORBA::ExceptionDefSeq &get_exceptions, - const CORBA::ExceptionDefSeq &set_exceptions - ) + const CORBA::ExceptionDefSeq &set_exceptions) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtAttributeDef::_nil ()); @@ -256,8 +253,7 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i ( CORBA::IDLType_ptr type, CORBA::AttributeMode mode, const CORBA::ExceptionDefSeq &get_exceptions, - const CORBA::ExceptionDefSeq &set_exceptions - ) + const CORBA::ExceptionDefSeq &set_exceptions) { TAO_Container_i::tmp_name_holder (name); ACE_Configuration_Section_Key new_key; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h index e72d43ac71f..8361d300531 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h @@ -75,11 +75,9 @@ public: CORBA::UnionMemberSeq *members_i (); - virtual void members ( - const CORBA::UnionMemberSeq &members); + virtual void members (const CORBA::UnionMemberSeq &members); - void members_i ( - const CORBA::UnionMemberSeq &members); + void members_i (const CORBA::UnionMemberSeq &members); private: /// Used by members() to get each member's label value. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h index da6bb1caf2f..7b3947e2196 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h @@ -46,44 +46,29 @@ public: virtual ~TAO_UsesDef_i (void); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe ( - ); + virtual CORBA::Contained::Description *describe (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe_i ( - ); + virtual CORBA::Contained::Description *describe_i (); - virtual CORBA::InterfaceDef_ptr interface_type ( - ); + virtual CORBA::InterfaceDef_ptr interface_type (); - virtual void interface_type ( - CORBA::InterfaceDef_ptr interface_type - ); + virtual void interface_type (CORBA::InterfaceDef_ptr interface_type); - void interface_type_i ( - CORBA::InterfaceDef_ptr interface_type - ); + void interface_type_i (CORBA::InterfaceDef_ptr interface_type); - CORBA::InterfaceDef_ptr interface_type_i ( - ); + CORBA::InterfaceDef_ptr interface_type_i (); - virtual CORBA::Boolean is_multiple ( - ); + virtual CORBA::Boolean is_multiple (); - CORBA::Boolean is_multiple_i ( - ); + CORBA::Boolean is_multiple_i (); - virtual void is_multiple ( - CORBA::Boolean is_multiple - ); + virtual void is_multiple (CORBA::Boolean is_multiple); - void is_multiple_i ( - CORBA::Boolean is_multiple - ); + void is_multiple_i (CORBA::Boolean is_multiple); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h index 68da641feaf..3bfb1ad0be0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h @@ -55,11 +55,9 @@ public: CORBA::IDLType_ptr original_type_def_i (); - virtual void original_type_def ( - CORBA::IDLType_ptr original_type_def); + virtual void original_type_def (CORBA::IDLType_ptr original_type_def); - void original_type_def_i ( - CORBA::IDLType_ptr original_type_def); + void original_type_def_i (CORBA::IDLType_ptr original_type_def); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h index 60aa3bb98d4..55941ca3b18 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h @@ -49,175 +49,116 @@ public: virtual ~TAO_ValueDef_i (void); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind (); /// Remove the repository entry. - virtual void destroy ( - ); + virtual void destroy (); - virtual void destroy_i ( - ); + virtual void destroy_i (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe ( - ); + virtual CORBA::Contained::Description *describe (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe_i ( - ); + virtual CORBA::Contained::Description *describe_i (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type ( - ); + virtual CORBA::TypeCode_ptr type (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type_i ( - ); + virtual CORBA::TypeCode_ptr type_i (); - virtual CORBA::InterfaceDefSeq *supported_interfaces ( - ); + virtual CORBA::InterfaceDefSeq *supported_interfaces (); - CORBA::InterfaceDefSeq *supported_interfaces_i ( - ); + CORBA::InterfaceDefSeq *supported_interfaces_i (); - virtual void supported_interfaces ( - const CORBA::InterfaceDefSeq & supported_interfaces - ); + virtual void supported_interfaces (const CORBA::InterfaceDefSeq & supported_interfaces); - void supported_interfaces_i ( - const CORBA::InterfaceDefSeq & supported_interfaces - ); + void supported_interfaces_i (const CORBA::InterfaceDefSeq & supported_interfaces); - virtual CORBA::InitializerSeq *initializers ( - ); + virtual CORBA::InitializerSeq *initializers (); - CORBA::InitializerSeq *initializers_i ( - ); + CORBA::InitializerSeq *initializers_i (); - virtual void initializers ( - const CORBA::InitializerSeq & initializers - ); + virtual void initializers (const CORBA::InitializerSeq & initializers); - void initializers_i ( - const CORBA::InitializerSeq & initializers - ); + void initializers_i (const CORBA::InitializerSeq & initializers); - virtual CORBA::ValueDef_ptr base_value ( - ); + virtual CORBA::ValueDef_ptr base_value (); - CORBA::ValueDef_ptr base_value_i ( - ); + CORBA::ValueDef_ptr base_value_i (); - virtual void base_value ( - CORBA::ValueDef_ptr base_value - ); + virtual void base_value (CORBA::ValueDef_ptr base_value); - void base_value_i ( - CORBA::ValueDef_ptr base_value - ); + void base_value_i (CORBA::ValueDef_ptr base_value); - virtual CORBA::ValueDefSeq *abstract_base_values ( - ); + virtual CORBA::ValueDefSeq *abstract_base_values (); - CORBA::ValueDefSeq *abstract_base_values_i ( - ); + CORBA::ValueDefSeq *abstract_base_values_i (); - virtual void abstract_base_values ( - const CORBA::ValueDefSeq & abstract_base_values - ); + virtual void abstract_base_values (const CORBA::ValueDefSeq & abstract_base_values); - void abstract_base_values_i ( - const CORBA::ValueDefSeq & abstract_base_values - ); + void abstract_base_values_i (const CORBA::ValueDefSeq & abstract_base_values ); - virtual CORBA::Boolean is_abstract ( - ); + virtual CORBA::Boolean is_abstract (); - CORBA::Boolean is_abstract_i ( - ); + CORBA::Boolean is_abstract_i (); - virtual void is_abstract ( - CORBA::Boolean is_abstract - ); + virtual void is_abstract (CORBA::Boolean is_abstract); - void is_abstract_i ( - CORBA::Boolean is_abstract - ); + void is_abstract_i (CORBA::Boolean is_abstract); - virtual CORBA::Boolean is_custom ( - ); + virtual CORBA::Boolean is_custom (); - CORBA::Boolean is_custom_i ( - ); + CORBA::Boolean is_custom_i (); - virtual void is_custom ( - CORBA::Boolean is_custom - ); + virtual void is_custom (CORBA::Boolean is_custom); - void is_custom_i ( - CORBA::Boolean is_custom - ); + void is_custom_i (CORBA::Boolean is_custom); - virtual CORBA::Boolean is_truncatable ( - ); + virtual CORBA::Boolean is_truncatable (); - CORBA::Boolean is_truncatable_i ( - ); + CORBA::Boolean is_truncatable_i (); - virtual void is_truncatable ( - CORBA::Boolean is_truncatable - ); + virtual void is_truncatable (CORBA::Boolean is_truncatable); - void is_truncatable_i ( - CORBA::Boolean is_truncatable - ); + void is_truncatable_i (CORBA::Boolean is_truncatable); - virtual CORBA::Boolean is_a ( - const char *id - ); + virtual CORBA::Boolean is_a (const char *id); - CORBA::Boolean is_a_i ( - const char *id - ); + CORBA::Boolean is_a_i (const char *id); - virtual CORBA::ValueDef::FullValueDescription *describe_value ( - ); + virtual CORBA::ValueDef::FullValueDescription *describe_value (); - CORBA::ValueDef::FullValueDescription *describe_value_i ( - ); + CORBA::ValueDef::FullValueDescription *describe_value_i (); virtual CORBA::ValueMemberDef_ptr create_value_member ( const char *id, const char *name, const char *version, CORBA::IDLType_ptr type, - CORBA::Visibility access - ); + CORBA::Visibility access); CORBA::ValueMemberDef_ptr create_value_member_i ( const char *id, const char *name, const char *version, CORBA::IDLType_ptr type, - CORBA::Visibility access - ); + CORBA::Visibility access); virtual CORBA::AttributeDef_ptr create_attribute ( const char *id, const char *name, const char *version, CORBA::IDLType_ptr type, - CORBA::AttributeMode mode - ); + CORBA::AttributeMode mode); CORBA::AttributeDef_ptr create_attribute_i ( const char *id, const char *name, const char *version, CORBA::IDLType_ptr type, - CORBA::AttributeMode mode - ); + CORBA::AttributeMode mode); virtual CORBA::OperationDef_ptr create_operation ( const char *id, @@ -227,8 +168,7 @@ public: CORBA::OperationMode mode, const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions, - const CORBA::ContextIdSeq &contexts - ); + const CORBA::ContextIdSeq &contexts); CORBA::OperationDef_ptr create_operation_i ( const char *id, @@ -238,8 +178,7 @@ public: CORBA::OperationMode mode, const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions, - const CORBA::ContextIdSeq &contexts - ); + const CORBA::ContextIdSeq &contexts); /// Called from TAO_IFR_Service_Utils::name_exists() when we /// are a base valuetype. @@ -252,8 +191,7 @@ public: ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, CORBA::DefinitionKind limit_type, - CORBA::Boolean exclude_inherited - ); + CORBA::Boolean exclude_inherited); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index fca03ee81ca..1f3ec0ccab5 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -61,7 +61,7 @@ public: /** * Add a binding with the specified parameters to the table. * Return 0 on success and -1 on failure, 1 if there already is a - * binding with <id> and <kind>. + * binding with @a id and @a kind. */ virtual int bind (const char *id, const char *kind, @@ -69,7 +69,7 @@ public: CosNaming::BindingType type) = 0; /** - * Overwrite a binding containing <id> and <kind> (or create a new + * Overwrite a binding containing @a id and @a kind (or create a new * one if one doesn't exist) with the specified parameters. Returns * -1 on failure. */ @@ -78,16 +78,16 @@ public: CORBA::Object_ptr obj, CosNaming::BindingType type) = 0; - /// Remove a binding containing <id> and <kind> from the table. + /// Remove a binding containing @a id and @a kind from the table. /// Return 0 on success and -1 on failure. virtual int unbind (const char * id, const char * kind) = 0; /** - * Find the binding containing <id> and <kind> in the table, and + * Find the binding containing @a id and @a kind in the table, and * pass binding's type and object back to the caller by reference. * Return 0 on success and -1 on failure. Note: a 'duplicated' object - * reference is assigned to <obj>, so the caller is responsible for + * reference is assigned to @a obj, so the caller is responsible for * its deallocation. */ virtual int find (const char * id, @@ -141,7 +141,7 @@ public: // = CosNaming::NamingContext idl interface methods. /** - * Create a binding for name <n> and object <obj> in the naming + * Create a binding for name @a n and object @a obj in the naming * context. Compound names are treated as follows: ctx->bind (<c1; * c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>, * obj) if the there already exists a binding for the specified @@ -153,7 +153,7 @@ public: CORBA::Object_ptr obj); /** - * This is similar to <bind> operation above, except for when the + * This is similar to bind() operation above, except for when the * binding for the specified name already exists in the specified * context. In that case, the existing binding is replaced with the * new one. @@ -205,7 +205,7 @@ public: * Delete the naming context. The user should take care to <unbind> any * bindings in which the given context is bound to some names, to * avoid dangling references when invoking <destroy> operation. - * NOTE: <destory> is a no-op on the root context. + * NOTE: <destroy> is a no-op on the root context. * NOTE: after <destroy> is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index a87cf97f8d4..a50a36eba42 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -129,7 +129,7 @@ public: * Delete the naming context. The user should take care to <unbind> any * bindings in which the given context is bound to some names, to * avoid dangling references when invoking <destroy> operation. - * NOTE: <destory> is a no-op on the root context. + * NOTE: <destroy> is a no-op on the root context. * NOTE: after <destroy> is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ @@ -325,7 +325,7 @@ public: * Delete the naming context. The user should take care to <unbind> any * bindings in which the given context is bound to some names, to * avoid dangling references when invoking <destroy> operation. - * NOTE: <destory> is a no-op on the root context. + * NOTE: <destroy> is a no-op on the root context. * NOTE: after <destroy> is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 8654e2210ae..777aaef1614 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -484,7 +484,11 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, TAO::Storable_Factory* pf = 0; ACE_CString directory (ACE_TEXT_ALWAYS_CHAR (persistence_location)); ACE_NEW_RETURN (pf, TAO::Storable_FlatFileFactory (directory), -1); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO::Storable_Factory> persFactory(pf); +#else auto_ptr<TAO::Storable_Factory> persFactory(pf); +#endif /* ACE_HAS_CPP11 */ // Use an auto_ptr to ensure that we clean up the factory in the case // of a failure in creating and registering the Activator. @@ -492,7 +496,11 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, this->storable_naming_context_factory (context_size); // Make sure we got a factory if (cf == 0) return -1; +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Storable_Naming_Context_Factory> contextFactory (cf); +#else auto_ptr<TAO_Storable_Naming_Context_Factory> contextFactory (cf); +#endif /* ACE_HAS_CPP11 */ // This instance will either get deleted after recreate all or, // in the case of a servant activator's use, on destruction of the diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h index b40a8da924a..67116707bc7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h @@ -351,7 +351,7 @@ public: * Delete the naming context. The user should take care to <unbind> any * bindings in which the given context is bound to some names, to * avoid dangling references when invoking <destroy> operation. - * NOTE: <destory> is a no-op on the root context. + * NOTE: <destroy> is a no-op on the root context. * NOTE: after <destroy> is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 4c45bd1404f..28e42513918 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -151,8 +151,7 @@ TAO_Notify_ConsumerAdmin::load_proxy ( CosNotifyChannelAdmin::ProxySupplier_ptr TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, - CosNotifyChannelAdmin::ProxyID_out proxy_id - ) + CosNotifyChannelAdmin::ProxyID_out proxy_id) { CosNotification::QoSProperties initial_qos; @@ -168,8 +167,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdm CosNotifyChannelAdmin::ProxySupplier_ptr TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id, - const CosNotification::QoSProperties & initial_qos - ) + const CosNotification::QoSProperties & initial_qos) { CosNotifyChannelAdmin::ProxySupplier_var proxy = TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this @@ -237,8 +235,7 @@ TAO_Notify_ConsumerAdmin::get_qos (void) void TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ) + const CosNotification::EventTypeSeq & removed) { TAO_Notify_EventTypeSeq seq_added (added); TAO_Notify_EventTypeSeq seq_removed (removed); @@ -333,8 +330,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdm void TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/, - CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ - ) + CosNotification::NamedPropertyRangeSeq_out /*available_qos*/) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index 09cdf6e0b86..a51e3da7ba7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -318,8 +318,7 @@ TAO_Notify_EventChannelFactory::load_event_persistence (void) //@@todo: tell the rspm it's an orphan, but we can't during reload // we need collect these and come back later to remove them ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Reload persistent event failed.\n") - )); + ACE_TEXT ("(%P|%t) Reload persistent event failed.\n"))); } } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h index 2cc811469f3..c556b0dd5e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h @@ -21,6 +21,7 @@ #include "ace/Message_Queue.h" #include "ace/Reactor.h" #include "ace/Null_Condition.h" +#include "ace/Auto_Ptr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h index cb765a69400..7c243fea89c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h @@ -35,7 +35,7 @@ class TAO_Notify_EventChannelFactory; * * Defines the interface for the consumer control strategy. * This strategy handles misbehaving or failing consumers. - * = MEMORY MANAGMENT + * = MEMORY MANAGEMENT * = LOCKING * = TODO */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h index 88622e7e008..2307a500f86 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h @@ -68,7 +68,7 @@ namespace TAO * Overwriting any value previously set for that property. * Leaving all other properties untouched. * @param name the name of the property to set - * @value an Any containing the value. + * @param value an Any containing the value. */ void set_default_property (const char * name, const PortableGroup::Value & value); @@ -101,7 +101,7 @@ namespace TAO * property set. Removal is done by name. The property values do not * have to match. There is no penalty for attempting to remove a property * that does not exist. - * @param props a set of propertys to be removed by name. + * @param props a set of properties to be removed by name. */ void remove_default_properties ( const PortableGroup::Properties & props); @@ -165,7 +165,8 @@ namespace TAO * property set. Removal is done by name. The property values do not * have to match. There is no penalty for attempting to remove a property * that does not exist. - * @param props a set of propertys to be removed by name from the type_id set. + * @param type_id identifies the set of properties to be removed. + * @param props a set of properties to be removed by name from the type_id set. */ void remove_type_properties ( const char *type_id, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp index 5b26d25596a..451189b1a2c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp @@ -51,7 +51,7 @@ TAO_UIPMC_Acceptor::create_profile ( // The standard mechanism for adding profiles to object references // for each pluggable protocol doesn't apply to UIPMC profiles, so // this function just returns success without doing anything. The - // appropiate mechanism for getting UIPMC profiles is to call the + // appropriate mechanism for getting UIPMC profiles is to call the // multicast group manager to get a Group reference. Invocations // sent to this group reference will be dispatched to the servants // that belong to that group. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index f6e55a8b5ac..6cea0ee37ed 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -305,6 +305,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) CORBA::String_var certificate_path; CORBA::String_var private_key_path; CORBA::String_var dhparams_path; + CORBA::String_var ec_name; CORBA::String_var ca_file; CORBA::String_var ca_dir; ACE_TCHAR *rand_path = 0; @@ -547,7 +548,15 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) { this->check_host_ = true; } - + else if (ACE_OS::strcasecmp (argv[curarg], + ACE_TEXT ("-SSLEcName")) == 0) + { + ++curarg; + if (curarg < argc) + { + ec_name = static_cast<const char *>(ACE_TEXT_ALWAYS_CHAR(argv[curarg])); + } + } } if (pem_passwd_.length() > 0) @@ -730,6 +739,54 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) } } + if (ec_name.in ()) + { +#ifdef OPENSSL_NO_EC + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - Unable to apply -SSLEcName ") + ACE_TEXT ("due to lack of EC support in OpenSSL\n"))); + return -1; +#else + int const ec_nid = OBJ_sn2nid (ec_name.in ()); + + if (ec_nid == NID_undef) + { + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - Unable to obtain ") + ACE_TEXT ("EC NID for <%C> in SSLIOP factory.\n"), + ec_name.in ())); + return -1; + } + + EC_KEY *const ecdh = EC_KEY_new_by_curve_name (ec_nid); + if (!ecdh) + { + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - Unable to set Curve Name ") + ACE_TEXT ("<%C> in SSLIOP factory.\n"), + ec_name.in ())); + return -1; + } + + if (1 != ::SSL_CTX_set_tmp_ecdh (ssl_ctx->context (), ecdh)) + { + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - Unable to set temp ECDH ") + ACE_TEXT ("<%C> in SSLIOP factory.\n"), + ec_name.in ())); + return -1; + } + + if (TAO_debug_level) + { + ORBSVCS_DEBUG ((LM_INFO, + ACE_TEXT ("TAO (%P|%t) - SSLIOP set EC Curve Name ") + ACE_TEXT ("to <%C>\n"), + ec_name.in ())); + } +#endif + } + if (this->register_orb_initializer () != 0) return -1; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c index df471da848e..1bef6923840 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c @@ -2,7 +2,6 @@ #include <openssl/asn1.h> - DSA * DSAPARAMS_DUP_WRAPPER_NAME (DSA * dsa) { diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index e14aeb636d7..da9d83b8e5d 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -104,7 +104,7 @@ ACE_Config_Scheduler::get (RtecScheduler::handle_t handle) { case BaseSchedImplType::SUCCEEDED: { - // IDL memory managment semantics require that we return a copy. + // IDL memory management semantics require that we return a copy. RtecScheduler::RT_Info* copy; ACE_NEW_RETURN (copy, RtecScheduler::RT_Info (*rt_info), 0); return copy; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h index 800d6f6ba13..f3977b64be7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h @@ -1,11 +1,7 @@ -#ifndef CONSTRAINT_TOKEN_H -#define CONSTRAINT_TOKEN_H +#ifndef CONSTRAINT_TOKENS_H +#define CONSTRAINT_TOKENS_H #include /**/ "ace/pre.h" -#ifndef YYERRCODE -#define YYERRCODE 256 -#endif - #define TAO_GT 257 #define TAO_GE 258 #define TAO_LT 259 @@ -41,4 +37,4 @@ #define TAO_FIRST 289 #define TAO_RANDOM 290 #include /**/ "ace/post.h" -#endif /* CONSTRAINT_TOKEN_H */ +#endif /* CONSTRAINT_TOKENS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 1a7d876309c..fc4038822dd 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -1,158 +1,279 @@ #define YY_NO_UNPUT #define YY_NO_INPUT +#line 2 "Trader/constraint.l" +#include /**/ "tao/orbconf.h" +#include /**/ "tao/Versioned_Namespace.h" + +#include "ace/OS_NS_unistd.h" +#include "ace/os_include/os_stdio.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + + + +#define YY_INT_ALIGNED short int + /* A lexical scanner generated by flex */ -/* Scanner skeleton version: - */ + + + + + + + + + #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + + + + + + + + + + + + + + + + -#include "ace/os_include/os_stdio.h" -#include "ace/OS_NS_unistd.h" -#include /**/ "tao/Versioned_Namespace.h" -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus -#endif -#endif -#ifdef __cplusplus -/* Use prototypes in function declarations. */ -#define YY_USE_PROTOS -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST -#else /* ! __cplusplus */ -#if __STDC__ -#define YY_USE_PROTOS -#define YY_USE_CONST -#endif /* __STDC__ */ -#endif /* ! __cplusplus */ +/* First, we deal with platform-specific or compiler-specific issues. */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#define YY_USE_CONST -#define YY_USE_PROTOS +/* begin standard C headers. */ + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 #endif -#ifdef YY_USE_CONST -#define yyconst const +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; #else -#define yyconst +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) #endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + +#endif /* ! C99 */ + +#endif /* ! FLEXINT_H */ + +/* begin standard C++ headers. */ -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto +/* TODO: this is always defined, so inline it */ +#define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define YY_PROTO(proto) () +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. + +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN yy_start = 1 + 2 * - +#define BEGIN (yy_start) = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START ((yy_start - 1) / 2) +#define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 + /* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ +#endif + + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif extern int yyleng; + extern FILE *yyin, *yyout; + #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ + #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) +/* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ { \ /* Undo effects of setting up yytext. */ \ - *yy_cp = yy_hold_char; \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - -#define unput(c) yyunput( c, yytext_ptr ) - -/* The following is because we cannot portably get our hands on size_t - * (without autoconf's help, which isn't available because we want - * flex-generated scanners to compile on their own). - */ -typedef unsigned int yy_size_t; +#define unput(c) yyunput( c, (yytext_ptr) ) +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state -{ + { FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ + char *yy_buf_pos; /* current position in input buffer */ /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. @@ -178,12 +299,17 @@ struct yy_buffer_state */ int yy_at_bol; + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; + #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -197,28 +323,42 @@ struct yy_buffer_state * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 -}; -static YY_BUFFER_STATE yy_current_buffer = 0; + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + + +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ + + /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". + * + * Returns the top of the stack, or 0. */ -#define YY_CURRENT_BUFFER yy_current_buffer +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : 0) +/* Same as previous macro, but useful when we know that the buffer stack is not + * 0 or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] + /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; - static int yy_n_chars; /* number of characters read into yy_ch_buf */ - - int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ +static char *yy_c_buf_p = 0; +static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ /* Flag which is used to allow yywrap()'s to do buffer switches @@ -226,66 +366,102 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart YY_PROTO(( FILE *input_file )); -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); -void yy_load_buffer_state YY_PROTO(( void )); -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); -static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); -static void yy_flex_free YY_PROTO(( void * )); +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) + + +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); + + +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); -#define yy_new_buffer yy_create_buffer +#define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_is_interactive = is_interactive; \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_at_bol = at_bol; \ + if ( ! YY_CURRENT_BUFFER ){\ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) +/* Begin user sect3 */ +typedef flex_uint8_t YY_CHAR; + +FILE *yyin = 0, *yyout = 0; -typedef unsigned char YY_CHAR; -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; typedef int yy_state_type; + +extern int yylineno; +int yylineno = 1; + extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state YY_PROTO(( void )); -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); -static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); + + + + + +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); + + + /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ - yytext_ptr = yy_bp; \ + (yytext_ptr) = yy_bp; \ yyleng = (int) (yy_cp - yy_bp); \ - yy_hold_char = *yy_cp; \ + (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ - yy_c_buf_p = yy_cp; - + (yy_c_buf_p) = yy_cp; #define YY_NUM_RULES 32 #define YY_END_OF_BUFFER 33 -static yyconst short int yy_accept[81] = +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static const flex_int16_t yy_accept[81] = { 0, 0, 0, 33, 31, 30, 31, 31, 22, 23, 14, 12, 13, 31, 15, 26, 16, 31, 18, 29, 29, @@ -297,7 +473,7 @@ static yyconst short int yy_accept[81] = 29, 29, 29, 5, 25, 6, 3, 29, 4, 0 } ; -static yyconst int yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -329,7 +505,7 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[42] = +static const YY_CHAR yy_meta[42] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2, 2, 2, 2, 2, @@ -338,7 +514,7 @@ static yyconst int yy_meta[42] = 1 } ; -static yyconst short int yy_base[83] = +static const flex_int16_t yy_base[83] = { 0, 0, 0, 108, 109, 109, 93, 38, 109, 109, 109, 33, 34, 94, 109, 37, 91, 90, 89, 0, 86, @@ -351,7 +527,7 @@ static yyconst short int yy_base[83] = 76, 57 } ; -static yyconst short int yy_def[83] = +static const flex_int16_t yy_def[83] = { 0, 80, 1, 80, 80, 80, 80, 81, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 82, 82, @@ -364,7 +540,7 @@ static yyconst short int yy_def[83] = 80, 80 } ; -static yyconst short int yy_nxt[151] = +static const flex_int16_t yy_nxt[151] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 19, 20, 19, @@ -384,7 +560,7 @@ static yyconst short int yy_nxt[151] = 80, 80, 80, 80, 80, 80, 80, 80, 80, 80 } ; -static yyconst short int yy_chk[151] = +static const flex_int16_t yy_chk[151] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -407,6 +583,9 @@ static yyconst short int yy_chk[151] = static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; +extern int yy_flex_debug; +int yy_flex_debug = 0; + /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ @@ -415,17 +594,21 @@ static char *yy_last_accepting_cpos; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#define INITIAL 0 -TAO_END_VERSIONED_NAMESPACE_DECL -//============================================================================= -/** - * @file Constraint_l.cpp - * - * @author Seth Widoff <sbw1@cs.wustl.edu> - */ -//============================================================================= +TAO_END_VERSIONED_NAMESPACE_DECL +// ======================================================================== +// +// = LIBRARY +// orbsvcs +// +// = FILENAME +// constraint.l +// +// = AUTHOR +// Seth Widoff <sbw1@cs.wustl.edu> +// +// ======================================================================== #include "orbsvcs/Trader/Constraint_Interpreter.h" #include "orbsvcs/Trader/Constraint_Nodes.h" @@ -445,100 +628,167 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base); + + +#define INITIAL 0 + + + + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#endif + + + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + + + + +static int yy_init_globals ( void ); + + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + + +int yylex_destroy ( void ); + + + +int yyget_debug ( void ); + + + +void yyset_debug ( int debug_flag ); + + + +YY_EXTRA_TYPE yyget_extra ( void ); + + + +void yyset_extra ( YY_EXTRA_TYPE user_defined ); + + + +FILE *yyget_in ( void ); + + + +void yyset_in ( FILE * _in_str ); + + + +FILE *yyget_out ( void ); + + + +void yyset_out ( FILE * _out_str ); + + + + int yyget_leng ( void ); + + + +char *yyget_text ( void ); + + + +int yyget_lineno ( void ); + + + +void yyset_lineno ( int _line_number ); + + + + + + + /* Macros after this point can all be overridden by user definitions in * section 1. */ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap YY_PROTO(( void )); +extern "C" int yywrap ( void ); #else -extern int yywrap YY_PROTO(( void )); +extern int yywrap ( void ); #endif #endif #ifndef YY_NO_UNPUT -static void yyunput YY_PROTO(( int c, char *buf_ptr )); + + static void yyunput ( int c, char *buf_ptr ); + #endif + #ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen YY_PROTO(( yyconst char * )); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput YY_PROTO(( void )); +static int yyinput ( void ); #else -static int input YY_PROTO(( void )); -#endif +static int input ( void ); #endif -#if YY_STACK_USED -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -#ifndef YY_NO_PUSH_STATE -static void yy_push_state YY_PROTO(( int new_state )); -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state YY_PROTO(( void )); -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); #endif -#else -#define YY_NO_PUSH_STATE 1 -#define YY_NO_POP_STATE 1 -#define YY_NO_TOP_STATE 1 -#endif -TAO_END_VERSIONED_NAMESPACE_DECL -#ifdef YY_MALLOC_DECL -YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif -#endif + + + + /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif -/* Copy whatever the last rule matched to the standard output. */ -//FUZZ: disable check_for_lack_ACE_OS +/* Copy whatever the last rule matched to the standard output. */ #ifndef TAO_TRADER_ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define TAO_TRADER_ECHO { size_t __dum_ret = fwrite( yytext, yyleng, 1, yyout ); (void) __dum_ret; } +#define TAO_TRADER_ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif - //FUZZ: enable check_for_lack_ACE_OS + + /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, * is returned in "result". */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( yy_current_buffer->yy_is_interactive ) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ - int c = '*', n; \ + int c = '*'; \ + int n; \ for ( n = 0; n < max_size && \ - (c = ACE_OS::getc( yyin )) != EOF && c != '\n'; ++n ) \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ if ( c == '\n' ) \ buf[n++] = (char) c; \ @@ -546,11 +796,26 @@ YY_MALLOC_DECL YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ - else if ( ((result = ACE_OS::fread( buf, 1, max_size, yyin )) == 0) \ - && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); + else \ + { \ + errno=0; \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(yyin); \ + } \ + }\ +\ + #endif + + /* No semi-colon after return; correct usage is to write "yyterminate();" - * we don't want an extra ';' after the "return" because that will cause * some compilers to complain about unreachable statements. @@ -559,22 +824,43 @@ YY_MALLOC_DECL #define yyterminate() return YY_NULL #endif + /* Number of entries by which start-condition stack grows. */ #ifndef YY_START_STACK_INCR #define YY_START_STACK_INCR 25 #endif + /* Report a fatal error. */ #ifndef YY_FATAL_ERROR #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) #endif + + +/* end tables serialization structures and prototypes */ + + + /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL int yylex YY_PROTO(( void )) -#endif +#define YY_DECL_IS_OURS 1 + + + + + + + + + +extern int yylex (void); + +#define YY_DECL int yylex (void) +#endif /* !YY_DECL */ + /* Code executed at the beginning of each rule, after yytext and yyleng * have been set up. @@ -583,35 +869,48 @@ YY_MALLOC_DECL #define YY_USER_ACTION #endif + + /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK ACE_NOTREACHED (break;) +#define YY_BREAK /*LINTED*/break; #endif + + #define YY_RULE_SETUP \ YY_USER_ACTION -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +/** The main scanner function which does all the work. + */ YY_DECL - { - register yy_state_type yy_current_state; - register char *yy_cp = 0, *yy_bp = 0; - register int yy_act; +{ + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; - if ( yy_init ) + + + + + + + if ( !(yy_init) ) { - yy_init = 0; + (yy_init) = 1; #ifdef YY_USER_INIT YY_USER_INIT; #endif - if ( ! yy_start ) - yy_start = 1; /* first start state */ + + + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ if ( ! yyin ) yyin = stdin; @@ -619,42 +918,48 @@ YY_DECL if ( ! yyout ) yyout = stdout; - if ( ! yy_current_buffer ) - yy_current_buffer = + if ( ! YY_CURRENT_BUFFER ) { + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = yy_create_buffer( yyin, YY_BUF_SIZE ); + } - yy_load_buffer_state(); + yy_load_buffer_state( ); } - while ( 1 ) /* loops until end-of-file is reached */ + { + + + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); /* Support of yytext. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); /* yy_bp points to the position in yy_ch_buf of the start of * the current run. */ yy_bp = yy_cp; - yy_current_state = yy_start; + yy_current_state = (yy_start); yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 81 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } while ( yy_base[yy_current_state] != 109 ); @@ -663,14 +968,15 @@ yy_find_action: yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); yy_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; + do_action: /* This label is used only to access EOF actions. */ @@ -678,9 +984,9 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 0: /* must back up */ /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); goto yy_find_action; case 1: @@ -818,6 +1124,7 @@ YY_RULE_SETUP } YY_BREAK case 28: +/* rule 28 can match eol */ YY_RULE_SETUP { yylval.constraint_ = extract_string(yytext); @@ -835,8 +1142,9 @@ YY_RULE_SETUP case 30: YY_RULE_SETUP {} - break; + YY_BREAK case 31: +/* rule 31 can match eol */ YY_RULE_SETUP { TAO_YY_LEX_DEBUG; return TAO_UNKNOWN; @@ -845,33 +1153,33 @@ YY_RULE_SETUP case 32: YY_RULE_SETUP TAO_TRADER_ECHO; - break; + YY_BREAK case YY_STATE_EOF(INITIAL): yyterminate(); case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); YY_RESTORE_YY_MORE_OFFSET - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called * yylex(). If so, then we have to assure - * consistency between yy_current_buffer and our + * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - yy_n_chars = yy_current_buffer->yy_n_chars; - yy_current_buffer->yy_input_file = yyin; - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -881,13 +1189,13 @@ case YY_STATE_EOF(INITIAL): * end-of-buffer state). Contrast this with the test * in input(). */ - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -900,30 +1208,30 @@ case YY_STATE_EOF(INITIAL): yy_next_state = yy_try_NUL_trans( yy_current_state ); - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_bp = (yytext_ptr) + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++yy_c_buf_p; + yy_cp = ++(yy_c_buf_p); yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); goto yy_find_action; } } - else switch ( yy_get_next_buffer() ) + else switch ( yy_get_next_buffer( ) ) { case EOB_ACT_END_OF_FILE: { - yy_did_buffer_switch_on_eof = 0; + (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap() ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -934,7 +1242,7 @@ case YY_STATE_EOF(INITIAL): * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -942,30 +1250,30 @@ case YY_STATE_EOF(INITIAL): else { - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = - yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_find_action; } break; @@ -976,7 +1284,11 @@ case YY_STATE_EOF(INITIAL): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of yylex */ + } /* end of user's declarations */ +} /* end of yylex */ + + + /* yy_get_next_buffer - try to read in a new buffer @@ -986,21 +1298,20 @@ case YY_STATE_EOF(INITIAL): * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ - -static int yy_get_next_buffer() - { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; - register int number_to_move, i; +static int yy_get_next_buffer (void) +{ + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( yy_current_buffer->yy_fill_buffer == 0 ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -1020,34 +1331,30 @@ static int yy_get_next_buffer() /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_current_buffer->yy_n_chars = yy_n_chars = 0; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; else { - int num_to_read = - yy_current_buffer->yy_buf_size - number_to_move - 1; + int num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ -#ifdef YY_USES_REJECT - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = yy_current_buffer; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = - (int) (yy_c_buf_p - b->yy_ch_buf); + (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -1060,8 +1367,8 @@ static int yy_get_next_buffer() b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ @@ -1071,35 +1378,35 @@ static int yy_get_next_buffer() YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = yy_current_buffer->yy_buf_size - + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; -#endif + } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), - yy_n_chars, num_to_read ); + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), num_to_read ); - yy_current_buffer->yy_n_chars = yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - if ( yy_n_chars == 0 ) + if ( (yy_n_chars) == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); + yyrestart( yyin ); } else { ret_val = EOB_ACT_LAST_MATCH; - yy_current_buffer->yy_buffer_status = + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -1107,44 +1414,55 @@ static int yy_get_next_buffer() else ret_val = EOB_ACT_CONTINUE_SCAN; - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); + } + + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; return ret_val; - } +} /* yy_get_previous_state - get the state just before the EOB char was reached */ -static yy_state_type yy_get_previous_state() - { - register yy_state_type yy_current_state; - register char *yy_cp; + static yy_state_type yy_get_previous_state (void) +{ + yy_state_type yy_current_state; + char *yy_cp; - yy_current_state = yy_start; + yy_current_state = (yy_start); - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 81 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; - } +} /* yy_try_NUL_trans - try to make a transition on the NUL character @@ -1152,107 +1470,101 @@ static yy_state_type yy_get_previous_state() * synopsis * next_state = yy_try_NUL_trans( current_state ); */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +{ + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); -#ifdef YY_USE_PROTOS -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) -#else -static yy_state_type yy_try_NUL_trans( yy_current_state ) -yy_state_type yy_current_state; -#endif - { - register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; - - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 81 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 80); - return yy_is_jam ? 0 : yy_current_state; - } + return yy_is_jam ? 0 : yy_current_state; +} #ifndef YY_NO_UNPUT -#ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) -#else -static void yyunput( c, yy_bp ) -int c; -register char *yy_bp; -#endif - { - register char *yy_cp = yy_c_buf_p; + + static void yyunput (int c, char * yy_bp ) +{ + char *yy_cp; + + yy_cp = (yy_c_buf_p); /* undo effects of setting up yytext */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ - yy_current_buffer->yy_buf_size + 2]; - register char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; + int number_to_move = (yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; + char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - while ( source > yy_current_buffer->yy_ch_buf ) + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) *--dest = *--source; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - yy_current_buffer->yy_n_chars = - yy_n_chars = yy_current_buffer->yy_buf_size; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + (yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size; - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } *--yy_cp = (char) c; - yytext_ptr = yy_bp; - yy_hold_char = *yy_cp; - yy_c_buf_p = yy_cp; - } -#endif /* ifndef YY_NO_UNPUT */ + + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; +} + +#endif #ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput() + static int yyinput (void) #else -static int input() + static int input (void) #endif - { + +{ int c; - *yy_c_buf_p = yy_hold_char; + *(yy_c_buf_p) = (yy_hold_char); - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) /* This was really a NUL. */ - *yy_c_buf_p = '\0'; + *(yy_c_buf_p) = '\0'; else { /* need more input */ - size_t offset = yy_c_buf_p - yytext_ptr; - ++yy_c_buf_p; + size_t offset = (int) ((yy_c_buf_p) - (yytext_ptr)); + ++(yy_c_buf_p); - switch ( yy_get_next_buffer() ) + switch ( yy_get_next_buffer( ) ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -1268,14 +1580,14 @@ static int input() /* Reset buffer status. */ yyrestart( yyin ); - /* fall through */ + /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap() ) - return EOF; + if ( yywrap( ) ) + return 0; - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; #ifdef __cplusplus return yyinput(); @@ -1285,90 +1597,95 @@ static int input() } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + offset; + (yy_c_buf_p) = (yytext_ptr) + offset; break; } } } - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ - yy_hold_char = *++yy_c_buf_p; + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve yytext */ + (yy_hold_char) = *++(yy_c_buf_p); return c; - } -#endif /* YY_NO_INPUT */ +} +#endif /* ifndef YY_NO_INPUT */ -#ifdef YY_USE_PROTOS -void yyrestart( FILE *input_file ) -#else -void yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! yy_current_buffer ) - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * + * @note This function does not reset the start condition to @c INITIAL . + */ + void yyrestart (FILE * input_file ) +{ - yy_init_buffer( yy_current_buffer, input_file ); - yy_load_buffer_state(); + if ( ! YY_CURRENT_BUFFER ){ + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer( yyin, YY_BUF_SIZE ); } + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); +} -#ifdef YY_USE_PROTOS -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) -#else -void yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; -#endif - { - if ( yy_current_buffer == new_buffer ) + +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * + */ + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) +{ + + /* TODO. We should be able to replace this entire function body + * with + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); + */ + yyensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) return; - if ( yy_current_buffer ) + if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - yy_current_buffer = new_buffer; - yy_load_buffer_state(); + YY_CURRENT_BUFFER_LVALUE = new_buffer; + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ - yy_did_buffer_switch_on_eof = 1; - } - + (yy_did_buffer_switch_on_eof) = 1; +} -#ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) -#else -void yy_load_buffer_state() -#endif - { - yy_n_chars = yy_current_buffer->yy_n_chars; - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } +static void yy_load_buffer_state (void) +{ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); +} -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) -#else -YY_BUFFER_STATE yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * + * @return the allocated buffer state. + */ + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) +{ YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1377,7 +1694,7 @@ int size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1386,66 +1703,67 @@ int size; yy_init_buffer( b, file ); return b; - } +} -#ifdef YY_USE_PROTOS -void yy_delete_buffer( YY_BUFFER_STATE b ) -#else -void yy_delete_buffer( b ) -YY_BUFFER_STATE b; -#endif - { +/** Destroy the buffer. + * @param b a buffer created with yy_create_buffer() + * + */ + void yy_delete_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yy_flex_free( (void *) b->yy_ch_buf ); - - yy_flex_free( (void *) b ); - } + yyfree( (void *) b->yy_ch_buf ); + yyfree( (void *) b ); +} -#ifdef YY_USE_PROTOS -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) -#else -void yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; -#endif +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a yyrestart() or at EOF. + */ + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) +{ + int oerrno = errno; - { yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; -#if YY_ALWAYS_INTERACTIVE - b->yy_is_interactive = 1; -#else -#if YY_NEVER_INTERACTIVE - b->yy_is_interactive = 0; -#else - b->yy_is_interactive = file ? (ACE_OS::isatty( ACE_OS::fileno(file) ) > 0) : 0; -#endif -#endif - } + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } -#ifdef YY_USE_PROTOS -void yy_flush_buffer( YY_BUFFER_STATE b ) -#else -void yy_flush_buffer( b ) -YY_BUFFER_STATE b; -#endif - { - if ( ! b ) + b->yy_is_interactive = file ? (ACE_OS::isatty( fileno(file) ) > 0) : 0; + + + errno = oerrno; +} + +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * + */ + void yy_flush_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; b->yy_n_chars = 0; @@ -1462,20 +1780,123 @@ YY_BUFFER_STATE b; b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == yy_current_buffer ) - yy_load_buffer_state(); + if ( b == YY_CURRENT_BUFFER ) + yy_load_buffer_state( ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * + */ +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) +{ + if (new_buffer == 0) + return; + + yyensure_buffer_stack(); + + /* This block is copied from yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; +} + + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * + */ +void yypop_buffer_state (void) +{ + if (!YY_CURRENT_BUFFER) + return; + + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = 0; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); + + if (YY_CURRENT_BUFFER) { + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; } +} -#ifndef YY_NO_SCAN_BUFFER -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) -#else -YY_BUFFER_STATE yy_scan_buffer( base, size ) -char *base; -yy_size_t size; -#endif - { +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void yyensure_buffer_stack (void) +{ + yy_size_t num_to_alloc; + + if (!(yy_buffer_stack)) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ + (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; + } + + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ + + /* Increase the buffer to prepare for a possible push. */ + yy_size_t grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } +} + + + + + +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) +{ YY_BUFFER_STATE b; if ( size < 2 || @@ -1484,11 +1905,11 @@ yy_size_t size; /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; b->yy_input_file = 0; @@ -1498,54 +1919,55 @@ yy_size_t size; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer( b ); + yy_switch_to_buffer( b ); return b; - } -#endif +} -#ifndef YY_NO_SCAN_STRING -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) -#else -YY_BUFFER_STATE yy_scan_string( yy_str ) -yyconst char *yy_str; -#endif - { - int len; - for ( len = 0; yy_str[len]; ++len ) - ; - return yy_scan_bytes( yy_str, len ); - } -#endif +/** Setup the input buffer state to scan a string. The next call to yylex() will + * scan from a @e copy of @a str. + * @param yystr a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * yy_scan_bytes() instead. + */ +YY_BUFFER_STATE yy_scan_string (const char * yystr ) +{ -#ifndef YY_NO_SCAN_BYTES -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) -#else -YY_BUFFER_STATE yy_scan_bytes( bytes, len ) -yyconst char *bytes; -int len; -#endif - { + return yy_scan_bytes( yystr, (int) strlen(yystr) ); +} + + + + +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will + * scan from a @e copy of @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) +{ YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; - buf = (char *) yy_flex_alloc( n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; b = yy_scan_buffer( buf, n ); if ( ! b ) @@ -1557,78 +1979,27 @@ int len; b->yy_is_our_buffer = 1; return b; - } -#endif - - -#ifndef YY_NO_PUSH_STATE -#ifdef YY_USE_PROTOS -static void yy_push_state( int new_state ) -#else -static void yy_push_state( new_state ) -int new_state; -#endif - { - if ( yy_start_stack_ptr >= yy_start_stack_depth ) - { - yy_size_t new_size; +} - yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yy_start_stack_depth * sizeof( int ); - if ( ! yy_start_stack ) - yy_start_stack = (int *) yy_flex_alloc( new_size ); - else - yy_start_stack = (int *) yy_flex_realloc( - (void *) yy_start_stack, new_size ); - if ( ! yy_start_stack ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); - } - yy_start_stack[yy_start_stack_ptr++] = YY_START; - BEGIN(new_state); - } -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state() - { - if ( --yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); - - BEGIN(yy_start_stack[yy_start_stack_ptr]); - } -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state() - { - return yy_start_stack[yy_start_stack_ptr - 1]; - } -#endif #ifndef YY_EXIT_FAILURE #define YY_EXIT_FAILURE 2 #endif -#ifdef YY_USE_PROTOS -static void yy_fatal_error( yyconst char msg[] ) -#else -static void yy_fatal_error( msg ) -char msg[]; -#endif - { - (void) ACE_OS::fprintf( stderr, "%s\n", msg ); - ACE_OS::exit( YY_EXIT_FAILURE ); - } - - +static void yynoreturn yy_fatal_error (const char* msg ) +{ + fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} /* Redefine yyless() so it works in section 3 code. */ @@ -1637,68 +2008,233 @@ char msg[]; do \ { \ /* Undo effects of setting up yytext. */ \ - yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n; \ - yy_hold_char = *yy_c_buf_p; \ - *yy_c_buf_p = '\0'; \ - yyleng = n; \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + yytext[yyleng] = (yy_hold_char); \ + (yy_c_buf_p) = yytext + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + yyleng = yyless_macro_arg; \ } \ while ( 0 ) -/* Internal utility routines. */ -#ifndef yytext_ptr -#ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) +/* Accessor methods (get/set functions) to struct members. */ + + + +/** Get the current line number. + * + */ +int yyget_lineno (void) +{ + + + return yylineno; +} + + + + + +/** Get the input stream. + * + */ +FILE *yyget_in (void) +{ + return yyin; +} + + + +/** Get the output stream. + * + */ +FILE *yyget_out (void) +{ + return yyout; +} + + + +/** Get the length of the current token. + * + */ +int yyget_leng (void) +{ + return yyleng; +} + + +/** Get the current token. + * + */ + +char *yyget_text (void) +{ + return yytext; +} + + + + +/** Set the current line number. + * @param _line_number line number + * + */ +void yyset_lineno (int _line_number ) +{ + + + yylineno = _line_number; +} + + + + + + +/** Set the input stream. This does not discard the current + * input buffer. + * @param _in_str A readable stream. + * + * @see yy_switch_to_buffer + */ +void yyset_in (FILE * _in_str ) +{ + yyin = _in_str ; +} + + + +void yyset_out (FILE * _out_str ) +{ + yyout = _out_str ; +} + + + + +int yyget_debug (void) +{ + return yy_flex_debug; +} + + + +void yyset_debug (int _bdebug ) +{ + yy_flex_debug = _bdebug ; +} + + + +static int yy_init_globals (void) +{ + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from yylex_destroy(), so don't allocate here. + */ + + + (yy_buffer_stack) = 0; + (yy_buffer_stack_top) = 0; + (yy_buffer_stack_max) = 0; + (yy_c_buf_p) = 0; + (yy_init) = 0; + (yy_start) = 0; + + + + + + + +/* Defined in main.c */ +#ifdef YY_STDINIT + yyin = stdin; + yyout = stdout; #else -static void yy_flex_strncpy( s1, s2, n ) -char *s1; -yyconst char *s2; -int n; + yyin = 0; + yyout = 0; #endif - { - register int i; + + /* For future reference: Set errno on error, since we are called by + * yylex_init() + */ + return 0; +} + + +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (void) +{ + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + yy_delete_buffer( YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = 0; + yypop_buffer_state(); + } + + /* Destroy the stack itself. */ + yyfree((yy_buffer_stack) ); + (yy_buffer_stack) = 0; + + + + + + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * yylex() is called, initialization will occur. */ + yy_init_globals( ); + + return 0; +} + + + +/* + * Internal utility routines. + */ + + + +#ifndef yytext_ptr +static void yy_flex_strncpy (char* s1, const char * s2, int n ) +{ + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; - } +} #endif + + #ifdef YY_NEED_STRLEN -#ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) -#else -static int yy_flex_strlen( s ) -yyconst char *s; -#endif - { - register int n; +static int yy_flex_strlen (const char * s ) +{ + int n; for ( n = 0; s[n]; ++n ) ; return n; - } +} #endif -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { - return (void *) ACE_OS::malloc( size ); - } -#ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, yy_size_t size ) -#else -static void *yy_flex_realloc( ptr, size ) -void *ptr; -yy_size_t size; -#endif - { +void *yyalloc (yy_size_t size ) +{ + return malloc(size); +} + + + +void *yyrealloc (void * ptr, yy_size_t size ) +{ + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -1706,26 +2242,24 @@ yy_size_t size; * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) ACE_OS::realloc( (char *) ptr, size ); - } + return realloc(ptr, size); +} + + + +void yyfree (void * ptr ) +{ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ +} + + +#define YYTABLES_NAME "yytables" + + + + -#ifdef YY_USE_PROTOS -static void yy_flex_free( void *ptr ) -#else -static void yy_flex_free( ptr ) -void *ptr; -#endif - { - ACE_OS::free( ptr ); - } -#if YY_MAIN -int main() - { - yylex(); - return 0; - } -#endif TAO_Literal_Constraint* @@ -1864,3 +2398,4 @@ yywrap (void) } TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff deleted file mode 100644 index 0067720a575..00000000000 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff +++ /dev/null @@ -1,55 +0,0 @@ ---- Constraint_l.cpp.orig 2006-12-29 11:48:44.000000000 -0600 -+++ Constraint_l.cpp 2006-12-29 11:48:44.000000000 -0600 -@@ -11,6 +11,7 @@ - - #include "ace/os_include/os_stdio.h" - #include "ace/OS_NS_unistd.h" -+#include /**/ "tao/Versioned_Namespace.h" - - - /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -@@ -94,6 +95,8 @@ - /* Size of default input buffer. */ - #define YY_BUF_SIZE 16384 - -+TAO_BEGIN_VERSIONED_NAMESPACE_DECL -+ - typedef struct yy_buffer_state *YY_BUFFER_STATE; - - extern int yyleng; -@@ -499,6 +502,8 @@ - #define YY_NO_TOP_STATE 1 - #endif - -+TAO_END_VERSIONED_NAMESPACE_DECL -+ - #ifdef YY_MALLOC_DECL - YY_MALLOC_DECL - #else -@@ -589,6 +594,8 @@ - #define YY_RULE_SETUP \ - YY_USER_ACTION - -+TAO_BEGIN_VERSIONED_NAMESPACE_DECL -+ - YY_DECL - { - register yy_state_type yy_current_state; -@@ -831,7 +838,7 @@ - case 30: - YY_RULE_SETUP - {} -- YY_BREAK -+ break; - case 31: - YY_RULE_SETUP - { -@@ -841,7 +848,7 @@ - case 32: - YY_RULE_SETUP - TAO_TRADER_ECHO; -- YY_BREAK -+ break; - case YY_STATE_EOF(INITIAL): - yyterminate(); - diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index f65cc5ae596..282aa57e8d2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp @@ -1,19 +1,35 @@ -#ifndef lint -// static char const -// yyrcsid[] = ""; -#endif -#include "ace/os_include/os_stdlib.h" +/* original parser id follows */ +/* yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93" */ +/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ + #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 -#define YYLEX yylex() -#define YYEMPTY -1 -#define yyclearin (yychar=(YYEMPTY)) -#define yyerrok (yyerrflag=0) -#define YYRECOVERING() (yyerrflag!=0) +#define YYPATCH 20140715 +#define YYEMPTY (-1) +#define yyclearin (yychar = YYEMPTY) +#define yyerrok (yyerrflag = 0) +#define YYRECOVERING() (yyerrflag != 0) +#define YYENOMEM (-2) +#define YYEOF 0 #define YYPREFIX "yy" +#define YYPURE 0 + + /* ========================================================================*/ +/**/ +/* = LIBRARY*/ +/* orbsvcs*/ +/* */ +/* = FILENAME*/ +/* constraint.y*/ +/**/ +/* = AUTHOR*/ +/* Seth Widoff <sbw1@cs.wustl.edu>*/ +/**/ +/* ========================================================================*/ + #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdlib.h" #include "orbsvcs/Trader/Constraint_Interpreter.h" @@ -22,7 +38,38 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /*#define YYDEBUG 1*/ -#define YYERRCODE 256 + +/* compatibility with bison */ +#ifdef YYPARSE_PARAM +/* compatibility with FreeBSD */ +# ifdef YYPARSE_PARAM_TYPE +# define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM) +# else +# define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM) +# endif +#else +# define YYPARSE_DECL() yyparse(void) +#endif + +/* Parameters sent to lex. */ +#ifdef YYLEX_PARAM +# define YYLEX_DECL() yylex(void *YYLEX_PARAM) +# define YYLEX yylex(YYLEX_PARAM) +#else +# define YYLEX_DECL() yylex(void) +# define YYLEX yylex() +#endif + +/* Parameters sent to yyerror. */ +#ifndef YYERROR_DECL +#define YYERROR_DECL() yyerror(const char *s) +#endif +#ifndef YYERROR_CALL +#define YYERROR_CALL(msg) yyerror(msg) +#endif + +extern int YYPARSE_DECL(); + #define TAO_GT 257 #define TAO_GE 258 #define TAO_LT 259 @@ -57,19 +104,21 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL #define TAO_MIN 288 #define TAO_FIRST 289 #define TAO_RANDOM 290 -const short yylhs[] = { -1, +#define YYERRCODE 256 +typedef short YYINT; +static const YYINT yylhs[] = { -1, 0, 0, 1, 1, 1, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 10, 10, 10, 10, 10, 10, 10, }; -const short yylen[] = { 2, +static const YYINT yylen[] = { 2, 1, 1, 2, 2, 2, 1, 1, 3, 1, 3, 1, 3, 3, 3, 3, 3, 3, 1, 3, 1, 3, 1, 3, 3, 1, 3, 3, 1, 2, 1, 3, 2, 1, 1, 2, 1, 1, }; -const short yydefred[] = { 0, +static const YYINT yydefred[] = { 0, 0, 0, 37, 0, 34, 0, 33, 36, 0, 0, 0, 6, 7, 0, 2, 0, 0, 11, 0, 0, 0, 0, 28, 30, 32, 29, 35, 0, 0, 0, @@ -77,10 +126,10 @@ const short yydefred[] = { 0, 0, 0, 0, 0, 0, 31, 0, 10, 14, 15, 16, 17, 12, 13, 19, 0, 0, 0, 26, 27, }; -const short yydgoto[] = { 14, +static const YYINT yydgoto[] = { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, }; -const short yysindex[] = { -253, +static const YYINT yysindex[] = { -253, -278, -219, 0, -271, 0, -224, 0, 0, -224, -224, -224, 0, 0, 0, 0, -256, -252, 0, -195, -244, -251, -243, 0, 0, 0, 0, 0, -262, -256, -256, @@ -88,7 +137,7 @@ const short yysindex[] = { -253, -224, -224, -224, -224, -224, 0, -252, 0, 0, 0, 0, 0, 0, 0, 0, -239, -243, -243, 0, 0, }; -const short yyrindex[] = { 0, +static const YYINT yyrindex[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, 8, 0, 11, 87, 61, 1, 0, 0, 0, 0, 0, 0, 38, 40, @@ -96,11 +145,11 @@ const short yyrindex[] = { 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 74, 21, 41, 0, 0, }; -const short yygindex[] = { 0, +static const YYINT yygindex[] = { 0, 0, -4, 14, 24, 34, 0, 36, 6, 31, 76, }; #define YYTABLESIZE 363 -const short yytable[] = { 25, +static const YYINT yytable[] = { 25, 25, 28, 32, 27, 29, 30, 31, 9, 32, 1, 18, 33, 2, 46, 55, 3, 41, 4, 42, 43, 23, 5, 40, 6, 7, 8, 1, 8, 44, 45, @@ -139,7 +188,7 @@ const short yytable[] = { 25, 20, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, }; -const short yycheck[] = { 278, +static const YYINT yycheck[] = { 278, 0, 6, 265, 275, 9, 10, 11, 0, 265, 263, 0, 264, 266, 276, 278, 269, 268, 271, 270, 271, 0, 275, 267, 277, 278, 279, 0, 0, 272, 273, @@ -183,8 +232,11 @@ const short yycheck[] = { 278, #define YYDEBUG 0 #endif #define YYMAXTOKEN 290 +#define YYUNDFTOKEN 303 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) #if YYDEBUG -const char * const yyname[] = { +static const char *const yyname[] = { + "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -196,9 +248,10 @@ const char * const yyname[] = { "TAO_TWIDDLE","TAO_BOOLEAN","TAO_PLUS","TAO_MINUS","TAO_MULT","TAO_DIV", "TAO_UMINUS","TAO_NUMBER","TAO_RPAREN","TAO_LPAREN","TAO_IDENT","TAO_STRING", "TAO_UNKNOWN","TAO_SIGNED","TAO_UNSIGNED","TAO_DOUBLE","TAO_CONSTRAINT", -"TAO_SEQUENCE","TAO_WITH","TAO_MAX","TAO_MIN","TAO_FIRST","TAO_RANDOM", +"TAO_SEQUENCE","TAO_WITH","TAO_MAX","TAO_MIN","TAO_FIRST","TAO_RANDOM",0,0,0,0, +0,0,0,0,0,0,0,0,"illegal-symbol", }; -const char * const yyrule[] = { +static const char *const yyrule[] = { "$accept : constraint", "constraint : bool_or", "constraint : preference", @@ -237,103 +290,112 @@ const char * const yyrule[] = { "factor : TAO_MINUS TAO_NUMBER", "factor : TAO_STRING", "factor : TAO_BOOLEAN", + }; #endif -#if YYDEBUG -#include <stdio.h> -#endif + +int yydebug; +int yynerrs; + +int yyerrflag; +int yychar; +YYSTYPE yyval; +YYSTYPE yylval; + +/* define the initial stack-sizes */ #ifdef YYSTACKSIZE #undef YYMAXDEPTH -#define YYMAXDEPTH YYSTACKSIZE +#define YYMAXDEPTH YYSTACKSIZE #else #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else #define YYSTACKSIZE 10000 -#define YYMAXDEPTH 10000 +#define YYMAXDEPTH 10000 #endif #endif + #define YYINITSTACKSIZE 200 -int yydebug; -int yynerrs; -int yyerrflag; -int yychar; -short *yyssp; -YYSTYPE *yyvsp; -YYSTYPE yyval; -YYSTYPE yylval; -short *yyss; -short *yysslim; -YYSTYPE *yyvs; -int yystacksize; + +typedef struct { + unsigned stacksize; + YYINT *s_base; + YYINT *s_mark; + YYINT *s_last; + YYSTYPE *l_base; + YYSTYPE *l_mark; +} YYSTACKDATA; +/* variables for the parser stack */ +static YYSTACKDATA yystack; //extern int yydebug = 1; + +#if YYDEBUG +#include <stdio.h> /* needed for printf */ +#endif + +#include <stdlib.h> /* needed for malloc, etc */ +#include <string.h> /* needed for memset */ + /* allocate initial stack or double stack size, up to YYMAXDEPTH */ -static int yygrowstack() +static int yygrowstack(YYSTACKDATA *data) { - size_t newsize, i; - short *newss; + int i; + unsigned newsize; + YYINT *newss; YYSTYPE *newvs; - if ((newsize = yystacksize) == 0) + if ((newsize = data->stacksize) == 0) newsize = YYINITSTACKSIZE; else if (newsize >= YYMAXDEPTH) - return -1; + return YYENOMEM; else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = yyssp - yyss; - newss = yyss ? (short *)ACE_OS::realloc(yyss, newsize * sizeof *newss) : - (short *)ACE_OS::malloc(newsize * sizeof *newss); + + i = (int) (data->s_mark - data->s_base); + newss = (YYINT *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) - return -1; - yyss = newss; - yyssp = newss + i; - newvs = yyvs ? (YYSTYPE *)ACE_OS::realloc(yyvs, newsize * sizeof *newvs) : - (YYSTYPE *)ACE_OS::malloc(newsize * sizeof *newvs); + return YYENOMEM; + + data->s_base = newss; + data->s_mark = newss + i; + + newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs)); if (newvs == 0) - return -1; - yyvs = newvs; - yyvsp = newvs + i; - yystacksize = newsize; - yysslim = yyss + newsize - 1; + return YYENOMEM; + + data->l_base = newvs; + data->l_mark = newvs + i; + + data->stacksize = newsize; + data->s_last = data->s_base + newsize - 1; return 0; } -#define YYABORT goto yyabort +#if YYPURE || defined(YY_NO_LEAKS) +static void yyfreestack(YYSTACKDATA *data) +{ + free(data->s_base); + free(data->l_base); + memset(data, 0, sizeof(*data)); +} +#else +#define yyfreestack(data) /* nothing */ +#endif + +#define YYABORT goto yyabort #define YYREJECT goto yyabort #define YYACCEPT goto yyaccept -#define YYERROR goto yyerrlab - -#ifndef YYPARSE_PARAM -#if defined(__cplusplus) || __STDC__ -#define YYPARSE_PARAM_ARG void -#define YYPARSE_PARAM_DECL -#else /* ! ANSI-C/C++ */ -#define YYPARSE_PARAM_ARG -#define YYPARSE_PARAM_DECL -#endif /* ANSI-C/C++ */ -#else /* YYPARSE_PARAM */ -#ifndef YYPARSE_PARAM_TYPE -#define YYPARSE_PARAM_TYPE void * -#endif -#if defined(__cplusplus) || __STDC__ -#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM -#define YYPARSE_PARAM_DECL -#else /* ! ANSI-C/C++ */ -#define YYPARSE_PARAM_ARG YYPARSE_PARAM -#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM; -#endif /* ANSI-C/C++ */ -#endif /* ! YYPARSE_PARAM */ +#define YYERROR goto yyerrlab int -yyparse (YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL +YYPARSE_DECL() { - register int yym, yyn, yystate; + int yym, yyn, yystate; #if YYDEBUG - register const char *yys; + const char *yys; - if ((yys = ACE_OS::getenv("YYDEBUG"))) + if ((yys = getenv("YYDEBUG")) != 0) { yyn = *yys; if (yyn >= '0' && yyn <= '9') @@ -343,26 +405,30 @@ yyparse (YYPARSE_PARAM_ARG) yynerrs = 0; yyerrflag = 0; - yychar = (-1); + yychar = YYEMPTY; + yystate = 0; - if (yyss == 0 && yygrowstack()) goto yyoverflow; - yyssp = yyss; - yyvsp = yyvs; - *yyssp = yystate = 0; +#if YYPURE + memset(&yystack, 0, sizeof(yystack)); +#endif + + if (yystack.s_base == 0 && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow; + yystack.s_mark = yystack.s_base; + yystack.l_mark = yystack.l_base; + yystate = 0; + *yystack.s_mark = 0; yyloop: - if ((yyn = yydefred[yystate])) goto yyreduce; + if ((yyn = yydefred[yystate]) != 0) goto yyreduce; if (yychar < 0) { - if ((yychar = yylex()) < 0) yychar = 0; + if ((yychar = YYLEX) < 0) yychar = YYEOF; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; - ACE_OS::printf("%sdebug: state %d, reading %d (%s)\n", - YYPREFIX, yystate, yychar, yys); + yys = yyname[YYTRANSLATE(yychar)]; + printf("%sdebug: state %d, reading %d (%s)\n", + YYPREFIX, yystate, yychar, yys); } #endif } @@ -371,16 +437,17 @@ yyloop: { #if YYDEBUG if (yydebug) - ACE_OS::printf("%sdebug: state %d, shifting to state %d\n", - YYPREFIX, yystate, yytable[yyn]); + printf("%sdebug: state %d, shifting to state %d\n", + YYPREFIX, yystate, yytable[yyn]); #endif - if (yyssp >= yysslim && yygrowstack()) + if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) { goto yyoverflow; } - *++yyssp = yystate = yytable[yyn]; - *++yyvsp = yylval; - yychar = (-1); + yystate = yytable[yyn]; + *++yystack.s_mark = yytable[yyn]; + *++yystack.l_mark = yylval; + yychar = YYEMPTY; if (yyerrflag > 0) --yyerrflag; goto yyloop; } @@ -391,218 +458,217 @@ yyloop: goto yyreduce; } if (yyerrflag) goto yyinrecovery; -#if defined(lint) || defined(__GNUC__) || defined (WIN32) || defined (__HP_aCC) - goto yynewerror; -#endif -yynewerror: - yyerror("syntax error"); -#if defined(lint) || defined(__GNUC__) || defined (WIN32) || defined (__HP_aCC) + + YYERROR_CALL("syntax error"); + goto yyerrlab; -#endif + yyerrlab: ++yynerrs; + yyinrecovery: if (yyerrflag < 3) { yyerrflag = 3; for (;;) { - if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 && + if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 && yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE) { #if YYDEBUG if (yydebug) - ACE_OS::printf("%sdebug: state %d, error recovery shifting\ - to state %d\n", YYPREFIX, *yyssp, yytable[yyn]); + printf("%sdebug: state %d, error recovery shifting\ + to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]); #endif - if (yyssp >= yysslim && yygrowstack()) + if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) { goto yyoverflow; } - *++yyssp = yystate = yytable[yyn]; - *++yyvsp = yylval; + yystate = yytable[yyn]; + *++yystack.s_mark = yytable[yyn]; + *++yystack.l_mark = yylval; goto yyloop; } else { #if YYDEBUG if (yydebug) - ACE_OS::printf("%sdebug: error recovery discarding state %d\n", - YYPREFIX, *yyssp); + printf("%sdebug: error recovery discarding state %d\n", + YYPREFIX, *yystack.s_mark); #endif - if (yyssp <= yyss) goto yyabort; - --yyssp; - --yyvsp; + if (yystack.s_mark <= yystack.s_base) goto yyabort; + --yystack.s_mark; + --yystack.l_mark; } } } else { - if (yychar == 0) goto yyabort; + if (yychar == YYEOF) goto yyabort; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; - ACE_OS::printf("%sdebug: state %d, error recovery discards token %d (%s)\n", - YYPREFIX, yystate, yychar, yys); + yys = yyname[YYTRANSLATE(yychar)]; + printf("%sdebug: state %d, error recovery discards token %d (%s)\n", + YYPREFIX, yystate, yychar, yys); } #endif - yychar = (-1); + yychar = YYEMPTY; goto yyloop; } + yyreduce: #if YYDEBUG if (yydebug) - ACE_OS::printf("%sdebug: state %d, reducing by rule %d (%s)\n", - YYPREFIX, yystate, yyn, yyrule[yyn]); + printf("%sdebug: state %d, reducing by rule %d (%s)\n", + YYPREFIX, yystate, yyn, yyrule[yyn]); #endif yym = yylen[yyn]; - yyval = yyvsp[1-yym]; + if (yym) + yyval = yystack.l_mark[1-yym]; + else + memset(&yyval, 0, sizeof yyval); switch (yyn) { case 1: -{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_CONSTRAINT, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_CONSTRAINT, yystack.l_mark[0].constraint_); } break; case 2: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 3: -{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_MIN, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_MIN, yystack.l_mark[0].constraint_); } break; case 4: -{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_MAX, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_MAX, yystack.l_mark[0].constraint_); } break; case 5: -{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_WITH, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_WITH, yystack.l_mark[0].constraint_); } break; case 6: -{ yyval.constraint_ = new TAO_Noop_Constraint(TAO_FIRST); } + { yyval.constraint_ = new TAO_Noop_Constraint(TAO_FIRST); } break; case 7: -{ yyval.constraint_ = new TAO_Noop_Constraint(TAO_RANDOM); } + { yyval.constraint_ = new TAO_Noop_Constraint(TAO_RANDOM); } break; case 8: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_OR, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_OR, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 9: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 10: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_AND, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_AND, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 11: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 12: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_EQ, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_EQ, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 13: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_NE, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_NE, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 14: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_GT, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_GT, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 15: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_GE, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_GE, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 16: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_LT, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_LT, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 17: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_LE, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_LE, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 18: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 19: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_IN, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_IN, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 20: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 21: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_TWIDDLE, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_TWIDDLE, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 22: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 23: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_PLUS, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_PLUS, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 24: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_MINUS, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_MINUS, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 25: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 26: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_MULT, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_MULT, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 27: -{ yyval.constraint_ = new TAO_Binary_Constraint(TAO_DIV, yyvsp[-2].constraint_, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Binary_Constraint(TAO_DIV, yystack.l_mark[-2].constraint_, yystack.l_mark[0].constraint_); } break; case 28: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 29: -{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_NOT, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_NOT, yystack.l_mark[0].constraint_); } break; case 30: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 31: -{ yyval.constraint_ = yyvsp[-1].constraint_; } + { yyval.constraint_ = yystack.l_mark[-1].constraint_; } break; case 32: -{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_EXIST, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_EXIST, yystack.l_mark[0].constraint_); } break; case 33: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 34: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 35: -{ yyval.constraint_ = new TAO_Unary_Constraint(TAO_UMINUS, yyvsp[0].constraint_); } + { yyval.constraint_ = new TAO_Unary_Constraint(TAO_UMINUS, yystack.l_mark[0].constraint_); } break; case 36: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; case 37: -{ yyval.constraint_ = yyvsp[0].constraint_; } + { yyval.constraint_ = yystack.l_mark[0].constraint_; } break; } - yyssp -= yym; - yystate = *yyssp; - yyvsp -= yym; + yystack.s_mark -= yym; + yystate = *yystack.s_mark; + yystack.l_mark -= yym; yym = yylhs[yyn]; if (yystate == 0 && yym == 0) { #if YYDEBUG if (yydebug) - ACE_OS::printf("%sdebug: after reduction, shifting from state 0 to\ + printf("%sdebug: after reduction, shifting from state 0 to\ state %d\n", YYPREFIX, YYFINAL); #endif yystate = YYFINAL; - *++yyssp = YYFINAL; - *++yyvsp = yyval; + *++yystack.s_mark = YYFINAL; + *++yystack.l_mark = yyval; if (yychar < 0) { - if ((yychar = yylex()) < 0) yychar = 0; + if ((yychar = YYLEX) < 0) yychar = YYEOF; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; - ACE_OS::printf("%sdebug: state %d, reading %d (%s)\n", - YYPREFIX, YYFINAL, yychar, yys); + yys = yyname[YYTRANSLATE(yychar)]; + printf("%sdebug: state %d, reading %d (%s)\n", + YYPREFIX, YYFINAL, yychar, yys); } #endif } - if (yychar == 0) goto yyaccept; + if (yychar == YYEOF) goto yyaccept; goto yyloop; } if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 && @@ -612,21 +678,26 @@ break; yystate = yydgoto[yym]; #if YYDEBUG if (yydebug) - ACE_OS::printf("%sdebug: after reduction, shifting from state %d \ -to state %d\n", YYPREFIX, *yyssp, yystate); + printf("%sdebug: after reduction, shifting from state %d \ +to state %d\n", YYPREFIX, *yystack.s_mark, yystate); #endif - if (yyssp >= yysslim && yygrowstack()) + if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) { goto yyoverflow; } - *++yyssp = yystate; - *++yyvsp = yyval; + *++yystack.s_mark = (YYINT) yystate; + *++yystack.l_mark = yyval; goto yyloop; + yyoverflow: - yyerror("yacc stack overflow"); + YYERROR_CALL("yacc stack overflow"); + yyabort: + yyfreestack(&yystack); return (1); + yyaccept: + yyfreestack(&yystack); return (0); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.l b/TAO/orbsvcs/orbsvcs/Trader/constraint.l index 400ce3a006f..df521e48349 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/constraint.l +++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.l @@ -1,3 +1,12 @@ +%top{ +#include /**/ "tao/orbconf.h" +#include /**/ "tao/Versioned_Namespace.h" + +#include "ace/OS_NS_unistd.h" +#include "ace/os_include/os_stdio.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL +} %{ TAO_END_VERSIONED_NAMESPACE_DECL @@ -198,7 +207,7 @@ trader_strtoull(const char* s, unsigned int base) result = (result * base) + (*s - 'A' + 10); } else - { + { break; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp index d9b23ee999f..17fb3f4f5d0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -98,8 +98,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Servant_var<TAO_EC_Event_Channel> ec_impl ( RTEC_Initializer::create (ec_poa.in (), ec_poa.in (), - rtserver_setup.rtcorba_setup ()) - ); + rtserver_setup.rtcorba_setup ())); ec_impl->activate (); diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index 535103b0a75..eda4570e7eb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -252,7 +252,7 @@ Sender::pace_data (void) } ACE_DEBUG ((LM_DEBUG, - "Sender::pace_data frame %d was sent succesfully\n", + "Sender::pace_data frame %d was sent successfully\n", ++this->frame_count_)); // Reset the message block. diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index 7ffb5d8cdf8..4ab1e54dc56 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -377,7 +377,7 @@ Sender::pace_data (void) -1); ACE_DEBUG ((LM_DEBUG, - "Sender::pace_data frame %d was sent succesfully\n", + "Sender::pace_data frame %d was sent successfully\n", ++this->frame_count_)); // Reset the message block. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index d1f0fb0a603..b7b47d1a487 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -392,7 +392,7 @@ Sender::pace_data (void) } ACE_DEBUG ((LM_DEBUG, - "Sender::pace_data frame %d was sent succesfully\n", + "Sender::pace_data frame %d was sent successfully\n", ++this->frame_count_)); /// Reset the message block. diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index d612810bf05..487bb92dab3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -62,7 +62,7 @@ FTP_Client_Callback::handle_timeout (void *) int result = this->protocol_object_->send_frame (&mb); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send\n"),-1); - ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent succesfully\n")); + ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent successfully\n")); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 337b6154c70..8f559e80797 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -35,8 +35,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *, CORBA::Boolean Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &/* the_flows */ - ) + const AVStreams::flowSpec &/* the_flows */) { ACE_DEBUG ((LM_DEBUG, "Sender_StreamEndPoint::modify_QoS\n")); @@ -327,7 +326,7 @@ Sender::pace_data (void) -1); ACE_DEBUG ((LM_DEBUG, - "Sender::pace_data frame %d was sent succesfully\n", + "Sender::pace_data frame %d was sent successfully\n", ++this->frame_count_)); // Reset the message block. diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index 7a3d6b003b5..ecfa3b10ac3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -76,7 +76,7 @@ FTP_Client_Callback::handle_timeout (void *) int result = this->protocol_object_->send_frame (&mb); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send\n"),-1); - ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent succesfully\n")); + ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent successfully\n")); return 0; } diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index b6fbd0d655b..2a384f91291 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -68,7 +68,7 @@ FTP_Client_Callback::handle_timeout (void *) int result = this->protocol_object_->send_frame (&mb); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send\n"),-1); - ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent succesfully\n")); + ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent successfully\n")); return 0; } diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 07e4c5001b9..805b34997c8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -330,7 +330,7 @@ Sender::pace_data (void) ACE_DEBUG ((LM_DEBUG, - "Sender::pace_data frame %d was sent succesfully\n", + "Sender::pace_data frame %d was sent successfully\n", ++this->frame_count_)); // Reset the message block. diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index eed33815360..4767b8cb342 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -373,7 +373,7 @@ Client::pace_data (void) ACE_ERROR_RETURN ((LM_ERROR, "send failed:%p","FTP_Client_Flow_Handler::send\n"), -1); - ACE_DEBUG ((LM_DEBUG,"Client::pace_data buffer sent succesfully\n")); + ACE_DEBUG ((LM_DEBUG,"Client::pace_data buffer sent successfully\n")); // Reset the mb. this->mb.reset (); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index 4c365693942..ec3f5548c13 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -300,7 +300,7 @@ Sender::pace_data (void) -1); ACE_DEBUG ((LM_DEBUG, - "Sender::pace_data frame %d was sent succesfully\n", + "Sender::pace_data frame %d was sent successfully\n", ++this->frame_count_)); // Reset the message block. diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index 1efe0bb67a8..ed682834aea 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -142,8 +142,7 @@ Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice, int Distributer::init (int /*argc*/, - ACE_TCHAR *[] /*argv*/ - ) + ACE_TCHAR *[] /*argv*/) { // Initialize the naming services int result = diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index f18d1b04631..740430dec90 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -275,7 +275,7 @@ Sender::pace_data (void) -1); ACE_DEBUG ((LM_DEBUG, - "Sender::pace_data frame %d was sent succesfully\n", + "Sender::pace_data frame %d was sent successfully\n", ++this->frame_count_)); // Reset the message block. diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index 01cf1610ffa..48b4b51d641 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp @@ -388,7 +388,7 @@ Sender::pace_data (void) -1); ACE_DEBUG ((LM_DEBUG, - "Sender::pace_data frame %d was sent succesfully %d\n", + "Sender::pace_data frame %d was sent successfully %d\n", ++this->frame_count_, buffer_size)); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 00d85f7ce1d..0c9d41de402 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -434,7 +434,7 @@ Sender::pace_data (void) -1); ACE_DEBUG ((LM_DEBUG, - " Sender::pace_data frame %d was sent succesfully\n", + " Sender::pace_data frame %d was sent successfully\n", ++this->frame_count_)); // Reset the message block. diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h index 693b51e7f9f..c3a323f966f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h @@ -36,8 +36,7 @@ public: TAO_AV_Protocol_Object *object); CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &/* the_flows */ - ); + const AVStreams::flowSpec &/* the_flows */); protected: /// Application callback. TAO_AV_Callback callback_; diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp index 46fc9e4d5d0..54cc2944398 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp @@ -17,8 +17,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ContainedSeq_var interfaces = repo_->contents (CORBA::dk_Interface, // Any type of contained object. - 1 // Exclude parents of interfaces. - ); + 1); // Exclude parents of interfaces. CORBA::ULong length = interfaces->length (); diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h index 318497270b3..4bafa4e0a52 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h @@ -28,22 +28,18 @@ public: Server_ORBInitializer2 (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); void set_server_iogr (CORBA::Object_ptr obj); private: /// Register the necessary interceptors. - void register_server_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info - ); + void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info); - // Private temprorary pointer + // Private temporary pointer TAO249_ServerRequest_Interceptor2 *sri_; }; diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h index a880888c4b6..4bafa4e0a52 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h @@ -37,10 +37,9 @@ public: private: /// Register the necessary interceptors. - void register_server_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info); + void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info); - // Private temprorary pointer + // Private temporary pointer TAO249_ServerRequest_Interceptor2 *sri_; }; diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp index 5b6e3eb3f15..9bb5cb60097 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp @@ -75,7 +75,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_ERROR, "REGRESSION - Test has failed !!!\n")); result = 1; } - catch (const CORBA::TRANSIENT my_ex) + catch (const CORBA::TRANSIENT& my_ex) { ACE_UNUSED_ARG (my_ex); ACE_DEBUG ((LM_DEBUG, "Client catches a TRANSIENT, as expected. No problem !\n")); diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp index a1a3408ed4a..d0732208090 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp @@ -38,7 +38,7 @@ public: try { group_svc.member_list (group_names[g]); } - catch (PortableGroup::ObjectGroupNotFound) { + catch (PortableGroup::ObjectGroupNotFound&) { } catch (CORBA::Exception &ex) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp index f91e3d3036f..f3b1557e85e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp @@ -69,6 +69,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) str.c_str ()), -1); } } + + orb->destroy (); + return 0; } catch (const CORBA::Exception &ex) diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp index d701d0c6ab4..011f1e903d9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp @@ -79,8 +79,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ex._tao_print_exception ("Client second attempt: "); } } - return 0; + orb->destroy (); + + return 0; } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/README b/TAO/orbsvcs/tests/ImplRepo/double_start/README index 1067933ec7b..3bad9cdc696 100644 --- a/TAO/orbsvcs/tests/ImplRepo/double_start/README +++ b/TAO/orbsvcs/tests/ImplRepo/double_start/README @@ -1,8 +1,5 @@ - - This test demonstrates that a client may safely obtain a new reference to a previously crashed server by connecting to either a primary or backup ImR. Additionally, a secondary restart script is used to request a server restart when the server exits with a non-zero value. - diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp index b1a7900a604..9112930c37a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp @@ -134,8 +134,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 1; do_restart_test (); - return 0; + orb->destroy (); + + return 0; } catch(const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("client:")); diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp index 5c05442041c..65910197c25 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp @@ -50,10 +50,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Client received reply from server %d\n", n)); + + orb->destroy (); + if (expect_transient) return -1; return 0; - } catch(const CORBA::TRANSIENT& ex) { if (expect_transient) diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp index 91d3a73d970..34668b48a26 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp @@ -79,8 +79,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } #endif } - return 0; + orb->destroy (); + + return 0; } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/README b/TAO/orbsvcs/tests/ImplRepo/link_poas/README index e37ed0f71de..0a804f65853 100644 --- a/TAO/orbsvcs/tests/ImplRepo/link_poas/README +++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/README @@ -1,5 +1,3 @@ - - This test validates the tao_imr link command by creating a server with 3 POAs and showing that when linked, concurrent startup requests for different POAs are treated as requests for the same server. diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp index fdf6eb9293d..ae911872025 100644 --- a/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp @@ -50,8 +50,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::Long spid = test->server_pid (); ACE_DEBUG ((LM_DEBUG, "client target %c got pid %d\n", target, spid)); - return 0; + orb->destroy (); + + return 0; } catch(const CORBA::Exception& ex) { ex._tao_print_exception ("client:"); diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/README b/TAO/orbsvcs/tests/ImplRepo/manual_start/README index 50a9e5641b4..b04bb6989ec 100644 --- a/TAO/orbsvcs/tests/ImplRepo/manual_start/README +++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/README @@ -1,5 +1,3 @@ - - This test demonstrates that a client attempting to contact a stopped MANUAL server will not lock up the ImR. The test starts primary and backup Locators, then registers and starts a server with MANUAL activation mode. The server connects to the locator then diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.conf b/TAO/orbsvcs/tests/ImplRepo/scale/client.conf index 7ecf7a7379c..11d8ef78a1d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/client.conf +++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.conf @@ -1,4 +1,3 @@ - # This file is here just in case you want to run some of the tests manually # and don't want the client to jump back in the reactor during the # invocation. diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp index 6fc3d865a28..7f093b9d1ef 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp @@ -23,6 +23,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { else ACE_DEBUG((LM_DEBUG, "Error: Client Expected %d = %d + 1.\n", m, n)); + orb->destroy (); + return 0; } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index 04162699197..e2b30ccbff4 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -196,7 +196,6 @@ Server_i::run (void) throw; } - return 0; } diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/README b/TAO/orbsvcs/tests/ImplRepo/scale_clients/README index 96eac20719f..3e96b8f11b2 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/README +++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/README @@ -1,24 +1,29 @@ - - This is a test of the ImplRepo being accessed by a variable number of clients trying to send a request to a server registered with the ImplRepo and launched using the activator. 1. Syntax run_test.pl [-clients <num>] - [-msecs_between_clients <msecs>] - [-server_init_delay <seconds>] - [-server_reply_delay <seconds>] - [-rt_timeout <round-trip-timeout-msecs>] - [-max_rt_tries <max-client-requests>] - [-no_imr] - + [-imrdebug <level>] + [-activationmode <mode>] + [-msecs_between_clients <msecs>] + [-server_init_delay <seconds>] + [-server_reply_delay <seconds>] + [-rt_timeout <round-trip-timeout-msecs>] + [-max_rt_tries <max-client-requests>] + [-no_imr] 2. Description of command line arguments - clients <num> The number of clients to spawn. +- imrdebug <level> + The debug level for the ImR Locator/Activator, default of 1 + +- activationmode <mode> + The server activation mode, normal|manual|per_client|auto_start + - msecs_between_clients <msecs> The number of milliseconds to wait between client spawns. This can be used to avoid a rapid succession of a large number @@ -41,8 +46,8 @@ run_test.pl [-clients <num>] the client will attempt to try the request again. This argument controls the maximum number of requests that the client will make. - You can use this argument along with low value of rt_timeout - to cause a rapid number of request attempts. + You can use this argument along with low value of rt_timeout + o cause a rapid number of request attempts. - no_imr Passing this argument will assume the ImplRepo is already diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl index b38cc18e356..fa2e9489dc7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl +++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl @@ -2,5 +2,7 @@ interface Test { // Return the number of the server after a delay short get_num_requests (in short delay_secs); + + oneway void shutdown(); }; diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp index 57a31fd0f16..f80d527fdee 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp @@ -5,8 +5,9 @@ /* static */ bool Test_i::expected_requests_made_ = false; -Test_i::Test_i (CORBA::Short num_requests_expected) - : num_requests_expected_ (num_requests_expected) +Test_i::Test_i (CORBA::ORB_ptr orb, CORBA::Short num_requests_expected) + : orb_ (CORBA::ORB::_duplicate(orb)) + , num_requests_expected_ (num_requests_expected) , num_requests_made_ (0) { } @@ -29,3 +30,9 @@ Test_i::expected_requests_made () { return Test_i::expected_requests_made_; } + +void +Test_i::shutdown () +{ + orb_->shutdown(0); +} diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h index d43ae9d214f..ea70013befe 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h @@ -13,8 +13,7 @@ class Test_i : public virtual POA_Test { public: - - Test_i (CORBA::Short num_requests_expected); + Test_i (CORBA::ORB_ptr orb, CORBA::Short num_requests_expected); virtual ~Test_i (); @@ -23,9 +22,11 @@ public: /// Valid after shutdown () is called. static bool expected_requests_made (); -private: + virtual void shutdown (); - CORBA::Short num_requests_expected_; +private: + CORBA::ORB_var orb_; + CORBA::Short const num_requests_expected_; CORBA::Short num_requests_made_; static bool expected_requests_made_; diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp index 70a05ff6ac3..d94bbe5cf91 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp @@ -12,11 +12,12 @@ int request_delay_secs = 0; // 0 Indicates don't apply RT timeout policy long rt_timeout_msecs = 0; int max_tries = 1; +long shutdown_server = 0; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:r:m:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:r:m:x:")); int c; while ((c = get_opts ()) != -1) @@ -34,13 +35,19 @@ parse_args (int argc, ACE_TCHAR *argv[]) max_tries = ACE_OS::atoi(get_opts.opt_arg ()); break; + case 'x': + shutdown_server = ACE_OS::atoi(get_opts.opt_arg ()); + break; + + case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " "-d <request delay in seconds> " - "-r <rount trip timeout in milliseconds> " + "-r <round trip timeout in milliseconds> " "-m <max tries if RT timeout failures> " + "-x <shutdown server at end of client>" "\n", argv [0]), -1); @@ -61,39 +68,35 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::Object_var obj; - ///// Specify the relative round trip policy ///// - + //Specify the relative round trip policy if (rt_timeout_msecs > 0) { - - // Timeout specified in hundreds of nanoseconds which is - // 10000 milliseconds. - TimeBase::TimeT relative_rt_timeout = rt_timeout_msecs * 10000; - - CORBA::Any relative_rt_timeout_as_any; - relative_rt_timeout_as_any <<= relative_rt_timeout; - CORBA::PolicyList policy_list(1); - policy_list.length(1); - policy_list[0] = - orb->create_policy(Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - relative_rt_timeout_as_any); - - // Apply the policy at the ORB level. - obj = orb->resolve_initial_references("ORBPolicyManager"); - CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow(obj.in()); - policy_manager->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE); - - // Destroy the Policy objects. - for (CORBA::ULong i = 0; i < policy_list.length(); ++i) { - policy_list[i]->destroy (); - } - policy_list.length(0); - + // Timeout specified in hundreds of nanoseconds which is + // 10000 milliseconds. + TimeBase::TimeT relative_rt_timeout = rt_timeout_msecs * 10000; + + CORBA::Any relative_rt_timeout_as_any; + relative_rt_timeout_as_any <<= relative_rt_timeout; + CORBA::PolicyList policy_list(1); + policy_list.length(1); + policy_list[0] = + orb->create_policy(Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, + relative_rt_timeout_as_any); + + // Apply the policy at the ORB level. + obj = orb->resolve_initial_references("ORBPolicyManager"); + CORBA::PolicyManager_var policy_manager = + CORBA::PolicyManager::_narrow(obj.in()); + policy_manager->set_policy_overrides (policy_list, CORBA::ADD_OVERRIDE); + + // Destroy the Policy objects. + for (CORBA::ULong i = 0; i < policy_list.length(); ++i) { + policy_list[i]->destroy (); + } + policy_list.length(0); } ///// Get object reference ///// - obj = orb->resolve_initial_references("Test"); ACE_ASSERT (!CORBA::is_nil(obj.in())); Test_var test = Test::_narrow( obj.in() ); @@ -102,7 +105,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (max_tries > 1) { ACE_DEBUG ((LM_DEBUG, - "Maximum number of tries = %d\n", + "(%P|%t) Maximum number of tries = %d\n", max_tries)); } @@ -124,17 +127,30 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (n == 0) { ACE_ERROR_RETURN ((LM_ERROR, - "ERROR: Expected number of requests from " - "server to by > 0\n"), + "(%P|%t) ERROR: Expected number of requests from " + "server to be > 0\n"), -1); } + else + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Client got back <%d>\n", + n)); + } + + // In a per client situation the client has to shutdown the server + if (shutdown_server) + { + test->shutdown(); + } + orb->destroy (); return 0; } catch(const CORBA::Exception& ex) { - ex._tao_print_exception ("client:"); + ex._tao_print_exception ("Client:"); } return -1; diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl index 8247005334c..1872581c6dd 100755 --- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl @@ -9,9 +9,10 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; $status = 0; -$debug_level = '0'; +my $debug_level = '0'; +my $imr_debug_level = '1'; -# Allow for manually launching ImpleRepo for debugging purposes. +# Allow for manually launching ImplRepo for debugging purposes. my $no_imr = 0; my $clients_count = 6; @@ -21,51 +22,61 @@ my $server_reply_delay = 0; my $rt_timeout_msecs = 0; my $max_rt_tries = 1; my $asynch_loc = ""; +my $activationmode = "normal"; +my $shutdownserver = 0; if ($#ARGV >= 0) { for (my $i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq '-debug') { - $debug_level = '10'; - $i++; - } - elsif ($ARGV[$i] eq "-clients") { - $i++; - $clients_count = $ARGV[$i]; - } - elsif ($ARGV[$i] eq "-rt_timeout") { - $i++; - $rt_timeout_msecs = $ARGV[$i]; - } - elsif ($ARGV[$i] eq "-secs_between_clients") { - $i++; - $secs_between_clients = $ARGV[$i]; - } - elsif ($ARGV[$i] eq "-server_init_delay") { - $i++; - $server_init_delay = $ARGV[$i]; - } - elsif ($ARGV[$i] eq "-server_reply_delay") { - $i++; - $server_reply_delay = $ARGV[$i]; - } - elsif ($ARGV[$i] eq "-rt_timeout") { - $i++; - $rt_timeout_msecs = $ARGV[$i]; - } - elsif ($ARGV[$i] eq "-max_rt_tries") { - $i++; - $max_rt_tries = $ARGV[$i]; - } - elsif ($ARGV[$i] eq "-no_imr") { - $no_imr = 1; - } - elsif ($ARGV[$i] eq "-asynch") { - $asynch_loc = "--use_dsi"; - } - else { - usage(); - exit 1; - } + if ($ARGV[$i] eq '-debug') { + $debug_level = '10'; + $i++; + } + elsif ($ARGV[$i] eq "-imrdebug") { + $i++; + $imr_debug_level = $ARGV[$i]; + } + elsif ($ARGV[$i] eq "-activationmode") { + $i++; + $activationmode = $ARGV[$i]; + } + elsif ($ARGV[$i] eq "-clients") { + $i++; + $clients_count = $ARGV[$i]; + } + elsif ($ARGV[$i] eq "-rt_timeout") { + $i++; + $rt_timeout_msecs = $ARGV[$i]; + } + elsif ($ARGV[$i] eq "-secs_between_clients") { + $i++; + $secs_between_clients = $ARGV[$i]; + } + elsif ($ARGV[$i] eq "-server_init_delay") { + $i++; + $server_init_delay = $ARGV[$i]; + } + elsif ($ARGV[$i] eq "-server_reply_delay") { + $i++; + $server_reply_delay = $ARGV[$i]; + } + elsif ($ARGV[$i] eq "-rt_timeout") { + $i++; + $rt_timeout_msecs = $ARGV[$i]; + } + elsif ($ARGV[$i] eq "-max_rt_tries") { + $i++; + $max_rt_tries = $ARGV[$i]; + } + elsif ($ARGV[$i] eq "-no_imr") { + $no_imr = 1; + } + elsif ($ARGV[$i] eq "-asynch") { + $asynch_loc = "--use_dsi"; + } + else { + usage(); + exit 1; + } } } @@ -128,34 +139,36 @@ sub scale_clients_test my $result = 0; my $start_time = time(); - $IMR->Arguments ("-d 1 -o $imr_imriorfile -orbendpoint iiop://:$port $asynch_loc "); -# "-ORBDebugLevel 10 -ORBVerboseLogging"); + if ($activationmode eq "per_client") { + $shutdownserver = 1; + } + + $IMR->Arguments ("-d $imr_debug_level -o $imr_imriorfile -orbendpoint iiop://:$port $asynch_loc -ORBDebugLevel $debug_level"); if ($no_imr) { - print STDERR "IMR assumed to be manually launched in way that is ". - "compatbile with:\n"; - print STDERR $IMR->CommandLine () . "\n"; + print STDERR "IMR assumed to be manually launched in way that is ". + "compatible with:\n"; + print STDERR $IMR->CommandLine () . "\n"; } else { + print ">>> " . $IMR->CommandLine () . "\n"; + + ##### Start ImplRepo ##### + $IMR_status = $IMR->Spawn (); + if ($IMR_status != 0) { + print STDERR "ERROR: ImplRepo Service returned $IMR_status\n"; + return 1; + } + if ($imr->WaitForFileTimed ($imriorfile, $imr->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$imr_imriorfile>\n"; + $IMR->Kill (); $IMR->TimedWait (1); + return 1; + } - print ">>> " . $IMR->CommandLine () . "\n"; - - ##### Start ImplRepo ##### - $IMR_status = $IMR->Spawn (); - if ($IMR_status != 0) { - print STDERR "ERROR: ImplRepo Service returned $IMR_status\n"; - return 1; - } - if ($imr->WaitForFileTimed ($imriorfile, $imr->ProcessStartWaitInterval()) == -1) { - print STDERR "ERROR: cannot find file <$imr_imriorfile>\n"; - $IMR->Kill (); $IMR->TimedWait (1); - return 1; - } - - if ($imr->GetFile ($imriorfile) == -1) { - print STDERR "ERROR: cannot retrieve file <$imr_imriorfile>\n"; - $IMR->Kill (); $IMR->TimedWait (1); - return 1; - } + if ($imr->GetFile ($imriorfile) == -1) { + print STDERR "ERROR: cannot retrieve file <$imr_imriorfile>\n"; + $IMR->Kill (); $IMR->TimedWait (1); + return 1; + } } if ($act->PutFile ($imriorfile) == -1) { @@ -174,19 +187,26 @@ sub scale_clients_test return 1; } - $ACT->Arguments ("-d 1 -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile"); + $ACT->Arguments ("-d $imr_debug_level -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile"); print ">>> " . $ACT->CommandLine () . "\n"; $ACT_status = $ACT->Spawn (); if ($ACT_status != 0) { - print STDERR "ERROR: ImR Activator returned $ACT_status\n"; - return 1; + print STDERR "ERROR: ImR Activator returned $ACT_status\n"; + return 1; } if ($act->WaitForFileTimed ($actiorfile,$act->ProcessStartWaitInterval()) == -1) { - print STDERR "ERROR: cannot find file <$act_imriorfile>\n"; - $ACT->Kill (); $ACT->TimedWait (1); - $IMR->Kill (); $IMR->TimedWait (1); - return 1; + print STDERR "ERROR: cannot find file <$act_imriorfile>\n"; + $ACT->Kill (); $ACT->TimedWait (1); + $IMR->Kill (); $IMR->TimedWait (1); + return 1; + } + + # In a per client mode each server should get one request, in all other + # modes the server gets a request for each client started + $expected_requests = $clients_count; + if ($activationmode eq "per_client") { + $expected_requests = 1; } ##### Add server to activator ##### @@ -195,18 +215,18 @@ sub scale_clients_test $srv->DeleteFile ($srv_status_file); $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ". - "add $objprefix" . " -c \"". - $srv_server_cmd . " ". - "-ORBUseIMR 1 -d $server_init_delay -n $clients_count ". - "-ORBInitRef ImplRepoService=file://$imr_imriorfile\""); + "add $objprefix" . " -a $activationmode -c \"". + $srv_server_cmd . " ". + "-ORBUseIMR 1 -d $server_init_delay -n $expected_requests ". + "-ORBInitRef ImplRepoService=file://$imr_imriorfile\""); print ">>> " . $TI->CommandLine () . "\n"; $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval()); if ($TI_status != 0) { - print STDERR "ERROR: tao_imr returned $TI_status\n"; - $ACT->Kill (); $ACT->TimedWait (1); - $IMR->Kill (); $IMR->TimedWait (1); - return 1; + print STDERR "ERROR: tao_imr returned $TI_status\n"; + $ACT->Kill (); $ACT->TimedWait (1); + $IMR->Kill (); $IMR->TimedWait (1); + return 1; } # Why is this sleep needed? @@ -214,20 +234,21 @@ sub scale_clients_test ##### Run clients ##### for(my $i = 0; $i < $clients_count; $i++ ) { - # Make sure server has started by looking for its status file - - $CLI[$i]->Arguments ("-ORBInitRef Test=corbaloc::localhost:$port/$objprefix" . - " -d $server_reply_delay". - " -r $rt_timeout_msecs". - " -m $max_rt_tries"); - print ">>> " . $CLI[$i]->CommandLine () . "\n"; - $CLI_status = $CLI[$i]->Spawn (); - if ($CLI_status != 0) { - print STDERR "ERROR: client returned $CLI_status during spawn\n"; - $status = 1; - last; - } - sleep($secs_between_clients); + # Make sure server has started by looking for its status file + + $CLI[$i]->Arguments ("-ORBInitRef Test=corbaloc::localhost:$port/$objprefix" . + " -d $server_reply_delay". + " -x $shutdownserver " . + " -r $rt_timeout_msecs". + " -m $max_rt_tries"); + print ">>> " . $CLI[$i]->CommandLine () . "\n"; + $CLI_status = $CLI[$i]->Spawn (); + if ($CLI_status != 0) { + print STDERR "ERROR: client returned $CLI_status during spawn\n"; + $status = 1; + last; + } + sleep($secs_between_clients); } sleep (server_request_delay); @@ -235,8 +256,7 @@ sub scale_clients_test ##### Stop clients ##### print STDERR "Waiting for clients to stop\n"; for(my $i = 0; $i < $clients_count; $i++ ) { - my $CLI_status = $CLI[$i]->WaitKill ($cli[$i]->ProcessStartWaitInterval() + - $server_init_delay + $server_reply_delay); + my $CLI_status = $CLI[$i]->WaitKill ($cli[$i]->ProcessStartWaitInterval() + $server_init_delay + $server_reply_delay); if ($CLI_status != 0) { print STDERR "ERROR: Client $i returned $CLI_status\n"; return 1; @@ -248,27 +268,29 @@ sub scale_clients_test $srv->DeleteFile ($status_file_name); # Shutting down any server object within the server will shutdown the whole server - $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ". - "shutdown $objprefix"); - print ">>> " . $TI->CommandLine () . "\n"; - $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval()); - if ($TI_status != 0) { - print STDERR "ERROR: tao_imr shutdown returned $TI_status\n"; - $status = 1; + # This can not be done with per client activation mode + if ($activationmode ne "per_client") { + $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile shutdown $objprefix"); + print ">>> " . $TI->CommandLine () . "\n"; + $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval()); + if ($TI_status != 0) { + print STDERR "ERROR: tao_imr shutdown returned $TI_status\n"; + $status = 1; + } } my $ACT_status = $ACT->TerminateWaitKill ($act->ProcessStopWaitInterval()); if ($ACT_status != 0) { - print STDERR "ERROR: IMR Activator returned $ACT_status\n"; - $status = 1; + print STDERR "ERROR: IMR Activator returned $ACT_status\n"; + $status = 1; } if (!$no_imr) { - my $IMR_status = $IMR->TerminateWaitKill ($imr->ProcessStopWaitInterval()); - if ($IMR_status != 0) { - print STDERR "ERROR: IMR returned $IMR_status\n"; - $status = 1; - } + my $IMR_status = $IMR->TerminateWaitKill ($imr->ProcessStopWaitInterval()); + if ($IMR_status != 0) { + print STDERR "ERROR: IMR returned $IMR_status\n"; + $status = 1; + } } my $test_time = time() - $start_time; @@ -280,14 +302,16 @@ sub scale_clients_test sub usage() { print "Usage: run_test.pl ". - "[-clients <num=$clients_count>] ". - "[-secs_between_clients <seconds=$secs_between_clients>] ". - "[-server_init_delay <seconds=$server_init_delay>] ". - "[-server_reply_delay <seconds=$server_reply_delay] ". - "[-rt_timeout <round-trip-timeout-msecs=$rt_timeout_msecs>] ". - "[-max_rt_tries <max-client-requests=$max_rt_tries>] ". - "[-no_imr] ". - "\n"; + "[-clients <num=$clients_count>] ". + "[-secs_between_clients <seconds=$secs_between_clients>] ". + "[-server_init_delay <seconds=$server_init_delay>] ". + "[-server_reply_delay <seconds=$server_reply_delay] ". + "[-rt_timeout <round-trip-timeout-msecs=$rt_timeout_msecs>] ". + "[-max_rt_tries <max-client-requests=$max_rt_tries>] ". + "[-no_imr] ". + "[-imrdebug <level=$imr_debug_level>]" . + "[-activationmode <activationmode=$activationmode]" . + "\n"; } ############################################################################### diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp index 6e14af58b69..5e7e9a53b83 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp @@ -1,4 +1,3 @@ -// server.cpp // This version uses the Implementation Repository. #include "Test_i.h" @@ -58,7 +57,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) break; case '?': ACE_DEBUG ((LM_DEBUG, - "usage: %s " + "Server: usage: %s " "-d <seconds to delay before initializing POA> ", "-n <number of expected requests> \n", argv[0])); @@ -67,11 +66,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, - "Delaying in initialization for %d seconds\n", + "(%P|%t) Server: delaying in initialization for <%d> seconds\n", init_delay_secs)); ACE_OS::sleep (init_delay_secs); ACE_DEBUG ((LM_DEBUG, - "Done with delay\n")); + "(%P|%t) Server: done with delay\n")); CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = PortableServer::POA::_narrow(obj.in()); @@ -84,29 +83,25 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa_name.c_str ()); PortableServer::Servant_var<Test_i> test_servant = - new Test_i(num_requests_expected); + new Test_i(orb.in(), num_requests_expected); PortableServer::ObjectId_var object_id = PortableServer::string_to_ObjectId("test_object"); - // // Activate the servant with the test POA, // obtain its object reference, and get a // stringified IOR. - // test_poa->activate_object_with_id(object_id.in(), test_servant.in()); - // // Create binding between "TestService" and // the test object reference in the IOR Table. // Use a TAO extension to get the non imrified poa // to avoid forwarding requests back to the ImR. - TAO_Root_POA* tpoa = dynamic_cast<TAO_Root_POA*>(test_poa.in()); if (!tpoa) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Could not cast POA to root POA") + ACE_TEXT ("(%P|%t) Server: Could not cast POA to root POA") )); return -1; } @@ -117,7 +112,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) IORTable::Table_var table = IORTable::Table::_narrow(obj.in()); table->bind(poa_name.c_str (), test_ior.in()); - // // This server is now ready to run. // This version does not create an IOR // file as demonstrated in the @@ -125,13 +119,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // users create IORs for the client using // the tao_imr utility. // - // // Stop discarding requests. - // mgr->activate(); ACE_DEBUG ((LM_DEBUG, - "\n Started Server %s \n", + "(%P|%t) Server: started <%C>\n", poa_name.c_str())); { @@ -145,20 +137,23 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->destroy(1,1); orb->destroy(); + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Server: ended <%C>\n", + poa_name.c_str())); } catch(const CORBA::Exception& ex) { ex._tao_print_exception ("Server main()"); return 1; } - bool expected_requests_made = Test_i::expected_requests_made (); + bool const expected_requests_made = Test_i::expected_requests_made (); if (!expected_requests_made) { ACE_ERROR ((LM_ERROR, - "ERROR: Expected number of requests were not made\n")); + "(%P|%t) Server: ERROR: Expected number of requests were not made\n")); } - int status = expected_requests_made ? 0 : -1; + int const status = expected_requests_made ? 0 : -1; return status; } diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp index 7f709cb03cb..1aca6cf2a07 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp @@ -64,6 +64,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) n)); } + orb->destroy (); + return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp index cc8af3b58e1..8390c42fd8c 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp @@ -115,7 +115,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { proxySupplier_obj = ca->obtain_notification_push_supplier(ctype, proxy_id); } - catch(CosNotifyChannelAdmin::AdminLimitExceeded err) + catch(CosNotifyChannelAdmin::AdminLimitExceeded& err) { std::cerr << "CosNotifyChannelAdmin::AdminLimitExceeded Exception!" << std::endl; throw; @@ -164,7 +164,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { pps->connect_structured_push_consumer(spc.in()); } - catch (CosEventChannelAdmin::AlreadyConnected ac) + catch (CosEventChannelAdmin::AlreadyConnected& ac) { std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl; throw; diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp index 953f44ea5f2..6f110389e8b 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp @@ -96,7 +96,7 @@ void match_structure_test (const CosNotifyFilter::Filter_var& filter, try{ bResult = filter->match_structured(event); } - catch(CosNotifyFilter::UnsupportedFilterableData) + catch(CosNotifyFilter::UnsupportedFilterableData&) { std::cerr << "UnsupportedFilterableData!" << std::endl; } diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp index 821e496afbd..a97114e1d40 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp @@ -57,7 +57,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { proxyCon_obj = sa->obtain_notification_push_consumer(ctype, proxy_id); } - catch(CosNotifyChannelAdmin::AdminLimitExceeded err) + catch(CosNotifyChannelAdmin::AdminLimitExceeded& err) { std::cerr << "CosNotifyChannelAdmin::AdminLimitExceeded Exception!" << std::endl; throw; @@ -71,7 +71,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ppc->connect_structured_push_supplier(sps.in()); } - catch (CosEventChannelAdmin::AlreadyConnected ac) + catch (CosEventChannelAdmin::AlreadyConnected& ac) { std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl; throw; diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp index 3c46b033d58..126007ce526 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp @@ -114,7 +114,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { proxySupplier_obj = ca->obtain_notification_push_supplier(ctype, proxy_id); } - catch(CosNotifyChannelAdmin::AdminLimitExceeded err) + catch(CosNotifyChannelAdmin::AdminLimitExceeded& err) { std::cerr << "CosNotifyChannelAdmin::AdminLimitExceeded Exception!" << std::endl; throw; @@ -163,7 +163,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { pps->connect_structured_push_consumer(spc.in()); } - catch (CosEventChannelAdmin::AlreadyConnected ac) + catch (CosEventChannelAdmin::AlreadyConnected& ac) { std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl; throw; diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp index 50088af13f4..9aa4bca5e30 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp @@ -59,7 +59,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { proxyCon_obj = sa->obtain_notification_push_consumer(ctype, proxy_id); } - catch(CosNotifyChannelAdmin::AdminLimitExceeded err) + catch(CosNotifyChannelAdmin::AdminLimitExceeded& err) { std::cerr << "CosNotifyChannelAdmin::AdminLimitExceeded Exception!" << std::endl; throw; @@ -73,7 +73,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ppc->connect_structured_push_supplier(sps.in()); } - catch (CosEventChannelAdmin::AlreadyConnected ac) + catch (CosEventChannelAdmin::AlreadyConnected& ac) { std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl; throw; diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client1.conf b/TAO/orbsvcs/tests/Security/BiDirectional/client1.conf new file mode 100644 index 00000000000..934b2b1298e --- /dev/null +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client1.conf @@ -0,0 +1,11 @@ + +dynamic SSLIOP_Factory Service_Object * + TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() + "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/client-key.pem' -SSLCertificate 'PEM:ssl/client-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem' -SSLCipherList 'ECDH+aRSA+HIGH'" + +dynamic Advanced_Resource_Factory Service_Object* + TAO_Strategies:_make_TAO_Advanced_Resource_Factory () + "-ORBProtocolFactory SSLIOP_Factory" + +static Client_Strategy_Factory "-ORBConnectStrategy blocked" + diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl b/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl index dbad4c1aa5a..a0ce7f7ffd1 100755 --- a/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl +++ b/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl @@ -21,6 +21,7 @@ sub options () { my $help = 0; # handled locally my $man = 0; # handled locally my $ssl = 1; # handled locally + my $ecdh = 0; # handled locally my $dotdec = 0; # handled locally my $debug; # handled locally my $shost; # handled locally @@ -34,6 +35,7 @@ sub options () { 'manual' => \$man, 'iter=i' => \$iter, 'ssl' => \$ssl, + 'ecdh' => \$ecdh, 'dd=s' => \$dotdec, 'shost=s' => \$shost, 'chost=s' => \$chost, @@ -43,8 +45,14 @@ sub options () { } if ($ssl) { + if ($ecdh) { + $conf_client = " -ORBSvcConf client1$svc_conf"; + $conf_server = " -ORBSvcConf server1$svc_conf"; + } + else { $conf_client = " -ORBSvcConf client$svc_conf"; $conf_server = " -ORBSvcConf server$svc_conf"; + } } if ($debug) { diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server1.conf b/TAO/orbsvcs/tests/Security/BiDirectional/server1.conf new file mode 100644 index 00000000000..d10f43ed4aa --- /dev/null +++ b/TAO/orbsvcs/tests/Security/BiDirectional/server1.conf @@ -0,0 +1,11 @@ + +dynamic SSLIOP_Factory Service_Object * + TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() + "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/server-key.pem' -SSLCertificate 'PEM:ssl/server-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem' -SSLCipherList 'ECDH+aRSA+HIGH' -SSLEcName 'prime256v1'" + +dynamic Advanced_Resource_Factory Service_Object* + TAO_Strategies:_make_TAO_Advanced_Resource_Factory () + "-ORBProtocolFactory SSLIOP_Factory" + +static Client_Strategy_Factory "-ORBConnectStrategy blocked" + diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp index 43dd91c23b8..2aea77e7ca2 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp @@ -1,9 +1,6 @@ - #include "Client_Task.h" #include "MessengerC.h" - - Client_Task::Client_Task ( CORBA::ORB_ptr corb, Messenger_ptr messenger, @@ -23,7 +20,7 @@ Client_Task::svc (void) // call message messenger_->call_message("user"); } - catch(const CORBA::NO_PERMISSION ex) + catch(const CORBA::NO_PERMISSION& ex) { result_ = 1; ex._tao_print_exception ("ERROR: Caught CORBA::NO_PERMISSION exception"); diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h index 7faa37e6a74..f1b2d8da72f 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h @@ -1,4 +1,3 @@ - #ifndef COLLOCATED_TEST_CLIENT_TASK_H #define COLLOCATED_TEST_CLIENT_TASK_H #include /**/ "ace/pre.h" @@ -15,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (CORBA::ORB_ptr corb, Messenger_ptr messenger, diff --git a/TAO/orbsvcs/tests/Security/cert/DOCCA/index.txt.attr.old b/TAO/orbsvcs/tests/Security/cert/DOCCA/index.txt.attr.old deleted file mode 100644 index 8f7e63a3475..00000000000 --- a/TAO/orbsvcs/tests/Security/cert/DOCCA/index.txt.attr.old +++ /dev/null @@ -1 +0,0 @@ -unique_subject = yes diff --git a/TAO/orbsvcs/tests/Security/cert/DOCCA/index.txt.old b/TAO/orbsvcs/tests/Security/cert/DOCCA/index.txt.old deleted file mode 100644 index a4a1b736524..00000000000 --- a/TAO/orbsvcs/tests/Security/cert/DOCCA/index.txt.old +++ /dev/null @@ -1 +0,0 @@ -V 320525140115Z 1000 unknown /C=US/ST=Tennessee/O=DOC Group/CN=DOC Group Build Czar Server diff --git a/TAO/orbsvcs/tests/Security/cert/DOCCA/serial.old b/TAO/orbsvcs/tests/Security/cert/DOCCA/serial.old deleted file mode 100644 index dd11724042e..00000000000 --- a/TAO/orbsvcs/tests/Security/cert/DOCCA/serial.old +++ /dev/null @@ -1 +0,0 @@ -1001 diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 8c7c723a562..678233f3951 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -22,8 +22,7 @@ template<typename T_slice, typename T_forany> TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T ( _tao_destructor destructor, CORBA::TypeCode_ptr tc, - T_slice * const val - ) + T_slice * const val) : Any_Impl (destructor, tc), value_ (val) @@ -94,9 +93,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, T_forany::tao_alloc ()), false); - auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety ( - replacement - ); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (replacement); +#else + auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (replacement); +#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index 1aedfbc1951..25e3c395d76 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -116,7 +116,11 @@ namespace TAO TAO::Any_Basic_Impl *replacement = TAO::Any_Basic_Impl::create_empty (any_tc); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement); +#else auto_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement); +#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index 0a38d944318..a45b3b2481b 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -78,7 +78,11 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, TAO::Any_Basic_Impl_T<T> * const replacement = TAO::Any_Basic_Impl_T<T>::create_empty (any_tc); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement); +#else auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement); +#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index eb3b9fdfc4b..42cc10a0066 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -158,7 +158,11 @@ TAO::Any_Dual_Impl_T<T>::replace (TAO_InputCDR &cdr, ACE_NEW_RETURN (empty_value, T, false); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<T> empty_value_safety (empty_value); +#else auto_ptr<T> empty_value_safety (empty_value); +#endif /* ACE_HAS_CPP11 */ TAO::Any_Dual_Impl_T<T> *replacement = 0; ACE_NEW_RETURN (replacement, TAO::Any_Dual_Impl_T<T> (destructor, @@ -166,7 +170,11 @@ TAO::Any_Dual_Impl_T<T>::replace (TAO_InputCDR &cdr, empty_value), false); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement); +#else auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement); +#endif /* ACE_HAS_CPP11 */ CORBA::Boolean const good_decode = replacement->demarshal_value (cdr); diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp index 4655db276f9..3633d68739f 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -110,7 +110,7 @@ TAO::Any_Impl::_add_ref (void) void TAO::Any_Impl::_remove_ref (void) { - const CORBA::ULong new_count = --this->refcount_; + CORBA::ULong const new_count = --this->refcount_; if (new_count != 0) return; diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 57e304288e1..2446ec37368 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -23,14 +23,14 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Basic_Types.h" -#include "ace/Synch_Traits.h" -#include "ace/Null_Mutex.h" -#include "ace/Thread_Mutex.h" -#include "ace/Atomic_Op.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Message_Block; -ACE_END_VERSIONED_NAMESPACE_DECL +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Synch_Traits.h" +# include "ace/Null_Mutex.h" +# include "ace/Thread_Mutex.h" +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -104,7 +104,11 @@ namespace TAO private: /// Reference counter. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ }; } diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index c1872c61e3f..f389796bff3 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -91,7 +91,11 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, 0), false); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement); +#else auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement); +#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index e0055e0cb2f..a5cdeb3239d 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -129,8 +129,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, bound), false); - auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety ( - replacement); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (replacement); +#else + auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (replacement); +#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index 1e553d02c08..2e06f71b942 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -116,7 +116,11 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, empty_value), false); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO::Any_SystemException > replacement_safety (replacement); +#else auto_ptr<TAO::Any_SystemException > replacement_safety (replacement); +#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index fba13992a3b..fde869f8cd3 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -435,7 +435,11 @@ CORBA::NVList::evaluate (void) if (this->incoming_ != 0) { +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_InputCDR> incoming (this->incoming_); +#else auto_ptr<TAO_InputCDR> incoming (this->incoming_); +#endif /* ACE_HAS_CPP11 */ this->incoming_ = 0; this->_tao_decode (*(incoming.get ()), this->incoming_flag_); diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index 24aa3a9498d..e68f65402bf 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -26,8 +26,11 @@ #include "ace/Unbounded_Queue.h" #include "ace/Thread_Mutex.h" -#include "ace/Atomic_Op.h" - +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -120,7 +123,11 @@ namespace CORBA private: /// Reference counter. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ /// holds the value Any any_; @@ -263,7 +270,11 @@ namespace CORBA ULong max_; /// Reference counter. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ /// Protects the incoming pointer. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h index a4c96d3d7d7..0f5a0875873 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -25,7 +25,11 @@ #include "tao/orbconf.h" #include "ace/Thread_Mutex.h" -#include "ace/Atomic_Op.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -101,7 +105,11 @@ namespace TAO private: /// Reference counter. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ }; } // End namespace TAO diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h index 7e4e2e4ba45..d5765aa4618 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h @@ -38,7 +38,6 @@ class TAO_BiDirPolicy_Validator; class TAO_BIDIRGIOP_Export TAO_BiDirGIOP_Loader : public TAO_BiDir_Adapter { public: - /// Constructor TAO_BiDirGIOP_Loader (void); @@ -55,7 +54,6 @@ public: static int Initializer (void); private: - /// Flag to indicate whether the BiDirGIOP library has been /// activated. bool initialized_; diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h index 1f5a048dbaa..0fce1e5f866 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h @@ -36,13 +36,11 @@ class TAO_BiDir_ORBInitializer , public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register BiDir policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h index e2aa9dc18b7..de613cd3cff 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h @@ -37,10 +37,8 @@ class TAO_BiDir_PolicyFactory , public ::CORBA::LocalObject { public: - virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index 280a86bf26e..718ae38a5f5 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -42,7 +42,6 @@ class TAO_BidirectionalPolicy , public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO_BidirectionalPolicy (const BiDirPolicy::BidirectionalPolicyValue val); @@ -64,10 +63,8 @@ public: virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; private: - /// The attribute BiDirPolicy::BidirectionalPolicyValue value_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 65d120186f0..3360714ffe4 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -442,25 +442,6 @@ public: /// Called after demarshalling. void reset_vt_indirect_maps (); - /// Helper classes for extracting bounded strings into std::string/wstring. - struct TAO_Export to_std_string - { - to_std_string (std::string &s, - ACE_CDR::ULong b); - std::string &val_; - ACE_CDR::ULong bound_; - }; - -#if !defined(ACE_LACKS_STD_WSTRING) - struct TAO_Export to_std_wstring - { - to_std_wstring (std::wstring &ws, - ACE_CDR::ULong b); - std::wstring &val_; - ACE_CDR::ULong bound_; - }; -#endif /* ACE_LACKS_STD_WSTRING */ - private: /// The ORB_Core, required to extract object references. TAO_ORB_Core* orb_core_; @@ -509,9 +490,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, ACE_OutputCDR::from_wstring x); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, const std::string &x); +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, + ACE_OutputCDR::from_std_string x); #if !defined(ACE_LACKS_STD_WSTRING) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, const std::wstring &x); +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, + ACE_OutputCDR::from_std_wstring x); #endif /* ACE_LACKS_STD_WSTRING */ // CDR input operators for CORBA types @@ -545,12 +530,12 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os, TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os, std::string &x); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os, - TAO_InputCDR::to_std_string x); + ACE_InputCDR::to_std_string x); #if !defined(ACE_LACKS_STD_WSTRING) TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os, std::wstring &x); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os, - TAO_InputCDR::to_std_wstring x); + ACE_InputCDR::to_std_wstring x); #endif /* ACE_LACKS_STD_WSTRING */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl index fcf3d9d5b13..c4fb156fcc5 100644 --- a/TAO/tao/CDR.inl +++ b/TAO/tao/CDR.inl @@ -326,24 +326,6 @@ TAO_InputCDR::reset_vt_indirect_maps () } } -ACE_INLINE -TAO_InputCDR::to_std_string::to_std_string (std::string &s, - ACE_CDR::ULong b) - : val_ (s), - bound_ (b) -{ -} - -#if !defined(ACE_LACKS_STD_WSTRING) -ACE_INLINE -TAO_InputCDR::to_std_wstring::to_std_wstring (std::wstring &s, - ACE_CDR::ULong b) - : val_ (s), - bound_ (b) -{ -} -#endif /* ACE_LACKS_STD_WSTRING */ - // **************************************************************** ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, @@ -472,14 +454,52 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, const std::string &x) { +#if defined (ACE_HAS_CPP11) + return + os.fragment_stream (ACE_CDR::OCTET_ALIGN, + sizeof (char)) + && static_cast<ACE_OutputCDR &> (os) << x; +#else return os << x.c_str (); +#endif +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, + ACE_OutputCDR::from_std_string x) +{ + if (x.bound_ != 0 && + static_cast<ACE_CDR::ULong> (x.val_.size ()) > x.bound_) + { + throw CORBA::BAD_PARAM (); + } + return os << x.val_; } #if !defined(ACE_LACKS_STD_WSTRING) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, const std::wstring &x) { +#if defined (ACE_HAS_CPP11) + return + os.fragment_stream ((sizeof (CORBA::WChar) == 2 + ? ACE_CDR::SHORT_ALIGN + : ACE_CDR::LONG_ALIGN), + sizeof (CORBA::WChar)) + && static_cast<ACE_OutputCDR &> (os) << x; +#else return os << x.c_str (); +#endif +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, + ACE_OutputCDR::from_std_wstring x) +{ + if (x.bound_ != 0 && + static_cast<ACE_CDR::ULong> (x.val_.size ()) > x.bound_) + { + throw CORBA::BAD_PARAM (); + } + return os << x.val_; } #endif /* ACE_LACKS_STD_WSTRING */ @@ -580,15 +600,11 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, std::string &x) { - char *buf = 0; - CORBA::Boolean const marshal_flag = is >> buf; - x.assign (buf); - ACE::strdelete (buf); - return marshal_flag; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, - TAO_InputCDR::to_std_string x) + ACE_InputCDR::to_std_string x) { CORBA::Boolean const marshal_flag = is >> x.val_; if (marshal_flag && x.bound_ != 0 && x.val_.size () > x.bound_) @@ -602,15 +618,11 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, std::wstring &x) { - CORBA::WChar *buf = 0; - CORBA::Boolean const marshal_flag = is >> buf; - x.assign (buf); - ACE::strdelete (buf); - return marshal_flag; + return static_cast<ACE_InputCDR &> (is) >> x; } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, - TAO_InputCDR::to_std_wstring x) + ACE_InputCDR::to_std_wstring x) { CORBA::Boolean const marshal_flag = is >> x.val_; if (marshal_flag && x.bound_ != 0 && x.val_.size () > x.bound_) diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index e770412fb67..fd98b445944 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -136,7 +136,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) size_t len = 0; size_t ndx = endpoints.size(); endpoints.size(ndx+1); - int uiop_compatible = 0; + bool uiop_compatible = false; TAO_ConnectorSetIterator conn_iter = 0; for (conn_iter = conn_reg->begin(); conn_iter != conn_reg->end() && @@ -148,8 +148,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) if (endpoints[ndx].profile_) { - endpoints[ndx].obj_key_sep_ = - (*conn_iter)->object_key_delimiter(); + endpoints[ndx].obj_key_sep_ = (*conn_iter)->object_key_delimiter(); uiop_compatible = (endpoints[ndx].obj_key_sep_ == '|'); this->make_canonical (ior,len,endpoints[ndx].prot_addr_); ior += len; @@ -192,7 +191,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) if (TAO_debug_level) TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - TAO_CORBALOC_Parser::parse_string ") - ACE_TEXT("could not parse from %C\n"), + ACE_TEXT("could not parse from <%C>\n"), ior)); throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO); } // end of while @@ -211,7 +210,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) obj_key; const char * str = full_ep.c_str(); endpoints[i].profile_->parse_string (str); - int share = orb->orb_core()->orb_params()->shared_profile(); + int const share = orb->orb_core()->orb_params()->shared_profile(); if (mprofile.give_profile(endpoints[i].profile_, share) != -1) endpoints[i].profile_ = 0; else diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp index a3ac4538d23..d81d2c728bb 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp @@ -13,7 +13,6 @@ #include "tao/ORB_Constants.h" #include "tao/Codeset_Translator_Base.h" -#include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" #include "ace/CORBA_macros.h" diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h index 8dd034110c4..74a9c76c8aa 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h @@ -46,7 +46,6 @@ class TAO_CDR_Encaps_Codec public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO_CDR_Encaps_Codec (CORBA::Octet major, CORBA::Octet minor, @@ -72,7 +71,6 @@ public: CORBA::TypeCode_ptr tc); protected: - /// Destructor. /** * Only allow this class to be instantiated on the heap since it is @@ -90,14 +88,12 @@ protected: void check_type_for_encoding (const CORBA::Any & data); private: - /// Prevent copying through the copy constructor and the assignment /// operator. TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &); void operator= (const TAO_CDR_Encaps_Codec &); private: - /// The major GIOP version associated with this Codec. CORBA::Octet const major_; diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h index d929dac8989..971c637d876 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.h +++ b/TAO/tao/CodecFactory/CodecFactory_impl.h @@ -45,7 +45,6 @@ class TAO_CodecFactory public virtual ::CORBA::LocalObject { public: - /// Constructor TAO_CodecFactory (TAO_ORB_Core * orb_core); @@ -67,7 +66,6 @@ private: TAO_Codeset_Translator_Base * char_trans, TAO_Codeset_Translator_Base * wchar_trans); private: - /// Pointer to the ORB Core. /** * Some Codec implementations may need access to the ORB Core with diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index ad66904c07a..0d0169cdd11 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -165,6 +165,74 @@ TAO_UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr, return 0; } +#if !defined(ACE_LACKS_STD_WSTRING) +ACE_CDR::Boolean +TAO_UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr, + std::wstring &x) +{ +#if defined (ACE_HAS_CPP11) + ACE_CDR::ULong len; + if (!this->read_4 (cdr, &len)) + return false; + + // A check for the length being too great is done later in the + // call to read_char_array but we want to have it done before + // the memory is allocated. + if (len > 0 && len <= cdr.length ()) + { + if (static_cast<ACE_CDR::Short> (this->major_version (cdr)) == 1 + && static_cast<ACE_CDR::Short> (this->minor_version (cdr)) > 1) + { + len /= ACE_UTF16_CODEPOINT_SIZE; + + try + { + x.resize (len); + } + catch (const std::bad_alloc&) + { + return false; + } + + if (this->read_wchar_array_i (cdr, &x[0], len, 1)) + { + // Since reading the array may have adjusted the length, + // shrink to fit + x.resize (len); + return true; + } + } + else + { + try + { + x.resize (len); + } + catch (const std::bad_alloc&) + { + return false; + } + + if (this->read_wchar_array (cdr, &x[0], len)) + { + x.resize (len-1); // drop terminating zero wchar read from stream + return true; + } + } + } + else if (len == 0) + { + x.clear (); + return true; + } + x.clear (); + return false; +#else + return this->ACE_WChar_Codeset_Translator::read_wstring (cdr, x); +#endif +} +#endif + ACE_CDR::Boolean TAO_UTF16_BOM_Translator::read_wchar_array_i (ACE_InputCDR & cdr, ACE_CDR::WChar *x, diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.h b/TAO/tao/Codeset/UTF16_BOM_Translator.h index 20d9ac2ad1e..19c3b8eb159 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.h +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.h @@ -52,6 +52,10 @@ public: ACE_CDR::WChar &); virtual ACE_CDR::Boolean read_wstring (ACE_InputCDR &, ACE_CDR::WChar *&); +#if !defined(ACE_LACKS_STD_WSTRING) + virtual ACE_CDR::Boolean read_wstring (ACE_InputCDR&, + std::wstring &); +#endif virtual ACE_CDR::Boolean read_wchar_array (ACE_InputCDR &, ACE_CDR::WChar *, ACE_CDR::ULong); diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp index 5dfb557ff0b..6da6df8f67a 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp @@ -118,6 +118,55 @@ TAO_UTF8_Latin1_Translator::read_string (ACE_InputCDR &cdr, } ACE_CDR::Boolean +TAO_UTF8_Latin1_Translator::read_string (ACE_InputCDR &cdr, + std::string &x) +{ +#if defined (ACE_HAS_CPP11) + ACE_CDR::ULong len; + if (!cdr.read_ulong (len)) + return false; + + // A check for the length being too great is done later in the + // call to read_char_array but we want to have it done before + // the memory is allocated. + if (len > 0 && len <= cdr.length()) + { + // detract terminating '\0' from length + len--; + try + { + x.resize (len); + } + catch (const std::bad_alloc&) + { + return false; + } + + // pos keeps track of the character position, it will never be + // greater than len + size_t pos = 0; + ACE_CDR::ULong incr = 1; + for (ACE_CDR::ULong i = 0; incr > 0 && i < len; i += incr) + { + incr = this->read_char_i(cdr,x[pos++]); + } + if (incr > 0) + { + // read terminating '\0' from stream + ACE_CDR::Char c; + incr = this->read_char_i(cdr, c); + return (incr > 0); + } + } + + x.clear (); + return false; +#else + return this->ACE_Char_Codeset_Translator::read_string (cdr, x); +#endif +} + +ACE_CDR::Boolean TAO_UTF8_Latin1_Translator::read_char_array (ACE_InputCDR & cdr, ACE_CDR::Char *x, ACE_CDR::ULong length) diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.h b/TAO/tao/Codeset/UTF8_Latin1_Translator.h index 2fac7ed1f80..6bccd0bee8c 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.h @@ -56,6 +56,8 @@ public: ACE_CDR::Char &); virtual ACE_CDR::Boolean read_string (ACE_InputCDR &, ACE_CDR::Char *&); + virtual ACE_CDR::Boolean read_string (ACE_InputCDR &, + std::string &); virtual ACE_CDR::Boolean read_char_array (ACE_InputCDR &, ACE_CDR::Char *, ACE_CDR::ULong); diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 0f828f613b1..99c57a9add1 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -64,8 +64,11 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) factory != end; ++factory) { - auto_ptr <TAO_Connector> connector ( - (*factory)->factory ()->make_connector ()); +#if defined (ACE_HAS_CPP11) + std::unique_ptr <TAO_Connector> connector ((*factory)->factory ()->make_connector ()); +#else + auto_ptr <TAO_Connector> connector ((*factory)->factory ()->make_connector ()); +#endif /* ACE_HAS_CPP11 */ if (connector.get ()) { @@ -79,8 +82,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) -1); } - this->connectors_[this->size_++] = - connector.release (); + this->connectors_[this->size_++] = connector.release (); } else return -1; @@ -165,8 +167,13 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) CORBA::ULong tag = 0; // If there is an error we abort. - if ((cdr >> tag) == 0) + if (!(cdr >> tag)) + { + TAOLIB_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") + ACE_TEXT ("create_profile: Unable to extract tag from CDR stream\n"))); return 0; + } TAO_Connector *connector = this->get_connector (tag); @@ -195,7 +202,6 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) } } - TAO_Profile *pfile = 0; ACE_NEW_RETURN (pfile, TAO_Unknown_Profile (tag, @@ -203,6 +209,9 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) 0); if (pfile->decode (cdr) == -1) { + TAOLIB_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") + ACE_TEXT ("create_profile: Unable to decode unknown profile from CDR stream\n"))); pfile->_decr_refcnt (); pfile = 0; } @@ -217,18 +226,36 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) // ProfileData is encoded as a sequence of octet. So first get the // length of the sequence. CORBA::ULong encap_len = 0; - if ((cdr >> encap_len) == 0) + if (!(cdr >> encap_len)) + { + TAOLIB_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") + ACE_TEXT ("create_profile: Unable to extract encapsulated length from CDR stream\n"))); return 0; + } // Create the decoding stream from the encapsulation in the buffer, // and skip the encapsulation. TAO_InputCDR str (cdr, encap_len); - if (str.good_bit () == 0 - || cdr.skip_bytes (encap_len) == 0) + if (!str.good_bit () || !cdr.skip_bytes (encap_len)) + { + TAOLIB_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") + ACE_TEXT ("create_profile: Unable to skip encapsulated stream from CDR stream\n"))); return 0; + } + + TAO_Profile* profile = connector->create_profile (str); + + if (!profile) + { + TAOLIB_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") + ACE_TEXT ("create_profile: Connector returned null profile for tag 0x%x\n"), tag)); + } - return connector->create_profile (str); + return profile; } char diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc index 5ab00b1a288..bf86d4fba0b 100644 --- a/TAO/tao/DynamicAny/DynamicAny.mpc +++ b/TAO/tao/DynamicAny/DynamicAny.mpc @@ -9,6 +9,8 @@ project(*idl) : tao_versioning_idl_defaults, valuetype, install { -iC tao/DynamicAny DynamicAny.pidl } + PIDL_Files { + } specific { install_dir = tao/DynamicAny diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index 830f379f67c..2b421eb3c91 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -267,8 +267,8 @@ TAO_AMH_DSI_Exception_Holder::_tao_unmarshal ( TAO_AMH_DSI_Exception_Holder *&new_object) { ::CORBA::ValueBase *base = 0; - ::CORBA::Boolean is_indirected = 0; - ::CORBA::Boolean is_null_object = 0; + ::CORBA::Boolean is_indirected = false; + ::CORBA::Boolean is_null_object = false; ::CORBA::Boolean const retval = ::CORBA::ValueBase::_tao_unmarshal_pre ( strm, @@ -281,14 +281,13 @@ TAO_AMH_DSI_Exception_Holder::_tao_unmarshal ( ::CORBA::ValueBase_var owner (base); if (!retval) - return 0; + return false; if (is_null_object) - return 1; + return true; if (!is_indirected && base != 0 && ! base->_tao_unmarshal_v (strm)) - return 0; - + return false; // Now base must be null or point to the unmarshaled object. // Align the pointer to the right subobject. @@ -297,13 +296,17 @@ TAO_AMH_DSI_Exception_Holder::_tao_unmarshal ( new_object->_add_ref (); owner._retn (); - return 1; + return true; } void TAO_AMH_DSI_Exception_Holder::raise_invoke () { +#if defined (ACE_HAS_CPP11) + std::unique_ptr< ::CORBA::Exception> safety (this->exception_); +#else auto_ptr< ::CORBA::Exception> safety (this->exception_); +#endif /* ACE_HAS_CPP11 */ this->exception_->_raise (); } diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 01cb4234dbb..92f4a4a6161 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -84,7 +84,7 @@ CORBA::Context::get_values (const char * /* start_scope */, } CORBA::ContextList::ContextList (CORBA::ULong len, char* *ctx_list) - : ref_count_ (1) + : refcount_ (1) { for (CORBA::ULong i=0; i < len; i++) { @@ -143,14 +143,14 @@ CORBA::ContextList::remove (CORBA::ULong) CORBA::ContextList_ptr CORBA::ContextList::_duplicate (void) { - ++this->ref_count_; + ++this->refcount_; return this; } void CORBA::ContextList::_destroy (void) { - CORBA::ULong const current = --this->ref_count_; + CORBA::ULong const current = --this->refcount_; if (current == 0) { @@ -161,15 +161,15 @@ CORBA::ContextList::_destroy (void) void CORBA::ContextList::_incr_refcount (void) { - ++this->ref_count_; + ++this->refcount_; } void CORBA::ContextList::_decr_refcount (void) { - --this->ref_count_; + --this->refcount_; - if (this->ref_count_ != 0) + if (this->refcount_ != 0) { delete this; } diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index a20b50554c4..30c269457a0 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -31,8 +31,11 @@ #include "tao/default_environment.h" #include "ace/Unbounded_Queue.h" -#include "ace/Atomic_Op.h" -#include "ace/Synch_Traits.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -111,7 +114,11 @@ namespace CORBA private: /// Reference counter. - ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_; +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else + ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ }; /** @@ -176,7 +183,11 @@ namespace CORBA ContextList &operator= (const ContextList &); /// Reference counter. - ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> ref_count_; +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else + ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ /// Internal list of typecodes. ACE_Unbounded_Queue<char *> ctx_list_; diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h index 37a16bc2733..705e783fea1 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.h +++ b/TAO/tao/DynamicInterface/DII_Invocation.h @@ -56,7 +56,6 @@ namespace TAO #endif /*TAO_HAS_INTERCEPTORS == 1*/ protected: - virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr); private: diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index 4de7ddaa17a..eb49f2d14d6 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -49,7 +49,7 @@ namespace TAO } void - DII_Invocation_Adapter::invoke (TAO::Exception_Data * /*ex_data*/, + DII_Invocation_Adapter::invoke (const TAO::Exception_Data * /*ex_data*/, unsigned long ex_count) { // Convert DII exception list to a form the invocation can use @@ -174,7 +174,7 @@ namespace TAO void DII_Deferred_Invocation_Adapter::invoke ( - TAO::Exception_Data *ex, + const TAO::Exception_Data *ex, unsigned long ex_count) { // New reply dispatcher on the heap, because we will go out of diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h index a1677cdc5b3..94edab69fb4 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h @@ -93,7 +93,7 @@ namespace TAO virtual ~DII_Invocation_Adapter (void); /// Invoke the target - virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count); + virtual void invoke (const TAO::Exception_Data *ex, unsigned long ex_count); protected: @@ -147,7 +147,7 @@ namespace TAO TAO::Invocation_Mode mode = TAO_DII_DEFERRED_INVOCATION); /// Invoke the target - virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count); + virtual void invoke (const TAO::Exception_Data *ex, unsigned long ex_count); protected: virtual Invocation_Status invoke_twoway ( diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.h b/TAO/tao/DynamicInterface/DII_Reply_Handler.h index 866b9d67c8f..eeb88e369dd 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Handler.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.h @@ -103,7 +103,6 @@ public: ACE_UNIMPLEMENTED_FUNC (TAO_DII_Reply_Handler (const TAO_DII_Reply_Handler &)) ACE_UNIMPLEMENTED_FUNC (TAO_DII_Reply_Handler &operator = (const TAO_DII_Reply_Handler &)) #endif - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 5fb4d67b4a0..40a06e0ded3 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ExceptionList::ExceptionList (CORBA::ULong len, CORBA::TypeCode_ptr *tc_list) - : ref_count_ (1) + : refcount_ (1) { for (CORBA::ULong i = 0; i < len; ++i) { @@ -82,13 +82,13 @@ CORBA::ExceptionList::_destroy (void) void CORBA::ExceptionList::_incr_refcount (void) { - ++this->ref_count_; + ++this->refcount_; } void CORBA::ExceptionList::_decr_refcount (void) { - CORBA::ULong const refcount = --this->ref_count_; + CORBA::ULong const refcount = --this->refcount_; if (refcount == 0) { diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index ab040f80b7d..cf4008f0f6c 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -30,8 +30,11 @@ #include "tao/Pseudo_VarOut_T.h" #include "ace/Unbounded_Queue.h" -#include "ace/Atomic_Op.h" -#include "ace/Synch_Traits.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -105,7 +108,11 @@ namespace CORBA ExceptionList &operator= (const ExceptionList &); /// Reference counter. - ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> ref_count_; +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else + ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_; +#endif /* ACE_HAS_CPP11 */ /// Internal list of typecodes. ACE_Unbounded_Queue<CORBA::TypeCode_ptr> tc_list_; diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl index 21c37cc3898..4178f77d903 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.inl +++ b/TAO/tao/DynamicInterface/ExceptionList.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ExceptionList::ExceptionList (void) - : ref_count_ (1) + : refcount_ (1) { } diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 997309f279a..0560d577255 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -40,7 +40,11 @@ #endif /* TAO_HAS_AMI */ #include "ace/SString.h" -#include "ace/Atomic_Op.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -246,7 +250,11 @@ namespace CORBA CORBA::Context_ptr ctx_; /// Reference counting. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ /// Protect the response_received_. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 532e8498e3a..555e1c4f8f7 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -29,7 +29,11 @@ #include "tao/TAO_Server_Request.h" #include "tao/CDR.h" -#include "ace/Atomic_Op.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -146,7 +150,11 @@ namespace CORBA CORBA::Any_ptr exception_; /// Reference counting. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ /// Request from the ORB. TAO_ServerRequest &orb_server_request_; diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index 78c4ef2b411..a51873958c1 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -519,7 +519,11 @@ CORBA::ULong TAO_DTP_Thread_Pool_Manager::create_threadpool_helper (TAO_DTP_Thread_Pool *thread_pool) { // Make sure of safe deletion in case of errors. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_DTP_Thread_Pool> safe_thread_pool (thread_pool); +#else auto_ptr<TAO_DTP_Thread_Pool> safe_thread_pool (thread_pool); +#endif /* ACE_HAS_CPP11 */ // Open the pool. thread_pool->open (); diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h index 050214b9865..b9474320f07 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h @@ -41,7 +41,6 @@ class TAO_EndpointPolicy_Export TAO_EndpointPolicy_Factory public virtual ::CORBA::LocalObject { public: - TAO_EndpointPolicy_Factory (TAO_ORB_Core * orb_core); virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h index 8e7e423132f..6767efd439c 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h @@ -38,7 +38,6 @@ class TAO_EndpointPolicy_ORBInitializer public virtual ::CORBA::LocalObject { public: - /** * @name PortableInterceptor::ORBInitializer Methods * @@ -52,7 +51,6 @@ public: //@} private: - /// Register Endpoint policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h index 8fbd6c3c0cb..2d28585fe82 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h @@ -52,7 +52,7 @@ public: virtual ~TAO_EndpointPolicy_i (); - /// Returns a copy of <this>. + /// Returns a copy of this> virtual TAO_EndpointPolicy_i *clone (void) const; // = The EndpointPolicy::Policy methods diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h index c2a786ea503..119ba18f526 100644 --- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h +++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h @@ -58,7 +58,6 @@ class TAO_EndpointPolicy_Export IIOPEndpointValue_i : public virtual ::CORBA::LocalObject { public: - /// Default Constructor. It is acceptable to create an empty value /// and modify the state via the attributes. IIOPEndpointValue_i (); diff --git a/TAO/tao/FlResource/FlResource.mpc b/TAO/tao/FlResource/FlResource.mpc index e9a6860c0c1..5eec5a5be08 100644 --- a/TAO/tao/FlResource/FlResource.mpc +++ b/TAO/tao/FlResource/FlResource.mpc @@ -1,4 +1,4 @@ -// -*- MPC -*- now wouldn't this be cool... +// -*- MPC -*- project(TAO_FlResource) : acelib, taolib, install, tao_output, taodefaults, ace_flreactor, taoidldefaults { sharedname = TAO_FlResource dynamicflags += TAO_FLRESOURCE_BUILD_DLL diff --git a/TAO/tao/FoxResource/FoxResource.mpc b/TAO/tao/FoxResource/FoxResource.mpc index 7f1178b642f..2c3b92fd37b 100644 --- a/TAO/tao/FoxResource/FoxResource.mpc +++ b/TAO/tao/FoxResource/FoxResource.mpc @@ -1,4 +1,4 @@ -// -*- MPC -*- now wouldn't this be cool... +// -*- MPC -*- project(TAO_FoxResource) : acelib, taolib, install, tao_output, taodefaults, ace_foxreactor, taoidldefaults { sharedname = TAO_FoxResource dynamicflags += TAO_FOCRESOURCE_BUILD_DLL diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.cpp b/TAO/tao/GIOP_Fragmentation_Strategy.cpp index 169aecfcba5..77e62f54c1f 100644 --- a/TAO/tao/GIOP_Fragmentation_Strategy.cpp +++ b/TAO/tao/GIOP_Fragmentation_Strategy.cpp @@ -1,7 +1,6 @@ #include "tao/GIOP_Fragmentation_Strategy.h" - TAO_GIOP_Fragmentation_Strategy::~TAO_GIOP_Fragmentation_Strategy (void) { } diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 2970391a641..75cc21133e9 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -25,12 +25,7 @@ TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, TAO_Transport *transport, size_t input_cdr_size) : orb_core_ (orb_core) -#if defined (__SUNPRO_CC) && (__SUNPRO_CC == 0x5110 || __SUNPRO_CC == 0x5120) - // initializing from auto_ptr_ref is broken on SunCC 5.11 and 5.12 - , fragmentation_strategy_ (orb_core->fragmentation_strategy (transport).release ()) -#else , fragmentation_strategy_ (orb_core->fragmentation_strategy (transport)) -#endif , out_stream_ (0, input_cdr_size, TAO_ENCAP_BYTE_ORDER, @@ -38,7 +33,7 @@ TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, orb_core->output_cdr_dblock_allocator (), orb_core->output_cdr_msgblock_allocator (), orb_core->orb_params ()->cdr_memcpy_tradeoff (), - fragmentation_strategy_.get (), + fragmentation_strategy_, TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR) { @@ -61,6 +56,7 @@ TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base (void) #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1) this->out_stream_.unregister_monitor (); #endif /* TAO_HAS_MONITOR_POINTS==1 */ + delete fragmentation_strategy_; } void @@ -637,7 +633,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport, TAO_ENCAP_BYTE_ORDER, this->orb_core_->input_cdr_msgblock_allocator (), this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (), - this->fragmentation_strategy_.get (), + this->fragmentation_strategy_, qd->giop_version ().major_version (), qd->giop_version ().minor_version ()); @@ -2021,7 +2017,7 @@ TAO_GIOP_Message_Base::discard_fragmented_message (const TAO_Queued_Data *cancel TAO_GIOP_Fragmentation_Strategy * TAO_GIOP_Message_Base::fragmentation_strategy (void) { - return this->fragmentation_strategy_.get (); + return this->fragmentation_strategy_; } void diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index 8bddc6d8200..f726e620176 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -29,8 +29,6 @@ #include "tao/CDR.h" #include "tao/Incoming_Message_Stack.h" -#include "ace/Auto_Ptr.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Pluggable_Reply_Params; @@ -267,7 +265,7 @@ protected: //@{ /// Strategy that sends data currently marshaled into this /// TAO_OutputCDR stream if necessary. - auto_ptr<TAO_GIOP_Fragmentation_Strategy> fragmentation_strategy_; + TAO_GIOP_Fragmentation_Strategy* fragmentation_strategy_; /// Buffer where the request is placed. TAO_OutputCDR out_stream_; diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp index c4888cdaca1..314932c5be6 100644 --- a/TAO/tao/GIOP_Message_State.cpp +++ b/TAO/tao/GIOP_Message_State.cpp @@ -87,7 +87,7 @@ TAO_GIOP_Message_State::parse_magic_bytes (char *buf) && buf [3] == 0x50)) // 'P' { if (TAO_debug_level > 0) - TAOLIB_DEBUG ((LM_DEBUG, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("TAO_GIOP_Message_State::parse_magic_bytes, ") ACE_TEXT ("bad %cIOP header: ") @@ -112,8 +112,8 @@ TAO_GIOP_Message_State::get_version_info (char *buf) } // We have a GIOP message on hand. Get its revision numbers - CORBA::Octet incoming_major = buf[TAO_GIOP_VERSION_MAJOR_OFFSET]; - CORBA::Octet incoming_minor = buf[TAO_GIOP_VERSION_MINOR_OFFSET]; + CORBA::Octet const incoming_major = buf[TAO_GIOP_VERSION_MAJOR_OFFSET]; + CORBA::Octet const incoming_minor = buf[TAO_GIOP_VERSION_MINOR_OFFSET]; // Check the revision information if (TAO_GIOP_Message_Generator_Parser_Impl::check_revision ( diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index af467be5978..32eebdc1b99 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -19,7 +19,6 @@ #include "tao/IIOP_Acceptor.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" #include "ace/os_include/os_netdb.h" diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h index 18b4ce533af..35d3dad6103 100644 --- a/TAO/tao/IORInterceptor/IORInfo.h +++ b/TAO/tao/IORInterceptor/IORInfo.h @@ -45,7 +45,6 @@ class TAO_IORInfo public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO_IORInfo (TAO_Root_POA *poa); @@ -101,8 +100,7 @@ public: void components_established (void); protected: - - /// Protected destructor to enforce proper memory managment through + /// Protected destructor to enforce proper memory management through /// the reference counting mechanism. ~TAO_IORInfo (void); @@ -115,14 +113,12 @@ protected: void check_validity (void); private: - /// Prevent copying through the copy constructor and the assignment /// operator. TAO_IORInfo (const TAO_IORInfo &); void operator= (const TAO_IORInfo &); private: - /// Pointer to POA TAO_Root_POA * poa_; @@ -135,7 +131,6 @@ private: * interception point has been called. */ CORBA::Boolean components_established_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 89b7adc02c4..ef0fba027af 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -46,7 +46,11 @@ TAO_IOR_Manipulation_impl::merge_iors ( // get the profile lists, start by initialize the composite reference // by using the first Object. Then for each subsequent Object verify // they are the same type and they do not have duplicate profiles. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->make_profiles ()); +#else auto_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->make_profiles ()); +#endif /* ACE_HAS_CPP11 */ if (Merged_Profiles.add_profiles (tmp_pfiles.get ())< 0) throw TAO_IOP::Invalid_IOR (); CORBA::String_var id = @@ -55,7 +59,6 @@ TAO_IOR_Manipulation_impl::merge_iors ( for (i = 1; i < iors.length () ; i++) { // this gets a copy of the MProfile, hence the auto_ptr; - ACE_auto_ptr_reset (tmp_pfiles, iors[i]->_stubobj ()->make_profiles ()); @@ -147,7 +150,11 @@ TAO_IOR_Manipulation_impl::remove_profiles ( // initialize with estimated pfile count. TAO_MProfile Diff_Profiles (count); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_MProfile> tmp_pfiles (group->_stubobj ()->make_profiles ()); +#else auto_ptr<TAO_MProfile> tmp_pfiles (group->_stubobj ()->make_profiles ()); +#endif /* ACE_HAS_CPP11 */ if (Diff_Profiles.add_profiles (tmp_pfiles.get ()) < 0) throw TAO_IOP::Invalid_IOR (); @@ -261,7 +268,7 @@ TAO_IOR_Manipulation_impl::is_primary_set ( } CORBA::Boolean -TAO_IOR_Manipulation_impl:: remove_primary_tag ( +TAO_IOR_Manipulation_impl::remove_primary_tag ( TAO_IOP::TAO_IOR_Property_ptr prop, CORBA::Object_ptr group) { @@ -276,8 +283,13 @@ TAO_IOR_Manipulation_impl::is_in_ior ( CORBA::ULong count = 0; TAO_Profile *pfile1 = 0; TAO_Profile *pfile2 = 0; +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ()); + std::unique_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ()); +#else auto_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ()); auto_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ()); +#endif /* ACE_HAS_CPP11 */ tmp_pfiles1->rewind (); while ((pfile1 = tmp_pfiles1->get_next ()) != 0) diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index 80483b3ce11..b98d874ccae 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -38,7 +38,7 @@ namespace if (TAO_debug_level > 0) { TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_ImR_Client (%P|%t) - IMR partial IOR =\n%C\n"), + ACE_TEXT ("TAO_ImR_Client (%P|%t) - IMR partial IOR <%C>\n"), profile_str.in ())); } char* const pos = find_delimiter (profile_str.inout (), @@ -63,7 +63,7 @@ namespace if (TAO_debug_level > 0) { TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_ImR_Client (%P|%t) - ImR-ified IOR =\n%C\n\n"), + ACE_TEXT ("TAO_ImR_Client (%P|%t) - ImR-ified IOR <%C>\n"), ior.c_str ())); } CORBA::Object_ptr obj = orb_core.orb ()->string_to_object (ior.c_str ()); @@ -128,8 +128,7 @@ namespace } catch (const ::CORBA::Exception& ) { - return default_obj ( - "could not ImRify object with all profiles"); + return default_obj ("could not ImRify object with all profiles"); } } private: @@ -156,8 +155,7 @@ namespace CORBA::Object_ptr default_obj(const char* desc) { const CORBA::ULong pcount = base_profiles_.profile_count (); - const char* info = - "because couldn't find ImR profile_in_use in profiles"; + const char* info = "because couldn't find ImR profile_in_use in profiles"; // identify the profile in use to see if we can default to // that profiles partial ImR-ification @@ -172,19 +170,26 @@ namespace info = "because couldn't ImR-ify profile_in_use"; break; } - TAOLIB_ERROR((LM_ERROR, - ACE_TEXT("TAO_ImR_Client (%P|%t) - ERROR: %C. ") - ACE_TEXT("Defaulting to ImR-ifying profile_in_use\n"), - desc)); + + if (TAO_debug_level > 0) + { + TAOLIB_ERROR((LM_ERROR, + ACE_TEXT("TAO_ImR_Client (%P|%t) - ERROR: %C. ") + ACE_TEXT("Defaulting to ImR-ifying profile_in_use\n"), + desc)); + } return objs_[i]._retn (); } } - TAOLIB_ERROR((LM_ERROR, - ACE_TEXT ("TAO_ImR_Client (%P|%t) - ERROR: %C, ") - ACE_TEXT ("but cannot default to ImR-ifying profile_in_use %C\n"), - desc, - info)); + if (TAO_debug_level > 0) + { + TAOLIB_ERROR((LM_ERROR, + ACE_TEXT ("TAO_ImR_Client (%P|%t) - ERROR: %C, ") + ACE_TEXT ("but cannot default to ImR-ifying profile_in_use %C\n"), + desc, + info)); + } return CORBA::Object::_nil(); } @@ -215,9 +220,12 @@ namespace TAO if (CORBA::is_nil (imr.in ())) { - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("TAO_ImR_Client (%P|%t) - ERROR: No usable IMR initial reference ") - ACE_TEXT ("available but use IMR has been specified.\n"))); + if (TAO_debug_level > 0) + { + TAOLIB_ERROR ((LM_ERROR, + ACE_TEXT ("TAO_ImR_Client (%P|%t) - ERROR: No usable IMR initial reference ") + ACE_TEXT ("available but use IMR has been specified.\n"))); + } throw ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), CORBA::COMPLETED_NO); @@ -225,16 +233,14 @@ namespace TAO if (TAO_debug_level > 0) { - ACE_CString imr_info; if (TAO_debug_level > 1) { CORBA::ORB_ptr orb = poa->orb_core ().orb (); CORBA::String_var ior = orb->object_to_string (imr.in ()); - imr_info = ACE_CString (", IMR IOR=") + ior.in (); + TAOLIB_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO_ImR_Client (%P|%t) - Notifying ImR of startup IMR IOR <%C>\n"), + ior.in ())); } - TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_ImR_Client (%P|%t) - Notifying ImR of startup <%C>\n"), - imr_info.c_str ())); } ImplementationRepository::Administration_var imr_locator; @@ -250,9 +256,12 @@ namespace TAO if (CORBA::is_nil (imr_locator.in ())) { - TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("TAO_ImR_Client (%P|%t) - ERROR: Narrowed IMR initial reference ") - ACE_TEXT ("is nil but use IMR has been specified.\n"))); + if (TAO_debug_level > 0) + { + TAOLIB_ERROR ((LM_ERROR, + ACE_TEXT ("TAO_ImR_Client (%P|%t) - ERROR: Narrowed IMR initial reference ") + ACE_TEXT ("is nil but use IMR has been specified.\n"))); + } throw ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), @@ -299,7 +308,7 @@ namespace TAO if (TAO_debug_level > 0) { TAOLIB_DEBUG((LM_INFO, - "TAO_ImR_Client (%P|%t) - full_ior=<%C>\n\nior=<%C>\n\n", + "TAO_ImR_Client (%P|%t) - full_ior <%C>\nior <%C>\n", full_ior.in(), ior.in())); } @@ -309,9 +318,12 @@ namespace TAO const ACE_CString partial_ior (ior.in (), (pos - ior.in ()) + 1); if (TAO_debug_level > 0) + { + CORBA::String_var poaname = poa->the_name (); TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_ImR_Client (%P|%t) - Informing IMR that we are running at: <%C>\n"), - partial_ior.c_str ())); + ACE_TEXT ("TAO_ImR_Client (%P|%t) - Informing IMR that <%C> is running at <%C>\n"), + poaname.in(), partial_ior.c_str ())); + } try { @@ -319,7 +331,7 @@ namespace TAO TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa); ACE_UNUSED_ARG (non_servant_upcall); - ACE_CString serverId = poa->orb_core ().server_id (); + ACE_CString const serverId = poa->orb_core ().server_id (); ACE_CString name; if (serverId.empty ()) { diff --git a/TAO/tao/ImR_Client/ImplRepo.idl b/TAO/tao/ImR_Client/ImplRepo.idl index 9e465cac545..fda944c0d08 100644 --- a/TAO/tao/ImR_Client/ImplRepo.idl +++ b/TAO/tao/ImR_Client/ImplRepo.idl @@ -1,8 +1,5 @@ // -*- IDL -*- -/** - */ - #ifndef TAO_IMRCLIENT_IMPLREPO_PIDL #define TAO_IMRCLIENT_IMPLREPO_PIDL @@ -73,7 +70,7 @@ module ImplementationRepository /// No attempt as been made to determine status. ACTIVE_MAYBE, - /// Server has been succesfully pinged within ping interval. + /// Server has been successfully pinged within ping interval. ACTIVE_YES, /// Server was not able to be pinged within ping interval. diff --git a/TAO/tao/ImR_Client/ServerObject.idl b/TAO/tao/ImR_Client/ServerObject.idl index 2d81e9c4e7d..38b094a5991 100644 --- a/TAO/tao/ImR_Client/ServerObject.idl +++ b/TAO/tao/ImR_Client/ServerObject.idl @@ -1,8 +1,5 @@ // -*- IDL -*- -/** - */ - #ifndef TAO_IMRCLIENT_SERVEROBJECT_PIDL #define TAO_IMRCLIENT_SERVEROBJECT_PIDL @@ -15,7 +12,6 @@ module ImplementationRepository * Implementation Repository (IR), is used to control or check the * status of the server by the IR. */ - interface ServerObject { /// Check the liveness of a server. diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h index f3179181295..c4c6f181b75 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h @@ -19,7 +19,13 @@ #include /**/ "tao/Versioned_Namespace.h" -#include "ace/Atomic_Op.h" +#include "tao/Basic_Types.h" + +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -37,21 +43,20 @@ template <class ACE_LOCK> class TAO_Intrusive_Ref_Count_Base { public: - virtual ~TAO_Intrusive_Ref_Count_Base (void); void _add_ref (void); void _remove_ref (void); - protected: - TAO_Intrusive_Ref_Count_Base (void); - private: - - ACE_Atomic_Op<ACE_LOCK, long> ref_count_; +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else + ACE_Atomic_Op<ACE_LOCK, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ // Prevent copying/assignment. TAO_Intrusive_Ref_Count_Base (const TAO_Intrusive_Ref_Count_Base&); diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.inl b/TAO/tao/Intrusive_Ref_Count_Base_T.inl index 158af586e62..336e713d1d7 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.inl +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base (void) - : ref_count_(1) + : refcount_(1) {} @@ -13,7 +13,7 @@ ACE_INLINE void TAO_Intrusive_Ref_Count_Base<T>::_add_ref (void) { - ++this->ref_count_; + ++this->refcount_; } @@ -22,7 +22,7 @@ ACE_INLINE void TAO_Intrusive_Ref_Count_Base<T>::_remove_ref (void) { - long const new_count = --this->ref_count_; + CORBA::ULong const new_count = --this->refcount_; if (new_count != 0) { diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index c7c2d955971..e9e71701152 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -30,7 +30,7 @@ namespace TAO } void - Invocation_Adapter::invoke (TAO::Exception_Data *ex_data, + Invocation_Adapter::invoke (const TAO::Exception_Data *ex_data, unsigned long ex_count) { // Should stub object be refcounted here? diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index 4edd270c21b..83fc8f7391f 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -123,7 +123,7 @@ namespace TAO * * @param ex_count Number of elements in the array. */ - virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count); + virtual void invoke (const TAO::Exception_Data *ex, unsigned long ex_count); /** * @param byte_order The intended byte order for the message output diff --git a/TAO/tao/Invocation_Retry_Params.h b/TAO/tao/Invocation_Retry_Params.h index 29d42c56d85..b24d30c7980 100644 --- a/TAO/tao/Invocation_Retry_Params.h +++ b/TAO/tao/Invocation_Retry_Params.h @@ -11,7 +11,9 @@ #define TAO_INVOCATION_RETRY_PARAMS_H #include "tao/orbconf.h" + #include "ace/Array_Map.h" +#include "ace/Time_Value.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Load_Protocol_Factory_T.h b/TAO/tao/Load_Protocol_Factory_T.h index 45b246d3188..29a2519aa05 100644 --- a/TAO/tao/Load_Protocol_Factory_T.h +++ b/TAO/tao/Load_Protocol_Factory_T.h @@ -33,7 +33,11 @@ namespace TAO const char *name) { TAO_Protocol_Factory *protocol_factory = 0; +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Protocol_Factory> safe_protocol_factory; +#else auto_ptr<TAO_Protocol_Factory> safe_protocol_factory; +#endif /* ACE_HAS_CPP11 */ TAO_Protocol_Item *item = 0; diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index 67accf14266..81a643b90ec 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -104,9 +104,8 @@ namespace TAO void Asynch_Invocation_Adapter::invoke ( - TAO::Exception_Data *ex, - unsigned long ex_count - ) + const TAO::Exception_Data *ex, + unsigned long ex_count) { Invocation_Adapter::invoke (ex, ex_count ); } diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index eaa14985196..22fa8f7bd7f 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -71,7 +71,7 @@ namespace TAO void invoke (Messaging::ReplyHandler_ptr reply_handler_ptr, const TAO_Reply_Handler_Stub &reply_handler_stub); - virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count); + virtual void invoke (const TAO::Exception_Data *ex, unsigned long ex_count); protected: virtual Invocation_Status invoke_twoway ( diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 6d936dfb818..083da7de8d7 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -35,7 +35,11 @@ #include "ace/Thread_Mutex.h" #include "ace/Guard_T.h" -#include "ace/Atomic_Op.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -577,7 +581,11 @@ namespace CORBA /// Maintains a reference count of number of instantiations of the /// ORB. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ /// The ORB_Core that created us.... TAO_ORB_Core * orb_core_; diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl index 9772329fbec..b46a2f83819 100644 --- a/TAO/tao/ORB.inl +++ b/TAO/tao/ORB.inl @@ -26,7 +26,11 @@ CORBA::ORB::_incr_refcount (void) ACE_INLINE unsigned long CORBA::ORB::_refcount (void) const { +#if defined (ACE_HAS_CPP11) + return this->refcount_; +#else return this->refcount_.value (); +#endif /* ACE_HAS_CPP11 */ } ACE_INLINE unsigned long diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index b96728d06ad..e91407c0d79 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1966,8 +1966,11 @@ TAO_ORB_Core::root_poa (void) if (CORBA::is_nil (this->root_poa_.in ())) { +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Adapter> poa_adapter (factory->create (this)); +#else auto_ptr<TAO_Adapter> poa_adapter (factory->create (this)); - +#endif /* ACE_HAS_CPP11 */ poa_adapter->open (); // @@ Not exception safe @@ -3075,7 +3078,7 @@ TAO_ORB_Core::connector_registry (void) return conn; } -auto_ptr<TAO_GIOP_Fragmentation_Strategy> +TAO_GIOP_Fragmentation_Strategy* TAO_ORB_Core::fragmentation_strategy (TAO_Transport * transport) { return @@ -3601,8 +3604,7 @@ TAO_ORB_Core::valuetype_adapter (void) { TAO_Valuetype_Adapter_Factory * vt_ap_factory = ACE_Dynamic_Service<TAO_Valuetype_Adapter_Factory>::instance ( - TAO_ORB_Core::valuetype_adapter_factory_name () - ); + TAO_ORB_Core::valuetype_adapter_factory_name ()); if (vt_ap_factory) { diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 6832bac73a7..f29cd02430d 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -37,12 +37,15 @@ #include "tao/Service_Context_Handler_Registry.h" #include "ace/Array_Map.h" -#include "ace/Auto_Ptr.h" #include "ace/Thread_Manager.h" #include "ace/Lock_Adapter_T.h" #include "ace/TSS_T.h" - #include "ace/Service_Config.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Data_Block; @@ -384,7 +387,7 @@ public: /// transports. ACE_Allocator *transport_message_buffer_allocator (void); - /// The Message Blocks used for input CDRs must have appropiate + /// The Message Blocks used for input CDRs must have appropriate /// locking strategies. ACE_Data_Block *create_input_cdr_data_block (size_t size); @@ -900,7 +903,7 @@ public: ACE_Service_Gestalt* configuration () const; /// Get outgoing fragmentation strategy. - auto_ptr<TAO_GIOP_Fragmentation_Strategy> + TAO_GIOP_Fragmentation_Strategy* fragmentation_strategy (TAO_Transport * transport); #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -1208,7 +1211,11 @@ protected: #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ /// Number of outstanding references to this object. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ /// Registry containing all registered policy factories. TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_; diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index be5af02ee10..f68d3beef3d 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -19,7 +19,11 @@ TAO_ORB_Core::_incr_refcnt (void) ACE_INLINE unsigned long TAO_ORB_Core::_refcnt (void) const { +#if defined (ACE_HAS_CPP11) + return this->refcount_; +#else return this->refcount_.value (); +#endif /* ACE_HAS_CPP11 */ } ACE_INLINE unsigned long diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 3e73ac25c1c..b96ae7b5125 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -110,7 +110,11 @@ CORBA::Object::_remove_ref (void) CORBA::ULong CORBA::Object::_refcount_value(void) const { - return static_cast<CORBA::ULong> (this->refcount_.value ()); +#if defined (ACE_HAS_CPP11) + return this->refcount_; +#else + return this->refcount_.value (); +#endif /* ACE_HAS_CPP11 */ } void @@ -929,9 +933,8 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) // profile from the IOR. TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ERROR: Could not create all ") - ACE_TEXT ("profiles while extracting object [%d, %d]\n") - ACE_TEXT ("TAO (%P|%t) - ERROR: reference from the ") - ACE_TEXT ("CDR stream.\n"), + ACE_TEXT ("profiles while extracting object [%d, %d] ") + ACE_TEXT ("reference from the CDR stream.\n"), mp.profile_count (), profile_count), false); } diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 8b401aab505..a2d2dd26fae 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -30,7 +30,11 @@ #include "tao/Object_Argument_T.h" #include "tao/Arg_Traits_T.h" #include "tao/Any_Insert_Policy_T.h" -#include "ace/Atomic_Op.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ #if defined (HPUX) && defined (IOR) /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h @@ -340,7 +344,12 @@ namespace CORBA TAO::Object_Proxy_Broker *proxy_broker () const; /// Number of outstanding references to this object. +#if defined (ACE_HAS_CPP11) +# define TAO_OBJECT_USES_STD_ATOMIC_REFCOUNT + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ private: diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index 708891e7674..fc7a4980394 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -141,7 +141,6 @@ TAO_ClientRequestInfo::received_exception (void) // The spec says that if it is a user exception which can't be // inserted then the UNKNOWN exception needs to be thrown with minor // code 1. - CORBA::Any * temp = 0; ACE_NEW_THROW_EX (temp, @@ -367,7 +366,7 @@ TAO_ClientRequestInfo::request_id (void) // @@ The following request ID generator prevents the // PortableInterceptor::ClientRequestInterceptor::send_request() - // interception point from occuring before the call to connect, + // interception point from occurring before the call to connect, // thus preventing us from adding an optimization that itself // prevents a connection from being unnecessarily performed. // Thus, the ClientRequestInfo object is forced to have its own diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp index 926749e8204..aa81eff08c6 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp @@ -30,7 +30,6 @@ TAO_Acceptor_Filter_Factory::initialize (void) (ace_svc_desc_TAO_Acceptor_Filter_Factory); } - ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Acceptor_Filter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Acceptor_Filter_Factory, ACE_TEXT ("TAO_Acceptor_Filter_Factory"), diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 706cd08e023..b556fa72579 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -91,13 +91,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( int persistent_id_policy, const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters & creation_parameters) - : user_id_map_ (0) - , servant_map_ (0) - , id_uniqueness_strategy_ (0) - , lifespan_strategy_ (0) - , id_assignment_strategy_ (0) - , id_hint_strategy_ (0) - , using_active_maps_ (false) + : using_active_maps_ (false) { TAO_Active_Object_Map::set_system_id_size (creation_parameters); @@ -122,8 +116,11 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. - auto_ptr<TAO_Id_Uniqueness_Strategy> - new_id_uniqueness_strategy (id_uniqueness_strategy); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy); +#else + auto_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy); +#endif /* ACE_HAS_CPP11 */ TAO_Lifespan_Strategy *lifespan_strategy = 0; @@ -147,7 +144,11 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy); +#else auto_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy); +#endif /* ACE_HAS_CPP11 */ TAO_Id_Assignment_Strategy *id_assignment_strategy = 0; @@ -182,8 +183,11 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. - auto_ptr<TAO_Id_Assignment_Strategy> - new_id_assignment_strategy (id_assignment_strategy); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy); +#else + auto_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy); +#endif /* ACE_HAS_CPP11 */ TAO_Id_Hint_Strategy *id_hint_strategy = 0; if ((user_id_policy @@ -205,7 +209,11 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy); +#else auto_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy); +#endif /* ACE_HAS_CPP11 */ servant_map *sm = 0; if (unique_id_policy) @@ -224,7 +232,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( "linear option for " "-ORBUniqueidPolicyReverseDemuxStrategy " "not supported with minimum POA maps. " - "Ingoring option to use default...\n")); + "Ignoring option to use default...\n")); /* FALL THROUGH */ #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ @@ -239,7 +247,11 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<servant_map> new_servant_map (sm); +#else auto_ptr<servant_map> new_servant_map (sm); +#endif /* ACE_HAS_CPP11 */ user_id_map *uim = 0; if (user_id_policy @@ -258,7 +270,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( TAOLIB_ERROR ((LM_ERROR, "linear option for -ORBUseridPolicyDemuxStrategy " "not supported with minimum POA maps. " - "Ingoring option to use default...\n")); + "Ignoring option to use default...\n")); /* FALL THROUGH */ #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ @@ -292,7 +304,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( TAOLIB_ERROR ((LM_ERROR, "linear and dynamic options for -ORBSystemidPolicyDemuxStrategy " "are not supported with minimum POA maps. " - "Ingoring option to use default...\n")); + "Ignoring option to use default...\n")); /* FALL THROUGH */ #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ @@ -309,7 +321,11 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<user_id_map> new_user_id_map (uim); +#else auto_ptr<user_id_map> new_user_id_map (uim); +#endif /* ACE_HAS_CPP11 */ id_uniqueness_strategy->set_active_object_map (this); lifespan_strategy->set_active_object_map (this); @@ -317,12 +333,21 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( // Finally everything is fine. Make sure to take ownership away // from the auto pointer. +#if defined (ACE_HAS_CPP11) + this->id_uniqueness_strategy_ = std::move(new_id_uniqueness_strategy); + this->lifespan_strategy_ = std::move(new_lifespan_strategy); + this->id_assignment_strategy_ = std::move(new_id_assignment_strategy); + this->id_hint_strategy_ = std::move(new_id_hint_strategy); + this->servant_map_ = std::move(new_servant_map); + this->user_id_map_ = std::move(new_user_id_map); +#else this->id_uniqueness_strategy_ = new_id_uniqueness_strategy; this->lifespan_strategy_ = new_lifespan_strategy; this->id_assignment_strategy_ = new_id_assignment_strategy; this->id_hint_strategy_ = new_id_hint_strategy; this->servant_map_ = new_servant_map; this->user_id_map_ = new_user_id_map; +#endif /* ACE_HAS_CPP11 */ #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1) ACE_NEW (this->monitor_, diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index 58c21c9cd83..a37e2fcaee5 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -237,22 +237,46 @@ public: #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ /// Id map. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<user_id_map> user_id_map_; +#else auto_ptr<user_id_map> user_id_map_; +#endif /* ACE_HAS_CPP11 */ /// Servant map. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<servant_map> servant_map_; +#else auto_ptr<servant_map> servant_map_; +#endif /* ACE_HAS_CPP11 */ /// Id uniqueness strategy. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_; +#else auto_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_; +#endif /* ACE_HAS_CPP11 */ /// Lifespan strategy. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Lifespan_Strategy> lifespan_strategy_; +#else auto_ptr<TAO_Lifespan_Strategy> lifespan_strategy_; +#endif /* ACE_HAS_CPP11 */ /// Id assignment strategy. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_; +#else auto_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_; +#endif /* ACE_HAS_CPP11 */ /// Id hint strategy. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_; +#else auto_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_; +#endif /* ACE_HAS_CPP11 */ /// Flag to see if we are using active maps in this active object /// map. diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h index 7cf6f17d130..ceab91a8dc7 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h @@ -34,12 +34,9 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual IdAssignmentStrategy* create ( - ::PortableServer::IdAssignmentPolicyValue value) = 0; + virtual IdAssignmentStrategy* create (::PortableServer::IdAssignmentPolicyValue value) = 0; - virtual void destroy ( - IdAssignmentStrategy *strategy - ) = 0; + virtual void destroy (IdAssignmentStrategy *strategy) = 0; }; } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp index 35a5119f07d..e2d04886b10 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp @@ -34,7 +34,7 @@ namespace TAO if (strategy == 0) TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), + ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), strategy_name)); return strategy; @@ -49,8 +49,6 @@ namespace TAO } } - - ACE_STATIC_SVC_DEFINE ( IdAssignmentStrategyFactoryImpl, ACE_TEXT ("IdAssignmentStrategyFactory"), diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h index 35aba6def0b..d0f64224202 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h @@ -32,8 +32,7 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual IdAssignmentStrategy* create ( - ::PortableServer::IdAssignmentPolicyValue value); + virtual IdAssignmentStrategy* create (::PortableServer::IdAssignmentPolicyValue value); virtual void destroy (IdAssignmentStrategy *strategy); }; diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp index 8a70ac0e4b1..57685cf2f83 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -20,7 +20,6 @@ namespace TAO } } - ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, IdAssignmentStrategyUser, diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h index cdec2af056f..c01c47fee41 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h @@ -34,13 +34,10 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual IdUniquenessStrategy* create ( - ::PortableServer::IdUniquenessPolicyValue value) = 0; + virtual IdUniquenessStrategy* create (::PortableServer::IdUniquenessPolicyValue value) = 0; /// Cleanup the given strategy instance - virtual void destroy ( - IdUniquenessStrategy *strategy - ) = 0; + virtual void destroy (IdUniquenessStrategy *strategy) = 0; }; } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h index d3ebc0fb69c..8c869ab0ab9 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h @@ -32,12 +32,9 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual IdUniquenessStrategy* create ( - ::PortableServer::IdUniquenessPolicyValue value); + virtual IdUniquenessStrategy* create (::PortableServer::IdUniquenessPolicyValue value); - virtual void destroy ( - IdUniquenessStrategy *strategy - ); + virtual void destroy (IdUniquenessStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index de5e3c291f4..89a795db50f 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -56,8 +56,6 @@ namespace TAO } } - - ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, IdUniquenessStrategyUnique, diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index 3605e61b739..fe25b407ce8 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -33,8 +33,7 @@ namespace TAO public: IdUniquenessStrategyUnique (void); - virtual void strategy_init (TAO_Root_POA *poa - ); + virtual void strategy_init (TAO_Root_POA *poa); virtual void strategy_cleanup (void); diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index 037d8733c2f..571175c03cf 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -44,7 +44,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( IdUniquenessStrategyUniqueFactoryImpl, ACE_TEXT ("IdUniquenessStrategyUniqueFactory"), diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h index c096575c1e2..d02e0060b4f 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h @@ -32,12 +32,9 @@ namespace TAO { public: /// Create a new strategy - virtual IdUniquenessStrategy* create ( - ::PortableServer::IdUniquenessPolicyValue value); + virtual IdUniquenessStrategy* create (::PortableServer::IdUniquenessPolicyValue value); - virtual void destroy ( - IdUniquenessStrategy *strategy - ); + virtual void destroy (IdUniquenessStrategy *strategy); }; } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h index ff238169a20..f2d8514ef57 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h @@ -34,12 +34,9 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual ImplicitActivationStrategy* create ( - ::PortableServer::ImplicitActivationPolicyValue value) = 0; + virtual ImplicitActivationStrategy* create (::PortableServer::ImplicitActivationPolicyValue value) = 0; - virtual void destroy ( - ImplicitActivationStrategy *strategy - ) = 0; + virtual void destroy (ImplicitActivationStrategy *strategy) = 0; }; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index a488aeaa7c9..c2172cc7cb9 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -36,7 +36,7 @@ namespace TAO if (strategy == 0) TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), + ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), strategy_name)); return strategy; @@ -52,13 +52,11 @@ namespace TAO } } - ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, ImplicitActivationStrategyFactoryImpl, TAO_VERSIONED_NAMESPACE_NAME::TAO::Portable_Server::ImplicitActivationStrategyFactoryImpl) - ACE_STATIC_SVC_DEFINE ( ImplicitActivationStrategyFactoryImpl, ACE_TEXT ("ImplicitActivationStrategyFactory"), diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h index ed3d93038c5..3ee40e3d8ba 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h @@ -33,12 +33,9 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual ImplicitActivationStrategy* create ( - ::PortableServer::ImplicitActivationPolicyValue value); + virtual ImplicitActivationStrategy* create (::PortableServer::ImplicitActivationPolicyValue value); - virtual void destroy ( - ImplicitActivationStrategy *strategy - ); + virtual void destroy (ImplicitActivationStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index c7694743bad..0be943ee21c 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -16,7 +16,6 @@ namespace TAO } } - ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, ImplicitActivationStrategyImplicit, diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h index 212fc0d3075..e60df4872d1 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactory.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactory.h @@ -34,13 +34,10 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual LifespanStrategy* create ( - ::PortableServer::LifespanPolicyValue value) = 0; + virtual LifespanStrategy* create (::PortableServer::LifespanPolicyValue value) = 0; /// Cleanup the given strategy instance - virtual void destroy ( - LifespanStrategy *strategy - ) = 0; + virtual void destroy (LifespanStrategy *strategy) = 0; }; } } diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp index d7e4388c991..f66cdebd8b3 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp @@ -36,7 +36,7 @@ namespace TAO strategy = strategy_factory->create (value); else TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), + ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), strategy_name)); @@ -75,8 +75,6 @@ namespace TAO } } - - ACE_STATIC_SVC_DEFINE ( LifespanStrategyFactoryImpl, ACE_TEXT ("LifespanStrategyFactory"), diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h index 32e032e6d47..b076007cd7a 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h @@ -32,13 +32,10 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual LifespanStrategy* create ( - ::PortableServer::LifespanPolicyValue value); + virtual LifespanStrategy* create (::PortableServer::LifespanPolicyValue value); /// Cleanup the given strategy instance - virtual void destroy ( - LifespanStrategy *strategy - ); + virtual void destroy (LifespanStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp index e5c8f46a06f..cd56cf99c58 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp @@ -42,7 +42,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( LifespanStrategyPersistentFactoryImpl, ACE_TEXT ("LifespanStrategyPersistentFactory"), diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h index 964c08f5584..77fbcaa3466 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h @@ -32,13 +32,10 @@ namespace TAO { public: /// Create a new strategy - virtual LifespanStrategy* create ( - ::PortableServer::LifespanPolicyValue value); + virtual LifespanStrategy* create (::PortableServer::LifespanPolicyValue value); /// Cleanup the given strategy instance - virtual void destroy ( - LifespanStrategy *strategy - ); + virtual void destroy (LifespanStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp index 522eeee81b9..05b6c6b1e17 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp @@ -42,7 +42,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( LifespanStrategyTransientFactoryImpl, ACE_TEXT ("LifespanStrategyTransientFactory"), diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h index e2c41a113ff..1d90c3f23f5 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h @@ -33,13 +33,10 @@ namespace TAO { public: /// Create a new strategy - virtual LifespanStrategy* create ( - ::PortableServer::LifespanPolicyValue value); + virtual LifespanStrategy* create (::PortableServer::LifespanPolicyValue value); /// Cleanup the given strategy instance - virtual void destroy ( - LifespanStrategy *strategy - ); + virtual void destroy (LifespanStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp index 5a31a807668..b143ac6a441 100644 --- a/TAO/tao/PortableServer/Network_Priority_Hook.cpp +++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp @@ -31,7 +31,6 @@ TAO_Network_Priority_Hook::initialize (void) (ace_svc_desc_TAO_Network_Priority_Hook); } - ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Network_Priority_Hook) ACE_STATIC_SVC_DEFINE (TAO_Network_Priority_Hook, ACE_TEXT ("TAO_Network_Priority_Hook"), diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 74af2512196..00819b064ec 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -166,7 +166,11 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ No_Hint_Strategy); // Give ownership to the auto pointer. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<Hint_Strategy> new_hint_strategy (hint_strategy); +#else auto_ptr<Hint_Strategy> new_hint_strategy (hint_strategy); +#endif /* ACE_HAS_CPP11 */ new_hint_strategy->object_adapter (this); @@ -183,7 +187,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ TAOLIB_ERROR ((LM_ERROR, "linear option for -ORBPersistentidPolicyDemuxStrategy " "not supported with minimum POA maps. " - "Ingoring option to use default...\n")); + "Ignoring option to use default...\n")); /* FALL THROUGH */ #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ case TAO_DYNAMIC_HASH: @@ -193,7 +197,11 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ break; } // Give ownership to the auto pointer. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm); +#else auto_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm); +#endif /* ACE_HAS_CPP11 */ transient_poa_map *tpm = 0; switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_) @@ -213,7 +221,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ TAOLIB_ERROR ((LM_ERROR, "linear and dynamic options for -ORBTransientidPolicyDemuxStrategy " "are not supported with minimum POA maps. " - "Ingoring option to use default...\n")); + "Ignoring option to use default...\n")); /* FALL THROUGH */ #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ case TAO_ACTIVE_DEMUX: @@ -223,14 +231,15 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ break; } // Give ownership to the auto pointer. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<transient_poa_map> new_transient_poa_map (tpm); +#else auto_ptr<transient_poa_map> new_transient_poa_map (tpm); +#endif /* ACE_HAS_CPP11 */ - this->hint_strategy_ = - new_hint_strategy.release (); - this->persistent_poa_name_map_ = - new_persistent_poa_name_map.release (); - this->transient_poa_map_ = - new_transient_poa_map.release (); + this->hint_strategy_ = new_hint_strategy.release (); + this->persistent_poa_name_map_ = new_persistent_poa_name_map.release (); + this->transient_poa_map_ = new_transient_poa_map.release (); } void diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp index 5bf4c071810..17377675a83 100644 --- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp @@ -16,7 +16,6 @@ TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) return adapter; } - ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Object_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Object_Adapter_Factory, ACE_TEXT ("TAO_Object_Adapter_Factory"), diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h index 938b5e1f9cd..ec0a774404f 100644 --- a/TAO/tao/PortableServer/Policy_Strategy.h +++ b/TAO/tao/PortableServer/Policy_Strategy.h @@ -32,7 +32,7 @@ namespace TAO : public ACE_Service_Object { public: - virtual void strategy_init(TAO_Root_POA *poa ) = 0; + virtual void strategy_init(TAO_Root_POA *poa) = 0; virtual void strategy_cleanup(void) = 0; diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp index cf2d613695c..dc55e7b8e14 100644 --- a/TAO/tao/PortableServer/PortableServer.cpp +++ b/TAO/tao/PortableServer/PortableServer.cpp @@ -84,8 +84,7 @@ TAO_POA_Initializer::init (void) #endif /* TAO_HAS_MINIMUM_POA == 0 */ ACE_Service_Config::process_directive ( - ace_svc_desc_LifespanStrategyFactoryImpl - ); + ace_svc_desc_LifespanStrategyFactoryImpl); #if !defined (CORBA_E_MICRO) ACE_Service_Config::process_directive ( @@ -125,8 +124,7 @@ TAO_POA_Initializer::init (void) ace_svc_desc_ServantRetentionStrategyFactoryImpl); ACE_Service_Config::process_directive ( - ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl - ); + ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) ACE_Service_Config::process_directive ( diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h index b68c31da175..6e9d1bd5d98 100644 --- a/TAO/tao/PortableServer/PortableServer.h +++ b/TAO/tao/PortableServer/PortableServer.h @@ -30,8 +30,7 @@ public: static int init (void); }; -static int -TAO_Requires_POA_Initializer = TAO_POA_Initializer::init (); +static const int TAO_Requires_POA_Initializer = TAO_POA_Initializer::init (); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp index b47cf080db1..2bdb5d8ce17 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp @@ -37,8 +37,7 @@ namespace TAO void RequestProcessingStrategyAOMOnlyFactoryImpl::destroy ( - RequestProcessingStrategy *strategy - ) + RequestProcessingStrategy *strategy) { strategy->strategy_cleanup (); @@ -47,7 +46,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyAOMOnlyFactoryImpl, ACE_TEXT ("RequestProcessingStrategyAOMOnlyFactory"), diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h index 8e4468fc920..c3bbc2407fb 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h @@ -36,9 +36,7 @@ namespace TAO ::PortableServer::RequestProcessingPolicyValue value, ::PortableServer::ServantRetentionPolicyValue srvalue); - virtual void destroy ( - RequestProcessingStrategy *strategy - ); + virtual void destroy (RequestProcessingStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index 5fad96ffd3a..20ed35f5a4f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -84,7 +84,6 @@ namespace TAO private: PortableServer::ServantBase_var default_servant_; }; - } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index 2b16cbeca96..b2a2250c04a 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -40,8 +40,7 @@ namespace TAO void RequestProcessingStrategyDefaultServantFactoryImpl::destroy ( - RequestProcessingStrategy *strategy - ) + RequestProcessingStrategy *strategy) { strategy->strategy_cleanup (); @@ -50,8 +49,6 @@ namespace TAO } } - - ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyDefaultServantFactoryImpl, ACE_TEXT ("RequestProcessingStrategyDefaultServantFactory"), diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h index 7ba9901d3a3..3fd7f737609 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h @@ -38,9 +38,7 @@ namespace TAO ::PortableServer::RequestProcessingPolicyValue value, ::PortableServer::ServantRetentionPolicyValue srvalue); - virtual void destroy ( - RequestProcessingStrategy *strategy - ); + virtual void destroy (RequestProcessingStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h index e22196c2f46..24b9a9c8767 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h @@ -39,9 +39,7 @@ namespace TAO ::PortableServer::RequestProcessingPolicyValue value, ::PortableServer::ServantRetentionPolicyValue srvalue) = 0; - virtual void destroy ( - RequestProcessingStrategy *strategy - ) = 0; + virtual void destroy (RequestProcessingStrategy *strategy) = 0; }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp index 4e08fdbc1f8..bd18a086ce7 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp @@ -74,8 +74,7 @@ namespace TAO void RequestProcessingStrategyFactoryImpl::destroy ( - RequestProcessingStrategy *strategy - ) + RequestProcessingStrategy *strategy) { RequestProcessingStrategyFactory *strategy_factory = 0; @@ -127,8 +126,6 @@ namespace TAO } } - - ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyFactoryImpl, ACE_TEXT ("RequestProcessingStrategyFactory"), diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h index f39537aaad1..96ee26cf106 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h @@ -35,9 +35,7 @@ namespace TAO ::PortableServer::RequestProcessingPolicyValue value, ::PortableServer::ServantRetentionPolicyValue srvalue); - virtual void destroy ( - RequestProcessingStrategy *strategy - ); + virtual void destroy (RequestProcessingStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index 0bed4c8c56d..9d25c652d3a 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -52,8 +52,7 @@ namespace TAO void RequestProcessingStrategyServantActivatorFactoryImpl::destroy ( - RequestProcessingStrategy *strategy - ) + RequestProcessingStrategy *strategy) { strategy->strategy_cleanup (); @@ -62,7 +61,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyServantActivatorFactoryImpl, ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"), diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h index 226f2933f55..b5bb15a8f98 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h @@ -38,9 +38,7 @@ namespace TAO ::PortableServer::RequestProcessingPolicyValue value, ::PortableServer::ServantRetentionPolicyValue srvalue); - virtual void destroy ( - RequestProcessingStrategy *strategy - ); + virtual void destroy (RequestProcessingStrategy *strategy); }; } } @@ -50,7 +48,6 @@ ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivat TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index d0d9c811d16..9da757ce489 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -62,7 +62,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( RequestProcessingStrategyServantLocatorFactoryImpl, ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"), diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index a8d0dc1ba64..972d5057fbc 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -2027,7 +2027,11 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key, } // Give ownership to the auto pointer. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Acceptor_Filter> new_filter (filter); +#else auto_ptr<TAO_Acceptor_Filter> new_filter (filter); +#endif /* ACE_HAS_CPP11 */ TAO_Stub *data = this->create_stub_object ( diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index f9198a4c9ba..5e1124ae33c 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -115,7 +115,6 @@ class TAO_PortableServer_Export TAO_Root_POA public virtual ::CORBA::LocalObject { public: - friend class TAO_Object_Adapter; friend class TAO::Portable_Server::Servant_Upcall; friend class TAO::Portable_Server::Non_Servant_Upcall; diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h index 4c454bb3ffa..dce8425c22b 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h @@ -34,12 +34,9 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual ServantRetentionStrategy* create ( - ::PortableServer::ServantRetentionPolicyValue value) = 0; + virtual ServantRetentionStrategy* create (::PortableServer::ServantRetentionPolicyValue value) = 0; - virtual void destroy ( - ServantRetentionStrategy *strategy - ) = 0; + virtual void destroy (ServantRetentionStrategy *strategy) = 0; }; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp index 79988662a34..71fa991e79a 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp @@ -39,7 +39,7 @@ namespace TAO { if (TAO_debug_level > 1) TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), + ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), strategy_factory_name)); return 0; @@ -79,7 +79,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( ServantRetentionStrategyFactoryImpl, ACE_TEXT ("ServantRetentionStrategyFactory"), diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h index 5d6764e48a9..e73ae1ff4d5 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h @@ -32,12 +32,9 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual ServantRetentionStrategy* create ( - ::PortableServer::ServantRetentionPolicyValue value); + virtual ServantRetentionStrategy* create (::PortableServer::ServantRetentionPolicyValue value); - virtual void destroy ( - ServantRetentionStrategy *strategy - ); + virtual void destroy (ServantRetentionStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index cf399e19de6..2650c125988 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -49,7 +49,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( ServantRetentionStrategyNonRetainFactoryImpl, ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"), diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h index a210f7a8bcf..f4003e80207 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h @@ -34,12 +34,9 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual ServantRetentionStrategy* create ( - ::PortableServer::ServantRetentionPolicyValue value); + virtual ServantRetentionStrategy* create (::PortableServer::ServantRetentionPolicyValue value); - virtual void destroy ( - ServantRetentionStrategy *strategy - ); + virtual void destroy (ServantRetentionStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 726625941f8..500629cf1c0 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -139,7 +139,11 @@ namespace TAO TAO_Active_Object_Map * get_active_object_map() const; private: +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Active_Object_Map> active_object_map_; +#else auto_ptr<TAO_Active_Object_Map> active_object_map_; +#endif /* ACE_HAS_CPP11 */ CORBA::ULong waiting_servant_deactivation_; }; } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index dc226731af2..df444547a4b 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -46,7 +46,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( ServantRetentionStrategyRetainFactoryImpl, ACE_TEXT ("ServantRetentionStrategyRetainFactory"), diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h index 127a6d69f60..1a2d964250a 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h @@ -32,12 +32,9 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual ServantRetentionStrategy* create ( - ::PortableServer::ServantRetentionPolicyValue value); + virtual ServantRetentionStrategy* create (::PortableServer::ServantRetentionPolicyValue value); - virtual void destroy ( - ServantRetentionStrategy *strategy - ); + virtual void destroy (ServantRetentionStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index e0fb3cb406d..2824458e957 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -661,7 +661,7 @@ TAO_ServantBase::_add_ref (void) void TAO_ServantBase::_remove_ref (void) { - unsigned long const new_count = --this->ref_count_; + CORBA::ULong const new_count = --this->ref_count_; if (new_count == 0) { @@ -672,7 +672,11 @@ TAO_ServantBase::_remove_ref (void) CORBA::ULong TAO_ServantBase::_refcount_value (void) const { +#if defined (ACE_HAS_CPP11) + return this->ref_count_; +#else return this->ref_count_.value (); +#endif /* ACE_HAS_CPP11 */ } void diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 6de277edbe6..b37018662db 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -22,7 +22,11 @@ #include "tao/PortableServer/PS_ForwardC.h" #include "tao/PortableServer/Servant_var.h" #include "tao/Abstract_Servant_Base.h" +#if defined (ACE_HAS_CPP11) +#include <atomic> +#else #include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -205,7 +209,11 @@ protected: protected: /// Reference counter. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> ref_count_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> ref_count_; +#endif /* ACE_HAS_CPP11 */ /// The operation table for this servant. It is initialized by the /// most derived class. diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h index b6f7a01e921..bac43806fa1 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactory.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h @@ -34,13 +34,10 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual ThreadStrategy *create ( - ::PortableServer::ThreadPolicyValue value) = 0; + virtual ThreadStrategy *create (::PortableServer::ThreadPolicyValue value) = 0; /// Cleanup the given strategy instance - virtual void destroy ( - ThreadStrategy *strategy - ) = 0; + virtual void destroy (ThreadStrategy *strategy) = 0; }; } } diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index 8a6b8f49b1a..a444714bd23 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -78,7 +78,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( ThreadStrategyFactoryImpl, ACE_TEXT ("ThreadStrategyFactory"), diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h index 1777f215aa8..a968b63d4ef 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h @@ -32,12 +32,9 @@ namespace TAO { public: /// Create a new servant retention strategy - virtual ThreadStrategy* create ( - ::PortableServer::ThreadPolicyValue value); + virtual ThreadStrategy* create (::PortableServer::ThreadPolicyValue value); - virtual void destroy ( - ThreadStrategy *strategy - ); + virtual void destroy (ThreadStrategy *strategy); }; } } diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp index e611c4e193b..aa99de625fe 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp @@ -28,8 +28,6 @@ namespace TAO } } - - ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, ThreadStrategyORBControl, diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp index 00840d2f40f..6f58c76f9ec 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp @@ -32,7 +32,6 @@ namespace TAO } } - ACE_FACTORY_NAMESPACE_DEFINE ( ACE_Local_Service, ThreadStrategySingle, diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index a89644c05b0..8b9f2a898d2 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -47,7 +47,6 @@ namespace TAO } } - ACE_STATIC_SVC_DEFINE ( ThreadStrategySingleFactoryImpl, ACE_TEXT ("ThreadStrategySingleFactory"), diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h index 96b852eb06c..bd3f0fc4f95 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h @@ -34,8 +34,7 @@ namespace TAO { public: /// Create a new thread strategy - virtual ThreadStrategy* create ( - ::PortableServer::ThreadPolicyValue value); + virtual ThreadStrategy* create (::PortableServer::ThreadPolicyValue value); virtual void destroy (ThreadStrategy *strategy); }; diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h index 7cd54ca9dc1..6184aa987dd 100644 --- a/TAO/tao/PortableServer/Upcall_Command.h +++ b/TAO/tao/PortableServer/Upcall_Command.h @@ -46,7 +46,6 @@ namespace TAO /// Execute the upcall. virtual void execute (void) = 0; }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h index 44f9f7ed5d1..afcc4f5b253 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Upcall_Wrapper.h @@ -110,7 +110,6 @@ namespace TAO TAO::Argument * const * args, size_t nargs); }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index a59912b817e..e961e8b419a 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -24,9 +24,12 @@ #include "tao/OctetSeqC.h" #include "tao/Pseudo_VarOut_T.h" - #include "ace/Thread_Mutex.h" -#include "ace/Atomic_Op.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -91,7 +94,11 @@ namespace CORBA private: /// Reference counter. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ }; } // End CORBA namespace diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 38c32e5cd3f..88423d1657e 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -22,7 +22,11 @@ #include "tao/GIOP_Message_Version.h" #include "tao/Refcounted_ObjectKey.h" #include "tao/Service_Callbacks.h" -#include "ace/Atomic_Op.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; @@ -380,7 +384,11 @@ private: TAO_MProfile* forward_to_; /// Number of outstanding references to this object. - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else + ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ /// A lock that protects creation of the tagged profile TAO_SYNCH_MUTEX tagged_profile_lock_; @@ -442,7 +450,6 @@ public: virtual int decode_endpoints (void); protected: - virtual CORBA::Boolean do_is_equivalent (const TAO_Profile* other_profile); virtual TAO_Service_Callbacks::Profile_Equivalence is_equivalent_hook ( const TAO_Profile* other_profile); diff --git a/TAO/tao/QtResource/QtResource.mpc b/TAO/tao/QtResource/QtResource.mpc index 4d30a4b84d0..bda61f23dd8 100644 --- a/TAO/tao/QtResource/QtResource.mpc +++ b/TAO/tao/QtResource/QtResource.mpc @@ -1,5 +1,5 @@ -// -*- MPC -*- now wouldn't this be cool... -project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qt4reactor, taoidldefaults { +// -*- MPC -*- +project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qtreactor, taoidldefaults { sharedname = TAO_QtResource dynamicflags += TAO_QTRESOURCE_BUILD_DLL diff --git a/TAO/tao/QtResource/QtResource_Factory.h b/TAO/tao/QtResource/QtResource_Factory.h index b093986fc2a..6540d2a70c8 100644 --- a/TAO/tao/QtResource/QtResource_Factory.h +++ b/TAO/tao/QtResource/QtResource_Factory.h @@ -40,16 +40,13 @@ namespace TAO class TAO_QtResource_Export QtResource_Factory : public GUIResource_Factory { public: - QtResource_Factory (QApplication *qapp_); protected: - /// Create or obtain current reactor implementation virtual ACE_Reactor_Impl *reactor_impl (void); private: - /// Reactor created by this factory. ACE_QtReactor *reactor_impl_; diff --git a/TAO/tao/QtResource/QtResource_Loader.h b/TAO/tao/QtResource/QtResource_Loader.h index 5446c77a3d1..807fa57f301 100644 --- a/TAO/tao/QtResource/QtResource_Loader.h +++ b/TAO/tao/QtResource/QtResource_Loader.h @@ -21,7 +21,9 @@ #include "tao/Versioned_Namespace.h" -#if defined (ACE_HAS_QT4) +#ifdef ACE_HAS_QT5 +#include <QtWidgets/QApplication> +#elif defined ACE_HAS_QT4 #include <QtGui/qapplication.h> #else #include <qapplication.h> diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp index 8ab26007dbf..bba2c40b318 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp @@ -18,8 +18,7 @@ TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj) { return TAO_Priority_Mapping_Manager::_duplicate ( - dynamic_cast<TAO_Priority_Mapping_Manager_ptr> (obj) - ); + dynamic_cast<TAO_Priority_Mapping_Manager_ptr> (obj)); } TAO_Priority_Mapping_Manager_ptr diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index e101bb672f5..622de35c11e 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -890,7 +890,11 @@ RTCORBA::ThreadpoolId TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool) { // Make sure of safe deletion in case of errors. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool); +#else auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool); +#endif /* ACE_HAS_CPP11 */ // Open the pool. thread_pool->open (); diff --git a/TAO/tao/Refcounted_ObjectKey.cpp b/TAO/tao/Refcounted_ObjectKey.cpp index 5c87170bbbc..4290884211a 100644 --- a/TAO/tao/Refcounted_ObjectKey.cpp +++ b/TAO/tao/Refcounted_ObjectKey.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Refcounted_ObjectKey::Refcounted_ObjectKey (const TAO::ObjectKey &key) : object_key_ (key) - , ref_count_ (1) + , refcount_ (1) { } diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h index 4a8dd4c0a46..96142a512d6 100644 --- a/TAO/tao/Refcounted_ObjectKey.h +++ b/TAO/tao/Refcounted_ObjectKey.h @@ -62,7 +62,7 @@ namespace TAO ObjectKey object_key_; /// The refcount on the object key.. - CORBA::ULong ref_count_; + CORBA::ULong refcount_; }; } diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl index eaef9e967cd..35fa18b2ea3 100644 --- a/TAO/tao/Refcounted_ObjectKey.inl +++ b/TAO/tao/Refcounted_ObjectKey.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void TAO::Refcounted_ObjectKey::incr_refcount (void) { - ++this->ref_count_; + ++this->refcount_; } ACE_INLINE const TAO::ObjectKey & @@ -16,12 +16,12 @@ TAO::Refcounted_ObjectKey::object_key (void) const ACE_INLINE CORBA::ULong TAO::Refcounted_ObjectKey::decr_refcount (void) { - if (--this->ref_count_ > 0) + if (--this->refcount_ > 0) { - return this->ref_count_; + return this->refcount_; } - ACE_ASSERT (this->ref_count_ == 0); + ACE_ASSERT (this->refcount_ == 0); delete this; diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index a2ebe2f4838..620f87f65e2 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -11,7 +11,7 @@ TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (ACE_Allocator *allocator) // Just an invalid reply status. : locate_reply_status_ (GIOP::UNKNOWN_OBJECT) , reply_status_ (GIOP::NO_EXCEPTION) - , refcnt_ (1) + , refcount_ (1) , allocator_(allocator) { } @@ -27,7 +27,7 @@ TAO_Reply_Dispatcher::intrusive_add_ref (TAO_Reply_Dispatcher* rd) { if (rd != 0) { - ++rd->refcnt_; + ++rd->refcount_; } } @@ -36,7 +36,7 @@ TAO_Reply_Dispatcher::intrusive_remove_ref (TAO_Reply_Dispatcher* rd) { if (rd != 0) { - long tmp = --rd->refcnt_; + long const tmp = --rd->refcount_; if (tmp <= 0) { if (rd->allocator_) diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index b01c69d657e..949bf0dfccd 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -103,7 +103,7 @@ protected: private: /// Support for intrusive reference counting - ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> refcnt_; + ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> refcount_; /// Allocator that was used to allocate this reply dispatcher. In case of /// zero we come from the heap. diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index 8aa7157ca9c..e2f35c788f5 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -236,7 +236,7 @@ public: virtual TAO_LF_Strategy *create_lf_strategy (void) = 0; /// Outgoing fragment creation strategy. - virtual auto_ptr<TAO_GIOP_Fragmentation_Strategy> + virtual TAO_GIOP_Fragmentation_Strategy* create_fragmentation_strategy (TAO_Transport * transport, CORBA::ULong max_message_size) const = 0; diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp index b7961c0af1b..f39f2ce2a88 100644 --- a/TAO/tao/Service_Context.cpp +++ b/TAO/tao/Service_Context.cpp @@ -84,7 +84,7 @@ void TAO_Service_Context::set_context_i (const IOP::ServiceContext& context) { // @@ TODO Some contexts can show up multiple times, others - // can't find out and take appropiate action. + // can't find out and take appropriate action. for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i) { if (context.context_id == this->service_context_[i].context_id) @@ -119,7 +119,7 @@ void TAO_Service_Context::add_context_i (IOP::ServiceContext& context) { // @@ TODO Some contexts can show up multiple times, others - // can't find out and take appropiate action. + // can't find out and take appropriate action. CORBA::ULong const l = this->service_context_.length (); this->service_context_.length (l + 1); this->service_context_[l].context_id = context.context_id; @@ -133,7 +133,7 @@ void TAO_Service_Context::add_context_i (const IOP::ServiceContext& context) { // @@ TODO Some contexts can show up multiple times, others - // can't find out and take appropiate action. + // can't find out and take appropriate action. CORBA::ULong const l = this->service_context_.length (); this->service_context_.length (l + 1); this->service_context_[l] = context; diff --git a/TAO/tao/Storable_File_Guard.cpp b/TAO/tao/Storable_File_Guard.cpp index 05a9ade6dfb..09a4b60f57e 100644 --- a/TAO/tao/Storable_File_Guard.cpp +++ b/TAO/tao/Storable_File_Guard.cpp @@ -239,7 +239,7 @@ TAO::Storable_File_Guard::load () { // Load the data from the newly restored primary. result = this->load_from_stream (); } - catch (const Storable_Read_Exception) + catch (const Storable_Read_Exception&) { // Still having trouble reading from the file. Time to bail. TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) ERROR: Unable to restore ") diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 2a582f8e2a5..83443fd6430 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -153,18 +153,9 @@ TAO_SHMIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint) if (endp == 0) return 0; - // @@ TODO The following code looks funky, why only the host - // name is compared? What if there are multiple SHMIOP - // servers in the same address? Why do SHMIOP_Endpoints keep - // a INET_Addr but not a MEM_Addr? And why is there no lazy - // evaluation of IP-addresses for SHMIOP endpoints? Is it - // because it is always 'localhost'? We need answers to - // these questions to solve: - // - // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220 - // - // The following code is suspec - // compare the port and sin_addr (numeric host address) + if (endp->port () != this->address_.get_port_number ()) + return 0; + return this->address_.same_host (endp->object_addr ()); } diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index bcf909b54ee..3f0532eb050 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -96,8 +96,14 @@ TAO_SHMIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) // Verify that the remote ACE_INET_Addr was initialized properly. // Failure can occur if hostname lookup failed when initializing the // remote ACE_INET_Addr. - if (remote_address.get_type () != AF_INET) + switch (remote_address.get_type ()) { + case AF_INET: +#ifdef ACE_HAS_IPV6 + case AF_INET6: +#endif + break; + default: if (TAO_debug_level > 0) { TAOLIB_ERROR ((LM_ERROR, @@ -111,7 +117,6 @@ TAO_SHMIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) } return 0; - } TAO_Transport * diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index 94c29e1ff66..17a3b19add8 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -386,7 +386,7 @@ TAO_SHMIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const else { TAOLIB_ERROR ((LM_ERROR, - "(%P|%t) TAO - UIOP_Profile::create_profile_body " + "(%P|%t) TAO - SHMIOP_Profile::create_profile_body " "no object key marshalled\n")); } diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index 92ee31f5679..e6638ac8f3f 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -120,7 +120,7 @@ TAO_UIOP_Connection_Handler::open (void*) if (TAO_debug_level > 0) TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) UIOP connection to server ") + ACE_TEXT ("TAO (%P|%t) - UIOP_Connection_Handler::open, connection to server ") ACE_TEXT ("<%C> on %d\n"), addr.get_path_name (), this->peer ().get_handle ())); diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index aaa5e1cd849..5f5a645e70e 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -334,7 +334,7 @@ TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj) return this_profile->is_equivalent (other_profile); } -// Memory managment +// Memory management TAO_Profile * TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile) @@ -456,8 +456,11 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add) { // Notice the use of an explicit constructor.... - auto_ptr<TAO_Policy_Set> policy_manager ( - new TAO_Policy_Set (TAO_POLICY_OBJECT_SCOPE)); +#if defined (ACE_HAS_CPP11) + std::unique_ptr<TAO_Policy_Set> policy_manager (new TAO_Policy_Set (TAO_POLICY_OBJECT_SCOPE)); +#else + auto_ptr<TAO_Policy_Set> policy_manager (new TAO_Policy_Set (TAO_POLICY_OBJECT_SCOPE)); +#endif /* ACE_HAS_CPP11 */ if (set_add == CORBA::SET_OVERRIDE) { diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 0f5ac9a6bbe..9b1764436e1 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -22,8 +22,11 @@ #include "tao/MProfile.h" #include "tao/ORB_Core_Auto_Ptr.h" - -#include "ace/Atomic_Op.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ #if defined (HPUX) && defined (IOR) /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h @@ -381,7 +384,11 @@ protected: CORBA::Boolean profile_success_; /// Reference counter. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ /// The policy overrides in this object, if nil then use the default /// policies. @@ -412,7 +419,6 @@ protected: /// True if forwarding request upon some specific exceptions /// (e.g. OBJECT_NOT_EXIST) already happened. ACE_Atomic_Op<TAO_SYNCH_MUTEX, bool> forwarded_on_exception_; - }; // Define a TAO_Stub auto_ptr class. diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index c2159dc9049..4b7563ec7a6 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -126,18 +126,18 @@ namespace TAO { if (this->retry_state_ && this->retry_state_->forward_on_exception_increment(FOE_TRANSIENT)) - { - if (TAO_debug_level > 0) - TAOLIB_DEBUG ((LM_INFO, - ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") - ACE_TEXT ("remote_twoway retrying on TRANSIENT ") - ACE_TEXT ("exception\n"))); - this->retry_state_->next_profile_retry (*this->stub ()); + { + if (TAO_debug_level > 0) + TAOLIB_DEBUG ((LM_INFO, + ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") + ACE_TEXT ("remote_twoway retrying on TRANSIENT ") + ACE_TEXT ("exception\n"))); + this->retry_state_->next_profile_retry (*this->stub ()); #if TAO_HAS_INTERCEPTORS == 1 - s = this->receive_other_interception (); + s = this->receive_other_interception (); #endif /* TAO_HAS_INTERCEPTORS */ - return TAO_INVOKE_RESTART; - } + return TAO_INVOKE_RESTART; + } else { // Way back, we failed to find a profile we could connect to. @@ -585,7 +585,11 @@ namespace TAO // We must manage the memory allocated // by the call above to alloc(). +#if defined (ACE_HAS_CPP11) + std::unique_ptr<CORBA::Exception> safety (exception); +#else auto_ptr<CORBA::Exception> safety (exception); +#endif /* ACE_HAS_CPP11 */ exception->_raise (); @@ -732,7 +736,11 @@ namespace TAO // Without this, the call to create_system_exception() above // causes a memory leak. On platforms without native exceptions, // the CORBA::Environment class manages the memory. +#if defined (ACE_HAS_CPP11) + std::unique_ptr<CORBA::SystemException> safety (ex); +#else auto_ptr<CORBA::SystemException> safety (ex); +#endif /* ACE_HAS_CPP11 */ ex->minor (minor); ex->completed (CORBA::CompletionStatus (completion)); diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 90f81fdf77d..ea8146e67c2 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -415,8 +415,9 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, if (TAO_debug_level > 4) TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - We are%Cthe default ") - ACE_TEXT ("ORB ...\n"), - (service_open_count == 0) ? " " : " not ")); + ACE_TEXT ("%C ORB ...\n"), + (service_open_count == 0) ? " " : " not ", + TAO_VERSION)); } ++service_open_count; diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp index a183ce96ac1..3ca35d08ca4 100644 --- a/TAO/tao/TAO_Singleton.cpp +++ b/TAO/tao/TAO_Singleton.cpp @@ -91,8 +91,12 @@ TAO_Singleton<TYPE, ACE_LOCK>::instance (void) ACE_NEW_RETURN (singleton, (TAO_Singleton<TYPE, ACE_LOCK>), 0); // Register for destruction with TAO_Singleton_Manager. - TAO_Singleton_Manager::at_exit (singleton, 0, typeid (TYPE).name()); -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) +#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 0) + TAO_Singleton_Manager::at_exit (singleton, 0, + typeid (TYPE).name ()); +#else + TAO_Singleton_Manager::at_exit (singleton, &lock, + typeid (TYPE).name()); } #endif /* ACE_MT_SAFE */ } @@ -102,10 +106,18 @@ TAO_Singleton<TYPE, ACE_LOCK>::instance (void) } template <class TYPE, class ACE_LOCK> void -TAO_Singleton<TYPE, ACE_LOCK>::cleanup (void *) +TAO_Singleton<TYPE, ACE_LOCK>::cleanup (void *param) { delete this; TAO_Singleton<TYPE, ACE_LOCK>::instance_i () = 0; + +#if defined ACE_MT_SAFE && ACE_MT_SAFE != 0 + if (param) + { + ACE_LOCK **lock = static_cast<ACE_LOCK **> (param); + *lock = 0; + } +#endif } #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp index 98e233c69e3..b95b4a0cae9 100644 --- a/TAO/tao/Tagged_Components.cpp +++ b/TAO/tao/Tagged_Components.cpp @@ -171,7 +171,7 @@ void TAO_Tagged_Components::set_component_i (const IOP::TaggedComponent& component) { // @@ TODO Some components can show up multiple times, others - // can't find out and take appropiate action. + // can't find out and take appropriate action. for (CORBA::ULong i = 0; i != this->components_.length (); ++i) { if (component.tag == this->components_[i].tag) @@ -206,7 +206,7 @@ void TAO_Tagged_Components::add_component_i (IOP::TaggedComponent& component) { // @@ TODO Some components can show up multiple times, others - // can't find out and take appropiate action. + // can't find out and take appropriate action. CORBA::ULong l = this->components_.length (); this->components_.length (l + 1); this->components_[l].tag = component.tag; @@ -220,7 +220,7 @@ void TAO_Tagged_Components::add_component_i (const IOP::TaggedComponent& component) { // @@ TODO Some components can show up multiple times, others - // can't find out and take appropiate action. + // can't find out and take appropriate action. CORBA::ULong l = this->components_.length (); this->components_.length (l + 1); this->components_[l] = component; diff --git a/TAO/tao/TkResource/TkResource.mpc b/TAO/tao/TkResource/TkResource.mpc index bf46b62e39f..72bc4345eeb 100644 --- a/TAO/tao/TkResource/TkResource.mpc +++ b/TAO/tao/TkResource/TkResource.mpc @@ -1,4 +1,4 @@ -// -*- MPC -*- now wouldn't this be cool... +// -*- MPC -*- project(TAO_TkResource) : acelib, taolib, install, tao_output, taodefaults, ace_tkreactor, taoidldefaults { sharedname = TAO_TkResource dynamicflags += TAO_TKRESOURCE_BUILD_DLL diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index da23142d059..d23b249e062 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -25,6 +25,11 @@ #include "tao/Objref_VarOut_T.h" #include "tao/Object.h" /* For CORBA::Object_var */ #include "tao/Pseudo_VarOut_T.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -143,7 +148,11 @@ namespace CORBA private: /// Number of outstanding references to this object. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ CORBA::Boolean is_collocated_; TAO_Abstract_ServantBase *servant_; diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index 9fc61b1b0c3..dd0a46c847e 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -1426,9 +1426,13 @@ CORBA::DefaultValueRefCountBase::_tao_remove_ref (void) } CORBA::ULong -CORBA::DefaultValueRefCountBase::_tao_refcount_value (void) +CORBA::DefaultValueRefCountBase::_tao_refcount_value (void) const { +#if defined (ACE_HAS_CPP11) + return this->refcount_; +#else return this->refcount_.value (); +#endif /* ACE_HAS_CPP11 */ } // =========================================================== diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 7eb6e378259..25a68b6e00a 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -30,7 +30,11 @@ #include "ace/Basic_Types.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" -#include "ace/Atomic_Op.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ #include "ace/Null_Mutex.h" #include "ace/Vector_T.h" @@ -331,7 +335,7 @@ namespace CORBA /// (if valuetype T is compiled with optimization for that.) %! (todo) void _tao_add_ref (void); void _tao_remove_ref (void); - CORBA::ULong _tao_refcount_value (void); + CORBA::ULong _tao_refcount_value (void) const; protected: DefaultValueRefCountBase (void); @@ -343,7 +347,11 @@ namespace CORBA private: // data /// Reference counter. +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ }; // DefaultValueRefCountBase // which lock has the lowest memory overhead ? diff --git a/TAO/tao/Valuetype/ValueBase.inl b/TAO/tao/Valuetype/ValueBase.inl index 3015b22d45c..e76c57a61f1 100644 --- a/TAO/tao/Valuetype/ValueBase.inl +++ b/TAO/tao/Valuetype/ValueBase.inl @@ -16,7 +16,7 @@ TAO_OBV_GIOP_Flags::is_value_tag (CORBA::Long tag) } ACE_INLINE CORBA::Boolean -TAO_OBV_GIOP_Flags:: has_codebase_url (CORBA::Long tag) +TAO_OBV_GIOP_Flags::has_codebase_url (CORBA::Long tag) { return (CORBA::Boolean) (tag & Codebase_url); } @@ -40,7 +40,7 @@ TAO_OBV_GIOP_Flags::has_list_type_info (CORBA::Long tag) } ACE_INLINE CORBA::Boolean -TAO_OBV_GIOP_Flags:: is_chunked (CORBA::Long tag) +TAO_OBV_GIOP_Flags::is_chunked (CORBA::Long tag) { return (CORBA::Boolean) (tag & 8); } diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp index d65e09ed1c0..ad7003800d2 100644 --- a/TAO/tao/Valuetype/ValueFactory.cpp +++ b/TAO/tao/Valuetype/ValueFactory.cpp @@ -27,7 +27,7 @@ CORBA::remove_ref (CORBA::ValueFactoryBase *val) // =========================================================== CORBA::ValueFactoryBase::ValueFactoryBase (void) - : _tao_reference_count_ (1) + : refcount_ (1) { } @@ -38,13 +38,13 @@ CORBA::ValueFactoryBase::~ValueFactoryBase (void) void CORBA::ValueFactoryBase::_add_ref (void) { - ++this->_tao_reference_count_; + ++this->refcount_; } void CORBA::ValueFactoryBase::_remove_ref (void) { - CORBA::ULong const new_count = --this->_tao_reference_count_; + CORBA::ULong const new_count = --this->refcount_; if (new_count == 0) delete this; diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 7f18962a74b..6003f803086 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -26,7 +26,11 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" #include "ace/Null_Mutex.h" -#include "ace/Atomic_Op.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -68,7 +72,11 @@ namespace CORBA private: /// Reference counter. - ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> _tao_reference_count_; +#if defined (ACE_HAS_CPP11) + std::atomic<uint32_t> refcount_; +#else + ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; +#endif /* ACE_HAS_CPP11 */ }; } // End CORBA namespace diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index cc44cc260f3..87760ca851a 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -3,10 +3,10 @@ // This is file was automatically generated by $ACE_ROOT/bin/make_release.py #define TAO_MAJOR_VERSION 2 -#define TAO_MINOR_VERSION 4 -#define TAO_MICRO_VERSION 6 -#define TAO_BETA_VERSION 6 -#define TAO_VERSION "2.4.6" -#define TAO_VERSION_CODE 132102 +#define TAO_MINOR_VERSION 5 +#define TAO_MICRO_VERSION 2 +#define TAO_BETA_VERSION 2 +#define TAO_VERSION "2.5.2" +#define TAO_VERSION_CODE 132354 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/TAO/tao/XtResource/XtResource.mpc b/TAO/tao/XtResource/XtResource.mpc index f0bf77f78af..e59c3ee021d 100644 --- a/TAO/tao/XtResource/XtResource.mpc +++ b/TAO/tao/XtResource/XtResource.mpc @@ -1,4 +1,4 @@ -// -*- MPC -*- now wouldn't this be cool... +// -*- MPC -*- project(TAO_XtResource) : acelib, taolib, install, tao_output, taodefaults, ace_xtreactor, taoidldefaults { sharedname = TAO_XtResource dynamicflags += TAO_XTRESOURCE_BUILD_DLL diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 9bcd535662d..8ea0122bbb4 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -1110,14 +1110,12 @@ TAO_Default_Resource_Factory::create_lf_strategy (void) return strategy; } -auto_ptr<TAO_GIOP_Fragmentation_Strategy> +TAO_GIOP_Fragmentation_Strategy* TAO_Default_Resource_Factory::create_fragmentation_strategy ( TAO_Transport * transport, CORBA::ULong max_message_size) const { - auto_ptr<TAO_GIOP_Fragmentation_Strategy> strategy (0); - - TAO_GIOP_Fragmentation_Strategy * tmp = 0; + TAO_GIOP_Fragmentation_Strategy* strategy = 0; // Minimum GIOP message size is 24 (a multiple of 8): // 12 GIOP Message Header @@ -1136,14 +1134,14 @@ TAO_Default_Resource_Factory::create_fragmentation_strategy ( || (TAO_DEF_GIOP_MAJOR == 1 && TAO_DEF_GIOP_MINOR < 2)) { // No maximum was set by the user. - ACE_NEW_RETURN (tmp, + ACE_NEW_RETURN (strategy, TAO_Null_Fragmentation_Strategy, strategy); } else { - ACE_NEW_RETURN (tmp, + ACE_NEW_RETURN (strategy, TAO_On_Demand_Fragmentation_Strategy ( transport, max_message_size), @@ -1151,8 +1149,6 @@ TAO_Default_Resource_Factory::create_fragmentation_strategy ( } } - ACE_auto_ptr_reset (strategy, tmp); - return strategy; } diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 6d1bcf05f31..e1ff41ce021 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -181,7 +181,7 @@ public: virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void); TAO_Resource_Factory::Resource_Usage resource_usage_strategy (void) const; virtual TAO_LF_Strategy *create_lf_strategy (void); - virtual auto_ptr<TAO_GIOP_Fragmentation_Strategy> + virtual TAO_GIOP_Fragmentation_Strategy* create_fragmentation_strategy (TAO_Transport * transport, CORBA::ULong max_message_size) const; virtual void disable_factory (void); diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index ebbf303c141..bdace9457dd 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -71,12 +71,12 @@ public: /// Constructor TAO_Operation_Details (const char *name, - CORBA::ULong len, + const CORBA::ULong len, TAO::Argument **args = 0, - CORBA::ULong num_args = 0, - CORBA::Boolean has_in_args = true, - TAO::Exception_Data *ex_data = 0, - CORBA::ULong ex_count = 0); + const CORBA::ULong num_args = 0, + const CORBA::Boolean has_in_args = true, + const TAO::Exception_Data *ex_data = 0, + const CORBA::ULong ex_count = 0); /// Operation name const char* opname (void) const; @@ -181,7 +181,7 @@ private: const char *opname_; /// Precalculated length of opname_. - CORBA::ULong opname_len_; + const CORBA::ULong opname_len_; /// Request ID of this operation. CORBA::ULong request_id_; @@ -207,16 +207,16 @@ private: TAO::Argument **args_; /// Number of arguments including the return value - CORBA::ULong num_args_; + const CORBA::ULong num_args_; /// A flag indicating any args are sent with the request - CORBA::Boolean has_in_args_; + const CORBA::Boolean has_in_args_; /// The type of exceptions that the operations can throw. - TAO::Exception_Data *ex_data_; + const TAO::Exception_Data *ex_data_; /// Count of the exceptions that operations can throw. - CORBA::ULong ex_count_; + const CORBA::ULong ex_count_; /// Boolean flag to indicate whether in the skeletons the stub arguments /// stored in these operation details should be used or not. diff --git a/TAO/tao/operation_details.inl b/TAO/tao/operation_details.inl index e012c99347a..216113cb758 100644 --- a/TAO/tao/operation_details.inl +++ b/TAO/tao/operation_details.inl @@ -4,12 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Operation_Details::TAO_Operation_Details (const char *name, - CORBA::ULong len, + const CORBA::ULong len, TAO::Argument **args, - CORBA::ULong num, - CORBA::Boolean has_in_args, - TAO::Exception_Data *data, - CORBA::ULong count) + const CORBA::ULong num, + const CORBA::Boolean has_in_args, + const TAO::Exception_Data *data, + const CORBA::ULong count) : opname_ (name) , opname_len_ (len) , request_id_ (0) diff --git a/TAO/tests/Big_Oneways/README b/TAO/tests/Big_Oneways/README index fab7d1470ac..3de1a42ef28 100644 --- a/TAO/tests/Big_Oneways/README +++ b/TAO/tests/Big_Oneways/README @@ -12,7 +12,7 @@ deadlocks. This is part of the regression testsuite for: -http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=132 +http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=132 To run the test use the run_test.pl script: diff --git a/TAO/tests/Big_Request_Muxing/README b/TAO/tests/Big_Request_Muxing/README index 89dde8ae8d2..4a403aea5b2 100644 --- a/TAO/tests/Big_Request_Muxing/README +++ b/TAO/tests/Big_Request_Muxing/README @@ -15,7 +15,7 @@ output data as possible. This is part of the regression testsuite for: -http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=132 +http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=132 To run the test use the run_test.pl script: diff --git a/TAO/tests/Big_Twoways/README b/TAO/tests/Big_Twoways/README index fab7d1470ac..3de1a42ef28 100644 --- a/TAO/tests/Big_Twoways/README +++ b/TAO/tests/Big_Twoways/README @@ -12,7 +12,7 @@ deadlocks. This is part of the regression testsuite for: -http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=132 +http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=132 To run the test use the run_test.pl script: diff --git a/TAO/tests/Blocking_Sync_None/README b/TAO/tests/Blocking_Sync_None/README index bf6a187cda4..b449d64be06 100644 --- a/TAO/tests/Blocking_Sync_None/README +++ b/TAO/tests/Blocking_Sync_None/README @@ -8,7 +8,7 @@ that the ORB never blocks a request made with the SYNC_NONE scope policy. This is a regression test for: -http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=858 +http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=858 To run the test use the run_test.pl script: diff --git a/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp b/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp index 8cdeab1213f..b1fefa0beb4 100644 --- a/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp +++ b/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp @@ -3,17 +3,15 @@ * * @author Carlos O'Ryan <coryan@atdesk.com> */ -#include "Echo_Callback.h" - +#include "Echo_Callback.h" Echo_Callback::Echo_Callback() { } void -Echo_Callback::echo_payload(Test::Payload const & - TAO_ENV_ARG_DECL_NOT_USED) +Echo_Callback::echo_payload(Test::Payload const &) { static int n = 0; n++; @@ -25,7 +23,6 @@ Echo_Callback::echo_payload(Test::Payload const & } void -Echo_Callback::echo_payload_excep(Test::AMI_EchoExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) +Echo_Callback::echo_payload_excep(Test::AMI_EchoExceptionHolder *) { } diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.cpp b/TAO/tests/Bug_2241_Regression/Client_Task.cpp index ef58f4548f7..419c8e44bbb 100644 --- a/TAO/tests/Bug_2241_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2241_Regression/Client_Task.cpp @@ -39,7 +39,7 @@ Client_Task::svc (void) hello->shutdown (); } - catch (const CORBA::INTERNAL) + catch (const CORBA::INTERNAL&) { exception = true; ACE_DEBUG ((LM_DEBUG, "OK: Client_Task Expected exception received\n")); diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp index 1a33f5446ac..a856b824816 100644 --- a/TAO/tests/Bug_2356_Regression/client.cpp +++ b/TAO/tests/Bug_2356_Regression/client.cpp @@ -174,8 +174,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } poa_var->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_2356_Regression/server.cpp b/TAO/tests/Bug_2356_Regression/server.cpp index a88b205577c..3bee8f93cbd 100644 --- a/TAO/tests/Bug_2356_Regression/server.cpp +++ b/TAO/tests/Bug_2356_Regression/server.cpp @@ -104,8 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp index edfd9b3a5c0..7ab1cc23b6f 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp @@ -131,9 +131,7 @@ Publisher_impl::~Publisher_impl() delete worker; } -void subscribe ( - ::Subscriber_ptr subscriber - ); +void subscribe (::Subscriber_ptr subscriber); void Publisher_impl::subscribe( diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp index 16f2e65e36e..8ffd6a12f67 100644 --- a/TAO/tests/Bug_2805_Regression/client.cpp +++ b/TAO/tests/Bug_2805_Regression/client.cpp @@ -272,8 +272,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp index dd7cfbc2247..a8f1a9f3f6b 100644 --- a/TAO/tests/Bug_2909_Regression/client.cpp +++ b/TAO/tests/Bug_2909_Regression/client.cpp @@ -255,8 +255,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_2953_Regression/client.cpp b/TAO/tests/Bug_2953_Regression/client.cpp index 97767d80a2a..e85c91e7923 100644 --- a/TAO/tests/Bug_2953_Regression/client.cpp +++ b/TAO/tests/Bug_2953_Regression/client.cpp @@ -18,7 +18,7 @@ void shutdownORB(CORBA::ORB_ptr orb, const char * orbid) orb->destroy(); ACE_DEBUG ((LM_DEBUG, - "ORB <%C> is destoyed\n", + "ORB <%C> is destroyed\n", orbid)); } diff --git a/TAO/tests/Bug_2953_Regression/server.cpp b/TAO/tests/Bug_2953_Regression/server.cpp index 0c7ac2eb322..5c55c057945 100644 --- a/TAO/tests/Bug_2953_Regression/server.cpp +++ b/TAO/tests/Bug_2953_Regression/server.cpp @@ -209,7 +209,7 @@ void shutdownORB(CORBA::ORB_ptr orb, const char * orbid) orb->destroy(); ACE_DEBUG ((LM_DEBUG, - "ORB <%C> is destoyed\n", + "ORB <%C> is destroyed\n", orbid)); } diff --git a/TAO/tests/Bug_3384_Regression/README.txt b/TAO/tests/Bug_3384_Regression/README.txt index dbf2ca03db9..9119b7f24ef 100644 --- a/TAO/tests/Bug_3384_Regression/README.txt +++ b/TAO/tests/Bug_3384_Regression/README.txt @@ -9,7 +9,7 @@ The test verifies if a oneway sent as the first request on a new transport gets correctly pushed out as soon as the new transort has connected. This is a regression test for: -http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=3384 +http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=3384 To run the test use the run_test.pl script: diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp index 1ebbc8bde8e..3cc35b7b408 100644 --- a/TAO/tests/Bug_3567_Regression/client.cpp +++ b/TAO/tests/Bug_3567_Regression/client.cpp @@ -297,8 +297,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server->shutdown (); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp index d507293b4be..70949ace98e 100644 --- a/TAO/tests/Bug_3567_Regression/server.cpp +++ b/TAO/tests/Bug_3567_Regression/server.cpp @@ -132,8 +132,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) worker.thr_mgr ()->wait (); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_3672_Regression/server.cpp b/TAO/tests/Bug_3672_Regression/server.cpp index e1aa13af889..f67a367ce08 100644 --- a/TAO/tests/Bug_3672_Regression/server.cpp +++ b/TAO/tests/Bug_3672_Regression/server.cpp @@ -104,8 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_3683_Regression/Echo.idl b/TAO/tests/Bug_3683_Regression/Echo.idl index ffc69e77ab6..52779336b89 100644 --- a/TAO/tests/Bug_3683_Regression/Echo.idl +++ b/TAO/tests/Bug_3683_Regression/Echo.idl @@ -2,24 +2,22 @@ #if !defined (_ECHO_IDL) #define _ECHO_IDL +// Defines an interface that encapsulates operations that return the +// mesg string to be displayed and shuts down the server. interface Echo { - // = TITLE - // Defines an interface that encapsulates operations that return the - // mesg string to be displayed and shuts down the server. - typedef sequence<Object> List; - List echo_list (in string message); // This operation returns the message as a sequence of Objects and // displays it on the screen as a string. + List echo_list (in string message); - string echo_string (in string message); // This operation returns the message as a string and displays it on // the screen. + string echo_string (in string message); - oneway void shutdown (); // This operation will shutdown the server. + oneway void shutdown (); }; #endif /* _ECHO_IDL */ diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.h b/TAO/tests/Bug_3683_Regression/Simple_util.h index a890314a03c..b0564357d7c 100644 --- a/TAO/tests/Bug_3683_Regression/Simple_util.h +++ b/TAO/tests/Bug_3683_Regression/Simple_util.h @@ -27,7 +27,7 @@ * A template server definition. This template can be used by * single server/client projects for definition of their * server/clients. See the directories time, bank, echo for - * further details of implemenatation. + * further details of implementation. */ template <class Servant> class Server diff --git a/TAO/tests/Bug_3801_Regression/server.cpp b/TAO/tests/Bug_3801_Regression/server.cpp index e1aa13af889..f67a367ce08 100644 --- a/TAO/tests/Bug_3801_Regression/server.cpp +++ b/TAO/tests/Bug_3801_Regression/server.cpp @@ -104,8 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_3801_Regression/simple_client.cpp b/TAO/tests/Bug_3801_Regression/simple_client.cpp index e38fa4fe9a9..94dd6d6b5c8 100644 --- a/TAO/tests/Bug_3801_Regression/simple_client.cpp +++ b/TAO/tests/Bug_3801_Regression/simple_client.cpp @@ -273,8 +273,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } poa_var->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_3845_Regression/issue570.idl b/TAO/tests/Bug_3845_Regression/issue570.idl new file mode 100644 index 00000000000..c688ed48102 --- /dev/null +++ b/TAO/tests/Bug_3845_Regression/issue570.idl @@ -0,0 +1,4 @@ +// Reproducer IDL for issue 570 +// https://github.com/DOCGroup/ACE_TAO/issues/570 + +struct X { _; }; diff --git a/TAO/tests/Bug_3845_Regression/run_test.pl b/TAO/tests/Bug_3845_Regression/run_test.pl index bc7adaddbbc..d02a4a7e147 100755 --- a/TAO/tests/Bug_3845_Regression/run_test.pl +++ b/TAO/tests/Bug_3845_Regression/run_test.pl @@ -28,6 +28,7 @@ $input_file1 = $server->LocalFile ("local_inarg.idl"); $input_file2 = $server->LocalFile ("local_inoutarg.idl"); $input_file3 = $server->LocalFile ("local_outarg.idl"); $input_file4 = $server->LocalFile ("local_rettype.idl"); +$input_file5 = $server->LocalFile ("issue570.idl"); # Compile the IDL $SV = $server->CreateProcess ("$tao_idl", "$input_file1"); @@ -49,6 +50,11 @@ $SV = $server->CreateProcess ("$tao_idl", "$input_file4"); $server_status4 = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); +# Compile the IDL +$SV = $server->CreateProcess ("$tao_idl", "$input_file5"); + +$server_status5 = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); + open (STDOUT, ">&OLDOUT"); open (STDERR, ">&OLDERR"); @@ -72,4 +78,9 @@ if ($server_status4 == 0) { $status = 1; } +if ($server_status5 == 0) { + print STDERR "ERROR: tao_idl returned $server_status5 for $input_file5, should have failed\n"; + $status = 1; +} + exit $status; diff --git a/TAO/tests/Bug_3940_Regression/Bug_3940_Regression.mpc b/TAO/tests/Bug_3940_Regression/Bug_3940_Regression.mpc new file mode 100644 index 00000000000..92fc577565c --- /dev/null +++ b/TAO/tests/Bug_3940_Regression/Bug_3940_Regression.mpc @@ -0,0 +1,3 @@ +// -*- MPC -*- +project (test3940) : taolib_with_idl { +} diff --git a/TAO/tests/Bug_3940_Regression/README b/TAO/tests/Bug_3940_Regression/README new file mode 100644 index 00000000000..0f8198c1b8f --- /dev/null +++ b/TAO/tests/Bug_3940_Regression/README @@ -0,0 +1,16 @@ + + +This is a compile only test. If it compiles, it's passed. + +tao_idl choked on the annotation syntax of IDL4 (and DDS-XTypes) +because that syntax was unknown to its IDL grammar: + + tao_idl -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I../.. -Sa -St test.idl + syntax error + Error - tao_idl: "test.idl", line 3: Illegal syntax following module '{' opener + make[1]: *** [testC.h] Error 1 + +The first patch for this bug adds a rule in the lexer to ignore the annotations +by consuming them without action. +Actual processing of annotations is still to be done. + diff --git a/TAO/tests/Bug_3940_Regression/test.idl b/TAO/tests/Bug_3940_Regression/test.idl new file mode 100644 index 00000000000..0bb7fbcc68c --- /dev/null +++ b/TAO/tests/Bug_3940_Regression/test.idl @@ -0,0 +1,19 @@ +#if !defined (__BORLANDC__) + +module test { + + @unit("deg") + @range(min=0.0, max=360.0) + typedef float angle_t; + + @unit("degC") @min(-60) @max(100) typedef short temperature_t; + + struct structure { + @key unsigned long key; + angle_t degrees; + temperature_t celsius; + }; + +}; + +#endif diff --git a/TAO/tests/Bug_4213_Regression/Bug_4213_Regression.mpc b/TAO/tests/Bug_4213_Regression/Bug_4213_Regression.mpc new file mode 100644 index 00000000000..370086e5f73 --- /dev/null +++ b/TAO/tests/Bug_4213_Regression/Bug_4213_Regression.mpc @@ -0,0 +1,35 @@ +// -*- MPC -*- +project(*idl): taoidldefaults { + idlflags += -Sp + IDL_Files { + Test.idl + } + custom_only = 1 +} + +project(*Server): strategies, taoserver, iortable { + after += *idl + Source_Files { + Hello.cpp + server.cpp + } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } +} + +project(*Client): strategies, taoclient { + after += *idl + Source_Files { + client.cpp + } + Source_Files { + TestC.cpp + } + IDL_Files { + } +} + diff --git a/TAO/tests/Bug_4213_Regression/Hello.cpp b/TAO/tests/Bug_4213_Regression/Hello.cpp new file mode 100644 index 00000000000..733fe2bfcaf --- /dev/null +++ b/TAO/tests/Bug_4213_Regression/Hello.cpp @@ -0,0 +1,18 @@ +#include "Hello.h" + +Hello::Hello (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +char * +Hello::get_string (void) +{ + return CORBA::string_dup ("Hello there!"); +} + +void +Hello::shutdown (void) +{ + this->orb_->shutdown (0); +} diff --git a/TAO/tests/Bug_4213_Regression/Hello.h b/TAO/tests/Bug_4213_Regression/Hello.h new file mode 100644 index 00000000000..8b2124d9fe5 --- /dev/null +++ b/TAO/tests/Bug_4213_Regression/Hello.h @@ -0,0 +1,28 @@ + +#ifndef HELLO_H +#define HELLO_H +#include /**/ "ace/pre.h" + +#include "TestS.h" + +/// Implement the Test::Hello interface +class Hello + : public virtual POA_Test::Hello +{ +public: + /// Constructor + Hello (CORBA::ORB_ptr orb); + + // = The skeleton methods + virtual char * get_string (void); + + virtual void shutdown (void); + +private: + /// Use an ORB reference to convert strings to objects and shutdown + /// the application. + CORBA::ORB_var orb_; +}; + +#include /**/ "ace/post.h" +#endif /* HELLO_H */ diff --git a/TAO/tests/Bug_4213_Regression/Test.idl b/TAO/tests/Bug_4213_Regression/Test.idl new file mode 100644 index 00000000000..6cd2805ea74 --- /dev/null +++ b/TAO/tests/Bug_4213_Regression/Test.idl @@ -0,0 +1,17 @@ + +/// Put the interfaces in a module, to avoid global namespace pollution +module Test +{ + /// A very simple interface + interface Hello + { + /// Return a simple string + string get_string (); + + /// A method to shutdown the ORB + /** + * This method is used to simplify the test shutdown process + */ + oneway void shutdown (); + }; +}; diff --git a/TAO/tests/Bug_4213_Regression/client.cpp b/TAO/tests/Bug_4213_Regression/client.cpp new file mode 100644 index 00000000000..0c84ecddb37 --- /dev/null +++ b/TAO/tests/Bug_4213_Regression/client.cpp @@ -0,0 +1,71 @@ +#include "TestC.h" +#include "ace/Get_Opt.h" +#include "tao/Strategies/advanced_resource.h" + +const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var tmp = orb->string_to_object(ior); + + Test::Hello_var hello = Test::Hello::_narrow(tmp.in ()); + + if (CORBA::is_nil (hello.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil Test::Hello reference <%s>\n", + ior), + 1); + } + + CORBA::String_var the_string = hello->get_string (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%C>\n", + the_string.in ())); + + hello->shutdown (); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return 0; +} diff --git a/TAO/tests/Bug_4213_Regression/run_test.pl b/TAO/tests/Bug_4213_Regression/run_test.pl new file mode 100755 index 00000000000..2ab705ae6b3 --- /dev/null +++ b/TAO/tests/Bug_4213_Regression/run_test.pl @@ -0,0 +1,84 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +$status = 0; +$debug_level = '0'; +$cdebug_level = '0'; +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } + if ($i eq '-cdebug') { + $cdebug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $socket_name = "/tmp/endpoint"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $server_socket = $server->LocalFile ($socket_name); +my $client_iorfile = $client->LocalFile ($iorbase); +my $client_socket = $client->LocalFile ($socket_name); + +$server->DeleteFile($iorbase); +$server->DeleteFile($socket_name); +$client->DeleteFile($iorbase); +$client->DeleteFile($socket_name); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile -ORBEndpoint uiop://$server_socket"); +#$CL = $client->CreateProcess ("client", "-ORBdebuglevel $cdebug_level -k uioploc:///tmp/endpoint|Hello"); +$CL = $client->CreateProcess ("client", "-ORBdebuglevel $cdebug_level -k 'corbaloc:uiop:/tmp/endpoint|Hello'"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$server->DeleteFile($socket_name); +$client->DeleteFile($iorbase); +$client->DeleteFile($socket_name); + +exit $status; diff --git a/TAO/tests/Bug_4213_Regression/server.cpp b/TAO/tests/Bug_4213_Regression/server.cpp new file mode 100644 index 00000000000..302f1e898c9 --- /dev/null +++ b/TAO/tests/Bug_4213_Regression/server.cpp @@ -0,0 +1,113 @@ +#include "Hello.h" +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" +#include "tao/Strategies/advanced_resource.h" +#include "tao/IORTable/IORTable.h" + +const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile>" + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + + if (parse_args (argc, argv) != 0) + return 1; + + Hello *hello_impl = 0; + ACE_NEW_RETURN (hello_impl, + Hello (orb.in ()), + 1); + PortableServer::ServantBase_var owner_transfer(hello_impl); + + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test::Hello_var hello = Test::Hello::_narrow (object.in ()); + + CORBA::String_var ior = orb->object_to_string (hello.in ()); + + CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable"); + + IORTable::Table_var adapter = IORTable::Table::_narrow (table_object.in ()); + if (CORBA::is_nil (adapter.in ())) + { + ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); + } + else + { + adapter->bind ("Hello", ior.in ()); + } + + // Output the IOR to the <ior_output_file> + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: <%s>\n", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + poa_manager->activate (); + + orb->run (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); + + root_poa->destroy (1, 1); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return 0; +} diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp index 81c6cde743f..1b24186d9b1 100644 --- a/TAO/tests/CDR/tc.cpp +++ b/TAO/tests/CDR/tc.cpp @@ -112,7 +112,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) const char *name = tc->name (); CORBA::ULong length = 0; - // tc->length (TAO_TRY_ENV); if (TAO_debug_level > 0) { diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp index b5925ed1f44..8199914c81f 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp +++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp @@ -41,7 +41,7 @@ Client_Task::svc (void) hello->shutdown (); } - catch (const CORBA::INTERNAL) + catch (const CORBA::INTERNAL&) { exception = true; ACE_DEBUG ((LM_DEBUG, "OK: Client_Task Expected exception received\n")); diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp index b5925ed1f44..8199914c81f 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp @@ -41,7 +41,7 @@ Client_Task::svc (void) hello->shutdown (); } - catch (const CORBA::INTERNAL) + catch (const CORBA::INTERNAL&) { exception = true; ACE_DEBUG ((LM_DEBUG, "OK: Client_Task Expected exception received\n")); diff --git a/TAO/tests/Connection_Purging/README b/TAO/tests/Connection_Purging/README index 95524a2116d..d4b9df91f89 100644 --- a/TAO/tests/Connection_Purging/README +++ b/TAO/tests/Connection_Purging/README @@ -1,5 +1,3 @@ - - Connection Purging ------------------ diff --git a/TAO/tests/Connection_Purging/test.idl b/TAO/tests/Connection_Purging/test.idl index 7c5dec9cd92..5713764cb2a 100644 --- a/TAO/tests/Connection_Purging/test.idl +++ b/TAO/tests/Connection_Purging/test.idl @@ -1,6 +1,4 @@ interface test { void send_stuff(in string foo); - -// oneway void shutdown (); }; diff --git a/TAO/tests/Crash_On_Write/README b/TAO/tests/Crash_On_Write/README index 83cac031000..7ca7244e348 100644 --- a/TAO/tests/Crash_On_Write/README +++ b/TAO/tests/Crash_On_Write/README @@ -7,8 +7,8 @@ Test the behavior of the ORB when the server crashes in the middle of a write() operation. This is a regression test for: -http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=678 -http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=856 +http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=678 +http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=856 To run the test use the run_test.pl script: diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp index c2dbebb87a5..fa74efaad3d 100644 --- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp +++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp @@ -42,8 +42,7 @@ My_DII_Reply_Handler::handle_response(TAO_InputCDR &incoming) this->response_handler_->_tao_byte_order (incoming.byte_order ()); this->response_handler_->invoke_reply (opList.in(), - 0 // result - ); + 0); // result } catch (const CORBA::SystemException &ex) { diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index 3af5b0f5e85..3c8eb33be0b 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -242,8 +242,7 @@ Test_DynSequence::run_test (void) DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code ( - DynAnyTests::_tc_test_seq - ); + DynAnyTests::_tc_test_seq); DynamicAny::DynSequence_var ftc1 = DynamicAny::DynSequence::_narrow (ftc1_base.in ()); @@ -263,8 +262,7 @@ Test_DynSequence::run_test (void) DynamicAny::DynAny_var da_bool = dynany_factory->create_dyn_any_from_type_code ( - DynAnyTests::_tc_SeqBoolean - ); + DynAnyTests::_tc_SeqBoolean); DynamicAny::DynSequence_var ds_bool = DynamicAny::DynSequence::_narrow (da_bool.in ()); @@ -285,9 +283,7 @@ Test_DynSequence::run_test (void) )); DynamicAny::DynAny_var da_short = - dynany_factory->create_dyn_any_from_type_code ( - DynAnyTests::_tc_SeqShort - ); + dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_SeqShort); DynamicAny::DynSequence_var ds_short = DynamicAny::DynSequence::_narrow (da_short.in ()); diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index 3ef81705613..1d7151f0eb4 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -156,9 +156,7 @@ Test_DynStruct::run_test (void) "testing: constructor(TypeCode)/from_any/to_any\n")); DynamicAny::DynAny_var ftc1_base = - dynany_factory->create_dyn_any_from_type_code ( - DynAnyTests::_tc_test_struct - ); + dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct); DynamicAny::DynStruct_var ftc1 = DynamicAny::DynStruct::_narrow (ftc1_base.in ()); diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp index 24a29d7b8bf..d8e42eeb1ca 100644 --- a/TAO/tests/Explicit_Event_Loop/server.cpp +++ b/TAO/tests/Explicit_Event_Loop/server.cpp @@ -128,8 +128,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "Cannot open output file for writing IOR: %s", ior_output_file ), - 1 - ); + 1); } ACE_OS::fprintf (output_file, diff --git a/TAO/tests/LongUpcalls/README b/TAO/tests/LongUpcalls/README index 8101f7da6ed..a0136f39f0c 100644 --- a/TAO/tests/LongUpcalls/README +++ b/TAO/tests/LongUpcalls/README @@ -7,7 +7,7 @@ Verify that the ORB does not dead-lock, even in the presence of very long or unbounded upcalls. This is a regression test for: -http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=175 +http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=175 In the old days the leader thread would not allow any followers to take over while a long upcall or reply handler @@ -24,7 +24,7 @@ The test returns 0 on success. This test can also be used to verify that bug -http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=575 +http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=575 is still unresolved, all you need to do is run the following programs: diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index 49385975f6c..fa4f6948cc8 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -664,12 +664,10 @@ Param_Test_i::test_objref (Coffee_ptr o1, catch (const CORBA::SystemException& sysex) { sysex._tao_print_exception ("System Exception"); - // env.exception (TAO_TRY_ENV.exception ()); } catch (const CORBA::UserException& userex) { userex._tao_print_exception ("User Exception"); - // env.exception (TAO_TRY_ENV.exception ()); } return ret; diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp index e81c2d3ebaa..79836dbacda 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp @@ -22,7 +22,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_ERROR, "Got number %d\n", n)); server->shutdown (); - } catch (const ::CORBA::Exception &ex) { diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp index db2fe365522..540d1e6e0c8 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp @@ -162,7 +162,6 @@ public: slot_id = info->allocate_slot_id (); ACE_DEBUG ((LM_DEBUG, "Allocated slot with id %d.\n", slot_id)); - ServerRequestInterceptor_var interceptor (new ReplicaController ()); info->add_server_request_interceptor (interceptor.in ()); } @@ -199,7 +198,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa_manager->activate (); - // Dump the ior. // FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp index a7660ec5c1a..d27ae377027 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp @@ -89,7 +89,6 @@ void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h index b3bc101f5c0..3937af13fdd 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef TAO_INTERCEPTOR_TEST_I_H #define TAO_INTERCEPTOR_TEST_I_H @@ -21,9 +20,7 @@ */ class Visual_i : public POA_Test_Interceptors::Visual { - public: - Visual_i (CORBA::ORB_ptr orb); void normal (CORBA::Long arg); @@ -37,10 +34,8 @@ public: void shutdown (void); private: - /// The ORB pseudo-reference (for shutdown). CORBA::ORB_var orb_; - }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/TAO/tests/RTCORBA/README b/TAO/tests/RTCORBA/README index b914fed40d5..f72b4471da1 100644 --- a/TAO/tests/RTCORBA/README +++ b/TAO/tests/RTCORBA/README @@ -4,7 +4,7 @@ This directory houses a collection of tests which exercise TAO support for features defined in the RT-CORBA specification. Tests which exercise TAO-specific RT features can be found in $TAO_ROOT/performance-tests/RTCorba. OMG Real-time CORBA specification is available at: -http://cgi.omg.org/cgi-bin/doc?ptc/99-05-03 (or check the OMG website +http://www.omg.org/cgi-bin/doc?ptc/99-05-03 (or check the OMG website for a more recent version). More information on TAO's implementation of RT-CORBA 1.0 specification diff --git a/TAO/tests/SHMIOP/SHMIOP_Test.mpc b/TAO/tests/SHMIOP/SHMIOP_Test.mpc new file mode 100644 index 00000000000..8ccc71387cc --- /dev/null +++ b/TAO/tests/SHMIOP/SHMIOP_Test.mpc @@ -0,0 +1,11 @@ +project: taoidldefaults, taoserver, strategies { + exename = shmiop_test + + IDL_Files { + Test.idl + } + + Source_Files { + shmiop_test.cpp + } +} diff --git a/TAO/tests/SHMIOP/Test.idl b/TAO/tests/SHMIOP/Test.idl new file mode 100644 index 00000000000..1f8ff5e7970 --- /dev/null +++ b/TAO/tests/SHMIOP/Test.idl @@ -0,0 +1,9 @@ +module Test +{ + interface Hello + { + string get_string (); + + oneway void shutdown (); + }; +}; diff --git a/TAO/tests/SHMIOP/run_test.pl b/TAO/tests/SHMIOP/run_test.pl new file mode 100644 index 00000000000..a4b44408ed5 --- /dev/null +++ b/TAO/tests/SHMIOP/run_test.pl @@ -0,0 +1,84 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; +use strict; + +my $status = 0; +my $debug_level = 0; +my $cdebug_level = 0; +my $extra; +foreach my $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = 10; + } + elsif ($i eq '-cdebug') { + $cdebug_level = 10; + } + elsif ($i eq 'with_collocated') { + $extra = "-s temp.ior"; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile ($iorbase); +$client->DeleteFile ($iorbase); + +my $shm = '-ORBSvcConf static_shmiop.conf -ORBListenEndpoints shmiop://'; + +my $SV = $server->CreateProcess ("shmiop_test", "-ORBDebugLevel $debug_level $shm -s $server_iorfile"); +my $CL = $client->CreateProcess ("shmiop_test", "-ORBDebugLevel $cdebug_level $shm -c $client_iorfile $extra"); +my $server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +my $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval ()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval ()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile ($iorbase); +$client->DeleteFile ($iorbase); + +if ($extra ne '') { + unlink 'temp.ior'; +} + +exit $status; diff --git a/TAO/tests/SHMIOP/run_test_collocated.pl b/TAO/tests/SHMIOP/run_test_collocated.pl new file mode 100644 index 00000000000..2a6f251b73a --- /dev/null +++ b/TAO/tests/SHMIOP/run_test_collocated.pl @@ -0,0 +1,40 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; +use strict; + +my $debug_level = 0; +foreach my $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = 10; + } +} + +my $target = PerlACE::TestTarget::create_target(1) || die "Create target 1 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $target->LocalFile ($iorbase); +$target->DeleteFile ($iorbase); + +my $status = 0; + +print "Collocated\n\n"; + +my $shm = '-ORBSvcConf static_shmiop.conf -ORBListenEndpoints shmiop://'; + +my $SV = $target->CreateProcess ("shmiop_test", "-ORBDebugLevel $debug_level $shm " . + "-s $server_iorfile -c $server_iorfile"); + +my $server = $SV->SpawnWaitKill ($target->ProcessStartWaitInterval ()); + +if ($server != 0) { + print STDERR "ERROR: Collocated test returned $server\n"; + $status = 1; +} + +$target->DeleteFile ($iorbase); + +exit $status; diff --git a/TAO/tests/SHMIOP/shmiop_test.cpp b/TAO/tests/SHMIOP/shmiop_test.cpp new file mode 100644 index 00000000000..dfbd3699508 --- /dev/null +++ b/TAO/tests/SHMIOP/shmiop_test.cpp @@ -0,0 +1,126 @@ +#include "TestS.h" + +#include "tao/Strategies/advanced_resource.h" + +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" +#include "ace/SString.h" +#include "ace/Task.h" + +struct Servant : virtual POA_Test::Hello +{ + explicit Servant (const CORBA::ORB_var &orb) + : orb_ (orb) + {} + + char *get_string () + { + CORBA::String_var str ("hello"); + return str._retn (); + } + + void shutdown () + { + this->orb_->shutdown (0); + } + + CORBA::ORB_var orb_; +}; + +struct ORBTask : ACE_Task_Base +{ + explicit ORBTask (const CORBA::ORB_var &orb) + : orb_ (orb) + {} + + int svc () + { + try + { + this->orb_->run (); + return 0; + } + catch (const CORBA::Exception &e) + { + e._tao_print_exception ("Exception caught from ORB::run:"); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR unknown exception caught ") + ACE_TEXT ("from ORB::run\n"))); + } + return 1; + } + + CORBA::ORB_var orb_; +}; + +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + ACE_Get_Opt opts (argc, argv, ACE_TEXT ("s:c:")); + const ACE_TCHAR *server = 0, *client = 0; + for (int o; (o = opts ()) != -1;) + { + switch (o) + { + case 's': + server = opts.opt_arg (); + break; + case 'c': + client = opts.opt_arg (); + break; + } + } + + Servant srv (orb); + ORBTask task (orb); + + if (server) + { + CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); + PortableServer::POA_var poa = PortableServer::POA::_narrow (obj); + PortableServer::POAManager_var pm = poa->the_POAManager (); + pm->activate (); + Test::Hello_var srv_obj = srv._this (); + CORBA::String_var srv_str = orb->object_to_string (srv_obj); + FILE *f = ACE_OS::fopen (server, "w"); + ACE_OS::fputs (srv_str, f); + ACE_OS::fclose (f); + if (!client) + task.activate(); + } + + if (client) + { + ACE_CString ior ("file://"); + ior += ACE_TEXT_ALWAYS_CHAR (client); + CORBA::Object_var obj = orb->string_to_object (ior.c_str ()); + Test::Hello_var hello = Test::Hello::_narrow (obj); + CORBA::String_var str = hello->get_string (); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - returned <%C>\n"), + str.in ())); + hello->shutdown (); + } + else if (server) + { + task.wait (); + } + + orb->destroy (); + return 0; + } + catch (const CORBA::Exception &e) + { + e._tao_print_exception ("Exception caught:"); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR unknown exception ") + ACE_TEXT ("caught in main\n"))); + } + return 1; +} diff --git a/TAO/tests/SHMIOP/static_shmiop.conf b/TAO/tests/SHMIOP/static_shmiop.conf new file mode 100644 index 00000000000..7fac80fcca5 --- /dev/null +++ b/TAO/tests/SHMIOP/static_shmiop.conf @@ -0,0 +1 @@ +static Advanced_Resource_Factory "-ORBProtocolFactory SHMIOP_Factory" diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 09546145c47..57c559330aa 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -125,7 +125,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // user-defined smart factory on the heap as the smart proxy // generated classes take care of destroying the object. This // way it a win situation for the application developer who - // doesnt have to make sure to destoy it and also for the smart + // doesnt have to make sure to destroy it and also for the smart // proxy designer who now can manage the lifetime of the object // much surely. diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp index e6017a2b44a..b28fe0a4b24 100644 --- a/TAO/tests/Smart_Proxies/Policy/client.cpp +++ b/TAO/tests/Smart_Proxies/Policy/client.cpp @@ -103,7 +103,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // user-defined smart factory on the heap as the smart proxy // generated classes take care of destroying the object. This // way it a win situation for the application developer who - // doesnt have to make sure to destoy it and also for the smart + // doesnt have to make sure to destroy it and also for the smart // proxy designer who now can manage the lifetime of the object // much surely. // By default this factory is permanent (i.e. registered for diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp index 47d5bab2cb2..f6bdb290393 100644 --- a/TAO/tests/Smart_Proxies/client.cpp +++ b/TAO/tests/Smart_Proxies/client.cpp @@ -60,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // user-defined smart factory on the heap as the smart proxy // generated classes take care of destroying the object. This // way it a win situation for the application developer who - // doesnt have to make sure to destoy it and also for the smart + // doesnt have to make sure to destroy it and also for the smart // proxy designer who now can manage the lifetime of the object // much surely. Smart_Test_Factory *test_factory = 0; diff --git a/TAO/tests/UNKNOWN_Exception/client.cpp b/TAO/tests/UNKNOWN_Exception/client.cpp index f754670339e..f7884f6c77e 100644 --- a/TAO/tests/UNKNOWN_Exception/client.cpp +++ b/TAO/tests/UNKNOWN_Exception/client.cpp @@ -67,7 +67,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { test->unknown_exception_in_method (); } - catch (const CORBA::UNKNOWN) + catch (const CORBA::UNKNOWN&) { unknown_exception_raised = 1; diff --git a/TAO/tests/ZIOP/client.cpp b/TAO/tests/ZIOP/client.cpp index ec09b9e9c20..d30d9a56fe2 100644 --- a/TAO/tests/ZIOP/client.cpp +++ b/TAO/tests/ZIOP/client.cpp @@ -211,7 +211,7 @@ check_results (CORBA::ORB_ptr orb) ACE_TEXT ("LZO Compressor\n")), 1); } - catch (::Compression::UnknownCompressorId) + catch (const ::Compression::UnknownCompressorId&) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("check_results, expected exception caught, ") diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 00000000000..270075fc9c1 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,149 @@ +variables: + ACE_ROOT: $(Build.SourcesDirectory)/ACE + TAO_ROOT: $(Build.SourcesDirectory)/TAO + MPC_ROOT: $(Build.SourcesDirectory)/ACE/MPC + system.prefergit: true + +resources: +- repo: self + fetchDepth: 1 + +jobs: +- job: VisualStudio2017 + timeoutInMinutes: 90 + pool: + vmImage: vs2017-win2016 + strategy: + maxParallel: 4 + matrix: + Debug64: + BuildPlatform: x64 + BuildConfiguration: Debug + Release64: + BuildPlatform: x64 + BuildConfiguration: Release + Debug32: + BuildPlatform: Win32 + BuildConfiguration: Debug + Release32: + BuildPlatform: Win32 + BuildConfiguration: Release + steps: + - powershell: | + $client = new-object System.Net.WebClient + $client.DownloadFile("http://strawberryperl.com/download/5.28.0.1/strawberry-perl-5.28.0.1-64bit.zip","strawberry-perl.zip"); + displayName: Download perl + - task: ExtractFiles@1 + displayName: Extract perl + inputs: + archiveFilePatterns: strawberry-perl.zip + destinationFolder: perl + - powershell: | + '#include "ace/config-win32.h"' > $(ACE_ROOT)/ace/config.h + displayName: Create config.h file + - powershell: git clone --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT) + displayName: git clone MPC + - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2017 $(TAO_ROOT)/TAO_ACE.mwc + displayName: Run script mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc + - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2017 $(ACE_ROOT)/tests/tests.mwc + displayName: Run script mwc.pl on $(ACE_ROOT)/tests/tests.mwc + - task: VSBuild@1 + displayName: Build solution TAO/TAO_ACE.sln + inputs: + solution: TAO/TAO_ACE.sln + platform: $(BuildPlatform) + configuration: $(BuildConfiguration) + maximumCpuCount: true + - task: VSBuild@1 + displayName: Build solution ACE/tests/tests.sln + inputs: + solution: ACE/tests/tests.sln + platform: $(BuildPlatform) + configuration: $(BuildConfiguration) + maximumCpuCount: true + +- job: VisualStudio2015 + timeoutInMinutes: 90 + pool: + vmImage: vs2015-win2012r2 + steps: + - powershell: | + $client = new-object System.Net.WebClient + $client.DownloadFile("http://strawberryperl.com/download/5.28.0.1/strawberry-perl-5.28.0.1-64bit.zip","strawberry-perl.zip"); + displayName: Download perl + - task: ExtractFiles@1 + displayName: Extract perl + inputs: + archiveFilePatterns: strawberry-perl.zip + destinationFolder: perl + - powershell: | + '#include "ace/config-win32.h"' > $(ACE_ROOT)/ace/config.h + displayName: Create config.h file + - powershell: git clone --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT) + displayName: git clone MPC + - powershell: perl/perl/bin/perl $(ACE_ROOT)/bin/mwc.pl -type vc14 $(TAO_ROOT)/TAO_ACE.mwc + displayName: Run script mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc + - powershell: perl/perl/bin/perl $(ACE_ROOT)/bin/mwc.pl -type vc14 $(ACE_ROOT)/tests/tests.mwc + displayName: Run script mwc.pl on $(ACE_ROOT)/tests/tests.mwc + - task: VSBuild@1 + displayName: Build solution TAO\TAO_ACE.sln + inputs: + solution: TAO\TAO_ACE.sln + maximumCpuCount: true + - task: VSBuild@1 + displayName: Build solution ACE\tests\tests.sln + inputs: + solution: ACE\tests\tests.sln + maximumCpuCount: true + +- job: Linux + timeoutInMinutes: 90 + pool: + vmImage: ubuntu-16.04 + steps: + - script: sudo apt-get --yes update && sudo apt-get --yes install libxerces-c-dev libssl-dev + displayName: install system package dependencies + - powershell: | + '#include "ace/config-linux.h"' > $(ACE_ROOT)/ace/config.h + displayName: Create config.h file + - powershell: | + 'xerces3=1' > $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features + 'ssl=1' >> $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features + displayName: Create default.features file + - powershell: | + 'xerces3=1' > $(ACE_ROOT)/include/makeinclude/platform_macros.GNU + 'ssl=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU + 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU + displayName: Create platform_macros file + - powershell: git clone --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT) + displayName: git clone MPC + - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(TAO_ROOT)/TAO_ACE.mwc + displayName: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc + - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(ACE_ROOT)/tests/tests.mwc + displayName: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc + - bash: make -j 6 -C TAO + displayName: Build TAO project + - bash: make -j 6 -C ACE/tests + displayName: Build tests project + +- job: MacOSX + timeoutInMinutes: 90 + pool: + vmImage: macOS-10.13 + steps: + - powershell: | + '#include "ace/config-macosx.h"' > $(ACE_ROOT)/ace/config.h + displayName: Create config.h file + - powershell: | + 'include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU' > $(ACE_ROOT)/include/makeinclude/platform_macros.GNU; + displayName: Create platform_macros file + - powershell: git clone --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT) + displayName: git clone MPC + - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(TAO_ROOT)/TAO_ACE.mwc + displayName: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc + - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(ACE_ROOT)/tests/tests.mwc + displayName: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc + - bash: make -j 6 -C TAO + displayName: Build TAO project + - bash: make -j 6 -C ACE/tests + displayName: Build tests project |