diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml new file mode 100644 index 0000000000000..fdd9bd839002e --- /dev/null +++ b/.github/workflows/cmake.yml @@ -0,0 +1,82 @@ +name: cmake + +on: + push: + pull_request: + schedule: + - cron: '0 1 * * SUN' + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: read + +jobs: + build: + strategy: + fail-fast: false + matrix: + include: + - CC: gcc-12 + CXX: g++-12 + PackageDeps: g++-12 + os: ubuntu-22.04 + - CC: vs2019 + CXX: vs2019 + os: windows-2019 + runs-on: ${{ matrix.os }} + name: ${{ matrix.os }} ${{ matrix.CXX }} + env: + ACE_ROOT: ${{ github.workspace }}/ACE + MPC_ROOT: ${{ github.workspace }}/MPC + CC: ${{ matrix.CC }} + CXX: ${{ matrix.CXX }} + steps: + - name: checkout ACE/TAO + uses: actions/checkout@v3 + - name: checkout MPC + uses: actions/checkout@v3 + with: + repository: DOCGroup/MPC + path: ${{ env.MPC_ROOT }} + - name: Add Repo + run: | + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - + sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main" + if: matrix.Repo != '' + - name: Add packages + run: | + sudo apt-get --yes update + sudo apt-get --yes install ${{ matrix.PackageDeps }} + if: matrix.PackageDeps != '' + - name: create $ACE_ROOT/ace/config.h + run: | + '#ifdef linux' > ${env:ACE_ROOT}/ace/config.h + '# include "ace/config-linux.h"' >> ${env:ACE_ROOT}/ace/config.h + '#else' >> ${env:ACE_ROOT}/ace/config.h + '# include "ace/config-win32.h"' >> ${env:ACE_ROOT}/ace/config.h + '#endif' >> ${env:ACE_ROOT}/ace/config.h + shell: pwsh + - name: Run mwc.pl on $(ACE_ROOT)/ace/ace.mwc + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type cmake ${env:ACE_ROOT}/ace/ace.mwc -workers 6 + shell: pwsh + - name: Run mwc.pl on $(ACE_ROOT)/apps/gperf/src + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type cmake ${env:ACE_ROOT}/apps/gperf/src + shell: pwsh + - name: Build ace project + run: | + cd ${env:ACE_ROOT}/ace + cmake -S . -B build + cmake --build build -j6 + shell: pwsh + - name: Build ACE/apps/gperf/src project + run: | + cd ${env:ACE_ROOT}/apps/gperf/src + cmake -S . -B build + cmake --build build -j6 + shell: pwsh diff --git a/.github/workflows/face.yml b/.github/workflows/face.yml index 5e244a5a4099c..5c029196cecf9 100644 --- a/.github/workflows/face.yml +++ b/.github/workflows/face.yml @@ -24,7 +24,7 @@ jobs: CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 runs-on: ${{ matrix.os }} name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }} env: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4f3b2fb4638d5..310922433cda4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -38,23 +38,23 @@ jobs: CXX: g++-7 PackageDeps: g++-7 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 CheckPkgConfig: 1 - CC: gcc-8 CXX: g++-8 PackageDeps: g++-8 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 - CC: gcc-9 CXX: g++-9 PackageDeps: g++-9 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 - CC: gcc-10 CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 - CC: gcc-11 CXX: g++-11 PackageDeps: g++-11 @@ -76,23 +76,23 @@ jobs: CXX: clang++-6.0 PackageDeps: clang-6.0 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 - CC: clang-7 CXX: clang++-7 PackageDeps: clang-7 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 - CC: clang-8 CXX: clang++-8 PackageDeps: clang-8 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 - CC: clang-9 CXX: clang++-9 PackageDeps: clang-9 Repo: llvm-toolchain-$(lsb_release -cs)-9 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 - CC: clang-10 CXX: clang++-10 PackageDeps: clang-10 @@ -123,12 +123,18 @@ jobs: Repo: llvm-toolchain-$(lsb_release -cs)-14 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU os: ubuntu-22.04 + - CC: clang-15 + CXX: clang++-15 + PackageDeps: clang-15 + Repo: llvm-toolchain-$(lsb_release -cs)-15 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU + os: ubuntu-22.04 - feature: CORBA/e micro CC: gcc-10 CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 optional_feature: corba_e_micro=1 optional_macros: corba_e_micro=1 - feature: CORBA/e compact @@ -136,7 +142,7 @@ jobs: CXX: g++-10 PackageDeps: g++-10 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 + os: ubuntu-20.04 optional_feature: corba_e_compact=1 optional_macros: corba_e_compact=1 - feature: ACE for TAO diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1d5f9cfa6084e..d16e9f2a9bd72 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -131,7 +131,7 @@ jobs: - name: Install vcpkg uses: lukka/run-vcpkg@v10 with: - vcpkgGitCommitId: f93ba152d55e1d243160e690bc302ffe8638358e + vcpkgGitCommitId: 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46 appendedCacheKey: ${{ matrix.name }} runVcpkgInstall: true - name: create $ACE_ROOT/ace/config.h diff --git a/.gitignore b/.gitignore index 949cea02040ab..8d1ca1d523e79 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ lib*.so* lib*.dylib *~ ipch/ +*.vsidx /ACE/ace/config.h /ACE/bin/MakeProjectCreator/config/default.features @@ -39,6 +40,7 @@ ipch/ /build /ACE/build /TAO/build +/MPC *.o *.res @@ -46,3 +48,5 @@ ipch/ *.VC.db* *.tds *.*codeanalysis* +read.lock +fileList.bin diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index df575bdd55528..185fe6d9d5235 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -181,11 +181,11 @@

Synopsis

Maintains ACE on many platforms required for their ACE and TAO service offerings. We support AIX, Embarcadero C++ Builder, - Windows CE, MinGW, Microsoft Visual C++, GCC, - Cygwin, VxWorks 6.x (kernel and rtp), OpenVMS on IA64, + MinGW, Microsoft Visual C++, GCC, + Cygwin, VxWorks 6.x (kernel and rtp), BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris, - SuSE Linux on IA32/EM64T/IA64, RTEMS, QNX, LynxOS, - HPUX on IA64, and Android. + SuSE Linux on IA32/EM64T/IA64, QNX, LynxOS, + and Android. The Intel C++ compiler is supported on Windows 32/64bit, Linux IA32/EM64T/IA64, MacOSX. @@ -284,7 +284,6 @@

Building and Installing ACE

  • Windows (including MinGW and Cygwin)
  • VxWorks
  • Android
    • -
  • RTEMS

    • General Rules

    @@ -2065,87 +2064,6 @@

    Installation Notes

    Please see the Non-static ACE_Object_Manager discussion below.

    -

  • Windows CE

    - - Take a look at (CE-status.txt) for - up-to-date information about ACE on Windows CE and Windows Mobile. - -

  • Solaris 7, 8, 9, and 10 using Sun ONE Studio 8 (C++ 5.5) - or higher, Centerline C++ 2.x, GNU gcc 2.95 and - later.

    - - All the source code and tests should build and run without any - problems on Solaris 7, 8, and 9 platforms using the above - Sun C++ compilers. - - There are likely to be build problems with older versions or - different patchlevels of Sun C++. Likewise, on - Solaris with g++ you may need to use GNU as instead of - /usr/ccs/bin/as, if you want -gstabs+ and -pipe support. - - Thanks to Susan Liebeskind <shl@janis.gtri.gatech.edu> - for providing the following useful information:

    - - By default, ACE uses both the Solaris and POSIX thread - interface. To disable use of the Solaris thread interface, add - -D_POSIX_PTHREAD_SEMANTICS to the - CFLAGS in your - $(ACE_ROOT)/include/makeinclude/platform_macros.GNU. - See the Solaris Intro (3) man page for more information.

    - - To disable ACE thread support completely, build with the - threads=0 make flag. See the Makefile Flags section below for more - information on make flags.

    - - If you use g++ on Solaris 7, you might need to rebuild - it on a SunOS 5.7 (Solaris 7) host. Some versions of g++ - provide replacements for system header files. The - replacements on older SunOS systems are not compatible with the - SunOS 5.7 system headers.

    - -
  • AIX

    - - ACE is currently supported on AIX 5.2 and higher using IBM's - Visual Age C++ 6 and XL C++ 7 compilers as well as g++ 3.2.

    - - The ace/config-aix-5.x.h file is recommended for all - compilers on all AIX 5L versions. The Asynchronous I/O functionality - is disabled by default because its use requires the system administrator - to explicitly enable it in the kernel using SMIT. If this has been - done and you want to enable asynchronous I/O support in ACE, add: - #define ACE_HAS_AIO_CALLS to your config.h - file before including ace/config-aix-5.x.h.

    - - The Visual Age 6.0.0.3 and 6.0.0.4 do have some bugs that makes - them unusable for building TAO. TAO has been tested with 6.0.0.12 and - had no problems with that version.

    - - For your platform_macros.GNU file, you should use - platform_aix_ibm.GNU when building ACE with any of the - IBM compilers and platform_aix_g++.GNU when building ACE - with g++.

    - - BTW, here's a technique from Rob Jordan <jordan@hursley.ibm.com> - that can reduce the size of the ACE libraries by about one - third, and can also be applied to applications. It works by - optimising the sharing of template functions, which are created - in an "unusual" way under AIX. It also speeds up - compilation.

    - - Here's how to optimise the ACE library generation:

    - - Look at the ace/GNUmakefile.ACE - in $ACE_ROOT/ace. Create a file called - ACE_All_Src.cpp, and add a line to #include - each of the source files - listed under FILES= in the GNUmakefile. Create a - file called ACE_All_Tmp.h - and add a line to #include each of the .h files listed under - TEMPLATE_FILES= in the GNUmakefile. Now update the - GNUmakefile so that - FILES=ACE_All_Src and - TEMPLATE_FILES=ACE_All_Tmp.

    -

  • Linux

    ACE has been ported to Linux on @@ -2437,24 +2355,6 @@

    Installation Notes

    Under the current version of QNX RTP ACE fails if compiled with inline=0 .

    -

  • RTEMS

    - - The support for RTEMS has been revived from version x.5.4. This version - was the first version that build again out of the box on RTEMS. Compilation - and testing was done for RTEMS with and without networking support. The - ACE GNU makefiles do automatically detect whether networking support - is available or not. - - Besides the standard config.h/platform_macros.GNU file you will need - to set RTEMS_MAKEFILE_PATH to point to the location - of your RTEMS installation, see below for an example.

    -

    export RTEMS_MAKEFILE_PATH=/opt/rtems/CPU-rtems/BSP

    -

    - When building without network support you will need the ace_for_tao - subsetting functionality enabled. For this add ace_for_tao = 1 - to your bin/MakeProjectCreator/config file and regenerate the - GNU makefiles as described here.

    -

  • PharLap ETS

    ACE has been ported to Ardence's @@ -2586,14 +2486,6 @@

    Compiling ACE with GNU g++

    --prefix option to configure instead of hacking its output.

    -

  • If you are getting weird link errors when building libACE - on Solaris you are probably using the GNU linker. Try using the - Sun linker (/usr/ccs/bin/ld) instead. Note that gcc first looks - for the GNU linker if it is installed along with gcc. The only - way to not use the GNU linker is to delete it from the - installation or to build your own compiler with no linker. Be - aware that you still need the libraries and includes of gcc.

    - NOTE: if you do use the GNU linker, you might need to change the -G flag to -shared in the SOFLAGS definition in your @@ -3004,7 +2896,6 @@

    To create an Eclipse project for ACE from a local source distribution:

    parameters when using include_env=1. If possible, do not use it, but instead change your TAO applications to use the ACE_ENV_ARG macros. -fast Enable -fast option, e.g., with Sun C++. inline Enable ACE inlining. Some platforms enable inlining by default, others do not. optimize Enable optimization; see OCFLAGS and OCCFLAGS. diff --git a/ACE/ACEXML/apps/svcconf/ACEXML_XML_Svc_Conf_Parser.rc b/ACE/ACEXML/apps/svcconf/ACEXML_XML_Svc_Conf_Parser.rc new file mode 100644 index 0000000000000..1d6036f1ea096 --- /dev/null +++ b/ACE/ACEXML/apps/svcconf/ACEXML_XML_Svc_Conf_Parser.rc @@ -0,0 +1,30 @@ +#include "../../../ace/Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACEXML_XML_Svc_Conf_Parser\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACEXML_XML_Svc_Conf_ParserDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACEXML_XML_Svc_Conf_Parser.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/ACEXML/apps/svcconf/Svcconf.cpp b/ACE/ACEXML/apps/svcconf/Svcconf.cpp index ad6bc5c419098..66f74adb4b598 100644 --- a/ACE/ACEXML/apps/svcconf/Svcconf.cpp +++ b/ACE/ACEXML/apps/svcconf/Svcconf.cpp @@ -7,7 +7,7 @@ #if (ACE_USES_CLASSIC_SVC_CONF == 0) extern "C" ACE_Proper_Export_Flag ACE_XML_Svc_Conf * -_ACEXML_create_XML_Svc_Conf_Object (void) +_ACEXML_create_XML_Svc_Conf_Object () { ACE_XML_Svc_Conf *retp = 0; diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp index b5d173d2fb327..0f6e9ae515362 100644 --- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp +++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp @@ -17,7 +17,7 @@ # include "Svcconf_Handler.inl" #endif /* __ACEXML_INLINE__ */ -ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler (void) +ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler () : in_stream_def_ (0), in_module_ (0), stream_svc_type_ (0), @@ -25,7 +25,7 @@ ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler (void) { } -ACEXML_Svcconf_Handler::~ACEXML_Svcconf_Handler (void) +ACEXML_Svcconf_Handler::~ACEXML_Svcconf_Handler () { } @@ -37,7 +37,7 @@ ACEXML_Svcconf_Handler::characters (const ACEXML_Char *, } void -ACEXML_Svcconf_Handler::endDocument (void) +ACEXML_Svcconf_Handler::endDocument () { } @@ -129,7 +129,6 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, this->stream_, svc_dll, this->stream_info_.active ()); - } else { @@ -291,7 +290,7 @@ ACEXML_Svcconf_Handler::skippedEntity (const ACEXML_Char *) } void -ACEXML_Svcconf_Handler::startDocument (void) +ACEXML_Svcconf_Handler::startDocument () { } @@ -308,7 +307,6 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, else if (ACE_OS::strcmp (qName, ACE_TEXT ("initializer")) == 0) { this->get_initializer_attrs (alist); - } else if (ACE_OS::strcmp (qName, ACE_TEXT ("static")) == 0) { diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h index b1eadf5bb2c53..e123c027c8b1f 100644 --- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h +++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h @@ -24,42 +24,42 @@ class ACE_Parsed_Info * Set/get name of a parsed entity. */ int name (const ACEXML_Char *n); - const ACEXML_Char *name (void); + const ACEXML_Char *name (); /** * Set/get type of a dynamic node. */ int service_type (int type); - int service_type (void); + int service_type (); /** * Set/Get active status. */ int active (int a); - int active (void); + int active (); /** * Set/get initializer path. */ int path (const ACEXML_Char *n); - const ACEXML_Char *path (void); + const ACEXML_Char *path (); /** * Set/get initializer init function. */ int init_func (const ACEXML_Char *n); - const ACEXML_Char *init_func (void); + const ACEXML_Char *init_func (); /** * Set/get initializer init parameter. */ int init_params (const ACEXML_Char *n); - const ACEXML_Char *init_params (void); + const ACEXML_Char *init_params (); /** * Reset Parsed_Info. */ - void reset (void); + void reset (); protected: ACEXML_Char *name_; @@ -84,12 +84,12 @@ class ACEXML_Svcconf_Handler : public ACEXML_DefaultHandler /* * Default constructor. */ - ACEXML_Svcconf_Handler (void); + ACEXML_Svcconf_Handler (); /* * Default destructor. */ - virtual ~ACEXML_Svcconf_Handler (void); + virtual ~ACEXML_Svcconf_Handler (); // Methods inherit from ACEXML_ContentHandler. @@ -103,7 +103,7 @@ class ACEXML_Svcconf_Handler : public ACEXML_DefaultHandler /* * Receive notification of the end of a document. */ - virtual void endDocument (void); + virtual void endDocument (); /* * Receive notification of the end of an element. @@ -143,7 +143,7 @@ class ACEXML_Svcconf_Handler : public ACEXML_DefaultHandler /* * Receive notification of the beginning of a document. */ - virtual void startDocument (void) + virtual void startDocument () ; /* diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.inl b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.inl index 6b872badecb13..319f88a025d4c 100644 --- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.inl +++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.inl @@ -32,7 +32,7 @@ ACE_Parsed_Info::name (const ACEXML_Char *n) } ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::name (void) +ACE_Parsed_Info::name () { return this->name_; } @@ -49,7 +49,7 @@ ACE_Parsed_Info::service_type (int type) } ACE_INLINE int -ACE_Parsed_Info::service_type (void) +ACE_Parsed_Info::service_type () { return this->service_type_; } @@ -62,7 +62,7 @@ ACE_Parsed_Info::active (int a) } ACE_INLINE int -ACE_Parsed_Info::active (void) +ACE_Parsed_Info::active () { return this->active_; } @@ -79,7 +79,7 @@ ACE_Parsed_Info::path (const ACEXML_Char *p) } ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::path (void) +ACE_Parsed_Info::path () { return this->path_; } @@ -96,7 +96,7 @@ ACE_Parsed_Info::init_func (const ACEXML_Char *n) } ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::init_func (void) +ACE_Parsed_Info::init_func () { return this->init_func_; } @@ -113,13 +113,13 @@ ACE_Parsed_Info::init_params (const ACEXML_Char *n) } ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::init_params (void) +ACE_Parsed_Info::init_params () { return this->init_params_; } ACE_INLINE void -ACE_Parsed_Info::reset (void) +ACE_Parsed_Info::reset () { delete[] this->name_; this->name_ = 0; diff --git a/ACE/ACEXML/common/ACEXML.rc b/ACE/ACEXML/common/ACEXML.rc new file mode 100644 index 0000000000000..12abc38b63e1c --- /dev/null +++ b/ACE/ACEXML/common/ACEXML.rc @@ -0,0 +1,30 @@ +#include "../../ace/Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACEXML\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACEXMLDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACEXML.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/ACEXML/common/Attributes.cpp b/ACE/ACEXML/common/Attributes.cpp index ae09b5ccdd4d2..97d4c8c587247 100644 --- a/ACE/ACEXML/common/Attributes.cpp +++ b/ACE/ACEXML/common/Attributes.cpp @@ -1,5 +1,5 @@ #include "Attributes.h" -ACEXML_Attributes::~ACEXML_Attributes (void) +ACEXML_Attributes::~ACEXML_Attributes () { } diff --git a/ACE/ACEXML/common/Attributes.h b/ACE/ACEXML/common/Attributes.h index 71482c30654e8..46b8fa1220d26 100644 --- a/ACE/ACEXML/common/Attributes.h +++ b/ACE/ACEXML/common/Attributes.h @@ -55,7 +55,6 @@ class ACEXML_Export ACEXML_Attributes { public: - /// Destructor. virtual ~ACEXML_Attributes (); diff --git a/ACE/ACEXML/common/AttributesImpl.cpp b/ACE/ACEXML/common/AttributesImpl.cpp index 6d48f903f83dd..b33568ec4e93a 100644 --- a/ACE/ACEXML/common/AttributesImpl.cpp +++ b/ACE/ACEXML/common/AttributesImpl.cpp @@ -21,7 +21,7 @@ ACEXML_AttributesImpl::ACEXML_AttributesImpl (const this->attrs_[i] = attrs.attrs_[i]; } -ACEXML_AttributesImpl::~ACEXML_AttributesImpl (void) +ACEXML_AttributesImpl::~ACEXML_AttributesImpl () { } @@ -115,7 +115,7 @@ ACEXML_AttributesImpl::getIndex (const ACEXML_Char *uri, } size_t -ACEXML_AttributesImpl::getLength (void) +ACEXML_AttributesImpl::getLength () { return this->attrs_.size (); } diff --git a/ACE/ACEXML/common/AttributesImpl.h b/ACE/ACEXML/common/AttributesImpl.h index b746878062c62..304558abf9449 100644 --- a/ACE/ACEXML/common/AttributesImpl.h +++ b/ACE/ACEXML/common/AttributesImpl.h @@ -41,7 +41,7 @@ class ACEXML_Export ACEXML_Attribute friend class ACEXML_AttributesImpl; /// Default constructor. - ACEXML_Attribute (void); + ACEXML_Attribute (); /// Copy constructor. ACEXML_Attribute (const ACEXML_Attribute &attr); @@ -54,7 +54,7 @@ class ACEXML_Export ACEXML_Attribute const ACEXML_Char *value); /// Destructor. - ~ACEXML_Attribute (void); + ~ACEXML_Attribute (); /// Set all members. void setAttribute (const ACEXML_Char *uri, @@ -147,7 +147,7 @@ class ACEXML_Export ACEXML_AttributesImpl */ ACEXML_AttributesImpl (int size = ACEXML_AttributesImpl_Default_Size); ACEXML_AttributesImpl (const ACEXML_AttributesImpl &attrs); - virtual ~ACEXML_AttributesImpl (void); + virtual ~ACEXML_AttributesImpl (); /** * Add a new attribute using the argument(s) supplied. @@ -190,7 +190,7 @@ class ACEXML_Export ACEXML_AttributesImpl /** * Return the number of attributes in the list. */ - virtual size_t getLength (void); + virtual size_t getLength (); /** * Look up an attribute's local name by index. diff --git a/ACE/ACEXML/common/AttributesImpl.inl b/ACE/ACEXML/common/AttributesImpl.inl index 38dafd62d3e12..603afa4cd206c 100644 --- a/ACE/ACEXML/common/AttributesImpl.inl +++ b/ACE/ACEXML/common/AttributesImpl.inl @@ -4,7 +4,7 @@ #include "ace/OS_NS_string.h" ACEXML_INLINE -ACEXML_Attribute::ACEXML_Attribute (void) +ACEXML_Attribute::ACEXML_Attribute () : uri_ (0), localName_ (0), qName_ (0), @@ -38,7 +38,7 @@ ACEXML_Attribute::ACEXML_Attribute (const ACEXML_Char *uri, } ACEXML_INLINE -ACEXML_Attribute::~ACEXML_Attribute (void) +ACEXML_Attribute::~ACEXML_Attribute () { delete[] this->uri_; delete[] this->localName_; diff --git a/ACE/ACEXML/common/Attributes_Def_Builder.cpp b/ACE/ACEXML/common/Attributes_Def_Builder.cpp index 11f853cb7383e..78e9117bea333 100644 --- a/ACE/ACEXML/common/Attributes_Def_Builder.cpp +++ b/ACE/ACEXML/common/Attributes_Def_Builder.cpp @@ -2,11 +2,9 @@ ACEXML_Attribute_Def_Builder::~ACEXML_Attribute_Def_Builder () { - } ACEXML_Attributes_Def_Builder::~ACEXML_Attributes_Def_Builder () { - } diff --git a/ACE/ACEXML/common/Attributes_Def_Builder.h b/ACE/ACEXML/common/Attributes_Def_Builder.h index 527e580aca2aa..a5e7ccf728540 100644 --- a/ACE/ACEXML/common/Attributes_Def_Builder.h +++ b/ACE/ACEXML/common/Attributes_Def_Builder.h @@ -66,7 +66,7 @@ class ACEXML_Export ACEXML_Attribute_Def_Builder /** * Get the name of the attribute. */ - virtual const ACEXML_Char *getName (void) = 0; + virtual const ACEXML_Char *getName () = 0; /** * Set the attribute type. @@ -89,12 +89,12 @@ class ACEXML_Export ACEXML_Attribute_Def_Builder * * @retval 0 if the attribute is not a valid combo. */ - virtual int validAttr (void) = 0; + virtual int validAttr () = 0; /** * Dump the content of the attribute definition. */ - virtual void dump (void) = 0; + virtual void dump () = 0; }; /** @@ -125,7 +125,7 @@ class ACEXML_Export ACEXML_Attributes_Def_Builder /** * Acquire an Attribute_Builder. */ - virtual ACEXML_Attribute_Def_Builder *getAttribute_Def_Builder (void) = 0; + virtual ACEXML_Attribute_Def_Builder *getAttribute_Def_Builder () = 0; /** * Add a definition for one attribute. diff --git a/ACE/ACEXML/common/CharStream.cpp b/ACE/ACEXML/common/CharStream.cpp index 00c1f32ab5475..09dc0905fa50a 100644 --- a/ACE/ACEXML/common/CharStream.cpp +++ b/ACE/ACEXML/common/CharStream.cpp @@ -2,6 +2,6 @@ #include "ACEXML/common/CharStream.h" -ACEXML_CharStream::~ACEXML_CharStream (void) +ACEXML_CharStream::~ACEXML_CharStream () { } diff --git a/ACE/ACEXML/common/CharStream.h b/ACE/ACEXML/common/CharStream.h index 555c04b204a72..3656f217573af 100644 --- a/ACE/ACEXML/common/CharStream.h +++ b/ACE/ACEXML/common/CharStream.h @@ -29,7 +29,6 @@ class ACEXML_Export ACEXML_CharStream { public: - /** * Virtual destructor, must have. */ @@ -77,7 +76,6 @@ class ACEXML_Export ACEXML_CharStream * Get the systemId for the underlying CharStream */ virtual const ACEXML_Char* getSystemId () = 0; - }; #include /**/ "ace/post.h" diff --git a/ACE/ACEXML/common/ContentHandler.cpp b/ACE/ACEXML/common/ContentHandler.cpp index d114e6a9b53ab..f28ee6a1780b0 100644 --- a/ACE/ACEXML/common/ContentHandler.cpp +++ b/ACE/ACEXML/common/ContentHandler.cpp @@ -1,5 +1,5 @@ #include "ContentHandler.h" -ACEXML_ContentHandler::~ACEXML_ContentHandler (void) +ACEXML_ContentHandler::~ACEXML_ContentHandler () { } diff --git a/ACE/ACEXML/common/ContentHandler.h b/ACE/ACEXML/common/ContentHandler.h index f5e88c150e092..7a6482da83d68 100644 --- a/ACE/ACEXML/common/ContentHandler.h +++ b/ACE/ACEXML/common/ContentHandler.h @@ -42,7 +42,6 @@ class ACEXML_Export ACEXML_ContentHandler { public: - virtual ~ACEXML_ContentHandler (); /** diff --git a/ACE/ACEXML/common/DTDHandler.cpp b/ACE/ACEXML/common/DTDHandler.cpp index 282ebf0cde630..e8a40f4b12437 100644 --- a/ACE/ACEXML/common/DTDHandler.cpp +++ b/ACE/ACEXML/common/DTDHandler.cpp @@ -1,5 +1,5 @@ #include "DTDHandler.h" -ACEXML_DTDHandler::~ACEXML_DTDHandler (void) +ACEXML_DTDHandler::~ACEXML_DTDHandler () { } diff --git a/ACE/ACEXML/common/DTDHandler.h b/ACE/ACEXML/common/DTDHandler.h index 52f701ccb02a0..36c91536e0550 100644 --- a/ACE/ACEXML/common/DTDHandler.h +++ b/ACE/ACEXML/common/DTDHandler.h @@ -48,7 +48,6 @@ class ACEXML_Export ACEXML_DTDHandler { public: - virtual ~ACEXML_DTDHandler (); /** diff --git a/ACE/ACEXML/common/DTD_Manager.cpp b/ACE/ACEXML/common/DTD_Manager.cpp index af34664566871..ed9bc4685f157 100644 --- a/ACE/ACEXML/common/DTD_Manager.cpp +++ b/ACE/ACEXML/common/DTD_Manager.cpp @@ -2,5 +2,4 @@ ACEXML_DTD_Manager::~ACEXML_DTD_Manager () { - } diff --git a/ACE/ACEXML/common/DefaultHandler.cpp b/ACE/ACEXML/common/DefaultHandler.cpp index 2338518e31291..dd023d7e51dac 100644 --- a/ACE/ACEXML/common/DefaultHandler.cpp +++ b/ACE/ACEXML/common/DefaultHandler.cpp @@ -2,11 +2,11 @@ #include "ACEXML/common/DefaultHandler.h" -ACEXML_DefaultHandler::ACEXML_DefaultHandler (void) +ACEXML_DefaultHandler::ACEXML_DefaultHandler () { } -ACEXML_DefaultHandler::~ACEXML_DefaultHandler (void) +ACEXML_DefaultHandler::~ACEXML_DefaultHandler () { } @@ -18,7 +18,7 @@ ACEXML_DefaultHandler::characters (const ACEXML_Char *, } void -ACEXML_DefaultHandler::endDocument (void) +ACEXML_DefaultHandler::endDocument () { } @@ -63,7 +63,7 @@ ACEXML_DefaultHandler::skippedEntity (const ACEXML_Char *) } void -ACEXML_DefaultHandler::startDocument (void) +ACEXML_DefaultHandler::startDocument () { // No-op. } diff --git a/ACE/ACEXML/common/Element_Def_Builder.cpp b/ACE/ACEXML/common/Element_Def_Builder.cpp index 75f1bc7ff426f..84f549c402d41 100644 --- a/ACE/ACEXML/common/Element_Def_Builder.cpp +++ b/ACE/ACEXML/common/Element_Def_Builder.cpp @@ -2,6 +2,5 @@ ACEXML_Element_Def_Builder::~ACEXML_Element_Def_Builder () { - } diff --git a/ACE/ACEXML/common/Encoding.h b/ACE/ACEXML/common/Encoding.h index 0a31d3653b2f8..15bbfc243a764 100644 --- a/ACE/ACEXML/common/Encoding.h +++ b/ACE/ACEXML/common/Encoding.h @@ -51,7 +51,6 @@ class ACEXML_Export ACEXML_Encoding static const ACEXML_UTF8 magic_values_[][4]; static const ACEXML_Char* get_encoding (const char* input); - }; #include /**/ "ace/post.h" diff --git a/ACE/ACEXML/common/EntityResolver.cpp b/ACE/ACEXML/common/EntityResolver.cpp index 92d948a9cffb0..ea251f41f2a84 100644 --- a/ACE/ACEXML/common/EntityResolver.cpp +++ b/ACE/ACEXML/common/EntityResolver.cpp @@ -1,5 +1,5 @@ #include "EntityResolver.h" -ACEXML_EntityResolver::~ACEXML_EntityResolver (void) +ACEXML_EntityResolver::~ACEXML_EntityResolver () { } diff --git a/ACE/ACEXML/common/EntityResolver.h b/ACE/ACEXML/common/EntityResolver.h index b2b143c34e333..041c0fbcfdf58 100644 --- a/ACE/ACEXML/common/EntityResolver.h +++ b/ACE/ACEXML/common/EntityResolver.h @@ -41,7 +41,6 @@ class ACEXML_Export ACEXML_EntityResolver { public: - virtual ~ACEXML_EntityResolver (); /** diff --git a/ACE/ACEXML/common/ErrorHandler.cpp b/ACE/ACEXML/common/ErrorHandler.cpp index 59426c3a7e7fa..29afddb5b5f9b 100644 --- a/ACE/ACEXML/common/ErrorHandler.cpp +++ b/ACE/ACEXML/common/ErrorHandler.cpp @@ -1,5 +1,5 @@ #include "ErrorHandler.h" -ACEXML_ErrorHandler::~ACEXML_ErrorHandler (void) +ACEXML_ErrorHandler::~ACEXML_ErrorHandler () { } diff --git a/ACE/ACEXML/common/ErrorHandler.h b/ACE/ACEXML/common/ErrorHandler.h index 72c8fb4a1a85b..1d10779bfca10 100644 --- a/ACE/ACEXML/common/ErrorHandler.h +++ b/ACE/ACEXML/common/ErrorHandler.h @@ -44,7 +44,6 @@ class ACEXML_Export ACEXML_ErrorHandler { public: - virtual ~ACEXML_ErrorHandler (); /** diff --git a/ACE/ACEXML/common/Exception.h b/ACE/ACEXML/common/Exception.h index 8520b2cfc2f39..6942e4c4eb531 100644 --- a/ACE/ACEXML/common/Exception.h +++ b/ACE/ACEXML/common/Exception.h @@ -34,7 +34,6 @@ class ACEXML_Export ACEXML_Exception { public: - /// Destructor. virtual ~ACEXML_Exception (); diff --git a/ACE/ACEXML/common/FileCharStream.cpp b/ACE/ACEXML/common/FileCharStream.cpp index b7a8538a38d21..eba9e8b266008 100644 --- a/ACE/ACEXML/common/FileCharStream.cpp +++ b/ACE/ACEXML/common/FileCharStream.cpp @@ -9,13 +9,13 @@ # include "ace/OS_NS_wchar.h" #endif /* ACE_USES_WCHAR */ -ACEXML_FileCharStream::ACEXML_FileCharStream (void) +ACEXML_FileCharStream::ACEXML_FileCharStream () : filename_ (0), encoding_ (0), size_ (0), infile_ (0), close_infile_ (true), peek_ (0) { } -ACEXML_FileCharStream::~ACEXML_FileCharStream (void) +ACEXML_FileCharStream::~ACEXML_FileCharStream () { this->close(); } @@ -60,7 +60,7 @@ ACEXML_FileCharStream::open (const ACEXML_Char *name) } int -ACEXML_FileCharStream::determine_encoding (void) +ACEXML_FileCharStream::determine_encoding () { if (this->infile_ == 0) return -1; @@ -114,7 +114,7 @@ ACEXML_FileCharStream::rewind() } int -ACEXML_FileCharStream::available (void) +ACEXML_FileCharStream::available () { if (this->infile_ == 0) return -1; @@ -126,7 +126,7 @@ ACEXML_FileCharStream::available (void) } int -ACEXML_FileCharStream::close (void) +ACEXML_FileCharStream::close () { if (this->infile_ != 0) { @@ -177,7 +177,7 @@ ACEXML_FileCharStream::get (ACEXML_Char& ch) } int -ACEXML_FileCharStream::peek (void) +ACEXML_FileCharStream::peek () { if (this->infile_ == 0) return -1; @@ -226,7 +226,7 @@ ACEXML_FileCharStream::get_i (ACEXML_Char& ch) } int -ACEXML_FileCharStream::peek_i (void) +ACEXML_FileCharStream::peek_i () { // If we are reading a UTF-8 encoded file, just use the plain unget. if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) @@ -262,13 +262,13 @@ ACEXML_FileCharStream::peek_i (void) #endif /* ACE_USES_WCHAR */ const ACEXML_Char* -ACEXML_FileCharStream::getEncoding (void) +ACEXML_FileCharStream::getEncoding () { return this->encoding_; } const ACEXML_Char* -ACEXML_FileCharStream::getSystemId (void) +ACEXML_FileCharStream::getSystemId () { return this->filename_; } diff --git a/ACE/ACEXML/common/FileCharStream.h b/ACE/ACEXML/common/FileCharStream.h index bb2f0ec5e2c0c..f1459976acfaf 100644 --- a/ACE/ACEXML/common/FileCharStream.h +++ b/ACE/ACEXML/common/FileCharStream.h @@ -95,7 +95,6 @@ class ACEXML_Export ACEXML_FileCharStream : public ACEXML_CharStream virtual const ACEXML_Char* getSystemId (); private: - /** Read the next character as a normal character. Return -1 if EOF is * reached, else return 0. */ @@ -113,7 +112,7 @@ class ACEXML_Export ACEXML_FileCharStream : public ACEXML_CharStream * encoding of the file. Subsequent call to get() returns this * character. */ - int peek_i (void); + int peek_i (); #endif /* ACE_USES_WCHAR */ diff --git a/ACE/ACEXML/common/HttpCharStream.cpp b/ACE/ACEXML/common/HttpCharStream.cpp index 804f467a5fda0..4fc0a1178a30f 100644 --- a/ACE/ACEXML/common/HttpCharStream.cpp +++ b/ACE/ACEXML/common/HttpCharStream.cpp @@ -19,7 +19,7 @@ static const int HDST_CR = 13; static const int HDST_CRLF = 14; static const int HDST_CRLFCR = 15; -ACEXML_HttpCharStream::ACEXML_HttpCharStream (void) +ACEXML_HttpCharStream::ACEXML_HttpCharStream () : url_(0), url_addr_(0), stream_(0), @@ -30,7 +30,7 @@ ACEXML_HttpCharStream::ACEXML_HttpCharStream (void) { } -ACEXML_HttpCharStream::~ACEXML_HttpCharStream (void) +ACEXML_HttpCharStream::~ACEXML_HttpCharStream () { this->close (); } @@ -269,7 +269,7 @@ ACEXML_HttpCharStream::get_url (size_t& len) int -ACEXML_HttpCharStream::send_request (void) +ACEXML_HttpCharStream::send_request () { char* path = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (this->url_addr_->get_path_name())); ACE_Auto_Basic_Array_Ptr path_ptr (path); @@ -301,7 +301,7 @@ ACEXML_HttpCharStream::send_request (void) int -ACEXML_HttpCharStream::available (void) +ACEXML_HttpCharStream::available () { if (this->stream_ == 0) return -1; @@ -309,7 +309,7 @@ ACEXML_HttpCharStream::available (void) } int -ACEXML_HttpCharStream::close (void) +ACEXML_HttpCharStream::close () { delete[] this->url_; this->url_ = 0; @@ -333,7 +333,7 @@ ACEXML_HttpCharStream::close (void) } int -ACEXML_HttpCharStream::determine_encoding (void) +ACEXML_HttpCharStream::determine_encoding () { if (this->stream_ == 0) return -1; @@ -377,7 +377,7 @@ ACEXML_HttpCharStream::determine_encoding (void) } void -ACEXML_HttpCharStream::rewind (void) +ACEXML_HttpCharStream::rewind () { if (this->stream_ == 0) return; @@ -390,13 +390,13 @@ ACEXML_HttpCharStream::rewind (void) } const ACEXML_Char* -ACEXML_HttpCharStream::getEncoding (void) +ACEXML_HttpCharStream::getEncoding () { return this->encoding_; } const ACEXML_Char* -ACEXML_HttpCharStream::getSystemId (void) +ACEXML_HttpCharStream::getSystemId () { return this->url_; } @@ -431,7 +431,7 @@ ACEXML_HttpCharStream::get (ACEXML_Char& ch) } int -ACEXML_HttpCharStream::peek (void) +ACEXML_HttpCharStream::peek () { if (this->stream_ == 0) return -1; @@ -469,7 +469,7 @@ ACEXML_HttpCharStream::get_i (ACEXML_Char& ch) } int -ACEXML_HttpCharStream::peek_i (void) +ACEXML_HttpCharStream::peek_i () { // If we are reading a UTF-8 encoded file, just use the plain unget. if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) diff --git a/ACE/ACEXML/common/HttpCharStream.h b/ACE/ACEXML/common/HttpCharStream.h index a19b2d3b99f8a..f6d7cd167ad10 100644 --- a/ACE/ACEXML/common/HttpCharStream.h +++ b/ACE/ACEXML/common/HttpCharStream.h @@ -31,10 +31,10 @@ class ACEXML_Export ACEXML_HttpCharStream : public ACEXML_CharStream { public: /// Default constructor. - ACEXML_HttpCharStream (void); + ACEXML_HttpCharStream (); /// Destructor - virtual ~ACEXML_HttpCharStream (void); + virtual ~ACEXML_HttpCharStream (); /// Open an URL. int open (const ACEXML_Char *url); @@ -43,12 +43,12 @@ class ACEXML_Export ACEXML_HttpCharStream : public ACEXML_CharStream * Returns the available ACEXML_Char in the buffer. -1 * if the object is not initialized properly. */ - virtual int available (void); + virtual int available (); /** * Close this stream and release all resources used by it. */ - virtual int close (void); + virtual int close (); /** * Read the next ACEXML_Char. Return -1 if we are not able to @@ -65,31 +65,30 @@ class ACEXML_Export ACEXML_HttpCharStream : public ACEXML_CharStream * Peek the next ACEXML_Char in the CharStream. Return the * character if succeess, -1 if EOS is reached. */ - virtual int peek (void); + virtual int peek (); /** * Resets the file pointer to the beginning of the stream. */ - virtual void rewind (void); + virtual void rewind (); /** * Determine the encoding of the file. */ - virtual int determine_encoding (void); + virtual int determine_encoding (); /** * Get the encoding of the file */ - virtual const ACEXML_Char* getEncoding (void); + virtual const ACEXML_Char* getEncoding (); /* * Get the systemId for the underlying CharStream */ - virtual const ACEXML_Char* getSystemId (void); + virtual const ACEXML_Char* getSystemId (); private: - #if defined (ACE_USES_WCHAR) /** * Read the next character from the stream taking into account the @@ -102,14 +101,14 @@ class ACEXML_Export ACEXML_HttpCharStream : public ACEXML_CharStream * encoding of the file. Subsequent call to get() returns this * character. */ - int peek_i (void); + int peek_i (); #endif /* ACE_USES_WCHAR */ /** * Send a HTTP/1.1 request to fetch the contents of the URL. */ - int send_request (void); + int send_request (); /** * Fetch the URL and save it in backing store. diff --git a/ACE/ACEXML/common/InputSource.cpp b/ACE/ACEXML/common/InputSource.cpp index 6d5a40ad2e457..a18405223bf23 100644 --- a/ACE/ACEXML/common/InputSource.cpp +++ b/ACE/ACEXML/common/InputSource.cpp @@ -4,7 +4,7 @@ #include "ACEXML/common/StreamFactory.h" #include "ace/ACE.h" -ACEXML_InputSource::ACEXML_InputSource (void) +ACEXML_InputSource::ACEXML_InputSource () : charStream_ (0), encoding_ (0), publicId_ (0), @@ -40,7 +40,7 @@ ACEXML_InputSource::ACEXML_InputSource (const ACEXML_Char *systemId) } } -ACEXML_InputSource::~ACEXML_InputSource (void) +ACEXML_InputSource::~ACEXML_InputSource () { delete[] this->publicId_; this->publicId_ = 0; diff --git a/ACE/ACEXML/common/Locator.cpp b/ACE/ACEXML/common/Locator.cpp index 6e3b6341ad948..e055408b2ba27 100644 --- a/ACE/ACEXML/common/Locator.cpp +++ b/ACE/ACEXML/common/Locator.cpp @@ -1,5 +1,5 @@ #include "Locator.h" -ACEXML_Locator::~ACEXML_Locator (void) +ACEXML_Locator::~ACEXML_Locator () { } diff --git a/ACE/ACEXML/common/Locator.h b/ACE/ACEXML/common/Locator.h index 14f27aefb999a..e68880b5ac87c 100644 --- a/ACE/ACEXML/common/Locator.h +++ b/ACE/ACEXML/common/Locator.h @@ -42,7 +42,6 @@ class ACEXML_Export ACEXML_Locator { public: - virtual ~ACEXML_Locator (); /* diff --git a/ACE/ACEXML/common/LocatorImpl.cpp b/ACE/ACEXML/common/LocatorImpl.cpp index 96234be24a951..47501f5736834 100644 --- a/ACE/ACEXML/common/LocatorImpl.cpp +++ b/ACE/ACEXML/common/LocatorImpl.cpp @@ -6,7 +6,7 @@ # include "ACEXML/common/LocatorImpl.inl" #endif /* __ACEXML_INLINE__ */ -ACEXML_LocatorImpl::ACEXML_LocatorImpl (void) +ACEXML_LocatorImpl::ACEXML_LocatorImpl () : publicId_ (0), systemId_ (0), lineNumber_ (1), @@ -32,13 +32,13 @@ ACEXML_LocatorImpl::ACEXML_LocatorImpl (const ACEXML_Locator& locator) { } -ACEXML_LocatorImpl::~ACEXML_LocatorImpl (void) +ACEXML_LocatorImpl::~ACEXML_LocatorImpl () { this->reset(); } void -ACEXML_LocatorImpl::reset (void) +ACEXML_LocatorImpl::reset () { delete[] this->publicId_; this->publicId_ = 0; diff --git a/ACE/ACEXML/common/Mem_Map_Stream.cpp b/ACE/ACEXML/common/Mem_Map_Stream.cpp index 2c188106ca2d8..dfcf04a48b762 100644 --- a/ACE/ACEXML/common/Mem_Map_Stream.cpp +++ b/ACE/ACEXML/common/Mem_Map_Stream.cpp @@ -4,7 +4,7 @@ #include "ACEXML/common/Mem_Map_Stream.h" -ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream (void) +ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream () : svc_handler_ (0), recv_pos_ (0), get_pos_ (0), @@ -13,7 +13,7 @@ ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream (void) } ACE_SOCK_Stream & -ACEXML_Mem_Map_Stream::stream (void) +ACEXML_Mem_Map_Stream::stream () { return svc_handler_->peer (); } @@ -32,7 +32,7 @@ ACEXML_Mem_Map_Stream::eof () const } int -ACEXML_Mem_Map_Stream::get_char (void) +ACEXML_Mem_Map_Stream::get_char () { if (this->eof () && this->grow_file_and_remap () == -1) return EOF; @@ -40,7 +40,7 @@ ACEXML_Mem_Map_Stream::get_char (void) } void -ACEXML_Mem_Map_Stream::rewind (void) +ACEXML_Mem_Map_Stream::rewind () { this->recv_pos_ = reinterpret_cast (this->mem_map_.addr ()); this->get_pos_ = this->recv_pos_; @@ -131,7 +131,7 @@ ACEXML_Mem_Map_Stream::seek (ACE_OFF_T offset, int whence) } Svc_Handler * -ACEXML_Mem_Map_Stream::svc_handler (void) +ACEXML_Mem_Map_Stream::svc_handler () { return this->svc_handler_; } @@ -154,7 +154,6 @@ ACEXML_Mem_Map_Stream::open (Connector *connector, if (connector->connect (svc_handler_, addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "%p %s %d\n", "Connect failed", @@ -188,7 +187,7 @@ ACEXML_Mem_Map_Stream::open (Connector *connector, } int -ACEXML_Mem_Map_Stream::grow_file_and_remap (void) +ACEXML_Mem_Map_Stream::grow_file_and_remap () { char buf[8192]; @@ -257,7 +256,7 @@ ACEXML_Mem_Map_Stream::grow_file_and_remap (void) return 0; } -ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream (void) +ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream () { // Remove the mapping and the file. this->mem_map_.remove (); diff --git a/ACE/ACEXML/common/Mem_Map_Stream.h b/ACE/ACEXML/common/Mem_Map_Stream.h index 52bb92fcd0f5d..716ea077f8c6c 100644 --- a/ACE/ACEXML/common/Mem_Map_Stream.h +++ b/ACE/ACEXML/common/Mem_Map_Stream.h @@ -53,17 +53,17 @@ class ACEXML_Export ACEXML_Mem_Map_Stream { public: /// Default constructor - ACEXML_Mem_Map_Stream (void); + ACEXML_Mem_Map_Stream (); /// Initialize this object. virtual int open (Connector *connector, const ACE_INET_Addr &); /// Destructor. - virtual ~ACEXML_Mem_Map_Stream (void); + virtual ~ACEXML_Mem_Map_Stream (); /// Returns the underlying . - ACE_SOCK_Stream &stream (void); + ACE_SOCK_Stream &stream (); /** * Send bytes in to the connected peer. This is a @@ -78,7 +78,7 @@ class ACEXML_Export ACEXML_Mem_Map_Stream * position. Returns EOF when the position reaches the end of the * HTTP stream. */ - virtual int get_char (void); + virtual int get_char (); /** * Returns a pointer to array of at most characters starting at @@ -111,7 +111,7 @@ class ACEXML_Export ACEXML_Mem_Map_Stream * This works since all the data has been cached in the memory-mapped * backing store. */ - virtual void rewind (void); + virtual void rewind (); /** * Returns the nth character from the position in the @@ -148,7 +148,7 @@ class ACEXML_Export ACEXML_Mem_Map_Stream virtual int eof () const; /// Returns the underlying service handler. - Svc_Handler *svc_handler (void); + Svc_Handler *svc_handler (); private: /** @@ -156,7 +156,7 @@ class ACEXML_Export ACEXML_Mem_Map_Stream * extend the mapping to cover this chunk. Returns -1 on failure or * EOF, else 0. */ - int grow_file_and_remap (void); + int grow_file_and_remap (); /** * Connection to peer. The granularity is at the Svc_Handler level. @@ -178,7 +178,6 @@ class ACEXML_Export ACEXML_Mem_Map_Stream /// Address at the end of the file mapping. char *end_of_mapping_plus1_; - }; diff --git a/ACE/ACEXML/common/NamespaceSupport.cpp b/ACE/ACEXML/common/NamespaceSupport.cpp index 550a3011c829c..938ad0bd23d8b 100644 --- a/ACE/ACEXML/common/NamespaceSupport.cpp +++ b/ACE/ACEXML/common/NamespaceSupport.cpp @@ -14,11 +14,11 @@ static const ACEXML_Char ACEXML_TABOO_NS_PREFIX[] = ACE_TEXT ("xml"); static const ACEXML_Char ACEXML_XMLNS_URI_name[] = ACE_TEXT ("http://www.w3.org/XML/1998/namespace"); const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS = ACEXML_XMLNS_URI_name; -ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack (void) +ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack () { } -ACEXML_Namespace_Context_Stack::~ACEXML_Namespace_Context_Stack (void) +ACEXML_Namespace_Context_Stack::~ACEXML_Namespace_Context_Stack () { // Clean up stuff. } @@ -30,7 +30,7 @@ ACEXML_Namespace_Context_Stack::push (ACEXML_NS_CONTEXT *nsc) } ACEXML_NS_CONTEXT * -ACEXML_Namespace_Context_Stack::pop (void) +ACEXML_Namespace_Context_Stack::pop () { if (this->stack_.size() <= 0) return 0; @@ -46,7 +46,7 @@ ACEXML_Namespace_Context_Stack::pop (void) } int -ACEXML_NamespaceSupport::popContext (void) +ACEXML_NamespaceSupport::popContext () { delete this->effective_context_; @@ -56,7 +56,7 @@ ACEXML_NamespaceSupport::popContext (void) } int -ACEXML_NamespaceSupport::pushContext (void) +ACEXML_NamespaceSupport::pushContext () { ACEXML_NS_CONTEXT *temp = this->effective_context_; ACE_NEW_RETURN (this->effective_context_, @@ -75,13 +75,13 @@ ACEXML_NamespaceSupport::pushContext (void) return 0; } -ACEXML_NamespaceSupport::ACEXML_NamespaceSupport (void) +ACEXML_NamespaceSupport::ACEXML_NamespaceSupport () : ns_stack_ (), effective_context_ (0) {} int -ACEXML_NamespaceSupport::init (void) +ACEXML_NamespaceSupport::init () { // @@ No way to tell if the new fails. ACE_NEW_RETURN (effective_context_, ACEXML_NS_CONTEXT(), -1); @@ -91,7 +91,7 @@ ACEXML_NamespaceSupport::init (void) return this->effective_context_->bind (prefix, uri); } -ACEXML_NamespaceSupport::~ACEXML_NamespaceSupport (void) +ACEXML_NamespaceSupport::~ACEXML_NamespaceSupport () { while (this->popContext () == 0) ; @@ -238,7 +238,7 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName, } int -ACEXML_NamespaceSupport::reset (void) +ACEXML_NamespaceSupport::reset () { while (this->popContext() != -1) ; diff --git a/ACE/ACEXML/common/SAXExceptions.cpp b/ACE/ACEXML/common/SAXExceptions.cpp index bca3d1e46b1c1..6eed2b94a8f80 100644 --- a/ACE/ACEXML/common/SAXExceptions.cpp +++ b/ACE/ACEXML/common/SAXExceptions.cpp @@ -18,7 +18,7 @@ const ACEXML_Char ACEXML_SAXParseException::exception_name_[] = ACE_TEXT ("ACEXM # include "ACEXML/common/SAXExceptions.inl" #endif /* __ACEXML_INLINE__ */ -ACEXML_SAXException::ACEXML_SAXException (void) +ACEXML_SAXException::ACEXML_SAXException () : message_ (0) { } @@ -53,7 +53,7 @@ ACEXML_SAXException::_downcast (ACEXML_Exception* ex) return dynamic_cast (ex); } -ACEXML_SAXException::~ACEXML_SAXException (void) +ACEXML_SAXException::~ACEXML_SAXException () { ACE::strdelete (this->message_); } @@ -81,7 +81,7 @@ ACEXML_SAXException::print () const this->exception_name_, this->message())); } -ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (void) +ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException () { } @@ -109,7 +109,7 @@ ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (const ACEXML_C { } -ACEXML_SAXNotSupportedException::~ACEXML_SAXNotSupportedException (void) +ACEXML_SAXNotSupportedException::~ACEXML_SAXNotSupportedException () { } @@ -138,7 +138,7 @@ ACEXML_SAXNotSupportedException::print () const this->exception_name_, this->message())); } -ACEXML_SAXNotRecognizedException::ACEXML_SAXNotRecognizedException (void) +ACEXML_SAXNotRecognizedException::ACEXML_SAXNotRecognizedException () { } @@ -165,7 +165,7 @@ ACEXML_SAXNotRecognizedException::_downcast (ACEXML_Exception* ex) return dynamic_cast (ex); } -ACEXML_SAXNotRecognizedException::~ACEXML_SAXNotRecognizedException (void) +ACEXML_SAXNotRecognizedException::~ACEXML_SAXNotRecognizedException () { } @@ -193,7 +193,7 @@ ACEXML_SAXNotRecognizedException::print () const this->exception_name_, this->message())); } -ACEXML_SAXParseException::ACEXML_SAXParseException (void) +ACEXML_SAXParseException::ACEXML_SAXParseException () { } @@ -220,7 +220,7 @@ ACEXML_SAXParseException::_downcast (ACEXML_Exception* ex) return dynamic_cast (ex); } -ACEXML_SAXParseException::~ACEXML_SAXParseException (void) +ACEXML_SAXParseException::~ACEXML_SAXParseException () { } diff --git a/ACE/ACEXML/common/StrCharStream.cpp b/ACE/ACEXML/common/StrCharStream.cpp index 66974199a477b..339bf4bd8feb9 100644 --- a/ACE/ACEXML/common/StrCharStream.cpp +++ b/ACE/ACEXML/common/StrCharStream.cpp @@ -4,13 +4,13 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACEXML_StrCharStream::ACEXML_StrCharStream (void) +ACEXML_StrCharStream::ACEXML_StrCharStream () : start_ (0), ptr_ (0), end_ (0), encoding_ (0), name_ (0) { } -ACEXML_StrCharStream::~ACEXML_StrCharStream (void) +ACEXML_StrCharStream::~ACEXML_StrCharStream () { this->close(); } @@ -18,7 +18,6 @@ ACEXML_StrCharStream::~ACEXML_StrCharStream (void) int ACEXML_StrCharStream::open (const ACEXML_Char *str, const ACEXML_Char* name) { - if (str != 0 && name != 0) { delete [] this->start_; @@ -35,7 +34,7 @@ ACEXML_StrCharStream::open (const ACEXML_Char *str, const ACEXML_Char* name) } int -ACEXML_StrCharStream::available (void) +ACEXML_StrCharStream::available () { if (this->start_ != 0) return static_cast (this->end_ - this->start_); // @@ Will this work on all platforms? @@ -43,7 +42,7 @@ ACEXML_StrCharStream::available (void) } int -ACEXML_StrCharStream::close (void) +ACEXML_StrCharStream::close () { delete[] this->start_; delete[] this->encoding_; @@ -55,7 +54,7 @@ ACEXML_StrCharStream::close (void) } int -ACEXML_StrCharStream::determine_encoding (void) +ACEXML_StrCharStream::determine_encoding () { if (this->start_ == 0) return -1; @@ -77,7 +76,7 @@ ACEXML_StrCharStream::determine_encoding (void) } void -ACEXML_StrCharStream::rewind (void) +ACEXML_StrCharStream::rewind () { this->ptr_ = this->start_; this->determine_encoding(); @@ -110,7 +109,7 @@ ACEXML_StrCharStream::read (ACEXML_Char *str, size_t len) } int -ACEXML_StrCharStream::peek (void) +ACEXML_StrCharStream::peek () { if (this->start_ != 0 && this->ptr_ != this->end_) return *this->ptr_; @@ -118,13 +117,13 @@ ACEXML_StrCharStream::peek (void) } const ACEXML_Char* -ACEXML_StrCharStream::getEncoding (void) +ACEXML_StrCharStream::getEncoding () { return this->encoding_; } const ACEXML_Char* -ACEXML_StrCharStream::getSystemId(void) +ACEXML_StrCharStream::getSystemId() { return this->name_; } diff --git a/ACE/ACEXML/common/StrCharStream.h b/ACE/ACEXML/common/StrCharStream.h index 47c9b0d04aea0..79eb26bcd9f04 100644 --- a/ACE/ACEXML/common/StrCharStream.h +++ b/ACE/ACEXML/common/StrCharStream.h @@ -30,10 +30,10 @@ class ACEXML_Export ACEXML_StrCharStream : public ACEXML_CharStream { public: /// Default constructor. - ACEXML_StrCharStream (void); + ACEXML_StrCharStream (); /// Destructor - virtual ~ACEXML_StrCharStream (void); + virtual ~ACEXML_StrCharStream (); /// Initializing StrCharStream with @a str and @a name int open (const ACEXML_Char *str, const ACEXML_Char* name); @@ -42,17 +42,17 @@ class ACEXML_Export ACEXML_StrCharStream : public ACEXML_CharStream * Returns the available ACEXML_Char in the buffer. -1 * if the object is not initialized properly. */ - virtual int available (void); + virtual int available (); /** * Close this stream and release all resources used by it. */ - virtual int close (void); + virtual int close (); /** * Determine the encoding of the file. */ - virtual int determine_encoding (void); + virtual int determine_encoding (); /** * Read the next ACEXML_Char. Return -1 if we are not able to @@ -69,22 +69,22 @@ class ACEXML_Export ACEXML_StrCharStream : public ACEXML_CharStream * Peek the next ACEXML_Char in the CharStream. Return the * character if succeess, -1 if EOS is reached. */ - virtual int peek (void); + virtual int peek (); /* * Get the character encoding for a byte stream or URI. */ - virtual const ACEXML_Char *getEncoding (void); + virtual const ACEXML_Char *getEncoding (); /* * Get the systemId for the underlying CharStream */ - virtual const ACEXML_Char* getSystemId (void); + virtual const ACEXML_Char* getSystemId (); /** * Resets the pointer to the beginning of the stream. */ - virtual void rewind (void); + virtual void rewind (); private: ACEXML_Char *start_; @@ -92,7 +92,6 @@ class ACEXML_Export ACEXML_StrCharStream : public ACEXML_CharStream ACEXML_Char *end_; ACEXML_Char* encoding_; ACEXML_Char* name_; - }; #include /**/ "ace/post.h" diff --git a/ACE/ACEXML/common/StreamFactory.cpp b/ACE/ACEXML/common/StreamFactory.cpp index c98d7a647da7d..80f722b50ed7d 100644 --- a/ACE/ACEXML/common/StreamFactory.cpp +++ b/ACE/ACEXML/common/StreamFactory.cpp @@ -9,7 +9,6 @@ #endif /* USE_ZZIP */ - ACEXML_CharStream* ACEXML_StreamFactory::create_stream (const ACEXML_Char* uri) { diff --git a/ACE/ACEXML/common/StreamFactory.h b/ACE/ACEXML/common/StreamFactory.h index dc751c9bc0094..68d5bbf1460c3 100644 --- a/ACE/ACEXML/common/StreamFactory.h +++ b/ACE/ACEXML/common/StreamFactory.h @@ -36,9 +36,8 @@ class ACEXML_CharStream; class ACEXML_Export ACEXML_StreamFactory { public: - // Destructor - virtual ~ACEXML_StreamFactory (void); + virtual ~ACEXML_StreamFactory (); /** * Create the appropriate stream from the @a uri passed and return the diff --git a/ACE/ACEXML/common/URL_Addr.cpp b/ACE/ACEXML/common/URL_Addr.cpp index 673b431795696..ccd234d33d668 100644 --- a/ACE/ACEXML/common/URL_Addr.cpp +++ b/ACE/ACEXML/common/URL_Addr.cpp @@ -11,7 +11,7 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_string.h" -ACEXML_URL_Addr::ACEXML_URL_Addr (void) +ACEXML_URL_Addr::ACEXML_URL_Addr () : path_name_ (0), addr_string_ (0), addr_string_len_ (0) @@ -166,7 +166,7 @@ ACEXML_URL_Addr::ACEXML_URL_Addr (const ACEXML_Char *host_name, { } -ACEXML_URL_Addr::~ACEXML_URL_Addr (void) +ACEXML_URL_Addr::~ACEXML_URL_Addr () { ACE_OS::free (this->path_name_); ACE_OS::free (this->addr_string_); diff --git a/ACE/ACEXML/common/URL_Addr.h b/ACE/ACEXML/common/URL_Addr.h index ea280dac4167a..4d2e3f2c91aeb 100644 --- a/ACE/ACEXML/common/URL_Addr.h +++ b/ACE/ACEXML/common/URL_Addr.h @@ -30,7 +30,7 @@ class ACEXML_Export ACEXML_URL_Addr : public ACE_INET_Addr { public: /// Initialization and termination methods. - ACEXML_URL_Addr (void); + ACEXML_URL_Addr (); /// Constructor. ACEXML_URL_Addr (const ACEXML_Char *host_name, @@ -89,7 +89,7 @@ class ACEXML_Export ACEXML_URL_Addr : public ACE_INET_Addr void operator= (const ACEXML_URL_Addr &addr); /// Destructor. - ~ACEXML_URL_Addr (void); + ~ACEXML_URL_Addr (); /** * Compare two addresses for equality. The addresses are considered @@ -107,10 +107,9 @@ class ACEXML_Export ACEXML_URL_Addr : public ACE_INET_Addr const ACEXML_Char *get_path_name () const; /// Commit suicide. - int destroy (void); + int destroy (); private: - /// Calculate the maximum length of the address string size_t calculate_length (int ipaddr_format) const; diff --git a/ACE/ACEXML/common/URL_Addr.inl b/ACE/ACEXML/common/URL_Addr.inl index eba8ef80b3dab..97b672ce18571 100644 --- a/ACE/ACEXML/common/URL_Addr.inl +++ b/ACE/ACEXML/common/URL_Addr.inl @@ -54,7 +54,7 @@ ACEXML_URL_Addr::get_path_name () const } ACE_INLINE int -ACEXML_URL_Addr::destroy (void) +ACEXML_URL_Addr::destroy () { // Commit suicide. delete this; diff --git a/ACE/ACEXML/common/Validator.cpp b/ACE/ACEXML/common/Validator.cpp index 158e1bad9d520..1349ed6cba8d0 100644 --- a/ACE/ACEXML/common/Validator.cpp +++ b/ACE/ACEXML/common/Validator.cpp @@ -2,5 +2,4 @@ ACEXML_Validator::~ACEXML_Validator () { - } diff --git a/ACE/ACEXML/common/XMLFilterImpl.cpp b/ACE/ACEXML/common/XMLFilterImpl.cpp index c4519cfdb300e..3a555931c45d1 100644 --- a/ACE/ACEXML/common/XMLFilterImpl.cpp +++ b/ACE/ACEXML/common/XMLFilterImpl.cpp @@ -6,7 +6,7 @@ # include "ACEXML/common/XMLFilterImpl.inl" #endif /* __ACEXML_INLINE__ */ -ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl (void) +ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl () : parent_ (0), // locator_ (0), entityResolver_ (0), @@ -26,7 +26,7 @@ ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl (ACEXML_XMLReader *parent) { } -ACEXML_XMLFilterImpl::~ACEXML_XMLFilterImpl (void) +ACEXML_XMLFilterImpl::~ACEXML_XMLFilterImpl () { // @@ How are all the object lifecycles managed? } @@ -118,7 +118,7 @@ ACEXML_XMLFilterImpl::characters (const ACEXML_Char *ch, } void -ACEXML_XMLFilterImpl::endDocument (void) +ACEXML_XMLFilterImpl::endDocument () { if (this->contentHandler_ != 0) this->contentHandler_->endDocument (); @@ -177,7 +177,7 @@ ACEXML_XMLFilterImpl::skippedEntity (const ACEXML_Char *name) } void -ACEXML_XMLFilterImpl::startDocument (void) +ACEXML_XMLFilterImpl::startDocument () { if (this->contentHandler_ != 0) this->contentHandler_->startDocument (); diff --git a/ACE/ACEXML/common/XMLFilterImpl.h b/ACE/ACEXML/common/XMLFilterImpl.h index ad5034372d962..c982068214da7 100644 --- a/ACE/ACEXML/common/XMLFilterImpl.h +++ b/ACE/ACEXML/common/XMLFilterImpl.h @@ -41,7 +41,7 @@ class ACEXML_Export ACEXML_XMLFilterImpl /** * Default constructor. Create with no parent. */ - ACEXML_XMLFilterImpl (void); + ACEXML_XMLFilterImpl (); /** * Construct an XML filter with the specified parent. @@ -51,7 +51,7 @@ class ACEXML_Export ACEXML_XMLFilterImpl /** * Destructor. */ - virtual ~ACEXML_XMLFilterImpl (void); + virtual ~ACEXML_XMLFilterImpl (); /* * Look up the value of a feature. @@ -143,7 +143,7 @@ class ACEXML_Export ACEXML_XMLFilterImpl /* * Receive notification of the end of a document. */ - virtual void endDocument (void); + virtual void endDocument (); /* * Receive notification of the end of an element. @@ -183,7 +183,7 @@ class ACEXML_Export ACEXML_XMLFilterImpl /* * Receive notification of the beginning of a document. */ - virtual void startDocument (void); + virtual void startDocument (); /* * Receive notification of the beginning of an element. @@ -241,7 +241,7 @@ class ACEXML_Export ACEXML_XMLFilterImpl */ virtual void warning (ACEXML_SAXParseException &exception); protected: - int setupParser (void); + int setupParser (); // Set up the event handlers of parent parser to this. // Returns -1 if no valid parent is set. diff --git a/ACE/ACEXML/common/XMLFilterImpl.inl b/ACE/ACEXML/common/XMLFilterImpl.inl index 3fd4fab16e834..76b43286d4ee9 100644 --- a/ACE/ACEXML/common/XMLFilterImpl.inl +++ b/ACE/ACEXML/common/XMLFilterImpl.inl @@ -1,7 +1,7 @@ // -*- C++ -*- ACEXML_INLINE int -ACEXML_XMLFilterImpl::setupParser (void) +ACEXML_XMLFilterImpl::setupParser () { if (this->parent_ == 0) return -1; diff --git a/ACE/ACEXML/common/XMLReader.cpp b/ACE/ACEXML/common/XMLReader.cpp index 4a82e8752576c..74247fe085029 100644 --- a/ACE/ACEXML/common/XMLReader.cpp +++ b/ACE/ACEXML/common/XMLReader.cpp @@ -1,5 +1,5 @@ #include "XMLReader.h" -ACEXML_XMLReader::~ACEXML_XMLReader (void) +ACEXML_XMLReader::~ACEXML_XMLReader () { } diff --git a/ACE/ACEXML/common/XMLReader.h b/ACE/ACEXML/common/XMLReader.h index a335291fc3e20..a4dca7837427b 100644 --- a/ACE/ACEXML/common/XMLReader.h +++ b/ACE/ACEXML/common/XMLReader.h @@ -40,7 +40,6 @@ class ACEXML_Export ACEXML_XMLReader { public: - virtual ~ACEXML_XMLReader (); /** diff --git a/ACE/ACEXML/common/XML_Codecs.h b/ACE/ACEXML/common/XML_Codecs.h index 006dddb6d576c..b20076aa28e48 100644 --- a/ACE/ACEXML/common/XML_Codecs.h +++ b/ACE/ACEXML/common/XML_Codecs.h @@ -35,9 +35,7 @@ class ACEXML_Export ACEXML_Base64 : public ACE_Base64 { public: - //@{ - /** * Encodes a stream of octets to Base64 data * diff --git a/ACE/ACEXML/common/ZipCharStream.cpp b/ACE/ACEXML/common/ZipCharStream.cpp index c4399ae72d229..7dcf3a9b47c65 100644 --- a/ACE/ACEXML/common/ZipCharStream.cpp +++ b/ACE/ACEXML/common/ZipCharStream.cpp @@ -4,13 +4,13 @@ #include "ace/ACE.h" -ACEXML_ZipCharStream::ACEXML_ZipCharStream (void) +ACEXML_ZipCharStream::ACEXML_ZipCharStream () : filename_ (0), encoding_ (0), size_ (0), infile_ (0), pos_ (0), limit_ (0) { } -ACEXML_ZipCharStream::~ACEXML_ZipCharStream (void) +ACEXML_ZipCharStream::~ACEXML_ZipCharStream () { this->close(); } @@ -33,7 +33,7 @@ ACEXML_ZipCharStream::open (const ACEXML_Char *name) } int -ACEXML_ZipCharStream::determine_encoding (void) +ACEXML_ZipCharStream::determine_encoding () { if (this->infile_ == 0) return -1; @@ -82,7 +82,7 @@ ACEXML_ZipCharStream::rewind() } int -ACEXML_ZipCharStream::available (void) +ACEXML_ZipCharStream::available () { if (this->infile_ == 0) return -1; @@ -93,7 +93,7 @@ ACEXML_ZipCharStream::available (void) } int -ACEXML_ZipCharStream::close (void) +ACEXML_ZipCharStream::close () { if (this->infile_ != 0) { @@ -182,7 +182,7 @@ ACEXML_ZipCharStream::get (ACEXML_Char& ch) int -ACEXML_ZipCharStream::peek (void) +ACEXML_ZipCharStream::peek () { #if defined (ACE_USES_WCHAR) return this->peek_i(); @@ -192,13 +192,13 @@ ACEXML_ZipCharStream::peek (void) } const ACEXML_Char* -ACEXML_ZipCharStream::getEncoding (void) +ACEXML_ZipCharStream::getEncoding () { return this->encoding_; } const ACEXML_Char* -ACEXML_ZipCharStream::getSystemId (void) +ACEXML_ZipCharStream::getSystemId () { return this->filename_; } @@ -226,9 +226,8 @@ ACEXML_ZipCharStream::get_i (ACEXML_Char& ch) } int -ACEXML_ZipCharStream::peek_i (void) +ACEXML_ZipCharStream::peek_i () { - // If we are reading a UTF-8 encoded file, just use the plain unget. if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) return this->peekchar_i(); diff --git a/ACE/ACEXML/common/ZipCharStream.h b/ACE/ACEXML/common/ZipCharStream.h index 8ed9ec48d3017..3940583088eef 100644 --- a/ACE/ACEXML/common/ZipCharStream.h +++ b/ACE/ACEXML/common/ZipCharStream.h @@ -38,10 +38,10 @@ class ACEXML_Export ACEXML_ZipCharStream : public ACEXML_CharStream { public: /// Default constructor. - ACEXML_ZipCharStream (void); + ACEXML_ZipCharStream (); /// Destructor - virtual ~ACEXML_ZipCharStream (void); + virtual ~ACEXML_ZipCharStream (); /// Open a file. int open (const ACEXML_Char *name); @@ -50,12 +50,12 @@ class ACEXML_Export ACEXML_ZipCharStream : public ACEXML_CharStream * Returns the available ACEXML_Char in the buffer. -1 * if the object is not initialized properly. */ - virtual int available (void); + virtual int available (); /** * Close this stream and release all resources used by it. */ - virtual int close (void); + virtual int close (); /** * Read the next ACEXML_Char. Return -1 if we are not able to @@ -71,32 +71,31 @@ class ACEXML_Export ACEXML_ZipCharStream : public ACEXML_CharStream /** * Determine the encoding of the file. */ - virtual int determine_encoding (void); + virtual int determine_encoding (); /** * Peek the next ACEXML_Char in the CharStream. Return the * character if success, -1 if EOF is reached. */ - virtual int peek (void); + virtual int peek (); /** * Resets the file pointer to the beginning of the stream. */ - virtual void rewind (void); + virtual void rewind (); /* * Get the character encoding for a byte stream or URI. */ - virtual const ACEXML_Char *getEncoding (void); + virtual const ACEXML_Char *getEncoding (); /* * Get the systemId for the underlying CharStream */ - virtual const ACEXML_Char* getSystemId (void); + virtual const ACEXML_Char* getSystemId (); protected: - /** Read the next character as a normal character. Return -1 if EOF is * reached, else return 0. */ @@ -109,7 +108,6 @@ class ACEXML_Export ACEXML_ZipCharStream : public ACEXML_CharStream virtual int peekchar_i (ACE_OFF_T offset = 0); private: - #if defined (ACE_USES_WCHAR) /** * Read the next character from the stream taking into account the @@ -122,7 +120,7 @@ class ACEXML_Export ACEXML_ZipCharStream : public ACEXML_CharStream * encoding of the file. Subsequent call to get() returns this * character. */ - int peek_i (void); + int peek_i (); #endif /* ACE_USES_WCHAR */ diff --git a/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp index 8b6ccdc374de8..d63a112808fcb 100644 --- a/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp +++ b/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp @@ -10,7 +10,7 @@ ACEXML_Print_Handler::ACEXML_Print_Handler (ACEXML_Char* fileName) { } -ACEXML_Print_Handler::~ACEXML_Print_Handler (void) +ACEXML_Print_Handler::~ACEXML_Print_Handler () { delete[] this->fileName_; } @@ -26,7 +26,7 @@ ACEXML_Print_Handler::characters (const ACEXML_Char *cdata, } void -ACEXML_Print_Handler::endDocument (void) +ACEXML_Print_Handler::endDocument () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event endDocument () ***************\n"))); @@ -84,7 +84,7 @@ ACEXML_Print_Handler::skippedEntity (const ACEXML_Char *name) } void -ACEXML_Print_Handler::startDocument (void) +ACEXML_Print_Handler::startDocument () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event startDocument () ***************\n"))); diff --git a/ACE/ACEXML/examples/SAXPrint/Print_Handler.h b/ACE/ACEXML/examples/SAXPrint/Print_Handler.h index da8381f50dea9..ea4359b2b69b1 100644 --- a/ACE/ACEXML/examples/SAXPrint/Print_Handler.h +++ b/ACE/ACEXML/examples/SAXPrint/Print_Handler.h @@ -30,7 +30,7 @@ class ACEXML_Print_Handler : public ACEXML_DefaultHandler /* * Default destructor. */ - virtual ~ACEXML_Print_Handler (void); + virtual ~ACEXML_Print_Handler (); // Methods inherited from ACEXML_ContentHandler. @@ -44,7 +44,7 @@ class ACEXML_Print_Handler : public ACEXML_DefaultHandler /* * Receive notification of the end of a document. */ - virtual void endDocument (void); + virtual void endDocument (); /* * Receive notification of the end of an element. @@ -84,7 +84,7 @@ class ACEXML_Print_Handler : public ACEXML_DefaultHandler /* * Receive notification of the beginning of a document. */ - virtual void startDocument (void); + virtual void startDocument (); /* * Receive notification of the beginning of an element. diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp index bebc001277a3c..ae1fbc605ec26 100644 --- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp +++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp @@ -13,7 +13,7 @@ ACEXML_SAXPrint_Handler::ACEXML_SAXPrint_Handler (const ACEXML_Char* filename) { } -ACEXML_SAXPrint_Handler::~ACEXML_SAXPrint_Handler (void) +ACEXML_SAXPrint_Handler::~ACEXML_SAXPrint_Handler () { delete [] this->fileName_; } @@ -29,10 +29,8 @@ ACEXML_SAXPrint_Handler::characters (const ACEXML_Char *cdata, } void -ACEXML_SAXPrint_Handler::endDocument (void) +ACEXML_SAXPrint_Handler::endDocument () { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } @@ -41,8 +39,6 @@ ACEXML_SAXPrint_Handler::endElement (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *qName) { - - this->dec_indent (); this->print_indent (); ACE_DEBUG ((LM_DEBUG, @@ -74,8 +70,6 @@ void ACEXML_SAXPrint_Handler::processingInstruction (const ACEXML_Char *target, const ACEXML_Char *data) { - - this->print_indent (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"), @@ -85,7 +79,6 @@ ACEXML_SAXPrint_Handler::processingInstruction (const ACEXML_Char *target, void ACEXML_SAXPrint_Handler::setDocumentLocator (ACEXML_Locator * locator) { - this->locator_ = locator; //ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event setDocumentLocator () ***************\n"))); } @@ -93,18 +86,14 @@ ACEXML_SAXPrint_Handler::setDocumentLocator (ACEXML_Locator * locator) void ACEXML_SAXPrint_Handler::skippedEntity (const ACEXML_Char *name) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event skippedEntity (%s) ***************\n"), name)); } void -ACEXML_SAXPrint_Handler::startDocument (void) +ACEXML_SAXPrint_Handler::startDocument () { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event startDocument () ***************\n"))); } @@ -115,8 +104,6 @@ ACEXML_SAXPrint_Handler::startElement (const ACEXML_Char *, const ACEXML_Char *qName, ACEXML_Attributes *alist) { - - this->print_indent (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<%s"), @@ -140,7 +127,6 @@ ACEXML_SAXPrint_Handler::startPrefixMapping (const ACEXML_Char * , // ACE_TEXT ("* Event startPrefixMapping () ***************\n"))); // ACE_DEBUG ((LM_DEBUG, // ACE_TEXT ("Prefix = %s, URI = %s\n"), prefix, uri)); - } // *** Methods inherited from ACEXML_DTDHandler. @@ -208,7 +194,7 @@ ACEXML_SAXPrint_Handler::warning (ACEXML_SAXParseException & ex) } void -ACEXML_SAXPrint_Handler::print_indent (void) +ACEXML_SAXPrint_Handler::print_indent () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); for (size_t i = 0; i < this->indent_; ++i) diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h index 33f38406458ba..02ce2487386fa 100644 --- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h +++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h @@ -30,7 +30,7 @@ class ACEXML_SAXPrint_Handler : public ACEXML_DefaultHandler /* * Default destructor. */ - virtual ~ACEXML_SAXPrint_Handler (void); + virtual ~ACEXML_SAXPrint_Handler (); // Methods inherit from ACEXML_ContentHandler. @@ -45,7 +45,7 @@ class ACEXML_SAXPrint_Handler : public ACEXML_DefaultHandler /* * Receive notification of the end of a document. */ - virtual void endDocument (void) + virtual void endDocument () ; /* @@ -86,7 +86,7 @@ class ACEXML_SAXPrint_Handler : public ACEXML_DefaultHandler /* * Receive notification of the beginning of a document. */ - virtual void startDocument (void); + virtual void startDocument (); /* * Receive notification of the beginning of an element. @@ -149,7 +149,6 @@ class ACEXML_SAXPrint_Handler : public ACEXML_DefaultHandler void print_indent (); private: - size_t indent_; ACEXML_Char* fileName_; ACEXML_Locator* locator_; diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.inl b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.inl index aa91087083350..002ebd8cd3ee7 100644 --- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.inl +++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.inl @@ -1,13 +1,13 @@ // -*- C++ -*- ACEXML_INLINE void -ACEXML_SAXPrint_Handler::inc_indent (void) +ACEXML_SAXPrint_Handler::inc_indent () { this->indent_ += 1; } ACEXML_INLINE void -ACEXML_SAXPrint_Handler::dec_indent (void) +ACEXML_SAXPrint_Handler::dec_indent () { this->indent_ -= 1; } diff --git a/ACE/ACEXML/examples/SAXPrint/main.cpp b/ACE/ACEXML/examples/SAXPrint/main.cpp index 6a5cdee25042f..e704d40c9bd76 100644 --- a/ACE/ACEXML/examples/SAXPrint/main.cpp +++ b/ACE/ACEXML/examples/SAXPrint/main.cpp @@ -115,7 +115,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } else if (url != 0) { - ACE_NEW_RETURN (ustm, ACEXML_HttpCharStream (), -1); if (ustm->open (url) != 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp index 35a07e5b4333c..586b503cbecc2 100644 --- a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp +++ b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp @@ -28,7 +28,7 @@ ACEXML_Debug_Attribute_Builder::setName (const ACEXML_Char *n) } const ACEXML_Char * -ACEXML_Debug_Attribute_Builder::getName (void) +ACEXML_Debug_Attribute_Builder::getName () { return this->name_.fast_rep (); } @@ -42,7 +42,6 @@ ACEXML_Debug_Attribute_Builder::setAttType (const ATT_TYPE type) return 0; } ACEXML_THROW_RETURN (ACEXML_SAXParseException (ACE_TEXT("Attribute type redefinition in Debug Validator")), -1); - } int @@ -64,14 +63,14 @@ ACEXML_Debug_Attribute_Builder::setDefault (const DEFAULT_DECL def, } int -ACEXML_Debug_Attribute_Builder::validAttr (void) +ACEXML_Debug_Attribute_Builder::validAttr () { // @@ Not implemented. Always return 1 (true) for now. return 1; } void -ACEXML_Debug_Attribute_Builder::dump (void) +ACEXML_Debug_Attribute_Builder::dump () { cout << this->name_ << " "; @@ -189,7 +188,7 @@ ACEXML_Debug_Attributes_Builder::insertAttribute ( } void -ACEXML_Debug_Attributes_Builder::dump (void) +ACEXML_Debug_Attributes_Builder::dump () { // @@ Print print. cout << "element_name_ << endl; diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h index bd3906bbc87f6..df6fac84210c9 100644 --- a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h +++ b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h @@ -43,7 +43,7 @@ class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Debug_Attribute_Builder * Specify the name of the attribute. */ virtual int setName (const ACEXML_Char *n); - virtual const ACEXML_Char *getName (void); + virtual const ACEXML_Char *getName (); /** * Set the attribute type. @@ -65,13 +65,13 @@ class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Debug_Attribute_Builder * * @retval 0 if the attribute is not a valid combo. */ - virtual int validAttr (void); + virtual int validAttr (); /** * Dump the content of the attribute definition. */ - virtual void dump (void); + virtual void dump (); private: /// Attribute name. ACEXML_String name_; @@ -147,7 +147,7 @@ class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Debug_Attributes_Builder /** * Dump the content of the attribute definition. */ - virtual void dump (void); + virtual void dump (); protected: /// The name of the element type these attributes applied. ACEXML_String element_name_; diff --git a/ACE/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp b/ACE/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp index 05b9fe637defb..cff827cb67e3e 100644 --- a/ACE/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp +++ b/ACE/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp @@ -7,12 +7,10 @@ ACEXML_Debug_DTD_Manager::ACEXML_Debug_DTD_Manager () { - } ACEXML_Debug_DTD_Manager::~ACEXML_Debug_DTD_Manager () { - } ACEXML_Element_Def_Builder * diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h b/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h index 1e63e8646c78e..4f3e4e0cb651f 100644 --- a/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h +++ b/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h @@ -101,7 +101,7 @@ class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Debug_Element_Builder /** * Dump the content of the attribute definition. */ - virtual void dump (void); + virtual void dump (); private: CONTENT_TYPE type_; diff --git a/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp b/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp index c41af17499968..d98812167aaac 100644 --- a/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp +++ b/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp @@ -19,7 +19,7 @@ ACEXML_Element_Tree_Name_Node::dump () ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_Name_Node) -ACEXML_Element_Tree_List_Node::~ACEXML_Element_Tree_List_Node (void) +ACEXML_Element_Tree_List_Node::~ACEXML_Element_Tree_List_Node () { delete this->head_; } @@ -40,7 +40,7 @@ ACEXML_Element_Tree_List_Node::insert (ACEXML_Element_Tree_Node *node) } void -ACEXML_Element_Tree_List_Node::dump (void) +ACEXML_Element_Tree_List_Node::dump () { ACEXML_Element_Tree_Node *ptr = this->head_; const ACEXML_Char *separator = (this->type_ == SEQUENCE) ? ACE_TEXT(" , ") : ACE_TEXT(" | "); @@ -66,5 +66,4 @@ ACEXML_Element_Tree_List_Node::dump (void) ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_List_Node) - ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_List_Stack) diff --git a/ACE/ACEXML/parser/debug_validator/Element_Tree.h b/ACE/ACEXML/parser/debug_validator/Element_Tree.h index 141de871f9672..71fae9b6a7742 100644 --- a/ACE/ACEXML/parser/debug_validator/Element_Tree.h +++ b/ACE/ACEXML/parser/debug_validator/Element_Tree.h @@ -29,7 +29,6 @@ class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Element_Tree_Node { public: - /// Default constructor. ACEXML_Element_Tree_Node (); @@ -98,16 +97,16 @@ class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Element_Tree_List_Node } LIST_TYPE; /// Default constructor. - ACEXML_Element_Tree_List_Node (void); + ACEXML_Element_Tree_List_Node (); /// Destructor. - virtual ~ACEXML_Element_Tree_List_Node (void); + virtual ~ACEXML_Element_Tree_List_Node (); /// Insert a new ACEXML_Element_Tree_Node into the list. int insert (ACEXML_Element_Tree_Node *node); /// Get/set the type of list. - LIST_TYPE get (void); + LIST_TYPE get (); int set (LIST_TYPE type); virtual void dump (); @@ -137,11 +136,11 @@ class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Element_Tree_List_Stack void push (ACEXML_Element_Tree_List_Node *n); - ACEXML_Element_Tree_List_Node *pop (void); + ACEXML_Element_Tree_List_Node *pop (); - ACEXML_Element_Tree_List_Node *top (void); + ACEXML_Element_Tree_List_Node *top (); - int empty (void); + int empty (); ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ACEXML/parser/debug_validator/Element_Tree.inl b/ACE/ACEXML/parser/debug_validator/Element_Tree.inl index 914b08d610b6f..0400b44713af5 100644 --- a/ACE/ACEXML/parser/debug_validator/Element_Tree.inl +++ b/ACE/ACEXML/parser/debug_validator/Element_Tree.inl @@ -31,7 +31,7 @@ ACEXML_Element_Tree_Name_Node::set (const ACEXML_Char *name, } ACEXML_INLINE -ACEXML_Element_Tree_List_Node::ACEXML_Element_Tree_List_Node (void) +ACEXML_Element_Tree_List_Node::ACEXML_Element_Tree_List_Node () : type_ (SEQUENCE), head_ (0), tail_ (0), @@ -40,7 +40,7 @@ ACEXML_Element_Tree_List_Node::ACEXML_Element_Tree_List_Node (void) } ACEXML_INLINE ACEXML_Element_Tree_List_Node::LIST_TYPE -ACEXML_Element_Tree_List_Node::get (void) +ACEXML_Element_Tree_List_Node::get () { return this->type_; } @@ -53,7 +53,7 @@ ACEXML_Element_Tree_List_Node::set (ACEXML_Element_Tree_List_Node::LIST_TYPE typ } ACEXML_INLINE -ACEXML_Element_Tree_List_Stack::ACEXML_Element_Tree_List_Stack (void) +ACEXML_Element_Tree_List_Stack::ACEXML_Element_Tree_List_Stack () : top_ (0) { } diff --git a/ACE/ACEXML/parser/parser/ACEXML_Parser.rc b/ACE/ACEXML/parser/parser/ACEXML_Parser.rc new file mode 100644 index 0000000000000..ea134a6ba13c6 --- /dev/null +++ b/ACE/ACEXML/parser/parser/ACEXML_Parser.rc @@ -0,0 +1,30 @@ +#include "../../../ace/Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACEXML_Parser\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACEXML_ParserDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACEXML_Parser.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/ACEXML/parser/parser/Entity_Manager.cpp b/ACE/ACEXML/parser/parser/Entity_Manager.cpp index 586a816f24a40..a73cbb1b7ea30 100644 --- a/ACE/ACEXML/parser/parser/Entity_Manager.cpp +++ b/ACE/ACEXML/parser/parser/Entity_Manager.cpp @@ -5,13 +5,12 @@ #endif /* __ACEXML_INLINE__ */ -ACEXML_Entity_Manager::ACEXML_Entity_Manager (void) +ACEXML_Entity_Manager::ACEXML_Entity_Manager () : entities_ (0) { - } -ACEXML_Entity_Manager::~ACEXML_Entity_Manager (void) +ACEXML_Entity_Manager::~ACEXML_Entity_Manager () { this->reset(); } diff --git a/ACE/ACEXML/parser/parser/Entity_Manager.h b/ACE/ACEXML/parser/parser/Entity_Manager.h index f4a65b13f2bff..9382d9ecc86dd 100644 --- a/ACE/ACEXML/parser/parser/Entity_Manager.h +++ b/ACE/ACEXML/parser/parser/Entity_Manager.h @@ -86,7 +86,6 @@ class ACEXML_PARSER_Export ACEXML_Entity_Manager private: ACEXML_ENTITIES_MANAGER* entities_; // bool init_; - }; #if defined (__ACEXML_INLINE__) diff --git a/ACE/ACEXML/parser/parser/Parser.cpp b/ACE/ACEXML/parser/parser/Parser.cpp index 53d594b68c389..48196f2672316 100644 --- a/ACE/ACEXML/parser/parser/Parser.cpp +++ b/ACE/ACEXML/parser/parser/Parser.cpp @@ -28,7 +28,7 @@ ACEXML_Parser::namespace_prefixes_feature_[] = ACE_TEXT ("http://xml.org/sax/fea const ACEXML_Char ACEXML_Parser::validation_feature_[] = ACE_TEXT ("http://xml.org/sax/features/validation"); -ACEXML_Parser::ACEXML_Parser (void) +ACEXML_Parser::ACEXML_Parser () : dtd_handler_ (0), entity_resolver_ (0), content_handler_ (0), @@ -51,9 +51,8 @@ ACEXML_Parser::ACEXML_Parser (void) { } -ACEXML_Parser::~ACEXML_Parser (void) +ACEXML_Parser::~ACEXML_Parser () { - } int @@ -203,7 +202,7 @@ ACEXML_Parser::parse (ACEXML_InputSource *input) } int -ACEXML_Parser::parse_doctypedecl (void) +ACEXML_Parser::parse_doctypedecl () { if (this->parse_token (ACE_TEXT ("DOCTYPE")) < 0) { @@ -263,7 +262,7 @@ ACEXML_Parser::parse_doctypedecl (void) } int -ACEXML_Parser::parse_internal_dtd (void) +ACEXML_Parser::parse_internal_dtd () { this->ref_state_ = ACEXML_ParserInt::IN_INT_DTD; ACEXML_Char nextch = this->skip_whitespace (); @@ -307,7 +306,7 @@ ACEXML_Parser::parse_internal_dtd (void) } int -ACEXML_Parser::parse_external_dtd (void) +ACEXML_Parser::parse_external_dtd () { this->ref_state_ = ACEXML_ParserInt::IN_EXT_DTD; ACEXML_Char* publicId = 0; @@ -349,7 +348,7 @@ ACEXML_Parser::parse_external_dtd (void) int -ACEXML_Parser::parse_external_subset (void) +ACEXML_Parser::parse_external_subset () { this->ref_state_ = ACEXML_ParserInt::IN_EXT_DTD; this->external_subset_ = 1; @@ -396,7 +395,7 @@ ACEXML_Parser::parse_external_subset (void) } int -ACEXML_Parser::parse_conditional_section (void) +ACEXML_Parser::parse_conditional_section () { ACEXML_Char ch = this->get (); int include = 0; @@ -458,7 +457,7 @@ ACEXML_Parser::parse_conditional_section (void) } int -ACEXML_Parser::parse_ignoresect (void) +ACEXML_Parser::parse_ignoresect () { ACEXML_Char nextch = this->skip_whitespace(); int count = 0; @@ -511,7 +510,7 @@ ACEXML_Parser::parse_ignoresect (void) } int -ACEXML_Parser::parse_includesect (void) +ACEXML_Parser::parse_includesect () { ACEXML_Char nextch = this->skip_whitespace(); do { @@ -562,7 +561,7 @@ ACEXML_Parser::parse_includesect (void) } int -ACEXML_Parser::parse_markup_decl (void) +ACEXML_Parser::parse_markup_decl () { ACEXML_Char nextch = this->peek (); switch (nextch) @@ -1004,7 +1003,7 @@ ACEXML_Parser::parse_content (const ACEXML_Char* startname, int -ACEXML_Parser::parse_cdata (void) +ACEXML_Parser::parse_cdata () { if (this->parse_token (ACE_TEXT ("[CDATA[")) < 0) { @@ -1042,7 +1041,7 @@ ACEXML_Parser::parse_cdata (void) int -ACEXML_Parser::parse_entity_decl (void) +ACEXML_Parser::parse_entity_decl () { ACEXML_Char nextch = 0; @@ -1169,7 +1168,7 @@ ACEXML_Parser::parse_entity_decl (void) } int -ACEXML_Parser::parse_attlist_decl (void) +ACEXML_Parser::parse_attlist_decl () { if (this->parse_token (ACE_TEXT ("ATTLIST")) < 0) { @@ -1228,7 +1227,7 @@ ACEXML_Parser::parse_attlist_decl (void) } int -ACEXML_Parser::check_for_PE_reference (void) +ACEXML_Parser::check_for_PE_reference () { ACEXML_Char fwd = '\xFF'; // Skip any leading whitespaces and store the number of such chars skipped @@ -1262,7 +1261,7 @@ ACEXML_Parser::check_for_PE_reference (void) } ACEXML_Char* -ACEXML_Parser::parse_attname (void) +ACEXML_Parser::parse_attname () { // Parse attribute name ACEXML_Char *att_name = this->parse_name (); @@ -1274,7 +1273,7 @@ ACEXML_Parser::parse_attname (void) } int -ACEXML_Parser::parse_defaultdecl (void) +ACEXML_Parser::parse_defaultdecl () { // DefaultDecl ::= '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue) ACEXML_Char nextch = this->peek (); @@ -1334,7 +1333,7 @@ ACEXML_Parser::parse_defaultdecl (void) } int -ACEXML_Parser::parse_tokenized_type (void) +ACEXML_Parser::parse_tokenized_type () { ACEXML_Char ch = this->get(); switch (ch) @@ -1452,7 +1451,7 @@ ACEXML_Parser::parse_tokenized_type (void) * [VC: Enumeration] */ int -ACEXML_Parser::parse_atttype (void) +ACEXML_Parser::parse_atttype () { ACEXML_Char nextch = this->peek(); switch (nextch) @@ -1547,7 +1546,7 @@ ACEXML_Parser::parse_atttype (void) } int -ACEXML_Parser::parse_notation_decl (void) +ACEXML_Parser::parse_notation_decl () { if (this->parse_token (ACE_TEXT ("NOTATION")) < 0) { @@ -1611,7 +1610,7 @@ ACEXML_Parser::parse_notation_decl (void) } int -ACEXML_Parser::parse_element_decl (void) +ACEXML_Parser::parse_element_decl () { if (this->parse_token (ACE_TEXT ("LEMENT")) < 0) { @@ -1665,7 +1664,7 @@ ACEXML_Parser::parse_element_decl (void) int -ACEXML_Parser::parse_children_definition (void) +ACEXML_Parser::parse_children_definition () { this->get (); // consume the '(' this->check_for_PE_reference (); @@ -1902,7 +1901,7 @@ ACEXML_Parser::parse_char_reference (ACEXML_Char *buf, size_t& len) } ACEXML_Char* -ACEXML_Parser::parse_reference_name (void) +ACEXML_Parser::parse_reference_name () { ACEXML_Char ch = this->get (); if (!this->isLetter (ch) && (ch != '_' && ch != ':')) @@ -1996,7 +1995,7 @@ ACEXML_Parser::parse_attvalue (ACEXML_Char *&str) } int -ACEXML_Parser::parse_entity_reference (void) +ACEXML_Parser::parse_entity_reference () { ACEXML_Char* replace = this->parse_reference_name (); if (replace == 0) @@ -2122,7 +2121,7 @@ ACEXML_Parser::parse_entity_reference (void) } int -ACEXML_Parser::parse_PE_reference (void) +ACEXML_Parser::parse_PE_reference () { ACEXML_Char* replace = this->parse_reference_name (); if (replace == 0) @@ -2613,7 +2612,6 @@ ACEXML_Parser::getFeature (const ACEXML_Char *name) } - void ACEXML_Parser::setFeature (const ACEXML_Char *name, int boolean_value) { @@ -2683,7 +2681,7 @@ ACEXML_Parser::fatal_error (const ACEXML_Char* msg) } void -ACEXML_Parser::parse_version_info (void) +ACEXML_Parser::parse_version_info () { ACEXML_Char* astring; if (this->parse_token (ACE_TEXT("ersion")) < 0 @@ -2701,7 +2699,7 @@ ACEXML_Parser::parse_version_info (void) } void -ACEXML_Parser::parse_encoding_decl (void) +ACEXML_Parser::parse_encoding_decl () { ACEXML_Char* astring = 0; if ((this->parse_token (ACE_TEXT("ncoding")) < 0) @@ -2722,7 +2720,7 @@ ACEXML_Parser::parse_encoding_decl (void) } int -ACEXML_Parser::parse_text_decl (void) +ACEXML_Parser::parse_text_decl () { // Read xml if (this->parse_token (ACE_TEXT("xml")) < 0) @@ -2756,7 +2754,7 @@ ACEXML_Parser::parse_text_decl (void) } void -ACEXML_Parser::parse_xml_decl (void) +ACEXML_Parser::parse_xml_decl () { // Read parse_token (ACE_TEXT("xml")) < 0) @@ -2802,7 +2800,7 @@ ACEXML_Parser::parse_xml_decl (void) } int -ACEXML_Parser::parse_comment (void) +ACEXML_Parser::parse_comment () { int state = 0; @@ -2827,7 +2825,7 @@ ACEXML_Parser::parse_comment (void) } int -ACEXML_Parser::parse_processing_instruction (void) +ACEXML_Parser::parse_processing_instruction () { const ACEXML_Char *pitarget = this->parse_name (); ACEXML_Char *instruction = 0; @@ -2873,7 +2871,7 @@ ACEXML_Parser::parse_processing_instruction (void) } void -ACEXML_Parser::reset (void) +ACEXML_Parser::reset () { this->doctype_ = 0; if (this->ctx_stack_.pop (this->current_) == -1) diff --git a/ACE/ACEXML/parser/parser/Parser.h b/ACE/ACEXML/parser/parser/Parser.h index 49a728be1b0d8..4fd5ae981c3e0 100644 --- a/ACE/ACEXML/parser/parser/Parser.h +++ b/ACE/ACEXML/parser/parser/Parser.h @@ -131,7 +131,6 @@ class ACEXML_PARSER_Export ACEXML_Parser : public ACEXML_XMLReader virtual void setErrorHandler (ACEXML_ErrorHandler *handler); - protected: /** * Parse XML Prolog. @@ -560,7 +559,6 @@ class ACEXML_PARSER_Export ACEXML_Parser : public ACEXML_XMLReader virtual ACEXML_Char peek (); private: - // *** Helper functions for parsing XML /** @@ -841,7 +839,6 @@ class ACEXML_PARSER_Export ACEXML_Parser : public ACEXML_XMLReader /// If set, the parser should include namespace declarations in the list /// of attributes of an element. int namespace_prefixes_; - }; #if defined (__ACEXML_INLINE__) diff --git a/ACE/ACEXML/parser/parser/ParserContext.h b/ACE/ACEXML/parser/parser/ParserContext.h index 9264273940bab..978ba06ca4aa8 100644 --- a/ACE/ACEXML/parser/parser/ParserContext.h +++ b/ACE/ACEXML/parser/parser/ParserContext.h @@ -59,7 +59,6 @@ class ACEXML_PARSER_Export ACEXML_Parser_Context virtual void setLocator(ACEXML_LocatorImpl* locator); private: - /// Copy constructor ACEXML_Parser_Context (const ACEXML_Parser_Context& src); diff --git a/ACE/ACEXML/parser/parser/ParserInternals.h b/ACE/ACEXML/parser/parser/ParserInternals.h index ef4204997c629..1cadcfc01c4dc 100644 --- a/ACE/ACEXML/parser/parser/ParserInternals.h +++ b/ACE/ACEXML/parser/parser/ParserInternals.h @@ -28,7 +28,6 @@ */ class ACEXML_PARSER_Export ACEXML_ParserInt { - public: #if defined (ACE_USES_WCHAR) @@ -91,7 +90,6 @@ class ACEXML_PARSER_Export ACEXML_ParserInt IN_NOTATION, INVALID = -1 }; - }; #include /**/ "ace/post.h" diff --git a/ACE/ACEXML/tests/ContentHandler_Test.cpp b/ACE/ACEXML/tests/ContentHandler_Test.cpp index fc905ac7e6cd9..4e4231e7d6fe1 100644 --- a/ACE/ACEXML/tests/ContentHandler_Test.cpp +++ b/ACE/ACEXML/tests/ContentHandler_Test.cpp @@ -23,7 +23,7 @@ class Basic_Content_Tester : public ACEXML_DefaultHandler size_t start, size_t length); - const ACEXML_Char *get_test_string (void) + const ACEXML_Char *get_test_string () { return Basic_Content_Tester::test_string_; } private: diff --git a/ACE/ASNMP/README b/ACE/ASNMP/README index 3d543a3d6582a..39d65c1d94b4b 100644 --- a/ACE/ASNMP/README +++ b/ACE/ASNMP/README @@ -23,8 +23,7 @@ Is HP SNMP++ compatible with ASNMP? with the HP interface as well as locking down valid() semantics, etc. What platforms have the test programs been verified on? - Solaris 2.4, 2.5.1 using SUN C++ 4.1,4.2 compiler. Linux/GCC - fixes are now in as well. + Linux/GCC fixes are now in as well. Why use this version? The SNMP++ version ships only for HP-UX and for Windows. @@ -144,7 +143,7 @@ readme.txt ( this file) src Directory Contents: -------------------------------------------------------------------- -Makefile - make file for ACE/Solaris 2. build +Makefile - make file for ACE. build target.cpp - Collection of attributes(address, timeout, etc) used to define a command session snmp.cpp - A logical session between NM app and agent diff --git a/ACE/ASNMP/asnmp/address.cpp b/ACE/ASNMP/asnmp/address.cpp index b4a64b327c20e..001337d36f32e 100644 --- a/ACE/ASNMP/asnmp/address.cpp +++ b/ACE/ASNMP/asnmp/address.cpp @@ -127,7 +127,6 @@ bool operator<=( const Address &lhs,const Address &rhs) return true; else return false; - } @@ -249,7 +248,6 @@ IpAddress::IpAddress( const char *inaddr): Address() smival.value.string.ptr = address_buffer; if (ACE_OS::strlen(inaddr) == 0) { - valid_flag = 0; iv_friendly_name_[0] = 0; iv_friendly_name_status_ = 0; @@ -505,7 +503,6 @@ int IpAddress::parse_address( const char *inaddr) // is this a dotted IP notation string or // a friendly name if ( parse_dotted_ipstring( inaddr)) { - // since this is a valid dotted string // don't do any DNS (Performance!) return 1; @@ -513,7 +510,6 @@ int IpAddress::parse_address( const char *inaddr) else { int rc; if ((rc = resolve_to_address(inaddr, ipAddr)) == 0) { - // now lets check out the dotted string ACE_OS::strncpy( ds, ACE_OS::inet_ntoa(ipAddr), MAXHOSTNAMELEN); @@ -522,7 +518,6 @@ int IpAddress::parse_address( const char *inaddr) // save the friendly name ACE_OS::strcpy( iv_friendly_name_, inaddr); - } // end if lookup result else { iv_friendly_name_status_ = rc; @@ -570,7 +565,6 @@ int IpAddress::resolve_to_hostname(const in_addr& quad_addr, char *hostname) // reverse lookup (requires in-addr.arpa to be setup in DNS if (ACE_OS::gethostbyaddr_r((const char *)&quad_addr.s_addr, IPV4LEN, AF_INET, &lookupResult, buffer, &loc_errno)) { - // verify right type of record if (lookupResult.h_addrtype == AF_INET && lookupResult.h_length == IPV4LEN) { @@ -1009,7 +1003,6 @@ void NetbiosAddress::InitNBAddr(const char *inaddr) NetbiosAddress::NetbiosAddress( const char *inaddr) { InitNBAddr(inaddr); - } NetbiosAddress::NetbiosAddress( const char *inaddr, nb_service svc) @@ -1714,7 +1707,6 @@ int IpxSockAddress::parse_address( const char *inaddr) } - //-------------[ set the socket number ]---------------------------------- void IpxSockAddress::set_socket( const unsigned short s) { @@ -1839,7 +1831,6 @@ MacAddress& MacAddress::operator=( const MacAddress &macaddress) } - //-----[ MAC Address general = operator ]--------------------------------- SnmpSyntax& MacAddress::operator=( SnmpSyntax &val) { @@ -2364,7 +2355,6 @@ int GenAddress::parse_address( const char *addr) return 1; // ok, its a mac } break; - } // otherwise its invalid delete address; diff --git a/ACE/ASNMP/asnmp/address.h b/ACE/ASNMP/asnmp/address.h index a46ddb666918a..d6a5cae87362c 100644 --- a/ACE/ASNMP/asnmp/address.h +++ b/ACE/ASNMP/asnmp/address.h @@ -101,7 +101,6 @@ class SIPAddress; // aka ipv6 */ class ASNMP_Export Address: public SnmpSyntax { - public: /// allow destruction of derived classes virtual ~Address(); @@ -294,7 +293,6 @@ class ASNMP_Export IpAddress : public Address /// thread safe routine to lookup name given ip address /// return <> 0 on error static int resolve_to_hostname(const in_addr& quad_addr, char *hostname); - }; //------------------------------------------------------------------------ @@ -477,7 +475,6 @@ class ASNMP_Export MacAddress : public Address class ASNMP_Export NetbiosAddress : public Address { public: - /// default constructor with string arg NetbiosAddress( const char *inaddr = ""); @@ -704,7 +701,6 @@ class ASNMP_Export IpxAddress : public Address }; - //------------------------------------------------------------------------ //---------[ IpxSock Address Class ]-------------------------------------- //------------------------------------------------------------------------ diff --git a/ACE/ASNMP/asnmp/asn1.cpp b/ACE/ASNMP/asnmp/asn1.cpp index a0f1eb1cb40ef..e5c8ad90171c7 100644 --- a/ACE/ASNMP/asnmp/asn1.cpp +++ b/ACE/ASNMP/asnmp/asn1.cpp @@ -418,7 +418,6 @@ u_char * asn1::build_header( u_char *data, *data++ = type; (*datalength)--; return asn1::build_length(data, datalength, length); - } /* @@ -519,7 +518,6 @@ u_char *asn1::build_length( u_char *data, } *datalength -= (data - start_data); return data; - } /* @@ -951,7 +949,6 @@ u_char * asn1::build_unsigned_int64( u_char *data, high = (high << 8) | ((low & mask) >> (8 * (sizeof(long) - 1))); low <<= 8; - } return data; } @@ -1084,7 +1081,6 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu, break; - case sNMP_SYNTAX_TIMETICKS: case sNMP_SYNTAX_CNTR32: case sNMP_SYNTAX_GAUGE32: @@ -1125,7 +1121,6 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu, sizeof( SmiCNTR64)); } break; - } // end switch } @@ -1316,7 +1311,6 @@ int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet, length = *out_length; if (pdu->command != TRP_REQ_MSG) { - // request id cp = asn1::build_int( packet, &length, @@ -1521,7 +1515,6 @@ cmu_snmp::parse_var_op( u_char *data, oid *var_name, } - // build a pdu from a data and length int cmu_snmp::parse( struct snmp_pdu *pdu, u_char *data, diff --git a/ACE/ASNMP/asnmp/asn1.h b/ACE/ASNMP/asnmp/asn1.h index c06f9d23d7293..f2d7d30990590 100644 --- a/ACE/ASNMP/asnmp/asn1.h +++ b/ACE/ASNMP/asnmp/asn1.h @@ -262,7 +262,6 @@ static unsigned char * build_unsigned_int64( unsigned char *data, unsigned char type, struct counter64 *cp, int countersize); - }; @@ -334,7 +333,6 @@ static unsigned char *parse_var_op( unsigned char *data, int *var_val_len, unsigned char **var_val, int *listlength); - }; #endif // ASN1 diff --git a/ACE/ASNMP/asnmp/enttraps.h b/ACE/ASNMP/asnmp/enttraps.h index c27f79233ecfe..bb302a3b79b69 100644 --- a/ACE/ASNMP/asnmp/enttraps.h +++ b/ACE/ASNMP/asnmp/enttraps.h @@ -39,7 +39,7 @@ class ASNMP_Export snmpTrapsOid : public Oid { public: - snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){} + snmpTrapsOid ():Oid("1.3.6.1.6.3.1.1.5"){} SnmpSyntax& operator=( SnmpSyntax &val){ return Oid::operator=(val); } }; @@ -51,7 +51,7 @@ class ASNMP_Export snmpTrapsOid : public Oid class ASNMP_Export snmpTrapEnterpriseOid : public Oid { public: - snmpTrapEnterpriseOid(void): Oid("1.3.6.1.6.3.1.1.4.3.0") { } + snmpTrapEnterpriseOid(): Oid("1.3.6.1.6.3.1.1.4.3.0") { } SnmpSyntax& operator=( SnmpSyntax &val){ return Oid::operator=(val); } }; @@ -63,7 +63,7 @@ class ASNMP_Export snmpTrapEnterpriseOid : public Oid class ASNMP_Export coldStartOid : public snmpTrapsOid { public: - coldStartOid( void){*this+=".1";} + coldStartOid(){*this+=".1";} SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); } }; @@ -75,7 +75,7 @@ class ASNMP_Export coldStartOid : public snmpTrapsOid class ASNMP_Export warmStartOid : public snmpTrapsOid { public: - warmStartOid( void){*this+=".2";} + warmStartOid(){*this+=".2";} SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); } }; @@ -87,7 +87,7 @@ class ASNMP_Export warmStartOid : public snmpTrapsOid class ASNMP_Export linkDownOid : public snmpTrapsOid { public: - linkDownOid( void){*this+=".3";} + linkDownOid(){*this+=".3";} SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); } }; @@ -101,7 +101,7 @@ class ASNMP_Export linkDownOid : public snmpTrapsOid class ASNMP_Export linkUpOid : public snmpTrapsOid { public: - linkUpOid( void){*this+=".4";} + linkUpOid(){*this+=".4";} SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); } }; @@ -113,7 +113,7 @@ class ASNMP_Export linkUpOid : public snmpTrapsOid class ASNMP_Export authenticationFailureOid : public snmpTrapsOid { public: - authenticationFailureOid( void){*this+=".5";} + authenticationFailureOid(){*this+=".5";} SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); } }; @@ -125,7 +125,7 @@ class ASNMP_Export authenticationFailureOid : public snmpTrapsOid class ASNMP_Export egpNeighborLossOid : public snmpTrapsOid { public: - egpNeighborLossOid( void){*this+=".6";} + egpNeighborLossOid(){*this+=".6";} SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); } }; diff --git a/ACE/ASNMP/asnmp/gauge.cpp b/ACE/ASNMP/asnmp/gauge.cpp index 9d8e1ed432434..485d002a22fdc 100644 --- a/ACE/ASNMP/asnmp/gauge.cpp +++ b/ACE/ASNMP/asnmp/gauge.cpp @@ -70,7 +70,6 @@ Gauge32& Gauge32::operator=( const unsigned long int i) // TODO: this is broken if not inherited from UInt32 (see UInt32 code). SnmpSyntax& Gauge32::operator=( SnmpSyntax &in_val) { - if ( this == &in_val ) // handle assignement from itself return *this; diff --git a/ACE/ASNMP/asnmp/integer.cpp b/ACE/ASNMP/asnmp/integer.cpp index 27ea79fe8d516..403b34de7ee15 100644 --- a/ACE/ASNMP/asnmp/integer.cpp +++ b/ACE/ASNMP/asnmp/integer.cpp @@ -58,7 +58,7 @@ SmiUINT32 SnmpUInt32::get_syntax() } // object validity -int SnmpUInt32::valid( void) const +int SnmpUInt32::valid() const { return valid_flag; } @@ -155,7 +155,7 @@ SmiUINT32 SnmpInt32::get_syntax() } // object validity -int SnmpInt32::valid( void) const +int SnmpInt32::valid() const { return valid_flag; } diff --git a/ACE/ASNMP/asnmp/octet.cpp b/ACE/ASNMP/asnmp/octet.cpp index e5803dcf4fe15..6a3da66f41d29 100644 --- a/ACE/ASNMP/asnmp/octet.cpp +++ b/ACE/ASNMP/asnmp/octet.cpp @@ -75,7 +75,6 @@ int copy_octet_smi(SmiVALUE& smi, int size, const char *src, int& valid_flag) OctetStr::OctetStr( const char * string, long size): output_buffer(0), validity(0) { - init_octet_smi(smival); // check for null string diff --git a/ACE/ASNMP/asnmp/oid.cpp b/ACE/ASNMP/asnmp/oid.cpp index c5d0716125359..e6b1ed8f272da 100644 --- a/ACE/ASNMP/asnmp/oid.cpp +++ b/ACE/ASNMP/asnmp/oid.cpp @@ -40,7 +40,7 @@ enum Defs {SNMPBUFFSIZE=300, #define NO_MEM_STR "ERROR: Oid::to_string: memory allocation failure" -//=============[Oid::get_syntax(void)]==================================== +//=============[Oid::get_syntax()]==================================== SmiUINT32 Oid::get_syntax() { return sNMP_SYNTAX_OID; @@ -732,7 +732,6 @@ int Oid::OidToStr( SmiLPOID srcOid, unsigned long size, // loop through and build up a string for (index=0; index < srcOid->len; index++) { - // convert data element to a string if (ACE_OS::sprintf( szNumber,"%lu", srcOid->ptr[index]) == -1) return -1; diff --git a/ACE/ASNMP/asnmp/oid_def.h b/ACE/ASNMP/asnmp/oid_def.h index 537415bb2bbc1..744fa24581c4a 100644 --- a/ACE/ASNMP/asnmp/oid_def.h +++ b/ACE/ASNMP/asnmp/oid_def.h @@ -31,50 +31,50 @@ // SMI trap oid def class snmpTrapsOid: public Oid { public: - snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){}; + snmpTrapsOid ():Oid("1.3.6.1.6.3.1.1.5"){}; }; // SMI Enterprose Oid class snmpTrapEnterpriseOid: public Oid { public: - snmpTrapEnterpriseOid(void):Oid("1.3.6.1.6.3.1.1.4.3.0"){}; + snmpTrapEnterpriseOid():Oid("1.3.6.1.6.3.1.1.4.3.0"){}; }; // SMI Cold Start Oid class coldStartOid: public snmpTrapsOid { public: - coldStartOid( void){*this+=".1";}; + coldStartOid(){*this+=".1";}; }; // SMI WarmStart Oid class warmStartOid: public snmpTrapsOid { public: - warmStartOid( void){*this+=".2";}; + warmStartOid(){*this+=".2";}; }; // SMI LinkDown Oid class linkDownOid: public snmpTrapsOid { public: - linkDownOid( void){*this+=".3";}; + linkDownOid(){*this+=".3";}; }; // SMI LinkUp Oid class linkUpOid: public snmpTrapsOid { public: - linkUpOid( void){*this+=".4";}; + linkUpOid(){*this+=".4";}; }; // SMI Authentication Failure Oid class authenticationFailureOid: public snmpTrapsOid { public: - authenticationFailureOid( void){*this+=".5";}; + authenticationFailureOid(){*this+=".5";}; }; // SMI egpneighborloss Oid class egpNeighborLossOid: public snmpTrapsOid { public: - egpNeighborLossOid( void){*this+=".6";}; + egpNeighborLossOid(){*this+=".6";}; }; diff --git a/ACE/ASNMP/asnmp/pdu.cpp b/ACE/ASNMP/asnmp/pdu.cpp index 4a05750685a4a..d80c4fa4c26f9 100644 --- a/ACE/ASNMP/asnmp/pdu.cpp +++ b/ACE/ASNMP/asnmp/pdu.cpp @@ -32,7 +32,7 @@ #include "ace/OS_NS_stdio.h" //=====================[ constructor no args ]========================= -Pdu::Pdu( void): vb_count_(0), error_status_(0), error_index_(0), +Pdu::Pdu(): vb_count_(0), error_status_(0), error_index_(0), validity_(0), request_id_(0), pdu_type_(0), notify_timestamp_(0), output_(0) { @@ -129,7 +129,6 @@ Pdu& Pdu::operator=( const Pdu &pdu) // append operator, appends a string Pdu& Pdu::operator+=( Vb &vb) { - // do we have room? if ( vb_count_ + 1 > MAX_VBS) return *this; @@ -145,7 +144,6 @@ Pdu& Pdu::operator+=( Vb &vb) // return self reference return *this; - } // return fomatted version of this object @@ -191,13 +189,11 @@ int Pdu::get_vblist( Vb* pvbs, const int pvb_count) pvbs[z] = *vbs_[z]; return 1; - } //=====================[ deposit Vbs ]=================================== int Pdu::set_vblist( Vb* pvbs, const int pvb_count) { - // if invalid then don't destroy if ((!pvbs) || ( pvb_count < 0) || ( pvb_count > MAX_VBS)) return 0; @@ -275,7 +271,6 @@ int Pdu::set_vb( Vb &vb, const int index) validity_ = 1; return 1; - } //=====================[ return number of vbs_ ]========================== @@ -408,7 +403,6 @@ int Pdu::trim(const int p) } - // delete a Vb anywhere within the Pdu int Pdu::delete_vb( const int p) { diff --git a/ACE/ASNMP/asnmp/pdu.h b/ACE/ASNMP/asnmp/pdu.h index dbfd80830adf6..0561bb4cf8ea5 100644 --- a/ACE/ASNMP/asnmp/pdu.h +++ b/ACE/ASNMP/asnmp/pdu.h @@ -45,7 +45,7 @@ class ASNMP_Export Pdu { public: /// constructor no args - Pdu( void); + Pdu(); /// constructor with vbs and count Pdu( Vb* pvbs, const int pvb_count); diff --git a/ACE/ASNMP/asnmp/target.cpp b/ACE/ASNMP/asnmp/target.cpp index d6458dca18773..338118e9cf77a 100644 --- a/ACE/ASNMP/asnmp/target.cpp +++ b/ACE/ASNMP/asnmp/target.cpp @@ -173,7 +173,7 @@ bool operator==(const SnmpTarget& lhs, const SnmpTarget& rhs) //---------------------------------------------------------------------- -//---------[ UdpTarget::UdpTarget( void) ]---------------------------------- +//---------[ UdpTarget::UdpTarget() ]---------------------------------- UdpTarget::UdpTarget() { diff --git a/ACE/ASNMP/asnmp/target.h b/ACE/ASNMP/asnmp/target.h index c439475fb2676..3903f7dde4fee 100644 --- a/ACE/ASNMP/asnmp/target.h +++ b/ACE/ASNMP/asnmp/target.h @@ -73,7 +73,6 @@ enum ASNMP_Defs { class ASNMP_Export SnmpTarget { public: - /// allow destruction of derived classes virtual ~SnmpTarget(); diff --git a/ACE/ASNMP/asnmp/transaction.cpp b/ACE/ASNMP/asnmp/transaction.cpp index 48de210c1a219..9081593e4d86f 100644 --- a/ACE/ASNMP/asnmp/transaction.cpp +++ b/ACE/ASNMP/asnmp/transaction.cpp @@ -63,7 +63,6 @@ int transaction::run() // register a time handler and a socket with this while (!done) { - if ((rc = this->send()) < 0) // send pkt to agent return rc; else { diff --git a/ACE/ASNMP/asnmp/vb.cpp b/ACE/ASNMP/asnmp/vb.cpp index 9c3cbedf5ddc3..8ceb3e9f72982 100644 --- a/ACE/ASNMP/asnmp/vb.cpp +++ b/ACE/ASNMP/asnmp/vb.cpp @@ -37,10 +37,10 @@ #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" -//---------------[ Vb::Vb( void) ]-------------------------------------- +//---------------[ Vb::Vb() ]-------------------------------------- // constructor with no arguments // makes an vb, unitialized -Vb::Vb( void): output_(0), iv_vb_value_(0), +Vb::Vb(): output_(0), iv_vb_value_(0), exception_status_(SNMP_CLASS_SUCCESS) { } @@ -325,7 +325,6 @@ int Vb::get_value( SnmpSyntax &val) } - //-----[ misc]-------------------------------------------------------- // return the current syntax diff --git a/ACE/ASNMP/asnmp/vb.h b/ACE/ASNMP/asnmp/vb.h index bd41f1a38c349..8242e31fcdf94 100644 --- a/ACE/ASNMP/asnmp/vb.h +++ b/ACE/ASNMP/asnmp/vb.h @@ -70,7 +70,7 @@ class ASNMP_Export Vb public: /// constructor with no arguments /// makes an vb, unitialized (does not make object valid) - Vb( void); + Vb(); /// constructor to initialize the oid /// makes a vb with oid portion initialized (does not make object valid) diff --git a/ACE/ASNMP/asnmp/wpdu.cpp b/ACE/ASNMP/asnmp/wpdu.cpp index aa4ac0e544fc6..1685d9190d2b8 100644 --- a/ACE/ASNMP/asnmp/wpdu.cpp +++ b/ACE/ASNMP/asnmp/wpdu.cpp @@ -261,7 +261,6 @@ int wpdu::convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival ) smival->syntax = tempvb.get_syntax(); switch ( smival->syntax ) { - case sNMP_SYNTAX_NULL: break; @@ -411,7 +410,6 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const struct variable_list *vp; for(vp = raw_pdu->variables; vp; vp = vp->next_variable) { - // extract the oid portion tempoid.set_data( (unsigned long *)vp->name, ( unsigned int) vp->name_length); @@ -419,7 +417,6 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const // extract the value portion switch(vp->type) { - // octet string case sNMP_SYNTAX_OCTETS: case sNMP_SYNTAX_OPAQUE: @@ -510,7 +507,6 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const default: tempvb.set_null(); - } // end switch // append the vb to the pdu diff --git a/ACE/ASNMP/asnmp/wpdu.h b/ACE/ASNMP/asnmp/wpdu.h index 454592e1f82bf..bfa35adebe03c 100644 --- a/ACE/ASNMP/asnmp/wpdu.h +++ b/ACE/ASNMP/asnmp/wpdu.h @@ -37,7 +37,6 @@ struct snmp_pdu; class ASNMP_Export wpdu { public: - /// construct CMU data from HP SNMP++ objects /// construct HP SNMP++ objects from raw buffer via CMU SNMP datatypes wpdu(const Pdu& pdu, const UdpTarget& target); diff --git a/ACE/ASNMP/examples/get/get.cpp b/ACE/ASNMP/examples/get/get.cpp index 31a8206173225..cd4015e8ff0ae 100644 --- a/ACE/ASNMP/examples/get/get.cpp +++ b/ACE/ASNMP/examples/get/get.cpp @@ -140,7 +140,6 @@ void getapp::usage() int getapp::run() { - //----------[ create a ASNMP session ]----------------------------------- if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { cout << "\nASNMP:ERROR:Create session failed: "<< diff --git a/ACE/ASNMP/examples/get/get_async.cpp b/ACE/ASNMP/examples/get/get_async.cpp index 0734bfddb6c90..ac843df2192af 100644 --- a/ACE/ASNMP/examples/get/get_async.cpp +++ b/ACE/ASNMP/examples/get/get_async.cpp @@ -140,7 +140,6 @@ void getapp::usage() int getapp::run() { - //----------[ create a ASNMP session ]----------------------------------- if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { cout << "\nASNMP:ERROR:Create session failed: "<< diff --git a/ACE/ASNMP/examples/next/next.cpp b/ACE/ASNMP/examples/next/next.cpp index cfff517c43ed0..8c77354822917 100644 --- a/ACE/ASNMP/examples/next/next.cpp +++ b/ACE/ASNMP/examples/next/next.cpp @@ -140,7 +140,6 @@ void nextapp::usage() int nextapp::run() { - //----------[ create a ASNMP session ]----------------------------------- if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { cout << "\nASNMP:ERROR:Create session failed: "<< diff --git a/ACE/ASNMP/examples/set/set.cpp b/ACE/ASNMP/examples/set/set.cpp index f5191b2b807a3..a2a83387fc9d0 100644 --- a/ACE/ASNMP/examples/set/set.cpp +++ b/ACE/ASNMP/examples/set/set.cpp @@ -210,7 +210,6 @@ void set::usage() int set::run() { - //----------[ create a ASNMP session ]----------------------------------- if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { cout << "\nASNMP:ERROR:Create session failed: "<< diff --git a/ACE/ASNMP/examples/walk/walk.cpp b/ACE/ASNMP/examples/walk/walk.cpp index f634f364ba897..555340358f6db 100644 --- a/ACE/ASNMP/examples/walk/walk.cpp +++ b/ACE/ASNMP/examples/walk/walk.cpp @@ -209,7 +209,6 @@ int MibIter::next(Vb& vb, char *& reason) int walkapp::run() { - //----------[ create a ASNMP session ]----------------------------------- if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { cout << "\nASNMP:ERROR:Create session failed: "<< diff --git a/ACE/ASNMP/tests/Address_Test.cpp b/ACE/ASNMP/tests/Address_Test.cpp index f1662556f3463..db1c047bbe41f 100644 --- a/ACE/ASNMP/tests/Address_Test.cpp +++ b/ACE/ASNMP/tests/Address_Test.cpp @@ -259,7 +259,7 @@ static void TestNetbiosAddress() // --------------- IPX --------------- /* - IpxAddress( void); + IpxAddress(); IpxAddress( const char *inaddr); IpxAddress( const IpxAddress &ipxaddr); IpxAddress( const GenAddress &genaddr); @@ -351,11 +351,10 @@ static void TestIpxAddress() const char *ptr = (const char *)xa7; ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa7-ptr(\"01234567-012345-6789AB\") [%s]\n", ptr)); - } /* - MacAddress( void); + MacAddress(); MacAddress( const char *inaddr); MacAddress( const MacAddress &macaddr); @@ -386,7 +385,6 @@ static void TestIpxAddress() static void TestMacAddress() { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress: Tests\n")); MacAddress ma1; @@ -430,7 +428,7 @@ static void TestMacAddress() } /* - UdpAddress( void); + UdpAddress(); UdpAddress( const char *inaddr); UdpAddress( const UdpAddress &udpaddr); UdpAddress( const GenAddress &genaddr); @@ -519,7 +517,6 @@ static void TestUdpAddress() ACE_ASSERT(ua1.get_port() == 333); ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress:ua1.set_port()(\"333\") [%s]\n", (const char *)ua1)); - } int diff --git a/ACE/ASNMP/tests/Counter_Test.cpp b/ACE/ASNMP/tests/Counter_Test.cpp index 0af060e0197d0..7432b9f1920a9 100644 --- a/ACE/ASNMP/tests/Counter_Test.cpp +++ b/ACE/ASNMP/tests/Counter_Test.cpp @@ -37,7 +37,7 @@ DAMAGES. #include "test_config.h" /* - Counter32( void); + Counter32(); Counter32( const unsigned long i); Counter32( const Counter32 &c); * SmiUINT32 get_syntax(); diff --git a/ACE/ASNMP/tests/Gauge_Test.cpp b/ACE/ASNMP/tests/Gauge_Test.cpp index 5660069ad5a4f..6081ac5e059c9 100644 --- a/ACE/ASNMP/tests/Gauge_Test.cpp +++ b/ACE/ASNMP/tests/Gauge_Test.cpp @@ -37,7 +37,7 @@ DAMAGES. #include "test_config.h" /* - Gauge32( void); + Gauge32(); Gauge32( const unsigned long i); Gauge32 ( const Gauge32 &g); ~Gauge32(); @@ -54,7 +54,7 @@ DAMAGES. value of 2^32-1 (4294967295 dec) for gauges. */ static void -TestGuage (void) +TestGuage () { #if !defined (ACE_WIN32) long l = LONG_MAX, nl = LONG_MIN; // limits.h diff --git a/ACE/ASNMP/tests/Integer_Test.cpp b/ACE/ASNMP/tests/Integer_Test.cpp index b9d3e3c0f7402..5660735c5c1bc 100644 --- a/ACE/ASNMP/tests/Integer_Test.cpp +++ b/ACE/ASNMP/tests/Integer_Test.cpp @@ -46,7 +46,7 @@ static unsigned short si = 32768; #endif /*ACE_WIN32*/ /* - SnmpInt32( void); + SnmpInt32(); SnmpInt32 (const long i); SnmpInt32 (const SnmpInt32 &c); virtual ~SnmpInt32(); @@ -112,7 +112,7 @@ static void TestInteger32() } /* - SnmpUInt32( void); + SnmpUInt32(); SnmpUInt32 (const unsigned long i); SnmpUInt32( const SnmpUInt32 &c); virtual ~SnmpUInt32(); diff --git a/ACE/ASNMP/tests/Octet_Test.cpp b/ACE/ASNMP/tests/Octet_Test.cpp index 5f8677c69e32a..acefb7eee2f15 100644 --- a/ACE/ASNMP/tests/Octet_Test.cpp +++ b/ACE/ASNMP/tests/Octet_Test.cpp @@ -134,7 +134,6 @@ static void TestOctet() ACE_ASSERT(o3 <= o3); ACE_ASSERT(o3 == o3); ACE_ASSERT(!(o3 != o3)); - } int diff --git a/ACE/ASNMP/tests/Oid_Test.cpp b/ACE/ASNMP/tests/Oid_Test.cpp index dfa6931fcbc9e..26666837bc75f 100644 --- a/ACE/ASNMP/tests/Oid_Test.cpp +++ b/ACE/ASNMP/tests/Oid_Test.cpp @@ -160,7 +160,6 @@ static void OidTest() ACE_ASSERT(!(d2 > d2)); ACE_ASSERT(d2 >= d2); ACE_ASSERT(d2 <= d2); - } int diff --git a/ACE/ASNMP/tests/Target_Test.cpp b/ACE/ASNMP/tests/Target_Test.cpp index 2d164b7ddf34b..af9ee224cc81c 100644 --- a/ACE/ASNMP/tests/Target_Test.cpp +++ b/ACE/ASNMP/tests/Target_Test.cpp @@ -51,7 +51,7 @@ DAMAGES. 7) can't access retry, timeout parameters... 8) can't assign or equate two UdpTargets - UdpTarget( void); + UdpTarget(); UdpTarget( const Address &address); UdpTarget( const UdpTarget &target); UdpTarget( const Address &address, // address diff --git a/ACE/ASNMP/tests/Varbind_Test.cpp b/ACE/ASNMP/tests/Varbind_Test.cpp index 4f7316836d23c..f0caf0f93e1b8 100644 --- a/ACE/ASNMP/tests/Varbind_Test.cpp +++ b/ACE/ASNMP/tests/Varbind_Test.cpp @@ -39,7 +39,7 @@ DAMAGES. #include "test_config.h" /* - Vb( void); + Vb(); Vb( const Oid &oid); Vb( const Vb &vb); Vb( const Oid& vb, const SnmpSyntax &val, const SmiUINT32=SNMP_CLASS_SUCCESS); diff --git a/ACE/ASNMP/tests/test_config.h b/ACE/ASNMP/tests/test_config.h index 39601b60064ac..c8895165d9945 100644 --- a/ACE/ASNMP/tests/test_config.h +++ b/ACE/ASNMP/tests/test_config.h @@ -97,11 +97,11 @@ char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; class ACE_Test_Output { public: - ACE_Test_Output (void); - ~ACE_Test_Output (void); + ACE_Test_Output (); + ~ACE_Test_Output (); int set_output (const ACE_TCHAR *filename, int append = 0); - ofstream *output_file (void); - void close (void); + ofstream *output_file (); + void close (); private: ofstream output_file_; @@ -109,11 +109,11 @@ class ACE_Test_Output static ACE_Test_Output ace_file_stream; -ACE_Test_Output::ACE_Test_Output (void) +ACE_Test_Output::ACE_Test_Output () { } -ACE_Test_Output::~ACE_Test_Output (void) +ACE_Test_Output::~ACE_Test_Output () { } @@ -140,13 +140,13 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) } ofstream * -ACE_Test_Output::output_file (void) +ACE_Test_Output::output_file () { return &this->output_file_; } void -ACE_Test_Output::close (void) +ACE_Test_Output::close () { this->output_file_.flush (); this->output_file_.close (); diff --git a/ACE/ChangeLogs/ACE-7_0_10 b/ACE/ChangeLogs/ACE-7_0_10 new file mode 100644 index 0000000000000..de8fb8d9fd8d8 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_0_10 @@ -0,0 +1,260 @@ +commit 367992d328a3fdbf3465445b1922ea9b21a04f04 +Author: Johnny Willemsen +Date: Thu Nov 17 07:58:59 2022 +0100 + + Update NEWS files for next release + + * ACE/NEWS: + * TAO/NEWS: + +commit a61fa263db13c5cf6e49a469d06d789a35bcce5e +Author: Johnny Willemsen +Date: Wed Nov 2 12:23:32 2022 +0100 + + The environment variable set is Z, not ZZ + + * ACE/tests/Process_Env_Test.cpp: + +commit fca859fece1cf48bc3ecbba171286a09b660f879 +Author: Johnny Willemsen +Date: Tue Nov 1 11:25:13 2022 +0100 + + Use const/override/default and some layout changes + + * ACE/ace/Process.cpp: + * ACE/ace/Process.h: + * TAO/tao/ORB_Core.cpp: + +commit 4db17ec554e3758aee08b78e676b3f7545f80967 +Author: Johnny Willemsen +Date: Mon Oct 31 10:01:59 2022 +0100 + + Removed empty line + + * ACE/ace/config-win32-borland.h: + +commit c3005ef6ff3ce5daa18862b59b3f3dfd1d2f0e36 +Author: Johnny Willemsen +Date: Mon Oct 31 10:01:31 2022 +0100 + + Add original code back + + * ACE/ace/config-win32-borland.h: + +commit 3f220acad9c039b3cb099adc3ca52532e6b5b6ea +Author: Johnny Willemsen +Date: Mon Oct 31 09:47:09 2022 +0100 + + Don't disable inlining always + + * ACE/ace/config-win32-borland.h: + +commit 3d67b98a644c748826e76a10659add89497c42b5 +Author: Johnny Willemsen +Date: Wed Oct 19 19:56:03 2022 +0200 + + Use override + + * ACE/ace/OS_NS_stropts.cpp: + * TAO/tao/PortableServer/Active_Policy_Strategies.cpp: + * TAO/tao/PortableServer/ThreadStrategy.h: + * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h: + * TAO/tao/PortableServer/ThreadStrategyORBControl.h: + * TAO/tao/PortableServer/ThreadStrategySingle.h: + * TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h: + * TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp: + +commit 4f8d9685b45a3f7a0140eb6053fcb096c0f67719 +Author: Johnny Willemsen +Date: Fri Oct 7 08:24:40 2022 +0200 + + Fixed potential memory leak on an allocation error, use nullptr + + * ACE/ace/Message_Block.cpp: + * ACE/ace/Message_Block.h: + +commit 2400ccf08afdf0ea9a60d18777c7a177bca09569 +Merge: f460e34343e d14bdd5c85d +Author: Johnny Willemsen +Date: Thu Oct 6 14:01:39 2022 +0200 + + Merge pull request #1960 from jwillemsen/jwi-vxworksgethost + + Updated VxWorks checks + +commit d14bdd5c85dc0f4fb21ee6d3443d0e79ac0a652e +Author: Johnny Willemsen +Date: Thu Oct 6 14:01:07 2022 +0200 + + Updated VxWorks checks + + * ACE/ace/os_include/os_netdb.h: + +commit e1dda342b0805ffc880c618df86550df27cb9ce5 +Merge: 9fb13ed9896 8989a69cac0 +Author: Johnny Willemsen +Date: Wed Oct 5 19:20:01 2022 +0200 + + Merge pull request #1954 from wkbrd/windows_resource_files + + Add windows resource files + +commit 8989a69cac0086c5f0df20bfdb003a1f8f635c1d +Author: wkbrd <30599409+wkbrd@users.noreply.github.com> +Date: Wed Oct 5 09:18:32 2022 -0400 + + Fixed path separators. + +commit 6f1bf15c3de6f62b2880a44f1b3977f930fe664a +Author: wkbrd <30599409+wkbrd@users.noreply.github.com> +Date: Wed Oct 5 08:09:35 2022 -0400 + + Correct FileDescription and InternalName + +commit a0a1c88566526496425aa49046f1caa053ee9247 +Author: Johnny Willemsen +Date: Wed Oct 5 11:46:48 2022 +0200 + + VxWorks 7 inet_aton returns 0 on failure, so we don't need the special VxWorks code anymore + + * ACE/ace/OS_NS_arpa_inet.cpp: + +commit 630c8d205b8cfb4a47f259091f8b06d8dc8d8a93 +Author: Johnny Willemsen +Date: Wed Oct 5 09:38:36 2022 +0200 + + Corrected version check + + * ACE/ace/SOCK_Dgram_Mcast.cpp: + +commit 88cc7195a5d562822d07376649d3d88550fe0397 +Author: Johnny Willemsen +Date: Wed Oct 5 09:37:36 2022 +0200 + + VxWorks 7 has ifaddrs.h + + * ACE/ace/SOCK_Dgram_Mcast.cpp: + +commit bbb1422b27c034970573317df9050ba1fe33d4e0 +Author: Johnny Willemsen +Date: Wed Oct 5 09:18:13 2022 +0200 + + Removed test compile error + + * ACE/ace/OS_NS_netdb.inl: + +commit 5766ae9409fa036a76b1a5e3155caed3af68e226 +Author: Johnny Willemsen +Date: Wed Oct 5 09:16:53 2022 +0200 + + VxWorks 7 also has a non-reentrant gethostbyaddr alternative + + * ACE/ace/OS_NS_netdb.inl: + * ACE/ace/Pipe.cpp: + * ACE/ace/os_include/os_netdb.h: + +commit 9b8f769e30b631baee892fee94a89ea4208a5cc2 +Author: Johnny Willemsen +Date: Wed Oct 5 09:01:36 2022 +0200 + + Moved VxWorks define to os_netdb.h + + * ACE/ace/os_include/os_netdb.h: + * ACE/ace/os_include/os_unistd.h: + +commit 320486a79260766c61512cc2217a805d915d3106 +Merge: 2ed56466bf3 20941bebd9d +Author: Johnny Willemsen +Date: Wed Oct 5 08:32:31 2022 +0200 + + Merge pull request #1953 from jwillemsen/jwi-vxworks7reentrent + + With VxWorks 7 the gethostbyname() API is not always reentrent + +commit 2ed56466bf34f1dd99260514cd6a38ac7497ee9a +Merge: a575bfe86fc 26ed9970aa4 +Author: Johnny Willemsen +Date: Wed Oct 5 08:31:02 2022 +0200 + + Merge pull request #1952 from jwillemsen/jwi-pipeopen + + Use the ACE_INET_Addr::set instead of the constructor so that we can … + +commit fb116806b0178616262153f7f6f0c551b643b9d1 +Author: wkbrd <30599409+wkbrd@users.noreply.github.com> +Date: Tue Oct 4 21:51:08 2022 -0400 + + Rebasing on newer constant names. + +commit af00945c38ce0ed6b6d28db5ba79b3aa1bedc8b7 +Author: wkbrd <30599409+wkbrd@users.noreply.github.com> +Date: Tue Oct 4 18:48:03 2022 -0400 + + Add resource files + +commit 20941bebd9d5200ac1e8e1d63c15bdd2c487c531 +Author: Johnny Willemsen +Date: Tue Oct 4 18:30:53 2022 +0200 + + With VxWorks 7 the gethostbyname() API is not always reentrent + + * ACE/ace/OS_NS_arpa_inet.inl: + * ACE/ace/OS_NS_netdb.inl: + * ACE/ace/os_include/os_unistd.h: + +commit 26ed9970aa41aac607e9dc9849e14b8ca0458b49 +Author: Johnny Willemsen +Date: Tue Oct 4 17:50:06 2022 +0200 + + Use the ACE_INET_Addr::set instead of the constructor so that we can check the return value of the set operation + + * ACE/ace/Pipe.cpp: + +commit 4d827f7dbfef927d913e6bc20a8360b78bb07242 +Author: Johnny Willemsen +Date: Tue Oct 4 16:54:06 2022 +0200 + + Use nullptr/std::addressof/default/uniform initialization + : + * ACE/ace/OS_NS_netdb.inl: + * TAO/tao/Endpoint.h: + * TAO/tao/Endpoint.inl: + * TAO/tao/IIOP_Endpoint.cpp: + * TAO/tao/IIOP_Endpoint.h: + +commit d5987833e7a582ff1a72a059f48c5c568a603b65 +Author: Johnny Willemsen +Date: Sat Oct 1 14:39:21 2022 +0200 + + Make x.0.9 public + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * 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: + +commit b785704c6dd43bb9cd36939d40e7d9bcbcc58154 +Merge: a276c37334a 9d6f14ac790 +Author: Johnny Willemsen +Date: Sat Oct 1 14:30:56 2022 +0200 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master + +commit a276c37334a955f1a7c2aac1aba6b52ddf642e47 +Merge: ee9dff76f82 49bf14b8f41 +Author: Johnny Willemsen +Date: Sat Oct 1 14:26:16 2022 +0200 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master + +commit ee9dff76f8276b344f18fab1a6c29d09ad56aa0a +Author: Johnny Willemsen +Date: Fri Sep 30 11:16:06 2022 +0200 + + Fixed typo + + * ACE/tests/SOCK_Connector_Test.cpp: diff --git a/ACE/ChangeLogs/ACE-7_0_11 b/ACE/ChangeLogs/ACE-7_0_11 new file mode 100644 index 0000000000000..a14888e9c1344 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_0_11 @@ -0,0 +1,235 @@ +commit d9c5ee83df0e28aca1fcaaa22430c17ddd73171a +Author: Adam Mitz +Date: Fri Dec 16 17:07:33 2022 -0600 + + Updated NEWS for 7.0.11/3.0.11 + +commit b5eb7cc3715e4a458ef63d1a8175c7c901eec121 +Merge: 34a585c202d 633be2b32bd +Author: ocielliottc +Date: Thu Dec 15 06:07:46 2022 -0600 + + Merge pull request #1998 from DOCGroup/elliottc/715-additional-master + + Fix additional warnings from OpenDDS builds. + +commit 2a171fa555c2c6db006aae28b7f397416dc2beec +Author: Chad Elliott +Date: Wed Dec 14 08:32:50 2022 -0600 + + Modified strenvdup() to avoid a second copy (via strdup) and silence a warning from gcc 11 about possibly returning a pointer to a local variable. + +commit 167bdcb15282991d199f2fdb1b2c0827187d77c3 +Author: Johnny Willemsen +Date: Wed Dec 14 11:17:51 2022 +0100 + + Document changes + + * ACE/NEWS: + * TAO/NEWS: + +commit c35922f48773b120e75210dda841dfab025c5019 +Author: Johnny Willemsen +Date: Tue Dec 13 09:06:19 2022 +0100 + + Upgrade all doxygen config files + + * ACE/etc/ace.doxygen: + * ACE/etc/ace_inet.doxygen: + * ACE/etc/ace_qos.doxygen: + * ACE/etc/ace_rmcast.doxygen: + * ACE/etc/ace_ssl.doxygen: + * ACE/etc/acexml.doxygen: + * TAO/etc/tao.doxygen: + * TAO/etc/tao_anytypecode.doxygen: + * TAO/etc/tao_av.doxygen: + * TAO/etc/tao_compression.doxygen: + * TAO/etc/tao_cosevent.doxygen: + * TAO/etc/tao_cosnaming.doxygen: + * TAO/etc/tao_cosnotification.doxygen: + * TAO/etc/tao_costime.doxygen: + * TAO/etc/tao_costrader.doxygen: + * TAO/etc/tao_dynamicany.doxygen: + * TAO/etc/tao_dynamicinterface.doxygen: + * TAO/etc/tao_esf.doxygen: + * TAO/etc/tao_ifr.doxygen: + * TAO/etc/tao_implrepo.doxygen: + * TAO/etc/tao_iormanip.doxygen: + * TAO/etc/tao_iortable.doxygen: + * TAO/etc/tao_pi.doxygen: + * TAO/etc/tao_pi_server.doxygen: + * TAO/etc/tao_portablegroup.doxygen: + * TAO/etc/tao_portableserver.doxygen: + * TAO/etc/tao_rtcorba.doxygen: + * TAO/etc/tao_rtevent.doxygen: + * TAO/etc/tao_rtportableserver.doxygen: + * TAO/etc/tao_security.doxygen: + * TAO/etc/tao_smartproxies.doxygen: + * TAO/etc/tao_ssliop.doxygen: + * TAO/etc/tao_strategies.doxygen: + * TAO/etc/tao_transportcurrent.doxygen: + * TAO/etc/tao_ziop.doxygen: + +commit cfebb9c5c616716f6fbde437c00c8e3655caa696 +Merge: ca1c66c3ab5 d5e5deaa57d +Author: ocielliottc +Date: Mon Dec 12 06:07:04 2022 -0600 + + Merge pull request #1992 from DOCGroup/elliottc/configuration-fix-master + + Correction for wide-char builds + +commit ca1c66c3ab52e226d7d36716dac9928e93da912a +Merge: 3a3bf85fb3b 0ddf6649d67 +Author: Johnny Willemsen +Date: Mon Dec 12 12:36:50 2022 +0100 + + Merge pull request #1993 from jwillemsen/jwi-noexcept2 + + Make use of noexcept instead of throw() + +commit 0ddf6649d679123b281879416b46e42933b82a21 +Author: Johnny Willemsen +Date: Mon Dec 12 09:57:46 2022 +0100 + + Make use of noexcept instead of throw() + + * ACE/ace/Auto_Functor.h: + * ACE/ace/Local_Name_Space_T.cpp: + * ACE/ace/Svc_Handler.cpp: + * ACE/ace/Svc_Handler.h: + * ACE/ace/config-lite.h: + * ACE/ace/config-macros.h: + * ACE/examples/DLL/Newsweek.cpp: + * ACE/examples/DLL/Newsweek.h: + * ACE/examples/DLL/Today.cpp: + * ACE/examples/DLL/Today.h: + * ACE/examples/Shared_Malloc/test_persistence.cpp: + * ACE/tests/DLL_Test_Impl.cpp: + * ACE/tests/DLL_Test_Impl.h: + * ACE/tests/Dynamic_Test.cpp: + * TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h: + * TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h: + * TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h: + * TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h: + * TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h: + * TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h: + * TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp: + * TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h: + * TAO/tao/Asynch_Reply_Dispatcher_Base.h: + * TAO/tao/Asynch_Reply_Dispatcher_Base.inl: + * TAO/tao/Bounded_Array_Sequence_T.h: + * TAO/tao/Bounded_Basic_String_Sequence_T.h: + * TAO/tao/Bounded_Object_Reference_Sequence_T.h: + * TAO/tao/Bounded_Value_Sequence_T.h: + * TAO/tao/Generic_Sequence_T.h: + * TAO/tao/Messaging/AMH_Response_Handler.cpp: + * TAO/tao/Messaging/AMH_Response_Handler.h: + * TAO/tao/PortableServer/Servant_var.cpp: + * TAO/tao/PortableServer/Servant_var.h: + * TAO/tao/PortableServer/Servant_var.inl: + * TAO/tao/Unbounded_Array_Sequence_T.h: + * TAO/tao/Unbounded_Basic_String_Sequence_T.h: + * TAO/tao/Unbounded_Object_Reference_Sequence_T.h: + * TAO/tao/Unbounded_Octet_Sequence_T.h: + * TAO/tao/Unbounded_Value_Sequence_T.h: + * TAO/tao/Utils/Implicit_Deactivator.cpp: + * TAO/tao/Utils/Implicit_Deactivator.h: + * TAO/tao/Utils/ORB_Destroyer.cpp: + * TAO/tao/Utils/ORB_Destroyer.h: + * TAO/tao/Utils/PolicyList_Destroyer.cpp: + * TAO/tao/Utils/PolicyList_Destroyer.h: + * TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h: + * TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h: + * TAO/tests/Bug_2936_Regression/PersistentPOA.cpp: + * TAO/tests/Bug_2936_Regression/PersistentPOA.h: + * TAO/tests/Bug_3251_Regression/PersistentPoa.cpp: + * TAO/tests/Bug_3251_Regression/PersistentPoa.h: + * TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp: + * TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h: + * TAO/tests/POA/DSI/Database_i.cpp: + * TAO/tests/POA/DSI/Database_i.h: + * TAO/utils/wxNamingViewer/wxAutoDialog.h: + +commit d5e5deaa57db13fe854bcd30af90ec9c2232c687 +Author: Chad Elliott +Date: Fri Dec 9 12:20:40 2022 -0600 + + Remove division by sizeof ACE_TCHAR when calculating the simple_section; pointer arithmetic already accounts for size of the individual elements. + +commit 27d365656066ed1e94a0f79a99dd703db473993f +Author: Chad Elliott +Date: Thu Dec 8 10:19:50 2022 -0600 + + No need to compare the result of ::TryEnterCriticalSection to an explicit value. Doing so causes a warning in Release builds. + +commit 252d9cb0aa3b3a0fd5ce8907b076a3c5eeaeacb0 +Author: Chad Elliott +Date: Thu Dec 8 10:19:33 2022 -0600 + + Increased the final buffer size (in the info method) to accommodate the maximum possible string size. (ubuntu 20 - gcc 10 warning) + +commit 6bedb8802eaf1b84527fd2f2c1dfa418c8d60cb3 +Author: Chad Elliott +Date: Tue Dec 6 13:50:14 2022 -0600 + + Increased the final buffer size (in the info method) to accommodate the maximum possible string size. (ubuntu 20 - gcc 10 warning) + +commit 485116aff06946416d30536b5c85d209877a0000 +Author: Chad Elliott +Date: Tue Dec 6 13:49:26 2022 -0600 + + Added curly braces around an else clause (ubuntu 22 - gcc 11 warning) + +commit b3d23ce050ba2ba8d48efd80d65dd5be0fb64472 +Author: Branaci Serban-Mihai +Date: Thu Nov 17 16:45:32 2022 +0200 + + [#1981] Removed invalid 'endscript' drectives from logrotate configuration files + +commit 10be9100e6c9e9d0d366e212c23c62e6e949cf08 +Author: Johnny Willemsen +Date: Thu Nov 17 10:28:40 2022 +0100 + + Update for next release + + * ACE/bin/copy-local-script.sh: + +commit 7b001f0c9c078a07546114cb5a32f67c90a17291 +Author: Johnny Willemsen +Date: Thu Nov 17 10:10:09 2022 +0100 + + Add missing news item + + * ACE/NEWS: + +commit b0e766146110d476f86919741ca35c5ae1baa4b9 +Author: Johnny Willemsen +Date: Thu Nov 17 10:07:57 2022 +0100 + + Make x.0.10 publicly available + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: + +commit 02e49a5139604e2ca369ea836549b438b3c2069c +Merge: 55a4be8e626 f5e8e9be931 +Author: Johnny Willemsen +Date: Thu Nov 17 09:50:11 2022 +0100 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master + +commit 55a4be8e62645e75083249690c380f77b614f9b2 +Author: Johnny Willemsen +Date: Thu Nov 17 09:35:42 2022 +0100 + + Fixed broken link + + * ACE/docs/bczar/bczar.html: diff --git a/ACE/ChangeLogs/ACE-7_0_9 b/ACE/ChangeLogs/ACE-7_0_9 new file mode 100644 index 0000000000000..dbde29c17ce94 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_0_9 @@ -0,0 +1,819 @@ +commit 6db9157a06c38119e160454d772d2a6303f1d312 +Author: Johnny Willemsen +Date: Thu Sep 29 10:27:36 2022 +0200 + + Update NEWS + +commit bdf31098cdda557b8b245b089306b737fb297305 +Merge: 697cb84ee1a 2c45e323a5b +Author: Johnny Willemsen +Date: Fri Sep 23 22:25:46 2022 +0200 + + Merge pull request #1944 from jwillemsen/jwi-dllistdocu + + Fixed documentation of ~ACE_DLList and use nullptr + +commit 2c45e323a5b597d17b1389abeb8be2fd25c74154 +Author: Johnny Willemsen +Date: Fri Sep 23 20:26:11 2022 +0200 + + Fixed documentation of ~ACE_DLList and use nullptr + + * ACE/ace/Containers_T.h: + * ACE/ace/Containers_T.inl: + +commit eb1fccda5feb81606a021382bb8fe4d40c85b087 +Author: Luke Mewburn +Date: Fri Sep 23 19:01:43 2022 +1000 + + Fix -Wformat-security issues in examples + +commit 7b7e65323459375cda40274c9b5828b3f5aebda9 +Merge: 0b7e12778ae 2aab75d5fdd +Author: Johnny Willemsen +Date: Fri Sep 23 09:20:32 2022 +0200 + + Merge pull request #1941 from knutpett/knutpett/remove_void_part2 + + Part 2: Remove obsolescent (void) in functions with no parameters + +commit 2aab75d5fddc126e8085c70fe8e1b875b75a30ef +Author: Knut Petter Svendsen +Date: Mon Sep 19 14:37:02 2022 +0200 + + Part 2: Remove obsolescent (void) in functions with no parameters + +commit 64b5a4fecb5806522f220d63b0744ffa40bb6bcc +Merge: ccbb3639f96 9bb6d09a139 +Author: Adam Mitz +Date: Mon Sep 19 16:40:20 2022 -0500 + + Merge branch 'master' into format-security + +commit 96f0f9c16668c07531ea8c60c7b912f2e7b55806 +Merge: 14610fc4e13 d7c2081760f +Author: Johnny Willemsen +Date: Mon Sep 19 09:55:26 2022 +0200 + + Merge pull request #1934 from jwillemsen/jwi-require_truncation_ + + Use uniform initialisation for require_truncation_ so tha we can generate a default constructor + +commit f110de2e2657cf09094d799152c52cff8c285afa +Author: Johnny Willemsen +Date: Sun Sep 18 10:34:06 2022 +0200 + + Layout change + + * ACE/ace/OS_NS_dirent.h: + +commit 8b0b7b43dbb949159a5d2384ea9897ff1cf0abf6 +Author: Chad Elliott +Date: Fri Sep 16 06:29:10 2022 -0500 + + Added $(ACE_SHLIBS) to the link line for shared libraries. This allows dlopen() to load in other dependency libraries. + + Removed the -soname option from the link line so that shared libraries do not have a hard-coded path built into them. + +commit 5c2ec52d1b878b4a8a7d18a6eb2f8319746b0ddf +Author: Johnny Willemsen +Date: Thu Sep 15 17:44:46 2022 +0200 + + Make use of default, uniform initialisation, and nullptr + + * ACE/ace/Dirent.h: + * ACE/ace/Dirent.inl: + * ACE/ace/Dirent_Selector.cpp: + * ACE/ace/Dirent_Selector.h: + * ACE/ace/Malloc_T.cpp: + * ACE/ace/POSIX_Asynch_IO.cpp: + +commit c9737bc0a77324eb91dd7e0a94d0ff7099eda09e +Author: Johnny Willemsen +Date: Wed Sep 14 13:49:46 2022 +0200 + + Use bcc32x in 32bit mode, at that moment it should have the same arguments as bcc64 + + * ACE/ace/config-win32-borland.h: + +commit 1b723073155ca88a84cf04e276f7402a3b9867b2 +Author: Johnny Willemsen +Date: Wed Sep 14 13:44:43 2022 +0200 + + bcc64 needs different commandline arguments to be used as preprocessor + + * ACE/ace/config-win32-borland.h: + +commit 3da59eac098c1ef9d2c98f2079185ff35c3b6105 +Author: Knut Petter Svendsen +Date: Tue Sep 13 22:57:39 2022 +0200 + + Remove obsolescent (void) in functions with no parameters + +commit ccbb3639f96d55c38f96914c6c7c4bc8c8998db9 +Merge: bdc29ef27a6 fe03724176d +Author: Johnny Willemsen +Date: Mon Sep 12 09:36:12 2022 +0200 + + Merge branch 'master' into format-security + +commit fe03724176dcfd20e0f9a6e493198469242be6b6 +Merge: 41a1f3bc12f 00b403be7df +Author: Johnny Willemsen +Date: Mon Sep 12 08:32:34 2022 +0200 + + Merge pull request #1922 from knutpett/knutpett/whitespace + + Remove whitespace + +commit 41a1f3bc12f780cc087c936ab53d1074f363b630 +Merge: 37eece01ce5 8933b892aaf +Author: Johnny Willemsen +Date: Mon Sep 12 08:29:51 2022 +0200 + + Merge pull request #1919 from esohns/asynch_acceptor_addr_family_protected + + make addr_family_ protected so it can be accessed from derived classes + +commit bdc29ef27a6bc8dc63bc46309639e3ef307e8557 +Author: Luke Mewburn +Date: Sun Sep 11 10:06:02 2022 +1000 + + Fixup previous adapt to ACE_TEXT_PRIs + + Add missing comma after format string. + +commit 15e81d1fdd3aceba9199802a697782507ecc87f2 +Author: Luke Mewburn +Date: Sun Sep 11 10:03:05 2022 +1000 + + Fix -Wformat-security issues for ACE/tests + + Fixes issue #1906. + +commit 00b403be7df0442405bd5e3dcc07beaa6730ddd2 +Author: Knut Petter Svendsen +Date: Sat Sep 10 12:26:57 2022 +0200 + + Fixed Redundant blank line at the end of a code block should be deleted + +commit 60987b4ba42ff6e4e6a4f4457d902a18c0c6b0a0 +Author: Knut Petter Svendsen +Date: Sat Sep 10 12:19:28 2022 +0200 + + Remove leading blank lines after opening { + +commit c42abee7c0e81ed89bdfb47bf3a1bcb743cf256b +Author: Knut Petter Svendsen +Date: Sat Sep 10 12:08:48 2022 +0200 + + Removed extra newline before closing } + +commit 983dabc472d4670a53a352584cdc82de749e2c41 +Author: Luke Mewburn +Date: Sat Sep 10 17:12:19 2022 +1000 + + Fixup previous adapt to ACE_TEXT_PRIs + + Remove reference to removed variable in separate #if codepath. + +commit 2be659384defe6b235e020f03a7d683c80a16c7e +Author: Luke Mewburn +Date: Sat Sep 10 16:30:54 2022 +1000 + + Adapt to ACE_TEXT_PRIs + + Use ACE_TEXT_PRIs instead of conditional compilation + checking !defined(ACE_WIN32) && defined(ACE_USES_WCHAR). + +commit f5e5d7759a9314053509d294a4c10827d3946034 +Author: Luke Mewburn +Date: Sat Sep 10 11:05:56 2022 +1000 + + Define ACE_TEXT_PRIs. Use to fix -Wformat-security + + Define ACE_TEXT_PRIs as "s" or "ls" depending upon the WCHAR mode. + (This is similar to the PRIxxx macros in ) + + Use ACE_TEXT("%") ACE_TEXT_PRIs instead of "%s" or even + just the raw string without a format specifier. + + Fixes issue #1906. + +commit 126e88aeb3f288c770f0dccde5c6314ccaa6212c +Author: Knut Petter Svendsen +Date: Fri Sep 9 15:46:54 2022 +0200 + + Replace 3 blank lines with just 2 blank lines + +commit 430d023f1d97173cfd104498f92dc4ccaa1c4135 +Author: Knut Petter Svendsen +Date: Fri Sep 9 14:31:18 2022 +0200 + + Remove extra newline after public, protected and private + +commit 6f72892d61032d294fe1387a36ec6e04e9efa9c2 +Author: Knut Petter Svendsen +Date: Fri Sep 9 10:38:55 2022 +0200 + + Fix trailing newline in class declarations + +commit 7de198658db10447a86ce14e457b5881140e95ce +Author: Chad Elliott +Date: Fri Sep 9 07:27:27 2022 -0500 + + Removed unnecessary check of ret inside the while condition. + +commit 6d7b6be10a2c2be4fc47bdd2e285657fcc4d60fd +Author: Knut Petter Svendsen +Date: Fri Sep 9 10:31:07 2022 +0200 + + Fix more blank line issues + +commit e21a89220b0b1571e09f02e66feea5c5dc734cd7 +Author: Chad Elliott +Date: Thu Sep 8 13:42:26 2022 -0500 + + Fixed indentation. + +commit 0a67ad7caf312a5ce67a071aee7859b3cf509824 +Author: Chad Elliott +Date: Thu Sep 8 13:38:45 2022 -0500 + + Added support for VxWorks 21.03, including building for RTP mode. + +commit 8933b892aaf731a58554a71e7ea2cd03d23b8aa3 +Author: Erik Sohns +Date: Wed Sep 7 16:58:12 2022 +0200 + + corrected ctor initialization order + +commit f32b02507a1a1cc642d84c3883f513e864b8400b +Author: Erik Sohns +Date: Tue Sep 6 20:16:15 2022 +0200 + + make addr_family_ protected so it can be accessed from derived classes + +commit 248271543f7574c7f10f98bfe0a905df8ea0889e +Author: Johnny Willemsen +Date: Mon Sep 5 08:26:47 2022 +0200 + + Fixed redefined ACE_FALLTHROUGH warnings + + * ACE/ace/config-g++-common.h: + +commit 023da962da06c7c6ab4e801d7a5861ef21ca9577 +Author: Knut Petter Svendsen +Date: Mon Aug 29 16:20:38 2022 +0200 + + Remove warnings -Wextra-semi + +commit 348277c5a753b65b7a0cc206720fd7ea47f81659 +Merge: c86d810dec3 dd6e9956697 +Author: Johnny Willemsen +Date: Mon Aug 29 15:24:44 2022 +0200 + + Merge pull request #1910 from Erich71/old_gcc_fix + + Fix ACE_FALLTHROUGH definition for old GCC compilers. + +commit c86d810dec3f11f7450312f7618fb1b25053cf16 +Merge: fe57f94c747 6e391dc5f42 +Author: Johnny Willemsen +Date: Mon Aug 29 15:24:13 2022 +0200 + + Merge pull request #1909 from jwillemsen/jwi-memorypoollogging + + Updated logging to include the class/method so that it is more obviou… + +commit fe57f94c7477e00cc6d3feaabbb76e4a0f9b4429 +Merge: 280392c8b78 d8409f7ce0b +Author: Johnny Willemsen +Date: Mon Aug 29 15:23:53 2022 +0200 + + Merge pull request #1908 from jwillemsen/jwi-redundantvoid3 + + Removed redundant void + +commit dd6e99566974c958738973d72bd7f3695447af44 +Author: Johnny Willemsen +Date: Mon Aug 29 09:07:02 2022 +0200 + + Update config-g++-common.h + + With C++17 we can use https://en.cppreference.com/w/cpp/language/attributes/fallthrough + +commit 93d938a9e43e4c368d0cd5caabedf4651a0737f2 +Author: Johnny Willemsen +Date: Mon Aug 29 08:59:18 2022 +0200 + + No need to define ACE_FALLTHROUGH for C++14, it is alreadys set from the C++11 part + +commit fc83f54e9330f3c325460f1f01cb4a10ef570f6f +Author: Erich Ponstingl +Date: Fri Aug 26 14:58:39 2022 +0200 + + Fix ACE_FALLTHROUGH definition for old GCC compilers. + +commit d8409f7ce0bfe8f283d2bd80faeb80adb74e4b32 +Author: Johnny Willemsen +Date: Wed Aug 24 13:08:05 2022 +0200 + + Removed redundant void + + * ACE/ace/ATM_Acceptor.cpp: + * ACE/ace/ATM_Acceptor.inl: + * ACE/ace/ATM_Connector.cpp: + +commit 6e391dc5f42d373d5b42f6f9c9642d867ce0fc6d +Author: Johnny Willemsen +Date: Wed Aug 24 13:07:26 2022 +0200 + + Updated logging to include the class/method so that it is more obvious where these logging messages are coming from + + * ACE/ace/Shared_Memory.cpp: + * ACE/ace/Shared_Memory.h: + * ACE/ace/Shared_Memory_MM.cpp: + * ACE/ace/Shared_Memory_MM.h: + * ACE/ace/Shared_Memory_MM.inl: + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + * ACE/ace/Shared_Memory_SV.cpp: + * ACE/ace/Shared_Memory_SV.h: + * ACE/ace/Shared_Memory_SV.inl: + +commit 73d9dcd44d257cb427c8510bbec52b0df73a9190 +Merge: 49423535b6e a9a6b7e565c +Author: Johnny Willemsen +Date: Mon Aug 15 09:51:55 2022 +0200 + + Merge pull request #1903 from likema/proc-gid + + Fix incorrect `uid_t` to `gid_t` in `ACE_Process` + +commit a9a6b7e565cda5187d4f0b14b62b2b19dc5fcbc8 +Author: Like Ma +Date: Sun Aug 14 03:22:02 2022 +0800 + + Fix incorrect uid_t to gid_t in ACE_Process + +commit 41cfd85e05e3f72df6fe90353f2e1a2cf3069942 +Author: Bin Lan +Date: Wed Mar 23 16:19:44 2022 +0800 + + Fix localtime_r emulation for Windows. + +commit 05484cd6cd8d3bf884075311041242d95158a0d4 +Merge: 7aeb1020b1a 4a7649ed0a6 +Author: Johnny Willemsen +Date: Wed Aug 10 14:42:58 2022 +0200 + + Merge pull request #1897 from jwillemsen/jwi-news8 + + List changes for next release + +commit 7aeb1020b1a73c01bc1f5473b6ddabe940c0bd65 +Merge: 3d4038ad273 4a6478c41ac +Author: Johnny Willemsen +Date: Wed Aug 10 14:42:41 2022 +0200 + + Merge pull request #1896 from jwillemsen/jwi-cleanup10 + + Use override, remove redundant whitespacing, fixed typo + +commit 3d4038ad273524a32bf892921e9d1a8f0bc609d4 +Merge: 636f29faa68 a972e0f1637 +Author: Johnny Willemsen +Date: Wed Aug 10 14:42:17 2022 +0200 + + Merge pull request #1895 from jwillemsen/jwi-acedebug + + Changed internal debug_ flag to bool and initialise it to false + +commit 4a7649ed0a6a58e62ca46c8add446502ead50e7d +Author: Johnny Willemsen +Date: Wed Aug 10 08:47:12 2022 +0200 + + List changes for next release + + * ACE/NEWS: + +commit 4a6478c41ac4b1e17cea8e0e4f4bbb6afe91269b +Author: Johnny Willemsen +Date: Wed Aug 10 08:32:51 2022 +0200 + + Use override, remove redundant whitespacing, fixed typo + + * ACE/tests/Enum_Interfaces_Test.cpp: + * TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README: + * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp: + * TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl: + +commit a972e0f1637e8a2ec2ce70f02c0154adfef59f73 +Author: Johnny Willemsen +Date: Wed Aug 10 08:31:55 2022 +0200 + + Changed internal debug_ flag to bool and initialise it to false + + * ACE/ace/ACE.cpp: + +commit f10a95323666778399fca640bbe95ad3a4c8b0d1 +Author: Andrew Buettner +Date: Thu Jul 21 09:43:29 2022 -0500 + + Fix syntax error when compiling without threads. + + This addresses issue in [ACE-TAO Issue #1889](https://github.com/DOCGroup/ACE_TAO/issues/1889) + +commit bd92596bbc63635a2ed2131322e6c659a5420586 +Merge: b9e4a9a92a6 8f9a9f304ba +Author: Johnny Willemsen +Date: Mon Jul 18 16:27:20 2022 +0200 + + Merge pull request #1887 from jwillemsen/jwi-codesetregistry + + Minor change for codeset registry generation and removed old Id tags + +commit d497168cef77c63a7557f6dad1c4483baf835754 +Author: Johnny Willemsen +Date: Mon Jul 18 13:21:48 2022 +0200 + + Updated tool to generate the same as we have Codeset_Registry_db.cpp + + * ACE/apps/mkcsregdb/mkcsregdb.cpp: + +commit 2f757b8bea56e2ca31c24507e8a1685c13733e13 +Author: Son Dinh +Date: Wed Jul 13 10:58:09 2022 -0500 + + Add header and footer for stuck stacks + +commit 3ebafd712042a344dc52677e1d190c9dfcbb3c65 +Merge: b619e577177 8096d513b52 +Author: Johnny Willemsen +Date: Thu Jul 14 11:57:11 2022 +0200 + + Merge pull request #1883 from jwillemsen/jwi-localhost + + Make use of ACE_LOCALHOST and removed Tru64/Irix remaining code + +commit 8096d513b52a30164b1820eab996dd26dbe2a4b8 +Author: Johnny Willemsen +Date: Thu Jul 14 09:25:40 2022 +0200 + + Removed old code for Tru64/Irix, not supported anymore for a long time + +commit ea7ee2053a878b207203af4ce134cc7fddea8465 +Author: Johnny Willemsen +Date: Wed Jul 13 16:29:49 2022 +0200 + + Doxygen style comment + + * ACE/ace/INET_Addr.cpp: + +commit a0b4b6382c2010a622c819814bdee790ca3b7f8d +Author: Johnny Willemsen +Date: Wed Jul 13 15:50:53 2022 +0200 + + Layout changes + + * ACE/ace/Pipe.cpp: + +commit 941dfb2ba87b3fd32dd4fc861212d20460060570 +Author: Johnny Willemsen +Date: Wed Jul 13 15:40:57 2022 +0200 + + Removed redundant whiteline + + * ACE/ace/SPIPE_Addr.cpp: + +commit 7671a48aaf4f297d396ec1106ed76664cd93a172 +Author: Johnny Willemsen +Date: Wed Jul 13 15:40:42 2022 +0200 + + Make use of ACE_LOCALHOST + + * ACE/ace/MEM_Addr.cpp: + +commit b619e577177bd4a8f5b7daffe27f32c84f13e021 +Merge: 77df25b965b 55e5793c721 +Author: Johnny Willemsen +Date: Wed Jul 13 11:53:38 2022 +0200 + + Merge pull request #1882 from jwillemsen/jwi-cleanup32 + + Removed duplicated define and layout changes + +commit 76c4b0736b2b7d0ebeaa7c3d9f04ecbac96c9d73 +Author: Johnny Willemsen +Date: Wed Jul 13 09:25:02 2022 +0200 + + Removed duplicated define + + * ACE/ace/config-integritySCA.h: + +commit 60dca03280c31b7861b1782649d23a00b7004d7b +Author: Johnny Willemsen +Date: Wed Jul 13 09:24:30 2022 +0200 + + Log the operation when reporting an error + + * ACE/ace/Select_Reactor_T.cpp: + +commit dee78f113e79812a438f050384ed6ec92d9d4cba +Author: Timothy Simpson +Date: Tue Jul 12 10:00:51 2022 -0500 + + Fixes for Static Initialization Order Issues Reported By AddressSanitizer + +commit b102db31aa3ff4cd53f25f1ae743277c452609aa +Author: Johnny Willemsen +Date: Mon Jul 4 16:06:38 2022 +0200 + + Use VxWorks type for return value of sysClkRateGet + + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/OS_NS_Thread.inl: + +commit 78d9da7d3f305160d4bd5c17edd56f02ef1418bd +Author: Johnny Willemsen +Date: Mon Jul 4 11:05:23 2022 +0200 + + Fixed compile error + +commit 2e5015f022ce6e154a9d46f5f3f48f9e80637ce6 +Author: Johnny Willemsen +Date: Mon Jul 4 10:55:18 2022 +0200 + + Removed redundant void + +commit 36cee4c046b4f8fafe6b246b477af7349b91d2fd +Author: Johnny Willemsen +Date: Mon Jul 4 10:54:21 2022 +0200 + + Add back regular destructor + + * ACE/ace/Profile_Timer.h: + * ACE/ace/Profile_Timer.inl: + +commit c85f9f17b1741ef2f10edbbc2c87eb4442d70430 +Author: Johnny Willemsen +Date: Mon Jul 4 10:53:24 2022 +0200 + + Make use of default destructors + +commit f9cb5892de0657a1193aa0d37a01c7cc16bcce7a +Author: Johnny Willemsen +Date: Mon Jul 4 10:44:52 2022 +0200 + + Make use of default destructor + +commit f471ff957ddd5c41f24d7e42df80574c1f8dba6a +Author: Johnny Willemsen +Date: Mon Jul 4 10:32:29 2022 +0200 + + VxWorks 22.03 seems to provide a lot more APIs, not runtime tested, just compilation + + * ACE/ace/config-vxworks22.03.h: + * ACE/ace/config-vxworks6.8.h: + +commit cc30a10ec83e20f75d4afd1977b6f648a23f2804 +Author: Johnny Willemsen +Date: Mon Jul 4 09:28:11 2022 +0200 + + Removed setting of ACE_LACKS_MEMORY_H, not used + + * ACE/ace/README: + * ACE/ace/config-face-conftest.h: + * ACE/ace/config-integritySCA.h: + * ACE/ace/config-posix-nonetworking.h: + * ACE/ace/config-sunos5.5.h: + * ACE/ace/config-vxworks6.4.h: + +commit 69ce5d1ae70831d8776ef2e2cc6544e242a4adad +Author: Johnny Willemsen +Date: Mon Jul 4 09:27:03 2022 +0200 + + Removed setting of ACE_LACKS_MALLOC_H, not used + + * ACE/ace/README: + * ACE/ace/config-WinCE.h: + * ACE/ace/config-freebsd.h: + * ACE/ace/config-integritySCA.h: + * ACE/ace/config-macosx-jaguar.h: + * ACE/ace/config-macosx-leopard.h: + * ACE/ace/config-macosx-panther.h: + * ACE/ace/config-macosx-tiger.h: + * ACE/ace/config-openvms.h: + * ACE/ace/config-vxworks6.4.h: + +commit 147fd87b68c94b39c6e5102b11ffedcd97c3763f +Author: Johnny Willemsen +Date: Mon Jul 4 09:26:11 2022 +0200 + + Updates for VxWorks API changes + + * ACE/ace/config-vxworks22.03.h: + * ACE/ace/config-vxworks6.4.h: + +commit ccab26600dd079be3187df64697af03126cb39e3 +Author: Johnny Willemsen +Date: Mon Jul 4 08:48:00 2022 +0200 + + Removed not used member, removed redundant void + + * ACE/ace/Message_Queue_Vx.cpp: + * ACE/ace/Message_Queue_Vx.h: + * ACE/ace/Message_Queue_Vx.inl: + +commit 669ac3a4ae2dc752a8fa8add5f00ebc65b03008f +Author: Johnny Willemsen +Date: Mon Jul 4 08:45:04 2022 +0200 + + Silence compiler warning + + * ACE/ace/SOCK_SEQPACK_Acceptor.cpp: + +commit bc710dd497225059151efbfd8bc7015c7b2585c0 +Author: Johnny Willemsen +Date: Mon Jul 4 08:41:44 2022 +0200 + + Add cast to short to silence compiler warning, done in more places already to calls to cond_init + + * ACE/ace/OS_NS_Thread.cpp: + +commit 43d1ea38792cb6d170e18f49ea9f30050091133e +Author: Johnny Willemsen +Date: Mon Jul 4 08:37:19 2022 +0200 + + Add truncate_cast to silence warning in 32bit build + + * ACE/ace/Time_Value.h: + +commit 1057396aed5bdd95dff9fc3b3af4014f687e41a7 +Author: Johnny Willemsen +Date: Mon Jul 4 08:36:59 2022 +0200 + + Changed ~ACE_Condition_Attributes_T to default + + * ACE/ace/Condition_Attributes.h: + * ACE/ace/Condition_Attributes.inl: + +commit 94703dd1d5c6500e425ec00fd1db0ab9f0d84684 +Merge: 5ff9db33d6e a9a4ffd3504 +Author: Johnny Willemsen +Date: Mon Jul 4 08:12:47 2022 +0200 + + Merge branch 'master' into jwi-vxworkstaskid + +commit 5ff9db33d6e74f43be11c5e122571dbea63558a6 +Author: Johnny Willemsen +Date: Sat Jul 2 10:20:00 2022 +0200 + + Removed check for ACE_LACKS_VA_FUNCTIONS from VxWorks specific code + + * ACE/ace/OS_NS_Thread.cpp: + +commit e8f3989275cda650ab71b3c85ebd0a91fa272f10 +Author: Johnny Willemsen +Date: Sat Jul 2 10:19:20 2022 +0200 + + Update some more taskSpawn return value checks + + * ACE/ace/OS_NS_Thread.cpp: + +commit ab6a0cda2826319044013c7de5808a4574b0eb11 +Author: Johnny Willemsen +Date: Sat Jul 2 10:02:25 2022 +0200 + + Use ACE_VX_TASK_ID_ERROR + + * ACE/ace/OS_NS_Thread.cpp: + +commit a9a4ffd350481eb482bd6a738c40c2a8a38515a1 +Merge: 42ceeaaeb44 d1a837e449f +Author: Johnny Willemsen +Date: Sat Jul 2 09:17:39 2022 +0200 + + Merge pull request #1877 from jwillemsen/jwi-vxworks2203 + + Added config file for VxWorks 22.03 + +commit 42ceeaaeb4478e0bf54eca6f36a0e9c084b5f7e9 +Merge: eafca4ec3ad cf9035f2ffe +Author: Johnny Willemsen +Date: Fri Jul 1 20:15:02 2022 +0200 + + Merge pull request #1875 from jwillemsen/jwi-nameproxy + + Removed not used reactor_ member, cleanup, and const changes + +commit eafca4ec3ad0f1f4d9e80737a0ac25c6184d8b85 +Merge: e35823e1811 1fd113b0e02 +Author: Johnny Willemsen +Date: Fri Jul 1 20:13:37 2022 +0200 + + Merge pull request #1874 from jwillemsen/jwi-ctdtcompile + + ctdt is a c file, so compile as c file, not c++ + +commit cf9035f2ffe88ce12fa484a752425ae1f09a263d +Author: Johnny Willemsen +Date: Fri Jul 1 13:00:14 2022 +0200 + + Removed not used reactor_ member, cleanup, and const changes + + * ACE/ace/Name_Proxy.cpp: + * ACE/ace/Name_Proxy.h: + +commit d1a837e449fa8908c3e836f4faf977b22f2de98a +Author: Johnny Willemsen +Date: Fri Jul 1 12:25:29 2022 +0200 + + Updated comment + + * ACE/ace/config-vxworks22.03.h: + +commit ea6b7064f8578aa8912f781d319aba909b04bdde +Author: Johnny Willemsen +Date: Fri Jul 1 12:10:10 2022 +0200 + + New file for VxWorks 22.03 + +commit 42a4f7db249d4d7a40dc73ebe42c4b198628517e +Author: Johnny Willemsen +Date: Fri Jul 1 12:06:40 2022 +0200 + + Make preprocessor check more readable + + * ACE/ace/OS_NS_sys_stat.h: + +commit 1fd113b0e0210221ea0be7f49b80d99f1ba3a2e1 +Author: Johnny Willemsen +Date: Fri Jul 1 11:39:52 2022 +0200 + + ctdt is a c file, so compile as c file, not c++ + +commit e35823e1811b6e38c0b175b4d238c7d9599e6c4e +Merge: 582d76a3464 0ed5e6bcf74 +Author: Johnny Willemsen +Date: Fri Jul 1 10:27:10 2022 +0200 + + Merge pull request #1872 from jwillemsen/jwi-vxworks + + Fixed VxWorks compile error and minor cleanup + +commit bff9af24d9cfd567a0f91d15dbab8bf729758e5a +Author: Johnny Willemsen +Date: Fri Jul 1 09:55:07 2022 +0200 + + Updated + + * ACE/docs/bczar/bczar.html: + * TAO/NEWS: + +commit 812f982c65d4cd70b7e33fe0bed7064e2861261a +Author: Johnny Willemsen +Date: Fri Jul 1 09:22:06 2022 +0200 + + Update for x.0.8 + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + +commit e30c5f68e6e216c735461235a546dae31e2c07bf +Author: Johnny Willemsen +Date: Fri Jul 1 08:59:21 2022 +0200 + + Updated return value check of taskSpawn + + * ACE/ace/OS_NS_Thread.cpp: + +commit 0ed5e6bcf74f4dc8feaac94da2aaea640fb066d4 +Author: Johnny Willemsen +Date: Thu Jun 30 11:47:38 2022 +0200 + + Fixed compile error + +commit 6b131752925e286e135d0b00f7c1a312413acfa5 +Author: Johnny Willemsen +Date: Thu Jun 30 11:46:59 2022 +0200 + + Directly assign variable + + * ACE/ace/SOCK_Dgram_Mcast.cpp: + +commit 1cc25240a576c75b0210cfeee0fcc63aba5800c4 +Author: Johnny Willemsen +Date: Thu Jun 30 11:46:45 2022 +0200 + + Fixed compile error + +commit 8780cb42e95433e4b05a4b3b423456a36311f631 +Author: Johnny Willemsen +Date: Thu Jun 30 11:46:15 2022 +0200 + + Fixed comment diff --git a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp index f993ec3f688d4..3df3f2d77c8e7 100644 --- a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp @@ -9,7 +9,6 @@ namespace Kokyu { - /* //@@VS: This is somehow not being recognized by MSVC, which results //in a link error. For now, the definition has been moved to the .h @@ -55,7 +54,6 @@ template int DSRT_CV_Dispatcher_Impl:: schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) { - #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, "(%t|%T):schedule_i enter\n")); diff --git a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h index 8d455ea223dba..1fcf16d5cee2f 100644 --- a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h @@ -64,20 +64,9 @@ namespace Kokyu cond_lock_t run_cond_lock_; cond_t run_cond_; }; - } -#if !defined (__ACE_INLINE__) -//#include "DSRT_CV_Dispatcher_Impl_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_CV_Dispatcher_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("DSRT_CV_Dispatcher_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* DSRT_DIRECT_DISPATCHER_IMPL_T_H */ diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp index 196f1ad0f82af..4890ad4d5c575 100644 --- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp @@ -9,7 +9,6 @@ namespace Kokyu { - /* //@@VS: This is somehow not being recognized by MSVC, which results //in a link error. For now, the definition has been moved to the .h @@ -62,7 +61,7 @@ init_i (const DSRT_ConfigInfo&) } template int -DSRT_Direct_Dispatcher_Impl::svc (void) +DSRT_Direct_Dispatcher_Impl::svc () { ACE_hthread_t scheduler_thr_handle; ACE_Thread::self (scheduler_thr_handle); diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h index 644736d84f870..b7aa5d00e7093 100644 --- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h @@ -68,22 +68,11 @@ namespace Kokyu cond_t sched_queue_modified_cond_; private: - int svc (void); + int svc (); }; - } -#if !defined (__ACE_INLINE__) -//#include "DSRT_Direct_Dispatcher_Impl_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Direct_Dispatcher_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("DSRT_Direct_Dispatcher_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* DSRT_DIRECT_DISPATCHER_IMPL_T_H */ diff --git a/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp b/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp index 95833d1af5448..c3cb5716042ae 100644 --- a/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp +++ b/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp @@ -9,7 +9,6 @@ namespace Kokyu { - template DSRT_Dispatch_Item_var:: DSRT_Dispatch_Item_var (DSRT_Dispatch_Item *p) diff --git a/ACE/Kokyu/DSRT_Dispatch_Item_T.h b/ACE/Kokyu/DSRT_Dispatch_Item_T.h index 7a74b8d843721..d719f5ec8ff48 100644 --- a/ACE/Kokyu/DSRT_Dispatch_Item_T.h +++ b/ACE/Kokyu/DSRT_Dispatch_Item_T.h @@ -88,13 +88,7 @@ namespace Kokyu #include "DSRT_Dispatch_Item_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Dispatch_Item_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("DSRT_Dispatch_Item_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* DSRT_DISPATCH_ITEM_H */ diff --git a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp index ea1f496b48aa3..4f48809e72ce0 100644 --- a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp @@ -9,7 +9,6 @@ namespace Kokyu { - template DSRT_Dispatcher_Impl:: DSRT_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy, diff --git a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h index 7909bd96d9715..e56454d7ef68c 100644 --- a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h @@ -21,7 +21,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ - namespace Kokyu { /** @@ -143,7 +142,6 @@ namespace Kokyu virtual ~DSRT_Dispatcher_Impl (); private: - //following an idiom to avoid public virtual functions. //instead make them private and use the template method //pattern - "Virtually Yours" article in CUJ Experts Forum @@ -188,20 +186,13 @@ namespace Kokyu ACE_hthread_t curr_scheduled_thr_handle_; Guid_t curr_scheduled_guid_; }; - } //end of namespace #if defined (__ACE_INLINE__) #include "DSRT_Dispatcher_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Dispatcher_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("DSRT_Dispatcher_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* DSRT_DISPATCHER_IMPL_H */ diff --git a/ACE/Kokyu/DSRT_Sched_Queue_T.cpp b/ACE/Kokyu/DSRT_Sched_Queue_T.cpp index fc9ba57b4efe6..f67e48d60b550 100644 --- a/ACE/Kokyu/DSRT_Sched_Queue_T.cpp +++ b/ACE/Kokyu/DSRT_Sched_Queue_T.cpp @@ -42,7 +42,7 @@ template :: -current_size (void) +current_size () { return ACE_Utils::truncate_cast ( diff --git a/ACE/Kokyu/DSRT_Sched_Queue_T.h b/ACE/Kokyu/DSRT_Sched_Queue_T.h index 161210accaaa0..6cdb0abf17741 100644 --- a/ACE/Kokyu/DSRT_Sched_Queue_T.h +++ b/ACE/Kokyu/DSRT_Sched_Queue_T.h @@ -22,7 +22,6 @@ namespace Kokyu { - /** * @class Sched_Ready_Queue * @@ -68,7 +67,6 @@ namespace Kokyu DSRT_Scheduler_Traits::QoSDescriptor_t DSRT_QoSDescriptor_t; public: - /** * Given a guid, find an item in the priority queue. * @@ -130,7 +128,6 @@ namespace Kokyu void dump(); private: - /** * @class Guid_Hash * @@ -211,17 +208,7 @@ namespace Kokyu }; } -#if !defined (__ACE_INLINE__) -//#include "DSRT_Sched_Queue_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Sched_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("DSRT_Sched_Queue_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* DSRT_SCHED_QUEUE_T_H */ diff --git a/ACE/Kokyu/Default_Dispatcher_Impl.cpp b/ACE/Kokyu/Default_Dispatcher_Impl.cpp index 7780e2df68ed8..b82e96ecb3101 100644 --- a/ACE/Kokyu/Default_Dispatcher_Impl.cpp +++ b/ACE/Kokyu/Default_Dispatcher_Impl.cpp @@ -10,7 +10,6 @@ namespace Kokyu { - Default_Dispatcher_Impl::Default_Dispatcher_Impl () : activated_ (0) { diff --git a/ACE/Kokyu/Default_Dispatcher_Impl.h b/ACE/Kokyu/Default_Dispatcher_Impl.h index 350c88d179d8f..2eb559f454c6d 100644 --- a/ACE/Kokyu/Default_Dispatcher_Impl.h +++ b/ACE/Kokyu/Default_Dispatcher_Impl.h @@ -64,7 +64,6 @@ namespace Kokyu /// Command callback int execute (); }; - } //end of namespace #if defined (__ACE_INLINE__) diff --git a/ACE/Kokyu/Dispatcher_Impl.cpp b/ACE/Kokyu/Dispatcher_Impl.cpp index a999295300006..efc244e5b38aa 100644 --- a/ACE/Kokyu/Dispatcher_Impl.cpp +++ b/ACE/Kokyu/Dispatcher_Impl.cpp @@ -6,7 +6,6 @@ namespace Kokyu { - //virtual - so don't inline Dispatcher_Impl::~Dispatcher_Impl() { diff --git a/ACE/Kokyu/Dispatcher_Task.cpp b/ACE/Kokyu/Dispatcher_Task.cpp index b128dcab6bf3a..31e1ba8504443 100644 --- a/ACE/Kokyu/Dispatcher_Task.cpp +++ b/ACE/Kokyu/Dispatcher_Task.cpp @@ -15,7 +15,6 @@ namespace namespace Kokyu { - typedef ACE_Cached_Allocator Dispatch_Queue_Item_Allocator; diff --git a/ACE/Kokyu/Dispatcher_Task.h b/ACE/Kokyu/Dispatcher_Task.h index ca602ca2be70c..55e5cb73e616d 100644 --- a/ACE/Kokyu/Dispatcher_Task.h +++ b/ACE/Kokyu/Dispatcher_Task.h @@ -22,7 +22,6 @@ namespace Kokyu { - class Dispatch_Queue_Item : public ACE_Message_Block { public: @@ -92,7 +91,6 @@ class Dispatcher_Task : public ACE_Task ACE_Deadline_Message_Strategy deadline_msg_strategy_; ACE_Laxity_Message_Strategy laxity_msg_strategy_; }; - } //end of namespace #if defined (__ACE_INLINE__) diff --git a/ACE/Kokyu/Kokyu.cpp b/ACE/Kokyu/Kokyu.cpp index ac396f9dea6ea..32e1499580410 100644 --- a/ACE/Kokyu/Kokyu.cpp +++ b/ACE/Kokyu/Kokyu.cpp @@ -10,7 +10,6 @@ namespace Kokyu { - int Dispatcher::dispatch (const Dispatch_Command* cmd, const QoSDescriptor& qos) { return dispatcher_impl_->dispatch (cmd, qos); diff --git a/ACE/Kokyu/Kokyu_defs.h b/ACE/Kokyu/Kokyu_defs.h index 5998817b84d30..9f8099dd08cd9 100644 --- a/ACE/Kokyu/Kokyu_defs.h +++ b/ACE/Kokyu/Kokyu_defs.h @@ -174,7 +174,6 @@ namespace Kokyu DSRT_ConfigInfo (); }; - } //end of namespace //to satisfy ACE_Array diff --git a/ACE/Kokyu/Kokyu_dsrt.cpp b/ACE/Kokyu/Kokyu_dsrt.cpp index 5832b22dd0308..65db3c552486b 100644 --- a/ACE/Kokyu/Kokyu_dsrt.cpp +++ b/ACE/Kokyu/Kokyu_dsrt.cpp @@ -10,7 +10,6 @@ namespace Kokyu { - template void DSRT_Dispatcher::implementation (DSRT_Dispatcher_Impl* impl) diff --git a/ACE/Kokyu/Kokyu_dsrt.h b/ACE/Kokyu/Kokyu_dsrt.h index eb5de72b987a6..e96d66197221f 100644 --- a/ACE/Kokyu/Kokyu_dsrt.h +++ b/ACE/Kokyu/Kokyu_dsrt.h @@ -16,7 +16,6 @@ namespace Kokyu { - template class DSRT_Dispatcher_Impl; /** @@ -152,20 +151,13 @@ namespace Kokyu const QoSDesc& qos2); }; - } //end of namespace #if defined (__ACE_INLINE__) #include "Kokyu_dsrt.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Kokyu_dsrt.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Kokyu_dsrt.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* KOKYU_DSRT_H */ diff --git a/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp b/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp index 045b97ba64d1c..6bd96d9615021 100644 --- a/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp +++ b/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp @@ -46,7 +46,6 @@ struct mif_scheduler_traits class MyTask : public ACE_Task_Base { public: - MyTask (ACE_Barrier& bar, Kokyu::DSRT_Dispatcher* dispatcher, mif_scheduler_traits::QoSDescriptor_t& qos, @@ -58,7 +57,7 @@ class MyTask : public ACE_Task_Base exec_duration_ (exec_duration) {} - int svc (void); + int svc (); private: ACE_Barrier& barrier_; @@ -68,7 +67,7 @@ class MyTask : public ACE_Task_Base int exec_duration_; }; -int MyTask::svc (void) +int MyTask::svc () { ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); diff --git a/ACE/NEWS b/ACE/NEWS index 9a8434ad31c63..42f1f292f2a50 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -1,8 +1,38 @@ +USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0 +===================================================== + +. Removed support for Windows CE, OpenVMS, HPUX, AIX, RTEMS, + and Solaris + +USER VISIBLE CHANGES BETWEEN ACE-7.0.10 and ACE-7.0.11 +====================================================== + +. Fixed some compiler warnings given by newer compilers + +. Make use of noexcept instead of throw() + +. Fixed a bug in ACE_Configuration_Heap with uses_wchar=1 builds + +USER VISIBLE CHANGES BETWEEN ACE-7.0.9 and ACE-7.0.10 +===================================================== + +. Add missing resource files for several DLLs on Windows + +. VxWorks runtime fixes + +. Various cleanup and using more C++11 features + +. Embarcadero C++ Builder 11.2 fixes + USER VISIBLE CHANGES BETWEEN ACE-7.0.8 and ACE-7.0.9 ==================================================== . Compile fixes for VxWorks 22.03 +. Various cleanup + +. Minor fixes + USER VISIBLE CHANGES BETWEEN ACE-7.0.7 and ACE-7.0.8 ==================================================== diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 144fce9cf6b3a..a42decdf7d158 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -25,7 +25,7 @@ include an entire platform-specific configuration file in the form. 8<----------8<----------8<----------8<----------8<----------8<----------8<---- - ACE VERSION: 7.0.8 + ACE VERSION: 7.0.11 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 a579f924d8718..eba289c43015e 100644 --- a/ACE/README +++ b/ACE/README @@ -18,9 +18,9 @@ The ADAPTIVE Communication Environment (ACE) is an object-oriented communication software. ACE provides a rich set of reusable C++ wrappers and frameworks that perform common communication software tasks across a range of OS platforms, including Win32/Win64, most -versions of UNIX (e.g., SunOS, HP-UX , AIX, Linux, NetBSD, and FreeBSD), +versions of UNIX (e.g., SunOS, Linux, NetBSD, and FreeBSD), real-time operating systems (e.g., VxWorks, Chorus, LynxOS, and QNX), -OpenVMS, and MVS OpenEdition. A single source tree is used for all +and MVS OpenEdition. A single source tree is used for all these platforms and porting ACE to other platforms is relatively easy. The communication software components provided by ACE include event @@ -62,8 +62,7 @@ interfaces: WaitForMultipleObjects and I/O completion ports; . Multi-threading and synchronization - -- e.g., Solaris threads, POSIX Pthreads, and Win32 - threads; + -- e.g., POSIX Pthreads, and Win32 threads; . Explicit dynamic linking -- e.g., dlopen/dlsym on UNIX and LoadLibrary/GetProc diff --git a/ACE/VERSION.txt b/ACE/VERSION.txt index 2d034f23eaa67..bbf4d7d4adb17 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 7.0.8, released Fri Jul 01 09:15:13 CEST 2022 +This is ACE version 7.0.11, released Mon Dec 19 12:02:50 CET 2022 If you have any problems with or questions about ACE, please open a issue or discussion on the ACE_TAO github project at diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 565b36876f07d..06b0289b89a85 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -59,9 +59,6 @@ ACE::out_of_handles (int error) #if defined (ACE_WIN32) // On Win32, we need to check for ENOBUFS also. error == ENOBUFS || -#elif defined (HPUX) - // On HPUX, we need to check for EADDRNOTAVAIL also. - error == EADDRNOTAVAIL || #elif defined (ACE_LINUX) // On linux, we need to check for ENOENT also. error == ENOENT || @@ -69,11 +66,6 @@ ACE::out_of_handles (int error) error == EINVAL || // Without threads check for EOPNOTSUPP error == EOPNOTSUPP || -#elif defined (sun) - // On sun, we need to check for ENOSR also. - error == ENOSR || - // Without threads check for ENOTSUP - error == ENOTSUP || #elif defined (__FreeBSD__) // On FreeBSD we need to check for EOPNOTSUPP (LinuxThreads) or // ENOSYS (libc_r threads) also. @@ -2342,11 +2334,7 @@ ACE::format_hexdump (const char *buffer, textver[j] = 0; ACE_OS::snprintf (obuf, obuf_sz - (obuf - obuf_start), -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_TEXT (" %ls\n"), -#else - ACE_TEXT (" %s\n"), -#endif + ACE_TEXT (" %") ACE_TEXT_PRIs ACE_TEXT ("\n"), textver); while (*obuf != '\0') @@ -2383,11 +2371,7 @@ ACE::format_hexdump (const char *buffer, textver[i] = 0; ACE_OS::snprintf (obuf, obuf_sz - (obuf - obuf_start), -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_TEXT (" %ls\n"), -#else - ACE_TEXT (" %s\n"), -#endif + ACE_TEXT (" %") ACE_TEXT_PRIs ACE_TEXT ("\n"), textver); } return size; @@ -3367,7 +3351,6 @@ ACE::strnew (const wchar_t *s) // helper functions for ACE::wild_match() namespace { - inline bool equal_char (char a, char b, bool case_sensitive) { if (case_sensitive) diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl index 4e7a77e5d8722..5c7b15e4072b1 100644 --- a/ACE/ace/ACE.inl +++ b/ACE/ace/ACE.inl @@ -216,7 +216,7 @@ ACE::sendv_n (ACE_HANDLE handle, ACE_INLINE ssize_t ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len) { -#if defined (ACE_WIN32) || defined (HPUX) || defined (ACE_MQX) +#if defined (ACE_WIN32) || defined (ACE_MQX) return ACE_OS::send (handle, (const char *) buf, len); #else return ACE_OS::write (handle, (const char *) buf, len); @@ -226,7 +226,7 @@ ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len) ACE_INLINE ssize_t ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len) { -#if defined (ACE_WIN32) || defined (ACE_OPENVMS) || defined (ACE_MQX) +#if defined (ACE_WIN32) || defined (ACE_MQX) return ACE_OS::recv (handle, (char *) buf, len); #else return ACE_OS::read (handle, (char *) buf, len); diff --git a/ACE/ace/ARGV.cpp b/ACE/ace/ARGV.cpp index 77353632b4d49..2c08788a86639 100644 --- a/ACE/ace/ARGV.cpp +++ b/ACE/ace/ARGV.cpp @@ -315,7 +315,6 @@ ACE_ARGV_T::~ACE_ARGV_T () #endif /* ACE_HAS_ALLOC_HOOKS */ - #if defined (ACE_HAS_ALLOC_HOOKS) ACE_Allocator::instance()->free (this->argv_); ACE_Allocator::instance()->free (this->buf_); diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h index f45f176a97c58..eb03fc776f43a 100644 --- a/ACE/ace/ARGV.h +++ b/ACE/ace/ARGV.h @@ -320,13 +320,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/ARGV.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/ARGV.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ARGV.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_ARGUMENT_VECTOR_H */ diff --git a/ACE/ace/ATM_Params.inl b/ACE/ace/ATM_Params.inl index 14d4a96ae4bfc..ceacb86d055cd 100644 --- a/ACE/ace/ATM_Params.inl +++ b/ACE/ace/ATM_Params.inl @@ -95,7 +95,7 @@ ACE_ATM_Params::set_type (int type) ACE_INLINE ACE_Protocol_Info* -ACE_ATM_Params::get_protocol_info( void ) +ACE_ATM_Params::get_protocol_info() { ACE_TRACE ("ACE_ATM_Params::get_protocol_info"); return protocol_info_; @@ -111,7 +111,7 @@ ACE_ATM_Params::set_protocol_info( ACE_Protocol_Info *protocol_info ) ACE_INLINE ACE_SOCK_GROUP -ACE_ATM_Params::get_sock_group( void ) +ACE_ATM_Params::get_sock_group() { ACE_TRACE ("ACE_ATM_Params::get_sock_group"); return group_; @@ -127,7 +127,7 @@ ACE_ATM_Params::set_sock_group( ACE_SOCK_GROUP g ) ACE_INLINE u_long -ACE_ATM_Params::get_flags( void ) +ACE_ATM_Params::get_flags() { ACE_TRACE ("ACE_ATM_Params::get_flags"); return flags_; diff --git a/ACE/ace/ATM_QoS.inl b/ACE/ace/ATM_QoS.inl index 8ac4d7aa09a19..457699547ebe3 100644 --- a/ACE/ace/ATM_QoS.inl +++ b/ACE/ace/ATM_QoS.inl @@ -17,7 +17,7 @@ ACE_ATM_QoS::~ACE_ATM_QoS () ACE_INLINE ATM_QoS -ACE_ATM_QoS::get_qos (void) +ACE_ATM_QoS::get_qos () { ACE_TRACE ("ACE_ATM_QoS::get_qos"); return qos_; diff --git a/ACE/ace/ATM_Stream.h b/ACE/ace/ATM_Stream.h index e140d97477f95..6bf102b933e2f 100644 --- a/ACE/ace/ATM_Stream.h +++ b/ACE/ace/ATM_Stream.h @@ -59,7 +59,7 @@ class ACE_Export ACE_ATM_Stream ACE_HANDLE get_handle () const; /// Get the underlying stream. - ATM_Stream& get_stream (void); + ATM_Stream& get_stream (); /// Get the name of the connected host. char* get_peer_name () const; diff --git a/ACE/ace/ATM_Stream.inl b/ACE/ace/ATM_Stream.inl index 803af75770c16..70403bab9a93b 100644 --- a/ACE/ace/ATM_Stream.inl +++ b/ACE/ace/ATM_Stream.inl @@ -10,7 +10,7 @@ ACE_ATM_Stream::dump () const } ACE_INLINE -ACE_ATM_Stream::ACE_ATM_Stream (void) +ACE_ATM_Stream::ACE_ATM_Stream () { ACE_TRACE ("ACE_ATM_Stream::ACE_ATM_Stream"); } @@ -64,7 +64,7 @@ ACE_ATM_Stream::open (ACE_ATM_Params params) ACE_INLINE int -ACE_ATM_Stream::close (void) +ACE_ATM_Stream::close () { ACE_TRACE ("ACE_ATM_Stream::close"); #if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) @@ -76,7 +76,7 @@ ACE_ATM_Stream::close (void) ACE_INLINE ATM_Stream& -ACE_ATM_Stream::get_stream (void) +ACE_ATM_Stream::get_stream () { ACE_TRACE ("ACE_ATM_Stream::get_stream"); return stream_; diff --git a/ACE/ace/Abstract_Timer_Queue.h b/ACE/ace/Abstract_Timer_Queue.h index cd17f28d0ef63..23e46afc4c1c6 100644 --- a/ACE/ace/Abstract_Timer_Queue.h +++ b/ACE/ace/Abstract_Timer_Queue.h @@ -218,13 +218,7 @@ class ACE_Abstract_Timer_Queue ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Abstract_Timer_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Abstract_Timer_Queue.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_ABSTRACT_TIMER_QUEUE_H */ diff --git a/ACE/ace/Acceptor.cpp b/ACE/ace/Acceptor.cpp index 6206c82459582..fd3fc9795cdd1 100644 --- a/ACE/ace/Acceptor.cpp +++ b/ACE/ace/Acceptor.cpp @@ -163,7 +163,6 @@ ACE_Acceptor::info (ACE_TCHAR **strp, size_t length) const { ACE_TRACE ("ACE_Acceptor::info"); - ACE_TCHAR buf[BUFSIZ]; ACE_TCHAR addr_str[BUFSIZ]; typename PEER_ACCEPTOR::PEER_ADDR addr; @@ -172,7 +171,17 @@ ACE_Acceptor::info (ACE_TCHAR **strp, else if (addr.addr_to_string (addr_str, sizeof addr_str) == -1) return -1; - ACE_OS::snprintf (buf, BUFSIZ, + // + // gcc10 complains that it is possible that buf could be truncated by up to + // 35 bytes in this call to snprintf. Technically, this is possible + // (however unlikely that may be). Since addr_str is defined to be of size + // BUFSIZ, gcc assumes that the string could actually be BUFSIZ in length. + // That makes the possible total length of the combined string (given the + // size of the literal string constants) 3 + 12 + BUFSIZE + 19 + 1. + // + const size_t additional = 35; + ACE_TCHAR buf[BUFSIZ + additional]; + ACE_OS::snprintf (buf, sizeof buf, ACE_TEXT ("%s\t %s %s"), ACE_TEXT ("ACE_Acceptor"), addr_str, @@ -821,7 +830,6 @@ ACE_Strategy_Acceptor::info (ACE_TCHAR **strp, { ACE_TRACE ("ACE_Strategy_Acceptor::info"); - ACE_TCHAR buf[BUFSIZ]; ACE_TCHAR service_addr_str[BUFSIZ]; typename PEER_ACCEPTOR::PEER_ADDR addr; @@ -831,8 +839,17 @@ ACE_Strategy_Acceptor::info (ACE_TCHAR **strp, sizeof service_addr_str) == -1) return -1; - // @@ Should add the protocol in... - ACE_OS::snprintf (buf, BUFSIZ, + // + // gcc10 complains that it is possible that buf could be truncated by up to + // 6 bytes in this call to snprintf. Technically, this is possible + // (however unlikely that may be). Since service_addr_str is defined to be + // of size BUFSIZ, gcc assumes that the string could actually be BUFSIZ in + // length. That makes the possible total length of the combined string + // (given the size of the literal string constants) 5 + BUFSIZE + 1. + // + const size_t additional = 6; + ACE_TCHAR buf[BUFSIZ + additional]; + ACE_OS::snprintf (buf, sizeof buf, ACE_TEXT ("%s\t %s #%s\n"), this->service_name_ == 0 ? ACE_TEXT ("") diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h index ba2c14cf43179..5ebbeeb5fa784 100644 --- a/ACE/ace/Acceptor.h +++ b/ACE/ace/Acceptor.h @@ -406,7 +406,6 @@ class ACE_Strategy_Acceptor virtual int resume (); protected: - /// Calls {handle_close} when dynamically unlinked. virtual int fini (); @@ -685,13 +684,7 @@ class ACE_Oneshot_Acceptor : public ACE_Service_Object ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Activation_Queue.h b/ACE/ace/Activation_Queue.h index 2e5d8f75f1f4b..f9401839f627a 100644 --- a/ACE/ace/Activation_Queue.h +++ b/ACE/ace/Activation_Queue.h @@ -77,7 +77,7 @@ class ACE_Export ACE_Activation_Queue ACE_Allocator *db_alloc = 0); /// Destructor. - virtual ~ACE_Activation_Queue (void); + virtual ~ACE_Activation_Queue (); // = Activate Queue operations. diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h index fdc54b65492a9..be1e78ad596a7 100644 --- a/ACE/ace/Active_Map_Manager_T.h +++ b/ACE/ace/Active_Map_Manager_T.h @@ -177,7 +177,6 @@ class ACE_Active_Map_Manager : public ACE_Map_Manager ACE_AMM_BASE; @@ -193,13 +192,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Active_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Active_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Active_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_ACTIVE_MAP_MANAGER_T_H */ diff --git a/ACE/ace/Arg_Shifter.h b/ACE/ace/Arg_Shifter.h index 547d772e12d05..c714b992ecb5b 100644 --- a/ACE/ace/Arg_Shifter.h +++ b/ACE/ace/Arg_Shifter.h @@ -226,13 +226,7 @@ typedef ACE_Arg_Shifter_T ACE_Arg_Shifter; ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Arg_Shifter.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Arg_Shifter.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Argv_Type_Converter.cpp b/ACE/ace/Argv_Type_Converter.cpp index ddf9531f10a37..a3e1c267686b0 100644 --- a/ACE/ace/Argv_Type_Converter.cpp +++ b/ACE/ace/Argv_Type_Converter.cpp @@ -78,7 +78,7 @@ ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter () #if defined (ACE_USES_WCHAR) void -ACE_Argv_Type_Converter::initialize (void) +ACE_Argv_Type_Converter::initialize () { if (this->original_type_) { @@ -100,7 +100,7 @@ ACE_Argv_Type_Converter::initialize (void) void -ACE_Argv_Type_Converter::align_char_with_wchar (void) +ACE_Argv_Type_Converter::align_char_with_wchar () { for (int wchar_argv_index = 0; wchar_argv_index < this->saved_argc_; ++wchar_argv_index) @@ -131,7 +131,7 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void) } void -ACE_Argv_Type_Converter::align_wchar_with_char (void) +ACE_Argv_Type_Converter::align_wchar_with_char () { for (int char_argv_index = 0; char_argv_index < saved_argc_; ++char_argv_index) @@ -163,7 +163,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void) } void -ACE_Argv_Type_Converter::cleanup (void) +ACE_Argv_Type_Converter::cleanup () { for (int i = this->saved_argc_; i < this->before_pass_argc_; ++i) { diff --git a/ACE/ace/Array_Base.h b/ACE/ace/Array_Base.h index d5ed71e47df64..13b71310509f7 100644 --- a/ACE/ace/Array_Base.h +++ b/ACE/ace/Array_Base.h @@ -55,8 +55,8 @@ class ACE_Array_Base typedef value_type const * const_pointer; typedef ptrdiff_t difference_type; typedef ACE_Allocator::size_type size_type; - - ACE_DECLARE_STL_REVERSE_ITERATORS + typedef std::reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; /// Dynamically create an uninitialized array. ACE_Array_Base (size_type size = 0, @@ -159,7 +159,6 @@ class ACE_Array_Base void swap (ACE_Array_Base & array); protected: - /// Returns 1 if @a slot is within range, i.e., 0 >= @a slot < /// @c cur_size_, else returns 0. bool in_range (size_type slot) const; @@ -237,13 +236,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Array_Base.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Array_Base.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Array_Base.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Array_Map.h b/ACE/ace/Array_Map.h index 4feefe97066cc..3e12910f74d37 100644 --- a/ACE/ace/Array_Map.h +++ b/ACE/ace/Array_Map.h @@ -33,13 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined __SUNPRO_CC && !defined _RWSTD_ALLOCATOR -# define ACE_ARRAY_MAP_DEFAULT_ALLOCATOR(K, V) std::allocator_interface< \ - std::allocator, \ - std::pair > -#else -# define ACE_ARRAY_MAP_DEFAULT_ALLOCATOR(K, V) std::allocator > -#endif +#define ACE_ARRAY_MAP_DEFAULT_ALLOCATOR(K, V) std::allocator > /** * @class ACE_Array_Map @@ -92,7 +86,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * -# operator= */ template, - class Alloc = ACE_ARRAY_MAP_DEFAULT_ALLOCATOR (Key, Value) > + class Alloc = std::allocator>> class ACE_Array_Map { public: @@ -110,7 +104,8 @@ class ACE_Array_Map typedef value_type const * const_iterator; typedef ptrdiff_t difference_type; typedef size_t size_type; - ACE_DECLARE_STL_REVERSE_ITERATORS + typedef std::reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; /// Default Constructor. /** @@ -287,13 +282,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Array_Map.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/Array_Map.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Array_Map.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "ace/Array_Map.cpp" #include /**/ "ace/post.h" diff --git a/ACE/ace/Asynch_Acceptor.cpp b/ACE/ace/Asynch_Acceptor.cpp index 060a5379b7b69..eff953ef89abe 100644 --- a/ACE/ace/Asynch_Acceptor.cpp +++ b/ACE/ace/Asynch_Acceptor.cpp @@ -23,13 +23,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template -ACE_Asynch_Acceptor::ACE_Asynch_Acceptor (void) - : listen_handle_ (ACE_INVALID_HANDLE), +ACE_Asynch_Acceptor::ACE_Asynch_Acceptor () + : addr_family_ (0), + listen_handle_ (ACE_INVALID_HANDLE), pass_addresses_ (false), validate_new_connection_ (false), reissue_accept_ (1), - bytes_to_read_ (0), - addr_family_ (0) + bytes_to_read_ (0) { } @@ -351,7 +351,7 @@ ACE_Asynch_Acceptor::validate_connection } template int -ACE_Asynch_Acceptor::cancel (void) +ACE_Asynch_Acceptor::cancel () { ACE_TRACE ("ACE_Asynch_Acceptor<>::cancel"); @@ -430,13 +430,13 @@ ACE_Asynch_Acceptor::handle (ACE_HANDLE h) } template ACE_Asynch_Accept & -ACE_Asynch_Acceptor::asynch_accept (void) +ACE_Asynch_Acceptor::asynch_accept () { return this->asynch_accept_; } template HANDLER * -ACE_Asynch_Acceptor::make_handler (void) +ACE_Asynch_Acceptor::make_handler () { // Default behavior HANDLER *handler = 0; @@ -495,7 +495,7 @@ ACE_Asynch_Acceptor::bytes_to_read (size_t new_value) } template int -ACE_Asynch_Acceptor::should_reissue_accept (void) +ACE_Asynch_Acceptor::should_reissue_accept () { return this->reissue_accept_; } diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h index 36b3aa1ca7664..16f4edb0dc3cf 100644 --- a/ACE/ace/Asynch_Acceptor.h +++ b/ACE/ace/Asynch_Acceptor.h @@ -45,10 +45,10 @@ class ACE_Asynch_Acceptor : public ACE_Handler { public: /// A do nothing constructor. - ACE_Asynch_Acceptor (void); + ACE_Asynch_Acceptor (); /// Virtual destruction - virtual ~ACE_Asynch_Acceptor (void); + virtual ~ACE_Asynch_Acceptor (); /** * @c open starts one or more asynchronous accept requests on a @@ -138,7 +138,7 @@ class ACE_Asynch_Acceptor : public ACE_Handler * @note On Windows, only accept operations initiated by the calling thread * are canceled. */ - virtual int cancel (void); + virtual int cancel (); /** * Template method to validate peer before service is opened. @@ -175,7 +175,7 @@ class ACE_Asynch_Acceptor : public ACE_Handler * @c open() method's @a reissue_accept argument. That value can also * be changed using the @c reissue_accept() method. */ - virtual int should_reissue_accept (void); + virtual int should_reissue_accept (); // // These are low level tweaking methods @@ -210,7 +210,6 @@ class ACE_Asynch_Acceptor : public ACE_Handler virtual void bytes_to_read (size_t new_value); protected: - /// This is called when an outstanding accept completes. virtual void handle_accept (const ACE_Asynch_Accept::Result &result); @@ -225,14 +224,18 @@ class ACE_Asynch_Acceptor : public ACE_Handler ACE_INET_Addr &local_address); /// Return the asynch accept object. - ACE_Asynch_Accept &asynch_accept (void); + ACE_Asynch_Accept &asynch_accept (); /** * This is the template method used to create new handler. * Subclasses must overwrite this method if a new handler creation * strategy is required. */ - virtual HANDLER *make_handler (void); + virtual HANDLER *make_handler (); + + /// Address family used to open this object. Obtained from @a address passed + /// to @c open(). + int addr_family_; private: /// Handle used to listen for new connections. @@ -253,21 +256,11 @@ class ACE_Asynch_Acceptor : public ACE_Handler /// Bytes to be read with the call. size_t bytes_to_read_; - - /// Address family used to open this object. Obtained from @a address passed - /// to @c open(). - int addr_family_; }; ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Asynch_Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Asynch_Acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Asynch_Connector.cpp b/ACE/ace/Asynch_Connector.cpp index fbb86182517be..5d9d5fdd16e89 100644 --- a/ACE/ace/Asynch_Connector.cpp +++ b/ACE/ace/Asynch_Connector.cpp @@ -7,7 +7,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE) +#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) // This only works on platforms that support async I/O. #include "ace/OS_NS_sys_socket.h" @@ -20,7 +20,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template -ACE_Asynch_Connector::ACE_Asynch_Connector (void) +ACE_Asynch_Connector::ACE_Asynch_Connector () : pass_addresses_ (false), validate_new_connection_ (false) { @@ -167,7 +167,7 @@ ACE_Asynch_Connector::validate_connection } template int -ACE_Asynch_Connector::cancel (void) +ACE_Asynch_Connector::cancel () { return this->asynch_connect_.cancel (); } @@ -218,13 +218,13 @@ ACE_Asynch_Connector::parse_address (const ACE_Asynch_Connect::Result & template ACE_Asynch_Connect & -ACE_Asynch_Connector::asynch_connect (void) +ACE_Asynch_Connector::asynch_connect () { return this->asynch_connect_; } template HANDLER * -ACE_Asynch_Connector::make_handler (void) +ACE_Asynch_Connector::make_handler () { // Default behavior HANDLER *handler = 0; diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h index 415915d87b0cb..aa1f763411a76 100644 --- a/ACE/ace/Asynch_Connector.h +++ b/ACE/ace/Asynch_Connector.h @@ -18,7 +18,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE) +#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) // This only works on platforms that support async i/o. #include "ace/Asynch_IO.h" @@ -45,7 +45,7 @@ class ACE_Asynch_Connector : public ACE_Handler { public: /// A do nothing constructor. - ACE_Asynch_Connector (void); + ACE_Asynch_Connector (); /// Virtual destruction virtual ~ACE_Asynch_Connector () = default; @@ -73,7 +73,7 @@ class ACE_Asynch_Connector : public ACE_Handler * * @note On POSIX, delegates cancelation to ACE_POSIX_Asynch_Connect. */ - virtual int cancel (void); + virtual int cancel (); /** @@ -122,7 +122,6 @@ class ACE_Asynch_Connector : public ACE_Handler virtual void validate_new_connection (bool new_value); protected: - /// This is called when an outstanding accept completes. virtual void handle_connect (const ACE_Asynch_Connect::Result &result); @@ -133,14 +132,14 @@ class ACE_Asynch_Connector : public ACE_Handler ACE_INET_Addr &local_address); /// Return the asynch Connect object. - ACE_Asynch_Connect & asynch_connect (void); + ACE_Asynch_Connect & asynch_connect (); /** * This is the template method used to create new handler. * Subclasses must overwrite this method if a new handler creation * strategy is required. */ - virtual HANDLER *make_handler (void); + virtual HANDLER *make_handler (); private: /// Asynch_Connect used to make life easier :-) @@ -155,13 +154,7 @@ class ACE_Asynch_Connector : public ACE_Handler ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Asynch_Connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Asynch_Connector.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Asynch_IO.cpp b/ACE/ace/Asynch_IO.cpp index e97457b75eea6..5502dd2191c2c 100644 --- a/ACE/ace/Asynch_IO.cpp +++ b/ACE/ace/Asynch_IO.cpp @@ -432,7 +432,7 @@ ACE_Asynch_Read_File::read (ACE_Message_Block &message_block, signal_number); } -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) int ACE_Asynch_Read_File::readv (ACE_Message_Block &message_block, size_t bytes_to_read, @@ -455,7 +455,7 @@ ACE_Asynch_Read_File::readv (ACE_Message_Block &message_block, priority, signal_number); } -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ ACE_Asynch_Operation_Impl * ACE_Asynch_Read_File::implementation () const @@ -540,7 +540,7 @@ ACE_Asynch_Write_File::write (ACE_Message_Block &message_block, signal_number); } -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) int ACE_Asynch_Write_File::writev (ACE_Message_Block &message_block, size_t bytes_to_write, @@ -563,7 +563,7 @@ ACE_Asynch_Write_File::writev (ACE_Message_Block &message_block, priority, signal_number); } -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ ACE_Asynch_Operation_Impl * ACE_Asynch_Write_File::implementation () const @@ -699,7 +699,6 @@ ACE_Asynch_Accept::Result::implementation () const } - // ********************************************************************* ACE_Asynch_Connect::ACE_Asynch_Connect () diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 7f485cd18d029..c528be4188ef9 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -4,9 +4,8 @@ /** * @file Asynch_IO.h * - * This works on Win32 (defined (ACE_WIN32) && !defined - * (ACE_HAS_WINCE)) platforms and on POSIX4 platforms with {aio_*} - * routines (defined (ACE_HAS_AIO_CALLS)) + * This works on Win32 (defined (ACE_WIN32)) platforms and on + * POSIX4 platforms with {aio_*} routines (defined (ACE_HAS_AIO_CALLS)) * * On Win32 platforms, the implementation of * {ACE_Asynch_Transmit_File} and {ACE_Asynch_Accept} are only @@ -166,7 +165,7 @@ class ACE_Export ACE_Asynch_Result /// Destructor. - virtual ~ACE_Asynch_Result (void); + virtual ~ACE_Asynch_Result (); protected: /// Constructor. This implementation will not be deleted. The @@ -244,7 +243,7 @@ class ACE_Export ACE_Asynch_Operation * For requested operations that are successfully canceled, the * associated error status is set to ECANCELED. */ - int cancel (void); + int cancel (); // = Access methods. @@ -288,10 +287,10 @@ class ACE_Export ACE_Asynch_Read_Stream : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Read_Stream (void); + ACE_Asynch_Read_Stream (); /// Destructor - virtual ~ACE_Asynch_Read_Stream (void); + virtual ~ACE_Asynch_Read_Stream (); /** * Initializes the factory with information which will be used with @@ -400,7 +399,7 @@ class ACE_Export ACE_Asynch_Read_Stream : public ACE_Asynch_Operation Result (ACE_Asynch_Read_Stream_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// The implementation class. ACE_Asynch_Read_Stream_Result_Impl *implementation_; @@ -430,10 +429,10 @@ class ACE_Export ACE_Asynch_Write_Stream : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Write_Stream (void); + ACE_Asynch_Write_Stream (); /// Destructor. - virtual ~ACE_Asynch_Write_Stream (void); + virtual ~ACE_Asynch_Write_Stream (); /** * Initializes the factory with information which will be used with @@ -554,7 +553,7 @@ class ACE_Export ACE_Asynch_Write_Stream : public ACE_Asynch_Operation Result (ACE_Asynch_Write_Stream_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// Implementation class. ACE_Asynch_Write_Stream_Result_Impl *implementation_; @@ -587,10 +586,10 @@ class ACE_Export ACE_Asynch_Read_File : public ACE_Asynch_Read_Stream { public: /// A do nothing constructor. - ACE_Asynch_Read_File (void); + ACE_Asynch_Read_File (); /// Destructor. - virtual ~ACE_Asynch_Read_File (void); + virtual ~ACE_Asynch_Read_File (); /** * Initializes the factory with information which will be used with @@ -639,7 +638,7 @@ class ACE_Export ACE_Asynch_Read_File : public ACE_Asynch_Read_Stream int priority = 0, int signal_number = ACE_SIGRTMIN); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with scatter support, through chaining of composite * message blocks using the continuation field. @@ -653,7 +652,7 @@ class ACE_Export ACE_Asynch_Read_File : public ACE_Asynch_Read_Stream const void *act = 0, int priority = 0, int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ /// Return the underlying implementation class. // (this should be protected...) @@ -698,7 +697,7 @@ class ACE_Export ACE_Asynch_Read_File : public ACE_Asynch_Read_Stream Result (ACE_Asynch_Read_File_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// The implementation class. ACE_Asynch_Read_File_Result_Impl *implementation_; @@ -736,10 +735,10 @@ class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream { public: /// A do nothing constructor. - ACE_Asynch_Write_File (void); + ACE_Asynch_Write_File (); /// Destructor. - virtual ~ACE_Asynch_Write_File (void); + virtual ~ACE_Asynch_Write_File (); /** * Initializes the factory with information which will be used with @@ -774,7 +773,7 @@ class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream int priority = 0, int signal_number = ACE_SIGRTMIN); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -788,7 +787,7 @@ class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream const void *act = 0, int priority = 0, int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ /// Return the underlying implementation class. // (this should be protected...) @@ -832,7 +831,7 @@ class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream Result (ACE_Asynch_Write_File_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// The implementation class. ACE_Asynch_Write_File_Result_Impl *implementation_; @@ -868,10 +867,10 @@ class ACE_Export ACE_Asynch_Accept : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Accept (void); + ACE_Asynch_Accept (); /// Destructor. - virtual ~ACE_Asynch_Accept (void); + virtual ~ACE_Asynch_Accept (); /** * Initializes the factory with information which will be used with @@ -975,7 +974,7 @@ class ACE_Export ACE_Asynch_Accept : public ACE_Asynch_Operation Result (ACE_Asynch_Accept_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// Implementation class. ACE_Asynch_Accept_Result_Impl *implementation_; @@ -1003,10 +1002,10 @@ class ACE_Export ACE_Asynch_Connect : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Connect (void); + ACE_Asynch_Connect (); /// Destructor. - virtual ~ACE_Asynch_Connect (void); + virtual ~ACE_Asynch_Connect (); /** * Initializes the factory with information which will be used with @@ -1058,7 +1057,6 @@ class ACE_Export ACE_Asynch_Connect : public ACE_Asynch_Operation friend class ACE_WIN32_Asynch_Connect_Result; public: - /// I/O handle for the connection. ACE_HANDLE connect_handle () const; @@ -1070,7 +1068,7 @@ class ACE_Export ACE_Asynch_Connect : public ACE_Asynch_Operation Result (ACE_Asynch_Connect_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// Implementation class. ACE_Asynch_Connect_Result_Impl *implementation_; @@ -1109,10 +1107,10 @@ class ACE_Export ACE_Asynch_Transmit_File : public ACE_Asynch_Operation class Header_And_Trailer; /// A do nothing constructor. - ACE_Asynch_Transmit_File (void); + ACE_Asynch_Transmit_File (); /// Destructor. - virtual ~ACE_Asynch_Transmit_File (void); + virtual ~ACE_Asynch_Transmit_File (); /** * Initializes the factory with information which will be used with @@ -1210,7 +1208,7 @@ class ACE_Export ACE_Asynch_Transmit_File : public ACE_Asynch_Operation Result (ACE_Asynch_Transmit_File_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// The implementation class. ACE_Asynch_Transmit_File_Result_Impl *implementation_; @@ -1235,7 +1233,7 @@ class ACE_Export ACE_Asynch_Transmit_File : public ACE_Asynch_Operation size_t trailer_bytes = 0); /// Destructor - virtual ~Header_And_Trailer (void); + virtual ~Header_And_Trailer (); /// This method allows all the member to be set in one fell swoop. void header_and_trailer (ACE_Message_Block *header = 0, @@ -1268,7 +1266,7 @@ class ACE_Export ACE_Asynch_Transmit_File : public ACE_Asynch_Operation void trailer_bytes (size_t bytes); /// Conversion routine. - ACE_LPTRANSMIT_FILE_BUFFERS transmit_buffers (void); + ACE_LPTRANSMIT_FILE_BUFFERS transmit_buffers (); protected: /// Header data. @@ -1314,10 +1312,10 @@ class ACE_Export ACE_Asynch_Read_Dgram : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Read_Dgram (void); + ACE_Asynch_Read_Dgram (); /// Destructor - virtual ~ACE_Asynch_Read_Dgram (void); + virtual ~ACE_Asynch_Read_Dgram (); /** * Initializes the factory with information which will be used with @@ -1416,7 +1414,7 @@ class ACE_Export ACE_Asynch_Read_Dgram : public ACE_Asynch_Operation Result (ACE_Asynch_Read_Dgram_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// The implementation class. ACE_Asynch_Read_Dgram_Result_Impl *implementation_; @@ -1447,10 +1445,10 @@ class ACE_Export ACE_Asynch_Write_Dgram : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Write_Dgram (void); + ACE_Asynch_Write_Dgram (); /// Destructor. - virtual ~ACE_Asynch_Write_Dgram (void); + virtual ~ACE_Asynch_Write_Dgram (); /** * Initializes the factory with information which will be used with @@ -1546,7 +1544,7 @@ class ACE_Export ACE_Asynch_Write_Dgram : public ACE_Asynch_Operation Result (ACE_Asynch_Write_Dgram_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// Implementation class. ACE_Asynch_Write_Dgram_Result_Impl *implementation_; @@ -1568,13 +1566,13 @@ class ACE_Export ACE_Handler { public: /// A do nothing constructor. - ACE_Handler (void); + ACE_Handler (); /// A do nothing constructor which allows proactor to be set to \. ACE_Handler (ACE_Proactor *p); /// Virtual destruction. - virtual ~ACE_Handler (void); + virtual ~ACE_Handler (); /// This method will be called when an asynchronous read completes on /// a stream. @@ -1620,10 +1618,10 @@ class ACE_Export ACE_Handler * ACE_Proactor. A special {Wake_Up_Completion} is used to wake up * all the threads that are blocking for completions. */ - virtual void handle_wakeup (void); + virtual void handle_wakeup (); /// Get the proactor associated with this handler. - ACE_Proactor *proactor (void); + ACE_Proactor *proactor (); /// Set the proactor. void proactor (ACE_Proactor *p); @@ -1651,14 +1649,14 @@ class ACE_Export ACE_Handler { public: Proxy (ACE_Handler *handler) : handler_ (handler) {} - void reset (void) { this->handler_ = 0; } - ACE_Handler *handler (void) { return this->handler_; } + void reset () { this->handler_ = 0; } + ACE_Handler *handler () { return this->handler_; } private: ACE_Handler *handler_; }; typedef ACE_Refcounted_Auto_Ptr Proxy_Ptr; - Proxy_Ptr &proxy (void); + Proxy_Ptr &proxy (); protected: /// The proactor associated with this handler. @@ -1700,10 +1698,10 @@ class ACE_Export ACE_Service_Handler : public ACE_Handler public: /// A do nothing constructor. - ACE_Service_Handler (void); + ACE_Service_Handler (); /// Virtual destruction. - virtual ~ACE_Service_Handler (void); + virtual ~ACE_Service_Handler (); /** * {open} is called by ACE_Asynch_Acceptor to initialize a new diff --git a/ACE/ace/Asynch_IO_Impl.h b/ACE/ace/Asynch_IO_Impl.h index 01880bc1dbcbb..40e79e25de687 100644 --- a/ACE/ace/Asynch_IO_Impl.h +++ b/ACE/ace/Asynch_IO_Impl.h @@ -46,7 +46,7 @@ class ACE_Proactor_Impl; class ACE_Export ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Result_Impl (void); + virtual ~ACE_Asynch_Result_Impl (); /// Number of bytes transferred by the operation. virtual size_t bytes_transferred () const = 0; @@ -97,7 +97,7 @@ class ACE_Export ACE_Asynch_Result_Impl protected: /// Do-nothing constructor. - ACE_Asynch_Result_Impl (void); + ACE_Asynch_Result_Impl (); }; /** @@ -110,7 +110,7 @@ class ACE_Export ACE_Asynch_Result_Impl class ACE_Export ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Operation_Impl (void); + virtual ~ACE_Asynch_Operation_Impl (); /** * Initializes the factory with information which will be used with @@ -128,7 +128,7 @@ class ACE_Export ACE_Asynch_Operation_Impl * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - virtual int cancel (void) = 0; + virtual int cancel () = 0; // = Access methods. @@ -137,7 +137,7 @@ class ACE_Export ACE_Asynch_Operation_Impl protected: /// Do-nothing constructor. - ACE_Asynch_Operation_Impl (void); + ACE_Asynch_Operation_Impl (); }; /** @@ -150,7 +150,7 @@ class ACE_Export ACE_Asynch_Operation_Impl class ACE_Export ACE_Asynch_Read_Stream_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Read_Stream_Impl (void); + virtual ~ACE_Asynch_Read_Stream_Impl (); /// This starts off an asynchronous read. Upto @a bytes_to_read will /// be read and stored in the @a message_block. @@ -160,7 +160,7 @@ class ACE_Export ACE_Asynch_Read_Stream_Impl : public virtual ACE_Asynch_Operati int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with scatter support, through chaining of composite * message blocks using the continuation field. @@ -170,11 +170,11 @@ class ACE_Export ACE_Asynch_Read_Stream_Impl : public virtual ACE_Asynch_Operati const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ protected: /// Do-nothing constructor. - ACE_Asynch_Read_Stream_Impl (void); + ACE_Asynch_Read_Stream_Impl (); }; /** @@ -187,7 +187,7 @@ class ACE_Export ACE_Asynch_Read_Stream_Impl : public virtual ACE_Asynch_Operati class ACE_Export ACE_Asynch_Read_Stream_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Read_Stream_Result_Impl (void); + virtual ~ACE_Asynch_Read_Stream_Result_Impl (); /// The number of bytes which were requested at the start of the /// asynchronous read. @@ -201,7 +201,7 @@ class ACE_Export ACE_Asynch_Read_Stream_Result_Impl : public virtual ACE_Asynch_ protected: /// Do-nothing constructor. - ACE_Asynch_Read_Stream_Result_Impl (void); + ACE_Asynch_Read_Stream_Result_Impl (); }; /** @@ -214,7 +214,7 @@ class ACE_Export ACE_Asynch_Read_Stream_Result_Impl : public virtual ACE_Asynch_ class ACE_Export ACE_Asynch_Write_Stream_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Write_Stream_Impl (void); + virtual ~ACE_Asynch_Write_Stream_Impl (); /// This starts off an asynchronous write. Upto @a bytes_to_write /// will be written from the @a message_block. @@ -224,7 +224,7 @@ class ACE_Export ACE_Asynch_Write_Stream_Impl : public virtual ACE_Asynch_Operat int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -234,11 +234,11 @@ class ACE_Export ACE_Asynch_Write_Stream_Impl : public virtual ACE_Asynch_Operat const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ protected: /// Do-nothing constructor. - ACE_Asynch_Write_Stream_Impl (void); + ACE_Asynch_Write_Stream_Impl (); }; /** @@ -251,7 +251,7 @@ class ACE_Export ACE_Asynch_Write_Stream_Impl : public virtual ACE_Asynch_Operat class ACE_Export ACE_Asynch_Write_Stream_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Write_Stream_Result_Impl (void); + virtual ~ACE_Asynch_Write_Stream_Result_Impl (); /// The number of bytes which were requested at the start of the /// asynchronous write. @@ -265,7 +265,7 @@ class ACE_Export ACE_Asynch_Write_Stream_Result_Impl : public virtual ACE_Asynch protected: /// Do-nothing constructor. - ACE_Asynch_Write_Stream_Result_Impl (void); + ACE_Asynch_Write_Stream_Result_Impl (); }; /** @@ -278,7 +278,7 @@ class ACE_Export ACE_Asynch_Write_Stream_Result_Impl : public virtual ACE_Asynch class ACE_Export ACE_Asynch_Read_File_Impl : public virtual ACE_Asynch_Read_Stream_Impl { public: - virtual ~ACE_Asynch_Read_File_Impl (void); + virtual ~ACE_Asynch_Read_File_Impl (); /** * This starts off an asynchronous read. Upto @a bytes_to_read will @@ -293,7 +293,7 @@ class ACE_Export ACE_Asynch_Read_File_Impl : public virtual ACE_Asynch_Read_Stre int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with scatter support, through chaining of composite * message blocks using the continuation field. @@ -307,7 +307,7 @@ class ACE_Export ACE_Asynch_Read_File_Impl : public virtual ACE_Asynch_Read_Stre const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ /// This starts off an asynchronous read. Upto @a bytes_to_read will /// be read and stored in the @a message_block. @@ -317,7 +317,7 @@ class ACE_Export ACE_Asynch_Read_File_Impl : public virtual ACE_Asynch_Read_Stre int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with scatter support, through chaining of composite * message blocks using the continuation field. @@ -327,11 +327,11 @@ class ACE_Export ACE_Asynch_Read_File_Impl : public virtual ACE_Asynch_Read_Stre const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ protected: /// Do-nothing constructor. - ACE_Asynch_Read_File_Impl (void); + ACE_Asynch_Read_File_Impl (); }; /** @@ -344,11 +344,11 @@ class ACE_Export ACE_Asynch_Read_File_Result_Impl : public virtual ACE_Asynch_Re { public: /// Destructor. - virtual ~ACE_Asynch_Read_File_Result_Impl (void); + virtual ~ACE_Asynch_Read_File_Result_Impl (); protected: /// Do-nothing constructor. - ACE_Asynch_Read_File_Result_Impl (void); + ACE_Asynch_Read_File_Result_Impl (); }; /** @@ -361,7 +361,7 @@ class ACE_Export ACE_Asynch_Read_File_Result_Impl : public virtual ACE_Asynch_Re class ACE_Export ACE_Asynch_Write_File_Impl : public virtual ACE_Asynch_Write_Stream_Impl { public: - virtual ~ACE_Asynch_Write_File_Impl (void); + virtual ~ACE_Asynch_Write_File_Impl (); /** * This starts off an asynchronous write. Upto @a bytes_to_write @@ -376,7 +376,7 @@ class ACE_Export ACE_Asynch_Write_File_Impl : public virtual ACE_Asynch_Write_St int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -390,7 +390,7 @@ class ACE_Export ACE_Asynch_Write_File_Impl : public virtual ACE_Asynch_Write_St const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ /// This starts off an asynchronous write. Upto @a bytes_to_write /// will be written from the @a message_block. @@ -400,7 +400,7 @@ class ACE_Export ACE_Asynch_Write_File_Impl : public virtual ACE_Asynch_Write_St int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -410,11 +410,11 @@ class ACE_Export ACE_Asynch_Write_File_Impl : public virtual ACE_Asynch_Write_St const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ protected: /// Do-nothing constructor. - ACE_Asynch_Write_File_Impl (void); + ACE_Asynch_Write_File_Impl (); }; /** @@ -427,11 +427,11 @@ class ACE_Export ACE_Asynch_Write_File_Impl : public virtual ACE_Asynch_Write_St class ACE_Export ACE_Asynch_Write_File_Result_Impl : public virtual ACE_Asynch_Write_Stream_Result_Impl { public: - virtual ~ACE_Asynch_Write_File_Result_Impl (void); + virtual ~ACE_Asynch_Write_File_Result_Impl (); protected: /// Do-nothing constructor. - ACE_Asynch_Write_File_Result_Impl (void); + ACE_Asynch_Write_File_Result_Impl (); }; /** @@ -444,7 +444,7 @@ class ACE_Export ACE_Asynch_Write_File_Result_Impl : public virtual ACE_Asynch_W class ACE_Export ACE_Asynch_Accept_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Accept_Impl (void); + virtual ~ACE_Asynch_Accept_Impl (); /** * This starts off an asynchronous accept. The asynchronous accept @@ -467,7 +467,7 @@ class ACE_Export ACE_Asynch_Accept_Impl : public virtual ACE_Asynch_Operation_Im protected: /// Do-nothing constructor. - ACE_Asynch_Accept_Impl (void); + ACE_Asynch_Accept_Impl (); }; /** @@ -480,7 +480,7 @@ class ACE_Export ACE_Asynch_Accept_Impl : public virtual ACE_Asynch_Operation_Im class ACE_Export ACE_Asynch_Accept_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Accept_Result_Impl (void); + virtual ~ACE_Asynch_Accept_Result_Impl (); /// The number of bytes which were requested at the start of the /// asynchronous accept. @@ -497,7 +497,7 @@ class ACE_Export ACE_Asynch_Accept_Result_Impl : public virtual ACE_Asynch_Resul protected: /// Do-nothing constructor. - ACE_Asynch_Accept_Result_Impl (void); + ACE_Asynch_Accept_Result_Impl (); }; @@ -511,7 +511,7 @@ class ACE_Export ACE_Asynch_Accept_Result_Impl : public virtual ACE_Asynch_Resul class ACE_Export ACE_Asynch_Connect_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Connect_Impl (void); + virtual ~ACE_Asynch_Connect_Impl (); /** * This starts off an asynchronous connect @@ -526,7 +526,7 @@ class ACE_Export ACE_Asynch_Connect_Impl : public virtual ACE_Asynch_Operation_I protected: /// Do-nothing constructor. - ACE_Asynch_Connect_Impl (void); + ACE_Asynch_Connect_Impl (); }; /** @@ -539,14 +539,14 @@ class ACE_Export ACE_Asynch_Connect_Impl : public virtual ACE_Asynch_Operation_I class ACE_Export ACE_Asynch_Connect_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Connect_Result_Impl (void); + virtual ~ACE_Asynch_Connect_Result_Impl (); /// I/O handle for the connection. virtual ACE_HANDLE connect_handle () const = 0; protected: /// Do-nothing constructor. - ACE_Asynch_Connect_Result_Impl (void); + ACE_Asynch_Connect_Result_Impl (); }; @@ -560,7 +560,7 @@ class ACE_Export ACE_Asynch_Connect_Result_Impl : public virtual ACE_Asynch_Resu class ACE_Asynch_Transmit_File_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Transmit_File_Impl (void); + virtual ~ACE_Asynch_Transmit_File_Impl (); /// This starts off an asynchronous transmit file. virtual int transmit_file (ACE_HANDLE file, @@ -576,7 +576,7 @@ class ACE_Asynch_Transmit_File_Impl : public virtual ACE_Asynch_Operation_Impl protected: /// Do-nothing constructor. - ACE_Asynch_Transmit_File_Impl (void); + ACE_Asynch_Transmit_File_Impl (); }; /** @@ -589,7 +589,7 @@ class ACE_Asynch_Transmit_File_Impl : public virtual ACE_Asynch_Operation_Impl class ACE_Export ACE_Asynch_Transmit_File_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Transmit_File_Result_Impl (void); + virtual ~ACE_Asynch_Transmit_File_Result_Impl (); /// Socket used for transmitting the file. virtual ACE_HANDLE socket () const = 0; @@ -613,7 +613,7 @@ class ACE_Export ACE_Asynch_Transmit_File_Result_Impl : public virtual ACE_Async protected: /// Do-nothing constructor. - ACE_Asynch_Transmit_File_Result_Impl (void); + ACE_Asynch_Transmit_File_Result_Impl (); }; @@ -627,7 +627,7 @@ class ACE_Export ACE_Asynch_Transmit_File_Result_Impl : public virtual ACE_Async class ACE_Export ACE_Asynch_Read_Dgram_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Read_Dgram_Impl (void); + virtual ~ACE_Asynch_Read_Dgram_Impl (); /** This starts off an asynchronous read. Upto * total_size()> will be read and stored in the @@ -665,7 +665,7 @@ class ACE_Export ACE_Asynch_Read_Dgram_Impl : public virtual ACE_Asynch_Operatio protected: /// Do-nothing constructor. - ACE_Asynch_Read_Dgram_Impl (void); + ACE_Asynch_Read_Dgram_Impl (); }; /** @@ -678,7 +678,7 @@ class ACE_Export ACE_Asynch_Read_Dgram_Impl : public virtual ACE_Asynch_Operatio class ACE_Export ACE_Asynch_Read_Dgram_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Read_Dgram_Result_Impl (void); + virtual ~ACE_Asynch_Read_Dgram_Result_Impl (); /// Message block which contains the read data virtual ACE_Message_Block *message_block () const = 0; @@ -698,7 +698,7 @@ class ACE_Export ACE_Asynch_Read_Dgram_Result_Impl : public virtual ACE_Asynch_R protected: /// Do-nothing constructor. - ACE_Asynch_Read_Dgram_Result_Impl (void); + ACE_Asynch_Read_Dgram_Result_Impl (); }; /** @@ -711,7 +711,7 @@ class ACE_Export ACE_Asynch_Read_Dgram_Result_Impl : public virtual ACE_Asynch_R class ACE_Export ACE_Asynch_Write_Dgram_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Write_Dgram_Impl (void); + virtual ~ACE_Asynch_Write_Dgram_Impl (); /** This starts off an asynchronous send. Upto * total_length()> will be sent. @a message_block's @@ -749,7 +749,7 @@ class ACE_Export ACE_Asynch_Write_Dgram_Impl : public virtual ACE_Asynch_Operati protected: /// Do-nothing constructor. - ACE_Asynch_Write_Dgram_Impl (void); + ACE_Asynch_Write_Dgram_Impl (); }; /** @@ -762,7 +762,7 @@ class ACE_Export ACE_Asynch_Write_Dgram_Impl : public virtual ACE_Asynch_Operati class ACE_Export ACE_Asynch_Write_Dgram_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Write_Dgram_Result_Impl (void); + virtual ~ACE_Asynch_Write_Dgram_Result_Impl (); /// The number of bytes which were requested at the start of the /// asynchronous write. @@ -779,7 +779,7 @@ class ACE_Export ACE_Asynch_Write_Dgram_Result_Impl : public virtual ACE_Asynch_ protected: /// Do-nothing constructor. - ACE_Asynch_Write_Dgram_Result_Impl (void); + ACE_Asynch_Write_Dgram_Result_Impl (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Asynch_IO_Impl.inl b/ACE/ace/Asynch_IO_Impl.inl index e6fce33b38620..f2fa1e936d5b4 100644 --- a/ACE/ace/Asynch_IO_Impl.inl +++ b/ACE/ace/Asynch_IO_Impl.inl @@ -2,100 +2,100 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Asynch_Result_Impl::ACE_Asynch_Result_Impl (void) +ACE_Asynch_Result_Impl::ACE_Asynch_Result_Impl () { } ACE_INLINE -ACE_Asynch_Operation_Impl::ACE_Asynch_Operation_Impl (void) +ACE_Asynch_Operation_Impl::ACE_Asynch_Operation_Impl () { } ACE_INLINE -ACE_Asynch_Read_Stream_Impl::ACE_Asynch_Read_Stream_Impl (void) +ACE_Asynch_Read_Stream_Impl::ACE_Asynch_Read_Stream_Impl () : ACE_Asynch_Operation_Impl () { } ACE_INLINE -ACE_Asynch_Read_Stream_Result_Impl::ACE_Asynch_Read_Stream_Result_Impl (void) +ACE_Asynch_Read_Stream_Result_Impl::ACE_Asynch_Read_Stream_Result_Impl () : ACE_Asynch_Result_Impl () { } ACE_INLINE -ACE_Asynch_Write_Stream_Impl::ACE_Asynch_Write_Stream_Impl (void) +ACE_Asynch_Write_Stream_Impl::ACE_Asynch_Write_Stream_Impl () : ACE_Asynch_Operation_Impl () { } ACE_INLINE -ACE_Asynch_Write_Stream_Result_Impl::ACE_Asynch_Write_Stream_Result_Impl (void) +ACE_Asynch_Write_Stream_Result_Impl::ACE_Asynch_Write_Stream_Result_Impl () : ACE_Asynch_Result_Impl () { } ACE_INLINE -ACE_Asynch_Read_File_Impl::ACE_Asynch_Read_File_Impl (void) +ACE_Asynch_Read_File_Impl::ACE_Asynch_Read_File_Impl () : ACE_Asynch_Operation_Impl (), ACE_Asynch_Read_Stream_Impl () { } ACE_INLINE -ACE_Asynch_Read_File_Result_Impl::ACE_Asynch_Read_File_Result_Impl (void) +ACE_Asynch_Read_File_Result_Impl::ACE_Asynch_Read_File_Result_Impl () : ACE_Asynch_Result_Impl (), ACE_Asynch_Read_Stream_Result_Impl () { } ACE_INLINE -ACE_Asynch_Write_File_Impl::ACE_Asynch_Write_File_Impl (void) +ACE_Asynch_Write_File_Impl::ACE_Asynch_Write_File_Impl () : ACE_Asynch_Operation_Impl (), ACE_Asynch_Write_Stream_Impl () { } ACE_INLINE -ACE_Asynch_Write_File_Result_Impl::ACE_Asynch_Write_File_Result_Impl (void) +ACE_Asynch_Write_File_Result_Impl::ACE_Asynch_Write_File_Result_Impl () : ACE_Asynch_Result_Impl (), ACE_Asynch_Write_Stream_Result_Impl () { } ACE_INLINE -ACE_Asynch_Accept_Impl::ACE_Asynch_Accept_Impl (void) +ACE_Asynch_Accept_Impl::ACE_Asynch_Accept_Impl () : ACE_Asynch_Operation_Impl () { } ACE_INLINE -ACE_Asynch_Accept_Result_Impl::ACE_Asynch_Accept_Result_Impl (void) +ACE_Asynch_Accept_Result_Impl::ACE_Asynch_Accept_Result_Impl () : ACE_Asynch_Result_Impl () { } ACE_INLINE -ACE_Asynch_Connect_Impl::ACE_Asynch_Connect_Impl (void) +ACE_Asynch_Connect_Impl::ACE_Asynch_Connect_Impl () : ACE_Asynch_Operation_Impl () { } ACE_INLINE -ACE_Asynch_Connect_Result_Impl::ACE_Asynch_Connect_Result_Impl (void) +ACE_Asynch_Connect_Result_Impl::ACE_Asynch_Connect_Result_Impl () : ACE_Asynch_Result_Impl () { } ACE_INLINE -ACE_Asynch_Transmit_File_Impl::ACE_Asynch_Transmit_File_Impl (void) +ACE_Asynch_Transmit_File_Impl::ACE_Asynch_Transmit_File_Impl () : ACE_Asynch_Operation_Impl () { } ACE_INLINE -ACE_Asynch_Transmit_File_Result_Impl::ACE_Asynch_Transmit_File_Result_Impl (void) +ACE_Asynch_Transmit_File_Result_Impl::ACE_Asynch_Transmit_File_Result_Impl () : ACE_Asynch_Result_Impl () { } diff --git a/ACE/ace/Asynch_Pseudo_Task.cpp b/ACE/ace/Asynch_Pseudo_Task.cpp index 72dff50ab0f5a..245581c6f9f34 100644 --- a/ACE/ace/Asynch_Pseudo_Task.cpp +++ b/ACE/ace/Asynch_Pseudo_Task.cpp @@ -66,7 +66,6 @@ ACE_Asynch_Pseudo_Task::svc () } - int ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle, ACE_Event_Handler *handler, diff --git a/ACE/ace/Asynch_Pseudo_Task.h b/ACE/ace/Asynch_Pseudo_Task.h index 0e311721a9d78..8bf712e768777 100644 --- a/ACE/ace/Asynch_Pseudo_Task.h +++ b/ACE/ace/Asynch_Pseudo_Task.h @@ -34,8 +34,8 @@ class ACE_Export ACE_Asynch_Pseudo_Task : public ACE_Task ACE_Asynch_Pseudo_Task(); virtual ~ACE_Asynch_Pseudo_Task(); - int start (void); - int stop (void); + int start (); + int stop (); int register_io_handler (ACE_HANDLE handle, ACE_Event_Handler *handler, diff --git a/ACE/ace/Atomic_Op.cpp b/ACE/ace/Atomic_Op.cpp index 07490f3a42502..52394cd01a3d5 100644 --- a/ACE/ace/Atomic_Op.cpp +++ b/ACE/ace/Atomic_Op.cpp @@ -7,12 +7,7 @@ #if defined (ACE_HAS_BUILTIN_ATOMIC_OP) -#if defined (ACE_INCLUDE_ATOMIC_OP_SPARC) -# include "ace/Atomic_Op_Sparc.h" -#endif /* ACE_INCLUDE_ATOMIC_OP_SPARC */ - namespace { - #if defined (_MSC_VER) // Disable "no return value" warning, as we will be putting // the return values directly into the EAX register. @@ -28,10 +23,6 @@ single_cpu_increment (volatile long *value) unsigned long addr = reinterpret_cast (value); asm( "xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp + 1; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_add_long ( - reinterpret_cast (value), 1); #elif defined(__GNUC__) && defined(__PPC__) long tmp; asm("lwz %0,%1" : "=r" (tmp) : "m" (*value) ); @@ -52,10 +43,6 @@ single_cpu_decrement (volatile long *value) unsigned long addr = reinterpret_cast (value); asm( "xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp - 1; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_add_long ( - reinterpret_cast (value), -1); #elif defined(__GNUC__) && defined(__PPC__) long tmp; asm("lwz %0,%1" : "=r" (tmp) : "m" (*value) ); @@ -75,10 +62,6 @@ single_cpu_exchange (volatile long *value, long rhs) unsigned long addr = reinterpret_cast (value); asm( "xchg %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_swap_long ( - reinterpret_cast (value), rhs); #elif defined(__GNUC__) && defined(__PPC__) long tmp; asm("lwz %0,%1" : "=r" (tmp) : "m" (rhs) ); @@ -98,10 +81,6 @@ single_cpu_exchange_add (volatile long *value, long rhs) unsigned long addr = reinterpret_cast (value); asm( "xadd %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_swap_add_long ( - reinterpret_cast (value), rhs); #elif defined(__GNUC__) && defined(__PPC__) long tmp; asm("add %0,%1,%2" : "=r" (tmp) : "r" (*value), "r" (rhs) ); @@ -141,10 +120,6 @@ multi_cpu_increment (volatile long *value) unsigned long addr = reinterpret_cast (value); asm( "lock ; xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp + 1; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_add_long ( - reinterpret_cast (value), 1); #else /* ACE_HAS_INTEL_ASSEMBLY*/ ACE_UNUSED_ARG (value); ACE_NOTSUP_RETURN (-1); @@ -159,10 +134,6 @@ multi_cpu_decrement (volatile long *value) unsigned long addr = reinterpret_cast (value); asm( "lock ; xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp - 1; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_add_long ( - reinterpret_cast (value), -1); #else /* ACE_HAS_INTEL_ASSEMBLY*/ ACE_UNUSED_ARG (value); ACE_NOTSUP_RETURN (-1); @@ -177,10 +148,6 @@ multi_cpu_exchange (volatile long *value, long rhs) // The XCHG instruction automatically follows LOCK semantics asm( "xchg %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_swap_long ( - reinterpret_cast (value), rhs); #else /* ACE_HAS_INTEL_ASSEMBLY*/ ACE_UNUSED_ARG (value); ACE_UNUSED_ARG (rhs); @@ -195,10 +162,6 @@ multi_cpu_exchange_add (volatile long *value, long rhs) unsigned long addr = reinterpret_cast (value); asm( "lock ; xadd %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_swap_add_long ( - reinterpret_cast (value), rhs); #elif defined (WIN32) && !defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) # if defined (_MSC_VER) __asm @@ -239,7 +202,7 @@ long (*ACE_Atomic_Op::exchange_fn_) (volatile long *, lo long (*ACE_Atomic_Op::exchange_add_fn_) (volatile long *, long) = multi_cpu_exchange_add; void -ACE_Atomic_Op::init_functions (void) +ACE_Atomic_Op::init_functions () { if (ACE_OS::num_processors () == 1) { @@ -272,7 +235,7 @@ long (*ACE_Atomic_Op::exchange_fn_) (volatile l long (*ACE_Atomic_Op::exchange_add_fn_) (volatile long *, long) = multi_cpu_exchange_add; void -ACE_Atomic_Op::init_functions (void) +ACE_Atomic_Op::init_functions () { if (ACE_OS::num_processors () == 1) { diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h index 146cb7c8acd46..0c50566697669 100644 --- a/ACE/ace/Atomic_Op.h +++ b/ACE/ace/Atomic_Op.h @@ -43,8 +43,6 @@ # define ACE_HAS_BUILTIN_ATOMIC_OP # elif defined (ACE_HAS_VXATOMICLIB) # define ACE_HAS_BUILTIN_ATOMIC_OP -# elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && !defined (ACE_HAS_BUILTIN_ATOMIC_OP) -# define ACE_HAS_BUILTIN_ATOMIC_OP # endif /* WIN32 */ #endif /* ACE_HAS_THREADS */ @@ -72,7 +70,7 @@ class ACE_Export ACE_Atomic_Op { public: /// Initialize @c value_ to 0. - ACE_Atomic_Op (void); + ACE_Atomic_Op (); /// Initialize @c value_ to c. ACE_Atomic_Op (long c); @@ -81,7 +79,7 @@ class ACE_Export ACE_Atomic_Op ACE_Atomic_Op (const ACE_Atomic_Op &c); /// Atomically pre-increment @c value_. - long operator++ (void); + long operator++ (); /// Atomically post-increment @c value_. long operator++ (int); @@ -90,7 +88,7 @@ class ACE_Export ACE_Atomic_Op long operator+= (long rhs); /// Atomically pre-decrement @c value_. - long operator-- (void); + long operator-- (); /// Atomically post-decrement @c value_. long operator-- (int); @@ -132,20 +130,20 @@ class ACE_Export ACE_Atomic_Op void dump () const; /// Explicitly return @c value_ (by reference). - volatile long &value_i (void); + volatile long &value_i (); // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. /// Used during ACE object manager initialization to optimize the fast /// atomic op implementation according to the number of CPUs. - static void init_functions (void); + static void init_functions (); private: /// This function cannot be supported by this template specialization. /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex /// template instead. - ACE_Thread_Mutex &mutex (void); + ACE_Thread_Mutex &mutex (); private: /// Current object decorated by the atomic op. @@ -170,7 +168,7 @@ class ACE_Export ACE_Atomic_Op { public: /// Initialize @c value_ to 0. - ACE_Atomic_Op (void); + ACE_Atomic_Op (); /// Initialize @c value_ to c. ACE_Atomic_Op (unsigned long c); @@ -179,7 +177,7 @@ class ACE_Export ACE_Atomic_Op ACE_Atomic_Op (const ACE_Atomic_Op &c); /// Atomically pre-increment @c value_. - unsigned long operator++ (void); + unsigned long operator++ (); /// Atomically post-increment @c value_. unsigned long operator++ (int); @@ -188,7 +186,7 @@ class ACE_Export ACE_Atomic_Op unsigned long operator+= (unsigned long rhs); /// Atomically pre-decrement @c value_. - unsigned long operator-- (void); + unsigned long operator-- (); /// Atomically post-decrement @c value_. unsigned long operator-- (int); @@ -230,20 +228,20 @@ class ACE_Export ACE_Atomic_Op void dump () const; /// Explicitly return @c value_ (by reference). - volatile unsigned long &value_i (void); + volatile unsigned long &value_i (); // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. /// Used during ACE object manager initialization to optimize the fast /// atomic op implementation according to the number of CPUs. - static void init_functions (void); + static void init_functions (); private: /// This function cannot be supported by this template specialization. /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex /// template instead. - ACE_Thread_Mutex &mutex (void); + ACE_Thread_Mutex &mutex (); private: /// Current object decorated by the atomic op. diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl index 7d75457bc0507..12fb795946e9d 100644 --- a/ACE/ace/Atomic_Op.inl +++ b/ACE/ace/Atomic_Op.inl @@ -8,16 +8,12 @@ # include #endif -#if defined (ACE_HAS_SOLARIS_ATOMIC_LIB) -# include -#endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_HAS_BUILTIN_ATOMIC_OP) ACE_INLINE -ACE_Atomic_Op::ACE_Atomic_Op (void) +ACE_Atomic_Op::ACE_Atomic_Op () : value_ (0) { } @@ -36,7 +32,7 @@ ACE_Atomic_Op::ACE_Atomic_Op ( } ACE_INLINE long -ACE_Atomic_Op::operator++ (void) +ACE_Atomic_Op::operator++ () { #if defined (ACE_HAS_INTRINSIC_INTERLOCKED) return ::_InterlockedIncrement (const_cast (&this->value_)); @@ -44,8 +40,6 @@ ACE_Atomic_Op::operator++ (void) return ::InterlockedIncrement (const_cast (&this->value_)); #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicInc (reinterpret_cast (const_cast (&this->value_))) + 1; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_inc_ulong_nv (reinterpret_cast(&this->value_)); #else /* WIN32 */ return (*increment_fn_) (&this->value_); #endif /* WIN32 */ @@ -58,7 +52,7 @@ ACE_Atomic_Op::operator++ (int) } ACE_INLINE long -ACE_Atomic_Op::operator-- (void) +ACE_Atomic_Op::operator-- () { #if defined (ACE_HAS_INTRINSIC_INTERLOCKED) return ::_InterlockedDecrement (const_cast (&this->value_)); @@ -66,8 +60,6 @@ ACE_Atomic_Op::operator-- (void) return ::InterlockedDecrement (const_cast (&this->value_)); #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicDec (reinterpret_cast (const_cast (&this->value_))) - 1; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_dec_ulong_nv (reinterpret_cast(&this->value_)); #else /* WIN32 */ return (*decrement_fn_) (&this->value_); #endif /* WIN32 */ @@ -90,8 +82,6 @@ ACE_Atomic_Op::operator+= (long rhs) rhs) + rhs; #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicAdd (reinterpret_cast (const_cast (&this->value_)), rhs) + rhs; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_add_long_nv (reinterpret_cast(&this->value_), rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ return (*exchange_add_fn_) (&this->value_, rhs) + rhs; #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ @@ -108,8 +98,6 @@ ACE_Atomic_Op::operator-= (long rhs) -rhs) - rhs; #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicSub (reinterpret_cast (const_cast (&this->value_)), rhs) - rhs; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_add_long_nv (reinterpret_cast(&this->value_), -rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ return (*exchange_add_fn_) (&this->value_, -rhs) - rhs; #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ @@ -160,8 +148,6 @@ ACE_Atomic_Op::operator= (long rhs) ::InterlockedExchange (const_cast (&this->value_), rhs); #elif defined (ACE_HAS_VXATOMICLIB) ::vxAtomicSet (reinterpret_cast (const_cast (&this->value_)), rhs); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - ::atomic_swap_ulong (reinterpret_cast(&this->value_), rhs); #else /* WIN32 */ (*exchange_fn_) (&this->value_, rhs); #endif /* WIN32 */ @@ -178,8 +164,6 @@ ACE_Atomic_Op::operator= ( ::InterlockedExchange (const_cast (&this->value_), rhs.value_); #elif defined (ACE_HAS_VXATOMICLIB) ::vxAtomicSet (reinterpret_cast (const_cast (&this->value_)), rhs.value_); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - ::atomic_swap_ulong (reinterpret_cast(&this->value_), rhs.value_); #else /* WIN32 */ (*exchange_fn_) (&this->value_, rhs.value_); #endif /* WIN32 */ @@ -195,8 +179,6 @@ ACE_Atomic_Op::exchange (long newval) return ::InterlockedExchange (const_cast (&this->value_), newval); #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicSet (reinterpret_cast (const_cast (&this->value_)), newval); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_swap_ulong (reinterpret_cast(&this->value_), newval); #else /* WIN32 */ return (*exchange_fn_) (&this->value_, newval); #endif /* WIN32 */ @@ -209,14 +191,14 @@ ACE_Atomic_Op::value () const } ACE_INLINE volatile long & -ACE_Atomic_Op::value_i (void) +ACE_Atomic_Op::value_i () { return this->value_; } ACE_INLINE -ACE_Atomic_Op::ACE_Atomic_Op (void) +ACE_Atomic_Op::ACE_Atomic_Op () : value_ (0) { } @@ -235,7 +217,7 @@ ACE_Atomic_Op::ACE_Atomic_Op ( } ACE_INLINE unsigned long -ACE_Atomic_Op::operator++ (void) +ACE_Atomic_Op::operator++ () { #if defined (ACE_HAS_INTRINSIC_INTERLOCKED) return static_cast (::_InterlockedIncrement (const_cast (reinterpret_cast(&this->value_)))); @@ -243,8 +225,6 @@ ACE_Atomic_Op::operator++ (void) return static_cast (::InterlockedIncrement (const_cast (reinterpret_cast(&this->value_)))); #elif defined (ACE_HAS_VXATOMICLIB) return static_cast (::vxAtomicInc (reinterpret_cast (const_cast (reinterpret_cast(&this->value_))))) + 1; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_inc_ulong_nv (&this->value_); #else /* WIN32 */ return static_cast ((*increment_fn_) (reinterpret_cast (&this->value_))); #endif /* WIN32 */ @@ -257,7 +237,7 @@ ACE_Atomic_Op::operator++ (int) } ACE_INLINE unsigned long -ACE_Atomic_Op::operator-- (void) +ACE_Atomic_Op::operator-- () { #if defined (ACE_HAS_INTRINSIC_INTERLOCKED) return static_cast (::_InterlockedDecrement (const_cast (reinterpret_cast(&this->value_)))); @@ -265,8 +245,6 @@ ACE_Atomic_Op::operator-- (void) return static_cast (::InterlockedDecrement (const_cast (reinterpret_cast(&this->value_)))); #elif defined (ACE_HAS_VXATOMICLIB) return static_cast (::vxAtomicDec (reinterpret_cast (const_cast (reinterpret_cast(&this->value_))))) - 1; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_dec_ulong_nv (&this->value_); #else /* WIN32 */ return static_cast ((*decrement_fn_) (reinterpret_cast (&this->value_))); #endif /* WIN32 */ @@ -289,8 +267,6 @@ ACE_Atomic_Op::operator+= (unsigned long rhs) rhs)) + rhs; #elif defined (ACE_HAS_VXATOMICLIB) return static_cast (::vxAtomicAdd (reinterpret_cast (const_cast (reinterpret_cast(&this->value_))), rhs)) + rhs; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_add_long_nv (&this->value_, rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ return static_cast ((*exchange_add_fn_) (reinterpret_cast (&this->value_), rhs)) + rhs; #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ @@ -307,8 +283,6 @@ ACE_Atomic_Op::operator-= (unsigned long rhs) -static_cast(rhs))) - rhs; #elif defined (ACE_HAS_VXATOMICLIB) return static_cast (::vxAtomicSub (reinterpret_cast (const_cast (reinterpret_cast(&this->value_))), rhs)) - rhs; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_add_long_nv (&this->value_, -rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ long l_rhs = static_cast (rhs); return static_cast ((*exchange_add_fn_) (reinterpret_cast (&this->value_), -l_rhs)) - rhs; @@ -360,8 +334,6 @@ ACE_Atomic_Op::operator= (unsigned long rhs) ::InterlockedExchange (const_cast (reinterpret_cast (&this->value_)), rhs); #elif defined (ACE_HAS_VXATOMICLIB) ::vxAtomicSet (reinterpret_cast (const_cast (reinterpret_cast (&this->value_))), rhs); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - ::atomic_swap_ulong (&this->value_, rhs); #else /* WIN32 */ (*exchange_fn_) (reinterpret_cast (&this->value_), rhs); #endif /* WIN32 */ @@ -378,8 +350,6 @@ ACE_Atomic_Op::operator= ( ::InterlockedExchange (const_cast (reinterpret_cast (&this->value_)), rhs.value_); #elif defined (ACE_HAS_VXATOMICLIB) ::vxAtomicSet (reinterpret_cast (const_cast (reinterpret_cast (&this->value_))), rhs.value_); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - ::atomic_swap_ulong (&this->value_, rhs.value_); #else /* WIN32 */ (*exchange_fn_) (reinterpret_cast (&this->value_), rhs.value_); #endif /* WIN32 */ @@ -395,8 +365,6 @@ ACE_Atomic_Op::exchange (unsigned long newval) return ::InterlockedExchange (const_cast (reinterpret_cast (&this->value_)), newval); #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicSet (reinterpret_cast (const_cast (reinterpret_cast (&this->value_))), newval); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_swap_ulong (&this->value_, newval); #else /* WIN32 */ return (*exchange_fn_) (reinterpret_cast (&this->value_), newval); #endif /* WIN32 */ @@ -409,7 +377,7 @@ ACE_Atomic_Op::value () const } ACE_INLINE volatile unsigned long & -ACE_Atomic_Op::value_i (void) +ACE_Atomic_Op::value_i () { return this->value_; } diff --git a/ACE/ace/Atomic_Op_GCC_T.h b/ACE/ace/Atomic_Op_GCC_T.h index 13d363163ea2f..751387f9ce777 100644 --- a/ACE/ace/Atomic_Op_GCC_T.h +++ b/ACE/ace/Atomic_Op_GCC_T.h @@ -120,14 +120,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Atomic_Op_GCC_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Atomic_Op_GCC_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Atomic_Op_GCC_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* ACE_HAS_GCC_ATOMIC_BUILTINS */ diff --git a/ACE/ace/Atomic_Op_Sparc.c b/ACE/ace/Atomic_Op_Sparc.c deleted file mode 100644 index 9e59864ae8a06..0000000000000 --- a/ACE/ace/Atomic_Op_Sparc.c +++ /dev/null @@ -1,187 +0,0 @@ -/* - * - * This is a C file for a reason. The Sun C++ compiler does not accept - * inline assembler. - * - * Portions of this code are based on atomic operations found in the - * linux kernel source code. - */ - -#if defined (ACE_INCLUDE_ATOMIC_OP_SPARC) - -#if defined(__i386) && defined(__SUNPRO_C) -static void -__sunpro_asm_code() { - __asm("\n\ - .globl ace_atomic_add_long \n\ - .type ace_atomic_add_long,@function \n\ - .align 4 \n\ -ace_atomic_add_long: \n\ - movl 0x00000004(%esp), %edx \n\ - movl 0x00000008(%esp), %eax \n\ - lock; xadd %eax, (%edx) \n\ - addl 0x00000008(%esp), %eax \n\ - ret \n\ - "); - - __asm("\n\ - .globl ace_atomic_swap_long \n\ - .type ace_atomic_swap_long,@function \n\ - .align 4 \n\ -ace_atomic_swap_long: \n\ - movl 0x00000004(%esp), %edx \n\ - movl 0x00000008(%esp), %eax \n\ - xchg %eax, (%edx) \n\ - ret \n\ - "); - - __asm("\n\ - .globl ace_atomic_swap_add_long \n\ - .type ace_atomic_swap_add_long,@function \n\ - .align 4 \n\ -ace_atomic_swap_add_long: \n\ - movl 0x00000004(%esp), %edx \n\ - movl 0x00000008(%esp), %eax \n\ - lock; xadd %eax, (%edx) \n\ - ret \n\ - "); -} - -#elif defined(__x86_64) && defined(__SUNPRO_C) - -static void -__sunpro_asm_code() { - __asm("\n\ - .globl ace_atomic_add_long \n\ - .type ace_atomic_add_long,@function \n\ - .align 16 \n\ -ace_atomic_add_long: \n\ - movq %rsi, %rax \n\ - lock; xaddq %rax, (%rdi) \n\ - addq %rsi, %rax \n\ - ret \n\ - "); - - __asm("\n\ - .globl ace_atomic_swap_long \n\ - .type ace_atomic_swap_long,@function \n\ - .align 16 \n\ -ace_atomic_swap_long: \n\ - xchgq %rsi, (%rdi) \n\ - movq %rsi, %rax \n\ - ret \n\ - "); - - __asm("\n\ - .globl ace_atomic_swap_add_long \n\ - .type ace_atomic_swap_add_long,@function \n\ - .align 16 \n\ -ace_atomic_swap_add_long: \n\ - lock; xaddq %rsi, (%rdi) \n\ - movq %rsi, %rax \n\ - ret \n\ - "); -} - -#elif defined (__sparcv9) - -unsigned long -ace_atomic_add_long (volatile unsigned long *dest, long rhs) -{ - __asm ("restore\n" - "ldx [%o0], %o2\n" - ".again_add:\n" - "add %o2, %o1, %o3\n" - "casx [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %xcc, .again_add\n" - "mov %o3, %o2\n" - "retl\n" - "add %o2, %o1, %o0\n"); -} - -unsigned long -ace_atomic_swap_long (volatile unsigned long *dest, unsigned long rhs) -{ - __asm ("restore\n" - "ldx [%o0], %o2\n" - ".again_swap:\n" - "mov %o1, %o3\n" - "casx [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %xcc, .again_swap\n" - "mov %o3, %o2\n" - "retl\n" - "mov %o3, %o0\n"); -} - -unsigned long -ace_atomic_swap_add_long (volatile unsigned long *dest, long rhs) -{ - __asm ("restore\n" - "ldx [%o0], %o2\n" - ".again_swap_add:\n" - "mov %o2, %o4\n" - "add %o2, %o1, %o3\n" - "casx [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %xcc, .again_swap_add\n" - "mov %o3, %o2\n" - "retl\n" - "mov %o4, %o0\n"); -} - -#else - -unsigned long -ace_atomic_add_long (volatile unsigned long *dest, long rhs) -{ - __asm ("restore\n" - "ld [%o0], %o2\n" - ".again_add:\n" - "add %o2, %o1, %o3\n" - "cas [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %icc, .again_add\n" - "mov %o3, %o2\n" - "retl\n" - "add %o2, %o1, %o0\n"); -} - -unsigned long -ace_atomic_swap_long (volatile unsigned long *dest, unsigned long rhs) -{ - __asm ("restore\n" - "ld [%o0], %o2\n" - ".again_swap:\n" - "mov %o1, %o3\n" - "cas [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %icc, .again_swap\n" - "mov %o3, %o2\n" - "retl\n" - "mov %o3, %o0\n"); -} - -unsigned long -ace_atomic_swap_add_long (volatile unsigned long *dest, long rhs) -{ - __asm ("restore\n" - "ld [%o0], %o2\n" - ".again_swap_add:\n" - "mov %o2, %o4\n" - "add %o2, %o1, %o3\n" - "cas [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %icc, .again_swap_add\n" - "mov %o3, %o2\n" - "retl\n" - "mov %o4, %o0\n"); -} - -# endif /* __sparcv9 */ - -#elif !defined (__GNUC__) && !defined (__INTEL_COMPILER) -/* Make compilers stop complaining about an empty translation unit */ -static int shut_up_compiler = 0; -#endif /* ACE_INCLUDE_ATOMIC_OP_SPARC */ diff --git a/ACE/ace/Atomic_Op_Sparc.h b/ACE/ace/Atomic_Op_Sparc.h deleted file mode 100644 index 3c4d883c2af44..0000000000000 --- a/ACE/ace/Atomic_Op_Sparc.h +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- C++ -*- */ -#ifndef ACE_ATOMIC_OP_SPARC_H -#define ACE_ATOMIC_OP_SPARC_H - -extern "C" -{ - unsigned long ace_atomic_add_long (volatile unsigned long *dest, long rhs); - unsigned long ace_atomic_swap_long (volatile unsigned long *dest, unsigned long rhs); - unsigned long ace_atomic_swap_add_long (volatile unsigned long *dest, long rhs); -} - -#endif /* ACE_ATOMIC_OP_SPARC_H */ diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h index 599ae7075b69d..e3752ccbd4cbc 100644 --- a/ACE/ace/Atomic_Op_T.h +++ b/ACE/ace/Atomic_Op_T.h @@ -344,13 +344,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Atomic_Op_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Atomic_Op_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Atomic_Op_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*ACE_ATOMIC_OP_T_H*/ diff --git a/ACE/ace/Auto_Event.h b/ACE/ace/Auto_Event.h index 324eb20ad25ab..c71e46c17be6e 100644 --- a/ACE/ace/Auto_Event.h +++ b/ACE/ace/Auto_Event.h @@ -92,13 +92,7 @@ class ACE_Auto_Event : ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Auto_Event.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Auto_Event.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_AUTO_EVENT_H */ diff --git a/ACE/ace/Auto_Functor.h b/ACE/ace/Auto_Functor.h index 7e75ae7b6a838..e64bcdf6bb315 100644 --- a/ACE/ace/Auto_Functor.h +++ b/ACE/ace/Auto_Functor.h @@ -46,10 +46,10 @@ struct Auto_Functor_Ref * * The functor is called in the destructor, and it must implement: * - * Functor() throw();
    - * Functor(Functor const &) throw();
    - * Functor & operator=(Functor const &) throw();
    - * void operator()(X * p) throw();
    + * Functor() noexcept;
    + * Functor(Functor const &) noexcept;
    + * Functor & operator=(Functor const &) noexcept;
    + * void operator()(X * p) noexcept;
    */ template class Auto_Functor @@ -60,48 +60,47 @@ class Auto_Functor /// Constructor explicit Auto_Functor (X * p = 0, - Functor functor = Functor()); // throw() + Functor functor = Functor()); // noexcept - Auto_Functor (Auto_Functor & rhs); // throw() + Auto_Functor (Auto_Functor & rhs); // noexcept - Auto_Functor& operator= (Auto_Functor & rhs); // throw() + Auto_Functor& operator= (Auto_Functor & rhs); // noexcept template - Auto_Functor(Auto_Functor& rhs); // throw() + Auto_Functor(Auto_Functor& rhs); // noexcept template - Auto_Functor& operator= (Auto_Functor& rhs); // throw() + Auto_Functor& operator= (Auto_Functor& rhs); // noexcept - ~Auto_Functor(); // throw() + ~Auto_Functor(); // noexcept - X & operator*() const; // throw() + X & operator*() const; // noexcept - X * operator->() const; // throw() + X * operator->() const; // noexcept - X * get(); // throw() + X * get(); // noexcept - X * release(); // throw() + X * release(); // noexcept - void reset (X * p = 0); // throw() + void reset (X * p = 0); // noexcept - void reset (X * p, Functor f); // throw() + void reset (X * p, Functor f); // noexcept - Functor const & functor() const; // throw() + Functor const & functor() const; // noexcept - Auto_Functor(Auto_Functor_Ref rhs); // throw() + Auto_Functor(Auto_Functor_Ref rhs); // noexcept - Auto_Functor & operator=(Auto_Functor_Ref rhs); // throw() + Auto_Functor & operator=(Auto_Functor_Ref rhs); // noexcept - template operator Auto_Functor_Ref(); // throw() + template operator Auto_Functor_Ref(); // noexcept - template operator Auto_Functor(); // throw() + template operator Auto_Functor(); // noexcept private: X * p_; Functor f_; }; - } // namespace ACE_Utils ACE_END_VERSIONED_NAMESPACE_DECL @@ -110,9 +109,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Auto_Functor.inl" #endif /* __ACE_INLINE__ */ -#if defined(ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/Auto_Functor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#include "ace/Auto_Functor.cpp" #include /**/ "ace/post.h" #endif /* ACE_AUTO_FUNCTOR_H*/ diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h index 78916c408c81c..afbde550e5195 100644 --- a/ACE/ace/Auto_IncDec_T.h +++ b/ACE/ace/Auto_IncDec_T.h @@ -42,7 +42,7 @@ class ACE_Auto_IncDec ACE_Auto_IncDec (ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter); /// Implicitly decrement the counter. - ~ACE_Auto_IncDec (void); + ~ACE_Auto_IncDec (); /// Dump the state of an object. void dump () const; @@ -65,13 +65,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Auto_IncDec_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Auto_IncDec_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Auto_IncDec_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Auto_IncDec_T.inl b/ACE/ace/Auto_IncDec_T.inl index cb214488861d3..1edcd2de2f08f 100644 --- a/ACE/ace/Auto_IncDec_T.inl +++ b/ACE/ace/Auto_IncDec_T.inl @@ -14,7 +14,7 @@ ACE_Auto_IncDec::ACE_Auto_IncDec // Implicitly and automatically decrement the counter. template ACE_INLINE -ACE_Auto_IncDec::~ACE_Auto_IncDec (void) +ACE_Auto_IncDec::~ACE_Auto_IncDec () { --this->counter_; } diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h index 01236ce8198ff..43b704e02bbf8 100644 --- a/ACE/ace/Auto_Ptr.h +++ b/ACE/ace/Auto_Ptr.h @@ -192,13 +192,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Auto_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Auto_Ptr.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if defined (_MSC_VER) // Restore the warning state to what it was before entry. diff --git a/ACE/ace/Base_Thread_Adapter.h b/ACE/ace/Base_Thread_Adapter.h index 5d9fc10ef2d1b..8a65e5726554e 100644 --- a/ACE/ace/Base_Thread_Adapter.h +++ b/ACE/ace/Base_Thread_Adapter.h @@ -99,7 +99,7 @@ class ACE_Export ACE_Base_Thread_Adapter #ifdef ACE_USES_GPROF /// Accessor to the itimer_ /// followed http://sam.zoy.org/writings/programming/gprof.html - struct itimerval* timerval (void); + struct itimerval* timerval (); #endif // ACE_USES_PROF /// Invoke the close_log_msg_hook, if it is present diff --git a/ACE/ace/Based_Pointer_Repository.h b/ACE/ace/Based_Pointer_Repository.h index ba0fa32fcf040..1b88fed51bf2d 100644 --- a/ACE/ace/Based_Pointer_Repository.h +++ b/ACE/ace/Based_Pointer_Repository.h @@ -41,8 +41,8 @@ class ACE_Export ACE_Based_Pointer_Repository public: // = Use ACE_Null_Mutex to allow locking while iterating. - ACE_Based_Pointer_Repository (void); - ~ACE_Based_Pointer_Repository (void); + ACE_Based_Pointer_Repository (); + ~ACE_Based_Pointer_Repository (); // = Search structure methods. /** diff --git a/ACE/ace/Based_Pointer_T.h b/ACE/ace/Based_Pointer_T.h index 902e90f2a361e..254371f305e87 100644 --- a/ACE/ace/Based_Pointer_T.h +++ b/ACE/ace/Based_Pointer_T.h @@ -176,13 +176,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Based_Pointer_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Based_Pointer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Based_Pointer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index fce2426fd5c1f..cccde07113f0f 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -266,12 +266,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL #else /* ! BYTE_ORDER && ! __BYTE_ORDER */ // We weren't explicitly told, so we have to figure it out . . . // Note that Itanium hardware (IA64) can run in either byte order. It's - // selected by the OS when loading; Windows runs little, HP-UX runs big. + // selected by the OS when loading; Windows runs little. # if defined (i386) || defined (__i386__) || defined (_M_IX86) || \ defined (vax) || defined (__LITTLE_ENDIAN__) || \ defined (ARM) || defined (_M_IA64) || defined (_M_AMD64) || \ defined (__amd64) || \ - ((defined (__ia64__) || defined (__ia64)) && !defined (__hpux)) + ((defined (__ia64__) || defined (__ia64))) // We know these are little endian. # define ACE_LITTLE_ENDIAN 0x0123 # define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h index 0464ef030dd5c..3b736a149420b 100644 --- a/ACE/ace/Bound_Ptr.h +++ b/ACE/ace/Bound_Ptr.h @@ -366,13 +366,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Bound_Ptr.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Bound_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Bound_Ptr.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp index 9fbc28b305f3c..f2213f379eb6a 100644 --- a/ACE/ace/CDR_Base.cpp +++ b/ACE/ace/CDR_Base.cpp @@ -811,7 +811,7 @@ ACE_CDR::Fixed ACE_CDR::Fixed::from_integer (ACE_CDR::ULongLong val) ACE_CDR::Fixed ACE_CDR::Fixed::from_floating (LongDouble val) { -#if defined ACE_OPENVMS || (defined ACE_VXWORKS && !defined __RTP__) +#if defined ACE_VXWORKS && !defined __RTP__ typedef double BigFloat; #elif defined NONNATIVE_LONGDOUBLE typedef LongDouble::NativeImpl BigFloat; diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h index 84085cf448274..2e2ce3bdf10c0 100644 --- a/ACE/ace/CDR_Base.h +++ b/ACE/ace/CDR_Base.h @@ -264,7 +264,7 @@ class ACE_Export ACE_CDR // VxWorks' compiler (gcc 2.96) gets confused by the operator long // double, so we avoid using long double as the NativeImpl. // Linux's x86 long double format (12 or 16 bytes) is incompatible - // with Windows, Solaris, AIX, MacOS X and HP-UX (and probably others) + // with Windows, and MacOS X (and probably others) // long double format (8 or 16 bytes). If you need 32-bit Linux to // inter-operate with 64-bit Linux you will want to define this // macro to 0 so that "long double" is used. Otherwise, do not define diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h index 8ad197b03acac..d29a1a3975d2e 100644 --- a/ACE/ace/CDR_Size.h +++ b/ACE/ace/CDR_Size.h @@ -48,7 +48,7 @@ class ACE_Export ACE_SizeCDR bool good_bit () const; /// Reset current size. - void reset (void); + void reset (); /// Return current size. size_t total_length () const; diff --git a/ACE/ace/CDR_Size.inl b/ACE/ace/CDR_Size.inl index 9a4e3fdeb7748..5d5edca3247ff 100644 --- a/ACE/ace/CDR_Size.inl +++ b/ACE/ace/CDR_Size.inl @@ -20,7 +20,7 @@ ACE_SizeCDR::good_bit () const } ACE_INLINE void -ACE_SizeCDR::reset (void) +ACE_SizeCDR::reset () { this->size_ = 0; } diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index 06bc14ad2dc7a..f30f3aa1fb599 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -1053,7 +1053,7 @@ ACE_OutputCDR::register_monitor (const char *id) } void -ACE_OutputCDR::unregister_monitor (void) +ACE_OutputCDR::unregister_monitor () { this->monitor_->remove_from_registry (); } @@ -1628,7 +1628,6 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x) if (this->read_wchar_array (x, len)) { - //Null character used by applications to find the end of //the wstring //Is this okay with the GIOP 1.2 spec?? @@ -2338,7 +2337,7 @@ ACE_InputCDR::register_monitor (const char *id) } void -ACE_InputCDR::unregister_monitor (void) +ACE_InputCDR::unregister_monitor () { this->monitor_->remove_from_registry (); } diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h index 506f92be91710..c1cd997330301 100644 --- a/ACE/ace/CDR_Stream.h +++ b/ACE/ace/CDR_Stream.h @@ -536,7 +536,7 @@ class ACE_Export ACE_OutputCDR #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) /// Register and unregister our buffer size monitor. void register_monitor (const char* id); - void unregister_monitor (void); + void unregister_monitor (); #endif /* ACE_HAS_MONITOR_POINTS==1 */ private: @@ -1086,11 +1086,10 @@ class ACE_Export ACE_InputCDR #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) /// Register and unregister our buffer size monitor. void register_monitor (const char* id); - void unregister_monitor (void); + void unregister_monitor (); #endif /* ACE_HAS_MONITOR_POINTS==1 */ protected: - /// The start of the chain of message blocks, even though in the /// current version the chain always has length 1. ACE_Message_Block start_; @@ -1371,7 +1370,6 @@ class ACE_Export ACE_WChar_Codeset_Translator ACE_CDR::Octet minor_version (ACE_InputCDR& input); ACE_CDR::Octet major_version (ACE_OutputCDR& output); ACE_CDR::Octet minor_version (ACE_OutputCDR& output); - }; // @@ These operators should not be inlined since they force SString.h diff --git a/ACE/ace/CE_Screen_Output.cpp b/ACE/ace/CE_Screen_Output.cpp deleted file mode 100644 index 8711f1e57c48f..0000000000000 --- a/ACE/ace/CE_Screen_Output.cpp +++ /dev/null @@ -1,156 +0,0 @@ -#include "ace/CE_Screen_Output.h" -#if defined (ACE_HAS_WINCE) - -#include "ace/Log_Category.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_CE_Screen_Output::ACE_CE_Screen_Output(HWND hEdit) -: handler_(hEdit) -, pFile_(0) -{ -} - -ACE_CE_Screen_Output::ACE_CE_Screen_Output() -: handler_(0) -, pFile_(0) -{ -} - -ACE_CE_Screen_Output::~ACE_CE_Screen_Output() -{ - if (pFile_ != 0) { - fclose(pFile_); - } -} - -void ACE_CE_Screen_Output::log(ACE_Log_Record &log_record) -{ - ACE_TCHAR verbose_msg[ACE_Log_Record::MAXVERBOSELOGMSGLEN]; - int result = log_record.format_msg (ACE_TEXT("WindozeCE"), // host name - 0, // verbose flag - verbose_msg); - - if (result == 0) - { - verbose_msg[ ACE_OS::strlen(verbose_msg) - 1 ] = 0; // CE does not like '\n' by itself. - *this << verbose_msg << endl; - } -} - -void ACE_CE_Screen_Output::SetOutputWindow(HWND hEdit) -{ - handler_ = hEdit; -} - -void ACE_CE_Screen_Output::clear() -{ - SetWindowText(handler_, 0); -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (ACE_TCHAR* output) -{ - int length = GetWindowTextLength(handler_); - SendMessage(handler_, EM_SETSEL, length, length); - SendMessage(handler_, EM_REPLACESEL, 0, (LPARAM)output); - - if (pFile_ != 0) - { - fwprintf(pFile_, L"%s", output); - } - - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_TCHAR* output) -{ - ACE_TCHAR* buffer = ACE_OS::strdup(output); - if (buffer != 0) - { - *this << buffer; - delete buffer; - } - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (ACE_ANTI_TCHAR* output) -{ - *this << ACE_TEXT_CHAR_TO_TCHAR(output); - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_ANTI_TCHAR* output) -{ - *this << ACE_TEXT_CHAR_TO_TCHAR(output); - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (char output) -{ - *this << (int)output; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned char output) -{ - *this << (int)output; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned short output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_TEXT("%u"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (int output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_TEXT("%d"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned int output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_TEXT("%du"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (float output) -{ - ACE_TCHAR buffer[20]; - swprintf(buffer, ACE_TEXT("%f"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (long output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_TEXT("%l"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned long output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_TEXT("%lu"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (FILE* pFile) -{ - pFile_ = pFile; - return *this; -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif // ACE_HAS_WINCE diff --git a/ACE/ace/CE_Screen_Output.h b/ACE/ace/CE_Screen_Output.h deleted file mode 100644 index f2497487d427a..0000000000000 --- a/ACE/ace/CE_Screen_Output.h +++ /dev/null @@ -1,104 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CE_Screen_Output.h - * - * @author Si Mong Park - */ -//============================================================================= - -#ifndef ACE_CE_SCREEN_OUTPUT_H -#define ACE_CE_SCREEN_OUTPUT_H - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_WINCE) - -#include "ace/Log_Msg_Callback.h" -#include "ace/Log_Record.h" - -namespace -{ - const ACE_TCHAR endl[] = ACE_TEXT("\r\n"); - const ACE_TCHAR tab[] = ACE_TEXT("\t"); -} - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class ACE_CE_Screen_Output - * - * @brief Replacement of text output for Windows CE. - * - * This class allows standard text output to be displayed on - * text window for Windows CE. Generally, all ACE output will - * go through under CE if and only if user uses Windows CE - * implementation by using main_ce instead of main. - * Also, for the easier debugging purpose, object pointer of - * this class can be gotten from ACE_Log_Msg::msg_callback() - * and then can be used directly by user just like cout stream. - */ -class ACE_Export ACE_CE_Screen_Output : public ACE_Log_Msg_Callback -{ -public: - ACE_CE_Screen_Output (HWND hEdit); - - ACE_CE_Screen_Output (void); - - virtual ~ACE_CE_Screen_Output(); - - /// Implementation of pure virtual function from ACE_Log_Msg_Callback. - virtual void log (ACE_Log_Record &log_record); - - /// Interface to specify active window handle. - void SetOutputWindow (HWND hWnd); - - void clear (void); - - /// Stream insertion operator that performs actual print out. - /** - * @note This is the only one operator that performs output. All - * other perators convert the type and use this operator - * underneath. - */ - ACE_CE_Screen_Output& operator << (ACE_TCHAR*); - ACE_CE_Screen_Output& operator << (const ACE_TCHAR*); - - ACE_CE_Screen_Output& operator << (ACE_ANTI_TCHAR* output); - ACE_CE_Screen_Output& operator << (const ACE_ANTI_TCHAR* output); - - ACE_CE_Screen_Output& operator << (char output); - ACE_CE_Screen_Output& operator << (unsigned char output); - - ACE_CE_Screen_Output& operator << (unsigned short output); - - ACE_CE_Screen_Output& operator << (int output); - ACE_CE_Screen_Output& operator << (unsigned int output); - - ACE_CE_Screen_Output& operator << (float output); - - ACE_CE_Screen_Output& operator << (long output); - ACE_CE_Screen_Output& operator << (unsigned long output); - - ACE_CE_Screen_Output& operator << (FILE* pFile); - -private: - ACE_CE_Screen_Output (ACE_CE_Screen_Output&); - -private: - HWND handler_; - - /// FILE pointer that used to save output to file. This class does - /// not own the file handler pointer. - FILE* pFile_; -}; - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif // ACE_HAS_WINCE -#endif // ACE_CE_SCREEN_OUTPUT_H diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp index b1abcdb19a429..229b982ac9613 100644 --- a/ACE/ace/Cache_Map_Manager_T.cpp +++ b/ACE/ace/Cache_Map_Manager_T.cpp @@ -30,11 +30,10 @@ ACE_Cache_Map_Manager -ACE_Cache_Map_Manager::~ACE_Cache_Map_Manager (void) +ACE_Cache_Map_Manager::~ACE_Cache_Map_Manager () { this->close (); } @@ -48,7 +47,7 @@ ACE_Cache_Map_Manager int -ACE_Cache_Map_Manager::close (void) +ACE_Cache_Map_Manager::close () { return this->map_.close (); } @@ -68,19 +67,16 @@ ACE_Cache_Map_Managercaching_strategy_.notify_bind (bind_result, cache_value.second); if (result == -1) { - this->map_.unbind (key); // Unless the notification goes thru the bind operation is // not complete. bind_result = -1; - } } @@ -101,13 +97,11 @@ ACE_Cache_Map_Managercaching_strategy_.notify_rebind (rebind_result, cache_value.second ()); if (result == -1) { - // Make sure the unbind operation is done only when the // notification fails after a bind which is denoted by // rebind_result = 0 @@ -117,7 +111,6 @@ ACE_Cache_Map_Managercaching_strategy_.notify_rebind (rebind_result, cache_value.second ()); if (result == -1) { - // Make sure the unbind operation is done only when the // notification fails after a bind which is denoted by // rebind_result = 0 @@ -159,13 +150,10 @@ ACE_Cache_Map_Managercaching_strategy_.notify_rebind (rebind_result, cache_value.second ()); if (result == -1) { - // Make sure the unbind operation is done only when the // notification fails after a bind which is denoted by // rebind_result = 0 @@ -208,13 +194,10 @@ ACE_Cache_Map_Managercaching_strategy_.notify_trybind (trybind_result, cache_value.second ()); if (result == -1) { - // If the entry has got inserted into the map, it is removed // due to failure. if (trybind_result == 0) this->map_.unbind (key); trybind_result = -1; - } else { - // If an attempt is made to bind an existing entry the value // is overwritten with the value from the map. if (trybind_result == 1) value = cache_value.first (); - } } @@ -276,7 +254,6 @@ ACE_Cache_Map_Managercaching_strategy_.notify_find (find_result, cache_value.second); @@ -286,7 +263,6 @@ ACE_Cache_Map_Manager has now changed after the // notification, we need to bind to the map again. int rebind_result = this->map_.rebind (key, @@ -295,7 +271,6 @@ ACE_Cache_Map_Managercaching_strategy_.notify_find (find_result, cache_value.second); @@ -324,7 +298,6 @@ ACE_Cache_Map_Manager has now changed after the // notification, we need to bind to the map again. int rebind_result = this->map_.rebind (key, @@ -332,7 +305,6 @@ ACE_Cache_Map_Managercaching_strategy_.notify_unbind (unbind_result, cache_value.second); if (result == -1) unbind_result = -1; - } return unbind_result; @@ -376,7 +346,6 @@ ACE_Cache_Map_Managercaching_strategy_.notify_unbind (unbind_result, cache_value.second ()); @@ -384,7 +353,6 @@ ACE_Cache_Map_Manager and release dynamically allocated /// resources. - virtual ~ACE_Cache_Map_Manager (void); + virtual ~ACE_Cache_Map_Manager (); /// Initialize a cache with size @a length. int open (size_t length = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = nullptr); /// Close down a cache and release dynamically allocated resources. - int close (void); + int close (); /** * Associate @a key with @a value. If @a key is already in the CMAP_TYPE @@ -187,7 +187,7 @@ class ACE_Cache_Map_Manager VALUE &value); /// Remove entries from the cache depending upon the strategy. - int purge (void); + int purge (); /// Return the current size of the cache. size_t current_size () const; @@ -201,24 +201,23 @@ class ACE_Cache_Map_Manager // = STL styled iterator factory functions. /// Return forward iterator. - ITERATOR begin (void); - ITERATOR end (void); + ITERATOR begin (); + ITERATOR end (); /// Return reverse iterator. - REVERSE_ITERATOR rbegin (void); - REVERSE_ITERATOR rend (void); + REVERSE_ITERATOR rbegin (); + REVERSE_ITERATOR rend (); /// The map managed by the Cache_Map_Manager. - CMAP_TYPE &map (void); + CMAP_TYPE &map (); /// The caching strategy used on the cache. - CACHING_STRATEGY &caching_strategy (void); + CACHING_STRATEGY &caching_strategy (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; protected: - /// The underlying map which needs to be cached. CMAP_TYPE map_; @@ -279,20 +278,20 @@ class ACE_Cache_Map_Iterator // = STL styled iteration, compare, and reference functions. /// Prefix advance - ACE_Cache_Map_Iterator &operator++ (void); + ACE_Cache_Map_Iterator &operator++ (); /// Postfix advance. ACE_Cache_Map_Iterator operator++ (int); /// Prefix reverse. - ACE_Cache_Map_Iterator &operator-- (void); + ACE_Cache_Map_Iterator &operator-- (); /// Postfix reverse. ACE_Cache_Map_Iterator operator-- (int); /// Returns the iterator of the internal map in the custody of the /// Cache_Map_Manager. - IMPLEMENTATION &iterator_implementation (void); + IMPLEMENTATION &iterator_implementation (); /// Dump the state of an object. void dump () const; @@ -352,20 +351,20 @@ class ACE_Cache_Map_Reverse_Iterator // = STL styled iteration, compare, and reference functions. /// Prefix advance - ACE_Cache_Map_Reverse_Iterator &operator++ (void); + ACE_Cache_Map_Reverse_Iterator &operator++ (); /// Postfix advance. ACE_Cache_Map_Reverse_Iterator operator++ (int); /// Prefix reverse. - ACE_Cache_Map_Reverse_Iterator &operator-- (void); + ACE_Cache_Map_Reverse_Iterator &operator-- (); /// Postfix reverse. ACE_Cache_Map_Reverse_Iterator operator-- (int); /// Returns the iterator of the internal map in the custody of the /// Cache_Map_Manager. - REVERSE_IMPLEMENTATION &iterator_implementation (void); + REVERSE_IMPLEMENTATION &iterator_implementation (); /// Dump the state of an object. void dump () const; @@ -385,13 +384,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Cache_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Cache_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cache_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Cache_Map_Manager_T.inl b/ACE/ace/Cache_Map_Manager_T.inl index 03faeec5c1aef..04a6be2bfef74 100644 --- a/ACE/ace/Cache_Map_Manager_T.inl +++ b/ACE/ace/Cache_Map_Manager_T.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_INLINE int -ACE_Cache_Map_Manager::purge (void) +ACE_Cache_Map_Manager::purge () { return this->caching_strategy ().caching_utility ().clear_cache (this->map_, this->caching_strategy ().purge_percent ()); @@ -22,36 +22,36 @@ ACE_Cache_Map_Manager ACE_INLINE CMAP_TYPE & -ACE_Cache_Map_Manager::map (void) +ACE_Cache_Map_Manager::map () { return this->map_; } template ACE_INLINE CACHING_STRATEGY & -ACE_Cache_Map_Manager::caching_strategy (void) +ACE_Cache_Map_Manager::caching_strategy () { return this->caching_strategy_; } template ACE_INLINE ACE_Cache_Map_Iterator -ACE_Cache_Map_Manager::begin (void) +ACE_Cache_Map_Manager::begin () { return ITERATOR (this->map_.begin ()); } template ACE_INLINE ACE_Cache_Map_Iterator -ACE_Cache_Map_Manager::end (void) +ACE_Cache_Map_Manager::end () { return ITERATOR (this->map_.end ()); } template ACE_INLINE ACE_Cache_Map_Reverse_Iterator -ACE_Cache_Map_Manager::rbegin (void) +ACE_Cache_Map_Manager::rbegin () { return REVERSE_ITERATOR (this->map_.rbegin ()); } template ACE_INLINE ACE_Cache_Map_Reverse_Iterator -ACE_Cache_Map_Manager::rend (void) +ACE_Cache_Map_Manager::rend () { return REVERSE_ITERATOR (this->map_.rend ()); } @@ -93,7 +93,7 @@ ACE_Cache_Map_Iterator template ACE_INLINE ACE_Cache_Map_Iterator & -ACE_Cache_Map_Iterator::operator++ (void) +ACE_Cache_Map_Iterator::operator++ () { ++this->iterator_implementation_; return *this; @@ -110,7 +110,7 @@ ACE_Cache_Map_Iterator template ACE_INLINE ACE_Cache_Map_Iterator & -ACE_Cache_Map_Iterator::operator-- (void) +ACE_Cache_Map_Iterator::operator-- () { --this->iterator_implementation_; return *this; @@ -140,7 +140,7 @@ ACE_Cache_Map_Iterator } template ACE_INLINE IMPLEMENTATION & -ACE_Cache_Map_Iterator::iterator_implementation (void) +ACE_Cache_Map_Iterator::iterator_implementation () { return this->iterator_implementation_; } @@ -182,7 +182,7 @@ ACE_Cache_Map_Reverse_Iterator ACE_INLINE ACE_Cache_Map_Reverse_Iterator & -ACE_Cache_Map_Reverse_Iterator::operator++ (void) +ACE_Cache_Map_Reverse_Iterator::operator++ () { ++this->reverse_iterator_implementation_; return *this; @@ -199,7 +199,7 @@ ACE_Cache_Map_Reverse_Iterator ACE_INLINE ACE_Cache_Map_Reverse_Iterator & -ACE_Cache_Map_Reverse_Iterator::operator-- (void) +ACE_Cache_Map_Reverse_Iterator::operator-- () { --this->reverse_iterator_implementation_; return *this; @@ -230,7 +230,7 @@ ACE_Cache_Map_Reverse_Iterator ACE_INLINE REVERSE_IMPLEMENTATION & -ACE_Cache_Map_Reverse_Iterator::iterator_implementation (void) +ACE_Cache_Map_Reverse_Iterator::iterator_implementation () { return this->reverse_iterator_implementation_; } diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp index 3e7a3782209fc..ee11f25d8ae7c 100644 --- a/ACE/ace/Cached_Connect_Strategy_T.cpp +++ b/ACE/ace/Cached_Connect_Strategy_T.cpp @@ -36,7 +36,7 @@ ACE_Cached_Connect_Strategy_Ex -ACE_Cached_Connect_Strategy_Ex::~ACE_Cached_Connect_Strategy_Ex (void) +ACE_Cached_Connect_Strategy_Ex::~ACE_Cached_Connect_Strategy_Ex () { cleanup (); } @@ -164,7 +164,6 @@ ACE_Cached_Connect_Strategy_Exclose () == -1) return -1; @@ -306,7 +305,6 @@ ACE_Cached_Connect_Strategy_Ex int -ACE_Cached_Connect_Strategy_Ex::purge_connections (void) +ACE_Cached_Connect_Strategy_Ex::purge_connections () { return this->connection_cache_.purge (); } template CACHING_STRATEGY & -ACE_Cached_Connect_Strategy_Ex::caching_strategy (void) +ACE_Cached_Connect_Strategy_Ex::caching_strategy () { return this->connection_cache_.caching_strategy (); } @@ -524,7 +522,7 @@ ACE_Cached_Connect_Strategy_Ex void -ACE_Cached_Connect_Strategy_Ex::cleanup (void) +ACE_Cached_Connect_Strategy_Ex::cleanup () { // Excluded other threads from changing the cache while we cleanup ACE_GUARD (MUTEX, ace_mon, *this->lock_); @@ -588,7 +586,6 @@ ACE_Bounded_Cached_Connect_Strategy > *&entry, int &found) { - REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr); // Try to find the address in the cache. Only if we don't find it diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h index ef2a0a8c33d6b..dd762faa2eb38 100644 --- a/ACE/ace/Cached_Connect_Strategy_T.h +++ b/ACE/ace/Cached_Connect_Strategy_T.h @@ -57,10 +57,10 @@ class ACE_Cached_Connect_Strategy_Ex int delete_lock = 0); /// Destructor - virtual ~ACE_Cached_Connect_Strategy_Ex (void); + virtual ~ACE_Cached_Connect_Strategy_Ex (); /// Explicit purging of connection entries from the connection cache. - virtual int purge_connections (void); + virtual int purge_connections (); /// Mark as closed (non-locking version). This is used during the cleanup of the /// connections purged. @@ -71,7 +71,7 @@ class ACE_Cached_Connect_Strategy_Ex * method had to be devised to avoid memory leaks and perform * cleanup of the . */ - void cleanup (void); + void cleanup (); // = Typedefs for managing the map typedef ACE_Refcounted_Hash_Recyclable @@ -100,7 +100,7 @@ class ACE_Cached_Connect_Strategy_Ex CCSBASE; // = Accessor. - CACHING_STRATEGY &caching_strategy (void); + CACHING_STRATEGY &caching_strategy (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -247,13 +247,7 @@ class ACE_Bounded_Cached_Connect_Strategy ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Cached_Connect_Strategy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cached_Connect_Strategy_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* CACHED_CONNECT_STRATEGY_T_H */ diff --git a/ACE/ace/Caching_Strategies_T.cpp b/ACE/ace/Caching_Strategies_T.cpp index 0cc25407a26e5..27d1827c5759f 100644 --- a/ACE/ace/Caching_Strategies_T.cpp +++ b/ACE/ace/Caching_Strategies_T.cpp @@ -15,14 +15,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template -ACE_Caching_Strategy::~ACE_Caching_Strategy (void) +ACE_Caching_Strategy::~ACE_Caching_Strategy () { } ////////////////////////////////////////////////////////////////////////////////// template -ACE_LRU_Caching_Strategy::ACE_LRU_Caching_Strategy (void) +ACE_LRU_Caching_Strategy::ACE_LRU_Caching_Strategy () : timer_ (0), purge_percent_ (10) { @@ -31,7 +31,7 @@ ACE_LRU_Caching_Strategy::ACE_LRU_Caching_Strategy //////////////////////////////////////////////////////////////////////////////////////////////// template -ACE_LFU_Caching_Strategy::ACE_LFU_Caching_Strategy (void) +ACE_LFU_Caching_Strategy::ACE_LFU_Caching_Strategy () : purge_percent_ (10) { } @@ -39,7 +39,7 @@ ACE_LFU_Caching_Strategy::ACE_LFU_Caching_Strategy //////////////////////////////////////////////////////////////////////////////////////////////// template -ACE_FIFO_Caching_Strategy::ACE_FIFO_Caching_Strategy (void) +ACE_FIFO_Caching_Strategy::ACE_FIFO_Caching_Strategy () : order_ (0), purge_percent_ (10) { diff --git a/ACE/ace/Caching_Strategies_T.h b/ACE/ace/Caching_Strategies_T.h index c46e30dd95762..8960ddd937b51 100644 --- a/ACE/ace/Caching_Strategies_T.h +++ b/ACE/ace/Caching_Strategies_T.h @@ -43,13 +43,13 @@ class ACE_Caching_Strategy { public: /// Destructor. - virtual ~ACE_Caching_Strategy (void); + virtual ~ACE_Caching_Strategy (); /// Accessor method for the timer attributes. - virtual ATTRIBUTES attributes (void) = 0; + virtual ATTRIBUTES attributes () = 0; /// Get the percentage of entries to purge. - virtual double purge_percent (void) = 0; + virtual double purge_percent () = 0; /// Set the percentage of entries to purge. virtual void purge_percent (double percentage) = 0; @@ -82,7 +82,7 @@ class ACE_Caching_Strategy const ATTRIBUTES &attr) = 0; /// Purge the cache. - virtual CACHING_UTILITY &caching_utility (void) = 0; + virtual CACHING_UTILITY &caching_utility () = 0; /// Dumps the state of the object. virtual void dump () const = 0; @@ -113,13 +113,13 @@ class ACE_Caching_Strategy_Adapter bool delete_implementation = false); /// Destructor. - ~ACE_Caching_Strategy_Adapter (void); + ~ACE_Caching_Strategy_Adapter (); /// Accessor method for the timer attributes. - ATTRIBUTES attributes (void); + ATTRIBUTES attributes (); /// Get the percentage of entries to purge. - double purge_percent (void); + double purge_percent (); /// Set the percentage of entries to purge. void purge_percent (double percentage); @@ -152,10 +152,10 @@ class ACE_Caching_Strategy_Adapter const ATTRIBUTES &attr); /// Accessor to the implementation. - IMPLEMENTATION &implementation (void); + IMPLEMENTATION &implementation (); /// Purge the cache. - CACHING_UTILITY &caching_utility (void); + CACHING_UTILITY &caching_utility (); /// Dumps the state of the object. void dump () const; @@ -209,15 +209,15 @@ class ACE_LRU_Caching_Strategy * in the cache which can be purged automagically and by default is * set to 10%. */ - ACE_LRU_Caching_Strategy (void); + ACE_LRU_Caching_Strategy (); // = Operations of the strategy. /// Accessor method for the timer attributes. - ATTRIBUTES attributes (void); + ATTRIBUTES attributes (); /// Get the percentage of entries to purge. - double purge_percent (void); + double purge_percent (); /// Set the percentage of entries to purge. void purge_percent (double percentage); @@ -251,7 +251,7 @@ class ACE_LRU_Caching_Strategy const ATTRIBUTES &attr); /// Purge the cache. - CACHING_UTILITY &caching_utility (void); + CACHING_UTILITY &caching_utility (); /// Dumps the state of the object. void dump () const; @@ -310,15 +310,15 @@ class ACE_LFU_Caching_Strategy * in the cache which can be purged automagically and by default is * set to 10%. */ - ACE_LFU_Caching_Strategy (void); + ACE_LFU_Caching_Strategy (); // = Strategy methods. /// Access the attributes. - ATTRIBUTES attributes (void); + ATTRIBUTES attributes (); /// Get the percentage of entries to purge. - double purge_percent (void); + double purge_percent (); /// Set the percentage of entries to purge. void purge_percent (double percentage); @@ -350,7 +350,7 @@ class ACE_LFU_Caching_Strategy const ATTRIBUTES &attr); /// Purge the cache. - CACHING_UTILITY &caching_utility (void); + CACHING_UTILITY &caching_utility (); /// Dumps the state of the object. void dump () const; @@ -402,15 +402,15 @@ class ACE_FIFO_Caching_Strategy * in the cache which can be purged automagically and by default is * set to 10%. */ - ACE_FIFO_Caching_Strategy (void); + ACE_FIFO_Caching_Strategy (); // = Strategy methods. /// Accessor method. - ATTRIBUTES attributes (void); + ATTRIBUTES attributes (); /// Get the percentage of entries to purge. - double purge_percent (void); + double purge_percent (); /// Set the percentage of entries to purge. void purge_percent (double percentage); @@ -441,7 +441,7 @@ class ACE_FIFO_Caching_Strategy const ATTRIBUTES &attr); /// Purge the cache. - CACHING_UTILITY &caching_utility (void); + CACHING_UTILITY &caching_utility (); /// Dumps the state of the object. void dump () const; @@ -484,10 +484,10 @@ class ACE_Null_Caching_Strategy // = Strategy methods. All are NO_OP methods!!! /// Accessor method. - ATTRIBUTES attributes (void); + ATTRIBUTES attributes (); /// Get the percentage of entries to purge. - double purge_percent (void); + double purge_percent (); /// Set the percentage of entries to purge. void purge_percent (double percentage); @@ -518,7 +518,7 @@ class ACE_Null_Caching_Strategy const ATTRIBUTES &attr); /// Purge the cache. - CACHING_UTILITY &caching_utility (void); + CACHING_UTILITY &caching_utility (); /// Dumps the state of the object. void dump () const; @@ -538,13 +538,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Caching_Strategies_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Caching_Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Caching_Strategies_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Caching_Strategies_T.inl b/ACE/ace/Caching_Strategies_T.inl index 68508f5e2988f..429b7cf23e9d4 100644 --- a/ACE/ace/Caching_Strategies_T.inl +++ b/ACE/ace/Caching_Strategies_T.inl @@ -21,7 +21,7 @@ ACE_Caching_Strategy_Adapter::ACE_C } template ACE_INLINE -ACE_Caching_Strategy_Adapter::~ACE_Caching_Strategy_Adapter (void) +ACE_Caching_Strategy_Adapter::~ACE_Caching_Strategy_Adapter () { if (this->delete_implementation_) { @@ -32,13 +32,13 @@ ACE_Caching_Strategy_Adapter::~ACE_ } template ACE_INLINE ATTRIBUTES -ACE_Caching_Strategy_Adapter::attributes (void) +ACE_Caching_Strategy_Adapter::attributes () { return this->implementation_->attributes (); } template ACE_INLINE double -ACE_Caching_Strategy_Adapter::purge_percent (void) +ACE_Caching_Strategy_Adapter::purge_percent () { return this->implementation_->purge_percent (); } @@ -90,13 +90,13 @@ ACE_Caching_Strategy_Adapter::notif } template ACE_INLINE IMPLEMENTATION & -ACE_Caching_Strategy_Adapter::implementation (void) +ACE_Caching_Strategy_Adapter::implementation () { return *this->implementation_; } template ACE_INLINE CACHING_UTILITY & -ACE_Caching_Strategy_Adapter::caching_utility (void) +ACE_Caching_Strategy_Adapter::caching_utility () { return this->implementation_->caching_utility (); } @@ -115,13 +115,13 @@ ACE_Caching_Strategy_Adapter::dump ////////////////////////////////////////////////////////////////////////////////// template ACE_INLINE ATTRIBUTES -ACE_LRU_Caching_Strategy::attributes (void) +ACE_LRU_Caching_Strategy::attributes () { return this->timer_; } template ACE_INLINE double -ACE_LRU_Caching_Strategy::purge_percent (void) +ACE_LRU_Caching_Strategy::purge_percent () { return this->purge_percent_; } @@ -185,7 +185,7 @@ ACE_LRU_Caching_Strategy::notify_rebind ( } template ACE_INLINE CACHING_UTILITY & -ACE_LRU_Caching_Strategy::caching_utility (void) +ACE_LRU_Caching_Strategy::caching_utility () { return this->caching_utility_; } @@ -205,13 +205,13 @@ ACE_LRU_Caching_Strategy::dump () const ////////////////////////////////////////////////////////////////////////////////// template ACE_INLINE ATTRIBUTES -ACE_LFU_Caching_Strategy::attributes (void) +ACE_LFU_Caching_Strategy::attributes () { return 0; } template ACE_INLINE double -ACE_LFU_Caching_Strategy::purge_percent (void) +ACE_LFU_Caching_Strategy::purge_percent () { return this->purge_percent_; } @@ -262,7 +262,7 @@ ACE_LFU_Caching_Strategy::notify_unbind (int result } template ACE_INLINE CACHING_UTILITY & -ACE_LFU_Caching_Strategy::caching_utility (void) +ACE_LFU_Caching_Strategy::caching_utility () { return this->caching_utility_; } @@ -281,13 +281,13 @@ ACE_LFU_Caching_Strategy::dump () const ////////////////////////////////////////////////////////////////////////////////////// template ACE_INLINE ATTRIBUTES -ACE_FIFO_Caching_Strategy::attributes (void) +ACE_FIFO_Caching_Strategy::attributes () { return this->order_; } template ACE_INLINE double -ACE_FIFO_Caching_Strategy::purge_percent (void) +ACE_FIFO_Caching_Strategy::purge_percent () { return this->purge_percent_; } @@ -350,7 +350,7 @@ ACE_FIFO_Caching_Strategy::notify_rebind (int resul } template ACE_INLINE CACHING_UTILITY & -ACE_FIFO_Caching_Strategy::caching_utility (void) +ACE_FIFO_Caching_Strategy::caching_utility () { return this->caching_utility_; } @@ -370,13 +370,13 @@ ACE_FIFO_Caching_Strategy::dump () const ////////////////////////////////////////////////////////////////////////////////// template ACE_INLINE ATTRIBUTES -ACE_Null_Caching_Strategy::attributes (void) +ACE_Null_Caching_Strategy::attributes () { return 0; } template ACE_INLINE double -ACE_Null_Caching_Strategy::purge_percent (void) +ACE_Null_Caching_Strategy::purge_percent () { return 0; } @@ -433,7 +433,7 @@ ACE_Null_Caching_Strategy::notify_rebind (int resul } template ACE_INLINE CACHING_UTILITY & -ACE_Null_Caching_Strategy::caching_utility (void) +ACE_Null_Caching_Strategy::caching_utility () { return this->caching_utility_; } diff --git a/ACE/ace/Caching_Utility_T.cpp b/ACE/ace/Caching_Utility_T.cpp index aa344562d865d..2f0ea2c295a07 100644 --- a/ACE/ace/Caching_Utility_T.cpp +++ b/ACE/ace/Caching_Utility_T.cpp @@ -31,7 +31,7 @@ ACE_Pair_Caching_Utility::ACE_Pair_ } template -ACE_Pair_Caching_Utility::~ACE_Pair_Caching_Utility (void) +ACE_Pair_Caching_Utility::~ACE_Pair_Caching_Utility () { if (this->delete_cleanup_strategy_) delete this->cleanup_strategy_; @@ -79,7 +79,6 @@ ACE_Pair_Caching_Utility::clear_cac key_to_remove, value_to_remove) == -1) return -1; - } return 0; @@ -130,7 +129,7 @@ ACE_Recyclable_Handler_Caching_Utility -ACE_Recyclable_Handler_Caching_Utility::~ACE_Recyclable_Handler_Caching_Utility (void) +ACE_Recyclable_Handler_Caching_Utility::~ACE_Recyclable_Handler_Caching_Utility () { if (this->delete_cleanup_strategy_) delete this->cleanup_strategy_; @@ -250,7 +249,7 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utility -ACE_Refcounted_Recyclable_Handler_Caching_Utility::~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void) +ACE_Refcounted_Recyclable_Handler_Caching_Utility::~ACE_Refcounted_Recyclable_Handler_Caching_Utility () { if (this->delete_cleanup_strategy_) delete this->cleanup_strategy_; @@ -374,7 +373,7 @@ ACE_Handler_Caching_Utility::ACE_Ha } template -ACE_Handler_Caching_Utility::~ACE_Handler_Caching_Utility (void) +ACE_Handler_Caching_Utility::~ACE_Handler_Caching_Utility () { if (this->delete_cleanup_strategy_) delete this->cleanup_strategy_; @@ -467,7 +466,7 @@ ACE_Null_Caching_Utility::ACE_Null_ } template -ACE_Null_Caching_Utility::~ACE_Null_Caching_Utility (void) +ACE_Null_Caching_Utility::~ACE_Null_Caching_Utility () { if (this->delete_cleanup_strategy_) delete this->cleanup_strategy_; diff --git a/ACE/ace/Caching_Utility_T.h b/ACE/ace/Caching_Utility_T.h index ac046b9746266..66ba434c9dd8d 100644 --- a/ACE/ace/Caching_Utility_T.h +++ b/ACE/ace/Caching_Utility_T.h @@ -50,7 +50,7 @@ class ACE_Pair_Caching_Utility : private ACE_Copy_Disabled bool delete_cleanup_strategy = false); /// Destructor. - ~ACE_Pair_Caching_Utility (void); + ~ACE_Pair_Caching_Utility (); /** * Purge entries from the @a container. The Cleanup_Strategy will do the @@ -59,7 +59,6 @@ class ACE_Pair_Caching_Utility : private ACE_Copy_Disabled int clear_cache (CONTAINER &container, double purge_percent); protected: - /// Find the entry with minimum caching attributes. void minimum (CONTAINER &container, KEY *&key_to_remove, @@ -99,7 +98,7 @@ class ACE_Recyclable_Handler_Caching_Utility : private ACE_Copy_Disabled bool delete_cleanup_strategy = false); /// Destructor. - ~ACE_Recyclable_Handler_Caching_Utility (void); + ~ACE_Recyclable_Handler_Caching_Utility (); /** * Purge entries from the @a container. The Cleanup_Strategy will do @@ -110,7 +109,6 @@ class ACE_Recyclable_Handler_Caching_Utility : private ACE_Copy_Disabled double purge_percent); protected: - /// Find the entry with minimum caching attributes. void minimum (CONTAINER &container, KEY *&key_to_remove, @@ -150,7 +148,7 @@ class ACE_Refcounted_Recyclable_Handler_Caching_Utility : private ACE_Copy_Disab bool delete_cleanup_strategy = false); /// Destructor. - ~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void); + ~ACE_Refcounted_Recyclable_Handler_Caching_Utility (); /** * Purge entries from the @a container. The Cleanup_Strategy will do @@ -161,7 +159,6 @@ class ACE_Refcounted_Recyclable_Handler_Caching_Utility : private ACE_Copy_Disab double purge_percent); protected: - /// Find the entry with minimum caching attributes. void minimum (CONTAINER &container, KEY *&key_to_remove, @@ -207,7 +204,7 @@ class ACE_Handler_Caching_Utility : private ACE_Copy_Disabled bool delete_cleanup_strategy = false); /// Destructor. - ~ACE_Handler_Caching_Utility (void); + ~ACE_Handler_Caching_Utility (); /** * Purge entries from the @a container. The Cleanup_Strategy will do @@ -218,7 +215,6 @@ class ACE_Handler_Caching_Utility : private ACE_Copy_Disabled double purge_percent); protected: - /** * Find the entry with minimum caching attributes. This is handler * specific since this utility is to be used very specifically for @@ -261,7 +257,7 @@ class ACE_Null_Caching_Utility : private ACE_Copy_Disabled bool delete_cleanup_strategy = false); /// Destructor. - ~ACE_Null_Caching_Utility (void); + ~ACE_Null_Caching_Utility (); /** * Purge entries from the @a container. The Cleanup_Strategy will do @@ -272,7 +268,6 @@ class ACE_Null_Caching_Utility : private ACE_Copy_Disabled double purge_percent); protected: - /** * Find the entry with minimum caching attributes. This is handler * specific since this utility is to be used very specifically for @@ -293,13 +288,7 @@ class ACE_Null_Caching_Utility : private ACE_Copy_Disabled ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Caching_Utility_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Caching_Utility_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Capabilities.h b/ACE/ace/Capabilities.h index 96abff06465d4..a5364e4ac7ba5 100644 --- a/ACE/ace/Capabilities.h +++ b/ACE/ace/Capabilities.h @@ -135,10 +135,10 @@ class ACE_Export ACE_Capabilities typedef ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> CAPABILITIES_MAP; /// The Constructor - ACE_Capabilities (void); + ACE_Capabilities (); /// The Destructor - ~ACE_Capabilities(void); + ~ACE_Capabilities(); public: /// Get a string entry. @@ -172,7 +172,7 @@ class ACE_Export ACE_Capabilities int is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line); /// Reset the set of capabilities - void resetcaps (void); + void resetcaps (); private: /// This is the set of ACE_CapEntry. diff --git a/ACE/ace/Cleanup_Strategies_T.cpp b/ACE/ace/Cleanup_Strategies_T.cpp index 53cf0b876ac10..004b9c0c0a76d 100644 --- a/ACE/ace/Cleanup_Strategies_T.cpp +++ b/ACE/ace/Cleanup_Strategies_T.cpp @@ -12,7 +12,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL //////////////////////////////////////////////////////////////////////////// template -ACE_Cleanup_Strategy::~ACE_Cleanup_Strategy (void) +ACE_Cleanup_Strategy::~ACE_Cleanup_Strategy () { } @@ -72,7 +72,6 @@ ACE_Handler_Cleanup_Strategy::cleanup ( if (container.unbind (*key) == -1) return -1; - } return 0; diff --git a/ACE/ace/Cleanup_Strategies_T.h b/ACE/ace/Cleanup_Strategies_T.h index c90dd5c5a5b78..9ec2afcdb6e1b 100644 --- a/ACE/ace/Cleanup_Strategies_T.h +++ b/ACE/ace/Cleanup_Strategies_T.h @@ -37,7 +37,7 @@ class ACE_Cleanup_Strategy { public: /// Destructor. - virtual ~ACE_Cleanup_Strategy (void); + virtual ~ACE_Cleanup_Strategy (); /// The method which will do the cleanup of the entry in the container. virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value); @@ -130,13 +130,7 @@ class ACE_Null_Cleanup_Strategy : public ACE_Cleanup_Strategy 0) { - ACE_Byte cur_byte = *in_p++; switch (out_index ? run_count : 128U) { // BootStrap to 128 @@ -46,7 +44,6 @@ ACE_RLECompressor::compress(const void *in_ptr, // Fix problem where input exhaused but maybe compressing if (in_len ? cur_byte == *in_p : run_code) { - if (run_code) { // In Compression? out_p[out_base] = ACE_Byte(run_count++ | 0x80); continue; // Stay in Compression @@ -99,7 +96,6 @@ ACE_RLECompressor::decompress(const void *in_ptr, ACE_Byte *out_p = static_cast(out_ptr); if (in_p && out_p) while(in_len-- > 0) { - ACE_Byte cur_byte = *in_p++; ACE_UINT32 cpy_len = ACE_UINT32((cur_byte & ACE_CHAR_MAX) + 1); diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp index 3c16a20201f3d..539bdf1232b94 100644 --- a/ACE/ace/Condition_T.cpp +++ b/ACE/ace/Condition_T.cpp @@ -128,10 +128,9 @@ ACE_Condition::wait (MUTEX &mutex, } } -// Peform an "alertable" timed wait. If the argument ABSTIME == 0 -// then we do a regular cond_wait(), else we do a timed wait for up to -// ABSTIME using the Solaris cond_timedwait() function. - +/// Peform an "alertable" timed wait. If @a abstime == 0 +/// then we do a regular cond_wait(), else we do a timed wait for up to +/// @a abstime template int ACE_Condition::wait (const ACE_Time_Value *abstime) { diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h index 34523edb875dd..f70ea1dad136d 100644 --- a/ACE/ace/Condition_T.h +++ b/ACE/ace/Condition_T.h @@ -152,13 +152,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Condition_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Condition_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Condition_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_THREADS */ diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 43bd04c84f22a..56cb81fd8ea81 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -336,7 +336,6 @@ ACE_Configuration::operator== (const ACE_Configuration& rhs) const }// end else if values match. ++valueIndex; - }// end value while loop // look in the rhs for values not in this @@ -361,7 +360,6 @@ ACE_Configuration::operator== (const ACE_Configuration& rhs) const }// end else if sections match. ++sectionIndex; - }// end section while loop // Finally, make sure that there are no sections in rhs that do not @@ -419,7 +417,7 @@ ACE_Section_Key_Win32::ACE_Section_Key_Win32 (HKEY hKey) { } -ACE_Section_Key_Win32::~ACE_Section_Key_Win32 (void) +ACE_Section_Key_Win32::~ACE_Section_Key_Win32 () { ::RegCloseKey (hKey_); } @@ -451,7 +449,7 @@ ACE_Configuration_Win32Registry::ACE_Configuration_Win32Registry (HKEY hKey, u_l } -ACE_Configuration_Win32Registry::~ACE_Configuration_Win32Registry (void) +ACE_Configuration_Win32Registry::~ACE_Configuration_Win32Registry () { } @@ -968,11 +966,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, HKEY result = 0; // Make a copy of hKey int errnum; -#if defined (ACE_HAS_WINCE) - if ((errnum = RegOpenKeyEx (hKey, 0, 0, 0, &result)) != ERROR_SUCCESS) -#else if ((errnum = RegOpenKey (hKey, 0, &result)) != ERROR_SUCCESS) -#endif // ACE_HAS_WINCE { errno = errnum; return 0; @@ -996,17 +990,9 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, // Open the key HKEY subkey; -#if defined (ACE_HAS_WINCE) - if ((errnum = ACE_TEXT_RegOpenKeyEx (result, - temp, - 0, - 0, - &subkey)) != ERROR_SUCCESS) -#else if ((errnum = ACE_TEXT_RegOpenKey (result, temp, &subkey)) != ERROR_SUCCESS) -#endif // ACE_HAS_WINCE { // try creating it if (!create || (errnum = ACE_TEXT_RegCreateKeyEx (result, @@ -1158,7 +1144,6 @@ ACE_Configuration_Section_IntId::ACE_Configuration_Section_IntId (const ACE_Conf : value_hash_map_ (rhs.value_hash_map_), section_hash_map_ (rhs.section_hash_map_) { - } ACE_Configuration_Section_IntId::~ACE_Configuration_Section_IntId () @@ -1509,10 +1494,10 @@ ACE_Configuration_Heap::open_section (const ACE_Configuration_Section_Key& base, ) { // Create a substring from the current location until the new found separator - // Because ACE_TString works with the character length we need to keep in mind - // the size of a single character + // Because both separator and sub_section are ACE_TCHAR*, the character size is + // already taken into account. ACE_TString tsub_section (sub_section); - ACE_TString const simple_section = tsub_section.substring(0, (separator - sub_section) / sizeof (ACE_TCHAR)); + ACE_TString const simple_section = tsub_section.substring(0, separator - sub_section); int const ret_val = open_simple_section (result, simple_section.c_str(), create, result); if (ret_val) return ret_val; diff --git a/ACE/ace/Configuration.h b/ACE/ace/Configuration.h index 3565c27a9cfef..b9cb18204d98c 100644 --- a/ACE/ace/Configuration.h +++ b/ACE/ace/Configuration.h @@ -108,7 +108,7 @@ class ACE_Export ACE_Configuration_Section_Key ACE_Configuration_Section_Key (const ACE_Configuration_Section_Key &rhs); /// Destructor, decrements reference count on the referenced key. - ~ACE_Configuration_Section_Key (void); + ~ACE_Configuration_Section_Key (); /// Assignment operator, increments reference count for this object /// and decrements it on @a rhs. @@ -524,12 +524,11 @@ class ACE_Export ACE_Configuration_Win32Registry : public ACE_Configuration virtual bool operator!= (const ACE_Configuration_Win32Registry &rhs) const; protected: - /// Gets the HKEY for a configuration section int load_key (const ACE_Configuration_Section_Key& key, HKEY& hKey); // Not used - ACE_Configuration_Win32Registry (void); + ACE_Configuration_Win32Registry (); ACE_Configuration_Win32Registry (const ACE_Configuration_Win32Registry& rhs); ACE_Configuration_Win32Registry& operator= (const ACE_Configuration_Win32Registry& rhs); @@ -613,7 +612,7 @@ class ACE_Export ACE_Configuration_Value_IntId { public: /// Default constructor - ACE_Configuration_Value_IntId (void); + ACE_Configuration_Value_IntId (); /// String constructor, takes ownership of string explicit ACE_Configuration_Value_IntId (ACE_TCHAR* string); @@ -628,7 +627,7 @@ class ACE_Export ACE_Configuration_Value_IntId ACE_Configuration_Value_IntId (const ACE_Configuration_Value_IntId& rhs); /// Destructor - ~ACE_Configuration_Value_IntId (void); + ~ACE_Configuration_Value_IntId (); /// Assignment operator ACE_Configuration_Value_IntId& operator= ( @@ -674,7 +673,7 @@ class ACE_Export ACE_Configuration_Section_IntId { public: /// Default ctor - ACE_Configuration_Section_IntId (void); + ACE_Configuration_Section_IntId (); /// Named ctor ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map, @@ -684,7 +683,7 @@ class ACE_Export ACE_Configuration_Section_IntId ACE_Configuration_Section_IntId (const ACE_Configuration_Section_IntId& rhs); /// Destructor - ~ACE_Configuration_Section_IntId (void); + ~ACE_Configuration_Section_IntId (); /// Assignment operator ACE_Configuration_Section_IntId& operator= ( @@ -740,7 +739,7 @@ class ACE_Export ACE_Configuration_Section_Key_Heap protected: /// Destructor - will delete the iterators - virtual ~ACE_Configuration_Section_Key_Heap (void); + virtual ~ACE_Configuration_Section_Key_Heap (); // Not used ACE_Configuration_Section_Key_Heap (const ACE_Configuration_Section_Key_Heap& rhs); diff --git a/ACE/ace/Configuration_Import_Export.cpp b/ACE/ace/Configuration_Import_Export.cpp index 609159bffd8d3..d2b1d5767e3cc 100644 --- a/ACE/ace/Configuration_Import_Export.cpp +++ b/ACE/ace/Configuration_Import_Export.cpp @@ -673,7 +673,6 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, } default: return -3; - }// end switch on type line += ACE_TEXT ("\n"); @@ -699,7 +698,6 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, ++index; } return 0; - } // Method to squish leading and trailing whitespaces from a string. diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp index 0e64c23d5d7c1..4e7f83b36873c 100644 --- a/ACE/ace/Connector.cpp +++ b/ACE/ace/Connector.cpp @@ -44,21 +44,21 @@ ACE_NonBlocking_Connect_Handler::ACE_NonBlocking_Connect_Handler (A } template -ACE_NonBlocking_Connect_Handler::~ACE_NonBlocking_Connect_Handler (void) +ACE_NonBlocking_Connect_Handler::~ACE_NonBlocking_Connect_Handler () { if (this->cleanup_svc_handler_) this->cleanup_svc_handler_->remove_reference (); } template SVC_HANDLER * -ACE_NonBlocking_Connect_Handler::svc_handler (void) +ACE_NonBlocking_Connect_Handler::svc_handler () { ACE_TRACE ("ACE_NonBlocking_Connect_Handler::svc_handler"); return this->svc_handler_; } template long -ACE_NonBlocking_Connect_Handler::timer_id (void) +ACE_NonBlocking_Connect_Handler::timer_id () { ACE_TRACE ("ACE_NonBlocking_Connect_Handler::timer_id"); return this->timer_id_; @@ -213,7 +213,7 @@ ACE_NonBlocking_Connect_Handler::handle_exception (ACE_HANDLE h) } template int -ACE_NonBlocking_Connect_Handler::resume_handler (void) +ACE_NonBlocking_Connect_Handler::resume_handler () { return ACE_Event_Handler::ACE_EVENT_HANDLER_NOT_RESUMED; } @@ -612,7 +612,7 @@ ACE_Connector::nonblocking_connect } template -ACE_Connector::~ACE_Connector (void) +ACE_Connector::~ACE_Connector () { ACE_TRACE ("ACE_Connector::~ACE_Connector"); @@ -669,13 +669,13 @@ ACE_Connector::reactor () const } template ACE_Unbounded_Set & -ACE_Connector::non_blocking_handles (void) +ACE_Connector::non_blocking_handles () { return this->non_blocking_handles_; } template int -ACE_Connector::close (void) +ACE_Connector::close () { // If there are no non-blocking handle pending, return immediately. if (this->non_blocking_handles ().size () == 0) @@ -734,7 +734,7 @@ ACE_Connector::close (void) } template int -ACE_Connector::fini (void) +ACE_Connector::fini () { ACE_TRACE ("ACE_Connector::fini"); @@ -751,14 +751,14 @@ ACE_Connector::init (int, ACE_TCHAR *[]) } template int -ACE_Connector::suspend (void) +ACE_Connector::suspend () { ACE_TRACE ("ACE_Connector::suspend"); return -1; } template int -ACE_Connector::resume (void) +ACE_Connector::resume () { ACE_TRACE ("ACE_Connector::resume"); return -1; @@ -896,7 +896,7 @@ ACE_Strategy_Connector::ACE_Strategy_Connector } template -ACE_Strategy_Connector::~ACE_Strategy_Connector (void) +ACE_Strategy_Connector::~ACE_Strategy_Connector () { ACE_TRACE ("ACE_Strategy_Connector::~ACE_Strategy_Connector"); @@ -905,7 +905,7 @@ ACE_Strategy_Connector::~ACE_Strategy_Connector (vo } template int -ACE_Strategy_Connector::close (void) +ACE_Strategy_Connector::close () { if (this->delete_creation_strategy_) delete this->creation_strategy_; diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h index d611f9d6b9995..2903ad6a750dd 100644 --- a/ACE/ace/Connector.h +++ b/ACE/ace/Connector.h @@ -348,7 +348,7 @@ class ACE_Connector : public ACE_Connector_Base, public ACE_Service /// Return the handle set representing the non-blocking connects in /// progress. - ACE_Unbounded_Set &non_blocking_handles (void); + ACE_Unbounded_Set &non_blocking_handles (); // = Dynamic linking hooks. /// Default version does no work and returns -1. Must be overloaded @@ -463,10 +463,10 @@ class ACE_Strategy_Connector int flags = 0); /// Shutdown a connector and release resources. - virtual ~ACE_Strategy_Connector (void); + virtual ~ACE_Strategy_Connector (); /// Close down the Connector - virtual int close (void); + virtual int close (); // = Strategies accessors virtual ACE_Creation_Strategy *creation_strategy () const; @@ -564,13 +564,7 @@ class ACE_Strategy_Connector ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Connector.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp index 2c69a6b0c6e13..1b3b6b144bc27 100644 --- a/ACE/ace/Containers_T.cpp +++ b/ACE/ace/Containers_T.cpp @@ -1396,7 +1396,7 @@ ACE_Bounded_Set_Iterator::done () const { ACE_TRACE ("ACE_Bounded_Set_Iterator::done"); - return static_cast (this->next_) >= + return static_cast (this->next_) >= this->s_.cur_size_; } @@ -1604,7 +1604,6 @@ ACE_Ordered_MultiSet::find (const T &item, } - template void ACE_Ordered_MultiSet::reset () { diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h index 5cbbca05813c9..533a48924bb36 100644 --- a/ACE/ace/Containers_T.h +++ b/ACE/ace/Containers_T.h @@ -330,7 +330,6 @@ class ACE_DNode }; - /** * @class ACE_Unbounded_Stack * @@ -987,18 +986,6 @@ template class ACE_DLList_Reverse_Iterator; typedef ACE_Double_Linked_List ACE_DLList_Base; -//typedef ACE_Double_Linked_List_Iterator -// ACE_DLList_Iterator_Base; -//typedef ACE_Double_Linked_List_Reverse_Iterator -// ACE_DLList_Reverse_Iterator_Base; -//@@ These two typedefs (inherited from James Hu's original design) -// have been removed because Sun CC 4.2 had problems with it. I guess -// having the DLList_Iterators inheriting from a class which is -// actually a typedef leads to problems. #define'ing rather than -// typedef'ing worked, but as per Carlos's reccomendation, I'm just -// replacing all references to the base classes with their actual -// type. Matt Braun (6/15/99) - /** * @class ACE_DLList * @@ -1031,7 +1018,6 @@ class ACE_DLList : public ACE_DLList_Base * @name Queue-like insert and delete methods */ //@{ - /** * Insert pointer for a new item at the tail of the list. * @@ -1086,9 +1072,9 @@ class ACE_DLList : public ACE_DLList_Base * * @param the_allocator Allocator to use for allocating ACE_DLList_Node * objects that wrap T objects for inclusion in the - * list. If 0, ACE_Allocator::instance() is used. + * list. If nullptr, ACE_Allocator::instance() is used. */ - ACE_DLList (ACE_Allocator *the_allocator = 0); + ACE_DLList (ACE_Allocator *the_allocator = nullptr); /// Delegates to ACE_Double_Linked_List. ACE_DLList (const ACE_DLList &l); @@ -1102,9 +1088,9 @@ class ACE_DLList : public ACE_DLList_Base * @code ACE_DLList list; ... // insert dynamically allocated Items... - Item *p; - while ((p = list.delete_head()) != 0) - delete *p; + Item *p = nullptr; + while ((p = list.delete_head()) != nullptr) + delete p; @endcode */ ~ACE_DLList (); @@ -2021,13 +2007,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Containers_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Containers_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Containers_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Containers_T.inl b/ACE/ace/Containers_T.inl index 9ef0b04df29fd..117ec4dcc659c 100644 --- a/ACE/ace/Containers_T.inl +++ b/ACE/ace/Containers_T.inl @@ -154,9 +154,6 @@ ACE_Unbounded_Stack::size () const return this->cur_size_; } -// --- - - // --- template ACE_INLINE int @@ -245,10 +242,6 @@ ACE_Ordered_MultiSet_Iterator::dump () const #endif /* ACE_HAS_DUMP */ } - - -// -- - template ACE_INLINE int ACE_Ordered_MultiSet::is_empty () const { diff --git a/ACE/ace/Countdown_Time_T.h b/ACE/ace/Countdown_Time_T.h index d3817db8c44c5..86bbf224f7e9d 100644 --- a/ACE/ace/Countdown_Time_T.h +++ b/ACE/ace/Countdown_Time_T.h @@ -89,13 +89,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Countdown_Time_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Countdown_Time_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Countdown_Time_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* ACE_COUNTDOWN_TIME_T_H */ diff --git a/ACE/ace/DEV.h b/ACE/ace/DEV.h index c7940ff8dc5ef..16f9423796d6a 100644 --- a/ACE/ace/DEV.h +++ b/ACE/ace/DEV.h @@ -33,7 +33,7 @@ class ACE_Export ACE_DEV : public ACE_IO_SAP { public: /// Close down the DEVICE - int close (void); + int close (); /// Dump the state of an object. void dump () const; @@ -50,7 +50,7 @@ class ACE_Export ACE_DEV : public ACE_IO_SAP protected: /// Ensure that this class is an abstract base class - ACE_DEV (void); + ACE_DEV (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/DEV_Addr.h b/ACE/ace/DEV_Addr.h index 2609a3febc02e..8a22565a57052 100644 --- a/ACE/ace/DEV_Addr.h +++ b/ACE/ace/DEV_Addr.h @@ -32,7 +32,7 @@ class ACE_Export ACE_DEV_Addr : public ACE_Addr { public: /// Default constructor. - ACE_DEV_Addr (void); + ACE_DEV_Addr (); /// Copy constructor. ACE_DEV_Addr (const ACE_DEV_Addr &sa); diff --git a/ACE/ace/DEV_Connector.h b/ACE/ace/DEV_Connector.h index 6363cba6e15ba..123fb54dca7d9 100644 --- a/ACE/ace/DEV_Connector.h +++ b/ACE/ace/DEV_Connector.h @@ -31,7 +31,7 @@ class ACE_Export ACE_DEV_Connector { public: /// Default constructor. - ACE_DEV_Connector (void); + ACE_DEV_Connector (); /** * Actively connect and produce a @a new_io if things go well. diff --git a/ACE/ace/DEV_IO.h b/ACE/ace/DEV_IO.h index 8188daf4ea45a..06cbb39479f8e 100644 --- a/ACE/ace/DEV_IO.h +++ b/ACE/ace/DEV_IO.h @@ -41,7 +41,7 @@ class ACE_Export ACE_DEV_IO : public ACE_DEV friend class ACE_DEV_Connector; /// Default constructor. - ACE_DEV_IO (void); + ACE_DEV_IO (); // = Various send operations. /// send upto @a n bytes in @a buf. diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp index 7eddc0484feb9..ec1a2a0e1b2a5 100644 --- a/ACE/ace/DLL_Manager.cpp +++ b/ACE/ace/DLL_Manager.cpp @@ -123,44 +123,6 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, { if (this->open_i (name->c_str (), open_mode, errors)) break; - -#if defined (AIX) -# define SHR_O ACE_TEXT("(shr.o)") -# define SHR_O_LEN (sizeof (SHR_O) / sizeof(ACE_TCHAR) - 1) - // AIX often puts the shared library file (most often named - // shr.o) inside an archive library. If this is an archive - // library name, then try appending [shr.o] and retry. - if (ACE_TString::npos != name->strstr (ACE_TEXT (".a"))) - { - ACE_TCHAR aix_pathname[MAXPATHLEN + 1]; - if (name->length () + SHR_O_LEN <= MAXPATHLEN) - { - ACE_OS::strcpy (aix_pathname, name->c_str()); - ACE_OS::strcat (aix_pathname, SHR_O); - } - else - { - if (errors) - { - errors->push ("path is too long"); - } - - if (ACE::debug ()) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Handle::open: ") - ACE_TEXT ("('%s(shr.o)') is too long\n"), - name->c_str())); - } - - return -1; - } - open_mode |= RTLD_MEMBER; - - if (this->open_i (aix_pathname, open_mode, errors)) - break; - } -#endif /* AIX */ } if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) @@ -286,11 +248,7 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, bool ignore_errors, ACE_TStri // BTW. Handle lifecycle management is a little crazy in ACE if (this->handle_ != ACE_SHLIB_INVALID_HANDLE) { -#if defined (ACE_OPENVMS) - void *sym = ACE::ldsymbol (this->handle_, auto_name.get ()); -#else void *sym = ACE_OS::dlsym (this->handle_, auto_name.get ()); -#endif // Linux says that the symbol could be null and that it isn't an // error. So you should check the error message also, but since @@ -758,13 +716,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) void * const unload_policy_ptr = dll_handle->symbol (ACE_TEXT ("_get_dll_unload_policy"), 1); -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int const temp_p = - reinterpret_cast (unload_policy_ptr); -#else - intptr_t const temp_p = - reinterpret_cast (unload_policy_ptr); -#endif + intptr_t const temp_p = reinterpret_cast (unload_policy_ptr); dll_unload_policy const the_policy = reinterpret_cast (temp_p); diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h index 23a4150f20653..6adcc2ceaa8c5 100644 --- a/ACE/ace/DLL_Manager.h +++ b/ACE/ace/DLL_Manager.h @@ -271,13 +271,13 @@ class ACE_Export ACE_DLL_Manager ACE_DLL_Manager (int size = ACE_DLL_Manager::DEFAULT_SIZE); /// Destructor. - ~ACE_DLL_Manager (void); + ~ACE_DLL_Manager (); /// Allocate handle_vector_. int open (int size); /// Close all open dlls and deallocate memory. - int close (void); + int close (); /// Find dll in handle_vector_. ACE_DLL_Handle *find_dll (const ACE_TCHAR *dll_name) const; @@ -287,7 +287,7 @@ class ACE_Export ACE_DLL_Manager private: /// Close the singleton instance. - static void close_singleton (void); + static void close_singleton (); ACE_DLL_Manager (const ACE_DLL_Manager &) = delete; void operator= (const ACE_DLL_Manager &) = delete; @@ -314,7 +314,6 @@ class ACE_Export ACE_DLL_Manager /// Synchronization variable for the MT_SAFE Repository ACE_Thread_Mutex lock_; #endif /* ACE_MT_SAFE */ - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Date_Time.inl b/ACE/ace/Date_Time.inl index ef2a39b4d3ed2..25bb2e2e0db7f 100644 --- a/ACE/ace/Date_Time.inl +++ b/ACE/ace/Date_Time.inl @@ -9,22 +9,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void ACE_Date_Time::update (const ACE_Time_Value& timevalue) { -#if defined (ACE_HAS_WINCE) - // CE doesn't do localtime(). - FILETIME file_time = timevalue; - FILETIME local_file_time; - SYSTEMTIME sys_time; - ::FileTimeToLocalFileTime (&file_time, &local_file_time); - ::FileTimeToSystemTime (&local_file_time, &sys_time); - this->day_ = sys_time.wDay; - this->month_ = sys_time.wMonth; - this->year_ = sys_time.wYear; - this->hour_ = sys_time.wHour; - this->minute_ = sys_time.wMinute; - this->second_ = sys_time.wSecond; - this->microsec_ = sys_time.wMilliseconds * 1000; - this->wday_ = sys_time.wDayOfWeek; -#else time_t time = timevalue.sec (); struct tm tm_time; ACE_OS::localtime_r (&time, &tm_time); @@ -36,7 +20,6 @@ ACE_Date_Time::update (const ACE_Time_Value& timevalue) this->second_ = tm_time.tm_sec; this->microsec_ = timevalue.usec (); this->wday_ = tm_time.tm_wday; -#endif /* ACE_HAS_WINCE */ } ACE_INLINE void diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h index dc1f2e6de4093..26405b2bc2cec 100644 --- a/ACE/ace/Default_Constants.h +++ b/ACE/ace/Default_Constants.h @@ -397,7 +397,6 @@ * @name Default values to control CDR classes memory allocation strategies */ //@{ - /// Control the initial size of all CDR buffers, application /// developers may want to optimize this value to fit their request /// size diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 46c8ae9cc03ce..6ac5147328577 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -13,8 +13,6 @@ # if defined (ACE_HAS_DEV_POLL) # if defined (ACE_LINUX) # include /**/ -# elif defined (HPUX_VERS) && HPUX_VERS < 1123 -# include /**/ # else # include /**/ # endif /* ACE_LINUX */ @@ -1115,7 +1113,6 @@ ACE_Dev_Poll_Reactor::dispatch_notification_handlers ( int ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) { - // Dispatch a ready event. // Define bits to check for while dispatching. @@ -2336,27 +2333,9 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle, // cleared, we can un-control the fd now. if (!info->suspended || (info->controlled && new_mask == 0)) { - short const events = this->reactor_mask_to_poll_event (new_mask); -#if defined (sun) - // Apparently events cannot be updated on-the-fly on Solaris so - // remove the existing events, and then add the new ones. - struct pollfd pfd[2]; - - pfd[0].fd = handle; - pfd[0].events = POLLREMOVE; - pfd[0].revents = 0; - pfd[1].fd = (events == POLLREMOVE ? ACE_INVALID_HANDLE : handle); - pfd[1].events = events; - pfd[1].revents = 0; - - // Change the events associated with the given file descriptor. - if (ACE_OS::write (this->poll_fd_, - pfd, - sizeof (pfd)) != sizeof (pfd)) - return -1; -#elif defined (ACE_HAS_EVENT_POLL) +#if defined (ACE_HAS_EVENT_POLL) struct epoll_event epev; ACE_OS::memset (&epev, 0, sizeof (epev)); diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h index c75cbc8cba0ce..6b0d99b5e94b1 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -67,7 +67,7 @@ class ACE_Dev_Poll_Reactor_Notify : public ACE_Reactor_Notify { public: /// Constructor - ACE_Dev_Poll_Reactor_Notify (void); + ACE_Dev_Poll_Reactor_Notify (); /** * @name Initialization and Termination Methods @@ -78,7 +78,7 @@ class ACE_Dev_Poll_Reactor_Notify : public ACE_Reactor_Notify virtual int open (ACE_Reactor_Impl *, ACE_Timer_Queue *timer_queue = 0, int disable_notify = 0); - virtual int close (void); + virtual int close (); /** * Called by a thread when it wants to unblock the Reactor_Impl. @@ -107,7 +107,7 @@ class ACE_Dev_Poll_Reactor_Notify : public ACE_Reactor_Notify /// Returns the ACE_HANDLE of the notify pipe on which the reactor /// is listening for notifications so that other threads can unblock /// the Reactor_Impl. - virtual ACE_HANDLE notify_handle (void); + virtual ACE_HANDLE notify_handle (); /// Verify whether the buffer has dispatchable info or not. virtual int is_dispatchable (ACE_Notification_Buffer &buffer); @@ -142,7 +142,7 @@ class ACE_Dev_Poll_Reactor_Notify : public ACE_Reactor_Notify * passed in via the notify queue before breaking out of its event * loop. */ - virtual int max_notify_iterations (void); + virtual int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -167,7 +167,6 @@ class ACE_Dev_Poll_Reactor_Notify : public ACE_Reactor_Notify ACE_ALLOC_HOOK_DECLARE; protected: - /** * Keep a back pointer to the ACE_Dev_Poll_Reactor. If this value * if NULL then the ACE_Dev_Poll_Reactor has been initialized with @@ -252,7 +251,6 @@ typedef ACE_Reactor_Token_T ACE_Dev_Poll_Reactor_Token; class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl { - /** * @struct Event_Tuple * @@ -316,7 +314,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl { public: /// Constructor. - Handler_Repository (void); + Handler_Repository (); /// Initialize a repository that can map handles up to the value @a size. /// Since the event tuples are accessed directly using the handle as @@ -324,7 +322,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl int open (size_t size); /// Close down the repository. - int close (void); + int close (); /** * @name Repository Manipulation Operations @@ -332,7 +330,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * Methods used to search and modify the handler repository. */ //@{ - /// Return a pointer to the Event_Tuple associated with @a handle. /// If there is none associated, returns 0 and sets errno. Event_Tuple *find (ACE_HANDLE handle); @@ -349,7 +346,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl int unbind (ACE_HANDLE handle, bool decr_refcnt = true); /// Remove all the registered tuples. - int unbind_all (void); + int unbind_all (); //@} @@ -360,7 +357,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * underlying handler array. */ //@{ - // Check the @a handle to make sure it's a valid @c ACE_HANDLE that // within the range of legal handles (i.e., greater than or equal to // zero and less than @c max_size_). @@ -398,7 +394,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * an @c ACE_HANDLE value. This is Unix-specific. */ Event_Tuple *handlers_; - }; public: @@ -436,7 +431,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl int s_queue = ACE_DEV_POLL_TOKEN::FIFO); /// Close down and release all resources. - virtual ~ACE_Dev_Poll_Reactor (void); + virtual ~ACE_Dev_Poll_Reactor (); /// Initialization. virtual int open (size_t size, @@ -466,7 +461,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl virtual ACE_Timer_Queue *timer_queue () const; /// Close down and release all resources. - virtual int close (void); + virtual int close (); // = Event loop drivers. /** @@ -527,7 +522,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * non-zero, @c handle_events() and * @c handle_alertable_events() return -1 immediately. */ - virtual int deactivated (void); + virtual int deactivated (); /** * Control whether the Reactor will handle any more incoming events @@ -637,7 +632,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl virtual int suspend_handler (const ACE_Handle_Set &handles); /// Suspend all handles temporarily. - virtual int suspend_handlers (void); + virtual int suspend_handlers (); /// Resume event_handler. Use ACE_Event_Handler::get_handle() to /// get the handle. @@ -650,16 +645,16 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl virtual int resume_handler (const ACE_Handle_Set &handles); /// Resume all handles. - virtual int resume_handlers (void); + virtual int resume_handlers (); /// Does the reactor allow the application to resume the handle on /// its own, i.e., can it pass on the control of handle resumption to /// the application. - virtual int resumable_handler (void); + virtual int resumable_handler (); /// Return true if we any event associations were made by the reactor /// for the handles that it waits on, false otherwise. - virtual bool uses_event_associations (void); + virtual bool uses_event_associations (); // = Timer management. @@ -765,7 +760,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * via the notify queue before breaking out of its * ACE_Message_Queue::dequeue() loop. */ - virtual int max_notify_iterations (void); + virtual int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -800,17 +795,17 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl /// Returns true if Reactor has been successfully initialized, else /// false. - virtual bool initialized (void); + virtual bool initialized (); /// Returns the current size of the Reactor's internal descriptor /// table. virtual size_t size () const; /// Returns a reference to the Reactor's internal repository lock. - virtual ACE_Lock &lock (void); + virtual ACE_Lock &lock (); /// Wake up all threads waiting in the event loop. - virtual void wakeup_all_threads (void); + virtual void wakeup_all_threads (); /// Transfers ownership of Reactor_Impl to the @a new_owner. /** @@ -831,7 +826,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl virtual int owner (ACE_thread_t *owner); /// Get the existing restart value. - virtual bool restart (void); + virtual bool restart (); /// Set a new value for restart and return the original value. /** @@ -853,7 +848,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl /** * @note This is currently a no-op. */ - virtual int requeue_position (void); + virtual int requeue_position (); /** * @name Low-level wait_set mask manipulation methods @@ -865,7 +860,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * manipulated with these methods. */ //@{ - /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the /// event_handler and mask. /** @@ -892,7 +886,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * These methods are unimplemented. */ //@{ - /// GET/SET/ADD/CLR the ready "bit" bound with the event_handler /// and mask. virtual int ready_ops (ACE_Event_Handler *event_handler, @@ -913,7 +906,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl ACE_ALLOC_HOOK_DECLARE; protected: - class Token_Guard; /// Non-locking version of wait_pending(). @@ -1090,7 +1082,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl bool restart_; protected: - /** * @class Token_Guard * @@ -1105,14 +1096,14 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl /// Destructor. This will release the token if it hasn't been /// released till this point - ~Token_Guard (void); + ~Token_Guard (); /// Release the token .. - void release_token (void); + void release_token (); /// Returns whether the thread that created this object owns the /// token or not. - bool is_owner (void); + bool is_owner (); /// A helper method that acquires the token 1) at a low priority, and /// 2) wait quietly for the token, not waking another thread. This @@ -1171,11 +1162,11 @@ class ACE_Dev_Poll_Handler_Guard * The destructor decrements the reference count on the event * handler corresponding to the given handle. */ - ~ACE_Dev_Poll_Handler_Guard (void); + ~ACE_Dev_Poll_Handler_Guard (); /// Release the event handler from this guard; when the destructor is /// called, the handler's reference count will not be decremented. - void release (void); + void release (); private: /// The event handler being managed. diff --git a/ACE/ace/Dev_Poll_Reactor.inl b/ACE/ace/Dev_Poll_Reactor.inl index 8a0332eb4e179..33d3bb7c44aab 100644 --- a/ACE/ace/Dev_Poll_Reactor.inl +++ b/ACE/ace/Dev_Poll_Reactor.inl @@ -54,14 +54,14 @@ ACE_Dev_Poll_Handler_Guard::ACE_Dev_Poll_Handler_Guard } ACE_INLINE -ACE_Dev_Poll_Handler_Guard::~ACE_Dev_Poll_Handler_Guard (void) +ACE_Dev_Poll_Handler_Guard::~ACE_Dev_Poll_Handler_Guard () { if (this->refcounted_ && this->eh_ != 0) this->eh_->remove_reference (); } ACE_INLINE void -ACE_Dev_Poll_Handler_Guard::release (void) +ACE_Dev_Poll_Handler_Guard::release () { this->eh_ = 0; } @@ -102,7 +102,7 @@ ACE_Dev_Poll_Reactor::Token_Guard::Token_Guard (ACE_Dev_Poll_Reactor_Token &toke } ACE_INLINE -ACE_Dev_Poll_Reactor::Token_Guard::~Token_Guard (void) +ACE_Dev_Poll_Reactor::Token_Guard::~Token_Guard () { if (this->owner_) { @@ -112,7 +112,7 @@ ACE_Dev_Poll_Reactor::Token_Guard::~Token_Guard (void) } ACE_INLINE void -ACE_Dev_Poll_Reactor::Token_Guard::release_token (void) +ACE_Dev_Poll_Reactor::Token_Guard::release_token () { if (this->owner_) { @@ -124,7 +124,7 @@ ACE_Dev_Poll_Reactor::Token_Guard::release_token (void) } ACE_INLINE bool -ACE_Dev_Poll_Reactor::Token_Guard::is_owner (void) +ACE_Dev_Poll_Reactor::Token_Guard::is_owner () { return this->owner_; } diff --git a/ACE/ace/Dirent.h b/ACE/ace/Dirent.h index 02551013d07ab..9d57d4e983981 100644 --- a/ACE/ace/Dirent.h +++ b/ACE/ace/Dirent.h @@ -34,7 +34,7 @@ class ACE_Export ACE_Dirent { public: /// Default constructor. - ACE_Dirent (); + ACE_Dirent () = default; /// Constructor calls @c opendir() explicit ACE_Dirent (const ACE_TCHAR *dirname); @@ -98,7 +98,7 @@ class ACE_Export ACE_Dirent private: /// Pointer to the directory stream. - ACE_DIR *dirp_; + ACE_DIR *dirp_ {}; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Dirent.inl b/ACE/ace/Dirent.inl index 163954c712f73..46c290a4fb0db 100644 --- a/ACE/ace/Dirent.inl +++ b/ACE/ace/Dirent.inl @@ -8,30 +8,22 @@ ACE_Dirent::open (const ACE_TCHAR *dirname) { // If the directory stream is already open, close it to prevent // possible resource leaks. - - if (this->dirp_ != 0) + if (this->dirp_) { ACE_OS::closedir (this->dirp_); - this->dirp_ = 0; + this->dirp_ = nullptr; } this->dirp_ = ACE_OS::opendir (dirname); - if (this->dirp_ == 0) + if (!this->dirp_) return -1; else return 0; } -ACE_INLINE -ACE_Dirent::ACE_Dirent () - : dirp_ (0) -{ -} - ACE_INLINE ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname) - : dirp_ (0) { if (this->open (dirname) == -1) ACELIB_ERROR ((LM_ERROR, @@ -42,25 +34,25 @@ ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname) ACE_INLINE ACE_Dirent::~ACE_Dirent () { - if (this->dirp_ != 0) + if (this->dirp_) ACE_OS::closedir (this->dirp_); } ACE_INLINE ACE_DIRENT * ACE_Dirent::read () { - return this->dirp_ ? ACE_OS::readdir (this->dirp_) : 0; + return this->dirp_ ? ACE_OS::readdir (this->dirp_) : nullptr; } ACE_INLINE void ACE_Dirent::close () { - if (this->dirp_ != 0) + if (this->dirp_) { ACE_OS::closedir (this->dirp_); // Prevent double closure - this->dirp_ = 0; + this->dirp_ = nullptr; } } diff --git a/ACE/ace/Dirent_Selector.cpp b/ACE/ace/Dirent_Selector.cpp index 5d7279fde9e86..7591b0b00d4d0 100644 --- a/ACE/ace/Dirent_Selector.cpp +++ b/ACE/ace/Dirent_Selector.cpp @@ -13,14 +13,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// Construction/Destruction - -ACE_Dirent_Selector::ACE_Dirent_Selector () - : namelist_ (0), - n_ (0) -{ -} - ACE_Dirent_Selector::~ACE_Dirent_Selector () { // Free up any allocated resources. diff --git a/ACE/ace/Dirent_Selector.h b/ACE/ace/Dirent_Selector.h index a3622d557dd25..2751a53272ea8 100644 --- a/ACE/ace/Dirent_Selector.h +++ b/ACE/ace/Dirent_Selector.h @@ -35,7 +35,7 @@ class ACE_Export ACE_Dirent_Selector { public: /// Constructor - ACE_Dirent_Selector (); + ACE_Dirent_Selector () = default; /// Destructor. virtual ~ACE_Dirent_Selector (); @@ -57,10 +57,10 @@ class ACE_Export ACE_Dirent_Selector protected: /// Ptr to the namelist array. - ACE_DIRENT **namelist_; + ACE_DIRENT **namelist_ {}; /// Number of entries in the array. - int n_; + int n_ {}; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Dump.h b/ACE/ace/Dump.h index c07193a5b0bf5..1959f36f66232 100644 --- a/ACE/ace/Dump.h +++ b/ACE/ace/Dump.h @@ -115,7 +115,7 @@ class ACE_Export ACE_ODB /// Iterates through the entire set of registered objects and /// dumps their state. - void dump_objects (void); + void dump_objects (); /// Add the tuple to the list of registered ACE objects. void register_object (const ACE_Dumpable *dumper); @@ -125,12 +125,12 @@ class ACE_Export ACE_ODB void remove_object (const void *this_); /// Interface to the Singleton instance of the object database. - static ACE_ODB *instance (void); + static ACE_ODB *instance (); ACE_ALLOC_HOOK_DECLARE; private: - ACE_ODB (void); // Ensure we have a Singleton... + ACE_ODB (); // Ensure we have a Singleton... struct Tuple { @@ -147,7 +147,7 @@ class ACE_Export ACE_ODB /// and we'll have to check for that). const ACE_Dumpable_Ptr dumper_; - Tuple (void) : this_ (0), dumper_(0) {} + Tuple () : this_ (0), dumper_(0) {} }; /// Singleton instance of this class. diff --git a/ACE/ace/Dump_T.cpp b/ACE/ace/Dump_T.cpp index 240d2fbfc42ef..6d0bc56d0e00f 100644 --- a/ACE/ace/Dump_T.cpp +++ b/ACE/ace/Dump_T.cpp @@ -13,7 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template -ACE_Dumpable_Adapter::~ACE_Dumpable_Adapter (void) +ACE_Dumpable_Adapter::~ACE_Dumpable_Adapter () { ACE_TRACE ("ACE_Dumpable_Adapter::~ACE_Dumpable_Adapter"); } diff --git a/ACE/ace/Dump_T.h b/ACE/ace/Dump_T.h index b9200fbc1b988..3d1cc3650ac63 100644 --- a/ACE/ace/Dump_T.h +++ b/ACE/ace/Dump_T.h @@ -39,7 +39,7 @@ class ACE_Dumpable_Adapter : public ACE_Dumpable { public: ACE_Dumpable_Adapter (const Concrete *t); - ~ACE_Dumpable_Adapter (void); + ~ACE_Dumpable_Adapter (); /// Concrete dump method (simply delegates to the dump() method of /// ). @@ -68,13 +68,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ((void *) this); #endif /* ACE_NDEBUG */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Dump_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Dump_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_DUMP_T_H */ diff --git a/ACE/ace/Dynamic_Service.h b/ACE/ace/Dynamic_Service.h index 713a5aac98f93..ed866b3f78eb9 100644 --- a/ACE/ace/Dynamic_Service.h +++ b/ACE/ace/Dynamic_Service.h @@ -74,13 +74,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Dynamic_Service.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) # include "ace/Dynamic_Service.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation ("Dynamic_Service.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Dynamic_Service_Dependency.h b/ACE/ace/Dynamic_Service_Dependency.h index bb5294f408e07..484660eb7171d 100644 --- a/ACE/ace/Dynamic_Service_Dependency.h +++ b/ACE/ace/Dynamic_Service_Dependency.h @@ -51,7 +51,7 @@ class ACE_Export ACE_Dynamic_Service_Dependency ACE_Dynamic_Service_Dependency (const ACE_Service_Gestalt *cfg, const ACE_TCHAR *principal); ACE_Dynamic_Service_Dependency (const ACE_TCHAR *principal); - ~ACE_Dynamic_Service_Dependency (void); + ~ACE_Dynamic_Service_Dependency (); private: void init (const ACE_Service_Gestalt *cfg, const ACE_TCHAR *principal); diff --git a/ACE/ace/ETCL/ACE_ETCL.rc b/ACE/ace/ETCL/ACE_ETCL.rc new file mode 100644 index 0000000000000..ec78ac7aeef6c --- /dev/null +++ b/ACE/ace/ETCL/ACE_ETCL.rc @@ -0,0 +1,30 @@ +#include "../Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACE_ETCL\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACE_ETCLDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACE_ETCL.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/ace/ETCL/ETCL_Constraint.cpp b/ACE/ace/ETCL/ETCL_Constraint.cpp index e5d6fe7dc6f94..74569e80eaeb8 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.cpp +++ b/ACE/ace/ETCL/ETCL_Constraint.cpp @@ -67,7 +67,7 @@ ETCL_Literal_Constraint::ETCL_Literal_Constraint ( this->op_.str_ = ACE::strnew (str); } -ETCL_Literal_Constraint::~ETCL_Literal_Constraint (void) +ETCL_Literal_Constraint::~ETCL_Literal_Constraint () { if (this->type_ == ACE_ETCL_STRING) { @@ -384,7 +384,7 @@ ETCL_Literal_Constraint::operator/ (const ETCL_Literal_Constraint & rhs) } ETCL_Literal_Constraint -ETCL_Literal_Constraint::operator- (void) +ETCL_Literal_Constraint::operator- () { switch (this->type_) { @@ -465,7 +465,7 @@ ETCL_Identifier::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Union_Value::~ETCL_Union_Value (void) +ETCL_Union_Value::~ETCL_Union_Value () { delete this->string_; delete this->integer_; @@ -479,7 +479,7 @@ ETCL_Union_Value::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Union_Pos::~ETCL_Union_Pos (void) +ETCL_Union_Pos::~ETCL_Union_Pos () { delete this->component_; delete this->union_value_; @@ -493,7 +493,7 @@ ETCL_Union_Pos::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Component_Pos::~ETCL_Component_Pos (void) +ETCL_Component_Pos::~ETCL_Component_Pos () { delete this->component_; delete this->integer_; @@ -507,7 +507,7 @@ ETCL_Component_Pos::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Component_Assoc::~ETCL_Component_Assoc (void) +ETCL_Component_Assoc::~ETCL_Component_Assoc () { delete this->component_; delete this->identifier_; @@ -521,7 +521,7 @@ ETCL_Component_Assoc::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Component_Array::~ETCL_Component_Array (void) +ETCL_Component_Array::~ETCL_Component_Array () { delete this->component_; delete this->integer_; @@ -543,7 +543,7 @@ ETCL_Special::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Component::~ETCL_Component (void) +ETCL_Component::~ETCL_Component () { delete this->component_; delete this->identifier_; @@ -557,7 +557,7 @@ ETCL_Component::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Dot::~ETCL_Dot (void) +ETCL_Dot::~ETCL_Dot () { delete this->component_; } @@ -570,7 +570,7 @@ ETCL_Dot::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Eval::~ETCL_Eval (void) +ETCL_Eval::~ETCL_Eval () { delete this->component_; } @@ -583,7 +583,7 @@ ETCL_Eval::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Default::~ETCL_Default (void) +ETCL_Default::~ETCL_Default () { delete this->component_; } @@ -596,7 +596,7 @@ ETCL_Default::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Exist::~ETCL_Exist (void) +ETCL_Exist::~ETCL_Exist () { delete this->component_; } @@ -609,7 +609,7 @@ ETCL_Exist::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Unary_Expr::~ETCL_Unary_Expr (void) +ETCL_Unary_Expr::~ETCL_Unary_Expr () { delete this->subexpr_; } @@ -622,7 +622,7 @@ ETCL_Unary_Expr::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Binary_Expr::~ETCL_Binary_Expr (void) +ETCL_Binary_Expr::~ETCL_Binary_Expr () { delete this->lhs_; delete this->rhs_; @@ -636,7 +636,7 @@ ETCL_Binary_Expr::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Preference::~ETCL_Preference (void) +ETCL_Preference::~ETCL_Preference () { delete this->subexpr_; } diff --git a/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp b/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp index 50d666025d88a..7c220fbb6a00d 100644 --- a/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp +++ b/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp @@ -11,11 +11,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ETCL_Constraint_Visitor::ETCL_Constraint_Visitor (void) +ETCL_Constraint_Visitor::ETCL_Constraint_Visitor () { } -ETCL_Constraint_Visitor::~ETCL_Constraint_Visitor (void) +ETCL_Constraint_Visitor::~ETCL_Constraint_Visitor () { } diff --git a/ACE/ace/ETCL/ETCL_Constraint_Visitor.h b/ACE/ace/ETCL/ETCL_Constraint_Visitor.h index ea790676c9aa8..f83413f633928 100644 --- a/ACE/ace/ETCL/ETCL_Constraint_Visitor.h +++ b/ACE/ace/ETCL/ETCL_Constraint_Visitor.h @@ -41,8 +41,8 @@ class ETCL_Preference; class ACE_ETCL_Export ETCL_Constraint_Visitor { public: - ETCL_Constraint_Visitor (void); - virtual ~ETCL_Constraint_Visitor (void); + ETCL_Constraint_Visitor (); + virtual ~ETCL_Constraint_Visitor (); virtual int visit_literal (ETCL_Literal_Constraint *); virtual int visit_identifier (ETCL_Identifier *); diff --git a/ACE/ace/ETCL/ETCL_Interpreter.cpp b/ACE/ace/ETCL/ETCL_Interpreter.cpp index 0eab66a65dff2..79f06d1e18db9 100644 --- a/ACE/ace/ETCL/ETCL_Interpreter.cpp +++ b/ACE/ace/ETCL/ETCL_Interpreter.cpp @@ -10,12 +10,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ETCL_Parser_Export ACE_SYNCH_MUTEX ETCL_Interpreter::parserMutex__; -ETCL_Interpreter::ETCL_Interpreter (void) +ETCL_Interpreter::ETCL_Interpreter () : root_ (0) { } -ETCL_Interpreter::~ETCL_Interpreter (void) +ETCL_Interpreter::~ETCL_Interpreter () { delete this->root_; } diff --git a/ACE/ace/ETCL/ETCL_Interpreter.h b/ACE/ace/ETCL/ETCL_Interpreter.h index b5f57b570ab66..0a16b259f846f 100644 --- a/ACE/ace/ETCL/ETCL_Interpreter.h +++ b/ACE/ace/ETCL/ETCL_Interpreter.h @@ -91,7 +91,6 @@ class Lex_String_Input static int copy_into (char* buf, int max_size); private: - /// Pointers to keep track of the input string. static char* string_; static char* current_; diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp index ee9e119dd4fb9..1addcb5319e12 100644 --- a/ACE/ace/ETCL/ETCL_l.cpp +++ b/ACE/ace/ETCL/ETCL_l.cpp @@ -1399,7 +1399,7 @@ static int input() } #endif /* YY_NO_INPUT */ -void yyflush_current_buffer (void) +void yyflush_current_buffer () { YY_FLUSH_BUFFER; } @@ -1451,7 +1451,7 @@ YY_BUFFER_STATE new_buffer; #ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) +void yy_load_buffer_state() #else void yy_load_buffer_state() #endif @@ -1514,7 +1514,6 @@ YY_BUFFER_STATE b; } - #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) #else @@ -1530,18 +1529,7 @@ FILE *file; b->yy_input_file = file; b->yy_fill_buffer = 1; -#if defined (ACE_HAS_WINCE) - // Mimic the behavior as WinCE does not have isatty(). - if ((file != 0) && (file == ACE_OS::fileno(file))) { - b->yy_is_interactive = 1; - } - else { - b->yy_is_interactive = 0; - } -#else b->yy_is_interactive = file ? (ACE_OS::isatty( ACE_OS::fileno(file) ) > 0) : 0; -#endif // ACE_HAS_WINCE - } @@ -1737,7 +1725,6 @@ char msg[]; } - /* Redefine yyless() so it works in section 3 code. */ #undef yyless @@ -1867,7 +1854,7 @@ extract_string(char* str) } int -yywrap (void) +yywrap () { return 1; } diff --git a/ACE/ace/ETCL/ETCL_y.cpp b/ACE/ace/ETCL/ETCL_y.cpp index 2744a3c238ab0..37321652c84b8 100644 --- a/ACE/ace/ETCL/ETCL_y.cpp +++ b/ACE/ace/ETCL/ETCL_y.cpp @@ -64,8 +64,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -extern int yylex (void); -extern void yyflush_current_buffer (void); +extern int yylex (); +extern void yyflush_current_buffer (); static void yyerror (const char *) { @@ -86,7 +86,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #endif - #define YYFINAL 114 #define YYFLAG -32768 #define YYNTBASE 46 @@ -352,13 +351,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #pragma alloca #define YYSTACK_USE_ALLOCA #else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ #endif /* not sparc */ @@ -539,7 +531,7 @@ __yy_memcpy (char *to, char *from, unsigned int count) #ifdef YYPARSE_PARAM int yyparse (void *); #else -int yyparse (void); +int yyparse (); #endif #endif @@ -836,7 +828,6 @@ yyparse(YYPARSE_PARAM_ARG) switch (yyn) { - case 3: //#line 97 "ETCL/ETCL.yy" { yyval.constraint = new ETCL_Preference (ETCL_MIN, yyvsp[0].constraint); ; diff --git a/ACE/ace/Encoding_Converter.cpp b/ACE/ace/Encoding_Converter.cpp index 29a3a1d18f96b..9c6e71ee5f625 100644 --- a/ACE/ace/Encoding_Converter.cpp +++ b/ACE/ace/Encoding_Converter.cpp @@ -3,7 +3,7 @@ #if defined (ACE_USES_WCHAR) ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_Encoding_Converter::~ACE_Encoding_Converter (void) +ACE_Encoding_Converter::~ACE_Encoding_Converter () { } diff --git a/ACE/ace/Encoding_Converter.h b/ACE/ace/Encoding_Converter.h index c430e8f93a607..9b08f6c7d7306 100644 --- a/ACE/ace/Encoding_Converter.h +++ b/ACE/ace/Encoding_Converter.h @@ -41,7 +41,7 @@ class ACE_Export ACE_Encoding_Converter /// This destructor is here (and virtual) because we have virtual /// functions. - virtual ~ACE_Encoding_Converter (void); + virtual ~ACE_Encoding_Converter (); /// Convert the source (which can be in any encoding) to UTF-8 and /// store it in the provided target buffer. diff --git a/ACE/ace/Env_Value_T.h b/ACE/ace/Env_Value_T.h index 6e97e3602d76a..e080cafcec6b8 100644 --- a/ACE/ace/Env_Value_T.h +++ b/ACE/ace/Env_Value_T.h @@ -78,9 +78,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Env_Value_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Env_Value_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -151,9 +149,5 @@ ACE_Convert (const ACE_TCHAR *s, T &t) ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Env_Value_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include /**/ "ace/post.h" #endif /* ACE_ENV_VALUE_T_H */ diff --git a/ACE/ace/Event.h b/ACE/ace/Event.h index 78682631d9db6..f0727003f53c7 100644 --- a/ACE/ace/Event.h +++ b/ACE/ace/Event.h @@ -77,13 +77,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Event.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Event.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Event.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_EVENT_H */ diff --git a/ACE/ace/Event_Handler.cpp b/ACE/ace/Event_Handler.cpp index db98ca84d537c..b67015a0691eb 100644 --- a/ACE/ace/Event_Handler.cpp +++ b/ACE/ace/Event_Handler.cpp @@ -362,7 +362,6 @@ bool ACE_Event_Handler_var::operator !=(std::nullptr_t) const { return this->ptr_ != nullptr; - } // --------------------------------------------------------------------- diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h index b41ecb4f22f34..0e7471deb89a3 100644 --- a/ACE/ace/Event_Handler.h +++ b/ACE/ace/Event_Handler.h @@ -229,7 +229,6 @@ class ACE_Export ACE_Event_Handler class ACE_Export Policy { public: - /// Virtual destructor. virtual ~Policy (); }; diff --git a/ACE/ace/Event_Handler_T.cpp b/ACE/ace/Event_Handler_T.cpp index 6c403c143cad2..6e15cbbc94fea 100644 --- a/ACE/ace/Event_Handler_T.cpp +++ b/ACE/ace/Event_Handler_T.cpp @@ -25,7 +25,7 @@ ACE_Event_Handler_T::dump () const } template -ACE_Event_Handler_T::~ACE_Event_Handler_T (void) +ACE_Event_Handler_T::~ACE_Event_Handler_T () { ACE_TRACE ("ACE_Event_Handler_T::~ACE_Event_Handler_T"); if (this->delete_handler_) diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h index 258396372a8a2..c45979267625c 100644 --- a/ACE/ace/Event_Handler_T.h +++ b/ACE/ace/Event_Handler_T.h @@ -90,7 +90,7 @@ class ACE_Event_Handler_T : public ACE_Event_Handler IO_HANDLER except = 0); /// Close down and delete the - ~ACE_Event_Handler_T (void); + ~ACE_Event_Handler_T (); // = Override all the ACE_Event_Handler methods. @@ -105,7 +105,7 @@ class ACE_Event_Handler_T : public ACE_Event_Handler virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); // = Get/set the operations handler. - T *op_handler (void); + T *op_handler (); void op_handler (T *); // = Get/set the target pointer-to-method used for dispatching. @@ -173,13 +173,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Event_Handler_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Event_Handler_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Event_Handler_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_EVENT_HANDLER_H */ diff --git a/ACE/ace/Event_Handler_T.inl b/ACE/ace/Event_Handler_T.inl index 64df02a1d0f34..a89334231c2da 100644 --- a/ACE/ace/Event_Handler_T.inl +++ b/ACE/ace/Event_Handler_T.inl @@ -11,14 +11,14 @@ ACE_Event_Handler_T::op_handler (T *op) } template ACE_INLINE T * -ACE_Event_Handler_T::op_handler (void) +ACE_Event_Handler_T::op_handler () { ACE_TRACE ("ACE_Event_Handler_T::op_handler"); return this->op_handler_; } template ACE_INLINE typename ACE_Event_Handler_T::GET_HANDLE -ACE_Event_Handler_T::handle_get (void) +ACE_Event_Handler_T::handle_get () { ACE_TRACE ("ACE_Event_Handler_T::handle_get"); return this->get_handle_; @@ -32,7 +32,7 @@ ACE_Event_Handler_T::handle_get (typename ACE_Event_Handler_T::GET_HANDLE } template ACE_INLINE typename ACE_Event_Handler_T::SET_HANDLE -ACE_Event_Handler_T::handle_set (void) +ACE_Event_Handler_T::handle_set () { ACE_TRACE ("ACE_Event_Handler_T::handle_set"); return this->set_handle_; @@ -46,7 +46,7 @@ ACE_Event_Handler_T::handle_set (typename ACE_Event_Handler_T::SET_HANDLE } template ACE_INLINE typename ACE_Event_Handler_T::IO_HANDLER -ACE_Event_Handler_T::input_handler (void) +ACE_Event_Handler_T::input_handler () { ACE_TRACE ("ACE_Event_Handler_T::input_handler"); return this->input_handler_; @@ -60,7 +60,7 @@ ACE_Event_Handler_T::input_handler (typename ACE_Event_Handler_T::IO_HANDL } template ACE_INLINE typename ACE_Event_Handler_T::IO_HANDLER -ACE_Event_Handler_T::output_handler (void) +ACE_Event_Handler_T::output_handler () { ACE_TRACE ("ACE_Event_Handler_T::output_handler"); return this->output_handler_; @@ -74,7 +74,7 @@ ACE_Event_Handler_T::output_handler (typename ACE_Event_Handler_T::IO_HAND } template ACE_INLINE typename ACE_Event_Handler_T::IO_HANDLER -ACE_Event_Handler_T::except_handler (void) +ACE_Event_Handler_T::except_handler () { ACE_TRACE ("ACE_Event_Handler_T::except_handler"); return this->except_handler_; @@ -88,7 +88,7 @@ ACE_Event_Handler_T::except_handler (typename ACE_Event_Handler_T::IO_HAND } template ACE_INLINE typename ACE_Event_Handler_T::TO_HANDLER -ACE_Event_Handler_T::to_handler (void) +ACE_Event_Handler_T::to_handler () { ACE_TRACE ("ACE_Event_Handler_T::to_handler"); return this->to_handler_; @@ -102,7 +102,7 @@ ACE_Event_Handler_T::to_handler (typename ACE_Event_Handler_T::TO_HANDLER } template ACE_INLINE typename ACE_Event_Handler_T::CL_HANDLER -ACE_Event_Handler_T::cl_handler (void) +ACE_Event_Handler_T::cl_handler () { ACE_TRACE ("ACE_Event_Handler_T::cl_handler"); return this->cl_handler_; @@ -116,7 +116,7 @@ ACE_Event_Handler_T::cl_handler (typename ACE_Event_Handler_T::CL_HANDLER } template ACE_INLINE typename ACE_Event_Handler_T::SIG_HANDLER -ACE_Event_Handler_T::sig_handler (void) +ACE_Event_Handler_T::sig_handler () { ACE_TRACE ("ACE_Event_Handler_T::sig_handler"); return this->sig_handler_; diff --git a/ACE/ace/FIFO.h b/ACE/ace/FIFO.h index efbbf8c140313..f738aa783d4ce 100644 --- a/ACE/ace/FIFO.h +++ b/ACE/ace/FIFO.h @@ -52,11 +52,11 @@ class ACE_Export ACE_FIFO : public ACE_IPC_SAP LPSECURITY_ATTRIBUTES sa = 0); /// Close down the ACE_FIFO without removing the rendezvous point. - int close (void); + int close (); /// Close down the ACE_FIFO and remove the rendezvous point from the /// file system. - int remove (void); + int remove (); /// Return the local address of this endpoint. int get_local_addr (const ACE_TCHAR *&rendezvous) const; @@ -74,7 +74,7 @@ class ACE_Export ACE_FIFO : public ACE_IPC_SAP */ //@{ /// Default constructor. - ACE_FIFO (void); + ACE_FIFO (); /// Open up the named pipe on the @a rendezvous in accordance with the /// flags. diff --git a/ACE/ace/FIFO.inl b/ACE/ace/FIFO.inl index 9fe5c733e3c78..4d3409020a3f0 100644 --- a/ACE/ace/FIFO.inl +++ b/ACE/ace/FIFO.inl @@ -12,7 +12,7 @@ ACE_FIFO::get_local_addr (const ACE_TCHAR *&r) const } ACE_INLINE int -ACE_FIFO::remove (void) +ACE_FIFO::remove () { ACE_TRACE ("ACE_FIFO::remove"); int const result = this->close (); diff --git a/ACE/ace/FIFO_Recv.h b/ACE/ace/FIFO_Recv.h index 163b5e372d02a..c34bd2180adaa 100644 --- a/ACE/ace/FIFO_Recv.h +++ b/ACE/ace/FIFO_Recv.h @@ -44,9 +44,8 @@ class ACE_Export ACE_FIFO_Recv : public ACE_FIFO /// reading." This ensures that the fifo never gets EOF, even if there /// aren't any writers at the moment! //@{ - /// Default constructor. - ACE_FIFO_Recv (void); + ACE_FIFO_Recv (); /// Open up a bytestream named pipe for reading. ACE_FIFO_Recv (const ACE_TCHAR *rendezvous, @@ -64,7 +63,7 @@ class ACE_Export ACE_FIFO_Recv : public ACE_FIFO //@} /// Close down the fifo. - int close (void); + int close (); /// Recv @a buf of up to @a len bytes. ssize_t recv (void *buf, size_t len); diff --git a/ACE/ace/File_Lock.h b/ACE/ace/File_Lock.h index c1a39a9669bc0..f731231c830a8 100644 --- a/ACE/ace/File_Lock.h +++ b/ACE/ace/File_Lock.h @@ -59,7 +59,7 @@ class ACE_Export ACE_File_Lock mode_t mode = 0); /// Remove a File lock by releasing it and closing down the . - ~ACE_File_Lock (void); + ~ACE_File_Lock (); /// Remove a File lock by releasing it and closing down the /// . If @a unlink_file is true then we unlink the file. diff --git a/ACE/ace/Filecache.h b/ACE/ace/Filecache.h index 4e6e712507c0a..870dce8c31686 100644 --- a/ACE/ace/Filecache.h +++ b/ACE/ace/Filecache.h @@ -88,7 +88,6 @@ class ACE_Export ACE_Filecache_Handle // Since this design should be simpler, problems should be easier to spot. // public: - /// Query cache for file, and acquire it. Assumes the file is being /// opened for reading. ACE_Filecache_Handle (const ACE_TCHAR *filename, diff --git a/ACE/ace/FlReactor/FlReactor.cpp b/ACE/ace/FlReactor/FlReactor.cpp index edbac9be35ec7..9c3cf5992de1c 100644 --- a/ACE/ace/FlReactor/FlReactor.cpp +++ b/ACE/ace/FlReactor/FlReactor.cpp @@ -29,7 +29,7 @@ ACE_FlReactor::ACE_FlReactor (size_t size, #endif /* ACE_MT_SAFE */ } -ACE_FlReactor::~ACE_FlReactor (void) +ACE_FlReactor::~ACE_FlReactor () { } @@ -86,7 +86,6 @@ ACE_FlReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s handle_set.wr_mask_, handle_set.ex_mask_, &zero); - } while (nfound == -1 && this->handle_error () > 0); if (nfound > 0) @@ -231,7 +230,7 @@ ACE_FlReactor::remove_handler_i (const ACE_Handle_Set &handles, // timeout in the Reactor's Timer_Queue. void -ACE_FlReactor::reset_timeout (void) +ACE_FlReactor::reset_timeout () { ACE_Time_Value *max_wait_time = this->timer_queue_->calculate_timeout (0); diff --git a/ACE/ace/FlReactor/FlReactor.h b/ACE/ace/FlReactor/FlReactor.h index f1b5767f557d0..b2d3283fcb68a 100644 --- a/ACE/ace/FlReactor/FlReactor.h +++ b/ACE/ace/FlReactor/FlReactor.h @@ -43,12 +43,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_FlReactor_Export ACE_FlReactor : public ACE_Select_Reactor { - public: ACE_FlReactor (size_t size = DEFAULT_SIZE, bool restart = false, ACE_Sig_Handler * = 0); - virtual ~ACE_FlReactor (void); + virtual ~ACE_FlReactor (); // = Timer operations. virtual long schedule_timer (ACE_Event_Handler *event_handler, @@ -90,7 +89,7 @@ class ACE_FlReactor_Export ACE_FlReactor : public ACE_Select_Reactor private: /// This method ensures there's an Fl timeout for the first timeout /// in the Reactor's Timer_Queue. - void reset_timeout (void); + void reset_timeout (); // = Integrate with the FL callback function mechanism. static void fl_io_proc (int fd, void*); diff --git a/ACE/ace/FoxReactor/FoxReactor.cpp b/ACE/ace/FoxReactor/FoxReactor.cpp index 9560a5ae2c2ef..7bd06e49b7ea7 100644 --- a/ACE/ace/FoxReactor/FoxReactor.cpp +++ b/ACE/ace/FoxReactor/FoxReactor.cpp @@ -35,7 +35,7 @@ ACE_FoxReactor::ACE_FoxReactor (FXApp* a, #endif /* ACE_MT_SAFE */ } -ACE_FoxReactor::~ACE_FoxReactor (void) +ACE_FoxReactor::~ACE_FoxReactor () { } @@ -65,7 +65,6 @@ ACE_FoxReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_ nfound = FoxWaitForMultipleEvents (width, handle_set, max_wait_time); - } while( nfound == -1 && this->handle_error () > 0 ); if (nfound > 0) @@ -233,7 +232,7 @@ ACE_FoxReactor::remove_handler_i (const ACE_Handle_Set &handles, // timeout in the Reactor's Timer_Queue. void -ACE_FoxReactor::reset_timeout (void) +ACE_FoxReactor::reset_timeout () { ACE_Time_Value *max_wait_time = this->timer_queue_->calculate_timeout (0); diff --git a/ACE/ace/FoxReactor/FoxReactor.h b/ACE/ace/FoxReactor/FoxReactor.h index 220d2b56a24e3..f837af62f16e8 100644 --- a/ACE/ace/FoxReactor/FoxReactor.h +++ b/ACE/ace/FoxReactor/FoxReactor.h @@ -43,7 +43,7 @@ class ACE_FoxReactor_Export ACE_FoxReactor : public FXObject, public ACE_Select_ size_t size = DEFAULT_SIZE, bool restart = false, ACE_Sig_Handler * = 0); - virtual ~ACE_FoxReactor (void); + virtual ~ACE_FoxReactor (); void fxapplication(FXApp* a); @@ -94,7 +94,7 @@ class ACE_FoxReactor_Export ACE_FoxReactor : public FXObject, public ACE_Select_ private: /// This method ensures there's an Fox timeout for the first timeout /// in the Reactor's Timer_Queue. - void reset_timeout (void); + void reset_timeout (); FXApp *fxapp; diff --git a/ACE/ace/Framework_Component_T.h b/ACE/ace/Framework_Component_T.h index a4e7d4ee3566e..e23f11889f5f0 100644 --- a/ACE/ace/Framework_Component_T.h +++ b/ACE/ace/Framework_Component_T.h @@ -57,13 +57,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_Framework_Repository::instance ()->register_component \ (new ACE_Framework_Component_T (INSTANCE)); -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Framework_Component_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Framework_Component_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_FRAMEWORK_COMPONENT_T_H */ diff --git a/ACE/ace/Free_List.h b/ACE/ace/Free_List.h index 38e30e6c1b0f6..a6252fe85edb0 100644 --- a/ACE/ace/Free_List.h +++ b/ACE/ace/Free_List.h @@ -137,13 +137,7 @@ class ACE_Locked_Free_List : public ACE_Free_List ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Free_List.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Free_List.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_FREE_LIST_H */ diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h index efa33f879b67f..4a9fb185dd222 100644 --- a/ACE/ace/Functor_T.h +++ b/ACE/ace/Functor_T.h @@ -180,13 +180,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Functor_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Functor_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Functor_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_FUNCTOR_T_H */ diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp index d77b8c0a28c62..311d9df096a60 100644 --- a/ACE/ace/Future.cpp +++ b/ACE/ace/Future.cpp @@ -20,7 +20,7 @@ ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Future_Rep) ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Future) template -ACE_Future_Holder::ACE_Future_Holder (void) +ACE_Future_Holder::ACE_Future_Holder () { } @@ -31,17 +31,17 @@ ACE_Future_Holder::ACE_Future_Holder (const ACE_Future &item) } template -ACE_Future_Holder::~ACE_Future_Holder (void) +ACE_Future_Holder::~ACE_Future_Holder () { } template -ACE_Future_Observer::ACE_Future_Observer (void) +ACE_Future_Observer::ACE_Future_Observer () { } template -ACE_Future_Observer::~ACE_Future_Observer (void) +ACE_Future_Observer::~ACE_Future_Observer () { } @@ -72,7 +72,7 @@ ACE_Future_Rep::dump () const } template ACE_Future_Rep * -ACE_Future_Rep::internal_create (void) +ACE_Future_Rep::internal_create () { ACE_Future_Rep *temp = 0; ACE_NEW_RETURN (temp, @@ -82,7 +82,7 @@ ACE_Future_Rep::internal_create (void) } template ACE_Future_Rep * -ACE_Future_Rep::create (void) +ACE_Future_Rep::create () { // Yes set ref count to zero. ACE_Future_Rep *temp = internal_create (); @@ -142,7 +142,7 @@ ACE_Future_Rep::assign (ACE_Future_Rep*& rep, ACE_Future_Rep* new_rep) } template -ACE_Future_Rep::ACE_Future_Rep (void) +ACE_Future_Rep::ACE_Future_Rep () : value_ (0), ref_count_ (0), value_ready_ (value_ready_mutex_) @@ -150,7 +150,7 @@ ACE_Future_Rep::ACE_Future_Rep (void) } template -ACE_Future_Rep::~ACE_Future_Rep (void) +ACE_Future_Rep::~ACE_Future_Rep () { delete this->value_; } @@ -288,7 +288,7 @@ ACE_Future_Rep::operator T () } template -ACE_Future::ACE_Future (void) +ACE_Future::ACE_Future () : future_rep_ (FUTURE_REP::create ()) { } @@ -307,7 +307,7 @@ ACE_Future::ACE_Future (const T &r) } template -ACE_Future::~ACE_Future (void) +ACE_Future::~ACE_Future () { FUTURE_REP::detach (future_rep_); } @@ -332,7 +332,7 @@ ACE_Future::cancel (const T &r) } template int -ACE_Future::cancel (void) +ACE_Future::cancel () { // If this ACE_Future is already attached to a ACE_Future_Rep, // detach it (maybe delete the ACE_Future_Rep). diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h index f63695202faad..e07756fc8807c 100644 --- a/ACE/ace/Future.h +++ b/ACE/ace/Future.h @@ -47,7 +47,7 @@ class ACE_Future_Holder { public: ACE_Future_Holder (const ACE_Future &future); - ~ACE_Future_Holder (void); + ~ACE_Future_Holder (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -55,7 +55,7 @@ class ACE_Future_Holder ACE_Future item_; protected: - ACE_Future_Holder (void); + ACE_Future_Holder (); }; /** @@ -73,7 +73,7 @@ class ACE_Future_Observer { public: /// Destructor - virtual ~ACE_Future_Observer (void); + virtual ~ACE_Future_Observer (); /// Called by the ACE_Future in which we are subscribed to when /// its value is written to. @@ -84,7 +84,7 @@ class ACE_Future_Observer protected: /// Constructor - ACE_Future_Observer (void); + ACE_Future_Observer (); }; /** @@ -163,10 +163,10 @@ class ACE_Future_Rep /// Allocate a new ACE_Future_Rep instance, returning NULL if it /// cannot be created. - static ACE_Future_Rep *internal_create (void); + static ACE_Future_Rep *internal_create (); /// Create a ACE_Future_Rep and initialize the reference count. - static ACE_Future_Rep *create (void); + static ACE_Future_Rep *create (); /** * Increase the reference count and return argument. Uses the @@ -232,7 +232,7 @@ class ACE_Future { public: /// Constructor. - ACE_Future (void); + ACE_Future (); /// Copy constructor binds @a this and @a r to the same /// ACE_Future_Rep. An ACE_Future_Rep is created if necessary. @@ -243,7 +243,7 @@ class ACE_Future ACE_Future (const T &r); /// Destructor. - ~ACE_Future (void); + ~ACE_Future (); /// Assignment operator that binds @a this and @a r to the same /// ACE_Future_Rep. An ACE_Future_Rep is created if necessary. @@ -259,7 +259,7 @@ class ACE_Future * to reuse the ACE_Future. But remember, the ACE_Future * is now bound to a new ACE_Future_Rep. */ - int cancel (void); + int cancel (); /** * Equality operator that returns @c true if both ACE_Future objects @@ -348,7 +348,7 @@ class ACE_Future * rarely, if ever, be used and that modifying the underlying * ACE_Future_Rep should be done with extreme caution. */ - ACE_Future_Rep *get_rep (void); + ACE_Future_Rep *get_rep (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -362,13 +362,7 @@ class ACE_Future ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Future.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Future.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_THREADS */ diff --git a/ACE/ace/Future_Set.cpp b/ACE/ace/Future_Set.cpp index 413539b2a866a..ed9b3c4037d44 100644 --- a/ACE/ace/Future_Set.cpp +++ b/ACE/ace/Future_Set.cpp @@ -28,7 +28,7 @@ ACE_Future_Set::ACE_Future_Set (ACE_Message_Queue *new_queue) } template -ACE_Future_Set::~ACE_Future_Set (void) +ACE_Future_Set::~ACE_Future_Set () { // Detach ourselves from all remaining futures, if any, in our map. typename FUTURE_HASH_MAP::iterator iterator = diff --git a/ACE/ace/Future_Set.h b/ACE/ace/Future_Set.h index abee861e31c11..ed1eb0999bfce 100644 --- a/ACE/ace/Future_Set.h +++ b/ACE/ace/Future_Set.h @@ -126,13 +126,7 @@ class ACE_Future_Set : public ACE_Future_Observer, ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Future_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Future_Set.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_THREADS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Get_Opt.cpp b/ACE/ace/Get_Opt.cpp index b990a9d57042f..02cdbef4a7155 100644 --- a/ACE/ace/Get_Opt.cpp +++ b/ACE/ace/Get_Opt.cpp @@ -571,7 +571,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, const ACE_TCHAR* ACE_Get_Opt::long_option () const { - ACE_TRACE ("ACE_Get_Opt::long_option (void)"); + ACE_TRACE ("ACE_Get_Opt::long_option ()"); if (this->long_option_) return this->long_option_->name_; return 0; diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index e8e64b20a6c2a..bc9b20a4962a5 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -559,27 +559,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC */ # define ACE_Local_Service_Export -#if defined (ACE_OPENVMS) -# define ACE_PREPROC_STRINGIFY(A) #A -# define ACE_MAKE_SVC_REGISTRAR_ARG(A) ACE_PREPROC_STRINGIFY(A), (void*)&A -# define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \ -void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \ - ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \ - static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \ - ACE_ASSERT (_p != 0); \ - delete _p; } \ -extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *\ -ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *gobbler) \ -{ \ - ACE_TRACE (#SERVICE_CLASS); \ - if (gobbler != 0) \ - *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \ - return new SERVICE_CLASS; \ -} \ -ACE_Dynamic_Svc_Registrar ace_svc_reg_##SERVICE_CLASS \ - (ACE_MAKE_SVC_REGISTRAR_ARG(ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS))); -#else -# define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \ +#define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \ void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \ ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \ static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \ @@ -593,7 +573,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \ return new SERVICE_CLASS; \ } -#endif /** * For service classes scoped within namespaces, use this macro in @@ -621,27 +600,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC * this will ensure unique generated signatures for the various C * style functions. */ -#if defined (ACE_OPENVMS) -# define ACE_PREPROC_STRINGIFY(A) #A -# define ACE_MAKE_SVC_REGISTRAR_ARG(A) ACE_PREPROC_STRINGIFY(A), (void*)&A -# define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \ -void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \ - ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \ - static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \ - ACE_ASSERT (_p != 0); \ - delete _p; } \ -extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *\ -ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *gobbler) \ -{ \ - ACE_TRACE (#SERVICE_CLASS); \ - if (gobbler != 0) \ - *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \ - return new NAMESPACE_CLASS; \ -} \ -ACE_Dynamic_Svc_Registrar ace_svc_reg_##SERVICE_CLASS \ - (ACE_MAKE_SVC_REGISTRAR_ARG(ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS))); -#else -# define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \ +#define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \ void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \ ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \ static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \ @@ -655,7 +614,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \ return new NAMESPACE_CLASS; \ } -#endif /// The canonical name for a service factory method # define ACE_SVC_NAME(SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) @@ -676,20 +634,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_SVC_FACTORY_DEFINE(X) ACE_FACTORY_DEFINE (ACE_Svc, X) //@} -#if defined (ACE_WIN32) -// These are used in SPIPE_Acceptor/Connector, but are ignored at runtime. -# if defined (ACE_HAS_WINCE) -# if !defined (PIPE_TYPE_MESSAGE) -# define PIPE_TYPE_MESSAGE 0 -# endif -# if !defined (PIPE_READMODE_MESSAGE) -# define PIPE_READMODE_MESSAGE 0 -# endif -# if !defined (PIPE_WAIT) -# define PIPE_WAIT 0 -# endif -# endif /* ACE_HAS_WINCE */ -#else /* !ACE_WIN32 */ +#if !defined (ACE_WIN32) // Add some typedefs and macros to enhance Win32 conformance... # if !defined (LPSECURITY_ATTRIBUTES) # define LPSECURITY_ATTRIBUTES int @@ -736,8 +681,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # if !defined(PIPE_TYPE_MESSAGE) # define PIPE_TYPE_MESSAGE 0 # endif /* !defined PIPE_TYPE_MESSAGE */ -#endif /* ACE_WIN32 */ - +#endif /* !ACE_WIN32 */ // Some useful abstractions for expressions involving // ACE_Allocator.malloc (). The difference between ACE_NEW_MALLOC* diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h index 575c17a91be43..b73346b6b4ed0 100644 --- a/ACE/ace/Guard_T.h +++ b/ACE/ace/Guard_T.h @@ -110,7 +110,6 @@ class ACE_Guard // Declare the dynamic allocation hooks. protected: - /// Helper, meant for subclass only. ACE_Guard (ACE_LOCK *lock): lock_ (lock), owner_ (0) {} @@ -379,13 +378,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Guard_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Guard_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Guard_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_GUARD_T_H */ diff --git a/ACE/ace/Handle_Gobbler.inl b/ACE/ace/Handle_Gobbler.inl index 8bacb005ded85..75e4d8e6dfb50 100644 --- a/ACE/ace/Handle_Gobbler.inl +++ b/ACE/ace/Handle_Gobbler.inl @@ -10,7 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL inline void -ACE_Handle_Gobbler::close_remaining_handles (void) +ACE_Handle_Gobbler::close_remaining_handles () { ACE_Handle_Set_Iterator iter (this->handle_set_); for (ACE_HANDLE h = iter (); h != ACE_INVALID_HANDLE; h = iter ()) @@ -18,7 +18,7 @@ ACE_Handle_Gobbler::close_remaining_handles (void) } inline -ACE_Handle_Gobbler::~ACE_Handle_Gobbler (void) +ACE_Handle_Gobbler::~ACE_Handle_Gobbler () { this->close_remaining_handles (); } diff --git a/ACE/ace/Handle_Set.cpp b/ACE/ace/Handle_Set.cpp index 1ca26071fd34c..98d9ca5e9fa43 100644 --- a/ACE/ace/Handle_Set.cpp +++ b/ACE/ace/Handle_Set.cpp @@ -117,7 +117,6 @@ ACE_Handle_Set::ACE_Handle_Set (const fd_set &fd_mask) int ACE_Handle_Set::count_bits (u_long n) { - ACE_TRACE ("ACE_Handle_Set::count_bits"); #if defined (ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT) int rval = 0; diff --git a/ACE/ace/Handle_Set.inl b/ACE/ace/Handle_Set.inl index 60e31a21a9c5a..49fb76559a31d 100644 --- a/ACE/ace/Handle_Set.inl +++ b/ACE/ace/Handle_Set.inl @@ -1,7 +1,6 @@ // -*- C++ -*- #include "ace/Log_Category.h" -// AIX defines bzero() in this odd file... used by FD_ZERO #if defined (ACE_HAS_STRINGS) # include "ace/os_include/os_strings.h" #endif /* ACE_HAS_STRINGS */ diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.cpp b/ACE/ace/Hash_Cache_Map_Manager_T.cpp index a828ecd1599b9..5eb4bcc825dab 100644 --- a/ACE/ace/Hash_Cache_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Cache_Map_Manager_T.cpp @@ -42,19 +42,16 @@ ACE_Hash_Cache_Map_Managercaching_strategy_.notify_bind (bind_result, cache_value.second); if (result == -1) { - this->map_.unbind (key); // Unless the notification goes thru the bind operation is // not complete. bind_result = -1; - } } @@ -75,13 +72,11 @@ ACE_Hash_Cache_Map_Managercaching_strategy_.notify_rebind (rebind_result, cache_value.second ()); if (result == -1) { - // Make sure the unbind operation is done only when the // notification fails after a bind which is denoted by // rebind_result = 0 @@ -91,7 +86,6 @@ ACE_Hash_Cache_Map_Managermap_.unbind (key); trybind_result = -1; - } else { - // If an attempt is made to bind an existing entry the value // is overwritten with the value from the map. if (trybind_result == 1) value = cache_value.first (); - } } @@ -152,7 +142,6 @@ ACE_Hash_Cache_Map_Managercaching_strategy_.notify_find (find_result, entry->int_id_.second); @@ -162,7 +151,6 @@ ACE_Hash_Cache_Map_Managercaching_strategy_.notify_unbind (unbind_result, entry->int_id_.second); if (result == -1) unbind_result = -1; - } return unbind_result; diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.h b/ACE/ace/Hash_Cache_Map_Manager_T.h index e8abfbcb464be..9b94124afab73 100644 --- a/ACE/ace/Hash_Cache_Map_Manager_T.h +++ b/ACE/ace/Hash_Cache_Map_Manager_T.h @@ -196,13 +196,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Hash_Cache_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Cache_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Hash_Cache_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h index 6960498bfe7b6..045c2935020d0 100644 --- a/ACE/ace/Hash_Map_Manager_T.h +++ b/ACE/ace/Hash_Map_Manager_T.h @@ -1281,13 +1281,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Hash_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Hash_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HASH_MAP_MANAGER_T_H */ diff --git a/ACE/ace/Hash_Map_Manager_T.inl b/ACE/ace/Hash_Map_Manager_T.inl index 479bbe9c11f73..c6e9d4d188585 100644 --- a/ACE/ace/Hash_Map_Manager_T.inl +++ b/ACE/ace/Hash_Map_Manager_T.inl @@ -761,7 +761,7 @@ template & ACE_Hash_Map_Iterator_Ex::operator++ () { - ACE_TRACE ("ACE_Hash_Map_Iterator_Ex::operator++ (void)"); + ACE_TRACE ("ACE_Hash_Map_Iterator_Ex::operator++ ()"); this->forward_i (); return *this; @@ -782,7 +782,7 @@ template & ACE_Hash_Map_Iterator_Ex::operator-- () { - ACE_TRACE ("ACE_Hash_Map_Iterator_Ex::operator-- (void)"); + ACE_TRACE ("ACE_Hash_Map_Iterator_Ex::operator-- ()"); this->reverse_i (); return *this; @@ -831,7 +831,7 @@ template & ACE_Hash_Map_Const_Iterator_Ex::operator++ () { - ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex::operator++ (void)"); + ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex::operator++ ()"); this->forward_i (); return *this; @@ -852,7 +852,7 @@ template & ACE_Hash_Map_Const_Iterator_Ex::operator-- () { - ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex::operator-- (void)"); + ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex::operator-- ()"); this->reverse_i (); return *this; @@ -888,7 +888,7 @@ template & ACE_Hash_Map_Bucket_Iterator::operator++ () { - ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator::operator++ (void)"); + ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator::operator++ ()"); this->forward_i (); return *this; @@ -909,7 +909,7 @@ template & ACE_Hash_Map_Bucket_Iterator::operator-- () { - ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator::operator-- (void)"); + ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator::operator-- ()"); this->reverse_i (); return *this; @@ -1018,7 +1018,7 @@ template & ACE_Hash_Map_Reverse_Iterator_Ex::operator++ () { - ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex::operator++ (void)"); + ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex::operator++ ()"); this->reverse_i (); return *this; @@ -1039,7 +1039,7 @@ template & ACE_Hash_Map_Reverse_Iterator_Ex::operator-- () { - ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex::operator-- (void)"); + ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex::operator-- ()"); this->forward_i (); return *this; @@ -1086,7 +1086,7 @@ template & ACE_Hash_Map_Const_Reverse_Iterator_Ex::operator++ () { - ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex::operator++ (void)"); + ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex::operator++ ()"); this->reverse_i (); return *this; @@ -1107,7 +1107,7 @@ template & ACE_Hash_Map_Const_Reverse_Iterator_Ex::operator-- () { - ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex::operator-- (void)"); + ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex::operator-- ()"); this->forward_i (); return *this; diff --git a/ACE/ace/Hash_Map_With_Allocator_T.h b/ACE/ace/Hash_Map_With_Allocator_T.h index 21eaec5f6ba18..eb8473305d6e4 100644 --- a/ACE/ace/Hash_Map_With_Allocator_T.h +++ b/ACE/ace/Hash_Map_With_Allocator_T.h @@ -97,14 +97,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Hash_Map_With_Allocator_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Map_With_Allocator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Hash_Map_With_Allocator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include /**/ "ace/post.h" #endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_H */ diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.cpp b/ACE/ace/Hash_Multi_Map_Manager_T.cpp index 9c325096aa771..0e128647915f8 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Multi_Map_Manager_T.cpp @@ -143,7 +143,7 @@ ACE_Hash_Multi_Map_Manager::op } template int -ACE_Hash_Multi_Map_Manager::close_i (void) +ACE_Hash_Multi_Map_Manager::close_i () { // Protect against "double-deletion" in case the destructor also // gets called. @@ -178,7 +178,7 @@ ACE_Hash_Multi_Map_Manager::cl } template int -ACE_Hash_Multi_Map_Manager::unbind_all_i (void) +ACE_Hash_Multi_Map_Manager::unbind_all_i () { // Iterate through the entire map calling the destuctor of each // . @@ -462,7 +462,7 @@ ACE_Hash_Multi_Map_Iterator_Base int -ACE_Hash_Multi_Map_Iterator_Base::forward_i (void) +ACE_Hash_Multi_Map_Iterator_Base::forward_i () { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base::forward_i"); @@ -492,7 +492,7 @@ ACE_Hash_Multi_Map_Iterator_Base int -ACE_Hash_Multi_Map_Iterator_Base::reverse_i (void) +ACE_Hash_Multi_Map_Iterator_Base::reverse_i () { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base::reverse_i"); @@ -534,7 +534,7 @@ ACE_Hash_Multi_Map_Const_Iterator_Base int -ACE_Hash_Multi_Map_Const_Iterator_Base::forward_i (void) +ACE_Hash_Multi_Map_Const_Iterator_Base::forward_i () { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base::forward_i"); @@ -564,7 +564,7 @@ ACE_Hash_Multi_Map_Const_Iterator_Base int -ACE_Hash_Multi_Map_Const_Iterator_Base::reverse_i (void) +ACE_Hash_Multi_Map_Const_Iterator_Base::reverse_i () { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base::reverse_i"); diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h index d92cc190bd700..dfa34ea9c5f3c 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.h +++ b/ACE/ace/Hash_Multi_Map_Manager_T.h @@ -66,10 +66,10 @@ class ACE_Hash_Multi_Map_Entry ~ACE_Hash_Multi_Map_Entry () = default; /// Key accessor. - EXT_ID& key (void); + EXT_ID& key (); /// Item accessor. - ACE_Unbounded_Set& item (void); + ACE_Unbounded_Set& item (); public: /// Key used to look up an entry. @@ -222,13 +222,13 @@ class ACE_Hash_Multi_Map_Manager /// Close down a Hash_Multi_Map_Manager and release dynamically allocated /// resources. - int close (void); + int close (); /// Removes all the entries in Hash_Multi_Map_Manager. - int unbind_all (void); + int unbind_all (); /// Cleanup the Hash_Multi_Map_Manager. - ~ACE_Hash_Multi_Map_Manager (void); + ~ACE_Hash_Multi_Map_Manager (); /** * Associate @a ext_id with @a int_id. If @a ext_id and @a int_id is already @@ -406,7 +406,7 @@ class ACE_Hash_Multi_Map_Manager * guard the state of an iterator. * @note The right name would be lock, but HP/C++ will choke on that! */ - ACE_LOCK &mutex (void); + ACE_LOCK &mutex (); /// Dump the state of an object. void dump () const; @@ -414,12 +414,12 @@ class ACE_Hash_Multi_Map_Manager // = STL styled iterator factory functions. /// Return forward iterator. - ACE_Hash_Multi_Map_Iterator begin (void); - ACE_Hash_Multi_Map_Iterator end (void); + ACE_Hash_Multi_Map_Iterator begin (); + ACE_Hash_Multi_Map_Iterator end (); /// Return reverse iterator. - ACE_Hash_Multi_Map_Reverse_Iterator rbegin (void); - ACE_Hash_Multi_Map_Reverse_Iterator rend (void); + ACE_Hash_Multi_Map_Reverse_Iterator rbegin (); + ACE_Hash_Multi_Map_Reverse_Iterator rend (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -539,11 +539,11 @@ class ACE_Hash_Multi_Map_Manager /// Close down a Map_Manager. Must be called with /// locks held. - int close_i (void); + int close_i (); /// Removes all the entries in Map_Manager. Must be called with /// locks held. - int unbind_all_i (void); + int unbind_all_i (); /// Pointer to a memory allocator used for table_, so it should /// supply size*sizeof (@c ACE_Hash_Multi_Map_Entry<@c EXT_ID, @c INT_ID>), @@ -572,7 +572,7 @@ class ACE_Hash_Multi_Map_Manager size_t &loc); /// Accessor of the underlying table - ACE_Hash_Multi_Map_Entry *table (void); + ACE_Hash_Multi_Map_Entry *table (); /// Accessor of the current size attribute size_t cur_size () const; @@ -632,7 +632,7 @@ class ACE_Hash_Multi_Map_Iterator_Base /// Returns reference the @c Hash_Multi_Map_Manager that is being iterated /// over. - ACE_Hash_Multi_Map_Manager& map (void); + ACE_Hash_Multi_Map_Manager& map (); /// Check if two iterators point to the same position bool operator== (const ACE_Hash_Multi_Map_Iterator_Base &) const; @@ -644,11 +644,11 @@ class ACE_Hash_Multi_Map_Iterator_Base protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backward by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Dump the state of an object. void dump_i () const; @@ -698,7 +698,7 @@ class ACE_Hash_Multi_Map_Const_Iterator_Base /// Returns reference the @c Hash_Multi_Map_Manager that is being iterated /// over. - const ACE_Hash_Multi_Map_Manager& map (void); + const ACE_Hash_Multi_Map_Manager& map (); /// Check if two iterators point to the same position bool operator== (const ACE_Hash_Multi_Map_Const_Iterator_Base &) const; @@ -710,11 +710,11 @@ class ACE_Hash_Multi_Map_Const_Iterator_Base protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backward by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Dump the state of an object. void dump_i () const; @@ -752,7 +752,7 @@ class ACE_Hash_Multi_Map_Iterator : public ACE_Hash_Multi_Map_Iterator_Base &operator++ (void); + ACE_Hash_Multi_Map_Iterator &operator++ (); /// Postfix advance. ACE_Hash_Multi_Map_Iterator operator++ (int); /// Prefix reverse. - ACE_Hash_Multi_Map_Iterator &operator-- (void); + ACE_Hash_Multi_Map_Iterator &operator-- (); /// Postfix reverse. ACE_Hash_Multi_Map_Iterator operator-- (int); @@ -797,7 +797,7 @@ class ACE_Hash_Multi_Map_Const_Iterator : public ACE_Hash_Multi_Map_Const_Iterat // = Iteration methods. /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. void dump () const; @@ -805,13 +805,13 @@ class ACE_Hash_Multi_Map_Const_Iterator : public ACE_Hash_Multi_Map_Const_Iterat // = STL styled iteration, compare, and reference functions. /// Prefix advance. - ACE_Hash_Multi_Map_Const_Iterator &operator++ (void); + ACE_Hash_Multi_Map_Const_Iterator &operator++ (); /// Postfix advance. ACE_Hash_Multi_Map_Const_Iterator operator++ (int); /// Prefix reverse. - ACE_Hash_Multi_Map_Const_Iterator &operator-- (void); + ACE_Hash_Multi_Map_Const_Iterator &operator-- (); /// Postfix reverse. ACE_Hash_Multi_Map_Const_Iterator operator-- (int); @@ -850,13 +850,13 @@ class ACE_Hash_Multi_Map_Bucket_Iterator // = STL styled iteration, compare, and reference functions. /// Prefix advance. - ACE_Hash_Multi_Map_Bucket_Iterator &operator++ (void); + ACE_Hash_Multi_Map_Bucket_Iterator &operator++ (); /// Postfix advance. ACE_Hash_Multi_Map_Bucket_Iterator operator++ (int); /// Prefix reverse. - ACE_Hash_Multi_Map_Bucket_Iterator &operator-- (void); + ACE_Hash_Multi_Map_Bucket_Iterator &operator-- (); /// Postfix reverse. ACE_Hash_Multi_Map_Bucket_Iterator operator-- (int); @@ -869,7 +869,7 @@ class ACE_Hash_Multi_Map_Bucket_Iterator /// Returns reference the Hash_Multi_Map_Manager that is being iterated /// over. - ACE_Hash_Multi_Map_Manager& map (void); + ACE_Hash_Multi_Map_Manager& map (); /// Check if two iterators point to the same position bool operator== (const ACE_Hash_Multi_Map_Bucket_Iterator &) const; @@ -878,11 +878,11 @@ class ACE_Hash_Multi_Map_Bucket_Iterator protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backward by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Map we are iterating over. ACE_Hash_Multi_Map_Manager *map_man_; @@ -917,7 +917,7 @@ class ACE_Hash_Multi_Map_Reverse_Iterator : public ACE_Hash_Multi_Map_Iterator_B // = Iteration methods. /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. void dump () const; @@ -925,13 +925,13 @@ class ACE_Hash_Multi_Map_Reverse_Iterator : public ACE_Hash_Multi_Map_Iterator_B // = STL styled iteration, compare, and reference functions. /// Prefix reverse. - ACE_Hash_Multi_Map_Reverse_Iterator &operator++ (void); + ACE_Hash_Multi_Map_Reverse_Iterator &operator++ (); /// Postfix reverse. ACE_Hash_Multi_Map_Reverse_Iterator operator++ (int); /// Prefix advance. - ACE_Hash_Multi_Map_Reverse_Iterator &operator-- (void); + ACE_Hash_Multi_Map_Reverse_Iterator &operator-- (); /// Postfix advance. ACE_Hash_Multi_Map_Reverse_Iterator operator-- (int); @@ -946,13 +946,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Hash_Multi_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Multi_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Hash_Multi_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HASH_MULTI_MAP_MANAGER_T_H */ diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.inl b/ACE/ace/Hash_Multi_Map_Manager_T.inl index 27bd2cc1f222d..b73d1c5371298 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.inl +++ b/ACE/ace/Hash_Multi_Map_Manager_T.inl @@ -31,7 +31,7 @@ ACE_Hash_Multi_Map_Manager::AC } template ACE_INLINE int -ACE_Hash_Multi_Map_Manager::close (void) +ACE_Hash_Multi_Map_Manager::close () { ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); @@ -39,7 +39,7 @@ ACE_Hash_Multi_Map_Manager::cl } template ACE_INLINE int -ACE_Hash_Multi_Map_Manager::unbind_all (void) +ACE_Hash_Multi_Map_Manager::unbind_all () { ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); @@ -47,7 +47,7 @@ ACE_Hash_Multi_Map_Manager::un } template ACE_INLINE -ACE_Hash_Multi_Map_Manager::~ACE_Hash_Multi_Map_Manager (void) +ACE_Hash_Multi_Map_Manager::~ACE_Hash_Multi_Map_Manager () { this->close (); } @@ -65,7 +65,7 @@ ACE_Hash_Multi_Map_Manager::to } template ACE_INLINE ACE_LOCK & -ACE_Hash_Multi_Map_Manager::mutex (void) +ACE_Hash_Multi_Map_Manager::mutex () { ACE_TRACE ("ACE_Hash_Multi_Map_Manager::mutex"); return this->lock_; @@ -419,35 +419,35 @@ ACE_Hash_Multi_Map_Manager::re template ACE_INLINE ACE_Hash_Multi_Map_Iterator -ACE_Hash_Multi_Map_Manager::begin (void) +ACE_Hash_Multi_Map_Manager::begin () { return ACE_Hash_Multi_Map_Iterator (*this); } template ACE_INLINE ACE_Hash_Multi_Map_Iterator -ACE_Hash_Multi_Map_Manager::end (void) +ACE_Hash_Multi_Map_Manager::end () { return ACE_Hash_Multi_Map_Iterator (*this, 1); } template ACE_INLINE ACE_Hash_Multi_Map_Reverse_Iterator -ACE_Hash_Multi_Map_Manager::rbegin (void) +ACE_Hash_Multi_Map_Manager::rbegin () { return ACE_Hash_Multi_Map_Reverse_Iterator (*this); } template ACE_INLINE ACE_Hash_Multi_Map_Reverse_Iterator -ACE_Hash_Multi_Map_Manager::rend (void) +ACE_Hash_Multi_Map_Manager::rend () { return ACE_Hash_Multi_Map_Reverse_Iterator (*this, 1); } template ACE_INLINE ACE_Hash_Multi_Map_Entry * -ACE_Hash_Multi_Map_Manager::table (void) +ACE_Hash_Multi_Map_Manager::table () { return this->table_; } @@ -533,7 +533,7 @@ ACE_Hash_Multi_Map_Iterator_Base ACE_INLINE ACE_Hash_Multi_Map_Manager& -ACE_Hash_Multi_Map_Iterator_Base::map (void) +ACE_Hash_Multi_Map_Iterator_Base::map () { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base::map"); return *this->map_man_; @@ -631,7 +631,7 @@ ACE_Hash_Multi_Map_Const_Iterator_Base ACE_INLINE const ACE_Hash_Multi_Map_Manager& -ACE_Hash_Multi_Map_Const_Iterator_Base::map (void) +ACE_Hash_Multi_Map_Const_Iterator_Base::map () { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base::map"); return *this->map_man_; @@ -677,7 +677,7 @@ ACE_Hash_Multi_Map_Iterator::A } template ACE_INLINE int -ACE_Hash_Multi_Map_Iterator::advance (void) +ACE_Hash_Multi_Map_Iterator::advance () { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator::advance"); return this->forward_i (); @@ -685,9 +685,9 @@ ACE_Hash_Multi_Map_Iterator::a template ACE_INLINE ACE_Hash_Multi_Map_Iterator & -ACE_Hash_Multi_Map_Iterator::operator++ (void) +ACE_Hash_Multi_Map_Iterator::operator++ () { - ACE_TRACE ("ACE_Hash_Multi_Map_Iterator::operator++ (void)"); + ACE_TRACE ("ACE_Hash_Multi_Map_Iterator::operator++ ()"); this->forward_i (); return *this; @@ -706,9 +706,9 @@ ACE_Hash_Multi_Map_Iterator::o template ACE_INLINE ACE_Hash_Multi_Map_Iterator & -ACE_Hash_Multi_Map_Iterator::operator-- (void) +ACE_Hash_Multi_Map_Iterator::operator-- () { - ACE_TRACE ("ACE_Hash_Multi_Map_Iterator::operator-- (void)"); + ACE_TRACE ("ACE_Hash_Multi_Map_Iterator::operator-- ()"); this->reverse_i (); return *this; @@ -747,7 +747,7 @@ ACE_Hash_Multi_Map_Const_Iterator ACE_INLINE int -ACE_Hash_Multi_Map_Const_Iterator::advance (void) +ACE_Hash_Multi_Map_Const_Iterator::advance () { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator::advance"); return this->forward_i (); @@ -755,9 +755,9 @@ ACE_Hash_Multi_Map_Const_Iterator ACE_INLINE ACE_Hash_Multi_Map_Const_Iterator & -ACE_Hash_Multi_Map_Const_Iterator::operator++ (void) +ACE_Hash_Multi_Map_Const_Iterator::operator++ () { - ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator::operator++ (void)"); + ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator::operator++ ()"); this->forward_i (); return *this; @@ -776,9 +776,9 @@ ACE_Hash_Multi_Map_Const_Iterator ACE_INLINE ACE_Hash_Multi_Map_Const_Iterator & -ACE_Hash_Multi_Map_Const_Iterator::operator-- (void) +ACE_Hash_Multi_Map_Const_Iterator::operator-- () { - ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator::operator-- (void)"); + ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator::operator-- ()"); this->reverse_i (); return *this; @@ -812,9 +812,9 @@ ACE_Hash_Multi_Map_Bucket_Iterator ACE_INLINE ACE_Hash_Multi_Map_Bucket_Iterator & -ACE_Hash_Multi_Map_Bucket_Iterator::operator++ (void) +ACE_Hash_Multi_Map_Bucket_Iterator::operator++ () { - ACE_TRACE ("ACE_Hash_Multi_Map_Bucket_Iterator::operator++ (void)"); + ACE_TRACE ("ACE_Hash_Multi_Map_Bucket_Iterator::operator++ ()"); this->forward_i (); return *this; @@ -833,9 +833,9 @@ ACE_Hash_Multi_Map_Bucket_Iterator ACE_INLINE ACE_Hash_Multi_Map_Bucket_Iterator & -ACE_Hash_Multi_Map_Bucket_Iterator::operator-- (void) +ACE_Hash_Multi_Map_Bucket_Iterator::operator-- () { - ACE_TRACE ("ACE_Hash_Multi_Map_Bucket_Iterator::operator-- (void)"); + ACE_TRACE ("ACE_Hash_Multi_Map_Bucket_Iterator::operator-- ()"); this->reverse_i (); return *this; @@ -853,7 +853,7 @@ ACE_Hash_Multi_Map_Bucket_Iterator int -ACE_Hash_Multi_Map_Bucket_Iterator::forward_i (void) +ACE_Hash_Multi_Map_Bucket_Iterator::forward_i () { ACE_TRACE ("ACE_Hash_Multi_Map_Bucket_Iterator::forward_i"); @@ -862,7 +862,7 @@ ACE_Hash_Multi_Map_Bucket_Iterator int -ACE_Hash_Multi_Map_Bucket_Iterator::reverse_i (void) +ACE_Hash_Multi_Map_Bucket_Iterator::reverse_i () { ACE_TRACE ("ACE_Hash_Multi_Map_Bucket_Iterator::reverse_i"); @@ -890,7 +890,7 @@ ACE_Hash_Multi_Map_Bucket_Iterator ACE_INLINE ACE_Hash_Multi_Map_Manager & -ACE_Hash_Multi_Map_Bucket_Iterator::map (void) +ACE_Hash_Multi_Map_Bucket_Iterator::map () { ACE_TRACE ("ACE_Hash_Multi_Map_Bucket_Iterator::map"); return *this->map_man_; @@ -935,7 +935,7 @@ ACE_Hash_Multi_Map_Reverse_Iterator ACE_INLINE int -ACE_Hash_Multi_Map_Reverse_Iterator::advance (void) +ACE_Hash_Multi_Map_Reverse_Iterator::advance () { ACE_TRACE ("ACE_Hash_Multi_Map_Reverse_Iterator::advance"); return this->reverse_i (); @@ -943,9 +943,9 @@ ACE_Hash_Multi_Map_Reverse_Iterator ACE_INLINE ACE_Hash_Multi_Map_Reverse_Iterator & -ACE_Hash_Multi_Map_Reverse_Iterator::operator++ (void) +ACE_Hash_Multi_Map_Reverse_Iterator::operator++ () { - ACE_TRACE ("ACE_Hash_Multi_Map_Reverse_Iterator::operator++ (void)"); + ACE_TRACE ("ACE_Hash_Multi_Map_Reverse_Iterator::operator++ ()"); this->reverse_i (); return *this; @@ -964,9 +964,9 @@ ACE_Hash_Multi_Map_Reverse_Iterator ACE_INLINE ACE_Hash_Multi_Map_Reverse_Iterator & -ACE_Hash_Multi_Map_Reverse_Iterator::operator-- (void) +ACE_Hash_Multi_Map_Reverse_Iterator::operator-- () { - ACE_TRACE ("ACE_Hash_Multi_Map_Reverse_Iterator::operator-- (void)"); + ACE_TRACE ("ACE_Hash_Multi_Map_Reverse_Iterator::operator-- ()"); this->forward_i (); return *this; diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp index ef30f0833fb0e..1546cd03d0706 100644 --- a/ACE/ace/High_Res_Timer.cpp +++ b/ACE/ace/High_Res_Timer.cpp @@ -227,7 +227,7 @@ ACE_High_Res_Timer::global_scale_factor () #endif /* (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ ACE_HAS_PENTIUM) && \ ! ACE_HAS_HI_RES_TIMER && - ((WIN32 && ! WINCE) || ghs || __GNUG__) */ + ((WIN32) || ghs || __GNUG__) */ return ACE_High_Res_Timer::global_scale_factor_; } diff --git a/ACE/ace/High_Res_Timer.h b/ACE/ace/High_Res_Timer.h index ff4d544159b4f..6c94f3566d3eb 100644 --- a/ACE/ace/High_Res_Timer.h +++ b/ACE/ace/High_Res_Timer.h @@ -29,7 +29,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief A high resolution timer class wrapper that encapsulates * OS-specific high-resolution timers, such as those found on - * Solaris, AIX, Win32/Pentium, and VxWorks. + * Win32/Pentium, and VxWorks. * * Most of the member functions don't return values. The only * reason that one would fail is if high-resolution time isn't @@ -58,9 +58,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This is probably not a problem profiling code, but could be * on if the high resolution timer class is used to initiate * actions after a "long" timeout. - * On Solaris, a scale factor of 1000 should be used because its - * high-resolution timer returns nanoseconds. However, on Intel - * platforms, we use RDTSC which returns the number of clock + * On Intel platforms, we use RDTSC which returns the number of clock * ticks since system boot. For a 200MHz cpu, each clock tick * is 1/200 of a microsecond; the global_scale_factor_ should * therefore be 200 or 200000 if it's in unit/millisecond. @@ -75,8 +73,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * you query for your @c timer.stop() value might not be the one * you queried for @c timer.start(). Its not clear how much * divergence there would be, if any. - * This issue is not mentioned in the Solaris 2.5.1 gethrtime - * man page. * A RDTSC NOTE: RDTSC is the Intel Pentium read-time stamp counter * and is actualy a 64 bit clock cycle counter, which is increased * with every cycle. It has a low overhead and can be read within @@ -109,7 +105,7 @@ class ACE_Export ACE_High_Res_Timer * global_scale_factor_. This allows applications to set the scale * factor just once for all High_Res_Timers. Check * High_Res_Timer.cpp for the default global_scale_factors for - * several platforms. For many platforms (e.g., Solaris), the + * several platforms. For many platforms the * global_scale_factor_ is set to 1000 so that need * not be set. Careful, a of 0 will cause division * by zero exceptions. diff --git a/ACE/ace/ICMP_Socket.h b/ACE/ace/ICMP_Socket.h index 79dbcb72c9215..c4495fa226d63 100644 --- a/ACE/ace/ICMP_Socket.h +++ b/ACE/ace/ICMP_Socket.h @@ -43,7 +43,6 @@ class ACE_Export ACE_ICMP_Socket : public ACE_SOCK * Data transfer routines. */ //@{ - /// Send an @a n byte @a buf to the datagram socket (uses /// @c sendto(3) ). ssize_t send (void const * buf, diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp index de9abf60c7727..58140d71ad428 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -49,20 +49,12 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[], + 5 // ACE_OS::strlen ("65535"), Assuming the max port number. + 1 // sizeof (':'), addr/port sep + 1; // sizeof ('\0'), terminating NUL -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_TCHAR const *format = ACE_TEXT("%ls:%d"); -#else - ACE_TCHAR const *format = ACE_TEXT("%s:%d"); -#endif /* !ACE_WIN32 && ACE_USES_WCHAR */ + ACE_TCHAR const *format = ACE_TEXT("%") ACE_TEXT_PRIs ACE_TEXT(":%d"); #if defined (ACE_HAS_IPV6) if (ACE_OS::strchr (hoststr, ACE_TEXT (':')) != 0) { total_len += 2; // ACE_OS::strlen ("[]") IPv6 addr frames -# if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - format = ACE_TEXT("[%ls]:%d"); -# else - format = ACE_TEXT("[%s]:%d"); -# endif /* !ACE_WIN32 && ACE_USES_WCHAR */ + format = ACE_TEXT("[%") ACE_TEXT_PRIs ACE_TEXT("]:%d"); } #endif // ACE_HAS_IPV6 @@ -983,7 +975,6 @@ int ACE_INET_Addr::set_address (const char *ip_addr, // Here with an unrecognized length. errno = EAFNOSUPPORT; return -1; - } #if (defined (ACE_LINUX) || defined (ACE_WIN32)) && defined (ACE_HAS_IPV6) @@ -1009,7 +1000,6 @@ ACE_INET_Addr::set_interface (const char *intf_name) } else return 0; - } #endif /* ACE_LINUX && ACE_HAS_IPV6 */ diff --git a/ACE/ace/IOStream.cpp b/ACE/ace/IOStream.cpp index a4158b00140b3..8d282688785fb 100644 --- a/ACE/ace/IOStream.cpp +++ b/ACE/ace/IOStream.cpp @@ -85,7 +85,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_HANDLE -ACE_Streambuf::get_handle (void) +ACE_Streambuf::get_handle () { return 0; } @@ -106,7 +106,7 @@ ACE_Streambuf::recv_timeout (ACE_Time_Value *tv) } int -ACE_Streambuf::underflow (void) +ACE_Streambuf::underflow () { // If input mode is not set, any attempt to read from the stream is // a failure. @@ -314,7 +314,7 @@ ACE_Streambuf::overflow (int c) // syncin int -ACE_Streambuf::syncin (void) +ACE_Streambuf::syncin () { // As discussed, there really isn't any way to sync input from a // socket-like device. We specifially override this base-class @@ -325,7 +325,7 @@ ACE_Streambuf::syncin (void) // syncout int -ACE_Streambuf::syncout (void) +ACE_Streambuf::syncout () { // Unlike syncin, syncout is a doable thing. All we have to do is // write whatever is in the output buffer to the peer. flushbuf () @@ -338,7 +338,7 @@ ACE_Streambuf::syncout (void) } int -ACE_Streambuf::sync (void) +ACE_Streambuf::sync () { // sync () is fairly traditional in that it syncs both input and // output. We could have omitted the call to syncin () but someday, @@ -358,7 +358,7 @@ ACE_Streambuf::sync (void) // flushbuf int -ACE_Streambuf::flushbuf (void) +ACE_Streambuf::flushbuf () { // pptr () is one character beyond the last character put into the // buffer. pbase () points to the beginning of the put buffer. @@ -415,7 +415,7 @@ ACE_Streambuf::flushbuf (void) } int -ACE_Streambuf::get_one_byte (void) +ACE_Streambuf::get_one_byte () { this->timeout_ = 0; @@ -439,7 +439,7 @@ ACE_Streambuf::get_one_byte (void) // (ie -- gptr == egptr). int -ACE_Streambuf::fillbuf (void) +ACE_Streambuf::fillbuf () { // Invoke recv_n to get exactly one byte from the remote. This will // block until something shows up. @@ -485,7 +485,7 @@ ACE_Streambuf::ACE_Streambuf (u_int streambuf_size, int io_mode) } u_int -ACE_Streambuf::streambuf_size (void) +ACE_Streambuf::streambuf_size () { return streambuf_size_; } @@ -494,7 +494,7 @@ ACE_Streambuf::streambuf_size (void) // gptr. u_int -ACE_Streambuf::get_waiting (void) +ACE_Streambuf::get_waiting () { return this->gptr_saved_ - this->eback_saved_; } @@ -503,7 +503,7 @@ ACE_Streambuf::get_waiting (void) // gotten); eback + get_avail = egptr. u_int -ACE_Streambuf::get_avail (void) +ACE_Streambuf::get_avail () { return this->egptr_saved_ - this->eback_saved_; } @@ -512,7 +512,7 @@ ACE_Streambuf::get_avail (void) // pbase + put_avail = pptr. u_int -ACE_Streambuf::put_avail (void) +ACE_Streambuf::put_avail () { return this->pptr_saved_ - this->pbase_saved_; } @@ -624,7 +624,7 @@ ACE_Streambuf::reset_put_buffer (char *newBuffer, } void -ACE_Streambuf::reset_base (void) +ACE_Streambuf::reset_base () { // Until we experience the first get or put operation, we do not // know what our current IO mode is. @@ -642,13 +642,13 @@ ACE_Streambuf::reset_base (void) // would be deleted when the object destructs. Since we are providing // separate read/write buffers, it is up to us to manage their memory. -ACE_Streambuf::~ACE_Streambuf (void) +ACE_Streambuf::~ACE_Streambuf () { delete [] this->eback_saved_; delete [] this->pbase_saved_; } -u_char ACE_Streambuf::timeout (void) +u_char ACE_Streambuf::timeout () { u_char rval = this->timeout_; this->timeout_ = 0; diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h index 51f94101ae0a7..38ebe09059365 100644 --- a/ACE/ace/IOStream.h +++ b/ACE/ace/IOStream.h @@ -45,7 +45,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Quoted_String : public ACE_IOStream_String { public: - inline ACE_Quoted_String (void) { *this = ""; } + inline ACE_Quoted_String () { *this = ""; } inline ACE_Quoted_String (const char *c) { *this = ACE_IOStream_String (c); } inline ACE_Quoted_String (const ACE_IOStream_String &s) { *this = s; } inline ACE_Quoted_String &operator= (const ACE_IOStream_String& s) @@ -62,7 +62,7 @@ class ACE_Export ACE_Quoted_String : public ACE_IOStream_String return *(ACE_IOStream_String *) this < (ACE_IOStream_String) s; } # if defined (ACE_WIN32) && defined (_MSC_VER) - inline int length (void) { return this->GetLength (); } + inline int length () { return this->GetLength (); } # endif /* ACE_WIN32 && defined (_MSC_VER) */ }; @@ -128,14 +128,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Streambuf : public streambuf { public: - /** * If the default allocation strategy were used the common buffer * would be deleted when the object destructs. Since we are * providing separate read/write buffers, it is up to us to manage * their memory. */ - virtual ~ACE_Streambuf (void); + virtual ~ACE_Streambuf (); /// Get the current Time_Value pointer and provide a new one. ACE_Time_Value *recv_timeout (ACE_Time_Value *tv = 0); @@ -155,7 +154,7 @@ class ACE_Export ACE_Streambuf : public streambuf /// Return the number of bytes to be 'put' onto the stream media. /// pbase + put_avail = pptr - u_int put_avail (void); + u_int put_avail (); /** * Use this to allocate a new/different buffer for get operations. @@ -173,18 +172,18 @@ class ACE_Export ACE_Streambuf : public streambuf /// Return the number of bytes not yet gotten. eback + get_waiting = /// gptr - u_int get_waiting (void); + u_int get_waiting (); /// Return the number of bytes in the get area (includes some already /// gotten); eback + get_avail = egptr - u_int get_avail (void); + u_int get_avail (); /// Query the streambuf for the size of its buffers. - u_int streambuf_size (void); + u_int streambuf_size (); /// Did we take an error because of an IO operation timeout? /// @note Invoking this resets the flag. - u_char timeout (void); + u_char timeout (); protected: ACE_Streambuf (u_int streambuf_size, @@ -192,10 +191,10 @@ class ACE_Export ACE_Streambuf : public streambuf /// Sync both input and output. See syncin/syncout below for /// descriptions. - virtual int sync (void); + virtual int sync (); // = Signatures for the underflow/overflow discussed above. - virtual int underflow (void); + virtual int underflow (); /// The overflow function receives the character which caused the /// overflow. @@ -203,7 +202,7 @@ class ACE_Export ACE_Streambuf : public streambuf /// Resets the pointer and streambuf mode. This is used /// internally when get/put buffers are allocatd. - void reset_base (void); + void reset_base (); protected: // = Two pointer sets for manipulating the read/write areas. @@ -246,22 +245,22 @@ class ACE_Export ACE_Streambuf : public streambuf * filebuf, the single common buffer is used forcing the * call. */ - int syncin (void); + int syncin (); /// syncout() is called when the output needs to be flushed. This is /// easily done by calling the peer's send_n function. - int syncout (void); + int syncout (); /// flushbuf() is the worker of syncout. It is a separate function /// because it gets used sometimes in different context. - int flushbuf (void); + int flushbuf (); /** * fillbuf is called in a couple of places. This is the worker of * underflow. It will attempt to fill the read buffer from the * peer. */ - int fillbuf (void); + int fillbuf (); /** * Used by fillbuf and others to get exactly one byte from the peer. @@ -269,7 +268,7 @@ class ACE_Export ACE_Streambuf : public streambuf * It is virtual because we really need to override it for * datagram-derived objects. */ - virtual int get_one_byte (void); + virtual int get_one_byte (); /** * Stream connections and "unconnected connections" (ie -- @@ -291,7 +290,7 @@ class ACE_Export ACE_Streambuf : public streambuf int flags = 0, ACE_Time_Value *tv = 0) = 0; - virtual ACE_HANDLE get_handle (void); + virtual ACE_HANDLE get_handle (); # if !defined (ACE_USES_OLD_IOSTREAMS) char *base () const @@ -315,7 +314,7 @@ class ACE_Export ACE_Streambuf : public streambuf setbuf (b, (eb - b)); } - int out_waiting (void) + int out_waiting () { return pptr () - pbase (); } @@ -344,16 +343,6 @@ typedef ostream& (*__omanip_)(ostream&); // operators. Notice how the and functions are used. #define GET_SIG(MT,DT) inline virtual MT& operator>> (DT v) -# if (defined (__SUNPRO_CC) && __SUNPRO_CC > 0x510) -#define GET_CODE { \ - if (ipfx (0)) \ - { \ - (*((istream*)this)) >> (v); \ - } \ - isfx (); \ - return *this; \ - } -# else #define GET_CODE { \ if (ipfx (0)) \ { \ @@ -362,7 +351,6 @@ typedef ostream& (*__omanip_)(ostream&); isfx (); \ return *this; \ } -# endif #define GET_PROT(MT,DT,CODE) GET_SIG(MT,DT) CODE #define GET_FUNC(MT,DT) GET_PROT(MT,DT,GET_CODE) @@ -371,16 +359,6 @@ typedef ostream& (*__omanip_)(ostream&); // operators. Notice how the and functions are used. #define PUT_SIG(MT,DT) inline virtual MT& operator<< (DT v) -# if (defined (__SUNPRO_CC) && __SUNPRO_CC > 0x510) -#define PUT_CODE { \ - if (opfx ()) \ - { \ - (*((ostream *) this)) << (v); \ - } \ - osfx (); \ - return *this; \ - } -# else #define PUT_CODE { \ if (opfx ()) \ { \ @@ -389,7 +367,6 @@ typedef ostream& (*__omanip_)(ostream&); osfx (); \ return *this; \ } -# endif #define PUT_PROT(MT,DT,CODE) PUT_SIG(MT,DT) CODE #define PUT_FUNC(MT,DT) PUT_PROT(MT,DT,PUT_CODE) @@ -443,10 +420,6 @@ typedef ostream& (*__omanip_)(ostream&); inline virtual MT& operator<<(__omanip_ func) CODE2 \ inline virtual MT& operator<<(__manip_ func) CODE2 -# if defined (ACE_LACKS_SIGNED_CHAR) - #define GET_FUNC_SET1(MT,CODE,CODE2) GET_FUNC_SET0(MT,CODE,CODE2) - #define PUT_FUNC_SET1(MT,CODE,CODE2) PUT_FUNC_SET0(MT,CODE,CODE2) -# else #define GET_FUNC_SET1(MT,CODE,CODE2) \ GET_PROT(MT,signed char &,CODE) \ GET_PROT(MT,signed char *,CODE) \ @@ -456,7 +429,6 @@ typedef ostream& (*__omanip_)(ostream&); PUT_FUNC(MT,signed char) \ PUT_FUNC(MT,const signed char *) \ PUT_FUNC_SET0(MT,CODE,CODE2) -# endif /* ACE_LACKS_SIGNED_CHAR */ #define GET_MANIP_CODE { if (ipfx ()) { (*func) (*this); } isfx (); return *this; } #define PUT_MANIP_CODE { if (opfx ()) { (*func) (*this); } osfx (); return *this; } diff --git a/ACE/ace/IOStream_T.cpp b/ACE/ace/IOStream_T.cpp index f0d10ad35a9a9..a3d8dd9b4d8a3 100644 --- a/ACE/ace/IOStream_T.cpp +++ b/ACE/ace/IOStream_T.cpp @@ -89,7 +89,7 @@ ACE_Streambuf_T::recv_n (char *buf, } template ACE_HANDLE -ACE_Streambuf_T::get_handle (void) +ACE_Streambuf_T::get_handle () { return peer_ ? peer_->get_handle () : 0; } @@ -124,7 +124,7 @@ ACE_IOStream::ACE_IOStream (u_int streambuf_size) // iostream () template -ACE_IOStream::~ACE_IOStream (void) +ACE_IOStream::~ACE_IOStream () { delete this->streambuf_; } @@ -133,7 +133,7 @@ ACE_IOStream::~ACE_IOStream (void) // function. template int -ACE_IOStream::close (void) +ACE_IOStream::close () { return STREAM::close (); } diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h index 49ddbf0ad095b..0ac556978a59c 100644 --- a/ACE/ace/IOStream_T.h +++ b/ACE/ace/IOStream_T.h @@ -68,7 +68,7 @@ class ACE_Streambuf_T : public ACE_Streambuf ACE_Time_Value *tv = 0); protected: - virtual ACE_HANDLE get_handle (void); + virtual ACE_HANDLE get_handle (); /// This will be our ACE_SOCK_Stream or similar object. STREAM *peer_; @@ -119,11 +119,11 @@ class ACE_IOStream : public iostream, public STREAM /// We have to get rid of the ourselves since we gave it /// to the base class; - virtual ~ACE_IOStream (void); + virtual ~ACE_IOStream (); /// The only ambiguity in the multiple inheritance is the /// function. - virtual int close (void); + virtual int close (); /** * Returns 1 if we're at the end of the , i.e., if the @@ -169,9 +169,9 @@ class ACE_IOStream : public iostream, public STREAM setstate (failbit); return (0); } - virtual int ipfx0 (void) // Optimized ipfx(0) + virtual int ipfx0 () // Optimized ipfx(0) { return ipfx (0); } - virtual int ipfx1 (void) // Optimized ipfx(1) + virtual int ipfx1 () // Optimized ipfx(1) { if (good ()) { @@ -183,26 +183,26 @@ class ACE_IOStream : public iostream, public STREAM setstate (failbit); return (0); } - virtual void isfx (void) { return; } - virtual int opfx (void) + virtual void isfx () { return; } + virtual int opfx () { if (good () && tie () != 0) tie ()->flush (); return good (); } - virtual void osfx (void) { if (flags () & unitbuf) flush (); } + virtual void osfx () { if (flags () & unitbuf) flush (); } # else # if defined (__GNUC__) - virtual int ipfx0 (void) { return iostream::ipfx0 (); } // Optimized ipfx(0) - virtual int ipfx1 (void) { return iostream::ipfx1 (); } // Optimized ipfx(1) + virtual int ipfx0 () { return iostream::ipfx0 (); } // Optimized ipfx(0) + virtual int ipfx1 () { return iostream::ipfx1 (); } // Optimized ipfx(1) # else - virtual int ipfx0 (void) { return iostream::ipfx (0); } - virtual int ipfx1 (void) { return iostream::ipfx (1); } + virtual int ipfx0 () { return iostream::ipfx (0); } + virtual int ipfx1 () { return iostream::ipfx (1); } # endif /* __GNUC__ */ virtual int ipfx (int need = 0) { return iostream::ipfx (need); } - virtual void isfx (void) { iostream::isfx (); } - virtual int opfx (void) { return iostream::opfx (); } - virtual void osfx (void) { iostream::osfx (); } + virtual void isfx () { iostream::isfx (); } + virtual int opfx () { return iostream::opfx (); } + virtual void osfx () { iostream::osfx (); } # endif /* ACE_LACKS_IOSTREAM_FX */ /// Allow the programmer to provide a timeout for read operations. @@ -243,7 +243,7 @@ template class ACE_SOCK_Dgram_SC : public STREAM { public: - ACE_SOCK_Dgram_SC (void); + ACE_SOCK_Dgram_SC (); ACE_SOCK_Dgram_SC (STREAM &source, ACE_INET_Addr &dest); ssize_t send_n (char *buf, ssize_t len); @@ -266,18 +266,11 @@ class ACE_SOCK_Dgram_SC : public STREAM ACE_END_VERSIONED_NAMESPACE_DECL -# if defined (__ACE_INLINE__) -# include "ace/IOStream_T.inl" -# endif /* __ACE_INLINE__ */ +#if defined (__ACE_INLINE__) +# include "ace/IOStream_T.inl" +#endif /* __ACE_INLINE__ */ -# if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/IOStream_T.cpp" -# endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -# if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation ("IOStream_T.cpp") -# endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ -#endif /* ACE_LACKS_ACE_IOSTREAM */ +#include "ace/IOStream_T.cpp" #include /**/ "ace/post.h" #endif /* ACE_IOSTREAM_T_H */ diff --git a/ACE/ace/IOStream_T.inl b/ACE/ace/IOStream_T.inl index 800b2db181ad1..16940be018774 100644 --- a/ACE/ace/IOStream_T.inl +++ b/ACE/ace/IOStream_T.inl @@ -33,7 +33,7 @@ ACE_IOStream::eof () const } template ACE_INLINE -ACE_SOCK_Dgram_SC::ACE_SOCK_Dgram_SC (void) +ACE_SOCK_Dgram_SC::ACE_SOCK_Dgram_SC () { } diff --git a/ACE/ace/If_Then_Else.h b/ACE/ace/If_Then_Else.h index 626b331f8fc75..9d645e026e8e8 100644 --- a/ACE/ace/If_Then_Else.h +++ b/ACE/ace/If_Then_Else.h @@ -78,7 +78,6 @@ namespace ACE { typedef Tb result_type; }; - } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Init_ACE.h b/ACE/ace/Init_ACE.h index dbf06ead97bb7..e1fe742717420 100644 --- a/ACE/ace/Init_ACE.h +++ b/ACE/ace/Init_ACE.h @@ -37,7 +37,7 @@ namespace ACE * @return Returns 0 on success, -1 on failure, and 1 if it had * already been called. */ - extern ACE_Export int init (void); + extern ACE_Export int init (); /** * Finalize the ACE library services and releases ACE's internal @@ -48,7 +48,7 @@ namespace ACE * @return Returns 0 on success, -1 on failure, and 1 if it had already been * called. */ - extern ACE_Export int fini (void); + extern ACE_Export int fini (); // private: // Used internally, so not exported. diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h index 7757e6d5c0c69..88357cf0215e1 100644 --- a/ACE/ace/Intrusive_Auto_Ptr.h +++ b/ACE/ace/Intrusive_Auto_Ptr.h @@ -140,13 +140,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Intrusive_Auto_Ptr.inl" #endif /* __ACE_INLINE __ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Intrusive_Auto_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_Auto_Ptr.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h index c5017cd730c61..58a820a840b4a 100644 --- a/ACE/ace/Intrusive_List.h +++ b/ACE/ace/Intrusive_List.h @@ -124,13 +124,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Intrusive_List.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Intrusive_List.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_List.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_INTRUSIVE_LIST_H */ diff --git a/ACE/ace/Intrusive_List_Node.h b/ACE/ace/Intrusive_List_Node.h index 8fe5c40b2053e..73506d48ba703 100644 --- a/ACE/ace/Intrusive_List_Node.h +++ b/ACE/ace/Intrusive_List_Node.h @@ -70,13 +70,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Intrusive_List_Node.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Intrusive_List_Node.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_List_Node.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_INTRUSIVE_LIST_NODE_H */ diff --git a/ACE/ace/LOCK_SOCK_Acceptor.cpp b/ACE/ace/LOCK_SOCK_Acceptor.cpp index 65a5512ba8047..400517cf40b8b 100644 --- a/ACE/ace/LOCK_SOCK_Acceptor.cpp +++ b/ACE/ace/LOCK_SOCK_Acceptor.cpp @@ -23,7 +23,7 @@ ACE_LOCK_SOCK_Acceptor::accept (ACE_SOCK_Stream &stream, } template ACE_LOCK & -ACE_LOCK_SOCK_Acceptor::lock (void) +ACE_LOCK_SOCK_Acceptor::lock () { return this->lock_; } diff --git a/ACE/ace/LOCK_SOCK_Acceptor.h b/ACE/ace/LOCK_SOCK_Acceptor.h index b4e099ba285d2..07d3a46210ab4 100644 --- a/ACE/ace/LOCK_SOCK_Acceptor.h +++ b/ACE/ace/LOCK_SOCK_Acceptor.h @@ -26,11 +26,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief Specialize ACE_SOCK_Acceptor to lock around ; * - * This class is necessary since some OS platforms (e.g., - * Solaris 2.5) do not allow multiple threads/processes to - * simultaneously call on the same listen-mode - * port/socket. Thus, we need to protect against multiple - * concurrent accesses by using the appropriate type of lock. + * This class is necessary since some OS platforms do not allow + * multiple threads/processes to simultaneously call @c accept + * on the same listen-mode port/socket. Thus, we need to + * protect against multiple concurrent accesses by using + * the appropriate type of lock. */ template class ACE_LOCK_SOCK_Acceptor : public ACE_SOCK_Acceptor @@ -53,13 +53,7 @@ class ACE_LOCK_SOCK_Acceptor : public ACE_SOCK_Acceptor ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/LOCK_SOCK_Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("LOCK_SOCK_Acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_LOCK_SOCK_ACCEPTOR_H */ diff --git a/ACE/ace/LSOCK.inl b/ACE/ace/LSOCK.inl index 7e7d9d1d6bfe2..0f569adea13e9 100644 --- a/ACE/ace/LSOCK.inl +++ b/ACE/ace/LSOCK.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Simple-minded constructor. ACE_INLINE -ACE_LSOCK::ACE_LSOCK (void) +ACE_LSOCK::ACE_LSOCK () : aux_handle_ (ACE_INVALID_HANDLE) { ACE_TRACE ("ACE_LSOCK::ACE_LSOCK"); diff --git a/ACE/ace/LSOCK_Acceptor.h b/ACE/ace/LSOCK_Acceptor.h index 330101fcc7504..8459ba4806ef8 100644 --- a/ACE/ace/LSOCK_Acceptor.h +++ b/ACE/ace/LSOCK_Acceptor.h @@ -40,7 +40,7 @@ class ACE_Export ACE_LSOCK_Acceptor : public ACE_SOCK_Acceptor { public: /// Default constructor. - ACE_LSOCK_Acceptor (void); + ACE_LSOCK_Acceptor (); /// Initiate a passive mode socket. ACE_LSOCK_Acceptor (const ACE_Addr &local_sap, @@ -65,7 +65,7 @@ class ACE_Export ACE_LSOCK_Acceptor : public ACE_SOCK_Acceptor /// Close down the ACE_LSOCK and remove the rendezvous point from the /// file system. - int remove (void); + int remove (); /// Return the local endpoint address. int get_local_addr (ACE_Addr &) const; diff --git a/ACE/ace/LSOCK_CODgram.inl b/ACE/ace/LSOCK_CODgram.inl index 21091814f9c00..17886def5d5e2 100644 --- a/ACE/ace/LSOCK_CODgram.inl +++ b/ACE/ace/LSOCK_CODgram.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Do nothing constructor. ACE_INLINE -ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (void) +ACE_LSOCK_CODgram::ACE_LSOCK_CODgram () { ACE_TRACE ("ACE_LSOCK_CODgram::ACE_LSOCK_CODgram"); } diff --git a/ACE/ace/LSOCK_Dgram.h b/ACE/ace/LSOCK_Dgram.h index 4c859a516b135..79d52e0ecb8d1 100644 --- a/ACE/ace/LSOCK_Dgram.h +++ b/ACE/ace/LSOCK_Dgram.h @@ -35,7 +35,7 @@ class ACE_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK { public: /// Default constructor. - ACE_LSOCK_Dgram (void); + ACE_LSOCK_Dgram (); /// Initiate a local dgram. ACE_LSOCK_Dgram (const ACE_Addr &local, diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index 650412aafadf4..085ed0b938e45 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -16,102 +16,6 @@ # include "ace/OS_NS_strings.h" #endif /* ACE_WIN32 */ -#if defined (ACE_OPENVMS) -#include "ace/RB_Tree.h" -#include "ace/Thread_Mutex.h" -#include "ace/Singleton.h" - -#include /**/ "descrip.h" -#include /**/ "chfdef.h" -#include /**/ "stsdef.h" -#include /**/ "libdef.h" - -extern "C" int LIB$FIND_IMAGE_SYMBOL(...); - -/** - * @internal - * - * Implements a class to register symbols and addresses for use with DLL - * symbol retrieval. - * - * OpenVMS restricts symbol length to 31 characters encoding any symbols - * longer than that. In these cases dlsym() only works with the encoded - * names. - * This creates serious problems for the service configurator framework - * where the factory method names often exceed 31 chars and where loading - * is based on retrieval of method pointers using the *full* name. - * For OpenVMS we therefor added this singleton class and the - * ACE_Dynamic_Svc_Registrar class which registers full names and function - * pointers with this singleton at the time the static ACE_Dynamic_Svc_Registrar - * object is created in a (service) DLL. - * By forcing the DLL to load using a common symbol ("NULL") we trigger static - * object creation *before* the full names are referenced. - * Symbol references will be resolved as follows on OpenVMS: - * - first try directly from DLL using the RTL dlsym() function and if that fails; - * - try to find symbol in singleton registry. - */ -class ACE_LD_Symbol_Registry -{ -public: - typedef ACE_RB_Tree, - ACE_Thread_Mutex> - TREE; - - void register_symbol (const ACE_TCHAR* symname, void* symaddr); - - void* find_symbol (const ACE_TCHAR* symname); - - ACE_LD_Symbol_Registry () = default; - -private: - TREE symbol_registry_; -}; - -void -ACE_LD_Symbol_Registry::register_symbol (const ACE_TCHAR* symname, - void* symaddr) -{ - int const result = symbol_registry_.bind (symname, symaddr); - if (result == 1) - { - ACELIB_DEBUG((LM_INFO, ACE_TEXT ("ACE_LD_Symbol_Registry:") - ACE_TEXT (" duplicate symbol %s registered\n"), - ACE_TEXT_ALWAYS_CHAR (symname))); - } - else if (result == -1) - { - ACELIB_ERROR((LM_ERROR, ACE_TEXT ("ACE_LD_Symbol_Registry:") - ACE_TEXT (" failed to register symbol %s\n"), - ACE_TEXT_ALWAYS_CHAR (symname))); - } -} - -void* -ACE_LD_Symbol_Registry::find_symbol (const ACE_TCHAR* symname) -{ - void* symaddr = 0; - int const result = symbol_registry_.find (symname, symaddr); - - return (result == 0 ? symaddr : 0); -} - -/// Declare a process wide singleton -ACE_SINGLETON_DECLARE (ACE_Singleton, - ACE_LD_Symbol_Registry, - ACE_Thread_Mutex) - -typedef ACE_Singleton - ACE_LD_SYMBOL_REGISTRY; - -ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_LD_Symbol_Registry, ACE_SYNCH_MUTEX); - - -#endif - - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL int @@ -120,86 +24,15 @@ ACE::ldfind (const ACE_TCHAR* filename, size_t maxpathnamelen) { ACE_TRACE ("ACE::ldfind"); -#if defined (ACE_OPENVMS) - if (ACE_OS::strlen (filename) >= maxpathnamelen) - { - errno = ENOMEM; - return -1; - } - - dsc$descriptor nameDsc; - nameDsc.dsc$b_class = DSC$K_CLASS_S; - nameDsc.dsc$b_dtype = DSC$K_DTYPE_T; - nameDsc.dsc$w_length = ACE_OS::strlen (filename); - nameDsc.dsc$a_pointer = (char*)filename; - - char symbol[] = "NULL"; - dsc$descriptor symbolDsc; - symbolDsc.dsc$b_class = DSC$K_CLASS_S; - symbolDsc.dsc$b_dtype = DSC$K_DTYPE_T; - symbolDsc.dsc$w_length = ACE_OS::strlen (symbol); - symbolDsc.dsc$a_pointer = symbol; - int symbolValue; - int result; - try - { - result = LIB$FIND_IMAGE_SYMBOL (&nameDsc, &symbolDsc, &symbolValue, 0, 0); - } - catch (chf$signal_array &sig) - { - result = sig.chf$l_sig_name; - } - - int severity = result & STS$M_SEVERITY; - int conditionId = result & STS$M_COND_ID; - if (severity == STS$K_SUCCESS || severity == STS$K_WARNING || severity == STS$K_INFO || - (severity == STS$K_ERROR && conditionId == (LIB$_KEYNOTFOU & STS$M_COND_ID))) - { - ACE_OS::strcpy (pathname, filename); - return 0; - } - - if (ACE_OS::strlen (filename) + ACE_OS::strlen (ACE_DLL_PREFIX) >= maxpathnamelen) - { - errno = ENOMEM; - return -1; - } - - - ACE_OS::strcpy (pathname, ACE_DLL_PREFIX); - ACE_OS::strcat (pathname, filename); - nameDsc.dsc$w_length = ACE_OS::strlen (pathname); - nameDsc.dsc$a_pointer = pathname; - try - { - result = LIB$FIND_IMAGE_SYMBOL (&nameDsc, &symbolDsc, &symbolValue, 0, 0); - } - catch (chf$signal_array &sig) - { - result = sig.chf$l_sig_name; - } - - severity = result & STS$M_SEVERITY; - conditionId = result & STS$M_COND_ID; - if (severity == STS$K_SUCCESS || severity == STS$K_WARNING || severity == STS$K_INFO || - (severity == STS$K_ERROR && conditionId == (LIB$_KEYNOTFOU & STS$M_COND_ID))) - { - return 0; - } - errno = ENOENT; - return -1; -#endif /* ACE_OPENVMS */ - -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && \ - !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) ACE_TCHAR expanded_filename[MAXPATHLEN]; if (ACE_TEXT_ExpandEnvironmentStrings (filename, expanded_filename, sizeof expanded_filename / sizeof (ACE_TCHAR))) filename = expanded_filename; -#endif /* ACE_WIN32 && !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ ACE_TCHAR tempcopy[MAXPATHLEN + 1]; ACE_TCHAR searchpathname[MAXPATHLEN + 1]; @@ -339,7 +172,7 @@ ACE::ldfind (const ACE_TCHAR* filename, // OS platform). else { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) ACE_TCHAR *file_component = 0; DWORD pathlen = ACE_TEXT_SearchPath (0, @@ -390,29 +223,6 @@ ACE::ldfind (const ACE_TCHAR* filename, # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ # endif /* ACE_DEFAULT_LD_SEARCH_PATH */ -#if defined (ACE_HAS_WINCE) - ACE_TCHAR *ld_path_temp = 0; - if (ld_path != 0) - { - ld_path_temp = (ACE_TCHAR *) - ACE_OS::malloc ((ACE_OS::strlen (ld_path) + 2) - * sizeof (ACE_TCHAR)); - if (ld_path_temp != 0) - { - ACE_OS::strcpy (ld_path_temp, - ACE_LD_SEARCH_PATH_SEPARATOR_STR); - - ACE_OS::strcat (ld_path_temp, ld_path); - ld_path = ld_path_temp; - } - else - { - ACE_OS::free ((void *) ld_path_temp); - ld_path = ld_path_temp = 0; - } - } -#endif /* ACE_HAS_WINCE */ - if (ld_path != 0 && (ld_path = ACE_OS::strdup (ld_path)) != 0) { @@ -493,10 +303,6 @@ ACE::ldfind (const ACE_TCHAR* filename, nextholder); } -#if defined (ACE_HAS_WINCE) - if (ld_path_temp != 0) - ACE_OS::free (ld_path_temp); -#endif /* ACE_HAS_WINCE */ #if defined (ACE_HAS_ALLOC_HOOKS) ACE_Allocator::instance()->free ((void *) ld_path); #else @@ -507,7 +313,7 @@ ACE::ldfind (const ACE_TCHAR* filename, #endif /* ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ return result; } -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } #if defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) } @@ -573,29 +379,6 @@ ACE::ldname (const ACE_TCHAR *entry_point) #endif /* ACE_NEEDS_DL_UNDERSCORE */ } -#if defined (ACE_OPENVMS) -void -ACE::ldregister (const ACE_TCHAR *entry_point, - void* entry_addr) -{ - ACE_LD_SYMBOL_REGISTRY::instance ()->register_symbol (entry_point, - entry_addr); -} - -void * -ACE::ldsymbol (ACE_SHLIB_HANDLE sh, const ACE_TCHAR *entry_point) -{ - void* symaddr = ACE_OS::dlsym (sh, entry_point); - // if not found through dlsym() try registry - if (!symaddr) - { - symaddr = ACE_LD_SYMBOL_REGISTRY::instance ()->find_symbol (entry_point); - } - - return symaddr; -} -#endif - int ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len) { diff --git a/ACE/ace/Lib_Find.h b/ACE/ace/Lib_Find.h index 3c72a1fc5723b..6496a93dc4d2e 100644 --- a/ACE/ace/Lib_Find.h +++ b/ACE/ace/Lib_Find.h @@ -16,9 +16,6 @@ #include /**/ "ace/config-all.h" #include /**/ "ace/ACE_export.h" #include "ace/os_include/os_stdio.h" -#if defined (ACE_OPENVMS) -# include "ace/OS_NS_dlfcn.h" -#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -57,26 +54,6 @@ namespace ACE */ extern ACE_Export ACE_TCHAR *ldname (const ACE_TCHAR *entry_point); - -#if defined (ACE_OPENVMS) - /** - * Registers an @a entry_point and its address for later retrieval - * through the ACE::ldsymbol () method. - * For use in cases where the OS compiler encodes long symbolnames. - */ - extern ACE_Export void ldregister (const ACE_TCHAR *entry_point, - void* entry_addr); - - /** - * Looks up an @a entry_point address either from previously registered - * symbols or through ACE_OS::dlsym (). - * Returns 0 in case the entry_point is not found, otherwise nonzero. - * For use in cases where the OS compiler encodes long symbolnames. - */ - extern ACE_Export void *ldsymbol (ACE_SHLIB_HANDLE sh, - const ACE_TCHAR *entry_point); -#endif - /** * Returns the temporary directory including the trailing slash in * @a buffer. Returns -1 for an error or if the buffer_len is not diff --git a/ACE/ace/Local_Memory_Pool.h b/ACE/ace/Local_Memory_Pool.h index ecf5e38ec0f98..0df0631a9be8b 100644 --- a/ACE/ace/Local_Memory_Pool.h +++ b/ACE/ace/Local_Memory_Pool.h @@ -52,7 +52,7 @@ class ACE_Export ACE_Local_Memory_Pool ACE_Local_Memory_Pool (const ACE_TCHAR *backing_store_name = 0, const OPTIONS *options = 0); - virtual ~ACE_Local_Memory_Pool (void); + virtual ~ACE_Local_Memory_Pool (); /// Ask system for initial chunk of local memory. virtual void *init_acquire (size_t nbytes, diff --git a/ACE/ace/Local_Name_Space.h b/ACE/ace/Local_Name_Space.h index ea7845baa8fce..b2bf2948b9fad 100644 --- a/ACE/ace/Local_Name_Space.h +++ b/ACE/ace/Local_Name_Space.h @@ -39,7 +39,7 @@ class ACE_Export ACE_NS_String public: // = Initialization. /// Default "no-op" constructor. - ACE_NS_String (void); + ACE_NS_String (); /// Initialization method. ACE_NS_String (ACE_WCHAR_T *dst, @@ -50,7 +50,7 @@ class ACE_Export ACE_NS_String ACE_NS_String (const ACE_NS_WString &); /// Destructor - ~ACE_NS_String (void); + ~ACE_NS_String (); /// Converts an ACE_NS_String to fresh copy of an ACE_NS_WString; operator ACE_NS_WString () const; @@ -98,7 +98,7 @@ class ACE_Export ACE_NS_Internal { public: /// No-op constructor. - ACE_NS_Internal (void); + ACE_NS_Internal (); /// Constructor. ACE_NS_Internal (ACE_NS_String &value, const char *type); @@ -107,10 +107,10 @@ class ACE_Export ACE_NS_Internal bool operator == (const ACE_NS_Internal &) const; /// Return value. - ACE_NS_String value (void); + ACE_NS_String value (); /// Return type. - const char *type (void); + const char *type (); private: /// Contains the value of the string. diff --git a/ACE/ace/Local_Name_Space_T.cpp b/ACE/ace/Local_Name_Space_T.cpp index 27a17710d4a00..91390fafd6304 100644 --- a/ACE/ace/Local_Name_Space_T.cpp +++ b/ACE/ace/Local_Name_Space_T.cpp @@ -139,7 +139,6 @@ ACE_Local_Name_Space::shared_bind_i ( const char *type, int rebind) { - ACE_TRACE ("ACE_Local_Name_Space::shared_bind_i"); const size_t name_len = (name.length () + 1) * sizeof (ACE_WCHAR_T); const size_t value_len = (value.length () + 1) * sizeof (ACE_WCHAR_T); @@ -232,7 +231,6 @@ ACE_Local_Name_Space::unbind ( { } return result; - } template int @@ -360,7 +358,7 @@ ACE_Local_Name_Space::open ( } template -ACE_Local_Name_Space::ACE_Local_Name_Space (void) +ACE_Local_Name_Space::ACE_Local_Name_Space () : allocator_ (0), name_space_map_ (0), name_options_ (0) @@ -383,7 +381,7 @@ ACE_Local_Name_Space::ACE_Local_Name_Space ( } template -ACE_Local_Name_Space::~ACE_Local_Name_Space (void) +ACE_Local_Name_Space::~ACE_Local_Name_Space () { ACE_TRACE ("ACE_Local_Name_Space::~ACE_Local_Name_Space"); @@ -395,7 +393,7 @@ ACE_Local_Name_Space::~ACE_Local_Name_Space (void) ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Local_Name_Space) template int -ACE_Local_Name_Space::create_manager (void) +ACE_Local_Name_Space::create_manager () { // Note that we *must* use structured exception handling here // because (1) we may need to commit virtual memory pages and (2) @@ -413,7 +411,7 @@ ACE_Local_Name_Space::create_manager (void) template int -ACE_Local_Name_Space::create_manager_i (void) +ACE_Local_Name_Space::create_manager_i () { ACE_TRACE ("ACE_Local_Name_Space::create_manager_i"); // Get directory name @@ -441,8 +439,7 @@ ACE_Local_Name_Space::create_manager_i (void) ACE_TCHAR lock_name_for_backing_store [MAXPATHLEN + MAXNAMELEN]; const ACE_TCHAR *postfix = database; - size_t length = 0; - length = sizeof lock_name_for_local_name_space / sizeof (ACE_TCHAR); + size_t length = sizeof lock_name_for_local_name_space / sizeof (ACE_TCHAR); ACE_OS::strsncpy (lock_name_for_local_name_space, dir, length); diff --git a/ACE/ace/Local_Name_Space_T.h b/ACE/ace/Local_Name_Space_T.h index 531e2a3e18ef5..04dc0e5acd2cf 100644 --- a/ACE/ace/Local_Name_Space_T.h +++ b/ACE/ace/Local_Name_Space_T.h @@ -122,7 +122,7 @@ class ACE_Local_Name_Space : public ACE_Name_Space /// Destructor, do some cleanup :TBD: last dtor should "compress" /// file - ~ACE_Local_Name_Space (void); + ~ACE_Local_Name_Space (); /// Bind a new name to a naming context (Wide character strings). virtual int bind (const ACE_NS_WString &name, @@ -229,8 +229,8 @@ class ACE_Local_Name_Space : public ACE_Name_Space /// Allocate the appropriate type of map manager that stores the /// key/value binding. - int create_manager (void); - int create_manager_i (void); + int create_manager (); + int create_manager_i (); /// Pointer to the allocator ALLOCATOR *allocator_; @@ -254,13 +254,7 @@ class ACE_Local_Name_Space : public ACE_Name_Space ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Local_Name_Space_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Local_Name_Space_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_LOCAL_NAME_SPACE_T_H */ diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp index 85fe6d8bb675d..215517c315700 100644 --- a/ACE/ace/Local_Tokens.cpp +++ b/ACE/ace/Local_Tokens.cpp @@ -28,7 +28,7 @@ ACE_Tokens::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_Tokens::ACE_Tokens (void) +ACE_Tokens::ACE_Tokens () : visited_ (0), reference_count_ (0) { @@ -114,7 +114,7 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_Token_Proxy *new_proxy, } } -ACE_TPQ_Entry::ACE_TPQ_Entry (void) +ACE_TPQ_Entry::ACE_TPQ_Entry () : cond_var_ (lock_), proxy_ (0), nesting_level_ (0), @@ -130,7 +130,7 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_TPQ_Entry &rhs) *this = rhs; } -ACE_TPQ_Entry::~ACE_TPQ_Entry (void) +ACE_TPQ_Entry::~ACE_TPQ_Entry () { ACE_TRACE ("ACE_TPQ_Entry::~ACE_TPQ_Entry"); } @@ -196,7 +196,7 @@ ACE_TSS_TPQ_Entry::make_TSS_TYPE () const return temp; } -ACE_TSS_TPQ_Entry::operator ACE_TPQ_Entry * (void) +ACE_TSS_TPQ_Entry::operator ACE_TPQ_Entry * () { #if !defined (ACE_NO_TSS_TOKENS) return (ACE_TPQ_Entry *) (*((ACE_TSS *) this)); @@ -236,7 +236,7 @@ ACE_TPQ_Iterator::done () const } void -ACE_TPQ_Iterator::advance (void) +ACE_TPQ_Iterator::advance () { ACE_TRACE ("ACE_TPQ_Iterator::advance"); @@ -276,7 +276,7 @@ ACE_Token_Proxy_Queue::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_Token_Proxy_Queue::ACE_Token_Proxy_Queue (void) +ACE_Token_Proxy_Queue::ACE_Token_Proxy_Queue () : head_ (0), tail_ (0), size_ (0) @@ -337,7 +337,7 @@ ACE_Token_Proxy_Queue::enqueue (ACE_TPQ_Entry *tpq, } void -ACE_Token_Proxy_Queue::dequeue (void) +ACE_Token_Proxy_Queue::dequeue () { ACE_TRACE ("ACE_Token_Proxy_Queue::dequeue"); @@ -447,7 +447,7 @@ ACE_Mutex_Token::ACE_Mutex_Token (const ACE_TCHAR *name) ACE_MAXTOKENNAMELEN); } -ACE_Mutex_Token::~ACE_Mutex_Token (void) +ACE_Mutex_Token::~ACE_Mutex_Token () { ACE_TRACE ("ACE_Mutex_Token::~ACE_Mutex_Token"); } @@ -704,7 +704,7 @@ ACE_RW_Token::ACE_RW_Token (const ACE_TCHAR *name) ACE_MAXTOKENNAMELEN); } -ACE_RW_Token::~ACE_RW_Token (void) +ACE_RW_Token::~ACE_RW_Token () { ACE_TRACE ("ACE_RW_Token::~ACE_RW_Token"); } @@ -1103,7 +1103,7 @@ ACE_Token_Proxy::client_id (const ACE_TCHAR *client_id) } const ACE_TCHAR * -ACE_Token_Proxy::owner_id (void) +ACE_Token_Proxy::owner_id () { ACE_TRACE ("ACE_Token_Proxy::owner_id"); return this->token_->owner_id (); @@ -1120,7 +1120,7 @@ ACE_Token_Proxy::name () const # pragma warning (push) # pragma warning (disable:4355) /* Use of 'this' in initializer list */ #endif -ACE_Token_Proxy::ACE_Token_Proxy (void) +ACE_Token_Proxy::ACE_Token_Proxy () : token_ (0), waiter_ (this, 0) { @@ -1142,7 +1142,7 @@ ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &) #endif // @@ should I do a mutex_->release ()? -ACE_Token_Proxy::~ACE_Token_Proxy (void) +ACE_Token_Proxy::~ACE_Token_Proxy () { ACE_TRACE ("ACE_Token_Proxy::~ACE_Token_Proxy"); @@ -1407,7 +1407,7 @@ ACE_Token_Proxy::remove (ACE_Synch_Options &) } void -ACE_Token_Proxy::sleep_hook (void) +ACE_Token_Proxy::sleep_hook () { ACE_TRACE ("ACE_Token_Proxy::sleep_hook"); // Somebody wants our token! (Let'em wait...) @@ -1522,13 +1522,13 @@ ACE_Local_Mutex::create_token (const ACE_TCHAR *name) return temp; } -ACE_Local_Mutex::~ACE_Local_Mutex (void) +ACE_Local_Mutex::~ACE_Local_Mutex () { } // ************************************************************ -ACE_Local_RLock::~ACE_Local_RLock (void) +ACE_Local_RLock::~ACE_Local_RLock () { } @@ -1562,7 +1562,7 @@ ACE_Local_RLock::clone () const // ************************************************************ -ACE_Local_WLock::~ACE_Local_WLock (void) +ACE_Local_WLock::~ACE_Local_WLock () { } diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h index 6b13715214310..fcfe7766c3eef 100644 --- a/ACE/ace/Local_Tokens.h +++ b/ACE/ace/Local_Tokens.h @@ -109,7 +109,7 @@ class ACE_Export ACE_TPQ_Entry typedef void (*PTVF) (void *); /// Null constructor. - ACE_TPQ_Entry (void); + ACE_TPQ_Entry (); /// Constructor. ACE_TPQ_Entry (const ACE_Token_Proxy *proxy, @@ -119,7 +119,7 @@ class ACE_Export ACE_TPQ_Entry ACE_TPQ_Entry (const ACE_TPQ_Entry &rhs); /// Destructor. - ~ACE_TPQ_Entry (void); + ~ACE_TPQ_Entry (); /// Copy operator use by the queue. void operator= (const ACE_TPQ_Entry &rhs); @@ -155,7 +155,7 @@ class ACE_Export ACE_TPQ_Entry PTVF sleep_hook () const; /// Call the sleep hook function or method passing arg. - void call_sleep_hook (void); + void call_sleep_hook (); /// Dump the state of the class. void dump () const; @@ -222,13 +222,13 @@ class ACE_Export ACE_TSS_TPQ_Entry : public ACE_TPQ_ENTRY virtual ACE_TPQ_Entry *make_TSS_TYPE () const; /// Operator overloading and inheritance don't mix. - operator ACE_TPQ_Entry *(void); + operator ACE_TPQ_Entry *(); /// Dump the state of the class. void dump () const; #if defined (ACE_NO_TSS_TOKENS) - ACE_TPQ_Entry *operator-> (void) + ACE_TPQ_Entry *operator-> () { return (ACE_TPQ_Entry *) this; } @@ -274,7 +274,7 @@ class ACE_Export ACE_TPQ_Iterator int done () const; /// Move forward by one element in the queue. - void advance (void); + void advance (); /// Dump the state of an object. void dump () const; @@ -304,7 +304,7 @@ class ACE_Export ACE_Token_Proxy_Queue friend class ACE_TPQ_Iterator; /// Constructor. - ACE_Token_Proxy_Queue (void); + ACE_Token_Proxy_Queue (); /// Destructor. ~ACE_Token_Proxy_Queue () = default; @@ -318,19 +318,19 @@ class ACE_Export ACE_Token_Proxy_Queue int position); /// Top of the queue. - const ACE_TPQ_Entry* head (void); + const ACE_TPQ_Entry* head (); // int member (const ACE_TCHAR *id); // Is this id in the waiter list? /// Remove the top waiter. - void dequeue (void); + void dequeue (); /// Remove the waiter whose proxy ref matches @a remove_me. void remove (const ACE_TPQ_Entry *remove_me); /// The number of waiters. - int size (void); + int size (); /// Dump the state of the class. void dump () const; @@ -412,22 +412,22 @@ class ACE_Export ACE_Tokens virtual int is_owner (const ACE_TCHAR *id) = 0; /// Return the queue of waiters. - virtual ACE_Token_Proxy_Queue *waiters (void); + virtual ACE_Token_Proxy_Queue *waiters (); /// Return the number of proxies that are currently waiting to get /// the token. - virtual int no_of_waiters (void); + virtual int no_of_waiters (); /// The current owner. - const ACE_TCHAR *owner_id (void); + const ACE_TCHAR *owner_id (); /// Token name. - const ACE_TCHAR* name (void); + const ACE_TCHAR* name (); // = Reference counting. These are only called by the // Token_Manager. - void inc_reference (void); - int dec_reference (void); + void inc_reference (); + int dec_reference (); /// Dump the state of the class. void dump () const; @@ -453,10 +453,10 @@ class ACE_Export ACE_Tokens void visit (int v); /// Check if the token has been visited. - int visited (void); + int visited (); /// All the data of the current owner. - ACE_TPQ_Entry *owner (void); + ACE_TPQ_Entry *owner (); protected: /// For the deadlock detection algorithm. @@ -497,7 +497,7 @@ class ACE_Export ACE_Mutex_Token : public ACE_Tokens explicit ACE_Mutex_Token (const ACE_TCHAR* name); /// Destructor - virtual ~ACE_Mutex_Token (void); + virtual ~ACE_Mutex_Token (); // = Synchronization operations. // With acquire, renew, and release, the caller must be specified so @@ -592,7 +592,7 @@ class ACE_Export ACE_RW_Token : public ACE_Tokens explicit ACE_RW_Token (const ACE_TCHAR* name); /// Destructor. - virtual ~ACE_RW_Token (void); + virtual ~ACE_RW_Token (); // = Synchronization operations. // With acquire, renew, and release, the caller must be specified so @@ -695,7 +695,7 @@ class ACE_Export ACE_Token_Name ACE_Token_Name (const ACE_Token_Name &rhs); /// Destructor. - virtual ~ACE_Token_Name (void); + virtual ~ACE_Token_Name (); /// Copy. void operator= (const ACE_Token_Name &rhs); @@ -751,10 +751,10 @@ class ACE_Export ACE_Token_Proxy // Initialization and termination methods. /// Construction. - ACE_Token_Proxy (void); + ACE_Token_Proxy (); /// Destructor. - virtual ~ACE_Token_Proxy (void); + virtual ~ACE_Token_Proxy (); /** * Open the . @@ -846,14 +846,14 @@ class ACE_Export ACE_Token_Proxy * by ACE_Token_xx's when another proxy enters the waiting list and * requests that the current token holder be notified. */ - virtual void sleep_hook (void); + virtual void sleep_hook (); /// This is called when a queued (waiting) proxy is removed from the /// waiters list and given the token. virtual void token_acquired (ACE_TPQ_Entry *); /// The client id of the current token holder - virtual const ACE_TCHAR *owner_id (void); + virtual const ACE_TCHAR *owner_id (); /// Return a dynamically allocated clone of the derived class. virtual ACE_Token_Proxy *clone () const = 0; @@ -975,7 +975,7 @@ class ACE_Export ACE_Local_Mutex : public ACE_Token_Proxy int debug = 0); /// Destructor - ~ACE_Local_Mutex (void); + ~ACE_Local_Mutex (); /// Dump the state of the class. void dump () const; @@ -1027,7 +1027,7 @@ class ACE_Export ACE_Local_RLock : public ACE_Token_Proxy int debug = 0); /// Destructor - ~ACE_Local_RLock (void); + ~ACE_Local_RLock (); /// Dump the state of the class. void dump () const; diff --git a/ACE/ace/Local_Tokens.inl b/ACE/ace/Local_Tokens.inl index 374b452a59f42..48c08462739bb 100644 --- a/ACE/ace/Local_Tokens.inl +++ b/ACE/ace/Local_Tokens.inl @@ -56,7 +56,7 @@ ACE_Tokens::remove (ACE_TPQ_Entry *caller) } ACE_INLINE int -ACE_Tokens::dec_reference (void) +ACE_Tokens::dec_reference () { ACE_TRACE ("ACE_Tokens::dec_reference"); if (this->reference_count_ == 0) @@ -69,14 +69,14 @@ ACE_Tokens::dec_reference (void) } ACE_INLINE void -ACE_Tokens::inc_reference (void) +ACE_Tokens::inc_reference () { ACE_TRACE ("ACE_Tokens::inc_reference"); ++this->reference_count_; } ACE_INLINE const ACE_TPQ_Entry * -ACE_Token_Proxy_Queue::head (void) +ACE_Token_Proxy_Queue::head () { ACE_TRACE ("ACE_Token_Proxy_Queue::head"); if (this->head_ == 0) @@ -95,14 +95,14 @@ ACE_Tokens::visit (int v) } ACE_INLINE int -ACE_Tokens::visited (void) +ACE_Tokens::visited () { ACE_TRACE ("ACE_Tokens::visited"); return visited_; } ACE_INLINE ACE_TPQ_Entry * -ACE_Tokens::owner (void) +ACE_Tokens::owner () { ACE_TRACE ("ACE_Tokens::owner"); return (ACE_TPQ_Entry *) this->waiters_.head (); @@ -119,7 +119,7 @@ ACE_Tokens::owner_id () } ACE_INLINE const ACE_TCHAR* -ACE_Tokens::name (void) +ACE_Tokens::name () { ACE_TRACE ("ACE_Tokens::name"); return this->token_name_; @@ -156,7 +156,7 @@ ACE_TPQ_Entry::sleep_hook (void (*sh)(void *)) } ACE_INLINE void -ACE_TPQ_Entry::call_sleep_hook (void) +ACE_TPQ_Entry::call_sleep_hook () { ACE_TRACE ("ACE_TPQ_Entry::call_sleep_hook"); diff --git a/ACE/ace/Lock_Adapter_T.h b/ACE/ace/Lock_Adapter_T.h index 360f2d024797c..dbc02adb6bba1 100644 --- a/ACE/ace/Lock_Adapter_T.h +++ b/ACE/ace/Lock_Adapter_T.h @@ -107,13 +107,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Lock_Adapter_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Lock_Adapter_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Lock_Adapter_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_LOCK_ADAPTER_T_H */ diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index c12d07f7c18cb..dd7e904b36eae 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -73,18 +73,18 @@ static ACE_Cleanup_Adapter* log_msg_cleanup = 0; class ACE_Msg_Log_Cleanup: public ACE_Cleanup_Adapter { public: - virtual ~ACE_Msg_Log_Cleanup (void) { + virtual ~ACE_Msg_Log_Cleanup () { if (this == log_msg_cleanup) log_msg_cleanup = 0; } }; #endif /* ACE_MT_SAFE */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_NT_Event_Log #elif defined (ACE_ANDROID) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_Android_Logcat -#elif !defined (ACE_LACKS_UNIX_SYSLOG) && !defined (ACE_HAS_WINCE) +#elif !defined (ACE_LACKS_UNIX_SYSLOG) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_UNIX_Syslog #endif @@ -1232,11 +1232,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, break; case 'N': // Source file name -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -#else - ACE_OS::strcpy (fp, ACE_TEXT ("s")); -#endif + ACE_OS::strcpy (fp, ACE_TEXT_PRIs); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, this->file () ? @@ -1251,11 +1247,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, break; case 'n': // Program name -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -#else /* ACE_WIN32 && ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_TEXT ("s")); -#endif + ACE_OS::strcpy (fp, ACE_TEXT_PRIs); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, ACE_Log_Msg::program_name_ ? @@ -1270,12 +1262,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, break; case 'P': // Process ID -#if defined (ACE_OPENVMS) - // Print the process id in hex on OpenVMS. - ACE_OS::strcpy (fp, ACE_TEXT ("x")); -#else ACE_OS::strcpy (fp, ACE_TEXT ("d")); -#endif if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, @@ -1408,11 +1395,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # if defined (ACE_WIN32) // Windows uses 'c' for a wide character ACE_OS::strcpy (fp, ACE_TEXT ("c")); # else // Other platforms behave differently -# if defined (HPUX) // HP-Unix compatible - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else // Other ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ # endif # else /* ACE_USES_WCHAR */ @@ -1495,11 +1478,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { // Nope, print out standard priority_name() string -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -#else - ACE_OS::strcpy (fp, ACE_TEXT ("s")); -#endif + ACE_OS::strcpy (fp, ACE_TEXT_PRIs); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, @@ -1529,11 +1508,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { #endif -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -#else /* ACE_WIN32 && ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_TEXT ("s")); -#endif + ACE_OS::strcpy (fp, ACE_TEXT_PRIs); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, ACE_TEXT_CHAR_TO_TCHAR (msg)); @@ -1713,11 +1688,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, sizeof (day_and_time) / sizeof (ACE_TCHAR), true); } -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -#else - ACE_OS::strcpy (fp, ACE_TEXT ("s")); -#endif + ACE_OS::strcpy (fp, ACE_TEXT_PRIs); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, day_and_time); @@ -1731,11 +1702,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // hour:minute:sec.usec format. { ACE_TCHAR day_and_time[27]; -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -#else - ACE_OS::strcpy (fp, ACE_TEXT ("s")); -#endif + ACE_OS::strcpy (fp, ACE_TEXT_PRIs); // Did we find the flag indicating a time value argument if (format[1] == ACE_TEXT('#')) { @@ -1810,11 +1777,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) wchar_t *str = va_arg (argp, wchar_t *); - ACE_OS::strcpy (fp, ACE_TEXT ("ls")); #else /* ACE_WIN32 && ACE_USES_WCHAR */ ACE_TCHAR *str = va_arg (argp, ACE_TCHAR *); - ACE_OS::strcpy (fp, ACE_TEXT ("s")); #endif /* ACE_WIN32 && ACE_USES_WCHAR */ + ACE_OS::strcpy (fp, ACE_TEXT_PRIs); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, str ? str : ACE_TEXT ("(null)")); @@ -1847,9 +1813,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { #if defined (ACE_HAS_WCHAR) wchar_t *wchar_str = va_arg (argp, wchar_t *); -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("S")); -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) ACE_OS::strcpy (fp, ACE_TEXT ("s")); # else /* ACE_USES_WCHAR */ @@ -1857,7 +1821,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # endif /* ACE_USES_WCHAR */ # else ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -# endif /* HPUX */ +# endif /* ACE_HAS_WCHAR */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, wchar_str ? wchar_str : ACE_TEXT_WIDE("(null)")); @@ -1883,11 +1847,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, this_len = ACE_OS::sprintf (bp, format, va_arg (argp, int)); #elif defined (ACE_USES_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, va_arg (argp, wint_t)); @@ -1919,11 +1879,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::strcpy (fp, ACE_TEXT ("C")); # endif /* ACE_USES_WCHAR */ #elif defined (ACE_USES_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ #else /* ACE_WIN32 */ ACE_OS::strcpy (fp, ACE_TEXT ("u")); #endif /* ACE_WIN32 */ @@ -1966,11 +1922,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::strcpy (fp, ACE_TEXT ("S")); # endif /* ACE_USES_WCHAR */ #elif defined (ACE_HAS_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("S")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -# endif /* HPUX */ #endif /* ACE_WIN32 / ACE_HAS_WCHAR */ if (can_check) this_len = ACE_OS::snprintf @@ -2543,7 +2495,7 @@ bool ACE_Log_Formatter::process_conversion () ACE_OS::strcpy (this->fp_, "ls"); return false; case 'Z': -#if (defined ACE_WIN32 && !defined ACE_USES_WCHAR) || defined HPUX +#if (defined ACE_WIN32 && !defined ACE_USES_WCHAR) ACE_OS::strcpy (this->fp_, "S"); #elif defined ACE_WIN32 ACE_OS::strcpy (this->fp_, "s"); @@ -2968,11 +2920,7 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority, if (text) wr_ptr += ACE_OS::snprintf (wr_ptr, end_ptr - wr_ptr, -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_TEXT ("%ls - "), -#else - ACE_TEXT ("%s - "), -#endif + ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" - "), text); wr_ptr += ACE_OS::snprintf (wr_ptr, diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index e3d1e462bce06..2608b6c0eb244 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -318,7 +318,6 @@ class ACE_Export ACE_Log_Msg * lock atomically over a number of calls to ACE_Log_Msg. */ //@{ - /// Acquire the internal lock. int acquire (); @@ -375,10 +374,6 @@ class ACE_Export ACE_Log_Msg /// restarted. bool restart () const; - // = Notice that the following two function is equivalent to - // "void msg_ostream (HANDLE)" and "HANDLE msg_ostream (void)" - // on Windows CE. There is no support on CE. - /// Update the ostream without overwriting the delete_ostream_ flag. void msg_ostream (ACE_OSTREAM_TYPE *); diff --git a/ACE/ace/Log_Msg_NT_Event_Log.h b/ACE/ace/Log_Msg_NT_Event_Log.h index a91fbab44571b..f5e972c9248e6 100644 --- a/ACE/ace/Log_Msg_NT_Event_Log.h +++ b/ACE/ace/Log_Msg_NT_Event_Log.h @@ -50,10 +50,10 @@ class ACE_Export ACE_Log_Msg_NT_Event_Log : public ACE_Log_Msg_Backend int open (const ACE_TCHAR *logger_key) override; /// Reset the backend. - int reset (void) override; + int reset () override; /// Close the backend completely. - int close (void) override; + int close () override; /// This is called when we want to log a message. ssize_t log (ACE_Log_Record &log_record) override; diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp index a97d63e023cac..ea4a782ffd66d 100644 --- a/ACE/ace/Log_Record.cpp +++ b/ACE/ace/Log_Record.cpp @@ -235,16 +235,6 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[], /* yyyy-mm-dd hh:mm:ss.mmmmmm */ ACE_TCHAR timestamp[27]; // Only used by VERBOSE and VERBOSE_LITE. - // The sprintf format needs to be different for Windows and POSIX - // in the wide-char case. -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - const ACE_TCHAR *verbose_fmt = ACE_TEXT ("%s@%s@%u@%s@%s"); - const ACE_TCHAR *verbose_lite_fmt = ACE_TEXT ("%s@%s@%s"); -#else - const ACE_TCHAR *verbose_fmt = ACE_TEXT ("%ls@%ls@%u@%ls@%ls"); - const ACE_TCHAR *verbose_lite_fmt = ACE_TEXT ("%ls@%ls@%ls"); -#endif - if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE) || ACE_BIT_ENABLED (verbose_flag, @@ -269,7 +259,10 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[], ? ACE_TEXT ("") : host_name); ACE_OS::snprintf (verbose_msg, verbose_msg_size, - verbose_fmt, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("@%") ACE_TEXT_PRIs + ACE_TEXT ("@%u@%") ACE_TEXT_PRIs + ACE_TEXT ("@%") ACE_TEXT_PRIs, timestamp, lhost_name, this->pid_, @@ -278,7 +271,9 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[], } else if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE_LITE)) ACE_OS::snprintf (verbose_msg, verbose_msg_size, - verbose_lite_fmt, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("@%") ACE_TEXT_PRIs + ACE_TEXT ("@%") ACE_TEXT_PRIs, timestamp, ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)), this->msg_data_); @@ -318,15 +313,9 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[], { int const verbose_msg_len = static_cast (ACE_OS::strlen (verbose_msg)); -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - int const fwrite_result = ACE_OS::fprintf (fp, - ACE_TEXT ("%ls"), - verbose_msg); -#else int const fwrite_result = ACE_OS::fprintf (fp, - ACE_TEXT ("%s"), + ACE_TEXT ("%") ACE_TEXT_PRIs, verbose_msg); -#endif // We should have written everything if (fwrite_result != verbose_msg_len) result = -1; diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h index 0cca3bfe1131c..152e2940eb43f 100644 --- a/ACE/ace/Log_Record.h +++ b/ACE/ace/Log_Record.h @@ -73,11 +73,11 @@ class ACE_Export ACE_Log_Record /// FILE if the corresponding type is enabled. int print (const ACE_TCHAR host_name[], u_long verbose_flag, -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_STDERR) +#if !defined (ACE_LACKS_STDERR) FILE *fp = stderr); #else FILE *fp); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_LACKS_STDERR */ #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) /// Write the contents of the logging record to the appropriate diff --git a/ACE/ace/MEM_Acceptor.h b/ACE/ace/MEM_Acceptor.h index dcf8cabaa0d4c..eebc834e5f67e 100644 --- a/ACE/ace/MEM_Acceptor.h +++ b/ACE/ace/MEM_Acceptor.h @@ -24,10 +24,7 @@ #include "ace/MEM_Stream.h" #include "ace/MEM_Addr.h" - -#if !defined (ACE_HAS_WINCE) #include "ace/OS_QoS.h" -#endif // ACE_HAS_WINCE ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -53,10 +50,10 @@ class ACE_Export ACE_MEM_Acceptor : public ACE_SOCK_Acceptor { public: /// Default constructor. - ACE_MEM_Acceptor (void); + ACE_MEM_Acceptor (); /// Destructor. - ~ACE_MEM_Acceptor (void); + ~ACE_MEM_Acceptor (); /// Initiate a passive mode socket. ACE_MEM_Acceptor (const ACE_MEM_Addr &remote_sap, @@ -151,14 +148,12 @@ class ACE_Export ACE_MEM_Acceptor : public ACE_SOCK_Acceptor bool restart = true, bool reset_new_handle = false) const; -#if !defined (ACE_HAS_WINCE) int accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, bool restart = true, bool reset_new_handle = false) const; -#endif // ACE_HAS_WINCE private: /// The filename prefix of the created mmap files. It should diff --git a/ACE/ace/MEM_Acceptor.inl b/ACE/ace/MEM_Acceptor.inl index 4d31ef56f20ac..35b2d9adaa2a0 100644 --- a/ACE/ace/MEM_Acceptor.inl +++ b/ACE/ace/MEM_Acceptor.inl @@ -27,7 +27,6 @@ ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, (new_stream, remote_addr, timeout, restart, reset_new_handle); } -#if !defined (ACE_HAS_WINCE) ACE_INLINE int ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, @@ -39,7 +38,6 @@ ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, return this->ACE_SOCK_Acceptor::accept (new_stream, qos_params, remote_addr, timeout, restart, reset_new_handle); } -#endif // ACE_HAS_WINCE ACE_INLINE int ACE_MEM_Acceptor::get_local_addr (ACE_MEM_Addr &sap) const diff --git a/ACE/ace/MEM_Connector.h b/ACE/ace/MEM_Connector.h index 1182198fa7442..334ab60590189 100644 --- a/ACE/ace/MEM_Connector.h +++ b/ACE/ace/MEM_Connector.h @@ -36,7 +36,7 @@ class ACE_Export ACE_MEM_Connector : public ACE_SOCK_Connector { public: /// Default constructor. - ACE_MEM_Connector (void); + ACE_MEM_Connector (); /** * Actively connect to a peer, producing a connected @c ACE_MEM_Stream diff --git a/ACE/ace/MEM_IO.h b/ACE/ace/MEM_IO.h index a7a582e1f0701..9f9b4787c59e7 100644 --- a/ACE/ace/MEM_IO.h +++ b/ACE/ace/MEM_IO.h @@ -32,9 +32,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP { public: - ACE_Reactive_MEM_IO (void); + ACE_Reactive_MEM_IO (); - virtual ~ACE_Reactive_MEM_IO (void); + virtual ~ACE_Reactive_MEM_IO (); /** * Initialize the MEM_SAP object. @@ -85,14 +85,14 @@ class ACE_Export ACE_MT_MEM_IO : public ACE_MEM_SAP class Simple_Queue { public: - Simple_Queue (void); + Simple_Queue (); Simple_Queue (MQ_Struct *mq); int init (MQ_Struct *mq, ACE_MEM_SAP::MALLOC_TYPE *malloc); int write (ACE_MEM_SAP_Node *new_msg); - ACE_MEM_SAP_Node *read (void); + ACE_MEM_SAP_Node *read (); private: MQ_Struct *mq_; ACE_MEM_SAP::MALLOC_TYPE *malloc_; @@ -105,9 +105,9 @@ class ACE_Export ACE_MT_MEM_IO : public ACE_MEM_SAP Simple_Queue queue_; } Channel; - ACE_MT_MEM_IO (void); + ACE_MT_MEM_IO (); - virtual ~ACE_MT_MEM_IO (void); + virtual ~ACE_MT_MEM_IO (); /** * Initialize the MEM_SAP object. @@ -171,10 +171,10 @@ class ACE_Export ACE_MEM_IO : public ACE_SOCK { public: /// Constructor. - ACE_MEM_IO (void); + ACE_MEM_IO (); /// Destructor. - ~ACE_MEM_IO (void); + ~ACE_MEM_IO (); typedef enum { @@ -193,7 +193,7 @@ class ACE_Export ACE_MEM_IO : public ACE_SOCK * Finalizing the MEM_IO object. This method doesn't invoke * the method. */ - int fini (void); + int fini (); /// Send an @a n byte buffer to the other process using shm_malloc_ /// connected thru the socket. diff --git a/ACE/ace/MEM_IO.inl b/ACE/ace/MEM_IO.inl index 6806a858c5bcb..7d89e4b8e6cdb 100644 --- a/ACE/ace/MEM_IO.inl +++ b/ACE/ace/MEM_IO.inl @@ -11,7 +11,7 @@ ACE_Reactive_MEM_IO::ACE_Reactive_MEM_IO () #if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM) ACE_INLINE -ACE_MT_MEM_IO::Simple_Queue::Simple_Queue (void) +ACE_MT_MEM_IO::Simple_Queue::Simple_Queue () : mq_ (0), malloc_ (0) { @@ -76,7 +76,7 @@ ACE_Reactive_MEM_IO::get_buf_len (const ACE_OFF_T off, ACE_MEM_SAP_Node *&buf) // Send an n byte message to the connected socket. ACE_INLINE -ACE_MEM_IO::ACE_MEM_IO (void) +ACE_MEM_IO::ACE_MEM_IO () : deliver_strategy_ (0), recv_buffer_ (0), buf_size_ (0), @@ -114,7 +114,7 @@ ACE_MEM_IO::fetch_recv_buf (int flag, const ACE_Time_Value *timeout) } ACE_INLINE -ACE_MEM_IO::~ACE_MEM_IO (void) +ACE_MEM_IO::~ACE_MEM_IO () { delete this->deliver_strategy_; } diff --git a/ACE/ace/MEM_SAP.h b/ACE/ace/MEM_SAP.h index 295beec2c17e9..7b19e8da1aec6 100644 --- a/ACE/ace/MEM_SAP.h +++ b/ACE/ace/MEM_SAP.h @@ -76,7 +76,7 @@ class ACE_Export ACE_MEM_SAP typedef ACE_MMAP_Memory_Pool_Options MALLOC_OPTIONS; /// Destructor. - virtual ~ACE_MEM_SAP (void); + virtual ~ACE_MEM_SAP (); /** * Initialize the MEM_SAP object. @@ -136,7 +136,7 @@ class ACE_Export ACE_MEM_SAP /// Close down the share memory pool. Clean up the /// mmap file if we are the last one using it. - int close_shm_malloc (void); + int close_shm_malloc (); ACE_HANDLE handle_; @@ -144,7 +144,7 @@ class ACE_Export ACE_MEM_SAP MALLOC_TYPE *shm_malloc_; /// Constructor. Prevent this class from being instantiated. - ACE_MEM_SAP (void); + ACE_MEM_SAP (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/MEM_SAP.inl b/ACE/ace/MEM_SAP.inl index 494d53db3d769..e7c171142889b 100644 --- a/ACE/ace/MEM_SAP.inl +++ b/ACE/ace/MEM_SAP.inl @@ -24,7 +24,7 @@ ACE_MEM_SAP_Node::capacity () const } ACE_INLINE void * -ACE_MEM_SAP_Node::data (void) +ACE_MEM_SAP_Node::data () { return this + 1; } diff --git a/ACE/ace/MEM_Stream.h b/ACE/ace/MEM_Stream.h index 55f8db9c23a2e..c9e6e5a23300e 100644 --- a/ACE/ace/MEM_Stream.h +++ b/ACE/ace/MEM_Stream.h @@ -59,13 +59,13 @@ class ACE_Export ACE_MEM_Stream : public ACE_MEM_IO // Initialization and termination methods. /// Constructor. - ACE_MEM_Stream (void); + ACE_MEM_Stream (); /// Constructor (sets the underlying ACE_HANDLE with ). ACE_MEM_Stream (ACE_HANDLE h); /// Destructor. - ~ACE_MEM_Stream (void); + ~ACE_MEM_Stream (); //= The following two methods use write and read system calls. /// Send n bytes, keep trying until n are sent. @@ -82,17 +82,17 @@ class ACE_Export ACE_MEM_Stream : public ACE_MEM_IO // = Selectively close endpoints. /// Close down the reader. - int close_reader (void); + int close_reader (); /// Close down the writer. - int close_writer (void); + int close_writer (); /** * Close down the socket (we need this to make things work correctly * on Win32, which requires use to do a before doing * the close to avoid losing data). */ - int close (void); + int close (); // = Meta-type info typedef ACE_Addr PEER_ADDR; diff --git a/ACE/ace/MEM_Stream.inl b/ACE/ace/MEM_Stream.inl index d268c45a74929..d16ae1ba58d43 100644 --- a/ACE/ace/MEM_Stream.inl +++ b/ACE/ace/MEM_Stream.inl @@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_MEM_Stream::ACE_MEM_Stream (void) +ACE_MEM_Stream::ACE_MEM_Stream () { // ACE_TRACE ("ACE_MEM_Stream::ACE_MEM_Stream"); } @@ -18,13 +18,13 @@ ACE_MEM_Stream::ACE_MEM_Stream (ACE_HANDLE h) } ACE_INLINE -ACE_MEM_Stream::~ACE_MEM_Stream (void) +ACE_MEM_Stream::~ACE_MEM_Stream () { // ACE_TRACE ("ACE_MEM_Stream::~ACE_MEM_Stream"); } ACE_INLINE int -ACE_MEM_Stream::close_reader (void) +ACE_MEM_Stream::close_reader () { ACE_TRACE ("ACE_MEM_Stream::close_reader"); if (this->get_handle () != ACE_INVALID_HANDLE) @@ -36,7 +36,7 @@ ACE_MEM_Stream::close_reader (void) // Shut down just the writing end of a ACE_SOCK. ACE_INLINE int -ACE_MEM_Stream::close_writer (void) +ACE_MEM_Stream::close_writer () { ACE_TRACE ("ACE_MEM_Stream::close_writer"); if (this->get_handle () != ACE_INVALID_HANDLE) diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp index ea1c432895e7d..a2689104e7918 100644 --- a/ACE/ace/MMAP_Memory_Pool.cpp +++ b/ACE/ace/MMAP_Memory_Pool.cpp @@ -255,10 +255,6 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, -1); } -#if defined (ACE_OPENVMS) - ::fsync(this->mmap_.handle()); -#endif - // Increment by one to put us at the beginning of the next chunk... ++map_size; #endif /* __Lynx__ */ @@ -294,11 +290,7 @@ ACE_MMAP_Memory_Pool::map_file (size_t map_size) 0, this->sa_) == -1 || (this->base_addr_ != 0 -#ifdef ACE_HAS_WINCE - && this->mmap_.addr () == 0)) // WinCE does not allow users to specify alloc addr. -#else && this->mmap_.addr () != this->base_addr_)) -#endif // ACE_HAS_WINCE { #if 0 ACELIB_ERROR ((LM_ERROR, diff --git a/ACE/ace/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h index d0f76ca8d9360..d53c43574bd76 100644 --- a/ACE/ace/MMAP_Memory_Pool.h +++ b/ACE/ace/MMAP_Memory_Pool.h @@ -140,7 +140,7 @@ class ACE_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler const OPTIONS *options = 0); /// Destructor. - virtual ~ACE_MMAP_Memory_Pool (void); + virtual ~ACE_MMAP_Memory_Pool (); /// Ask system for initial chunk of shared memory. virtual void *init_acquire (size_t nbytes, @@ -219,7 +219,7 @@ class ACE_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler ACE_Mem_Map const & mmap () const; /// Get reference to underlying ACE_Mem_Map object. - ACE_Mem_Map & mmap (void); + ACE_Mem_Map & mmap (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -320,7 +320,7 @@ class ACE_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool const OPTIONS *options = 0); /// Destructor. - virtual ~ACE_Lite_MMAP_Memory_Pool (void); + virtual ~ACE_Lite_MMAP_Memory_Pool (); /// Overwrite the default sync behavior with no-op virtual int sync (size_t len, int flags = MS_SYNC); @@ -333,7 +333,6 @@ class ACE_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/MMAP_Memory_Pool.inl b/ACE/ace/MMAP_Memory_Pool.inl index a458c8e374a71..46cadc69928fd 100644 --- a/ACE/ace/MMAP_Memory_Pool.inl +++ b/ACE/ace/MMAP_Memory_Pool.inl @@ -10,7 +10,7 @@ ACE_MMAP_Memory_Pool::mmap () const ACE_INLINE ACE_Mem_Map & -ACE_MMAP_Memory_Pool::mmap (void) +ACE_MMAP_Memory_Pool::mmap () { return mmap_; } diff --git a/ACE/ace/MQX_Filesystem.cpp b/ACE/ace/MQX_Filesystem.cpp index f04303d8675e0..862e0dafd3622 100644 --- a/ACE/ace/MQX_Filesystem.cpp +++ b/ACE/ace/MQX_Filesystem.cpp @@ -520,7 +520,6 @@ MQX_Filesystem::fstat (int fd, ACE_stat *statbuf) */ extern "C" { - int __open (const char *filename, int mode) { return MQX_Filesystem::inst ().open (filename, mode); diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp index c61b0151cfd36..de9f79aad1d3c 100644 --- a/ACE/ace/Malloc.cpp +++ b/ACE/ace/Malloc.cpp @@ -145,7 +145,7 @@ ACE_Control_Block::ACE_Name_Node::dump () const #if defined (ACE_HAS_MALLOC_STATS) -ACE_Malloc_Stats::ACE_Malloc_Stats (void) +ACE_Malloc_Stats::ACE_Malloc_Stats () : nchunks_ (0), nblocks_ (0), ninuse_ (0) diff --git a/ACE/ace/Malloc.h b/ACE/ace/Malloc.h index 9fc2efb11eef1..06b9eb6cbe37f 100644 --- a/ACE/ace/Malloc.h +++ b/ACE/ace/Malloc.h @@ -254,7 +254,6 @@ union ACE_max_align_info class ACE_Export ACE_Control_Block { public: - /** * @class ACE_Malloc_Header * diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index 3d6a11a61cc2b..23f2558de3a1b 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -476,17 +476,7 @@ ACE_Malloc_T::open () 0, this->cb_ptr_); - // Why aC++ in 64-bit mode can't grok this, I have no - // idea... but it ends up with an extra bit set which makes - // size_ really big without this hack. -#if defined (__hpux) && defined (__LP64__) - size_t hpux11_hack = (rounded_bytes - sizeof *this->cb_ptr_) - / sizeof (MALLOC_HEADER); - p->size_ = hpux11_hack; -#else - p->size_ = (rounded_bytes - sizeof *this->cb_ptr_) - / sizeof (MALLOC_HEADER); -#endif /* (__hpux) && defined (__LP64__) */ + p->size_ = (rounded_bytes - sizeof *this->cb_ptr_) / sizeof (MALLOC_HEADER); ACE_MALLOC_STATS (++this->cb_ptr_->malloc_stats_.nchunks_); ACE_MALLOC_STATS (++this->cb_ptr_->malloc_stats_.nblocks_); @@ -792,7 +782,6 @@ ACE_Malloc_T::shared_free (void *ap) // Search until we find the location where the blocks belongs. Note // that addresses are kept in sorted order. - ACE_SEH_TRY { for (; diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h index e7c28760a8cfd..273bb013dcb78 100644 --- a/ACE/ace/Malloc_T.h +++ b/ACE/ace/Malloc_T.h @@ -416,9 +416,9 @@ class ACE_Malloc_FIFO_Iterator_T; * - constructor (const ACE_TCHAR *pool_name, const MEMORY_POOL_OPTIONS *options) * - void dump () const (needed if ACE is built with ACE_HAS_DUMP defined) * - void *init_acquire (size_t nbytes, size_t &rounded_bytes, int &first_time); - * - int release (void) + * - int release () * - void *acquire (size_t nbytes, size_t &rounded_bytes) - * - void *base_addr (void) + * - void *base_addr () * - seh_selector() (only needed on Windows) * * Note that the ACE_Allocator_Adapter class can be used to integrate allocator @@ -881,13 +881,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Malloc_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Malloc_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Malloc_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_MALLOC_H */ diff --git a/ACE/ace/Managed_Object.h b/ACE/ace/Managed_Object.h index 0c648c4bbad8c..d18863842af6e 100644 --- a/ACE/ace/Managed_Object.h +++ b/ACE/ace/Managed_Object.h @@ -100,6 +100,9 @@ template class ACE_Managed_Object { public: + /// Get the preallocated object identified by "id". Returns a + /// pointer to the object. Beware: no error indication is provided, + /// because it can _only_ be used for accessing preallocated objects. static TYPE *get_preallocated_object (ACE_Object_Manager::Preallocated_Object identifier) { // The preallocated objects are in a separate, "read-only" array so @@ -112,12 +115,9 @@ class ACE_Managed_Object return &((ACE_Cleanup_Adapter *) ACE_Object_Manager::preallocated_object[identifier])->object (); } - // Get the preallocated object identified by "id". Returns a - // pointer to the object. Beware: no error indication is provided, - // because it can _only_ be used for accessing preallocated objects. - // @note The function definition is inlined here so that it compiles - // on AIX 4.1 w/xlC v. 3.01. - + /// Get the preallocated array identified by "id". Returns a + /// pointer to the array. Beware: no error indication is provided, + /// because it can _only_ be used for accessing preallocated arrays. static TYPE *get_preallocated_array (ACE_Object_Manager::Preallocated_Array identifier) { // The preallocated array are in a separate, "read-only" array so @@ -130,15 +130,10 @@ class ACE_Managed_Object return &((ACE_Cleanup_Adapter *) ACE_Object_Manager::preallocated_array[identifier])->object (); } - // Get the preallocated array identified by "id". Returns a - // pointer to the array. Beware: no error indication is provided, - // because it can _only_ be used for accessing preallocated arrays. - // @note The function definition is inlined here so that it compiles - // on AIX 4.1 w/xlC v. 3.01. protected: // Disallow instantiation of this class. - ACE_Managed_Object (void) = delete; + ACE_Managed_Object () = delete; private: ACE_Managed_Object (const ACE_Managed_Object &) = delete; @@ -151,13 +146,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Managed_Object.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Managed_Object.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Managed_Object.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Manual_Event.h b/ACE/ace/Manual_Event.h index e3e8e14e38cdb..b4754c49194be 100644 --- a/ACE/ace/Manual_Event.h +++ b/ACE/ace/Manual_Event.h @@ -88,13 +88,7 @@ class ACE_Manual_Event : ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Manual_Event.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Manual_Event.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_MANUAL_EVENT_H */ diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp index fb7d6046cf6bb..9b5e9052e44df 100644 --- a/ACE/ace/Map_Manager.cpp +++ b/ACE/ace/Map_Manager.cpp @@ -133,7 +133,7 @@ ACE_Map_Manager::next_free (ACE_UINT32 &free_slot) #if defined (ACE_HAS_LAZY_MAP_MANAGER) template void -ACE_Map_Manager::move_all_free_slots_from_occupied_list (void) +ACE_Map_Manager::move_all_free_slots_from_occupied_list () { // // In the case of lazy map managers, the movement of free slots from @@ -450,7 +450,6 @@ ACE_Map_Manager::unbind_and_return_index (const EXT_ID template void ACE_Map_Manager::unbind_slot (ACE_UINT32 slot) { - #if defined (ACE_HAS_LAZY_MAP_MANAGER) // diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h index 99ef7f9402135..0c887a412a9e3 100644 --- a/ACE/ace/Map_Manager.h +++ b/ACE/ace/Map_Manager.h @@ -283,7 +283,6 @@ class ACE_Map_Manager ACE_ALLOC_HOOK_DECLARE; protected: - // = The following methods do the actual work. // These methods assume that the locks are held by the private @@ -390,7 +389,7 @@ class ACE_Map_Manager * free slots in the free list. This function goes through the * entire occupied list, moving free slots to the free list. */ - void move_all_free_slots_from_occupied_list (void); + void move_all_free_slots_from_occupied_list (); #endif /* ACE_HAS_LAZY_MAP_MANAGER */ @@ -697,13 +696,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Map_Manager.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Map_Manager.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Map_Manager.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h index bfe52db6a4dc5..3e6d29fa14587 100644 --- a/ACE/ace/Map_T.h +++ b/ACE/ace/Map_T.h @@ -32,7 +32,6 @@ template class ACE_Noop_Key_Generator { public: - /// Functor method: generates a new key. int operator () (T &); }; @@ -685,7 +684,6 @@ class ACE_Map_Impl : public ACE_Map IMPLEMENTATION &impl (); protected: - /// All implementation details are forwarded to this class. IMPLEMENTATION implementation_; @@ -716,7 +714,6 @@ template class ACE_Active_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl { public: - // = Traits. typedef typename ACE_Active_Map_Manager::iterator implementation; @@ -746,7 +743,6 @@ class ACE_Active_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl ACE_Map_Iterator &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Map_Iterator implementation_; }; @@ -762,7 +758,6 @@ template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl { public: - // = Traits. typedef typename ACE_Active_Map_Manager::reverse_iterator implementation; @@ -792,7 +787,6 @@ class ACE_Active_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Itera ACE_Map_Reverse_Iterator &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Map_Reverse_Iterator implementation_; }; @@ -966,7 +960,6 @@ class ACE_Active_Map_Manager_Adapter : public ACE_Map KEY_ADAPTER &key_adapter (); protected: - /// Find helper. virtual int find (const KEY &key, expanded_value *&internal_value); @@ -1008,7 +1001,6 @@ template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter : public ACE_Iterator_Impl { public: - // = Traits. typedef typename ACE_Hash_Map_Manager_Ex::iterator implementation; @@ -1038,7 +1030,6 @@ class ACE_Hash_Map_Manager_Ex_Iterator_Adapter : public ACE_Iterator_Impl ACE_Hash_Map_Iterator_Ex &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Hash_Map_Iterator_Ex implementation_; }; @@ -1054,7 +1045,6 @@ template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl { public: - // = Traits. typedef typename ACE_Hash_Map_Manager_Ex::reverse_iterator implementation; @@ -1084,7 +1074,6 @@ class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter : public ACE_Reverse_Iter ACE_Hash_Map_Reverse_Iterator_Ex &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Hash_Map_Reverse_Iterator_Ex implementation_; }; @@ -1257,7 +1246,6 @@ class ACE_Hash_Map_Manager_Ex_Adapter : public ACE_Map KEY_GENERATOR &key_generator (); protected: - /// All implementation details are forwarded to this class. ACE_Hash_Map_Manager_Ex implementation_; @@ -1291,7 +1279,6 @@ template class ACE_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl { public: - // = Traits. typedef typename ACE_Map_Manager::iterator implementation; @@ -1321,7 +1308,6 @@ class ACE_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl ACE_Map_Iterator &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Map_Iterator implementation_; }; @@ -1337,7 +1323,6 @@ template class ACE_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl { public: - // = Traits. typedef typename ACE_Map_Manager::reverse_iterator implementation; @@ -1367,7 +1352,6 @@ class ACE_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Imp ACE_Map_Reverse_Iterator &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Map_Reverse_Iterator implementation_; }; @@ -1540,7 +1524,6 @@ class ACE_Map_Manager_Adapter : public ACE_Map KEY_GENERATOR &key_generator (); protected: - /// All implementation details are forwarded to this class. ACE_Map_Manager implementation_; @@ -1569,13 +1552,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Map_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Map_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Map_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_MAP_T_H */ diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp index 47fa9b2b3d2b4..e44677922f0dc 100644 --- a/ACE/ace/Mem_Map.cpp +++ b/ACE/ace/Mem_Map.cpp @@ -188,8 +188,6 @@ ACE_Mem_Map::open (const ACE_TCHAR *file_name, #if defined (INTEGRITY) || defined (__QNXNTO__) || defined (ACE_VXWORKS) this->handle_ = ACE_OS::shm_open (file_name, flags, perms, sa); -#elif defined (ACE_OPENVMS) - ACE_OSCALL (::open (file_name, flags, perms, "shr=get,put,upd"), ACE_HANDLE, this->handle_); #else this->handle_ = ACE_OS::open (file_name, flags, perms, sa); #endif /* INTEGRITY */ diff --git a/ACE/ace/Mem_Map.h b/ACE/ace/Mem_Map.h index 4ea7b55be550a..9f728fa2e09f9 100644 --- a/ACE/ace/Mem_Map.h +++ b/ACE/ace/Mem_Map.h @@ -40,7 +40,7 @@ class ACE_Export ACE_Mem_Map : private ACE_Copy_Disabled { public: /// Default constructor. - ACE_Mem_Map (void); + ACE_Mem_Map (); /// Map a file from an open file descriptor @a handle. This function /// will lookup the length of the file if it is not given. @@ -183,7 +183,6 @@ class ACE_Export ACE_Mem_Map : private ACE_Copy_Disabled ACE_ALLOC_HOOK_DECLARE; private: - /// This method does the dirty work of actually calling ::mmap to map /// the file into memory. int map_it (ACE_HANDLE handle, diff --git a/ACE/ace/Mem_Map.inl b/ACE/ace/Mem_Map.inl index 4eb164f8d81b7..c3c316a81c752 100644 --- a/ACE/ace/Mem_Map.inl +++ b/ACE/ace/Mem_Map.inl @@ -93,7 +93,7 @@ ACE_Mem_Map::size () const } ACE_INLINE int -ACE_Mem_Map::close_filemapping_handle (void) +ACE_Mem_Map::close_filemapping_handle () { int result = 0; @@ -218,7 +218,7 @@ ACE_Mem_Map::advise (int behavior, int len) } ACE_INLINE int -ACE_Mem_Map::close_handle (void) +ACE_Mem_Map::close_handle () { int result = 0; diff --git a/ACE/ace/Message_Block.cpp b/ACE/ace/Message_Block.cpp index 3c6e51350ca91..4ff96b35f9dac 100644 --- a/ACE/ace/Message_Block.cpp +++ b/ACE/ace/Message_Block.cpp @@ -392,16 +392,16 @@ ACE_Message_Block::ACE_Message_Block (const char *data, if (this->init_i (size, // size MB_DATA, // type - 0, // cont + nullptr, // cont data, // data - 0, // allocator + nullptr, // allocator 0, // locking strategy ACE_Message_Block::DONT_DELETE, // flags priority, // priority ACE_Time_Value::zero, // execution time ACE_Time_Value::max_time, // absolute time of deadline - 0, // data block - 0, // data_block allocator + nullptr, // data block + nullptr, // data_block allocator 0) == -1) // message_block allocator ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Block"))); @@ -415,16 +415,16 @@ ACE_Message_Block::ACE_Message_Block (ACE_Allocator *message_block_allocator) if (this->init_i (0, // size MB_DATA, // type - 0, // cont - 0, // data - 0, // allocator + nullptr, // cont + nullptr, // data + nullptr, // allocator 0, // locking strategy ACE_Message_Block::DONT_DELETE, // flags 0, // priority ACE_Time_Value::zero, // execution time ACE_Time_Value::max_time, // absolute time of deadline - 0, // data block - 0, // data_block allocator + nullptr, // data block + nullptr, // data_block allocator message_block_allocator) == -1) // message_block allocator ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Block"))); @@ -494,25 +494,24 @@ ACE_Message_Block::init (size_t size, } int -ACE_Message_Block::init (const char *data, - size_t size) +ACE_Message_Block::init (const char *data, size_t size) { ACE_TRACE ("ACE_Message_Block::init"); // Should we also initialize all the other fields, as well? return this->init_i (size, // size MB_DATA, // type - 0, // cont + nullptr, // cont data, // data - 0, // allocator + nullptr, // allocator 0, // locking strategy ACE_Message_Block::DONT_DELETE, // flags 0, // priority ACE_Time_Value::zero, // execution time ACE_Time_Value::max_time, // absolute time of deadline - 0, // data block - 0, // data_block allocator - 0); // message_block allocator + nullptr, // data block + nullptr, // data_block allocator + nullptr); // message_block allocator } ACE_Message_Block::ACE_Message_Block (size_t size, @@ -529,7 +528,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size, ACE_Allocator *data_block_allocator, ACE_Allocator *message_block_allocator) : flags_ (0), - data_block_ (0) + data_block_ (nullptr) { ACE_TRACE ("ACE_Message_Block::ACE_Message_Block"); @@ -554,7 +553,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block, ACE_Message_Block::Message_Flags flags, ACE_Allocator *message_block_allocator) : flags_ (flags), - data_block_ (0) + data_block_ (nullptr) { ACE_TRACE ("ACE_Message_Block::ACE_Message_Block"); @@ -578,7 +577,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block, ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, size_t align) :flags_ (0), - data_block_ (0) + data_block_ (nullptr) { ACE_TRACE ("ACE_Message_Block::ACE_Message_Block"); @@ -587,10 +586,10 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, { if (this->init_i (0, // size MB_NORMAL, // type - 0, // cont - 0, // data - 0, // allocator - 0, // locking strategy + nullptr, // cont + nullptr, // data + nullptr, // allocator + nullptr, // locking strategy 0, // flags 0, // priority ACE_Time_Value::zero, // execution time @@ -611,16 +610,15 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, // Set our rd & wr pointers this->rd_ptr (start); this->wr_ptr (start); - } else { if (this->init_i (0, // size MB_NORMAL, // type - 0, // cont - 0, // data - 0, // allocator - 0, // locking strategy + nullptr, // cont + nullptr, // data + nullptr, // allocator + nullptr, // locking strategy 0, // flags 0, // priority ACE_Time_Value::zero, // execution time @@ -645,8 +643,7 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, #if !defined (ACE_LACKS_CDR_ALIGNMENT) // Get the alignment offset of the incoming ACE_Message_Block - start = ACE_ptr_align_binary (mb.base (), - align); + start = ACE_ptr_align_binary (mb.base (), align); #else start = mb.base (); #endif /* ACE_LACKS_CDR_ALIGNMENT */ @@ -660,9 +657,8 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, start, wr_offset); - // Dont move the write pointer, just leave it to the application + // Don't move the write pointer, just leave it to the application // to do what it wants - } #if defined (ACE_LACKS_CDR_ALIGNMENT) ACE_UNUSED_ARG (align); @@ -698,8 +694,8 @@ ACE_Message_Block::init_i (size_t size, ACE_UNUSED_ARG (deadline_time); #endif /* ACE_HAS_TIMED_MESSAGE_BLOCKS */ this->cont_ = msg_cont; - this->next_ = 0; - this->prev_ = 0; + this->next_ = nullptr; + this->prev_ = nullptr; this->message_block_allocator_ = message_block_allocator; @@ -734,7 +730,7 @@ ACE_Message_Block::init_i (size_t size, ACE_TIMEPROBE (ACE_MESSAGE_BLOCK_INIT_I_DB_CTOR); // Message block initialization may fail, while the construction - // succeds. Since ACE may throw no exceptions, we have to do a + // succeeds. Since ACE may throw no exceptions, we have to do a // separate check and clean up, like this: if (db != 0 && db->size () < size) { @@ -763,7 +759,7 @@ ACE_Data_Block::~ACE_Data_Block () ACE_Message_Block::DONT_DELETE)) { this->allocator_strategy_->free ((void *) this->base_); - this->base_ = 0; + this->base_ = nullptr; } } @@ -774,14 +770,14 @@ ACE_Data_Block::release_i () ACE_ASSERT (this->reference_count_ > 0); - ACE_Data_Block *result = 0; + ACE_Data_Block *result = nullptr; // decrement reference count --this->reference_count_; if (this->reference_count_ == 0) // this will cause deletion of this - result = 0; + result = nullptr; else result = this; @@ -793,8 +789,8 @@ ACE_Data_Block::release_no_delete (ACE_Lock *lock) { ACE_TRACE ("ACE_Data_Block::release_no_delete"); - ACE_Data_Block *result = 0; - ACE_Lock *lock_to_be_used = 0; + ACE_Data_Block *result = nullptr; + ACE_Lock *lock_to_be_used = nullptr; // Check if we were passed in a lock if (lock != 0) @@ -844,7 +840,7 @@ ACE_Data_Block::release (ACE_Lock *lock) // We must delete this outside the scope of the locking_strategy_ // since otherwise we'd be trying to "release" through a deleted // pointer! - if (result == 0) + if (result == nullptr) ACE_DES_FREE_THIS (allocator->free, ACE_Data_Block); return result; @@ -909,7 +905,7 @@ ACE_Message_Block::release_i (ACE_Lock *lock) if (this->cont_) { ACE_Message_Block *mb = this->cont_; - ACE_Message_Block *tmp = 0; + ACE_Message_Block *tmp = nullptr; do { @@ -939,12 +935,12 @@ ACE_Message_Block::release_i (ACE_Lock *lock) { if (this->data_block ()->release_no_delete (lock) == 0) result = 1; - this->data_block_ = 0; + this->data_block_ = nullptr; } // We will now commit suicide: this object *must* have come from the // allocator given. - if (this->message_block_allocator_ == 0) + if (this->message_block_allocator_ == nullptr) delete this; else { @@ -961,24 +957,25 @@ ACE_Message_Block::release (ACE_Message_Block *mb) { ACE_TRACE ("ACE_Message_Block::release"); - if (mb != 0) + if (mb != nullptr) return mb->release (); else - return 0; + return nullptr; } ACE_Message_Block::~ACE_Message_Block () { ACE_TRACE ("ACE_Message_Block::~ACE_Message_Block"); - if (ACE_BIT_DISABLED (this->flags_, - ACE_Message_Block::DONT_DELETE)&& + if (ACE_BIT_DISABLED (this->flags_, ACE_Message_Block::DONT_DELETE) && this->data_block ()) - this->data_block ()->release (); + { + this->data_block ()->release (); + } - this->prev_ = 0; - this->next_ = 0; - this->cont_ = 0; + this->prev_ = nullptr; + this->next_ = nullptr; + this->cont_ = nullptr; } ACE_Data_Block * @@ -1013,9 +1010,8 @@ ACE_Message_Block::duplicate () const { ACE_TRACE ("ACE_Message_Block::duplicate"); - ACE_Message_Block *nb_top = 0; - ACE_Message_Block *nb = 0; - + ACE_Message_Block *nb_top = nullptr; + ACE_Message_Block *nb = nullptr; const ACE_Message_Block *current = this; // Increment the reference counts of all the continuation messages. @@ -1032,10 +1028,10 @@ ACE_Message_Block::duplicate () const ACE_NEW_NORETURN (cur_dup, ACE_Message_Block (0, // size ACE_Message_Type (0), // type - 0, // cont - 0, // data - 0, // allocator - 0, // locking strategy + nullptr, // cont + nullptr, // data + nullptr, // allocator + nullptr, // locking strategy 0, // flags current->priority_, // priority ACE_EXECUTION_TIME, @@ -1053,10 +1049,10 @@ ACE_Message_Block::duplicate () const current->message_block_allocator_->malloc (sizeof (ACE_Message_Block))), ACE_Message_Block (0, // size ACE_Message_Type (0), // type - 0, // cont - 0, // data - 0, // allocator - 0, // locking strategy + nullptr, // cont + nullptr, // data + nullptr, // allocator + nullptr, // locking strategy 0, // flags current->priority_, // priority ACE_EXECUTION_TIME, @@ -1109,8 +1105,8 @@ ACE_Message_Block * ACE_Message_Block::duplicate (const ACE_Message_Block *mb) { ACE_TRACE ("ACE_Message_Block::duplicate"); - if (mb == 0) - return 0; + if (mb == nullptr) + return nullptr; else return mb->duplicate (); } @@ -1126,7 +1122,7 @@ ACE_Data_Block::clone (ACE_Message_Block::Message_Flags mask) const // was allocated with max_size_ (and, thus, it's cur_size_ is the same // as max_size_). Maintain the same "has been written" boundary in the // new block by only copying cur_size_ bytes. - if (nb != 0) + if (nb != nullptr) { ACE_OS::memcpy (nb->base_, this->base_, @@ -1146,13 +1142,9 @@ ACE_Data_Block::clone_nocopy (ACE_Message_Block::Message_Flags mask, // You always want to clear this one to prevent memory leaks but you // might add some others later. - const ACE_Message_Block::Message_Flags always_clear = - ACE_Message_Block::DONT_DELETE; - - const size_t newsize = - max_size == 0 ? this->max_size_ : max_size; - - ACE_Data_Block *nb = 0; + const ACE_Message_Block::Message_Flags always_clear = ACE_Message_Block::DONT_DELETE; + const size_t newsize = max_size == 0 ? this->max_size_ : max_size; + ACE_Data_Block *nb = nullptr; ACE_NEW_MALLOC_RETURN (nb, static_cast ( @@ -1167,7 +1159,7 @@ ACE_Data_Block::clone_nocopy (ACE_Message_Block::Message_Flags mask, 0); // Message block initialization may fail while the construction - // succeds. Since as a matter of policy, ACE may throw no + // succeeds. Since as a matter of policy, ACE may throw no // exceptions, we have to do a separate check like this. if (nb != 0 && nb->size () < newsize) { @@ -1177,7 +1169,6 @@ ACE_Data_Block::clone_nocopy (ACE_Message_Block::Message_Flags mask, return 0; } - // Set new flags minus the mask... nb->clr_flags (mask | always_clear); return nb; @@ -1189,40 +1180,39 @@ ACE_Message_Block::clone (Message_Flags mask) const ACE_TRACE ("ACE_Message_Block::clone"); const ACE_Message_Block *old_message_block = this; - ACE_Message_Block *new_message_block = 0; - ACE_Message_Block *new_previous_message_block = 0; - ACE_Message_Block *new_root_message_block = 0; + ACE_Message_Block *new_message_block {}; + ACE_Message_Block *new_previous_message_block {}; + ACE_Message_Block *new_root_message_block {}; do { - // Get a pointer to a "cloned" (will copy the + // Get a pointer to a "cloned" ACE_Data_Block (will copy the // values rather than increment the reference count). ACE_Data_Block *db = old_message_block->data_block ()->clone (mask); - if (db == 0) - return 0; + if (!db) + return nullptr; - if(old_message_block->message_block_allocator_ == 0) + if(old_message_block->message_block_allocator_ == nullptr) { - ACE_NEW_RETURN (new_message_block, - ACE_Message_Block (0, // size - ACE_Message_Type (0), // type - 0, // cont - 0, // data - 0, // allocator - 0, // locking strategy - 0, // flags - old_message_block->priority_, // priority - ACE_EXECUTION_TIME, // execution time - ACE_DEADLINE_TIME, // absolute time to deadline - // Get a pointer to a - // "duplicated" - // (will simply increment the - // reference count). - db, - db->data_block_allocator (), - old_message_block->message_block_allocator_), - 0); + ACE_NEW_NORETURN (new_message_block, + ACE_Message_Block (0, // size + ACE_Message_Type (0), // type + nullptr, // cont + nullptr, // data + nullptr, // allocator + nullptr, // locking strategy + 0, // flags + old_message_block->priority_, // priority + ACE_EXECUTION_TIME, // execution time + ACE_DEADLINE_TIME, // absolute time to deadline + // Get a pointer to a + // "duplicated" + // (will simply increment the + // reference count). + db, + db->data_block_allocator (), + old_message_block->message_block_allocator_)); } else { @@ -1232,13 +1222,13 @@ ACE_Message_Block::clone (Message_Flags mask) const // ACE_NEW_MALLOC_RETURN, there would be a memory leak because the // above db pointer would be left dangling. new_message_block = static_cast (old_message_block->message_block_allocator_->malloc (sizeof (ACE_Message_Block))); - if (new_message_block != 0) + if (new_message_block != nullptr) new (new_message_block) ACE_Message_Block (0, // size ACE_Message_Type (0), // type - 0, // cont - 0, // data - 0, // allocator - 0, // locking strategy + nullptr, // cont + nullptr, // data + nullptr, // allocator + nullptr, // locking strategy 0, // flags old_message_block->priority_, // priority ACE_EXECUTION_TIME, // execution time @@ -1248,10 +1238,10 @@ ACE_Message_Block::clone (Message_Flags mask) const old_message_block->message_block_allocator_); } - if (new_message_block == 0) + if (new_message_block == nullptr) { db->release (); - return 0; + return nullptr; } // Set the read and write pointers in the new to the @@ -1259,15 +1249,15 @@ ACE_Message_Block::clone (Message_Flags mask) const new_message_block->rd_ptr (old_message_block->rd_ptr_); new_message_block->wr_ptr (old_message_block->wr_ptr_); // save the root message block to return - if (new_root_message_block == 0) + if (new_root_message_block == nullptr) new_root_message_block = new_message_block; - if (new_previous_message_block != 0) + if (new_previous_message_block != nullptr) // we're a continuation of the previous block, add ourself to its chain new_previous_message_block->cont_ = new_message_block; new_previous_message_block = new_message_block; old_message_block = old_message_block->cont (); } - while (old_message_block != 0); + while (old_message_block != nullptr); return new_root_message_block; } diff --git a/ACE/ace/Message_Block.h b/ACE/ace/Message_Block.h index 954071060f4f2..39fb2855b500f 100644 --- a/ACE/ace/Message_Block.h +++ b/ACE/ace/Message_Block.h @@ -175,15 +175,15 @@ class ACE_Export ACE_Message_Block */ ACE_Message_Block (size_t size, ACE_Message_Type type = MB_DATA, - ACE_Message_Block *cont = 0, - const char *data = 0, - ACE_Allocator *allocator_strategy = 0, - ACE_Lock *locking_strategy = 0, + ACE_Message_Block *cont = nullptr, + const char *data = nullptr, + ACE_Allocator *allocator_strategy = nullptr, + ACE_Lock *locking_strategy = nullptr, unsigned long priority = ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY, const ACE_Time_Value &execution_time = ACE_Time_Value::zero, const ACE_Time_Value &deadline_time = ACE_Time_Value::max_time, - ACE_Allocator *data_block_allocator = 0, - ACE_Allocator *message_block_allocator = 0); + ACE_Allocator *data_block_allocator = nullptr, + ACE_Allocator *message_block_allocator = nullptr); /** * A copy constructor. This constructor is a bit different. If the diff --git a/ACE/ace/Message_Block.inl b/ACE/ace/Message_Block.inl index f6d69e9cf0110..8e844f612e176 100644 --- a/ACE/ace/Message_Block.inl +++ b/ACE/ace/Message_Block.inl @@ -223,7 +223,7 @@ ACE_Message_Block::msg_priority (unsigned long pri) ACE_INLINE const ACE_Time_Value & ACE_Message_Block::msg_execution_time () const { - ACE_TRACE ("ACE_Message_Block::msg_execution_time (void)"); + ACE_TRACE ("ACE_Message_Block::msg_execution_time ()"); #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) return this->execution_time_; #else @@ -245,7 +245,7 @@ ACE_Message_Block::msg_execution_time (const ACE_Time_Value &et) ACE_INLINE const ACE_Time_Value & ACE_Message_Block::msg_deadline_time () const { - ACE_TRACE ("ACE_Message_Block::msg_deadline_time (void)"); + ACE_TRACE ("ACE_Message_Block::msg_deadline_time ()"); #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) return this->deadline_time_; diff --git a/ACE/ace/Message_Block_T.h b/ACE/ace/Message_Block_T.h index dc7f3e0ed5049..0265992931cc5 100644 --- a/ACE/ace/Message_Block_T.h +++ b/ACE/ace/Message_Block_T.h @@ -73,13 +73,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Message_Block_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Message_Block_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Message_Block_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_MESSAGE_BLOCK_T_H */ diff --git a/ACE/ace/Message_Queue_NT.cpp b/ACE/ace/Message_Queue_NT.cpp index 0273fe9f841e1..e3d82e10ea2e7 100644 --- a/ACE/ace/Message_Queue_NT.cpp +++ b/ACE/ace/Message_Queue_NT.cpp @@ -38,7 +38,7 @@ ACE_Message_Queue_NT::open (DWORD max_threads) } int -ACE_Message_Queue_NT::close (void) +ACE_Message_Queue_NT::close () { ACE_TRACE ("ACE_Message_Queue_NT::close"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -46,7 +46,7 @@ ACE_Message_Queue_NT::close (void) return (::CloseHandle (this->completion_port_) ? 0 : -1 ); } -ACE_Message_Queue_NT::~ACE_Message_Queue_NT (void) +ACE_Message_Queue_NT::~ACE_Message_Queue_NT () { ACE_TRACE ("ACE_Message_Queue_NT::~ACE_Message_Queue_NT"); this->close (); @@ -131,7 +131,7 @@ ACE_Message_Queue_NT::dequeue (ACE_Message_Block *&first_item, } int -ACE_Message_Queue_NT::deactivate (void) +ACE_Message_Queue_NT::deactivate () { ACE_TRACE ("ACE_Message_Queue_NT::deactivate"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -155,7 +155,7 @@ ACE_Message_Queue_NT::deactivate (void) } int -ACE_Message_Queue_NT::activate (void) +ACE_Message_Queue_NT::activate () { ACE_TRACE ("ACE_Message_Queue_NT::activate"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -165,7 +165,7 @@ ACE_Message_Queue_NT::activate (void) } int -ACE_Message_Queue_NT::pulse (void) +ACE_Message_Queue_NT::pulse () { ACE_TRACE ("ACE_Message_Queue_NT::pulse"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); diff --git a/ACE/ace/Message_Queue_NT.h b/ACE/ace/Message_Queue_NT.h index 2e50483b67d49..60a20242d3952 100644 --- a/ACE/ace/Message_Queue_NT.h +++ b/ACE/ace/Message_Queue_NT.h @@ -167,7 +167,7 @@ class ACE_Export ACE_Message_Queue_NT : public ACE_Message_Queue_Base // = Not currently implemented... int peek_dequeue_head (ACE_Message_Block *&first_item, ACE_Time_Value *timeout = 0); - ACE_Notification_Strategy *notification_strategy (void); + ACE_Notification_Strategy *notification_strategy (); void notification_strategy (ACE_Notification_Strategy *s); // = Notification hook. @@ -214,7 +214,6 @@ class ACE_Export ACE_Message_Queue_NT : public ACE_Message_Queue_Base /// Underlying NT IoCompletionPort. ACE_HANDLE completion_port_; - }; #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ diff --git a/ACE/ace/Message_Queue_NT.inl b/ACE/ace/Message_Queue_NT.inl index 7c1b28515031b..c3a2d68e15d04 100644 --- a/ACE/ace/Message_Queue_NT.inl +++ b/ACE/ace/Message_Queue_NT.inl @@ -24,14 +24,14 @@ ACE_Message_Queue_NT::dequeue_head (ACE_Message_Block *&first_item, } ACE_INLINE bool -ACE_Message_Queue_NT::is_full (void) +ACE_Message_Queue_NT::is_full () { ACE_TRACE ("ACE_Message_Queue_NT::is_full"); return false; // Always not full. } ACE_INLINE bool -ACE_Message_Queue_NT::is_empty (void) +ACE_Message_Queue_NT::is_empty () { ACE_TRACE ("ACE_Message_Queue_NT::is_empty"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, false); @@ -40,7 +40,7 @@ ACE_Message_Queue_NT::is_empty (void) } ACE_INLINE size_t -ACE_Message_Queue_NT::message_bytes (void) +ACE_Message_Queue_NT::message_bytes () { ACE_TRACE ("ACE_Message_Queue_NT::message_bytes"); // Accessing to size_t must be atomic. @@ -48,7 +48,7 @@ ACE_Message_Queue_NT::message_bytes (void) } ACE_INLINE size_t -ACE_Message_Queue_NT::message_length (void) +ACE_Message_Queue_NT::message_length () { ACE_TRACE ("ACE_Message_Queue_NT::message_length"); // Accessing to size_t must be atomic. @@ -56,7 +56,7 @@ ACE_Message_Queue_NT::message_length (void) } ACE_INLINE size_t -ACE_Message_Queue_NT::message_count (void) +ACE_Message_Queue_NT::message_count () { ACE_TRACE ("ACE_Message_Queue_NT::message_count"); // Accessing to size_t must be atomic. @@ -82,14 +82,14 @@ ACE_Message_Queue_NT::message_length (size_t new_value) } ACE_INLINE DWORD -ACE_Message_Queue_NT::max_threads (void) +ACE_Message_Queue_NT::max_threads () { ACE_TRACE ("ACE_Message_Queue_NT::max_threads"); return this->max_cthrs_; } ACE_INLINE int -ACE_Message_Queue_NT::deactivated (void) +ACE_Message_Queue_NT::deactivated () { ACE_TRACE ("ACE_Message_Queue_NT::deactivated"); // Accessing to int must be atomic. @@ -97,7 +97,7 @@ ACE_Message_Queue_NT::deactivated (void) } ACE_INLINE ACE_HANDLE -ACE_Message_Queue_NT::completion_port (void) +ACE_Message_Queue_NT::completion_port () { ACE_TRACE ("ACE_Message_Queue_NT::completion_port"); return this->completion_port_; @@ -113,7 +113,7 @@ ACE_Message_Queue_NT::peek_dequeue_head (ACE_Message_Block *&first_item, } ACE_INLINE ACE_Notification_Strategy * -ACE_Message_Queue_NT::notification_strategy (void) +ACE_Message_Queue_NT::notification_strategy () { ACE_NOTSUP_RETURN (0); } diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index d16e5cc485d8b..76ff7aa38fa0b 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -347,7 +347,6 @@ ACE_Message_Queue_Ex_Iterator:: ACE_Message_Queue_Ex_Iterator (ACE_Message_Queue_Ex & queue) : iter_ (queue.queue_) { - } template int @@ -388,7 +387,6 @@ ACE_Message_Queue_Ex_Reverse_Iterator & queue) : iter_ (queue.queue_) { - } template int diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h index bc49d81d80b0f..cfd3fdd43a6c2 100644 --- a/ACE/ace/Message_Queue_T.h +++ b/ACE/ace/Message_Queue_T.h @@ -97,7 +97,7 @@ class ACE_Message_Queue : public ACE_Message_Queue_Base * new messages, which can minimize the "silly window syndrome." * @param ns Notification strategy. Pointer to an object conforming to the * ACE_Notification_Strategy interface. If set, the object's - * notify(void) method will be called each time data is added to + * notify() method will be called each time data is added to * this ACE_Message_Queue. @see ACE_Reactor_Notification_Strategy. */ ACE_Message_Queue (size_t hwm = ACE_Message_Queue_Base::DEFAULT_HWM, @@ -353,7 +353,6 @@ class ACE_Message_Queue : public ACE_Message_Queue_Base /** @name Queue statistics methods */ //@{ - /// True if queue is full, else false. virtual bool is_full (); /// True if queue is empty, else false. @@ -395,7 +394,6 @@ class ACE_Message_Queue : public ACE_Message_Queue_Base /** @name Water mark (flow control) methods */ //@{ - /** * Get high watermark. */ @@ -424,7 +422,6 @@ class ACE_Message_Queue : public ACE_Message_Queue_Base * enqueueing and dequeueing operations. */ //@{ - /** * Deactivate the queue and wakeup all threads waiting on the queue * so they can continue. No messages are removed from the queue, @@ -462,7 +459,6 @@ class ACE_Message_Queue : public ACE_Message_Queue_Base /** @name Notification strategy methods */ //@{ - /** * This hook is automatically invoked by , * , and when a new item is inserted @@ -841,7 +837,6 @@ class ACE_Dynamic_Message_Queue : public ACE_Message_Queue in accordance with its priority. * priority may be *dynamic* or *static* or a combination or *both* @@ -1002,7 +997,6 @@ template , * , and when a new item is inserted @@ -1571,13 +1561,7 @@ class ACE_Message_Queue_Ex_N : public ACE_Message_Queue_Ex= max_messages_; diff --git a/ACE/ace/Method_Request.h b/ACE/ace/Method_Request.h index 0833fe93dd611..96234416b21c7 100644 --- a/ACE/ace/Method_Request.h +++ b/ACE/ace/Method_Request.h @@ -76,7 +76,7 @@ class ACE_Export ACE_Method_Request * decide the meaning of this return value and act on it * if needed. */ - virtual int call (void) = 0; + virtual int call () = 0; private: ACE_Method_Request (const ACE_Method_Request &) = delete; diff --git a/ACE/ace/Metrics_Cache_T.cpp b/ACE/ace/Metrics_Cache_T.cpp index c2611b921d37f..a9967e460acd4 100644 --- a/ACE/ace/Metrics_Cache_T.cpp +++ b/ACE/ace/Metrics_Cache_T.cpp @@ -105,7 +105,7 @@ ACE_Metrics_Timeprobe::is_event (const ACE_Metrics_Timeprob template const char * -ACE_Metrics_Timeprobe::probe_name (void) +ACE_Metrics_Timeprobe::probe_name () { return name_; } @@ -131,7 +131,7 @@ ACE_Metrics_Timeprobe::probe_name (char * name) template u_int -ACE_Metrics_Timeprobe::probe_id (void) +ACE_Metrics_Timeprobe::probe_id () { return id_; } @@ -206,7 +206,7 @@ ACE_Metrics_Cache::~ACE_Metrics_Cache () // the singleton allocator in the current process is used. template ALLOCATOR * -ACE_Metrics_Cache::allocator (void) +ACE_Metrics_Cache::allocator () { ALLOCATOR * alloc = allocator_; return alloc diff --git a/ACE/ace/Metrics_Cache_T.h b/ACE/ace/Metrics_Cache_T.h index c05862183c59d..9488c81b7aec8 100644 --- a/ACE/ace/Metrics_Cache_T.h +++ b/ACE/ace/Metrics_Cache_T.h @@ -45,7 +45,6 @@ class ACE_Metrics_Timeprobe : public ACE_Timeprobe_Ex { public: - typedef ACE_Metrics_Timeprobe ACE_METRICS_TIMEPROBE_TYPE; @@ -81,11 +80,11 @@ class ACE_Metrics_Timeprobe : ACE_Metrics_Timeprobe::event_id id); /// Accessor and mutator for probe name. - const char * probe_name (void); + const char * probe_name (); void probe_name (char * name); /// Accessor for probe id. - u_int probe_id (void); + u_int probe_id (); /// Mutator for probe id. void probe_id (u_int id); @@ -94,7 +93,6 @@ class ACE_Metrics_Timeprobe : void flush_ACE_Metrics_Timeprobe (); protected: - /// Identifier for the timeprobe. u_int id_; @@ -102,7 +100,6 @@ class ACE_Metrics_Timeprobe : char* name_; private: - // Declare but do not define. ACE_Metrics_Timeprobe (const ACE_Metrics_Timeprobe &); void operator =(const ACE_Metrics_Timeprobe &); @@ -120,7 +117,6 @@ template class ACE_Metrics_Cache { public: - typedef ACE_Metrics_Cache ACE_METRICS_CACHE_TYPE; /// Default constructor. @@ -165,11 +161,10 @@ class ACE_Metrics_Cache int metrics_enabled() const; protected: - /// Obtain an allocator pointer correctly thunked for the current /// address space. If there is no allocator stored in the instance, /// the singleton allocator in the current process is used. - ALLOCATOR * allocator (void); + ALLOCATOR * allocator (); // = Implementation members. @@ -227,13 +222,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Metrics_Cache_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Metrics_Cache_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Metrics_Cache_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* defined (ACE_COMPILE_TIMEPROBES) */ diff --git a/ACE/ace/Module.h b/ACE/ace/Module.h index 881d4076616aa..bb5f31578d284 100644 --- a/ACE/ace/Module.h +++ b/ACE/ace/Module.h @@ -201,13 +201,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Module.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Module.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Module.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Monitor_Admin_Manager.h b/ACE/ace/Monitor_Admin_Manager.h index 5b4f04c230202..f3c27214bf5d9 100644 --- a/ACE/ace/Monitor_Admin_Manager.h +++ b/ACE/ace/Monitor_Admin_Manager.h @@ -42,10 +42,10 @@ namespace ACE { public: /// Access the admin instance. - ACE::Monitor_Control::Monitor_Admin& admin (void); + ACE::Monitor_Control::Monitor_Admin& admin (); /// Used to force initialization of the MC service. - static int Initializer (void); + static int Initializer (); private: Monitor_Admin admin_; diff --git a/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp b/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp index e65e4f2ec9737..ad603b39aa128 100644 --- a/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp +++ b/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp @@ -12,12 +12,12 @@ namespace ACE { namespace Monitor_Control { - Auto_Update_Starter::Auto_Update_Starter (void) + Auto_Update_Starter::Auto_Update_Starter () { } int - Auto_Update_Starter::svc (void) + Auto_Update_Starter::svc () { MC_ADMINMANAGER* mgr = ACE_Dynamic_Service::instance ("MC_ADMINMANAGER"); diff --git a/ACE/ace/Monitor_Control/Auto_Update_Starter.h b/ACE/ace/Monitor_Control/Auto_Update_Starter.h index 7a488d5370f57..f773b24217c51 100644 --- a/ACE/ace/Monitor_Control/Auto_Update_Starter.h +++ b/ACE/ace/Monitor_Control/Auto_Update_Starter.h @@ -43,9 +43,9 @@ namespace ACE class MONITOR_CONTROL_Export Auto_Update_Starter : public ACE_Task_Base { public: - Auto_Update_Starter (void); + Auto_Update_Starter (); - int svc (void); + int svc (); }; } } diff --git a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp index 1e8a99d2876b7..718e603d91117 100644 --- a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp @@ -27,20 +27,20 @@ namespace ACE } void - BSD_Network_Interface_Monitor::update_i (void) + BSD_Network_Interface_Monitor::update_i () { this->fetch(this->value_); this->value_ -= this->start_; } void - BSD_Network_Interface_Monitor::clear_impl (void) + BSD_Network_Interface_Monitor::clear_impl () { this->init(); } void - BSD_Network_Interface_Monitor::init (void) + BSD_Network_Interface_Monitor::init () { this->fetch(this->start_); this->value_ = 0UL; diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp index 0cca617c78f69..9524a483c6426 100644 --- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp @@ -16,12 +16,10 @@ namespace ACE #if defined (ACE_HAS_WIN32_PDH) , Windows_Multi_Instance_Monitor ( ACE_TEXT ("\\Network Interface(*)\\Bytes Received/sec")) -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , Linux_Network_Interface_Monitor ( " %*[^:]: %lu %*u %*u %*u %*u %*u %*u %*u %*u %*u") /// Scan format for /proc/net/dev -#elif defined (ACE_HAS_KSTAT) - , Solaris_Network_Interface_Monitor (ACE_TEXT ("rbytes")) #elif defined (__NetBSD__) || defined (__OpenBSD__) , BSD_Network_Interface_Monitor (ACE_TEXT ("ibytes")) #elif defined (__FreeBSD__) || defined (__Lynx__) @@ -30,7 +28,7 @@ namespace ACE {} void - Bytes_Received_Monitor::update (void) + Bytes_Received_Monitor::update () { this->update_i (); @@ -39,13 +37,13 @@ namespace ACE } const char* - Bytes_Received_Monitor::default_name (void) + Bytes_Received_Monitor::default_name () { return Bytes_Received_Monitor::default_name_; } void - Bytes_Received_Monitor::clear_i (void) + Bytes_Received_Monitor::clear_i () { this->clear_impl (); this->Monitor_Base::clear_i (); diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h index eabb99399ca4e..de3158513d36c 100644 --- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h +++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h @@ -23,10 +23,8 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h" -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h" #elif defined (__FreeBSD__) || defined (__Lynx__) #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h" #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -52,10 +50,8 @@ namespace ACE : public Monitor_Base #if defined (ACE_HAS_WIN32_PDH) , public Windows_Multi_Instance_Monitor -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , public Linux_Network_Interface_Monitor -#elif defined (ACE_HAS_KSTAT) - , public Solaris_Network_Interface_Monitor #elif defined (__NetBSD__) || defined (__OpenBSD__) , public BSD_Network_Interface_Monitor #elif defined (__FreeBSD__) || defined (__Lynx__) @@ -68,14 +64,14 @@ namespace ACE Bytes_Received_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp index 7e1e408a5f952..b196f2f01f56e 100644 --- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp @@ -16,12 +16,10 @@ namespace ACE #if defined (ACE_HAS_WIN32_PDH) , Windows_Multi_Instance_Monitor ( ACE_TEXT ("\\Network Interface(*)\\Bytes Sent/sec")) -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , Linux_Network_Interface_Monitor ( " %*[^:]: %*u %*u %*u %*u %*u %*u %*u %*u %lu %*u") /// Scan format for /proc/net/dev -#elif defined (ACE_HAS_KSTAT) - , Solaris_Network_Interface_Monitor (ACE_TEXT ("obytes")) #elif defined (__FreeBSD__) || defined (__Lynx__) , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("obytes")) #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -30,7 +28,7 @@ namespace ACE {} void - Bytes_Sent_Monitor::update (void) + Bytes_Sent_Monitor::update () { this->update_i (); @@ -39,13 +37,13 @@ namespace ACE } const char* - Bytes_Sent_Monitor::default_name (void) + Bytes_Sent_Monitor::default_name () { return Bytes_Sent_Monitor::default_name_; } void - Bytes_Sent_Monitor::clear_i (void) + Bytes_Sent_Monitor::clear_i () { this->clear_impl (); this->Monitor_Base::clear_i (); diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h index 7cf0def29da4b..8672d6749bf88 100644 --- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h +++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h @@ -23,10 +23,8 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h" -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h" #elif defined (__FreeBSD__) || defined (__Lynx__) #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h" #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -52,10 +50,8 @@ namespace ACE : public Monitor_Base #if defined (ACE_HAS_WIN32_PDH) , public Windows_Multi_Instance_Monitor -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , public Linux_Network_Interface_Monitor -#elif defined (ACE_HAS_KSTAT) - , public Solaris_Network_Interface_Monitor #elif defined (__NetBSD__) || defined (__OpenBSD__) , public BSD_Network_Interface_Monitor #elif defined (__FreeBSD__) || defined (__Lynx__) @@ -68,14 +64,14 @@ namespace ACE Bytes_Sent_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp index 5aa5b944bf211..af3bfe9716309 100644 --- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp +++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp @@ -2,10 +2,6 @@ #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1) -#if defined (ACE_HAS_KSTAT) -#include -#endif - #if defined (ACE_LINUX) #include "ace/OS_NS_stdio.h" #endif @@ -27,7 +23,7 @@ namespace ACE #if defined (ACE_HAS_WIN32_PDH) , Windows_Monitor (ACE_TEXT("\\Processor(_Total)\\% Processor Time")) #endif -#if defined (ACE_LINUX) || defined (ACE_HAS_KSTAT) +#if defined (ACE_LINUX) , user_ (0) , wait_ (0) , kernel_ (0) @@ -37,17 +33,13 @@ namespace ACE #endif #if defined (ACE_LINUX) , file_ptr_ (0) -#elif defined (ACE_HAS_KSTAT) - , kstats_ (0) - , kstat_ (0) - , kstat_id_ (0) #endif { this->init (); } void - CPU_Load_Monitor::update (void) + CPU_Load_Monitor::update () { #if defined (ACE_HAS_WIN32_PDH) this->update_i (); @@ -58,7 +50,7 @@ namespace ACE this->access_kstats (&this->idle_); #endif -#if defined (ACE_LINUX) || defined (ACE_HAS_KSTAT) +#if defined (ACE_LINUX) double delta_idle = this->idle_ - this->prev_idle_; double total = this->user_ + this->wait_ + this->kernel_ + this->idle_; @@ -82,13 +74,13 @@ namespace ACE } const char* - CPU_Load_Monitor::default_name (void) + CPU_Load_Monitor::default_name () { return CPU_Load_Monitor::default_name_; } void - CPU_Load_Monitor::clear_i (void) + CPU_Load_Monitor::clear_i () { #if defined (ACE_HAS_WIN32_PDH) this->clear_impl (); @@ -99,7 +91,7 @@ namespace ACE } void - CPU_Load_Monitor::init (void) + CPU_Load_Monitor::init () { #if defined (ACE_LINUX) /// All data in this file are stored as running 'jiffy' totals, so we @@ -107,12 +99,6 @@ namespace ACE /// in subsequent calls. this->access_proc_stat (&this->prev_idle_); - this->prev_total_ = - this->user_ + this->wait_ + this->kernel_ + this->prev_idle_; -#elif defined (ACE_HAS_KSTAT) - /// Stored similarly to Linux, in a system file. - this->access_kstats (&this->prev_idle_); - this->prev_total_ = this->user_ + this->wait_ + this->kernel_ + this->prev_idle_; #endif @@ -160,93 +146,6 @@ namespace ACE ACE_OS::fclose (this->file_ptr_); } #endif - -#if defined (ACE_HAS_KSTAT) - void - CPU_Load_Monitor::access_kstats (unsigned long *which_idle) - { - this->kstats_ = kstat_open (); - - if (this->kstats_ == 0) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("opening kstats file failed\n"))); - return; - } - - this->kstat_id_ = this->kstats_->kc_chain_id; - - while (true) - { - this->kernel_ = 0UL; - this->wait_ = 0UL; - this->user_ = 0UL; - (*which_idle) = 0UL; - - /// Unlike Linux's "/proc/stat", there is no entry for total CPU - /// stats, so we have to sum them manually. - for (this->kstat_ = this->kstats_->kc_chain; - this->kstat_ != 0; - this->kstat_ = this->kstat_->ks_next) - { - int result = ACE_OS::strncmp (this->kstat_->ks_name, - "cpu_stat", - ACE_OS::strlen ("cpu_stat")); - - if (result == 0) - { - /// Because the kstat chain can change dynamically, - /// watch the chain ID and restart the walk if the ID - /// differs from what we saw during the walk. The restart - /// is done by breaking from the cycle with kstat_ not 0. - - kid_t kstat_id = kstat_read (this->kstats_, this->kstat_, 0); - - if (kstat_id != this->kstat_id_) - { - break; - } - - cpu_stat_t &kstat_cpu = - *((cpu_stat_t *) this->kstat_->ks_data); - - this->kernel_ += kstat_cpu.cpu_sysinfo.cpu[CPU_KERNEL]; - this->wait_ += kstat_cpu.cpu_sysinfo.cpu[CPU_WAIT]; - this->user_ += kstat_cpu.cpu_sysinfo.cpu[CPU_USER]; - (*which_idle) += kstat_cpu.cpu_sysinfo.cpu[CPU_IDLE]; - } - } - - if (this->kstat_ != 0) - { - /// The ID changed underneath us, so get the new one and - /// start again. - this->kstat_id_ = kstat_chain_update (this->kstats_); - - if (! this->kstat_id_ > 0) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("kstat chain update ") - ACE_TEXT ("returned null id\n"))); - return; - } - } - else - { - /// Clean run, exit the WHILE loop. - break; - } - } - - int status = kstat_close (this->kstats_); - - if (status != 0) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("closing kstats file failed\n"))); - } - } -#endif } } diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.h b/ACE/ace/Monitor_Control/CPU_Load_Monitor.h index 7ae6dda69d515..f286478039b2d 100644 --- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.h +++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.h @@ -23,8 +23,6 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -#include "ace/os_include/os_kstat.h" #endif #include "ace/Monitor_Control/Monitor_Control_export.h" @@ -50,32 +48,28 @@ namespace ACE CPU_Load_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); /// Common code to the constructor and to clear_i(). - void init (void); + void init (); private: #if defined (ACE_LINUX) void access_proc_stat (unsigned long *which_idle); #endif -#if defined (ACE_HAS_KSTAT) - void access_kstats (unsigned long *which_idle); -#endif - private: static const char* default_name_; - /// Common to Linux and Solaris implementations. -#if defined (ACE_LINUX) || defined (ACE_HAS_KSTAT) + /// Linux implementation +#if defined (ACE_LINUX) unsigned long user_; unsigned long wait_; unsigned long kernel_; @@ -86,10 +80,6 @@ namespace ACE #if defined (ACE_LINUX) FILE *file_ptr_; char buf_[1024]; -#elif defined (ACE_HAS_KSTAT) - kstat_ctl_t *kstats_; - kstat_t *kstat_; - kid_t kstat_id_; #endif }; } diff --git a/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp b/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp index f6b4f6859582b..7cd1922fd3a3e 100644 --- a/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp +++ b/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp @@ -14,11 +14,11 @@ namespace ACE { namespace Monitor_Control { - Constraint_Interpreter::Constraint_Interpreter (void) + Constraint_Interpreter::Constraint_Interpreter () { } - Constraint_Interpreter::~Constraint_Interpreter (void) + Constraint_Interpreter::~Constraint_Interpreter () { } diff --git a/ACE/ace/Monitor_Control/Constraint_Interpreter.h b/ACE/ace/Monitor_Control/Constraint_Interpreter.h index d63bf35f81648..e867c72ef0dd9 100644 --- a/ACE/ace/Monitor_Control/Constraint_Interpreter.h +++ b/ACE/ace/Monitor_Control/Constraint_Interpreter.h @@ -44,9 +44,9 @@ namespace ACE : public ETCL_Interpreter { public: - Constraint_Interpreter (void); + Constraint_Interpreter (); - virtual ~Constraint_Interpreter (void); + virtual ~Constraint_Interpreter (); /** * This method builds an expression tree representing the diff --git a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp index 1348f6a21c64d..e793a54d7225a 100644 --- a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp @@ -28,20 +28,20 @@ namespace ACE } void - FreeBSD_Network_Interface_Monitor::update_i (void) + FreeBSD_Network_Interface_Monitor::update_i () { this->fetch(this->value_); this->value_ -= this->start_; } void - FreeBSD_Network_Interface_Monitor::clear_impl (void) + FreeBSD_Network_Interface_Monitor::clear_impl () { this->init(); } void - FreeBSD_Network_Interface_Monitor::init (void) + FreeBSD_Network_Interface_Monitor::init () { this->fetch(this->start_); this->value_ = 0UL; diff --git a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h index 61a650c4c564e..521f746df813e 100644 --- a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h +++ b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h @@ -41,16 +41,16 @@ namespace ACE FreeBSD_Network_Interface_Monitor (const ACE_TCHAR *lookup_str); /// Platform-specific implementation. - void update_i (void); + void update_i (); /// Platform-specific reset. - void clear_impl (void); + void clear_impl (); protected: ACE_UINT64 value_; private: - void init (void); + void init (); void fetch (ACE_UINT64& value) const; ACE_UINT64 start_; diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp index a92f82b881666..1ba3229d9e7da 100644 --- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp @@ -1,6 +1,6 @@ #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h" -#if defined (ACE_LINUX) || defined (AIX) +#if defined (ACE_LINUX) #include "ace/Log_Category.h" #include "ace/OS_NS_stdio.h" @@ -21,7 +21,7 @@ namespace ACE } void - Linux_Network_Interface_Monitor::update_i (void) + Linux_Network_Interface_Monitor::update_i () { char buf[1024]; FILE* fp = ACE_OS::fopen (ACE_TEXT ("/proc/net/dev"), @@ -66,13 +66,13 @@ namespace ACE } void - Linux_Network_Interface_Monitor::clear_impl (void) + Linux_Network_Interface_Monitor::clear_impl () { this->init (); } void - Linux_Network_Interface_Monitor::init (void) + Linux_Network_Interface_Monitor::init () { for (unsigned long i = 0UL; i < MAX_INTERFACES; ++i) { @@ -119,4 +119,4 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* defined (ACE_LINUX) || defined (AIX) */ +#endif /* defined (ACE_LINUX) */ diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h index 0320bfa3f8cc6..e60e8c5fcad3a 100644 --- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h +++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h @@ -21,7 +21,7 @@ #include "ace/Monitor_Control/Monitor_Control_export.h" -#if defined (ACE_LINUX) || defined (AIX) +#if defined (ACE_LINUX) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -44,17 +44,17 @@ namespace ACE Linux_Network_Interface_Monitor (const char *scan_format); /// Platform-specific implementation. - void update_i (void); + void update_i (); /// Platform-specific reset. - void clear_impl (void); + void clear_impl (); protected: ACE_UINT64 value_; private: /// Common code. - void init (void); + void init (); private: static const unsigned long MAX_INTERFACES = 10UL; @@ -67,7 +67,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* defined (ACE_LINUX) || defined (AIX) */ +#endif /* defined (ACE_LINUX) */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp index 73b29f73abd68..ab288a05dfac7 100644 --- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp @@ -1,7 +1,3 @@ -#if defined (ACE_HAS_KSTAT) -#include -#endif - #include "ace/Monitor_Control/Memory_Usage_Monitor.h" #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1) @@ -24,7 +20,7 @@ namespace ACE } void - Memory_Usage_Monitor::update (void) + Memory_Usage_Monitor::update () { #if defined (ACE_HAS_WIN32_PDH) this->update_i (); @@ -40,27 +36,18 @@ namespace ACE double used_ram = this->sysinfo_.totalram - this->sysinfo_.freeram; double percent_mem_usage = used_ram / this->sysinfo_.totalram * 100.0; - this->receive (percent_mem_usage); -#elif defined (ACE_HAS_KSTAT) - unsigned long page_size = sysconf (_SC_PAGE_SIZE); - unsigned long total = sysconf (_SC_PHYS_PAGES) * page_size; - unsigned long free = sysconf (_SC_AVPHYS_PAGES) * page_size; - - double used = total - free; - double percent_mem_usage = used / total * 100.0; - this->receive (percent_mem_usage); #endif } const char* - Memory_Usage_Monitor::default_name (void) + Memory_Usage_Monitor::default_name () { return Memory_Usage_Monitor::default_name_; } void - Memory_Usage_Monitor::clear_i (void) + Memory_Usage_Monitor::clear_i () { #if defined (ACE_HAS_WIN32_PDH) this->clear_impl (); diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h index c8eb730767b59..064b5e74e2df7 100644 --- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h +++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h @@ -50,14 +50,14 @@ namespace ACE Memory_Usage_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/Monitor_Control.mpc b/ACE/ace/Monitor_Control/Monitor_Control.mpc index a13930e845e4a..5073b019163fb 100644 --- a/ACE/ace/Monitor_Control/Monitor_Control.mpc +++ b/ACE/ace/Monitor_Control/Monitor_Control.mpc @@ -2,7 +2,6 @@ project(Monitor_Control) : acelib, ace_etcl_parser, ace_output, install { dynamicflags += MONITOR_CONTROL_BUILD_DLL sharedname = ACE_Monitor_Control - avoids += wince Source_Files { Auto_Update_Starter.cpp @@ -21,7 +20,6 @@ project(Monitor_Control) : acelib, ace_etcl_parser, ace_output, install { Num_Threads_Monitor.cpp Packets_Received_Monitor.cpp Packets_Sent_Monitor.cpp - Solaris_Network_Interface_Monitor.cpp Windows_Monitor.cpp Windows_Multi_Instance_Monitor.cpp } @@ -48,4 +46,9 @@ project(Monitor_Control) : acelib, ace_etcl_parser, ace_output, install { " ACE_SHLIBS += pdh.lib" "endif" } + verbatim (cmake, top, 1) { + "if (WIN32)" + " link_libraries(pdh)" + "endif()" + } } diff --git a/ACE/ace/Monitor_Control/Monitor_Control.rc b/ACE/ace/Monitor_Control/Monitor_Control.rc new file mode 100644 index 0000000000000..118f045704289 --- /dev/null +++ b/ACE/ace/Monitor_Control/Monitor_Control.rc @@ -0,0 +1,30 @@ +#include "../Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACE_Monitor_Control\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACE_Monitor_ControlDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACE_Monitor_Control.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/ace/Monitor_Control/Monitor_Group.cpp b/ACE/ace/Monitor_Control/Monitor_Group.cpp index 77cc456797f84..42c8b824bb5d6 100644 --- a/ACE/ace/Monitor_Control/Monitor_Group.cpp +++ b/ACE/ace/Monitor_Control/Monitor_Group.cpp @@ -19,7 +19,7 @@ namespace ACE } void - Monitor_Group::update (void) + Monitor_Group::update () { for (MEMBERS_ITERATOR i (this->members_); !i.done (); i.advance ()) { @@ -48,7 +48,7 @@ namespace ACE } void - Monitor_Group::clear (void) + Monitor_Group::clear () { for (MEMBERS_ITERATOR i (this->members_); !i.done (); i.advance ()) { diff --git a/ACE/ace/Monitor_Control/Monitor_Group.h b/ACE/ace/Monitor_Control/Monitor_Group.h index 2ce370c860b8d..6aa628949360a 100644 --- a/ACE/ace/Monitor_Control/Monitor_Group.h +++ b/ACE/ace/Monitor_Control/Monitor_Group.h @@ -41,14 +41,14 @@ namespace ACE void add_member (Monitor_Base* member); - virtual void update (void); + virtual void update (); /// These are overridden to be no-ops. virtual void receive (double data); virtual void receive (size_t data); virtual void receive (const Monitor_Control_Types::NameList& data); - virtual void clear (void); + virtual void clear (); private: typedef ACE_Unbounded_Queue diff --git a/ACE/ace/Monitor_Control/Monitor_Query.cpp b/ACE/ace/Monitor_Control/Monitor_Query.cpp index 6de953b16194c..e51595c35455f 100644 --- a/ACE/ace/Monitor_Control/Monitor_Query.cpp +++ b/ACE/ace/Monitor_Control/Monitor_Query.cpp @@ -48,7 +48,7 @@ namespace ACE } void - Monitor_Query::query (void) + Monitor_Query::query () { if (this->monitor_ == 0) { diff --git a/ACE/ace/Monitor_Control/Monitor_Query.h b/ACE/ace/Monitor_Control/Monitor_Query.h index 5c24c7f4ab434..2cfe0461b9dca 100644 --- a/ACE/ace/Monitor_Control/Monitor_Query.h +++ b/ACE/ace/Monitor_Control/Monitor_Query.h @@ -59,7 +59,7 @@ namespace ACE public: Monitor_Query (const char* monitor_name); - void query (void); + void query (); private: Monitor_Base* monitor_; diff --git a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp index ad554ca17cdb6..4a52c001503b9 100644 --- a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp @@ -6,19 +6,19 @@ namespace ACE { namespace Monitor_Control { - Null_Network_Interface_Monitor::Null_Network_Interface_Monitor (void) + Null_Network_Interface_Monitor::Null_Network_Interface_Monitor () : value_ (0UL) { } void - Null_Network_Interface_Monitor::update_i (void) + Null_Network_Interface_Monitor::update_i () { /// No-op. } void - Null_Network_Interface_Monitor::clear_impl (void) + Null_Network_Interface_Monitor::clear_impl () { /// No-op. } diff --git a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h index 82fd31707842c..568a1ed2a349f 100644 --- a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h +++ b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h @@ -38,13 +38,13 @@ namespace ACE class MONITOR_CONTROL_Export Null_Network_Interface_Monitor { protected: - Null_Network_Interface_Monitor (void); + Null_Network_Interface_Monitor (); /// Platform-specific implementation. - void update_i (void); + void update_i (); /// Platform-specific reset. - void clear_impl (void); + void clear_impl (); protected: ACE_UINT64 value_; diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp index f4a3370813346..c42fac4f0983d 100644 --- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp @@ -30,7 +30,7 @@ namespace ACE } void - Num_Threads_Monitor::update (void) + Num_Threads_Monitor::update () { #if defined (ACE_HAS_WIN32_PDH) this->update_i (); @@ -75,13 +75,13 @@ namespace ACE } const char* - Num_Threads_Monitor::default_name (void) + Num_Threads_Monitor::default_name () { return Num_Threads_Monitor::default_name_; } void - Num_Threads_Monitor::clear_i (void) + Num_Threads_Monitor::clear_i () { #if defined (ACE_HAS_WIN32_PDH) this->clear_impl (); diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.h b/ACE/ace/Monitor_Control/Num_Threads_Monitor.h index 2c44c0e7f4a5e..7a20d2d0b78bb 100644 --- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.h +++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.h @@ -23,14 +23,6 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -/// There is apparently no way to query the number of threads on the -/// Solaris platform. The only benchmark I've seen had to put hooks -/// in the thread creation functions to keep track of the highest -/// thread ID, then check all the IDs less than that to see if the -/// threads still exist. Since we don't have that option in this -/// framework, which is to be used by existing applications, this -/// particular OS monitor is left unimplemented on Solaris. #endif #include "ace/Monitor_Control/Monitor_Control_export.h" @@ -56,14 +48,14 @@ namespace ACE Num_Threads_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp index f0029acd6a83f..4d222b86514a8 100644 --- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp @@ -16,12 +16,10 @@ namespace ACE #if defined (ACE_HAS_WIN32_PDH) , Windows_Multi_Instance_Monitor ( ACE_TEXT ("\\Network Interface(*)\\Packets Received/sec")) -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , Linux_Network_Interface_Monitor ( " %*[^:]: %*u %lu %*u %*u %*u %*u %*u %*u %*u %*u") /// Scan format for /proc/net/dev -#elif defined (ACE_HAS_KSTAT) - , Solaris_Network_Interface_Monitor (ACE_TEXT ("ipackets")) #elif defined (__FreeBSD__) || defined (__Lynx__) , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("ipackets")) #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -30,7 +28,7 @@ namespace ACE {} void - Packets_Received_Monitor::update (void) + Packets_Received_Monitor::update () { this->update_i (); @@ -39,13 +37,13 @@ namespace ACE } const char* - Packets_Received_Monitor::default_name (void) + Packets_Received_Monitor::default_name () { return Packets_Received_Monitor::default_name_; } void - Packets_Received_Monitor::clear_i (void) + Packets_Received_Monitor::clear_i () { this->clear_impl (); this->Monitor_Base::clear_i (); diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h index bb0e7d0763fd7..d0338dfde6be0 100644 --- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h +++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h @@ -23,10 +23,8 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h" -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h" #elif defined (__FreeBSD__) || defined (__Lynx__) #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h" #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -52,10 +50,8 @@ namespace ACE : public Monitor_Base #if defined (ACE_HAS_WIN32_PDH) , public Windows_Multi_Instance_Monitor -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , public Linux_Network_Interface_Monitor -#elif defined (ACE_HAS_KSTAT) - , public Solaris_Network_Interface_Monitor #elif defined (__NetBSD__) || defined (__OpenBSD__) , public BSD_Network_Interface_Monitor #elif defined (__FreeBSD__) || defined (__Lynx__) @@ -68,14 +64,14 @@ namespace ACE Packets_Received_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp index de5cfd3781311..5c3046c0e3ecd 100644 --- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp @@ -16,12 +16,10 @@ namespace ACE #if defined (ACE_HAS_WIN32_PDH) , Windows_Multi_Instance_Monitor ( ACE_TEXT ("\\Network Interface(*)\\Packets Sent/sec")) -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , Linux_Network_Interface_Monitor ( " %*[^:]: %*u %*u %*u %*u %*u %*u %*u %*u %*u %lu") /// Scan format for /proc/net/dev -#elif defined (ACE_HAS_KSTAT) - , Solaris_Network_Interface_Monitor (ACE_TEXT ("opackets")) #elif defined (__NetBSD__) || defined (__OpenBSD__) , BSD_Network_Interface_Monitor (ACE_TEXT ("opackets")) #elif defined (__FreeBSD__) || defined (__Lynx__) @@ -30,7 +28,7 @@ namespace ACE {} void - Packets_Sent_Monitor::update (void) + Packets_Sent_Monitor::update () { this->update_i (); @@ -39,13 +37,13 @@ namespace ACE } const char* - Packets_Sent_Monitor::default_name (void) + Packets_Sent_Monitor::default_name () { return Packets_Sent_Monitor::default_name_; } void - Packets_Sent_Monitor::clear_i (void) + Packets_Sent_Monitor::clear_i () { this->clear_impl (); this->Monitor_Base::clear_i (); diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h index 1ad0a2d9a6c35..85de0ca1d6383 100644 --- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h +++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h @@ -23,10 +23,8 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h" -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h" #elif defined (__FreeBSD__) || defined (__Lynx__) #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h" #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -52,10 +50,8 @@ namespace ACE : public Monitor_Base #if defined (ACE_HAS_WIN32_PDH) , public Windows_Multi_Instance_Monitor -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , public Linux_Network_Interface_Monitor -#elif defined (ACE_HAS_KSTAT) - , public Solaris_Network_Interface_Monitor #elif defined (__NetBSD__) || defined (__OpenBSD__) , public BSD_Network_Interface_Monitor #elif defined (__FreeBSD__) || defined (__Lynx__) @@ -68,14 +64,14 @@ namespace ACE Packets_Sent_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp deleted file mode 100644 index d57dc88ad3756..0000000000000 --- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp +++ /dev/null @@ -1,221 +0,0 @@ -#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h" - -#if defined (ACE_HAS_KSTAT) - -#include "ace/Log_Category.h" -#include "ace/OS_NS_stdio.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace ACE -{ - namespace Monitor_Control - { - Solaris_Network_Interface_Monitor::Solaris_Network_Interface_Monitor ( - const ACE_TCHAR *lookup_str) - : value_ (0UL), - start_ (0UL), - lookup_str_ (lookup_str) - { - this->init (); - } - - void - Solaris_Network_Interface_Monitor::update_i (void) - { - this->access_kstats (this->value_); - this->value_ -= this->start_; - } - - void - Solaris_Network_Interface_Monitor::clear_impl (void) - { - this->init (); - } - - void - Solaris_Network_Interface_Monitor::init (void) - { - unsigned long i; - - for (i = 0UL; i < MAX_LO_INTERFACES; ++i) - { - this->value_array_lo_[i] = 0UL; - } - - for (i = 0UL; i < MAX_HME_INTERFACES; ++i) - { - this->value_array_hme_[i] = 0UL; - } - - this->access_kstats (this->start_); - } - - void - Solaris_Network_Interface_Monitor::access_kstats ( - ACE_UINT64 &which_member) - { - this->kstats_ = kstat_open (); - - if (this->kstats_ == 0) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("opening kstats file failed\n"))); - return; - } - - this->kstat_id_ = this->kstats_->kc_chain_id; - int status = 0; - - while (true) - { - /// We have to sum the network interfaces manually. - for (this->kstat_ = this->kstats_->kc_chain; - this->kstat_ != 0; - this->kstat_ = this->kstat_->ks_next) - { - if (ACE_OS::strcmp (this->kstat_->ks_class, "net") != 0) - { - continue; - } - - unsigned long ks_instance = this->kstat_->ks_instance; - - if (ACE_OS::strcmp (this->kstat_->ks_module, "lo") == 0) - { - /// Interfaces 'lo' have only packet counters. - if (this->lookup_str_ == ACE_TEXT ("obytes") - || this->lookup_str_ == ACE_TEXT ("rbytes")) - { - continue; - } - - status = this->check_ks_module (ks_instance, - MAX_LO_INTERFACES, - "MAX_LO_INTERFACES", - this->value_array_lo_, - which_member); - - if (status == -1) - { - /// Unrecoverable error, diagnostic already output. - (void) kstat_close (this->kstats_); - return; - } - else if (status == 1) - { - /// The kstat_id changed underneath us, start over. - break; - } - } - else if (ACE_OS::strcmp (this->kstat_->ks_module, "hme") == 0 - || ACE_OS::strcmp (this->kstat_->ks_module, "bge") == 0) - { - status = this->check_ks_module (ks_instance, - MAX_HME_INTERFACES, - "MAX_HME_INTERFACES", - this->value_array_hme_, - which_member); - - if (status == -1) - { - /// Unrecoverable error, diagnostic already output. - (void) kstat_close (this->kstats_); - return; - } - else if (status == 1) - { - /// The kstat_id changed underneath us, start over. - break; - } - } - } - - if (this->kstat_) - { - this->kstat_id_ = kstat_chain_update (this->kstats_); - - if (! this->kstat_id_ > 0) - { - ACELIB_ERROR ((LM_ERROR, "kstat is is not > 0.\n")); - break; - } - } - else - { - break; - } - } - - status = kstat_close (this->kstats_); - - if (status != 0) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("closing kstats file failed\n"))); - } - } - - int - Solaris_Network_Interface_Monitor::check_ks_module ( - const unsigned long ks_instance, - const unsigned long which_max, - const char *max_str, - ACE_UINT64 *value_array, - ACE_UINT64 &which_member) - { - if (! (ks_instance < which_max)) - { - ACELIB_ERROR_RETURN ((LM_ERROR, - "%s exceeded.\n", - max_str), - -1); - } - - /// Because the kstat chain can change dynamically, - /// watch the chain ID and restart the walk if the ID - /// differs from what we saw during the walk. The restart - /// is done by breaking from the cycle with kstat_ not 0. - - kid_t kstat_id = - kstat_read (this->kstats_, this->kstat_, 0); - - if (kstat_id != this->kstat_id_) - { - /// This return value restarts the walk as described above. - return 1; - } - - kstat_named_t *value = - (kstat_named_t *) kstat_data_lookup ( - this->kstat_, - ACE_TEXT_ALWAYS_CHAR (this->lookup_str_.rep ())); - - if (value == 0) - { - /// Just return and let the calling FOR loop advance. - return 0; - } - - if (value->data_type != KSTAT_DATA_UINT32) - { - ACELIB_ERROR_RETURN ((LM_ERROR, - "Wrong data type.\n"), - -1); - } - - /// Guard against overflow. - value_array[ks_instance] += - value->value.ui32 - - static_cast (value_array[ks_instance]); - - which_member += value_array[ks_instance]; - - return 0; - } - } -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* defined (ACE_HAS_KSTAT) */ diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h deleted file mode 100644 index 83f02f71e05f5..0000000000000 --- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h +++ /dev/null @@ -1,89 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Solaris_Network_Interface_Monitor.h - * - * @author Jeff Parsons - */ -//============================================================================= - -#ifndef SOLARIS_NETWORK_INTERFACE_MONITOR_H -#define SOLARIS_NETWORK_INTERFACE_MONITOR_H - -#include /**/ "ace/pre.h" - -#include "ace/SString.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Monitor_Control/Monitor_Control_export.h" - -#if defined (ACE_HAS_KSTAT) - -#include "ace/os_include/os_kstat.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace ACE -{ - namespace Monitor_Control - { - /** - * @class Solaris_Network_Interface_Monitor - * - * @brief Mixin class for network interface monitors compiled on - * Solaris machines. - */ - class MONITOR_CONTROL_Export Solaris_Network_Interface_Monitor - { - protected: - /// The kstat interface can access a wealth of - /// network information about the system. To get the specific - /// value we want to monitor, we just vary the lookup string. - Solaris_Network_Interface_Monitor (const ACE_TCHAR *lookup_str); - - /// Platform-specific implementation. - void update_i (void); - - /// Platform-specific reset. - void clear_impl (void); - - protected: - ACE_UINT64 value_; - - private: - /// Common code. - - void init (void); - void access_kstats (ACE_UINT64 &which_member); - int check_ks_module (const unsigned long ks_instance, - const unsigned long which_max, - const char *max_str, - ACE_UINT64 *value_array, - ACE_UINT64 &which_member); - - - private: - static const unsigned long MAX_LO_INTERFACES = 5UL; - static const unsigned long MAX_HME_INTERFACES = 10UL; - ACE_UINT64 value_array_lo_[MAX_LO_INTERFACES]; - ACE_UINT64 value_array_hme_[MAX_HME_INTERFACES]; - ACE_UINT64 start_; - ACE_TString lookup_str_; - kstat_ctl_t *kstats_; - kstat_t *kstat_; - kid_t kstat_id_; - }; - } -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* defined (ACE_HAS_KSTAT) */ - -#include /**/ "ace/post.h" - -#endif // SOLARIS_NETWORK_INTERFACE_MONITOR_H diff --git a/ACE/ace/Monitor_Control/Windows_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Monitor.cpp index d44f7e58a2494..2759ee6c2a0f4 100644 --- a/ACE/ace/Monitor_Control/Windows_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Windows_Monitor.cpp @@ -21,7 +21,7 @@ namespace ACE } void - Windows_Monitor::update_i (void) + Windows_Monitor::update_i () { PdhCollectQueryData (this->query_); PDH_FMT_COUNTERVALUE pdh_value; @@ -35,13 +35,13 @@ namespace ACE } void - Windows_Monitor::clear_impl (void) + Windows_Monitor::clear_impl () { this->init (); } void - Windows_Monitor::init (void) + Windows_Monitor::init () { /// Create a query and a counter here so it doesn't have /// to be done with each update. diff --git a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp index 7d3b68d5c0e03..8a38444b76a50 100644 --- a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp @@ -60,7 +60,7 @@ namespace ACE GlobalFree (paths); } - Windows_Multi_Instance_Monitor::~Windows_Multi_Instance_Monitor (void) + Windows_Multi_Instance_Monitor::~Windows_Multi_Instance_Monitor () { Windows_Monitor *instance = 0; @@ -72,7 +72,7 @@ namespace ACE } void - Windows_Multi_Instance_Monitor::update_i (void) + Windows_Multi_Instance_Monitor::update_i () { Windows_Monitor **current_instance = 0; @@ -88,7 +88,7 @@ namespace ACE } void - Windows_Multi_Instance_Monitor::clear_impl (void) + Windows_Multi_Instance_Monitor::clear_impl () { Windows_Monitor **current_instance = 0; diff --git a/ACE/ace/Monitor_Control_Action.h b/ACE/ace/Monitor_Control_Action.h index aea10b43b46b6..8f061459ffb3e 100644 --- a/ACE/ace/Monitor_Control_Action.h +++ b/ACE/ace/Monitor_Control_Action.h @@ -44,8 +44,8 @@ namespace ACE virtual void execute (const char* command = 0) = 0; /// Refcounting methods. - void add_ref (void); - void remove_ref (void); + void add_ref (); + void remove_ref (); protected: Control_Action (); diff --git a/ACE/ace/Msg_WFMO_Reactor.cpp b/ACE/ace/Msg_WFMO_Reactor.cpp index b4488bb6e7d54..57682de44f34e 100644 --- a/ACE/ace/Msg_WFMO_Reactor.cpp +++ b/ACE/ace/Msg_WFMO_Reactor.cpp @@ -22,7 +22,7 @@ ACE_Msg_WFMO_Reactor::ACE_Msg_WFMO_Reactor (size_t size, { } -ACE_Msg_WFMO_Reactor::~ACE_Msg_WFMO_Reactor (void) +ACE_Msg_WFMO_Reactor::~ACE_Msg_WFMO_Reactor () { } @@ -43,7 +43,7 @@ ACE_Msg_WFMO_Reactor::wait_for_multiple_events (int timeout, } int -ACE_Msg_WFMO_Reactor::dispatch_window_messages (void) +ACE_Msg_WFMO_Reactor::dispatch_window_messages () { int number_of_messages = 0; MSG msg; diff --git a/ACE/ace/Msg_WFMO_Reactor.h b/ACE/ace/Msg_WFMO_Reactor.h index 6adb3d5d433b6..3381da09d5d0b 100644 --- a/ACE/ace/Msg_WFMO_Reactor.h +++ b/ACE/ace/Msg_WFMO_Reactor.h @@ -55,7 +55,7 @@ class ACE_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor ACE_Timer_Queue * = 0); /// Close down the ACE_Msg_WFMO_Reactor and release all of its resources. - virtual ~ACE_Msg_WFMO_Reactor (void); + virtual ~ACE_Msg_WFMO_Reactor (); /** * This event loop driver blocks for up to @a max_wait_time before @@ -102,7 +102,7 @@ class ACE_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor virtual DWORD poll_remaining_handles (DWORD index); /// Dispatches window messages. - virtual int dispatch_window_messages (void); + virtual int dispatch_window_messages (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Multihomed_INET_Addr.cpp b/ACE/ace/Multihomed_INET_Addr.cpp index 08de42a0ea3e4..4589fbf22fed2 100644 --- a/ACE/ace/Multihomed_INET_Addr.cpp +++ b/ACE/ace/Multihomed_INET_Addr.cpp @@ -31,7 +31,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, int address_family, const char *(secondary_host_names[]), size_t size){ - // Initialize the primary INET addr ACE_INET_Addr::set(port_number, host_name, encode, address_family); @@ -67,7 +66,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, int address_family, const wchar_t *(secondary_host_names[]), size_t size){ - // Initialize the primary INET addr ACE_INET_Addr::set(port_number, host_name, encode, address_family); @@ -102,7 +100,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, int encode, const ACE_UINT32 *secondary_ip_addrs, size_t size){ - // Initialize the primary INET addr ACE_INET_Addr::set(port_number, primary_ip_addr, encode); @@ -143,7 +140,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number, this->secondaries_.size(size); for (size_t i = 0; i < size; ++i) { - int const ret = this->secondaries_[i].set(port_number, secondary_host_names[i], encode, @@ -171,7 +167,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number, this->secondaries_.size(size); for (size_t i = 0; i < size; ++i) { - int ret = this->secondaries_[i].set(port_number, secondary_host_names[i], encode, @@ -195,7 +190,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number, this->secondaries_.size(size); for (size_t i = 0; i < size; ++i) { - int ret = this->secondaries_[i].set(port_number, secondary_ip_addrs[i], encode); @@ -228,7 +222,6 @@ ACE_Multihomed_INET_Addr::get_secondary_addresses(ACE_INET_Addr *secondary_addrs for (size_t i = 0; i < top; ++i) { - int ret = secondary_addrs[i].set (this->secondaries_[i]); @@ -325,7 +318,6 @@ ACE_Multihomed_INET_Addr::get_addresses(sockaddr_in6 *addrs, ACE_Multihomed_INET_Addr::~ACE_Multihomed_INET_Addr () { - } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Multihomed_INET_Addr.h b/ACE/ace/Multihomed_INET_Addr.h index 496efc73bc646..58879c6263291 100644 --- a/ACE/ace/Multihomed_INET_Addr.h +++ b/ACE/ace/Multihomed_INET_Addr.h @@ -34,7 +34,7 @@ class ACE_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr { public: /// Default constructor. - ACE_Multihomed_INET_Addr (void); + ACE_Multihomed_INET_Addr (); /** * Initializes an ACE_Multihomed_INET_Addr from the @a address, @@ -102,7 +102,7 @@ class ACE_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr /// Use compiler-generated assignment operator. /// Default destructor. - ~ACE_Multihomed_INET_Addr (void); + ~ACE_Multihomed_INET_Addr (); // = Direct initialization methods. diff --git a/ACE/ace/Mutex.h b/ACE/ace/Mutex.h index ba784f63b7f80..16950c7187206 100644 --- a/ACE/ace/Mutex.h +++ b/ACE/ace/Mutex.h @@ -161,7 +161,7 @@ class ACE_Export ACE_Mutex # define ACE_MUTEX_PROCESS_LOCK_IS_SEMA ACE_sema_t process_sema_; typedef ACE_sema_t Process_Lock; -#elif defined ACE_HAS_PTHREADS || defined ACE_HAS_STHREADS +#elif defined ACE_HAS_PTHREADS # define ACE_MUTEX_USE_PROCESS_LOCK # define ACE_MUTEX_PROCESS_LOCK_IS_MUTEX typedef ACE_mutex_t Process_Lock; diff --git a/ACE/ace/NT_Service.cpp b/ACE/ace/NT_Service.cpp index 720ceefa9b3d6..cdc6ecc5bc8e6 100644 --- a/ACE/ace/NT_Service.cpp +++ b/ACE/ace/NT_Service.cpp @@ -17,7 +17,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_NT_Service) // ACE_NT_Service destructor. -ACE_NT_Service::~ACE_NT_Service (void) +ACE_NT_Service::~ACE_NT_Service () { if (this->svc_sc_handle_ != 0) { @@ -75,7 +75,6 @@ ACE_NT_Service::open (void *args) } return svc_return; - } int @@ -234,11 +233,10 @@ ACE_NT_Service::insert (DWORD start_type, this->svc_sc_handle_ = sh; return 0; - } int -ACE_NT_Service::remove (void) +ACE_NT_Service::remove () { if (this->svc_sc_handle () == 0) return -1; @@ -277,7 +275,7 @@ ACE_NT_Service::startup (DWORD startup) // Returns the current startup type. DWORD -ACE_NT_Service::startup (void) +ACE_NT_Service::startup () { // The query buffer will hold strings as well as the defined struct. // The string pointers in the struct point to other areas in the @@ -302,7 +300,6 @@ ACE_NT_Service::startup (void) // Zero is a valid return value for QueryServiceConfig, so if // QueryServiceConfig fails, return the DWORD equivalent of -1. return MAXDWORD; - } void @@ -519,7 +516,7 @@ ACE_NT_Service::report_status (DWORD new_status, } SC_HANDLE -ACE_NT_Service::svc_sc_handle (void) +ACE_NT_Service::svc_sc_handle () { if (this->svc_sc_handle_ == 0) { diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h index cca6f82600c6b..5c9f282884fd3 100644 --- a/ACE/ace/NT_Service.h +++ b/ACE/ace/NT_Service.h @@ -110,7 +110,7 @@ class ACE_Export ACE_NT_Service : public ACE_Task DWORD service_type = SERVICE_WIN32_OWN_PROCESS, DWORD controls_mask = SERVICE_ACCEPT_STOP); - virtual ~ACE_NT_Service (void); + virtual ~ACE_NT_Service (); // = Functions to operate the service @@ -225,7 +225,7 @@ class ACE_Export ACE_NT_Service : public ACE_Task * first method called to be sure that any logging done is incorporated * correctly into the process's established logging setup. */ - void inherit_log_msg_attributes (void); + void inherit_log_msg_attributes (); // = Methods which control the service's execution. @@ -323,7 +323,7 @@ class ACE_Export ACE_NT_Service : public ACE_Task * retrieves the handle from the Service Control Manager and caches * it. */ - SC_HANDLE svc_sc_handle (void); + SC_HANDLE svc_sc_handle (); /** * Waits for the service to reach @a desired_state or get diff --git a/ACE/ace/NT_Service.inl b/ACE/ace/NT_Service.inl index c5af76d4018fd..5a1a4075d9655 100644 --- a/ACE/ace/NT_Service.inl +++ b/ACE/ace/NT_Service.inl @@ -45,7 +45,7 @@ ACE_NT_Service::ACE_NT_Service (const ACE_TCHAR *name, ACE_INLINE int -ACE_NT_Service::svc (void) +ACE_NT_Service::svc () { return -1; } diff --git a/ACE/ace/Name_Request_Reply.h b/ACE/ace/Name_Request_Reply.h index ec49d3679c4b6..0dcfeb7a240d2 100644 --- a/ACE/ace/Name_Request_Reply.h +++ b/ACE/ace/Name_Request_Reply.h @@ -67,7 +67,7 @@ class ACE_Export ACE_Name_Request }; /// Default constructor. - ACE_Name_Request (void); + ACE_Name_Request (); /// Create a ACE_Name_Request message. ACE_Name_Request (ACE_INT32 msg_type, // Type of request. @@ -81,7 +81,7 @@ class ACE_Export ACE_Name_Request /// Initialize length_ in order to ensure correct byte ordering /// before a request is sent. - void init (void); + void init (); // = Set/get the length of the encoded/decoded message. ACE_UINT32 length () const; @@ -127,7 +127,7 @@ class ACE_Export ACE_Name_Request int encode (void *&); /// Decode message after reception. - int decode (void); + int decode (); /// Print out the values of the message for debugging purposes. void dump () const; @@ -201,14 +201,14 @@ class ACE_Export ACE_Name_Reply }; /// Default constructor. - ACE_Name_Reply (void); + ACE_Name_Reply (); /// Create a ACE_Name_Reply message. ACE_Name_Reply (ACE_UINT32 type, ACE_UINT32 err); // Type of reply. /// Initialize length_ in order to ensure correct byte ordering /// before a reply is sent. - void init (void); + void init (); // = Set/get the length of the encoded/decoded message. ACE_UINT32 length () const; @@ -230,7 +230,7 @@ class ACE_Export ACE_Name_Reply int encode (void *&); /// Decode a message after reception. - int decode (void); + int decode (); /// Print out the values of the message for debugging purposes. void dump () const; diff --git a/ACE/ace/Name_Space.cpp b/ACE/ace/Name_Space.cpp index 0e1228909a52b..57ebe136393d7 100644 --- a/ACE/ace/Name_Space.cpp +++ b/ACE/ace/Name_Space.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_stdlib.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Name_Binding::ACE_Name_Binding () diff --git a/ACE/ace/Name_Space.h b/ACE/ace/Name_Space.h index ddde081c490ed..4e38f412709ac 100644 --- a/ACE/ace/Name_Space.h +++ b/ACE/ace/Name_Space.h @@ -82,7 +82,6 @@ typedef ACE_Unbounded_Set_Iterator ACE_PWSTRING_ITERATOR; class ACE_Export ACE_Name_Space { public: - /// virtual destructor to ensure destructors of subclasses get /// called. virtual ~ACE_Name_Space (); diff --git a/ACE/ace/Naming_Context.h b/ACE/ace/Naming_Context.h index c7b7969678faf..e109bfa58ff7a 100644 --- a/ACE/ace/Naming_Context.h +++ b/ACE/ace/Naming_Context.h @@ -87,14 +87,14 @@ class ACE_Export ACE_Naming_Context : public ACE_Service_Object /// Deletes the instance of Name Space. Must be called before /// switching name spaces. - int close (void); + int close (); /// Release all resources. Gets called by destructor and fini. - int close_down (void); + int close_down (); /// destructor, do some cleanup :TBD: last dtor should "compress" /// file - ~ACE_Naming_Context (void); + ~ACE_Naming_Context (); // = Dynamic initialization hooks. /// Initialize name options and naming context when dynamically @@ -108,7 +108,7 @@ class ACE_Export ACE_Naming_Context : public ACE_Service_Object virtual int info (ACE_TCHAR **strp, size_t length) const; /// Returns the ACE_Name_Options associated with the Naming_Context - ACE_Name_Options *name_options (void); + ACE_Name_Options *name_options (); /// Bind a new name to a naming context (Wide character strings). int bind (const ACE_NS_WString &name_in, @@ -246,7 +246,7 @@ class ACE_Export ACE_Naming_Context : public ACE_Service_Object const char *pattern_in); /// Dump the state of the object. - void dump (void); + void dump (); private: /// Keep track of the options such as database name etc per Naming Context @@ -265,7 +265,7 @@ class ACE_Export ACE_Naming_Context : public ACE_Service_Object int netnameserver_port_; /// 1 if we're on the same local machine as the name server, else 0. - int local (void); + int local (); }; /** @@ -276,8 +276,8 @@ class ACE_Export ACE_Naming_Context : public ACE_Service_Object class ACE_Export ACE_Name_Options { public: - ACE_Name_Options (void); - ~ACE_Name_Options (void); + ACE_Name_Options (); + ~ACE_Name_Options (); /// Parse arguments. void parse_args (int argc, @@ -287,10 +287,10 @@ class ACE_Export ACE_Name_Options void nameserver_port (int port); /// Get the port number - int nameserver_port (void); + int nameserver_port (); /// Get the context - ACE_Naming_Context::Context_Scope_Type context (void); + ACE_Naming_Context::Context_Scope_Type context (); /// Set the context void context (ACE_Naming_Context::Context_Scope_Type); @@ -299,31 +299,31 @@ class ACE_Export ACE_Name_Options void nameserver_host (const ACE_TCHAR *host); /// Get the host name - const ACE_TCHAR *nameserver_host (void); + const ACE_TCHAR *nameserver_host (); /// Set name space directory void namespace_dir (const ACE_TCHAR *dir); /// Get name space directory - const ACE_TCHAR *namespace_dir (void); + const ACE_TCHAR *namespace_dir (); /// Set process name void process_name (const ACE_TCHAR *dir); /// Get process name - const ACE_TCHAR *process_name (void); + const ACE_TCHAR *process_name (); /// Set database name void database (const ACE_TCHAR *); /// Get database name - const ACE_TCHAR *database (void); + const ACE_TCHAR *database (); /// Set base address of the underlying allocator void base_address (char *address); /// Get base address of the underlying allocator - char *base_address (void); + char *base_address (); /// Get use of registry in naming bool use_registry () const; @@ -332,10 +332,10 @@ class ACE_Export ACE_Name_Options void use_registry (bool x); /// Return debug status - bool debug (void); + bool debug (); /// Return verbose status - bool verbose (void); + bool verbose (); ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Naming_Context.inl b/ACE/ace/Naming_Context.inl index bd61adb77cd7b..34aad4297faef 100644 --- a/ACE/ace/Naming_Context.inl +++ b/ACE/ace/Naming_Context.inl @@ -13,28 +13,28 @@ ACE_Name_Options::use_registry (bool x) } ACE_INLINE bool -ACE_Name_Options::verbose (void) +ACE_Name_Options::verbose () { ACE_TRACE ("ACE_Name_Options::verbose"); return this->verbosity_; } ACE_INLINE const ACE_TCHAR * -ACE_Name_Options::process_name (void) +ACE_Name_Options::process_name () { ACE_TRACE ("ACE_Name_Options::process_name"); return this->process_name_; } ACE_INLINE const ACE_TCHAR * -ACE_Name_Options::namespace_dir (void) +ACE_Name_Options::namespace_dir () { ACE_TRACE ("ACE_Name_Options::namespace_dir"); return this->namespace_dir_; } ACE_INLINE bool -ACE_Name_Options::debug (void) +ACE_Name_Options::debug () { ACE_TRACE ("ACE_Name_Options::debug"); return this->debugging_; diff --git a/ACE/ace/Netlink_Addr.h b/ACE/ace/Netlink_Addr.h index 5b08d5fb78f35..a2bbb238ee80f 100644 --- a/ACE/ace/Netlink_Addr.h +++ b/ACE/ace/Netlink_Addr.h @@ -37,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Netlink_Addr : public ACE_Addr { public: /// Default constructor. - ACE_Netlink_Addr (void); + ACE_Netlink_Addr (); /// Copy constructor. ACE_Netlink_Addr (const ACE_Netlink_Addr &); @@ -93,7 +93,7 @@ class ACE_Export ACE_Netlink_Addr : public ACE_Addr { /** * set nl_ @see nl_ to zero and sets address family to default value */ - void reset (void); + void reset (); sockaddr_nl nl_; }; @@ -111,4 +111,3 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_NETLINK_ADDR_H */ - diff --git a/ACE/ace/Netlink_Addr.inl b/ACE/ace/Netlink_Addr.inl index 2c8dbb1e55c52..261dbfced3be2 100644 --- a/ACE/ace/Netlink_Addr.inl +++ b/ACE/ace/Netlink_Addr.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE ACE_Netlink_Addr::ACE_Netlink_Addr (void): +ACE_INLINE ACE_Netlink_Addr::ACE_Netlink_Addr (): ACE_Addr (this->determine_type(), sizeof (sockaddr_nl)) { this->nl_.nl_family = AF_NETLINK; @@ -15,7 +15,7 @@ ACE_INLINE void ACE_Netlink_Addr::set(int pid, int gid) this->nl_.nl_groups = gid; } -ACE_INLINE void ACE_Netlink_Addr::reset (void) +ACE_INLINE void ACE_Netlink_Addr::reset () { ACE_OS::memset (&this->nl_, 0, sizeof (this->nl_)); this->nl_.nl_family = AF_NETLINK; diff --git a/ACE/ace/Node.h b/ACE/ace/Node.h index ca0c8b422e187..523cbec4b3539 100644 --- a/ACE/ace/Node.h +++ b/ACE/ace/Node.h @@ -70,13 +70,7 @@ class ACE_Node ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Node.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Node.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_NODE_H */ diff --git a/ACE/ace/OS_Errno.cpp b/ACE/ace/OS_Errno.cpp index 065eb39e13369..8c082487b7373 100644 --- a/ACE/ace/OS_Errno.cpp +++ b/ACE/ace/OS_Errno.cpp @@ -1,11 +1,9 @@ // -*- C++ -*- #include "ace/OS_Errno.h" -// Inlining this class on debug builds with gcc on Solaris can cause -// deadlocks during static initialization. On non debug builds it -// causes compilation errors. -#if !defined (ACE_HAS_INLINED_OSCALLS) || \ - (defined (__GNUG__) && defined (__sun__)) +// Inlining this class on debug builds with gcc deadlocks during static +// initialization. On non debug builds it causes compilation errors. +#if !defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE # endif /* ACE_INLINE */ @@ -13,31 +11,3 @@ # include "ace/OS_Errno.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - -#include "ace/OS_Memory.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_CE_Errno *ACE_CE_Errno::instance_ = 0; -DWORD ACE_CE_Errno::errno_key_ = 0xffffffff; - -void -ACE_CE_Errno::init () -{ - ACE_NEW (ACE_CE_Errno::instance_, - ACE_CE_Errno ()); - ACE_CE_Errno::errno_key_ = TlsAlloc (); -} - -void -ACE_CE_Errno::fini () -{ - TlsFree (ACE_CE_Errno::errno_key_); - delete ACE_CE_Errno::instance_; - ACE_CE_Errno::instance_ = 0; -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h index d50463c9b6872..3f2555b3fb5e0 100644 --- a/ACE/ace/OS_Errno.h +++ b/ACE/ace/OS_Errno.h @@ -55,18 +55,13 @@ class ACE_Export ACE_Errno_Guard /// Reset the value of @c errno to . ~ACE_Errno_Guard (); -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - /// Assign @a errno_ref to . - int operator= (const ACE_ERRNO_TYPE &errno_ref); -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - - /// Assign to . + /// Assign @a erro> to error_. int operator= (int error); - /// Compare with for equality. + /// Compare @a error with error_ for equality. bool operator== (int error); - /// Compare with for inequality. + /// Compare @a error with error_ for inequality. bool operator!= (int error); private: @@ -81,11 +76,10 @@ class ACE_Export ACE_Errno_Guard ACE_END_VERSIONED_NAMESPACE_DECL -// Inlining this class on debug builds with gcc on Solaris can cause +// Inlining this class on debug builds with can cause // deadlocks during static initialization. On non debug builds it // causes compilation errors. -#if defined (ACE_HAS_INLINED_OSCALLS) && \ - (!defined (__GNUG__) || !defined (__sun__)) +#if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE # endif /* ACE_INLINE */ diff --git a/ACE/ace/OS_Errno.inl b/ACE/ace/OS_Errno.inl index 0a7fa0f4ff2e2..32d9ea284bd1b 100644 --- a/ACE/ace/OS_Errno.inl +++ b/ACE/ace/OS_Errno.inl @@ -35,14 +35,6 @@ ACE_Errno_Guard::~ACE_Errno_Guard () #endif /* ACE_MT_SAFE */ } -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -ACE_INLINE int -ACE_Errno_Guard::operator= (const ACE_ERRNO_TYPE &error) -{ - return this->error_ = error; -} -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - ACE_INLINE int ACE_Errno_Guard::operator= (int error) { diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h index fd8262de6ae43..eec0b65df8f4b 100644 --- a/ACE/ace/OS_Memory.h +++ b/ACE/ace/OS_Memory.h @@ -123,40 +123,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @param ptr the base pointer * @param alignment the required alignment */ -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) -inline unsigned int -ACE_align_binary (unsigned int ptr, unsigned int alignment) -{ - unsigned int const tmp = alignment - 1; - return (ptr + tmp) & (~tmp); -} -#else inline uintptr_t ACE_align_binary (uintptr_t ptr, uintptr_t alignment) { uintptr_t const tmp = alignment - 1; return (ptr + tmp) & (~tmp); } -#endif -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) -/// Return the next address aligned to a required boundary -inline char * -ACE_ptr_align_binary (char const * ptr, unsigned int alignment) -{ - return - reinterpret_cast ( - ACE_align_binary (reinterpret_cast (ptr), alignment)); -} - -/// Return the next address aligned to a required boundary -inline char * -ACE_ptr_align_binary (unsigned char const * ptr, unsigned int alignment) -{ - return - ACE_ptr_align_binary (reinterpret_cast (ptr), alignment); -} -#else /// Return the next address aligned to a required boundary inline char * ACE_ptr_align_binary (char const * ptr, uintptr_t alignment) @@ -173,7 +146,6 @@ ACE_ptr_align_binary (unsigned char const * ptr, uintptr_t alignment) return ACE_ptr_align_binary (reinterpret_cast (ptr), alignment); } -#endif /* ACE_OPENVMS && __INITIAL_POINTER_SIZE < 64 */ //@} ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 885550619a8f6..d4e3c82b253db 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -30,9 +30,6 @@ ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args) #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) # define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ (*THR_ID = ::_beginthreadex ((void(_Optlink*)(void*))ENTRY_POINT, STACK, STACKSIZE, ARGS), *THR_ID) -#elif defined (ACE_HAS_WINCE) -# define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ - CreateThread (0, STACKSIZE, (unsigned long (__stdcall *) (void *)) ENTRY_POINT, ARGS, (FLAGS) & (CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION), (unsigned long *) THR_ID) #elif defined(ACE_HAS_WTHREADS) // Green Hills compiler gets confused when __stdcall is embedded in // parameter list, so we define the type ACE_WIN32THRFUNC_T and use it @@ -346,7 +343,7 @@ ACE_TSS_Ref::ACE_TSS_Ref (ACE_thread_t id) ACE_OS_TRACE ("ACE_TSS_Ref::ACE_TSS_Ref"); } -ACE_TSS_Ref::ACE_TSS_Ref (void) +ACE_TSS_Ref::ACE_TSS_Ref () { ACE_OS_TRACE ("ACE_TSS_Ref::ACE_TSS_Ref"); } @@ -386,7 +383,7 @@ ACE_TSS_Info::ACE_TSS_Info (ACE_thread_key_t key, ACE_OS_TRACE ("ACE_TSS_Info::ACE_TSS_Info"); } -ACE_TSS_Info::ACE_TSS_Info (void) +ACE_TSS_Info::ACE_TSS_Info () : key_ (ACE_OS::NULL_key), destructor_ (0), thread_count_ (-1) @@ -413,7 +410,7 @@ ACE_TSS_Info::operator != (const ACE_TSS_Info &info) const } void -ACE_TSS_Info::dump (void) +ACE_TSS_Info::dump () { # if defined (ACE_HAS_DUMP) // ACE_OS_TRACE ("ACE_TSS_Info::dump"); @@ -430,7 +427,7 @@ ACE_TSS_Info::dump (void) // Moved class ACE_TSS_Keys declaration to OS.h so it can be visible // to the single file of template instantiations. -ACE_TSS_Keys::ACE_TSS_Keys (void) +ACE_TSS_Keys::ACE_TSS_Keys () { for (u_int i = 0; i < ACE_WORDS; ++i) { @@ -518,10 +515,10 @@ class ACE_TSS_Cleanup /// Cleanup the thread-specific objects. Does _NOT_ exit the thread. /// For each used key perform the same actions as free_key. - void thread_exit (void); + void thread_exit (); private: - void dump (void); + void dump (); /// Release a key used by this thread /// @param info reference to the info for this key @@ -546,8 +543,8 @@ class ACE_TSS_Cleanup ACE_TSS_Keys *tss_keys (); /// Ensure singleton. - ACE_TSS_Cleanup (void); - ~ACE_TSS_Cleanup (void); + ACE_TSS_Cleanup (); + ~ACE_TSS_Cleanup (); /// ACE_TSS_Cleanup access only via TSS_Cleanup_Instance friend class TSS_Cleanup_Instance; @@ -604,7 +601,6 @@ class TSS_Cleanup_Instance ACE_TSS_Cleanup * operator ->(); private: - ACE_TSS_Cleanup * operator *(); private: @@ -672,7 +668,7 @@ TSS_Cleanup_Instance::TSS_Cleanup_Instance (Purpose purpose) } } -TSS_Cleanup_Instance::~TSS_Cleanup_Instance (void) +TSS_Cleanup_Instance::~TSS_Cleanup_Instance () { // Variable to hold the mutex_ to delete outside the scope of the // guard. @@ -736,12 +732,12 @@ ACE_TSS_Cleanup * TSS_Cleanup_Instance::instance_ = 0; ACE_Thread_Mutex* TSS_Cleanup_Instance::mutex_ = 0; ACE_Condition_Thread_Mutex* TSS_Cleanup_Instance::condition_ = 0; -ACE_TSS_Cleanup::~ACE_TSS_Cleanup (void) +ACE_TSS_Cleanup::~ACE_TSS_Cleanup () { } void -ACE_TSS_Cleanup::thread_exit (void) +ACE_TSS_Cleanup::thread_exit () { ACE_OS_TRACE ("ACE_TSS_Cleanup::thread_exit"); // variables to hold the destructors, keys @@ -823,7 +819,7 @@ ACE_TSS_Cleanup_keys_destroyer (void *tss_keys) delete static_cast (tss_keys); } -ACE_TSS_Cleanup::ACE_TSS_Cleanup (void) +ACE_TSS_Cleanup::ACE_TSS_Cleanup () : in_use_ (ACE_OS::NULL_key) { ACE_OS_TRACE ("ACE_TSS_Cleanup::ACE_TSS_Cleanup"); @@ -976,7 +972,7 @@ ACE_TSS_Cleanup::thread_use_key (ACE_thread_key_t key) } void -ACE_TSS_Cleanup::dump (void) +ACE_TSS_Cleanup::dump () { # if defined (ACE_HAS_DUMP) // Iterate through all the thread-specific items and dump them all. @@ -1467,13 +1463,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Wait to be awakened by a ACE_OS::signal() or // ACE_OS::broadcast(). # if defined (ACE_WIN32) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) result = ::WaitForSingleObject (cv->sema_, msec_timeout); -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - // Can't use Win32 API on our simulated semaphores. - result = ACE_OS::sema_wait (&cv->sema_, - timeout); -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) // Inline the call to ACE_OS::sema_wait () because it takes an // ACE_Time_Value argument. Avoid the cost of that conversion . . . @@ -1658,16 +1648,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, return -1; // Wait to be awakened by a ACE_OS::signal() or ACE_OS::broadcast(). -# if defined (ACE_USES_WINCE_SEMA_SIMULATION) - // Can't use Win32 API on simulated semaphores. - result = ACE_OS::sema_wait (&cv->sema_, - timeout); - - if (result == -1 && errno == ETIME) - result = WAIT_TIMEOUT; -# else result = ::WaitForSingleObject (cv->sema_, msec_timeout); -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ // Reacquire lock to avoid race conditions. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) @@ -1749,16 +1730,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, // Wait to be awakened by a ACE_OS::cond_signal() or // ACE_OS::cond_broadcast(). -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) result = ::WaitForSingleObject (cv->sema_, INFINITE); -# else - // Can't use Win32 API on simulated semaphores. - result = ACE_OS::sema_wait (&cv->sema_); - - if (result != WAIT_OBJECT_0 && errno == ETIME) - result = WAIT_TIMEOUT; - -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ // Reacquire lock to avoid race conditions. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) @@ -1905,14 +1877,6 @@ ACE_OS::mutex_init (ACE_mutex_t *m, ::pthread_mutexattr_destroy (&l_attributes); return result; -# elif defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (sa); - ACE_UNUSED_ARG (lock_type); - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_init (m, lock_scope, attributes), - result), - int); # elif defined (ACE_HAS_WTHREADS) m->type_ = lock_scope; @@ -1921,20 +1885,11 @@ ACE_OS::mutex_init (ACE_mutex_t *m, switch (lock_scope) { case USYNC_PROCESS: -# if defined (ACE_HAS_WINCE) - // @@todo (brunsch) This idea should be moved into ACE_OS_Win32. - m->proc_mutex_ = - ::CreateMutexW (ACE_OS::default_win32_security_attributes_r - (sa, &sa_buffer, &sd_buffer), - FALSE, - ACE_Ascii_To_Wide (name).wchar_rep ()); -# else /* ACE_HAS_WINCE */ m->proc_mutex_ = - ::CreateMutexA (ACE_OS::default_win32_security_attributes_r - (sa, &sa_buffer, &sd_buffer), - FALSE, - name); -# endif /* ACE_HAS_WINCE */ + ::CreateMutexA (ACE_OS::default_win32_security_attributes_r + (sa, &sa_buffer, &sd_buffer), + FALSE, + name); if (m->proc_mutex_ == 0) ACE_FAIL_RETURN (-1); else @@ -1986,9 +1941,6 @@ ACE_OS::mutex_destroy (ACE_mutex_t *m) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_mutex_destroy (m), result), int); # endif /* ACE_LACKS_PTHREAD_MUTEX_DESTROY */ -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_destroy (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2070,9 +2022,6 @@ ACE_OS::mutex_lock (ACE_mutex_t *m) // Note, don't use "::" here since the following call is often a macro. int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_lock (m), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_lock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2244,9 +2193,6 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m) // Note, don't use "::" here since the following call is often a macro. int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_trylock (m), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_trylock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2345,9 +2291,6 @@ ACE_OS::mutex_unlock (ACE_mutex_t *m) // Note, don't use "::" here since the following call is often a macro. int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_unlock (m), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_unlock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2588,20 +2531,11 @@ ACE_OS::event_init (ACE_event_t *event, ACE_UNUSED_ARG (arg); SECURITY_ATTRIBUTES sa_buffer; SECURITY_DESCRIPTOR sd_buffer; -# if defined (ACE_HAS_WINCE) - // @@todo (brunsch) This idea should be moved into ACE_OS_Win32. - *event = ::CreateEventW (ACE_OS::default_win32_security_attributes_r - (sa, &sa_buffer, &sd_buffer), - manual_reset, - initial_state, - ACE_Ascii_To_Wide (name).wchar_rep ()); -# else /* ACE_HAS_WINCE */ *event = ::CreateEventA (ACE_OS::default_win32_security_attributes_r (sa, &sa_buffer, &sd_buffer), manual_reset, initial_state, name); -# endif /* ACE_HAS_WINCE */ if (*event == 0) ACE_FAIL_RETURN (-1); else @@ -3056,72 +2990,15 @@ ACE_OS::event_timedwait (ACE_event_t *event, int ACE_OS::lwp_getparams (ACE_Sched_Params &sched_params) { -#if defined (ACE_HAS_STHREADS) || defined (sun) - // Get the class TS and RT class IDs. - ACE_id_t rt_id; - ACE_id_t ts_id; - if (ACE_OS::scheduling_class ("RT", rt_id) == -1 - || ACE_OS::scheduling_class ("TS", ts_id) == -1) - return -1; - - // Get this LWP's scheduling parameters. - pcparms_t pcparms; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcparms, 0, sizeof pcparms); - pcparms.pc_cid = PC_CLNULL; - - if (ACE_OS::priority_control (P_LWPID, - P_MYID, - PC_GETPARMS, - (char *) &pcparms) == -1) - return -1; - else if (pcparms.pc_cid == rt_id) - { - // RT class. - rtparms_t rtparms; - ACE_OS::memcpy (&rtparms, pcparms.pc_clparms, sizeof rtparms); - - sched_params.policy (ACE_SCHED_FIFO); - sched_params.priority (rtparms.rt_pri); - sched_params.scope (ACE_SCOPE_THREAD); - ACE_Time_Value quantum (rtparms.rt_tqsecs, - rtparms.rt_tqnsecs == RT_TQINF - ? 0 : rtparms.rt_tqnsecs * 1000); - sched_params.quantum (quantum); - return 0; - } - else if (pcparms.pc_cid == ts_id) - { - /* TS class */ - tsparms_t tsparms; - ACE_OS::memcpy (&tsparms, pcparms.pc_clparms, sizeof tsparms); - - sched_params.policy (ACE_SCHED_OTHER); - sched_params.priority (tsparms.ts_upri); - sched_params.scope (ACE_SCOPE_THREAD); - return 0; - } - else - return -1; - -#else /* ! ACE_HAS_STHREADS && ! sun */ ACE_UNUSED_ARG (sched_params); ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_STHREADS && ! sun */ } int ACE_OS::lwp_setparams (const ACE_Sched_Params &sched_params) { -#if defined (ACE_HAS_STHREADS) || defined (sun) - ACE_Sched_Params lwp_params (sched_params); - lwp_params.scope (ACE_SCOPE_LWP); - return ACE_OS::sched_params (lwp_params); -#else /* ! ACE_HAS_STHREADS && ! sun */ ACE_UNUSED_ARG (sched_params); ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_STHREADS && ! sun */ } #if defined ACE_HAS_THREADS && defined ACE_LACKS_RWLOCK_T @@ -3251,9 +3128,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, ACE_id_t id) { ACE_OS_TRACE ("ACE_OS::sched_params"); -#if defined (ACE_HAS_STHREADS) - return ACE_OS::set_scheduling_params (sched_params, id); -#elif defined (ACE_HAS_PTHREADS) && \ +#if defined (ACE_HAS_PTHREADS) && \ (!defined (ACE_LACKS_SETSCHED) || \ defined (ACE_HAS_PTHREAD_SCHEDPARAM)) if (sched_params.quantum () != ACE_Time_Value::zero) @@ -3294,20 +3169,13 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, result), int); } -# if defined (sun) - // We need to be able to set LWP priorities on Suns, even without - // ACE_HAS_STHREADS, to obtain preemption. - else if (sched_params.scope () == ACE_SCOPE_LWP) - return ACE_OS::set_scheduling_params (sched_params, id); -# endif /* sun */ else // sched_params.scope () == ACE_SCOPE_LWP, which isn't POSIX { errno = EINVAL; return -1; } -#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) - +#elif defined (ACE_WIN32) // PharLap ETS can act on the current thread - it can set the // quantum also, unlike Win32. All this only works on the RT // version. @@ -3319,16 +3187,13 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, if (sched_params.quantum() != ACE_Time_Value::zero) EtsSetTimeSlice (sched_params.quantum().msec()); # endif - # else - if (sched_params.quantum () != ACE_Time_Value::zero) { // I don't know of a way to set the quantum on Win32. errno = EINVAL; return -1; } - # endif /* ACE_HAS_PHARLAP_RT */ if (sched_params.scope () == ACE_SCOPE_THREAD) @@ -3358,7 +3223,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } else if (sched_params.scope () == ACE_SCOPE_PROCESS) { - # if defined (ACE_HAS_PHARLAP_RT) ACE_NOTSUP_RETURN (-1); # else @@ -3417,132 +3281,19 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, ACE_UNUSED_ARG (sched_params); ACE_UNUSED_ARG (id); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS */ } int -ACE_OS::scheduling_class (const char *class_name, ACE_id_t &id) +ACE_OS::scheduling_class (const char */*class_name*/, ACE_id_t &/*id*/) { -#if defined (ACE_HAS_PRIOCNTL) - // Get the priority class ID. - pcinfo_t pcinfo; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcinfo, 0, sizeof pcinfo); - - ACE_OS::strcpy (pcinfo.pc_clname, class_name); - if (ACE_OS::priority_control (P_ALL /* ignored */, - P_MYID /* ignored */, - PC_GETCID, - (char *) &pcinfo) == -1) - { - return -1; - } - else - { - id = pcinfo.pc_cid; - return 0; - } -#else /* ! ACE_HAS_PRIOCNTL */ - ACE_UNUSED_ARG (class_name); - ACE_UNUSED_ARG (id); ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_PRIOCNTL */ } int -ACE_OS::set_scheduling_params (const ACE_Sched_Params &sched_params, - ACE_id_t id) +ACE_OS::set_scheduling_params (const ACE_Sched_Params &/*sched_params*/, ACE_id_t /*id*/) { -#if defined (ACE_HAS_PRIOCNTL) - // Set priority class, priority, and quantum of this LWP or process as - // specified in sched_params. - - // Get the priority class ID. - ACE_id_t class_id; - if (ACE_OS::scheduling_class (sched_params.policy() == ACE_SCHED_OTHER ? - "TS" : - "RT", class_id) == -1) - { - return -1; - } - - pcparms_t pcparms; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcparms, 0, sizeof pcparms); - - pcparms.pc_cid = class_id; - - if (sched_params.policy () == ACE_SCHED_OTHER && - sched_params.quantum () == ACE_Time_Value::zero) - // SunOS doesn't support non-zero quantums in time-sharing class: use - // real-time class instead. - { - tsparms_t tsparms; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&tsparms, 0, sizeof tsparms); - - // Don't change ts_uprilim (user priority limit) - tsparms.ts_uprilim = TS_NOCHANGE; - tsparms.ts_upri = sched_params.priority (); - - // Package up the TS class ID and parameters for the - // priority_control () call. - ACE_OS::memcpy (pcparms.pc_clparms, &tsparms, sizeof tsparms); - } - else if (sched_params.policy () == ACE_SCHED_FIFO || - (sched_params.policy () == ACE_SCHED_RR && - sched_params.quantum () != ACE_Time_Value::zero)) - // must have non-zero quantum for RR, to make it meaningful - // A zero quantum with FIFO has special significance: it actually - // means infinite time quantum, i.e., run-to-completion. - { - rtparms_t rtparms; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&rtparms, 0, sizeof rtparms); - - rtparms.rt_pri = sched_params.priority (); - - if (sched_params.quantum () == ACE_Time_Value::zero) - { - // rtparms.rt_tqsecs is ignored with RT_TQINF - rtparms.rt_tqnsecs = RT_TQINF; - } - else - { - rtparms.rt_tqsecs = (ulong) sched_params.quantum ().sec (); - rtparms.rt_tqnsecs = sched_params.quantum ().usec () * 1000; - } - - // Package up the RT class ID and parameters for the - // priority_control () call. - ACE_OS::memcpy (pcparms.pc_clparms, &rtparms, sizeof rtparms); - } - else - { - errno = EINVAL; - return -1; - } - - if (ACE_OS::priority_control ((idtype_t) (sched_params.scope () == ACE_SCOPE_THREAD - ? ACE_SCOPE_PROCESS - : sched_params.scope ()), - id, - PC_SETPARMS, - (char *) &pcparms) < 0) - { - return ACE_OS::last_error (); - } - - return 0; -#else /* ! ACE_HAS_PRIOCNTL */ - ACE_UNUSED_ARG (sched_params); - ACE_UNUSED_ARG (id); ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_PRIOCNTL */ } int @@ -3721,9 +3472,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # if defined (ACE_HAS_ONLY_SCHED_OTHER) // SunOS, thru version 5.6, only supports SCHED_OTHER. spolicy = SCHED_OTHER; -# elif defined (ACE_HAS_ONLY_SCHED_FIFO) - // NonStop OSS standard pthread supports only SCHED_FIFO. - spolicy = SCHED_FIFO; # else // Make sure to enable explicit scheduling, in case we didn't // enable it above (for non-default priority). @@ -3784,7 +3532,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # if defined (PTHREAD_MAX_PRIORITY) && !defined(ACE_HAS_PTHREADS) /* For MIT pthreads... */ sparam.prio = ACE_MIN (priority, PTHREAD_MAX_PRIORITY); -# elif defined(ACE_HAS_PTHREADS) && !defined (ACE_HAS_STHREADS) +# elif defined(ACE_HAS_PTHREADS) // The following code forces priority into range. if (ACE_BIT_ENABLED (flags, THR_SCHED_FIFO)) sparam.sched_priority = @@ -3806,20 +3554,12 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # endif /* PTHREAD_MAX_PRIORITY */ { -# if defined (sun) && defined (ACE_HAS_ONLY_SCHED_OTHER) - // SunOS, through 5.6, POSIX only allows priorities > 0 to - // ::pthread_attr_setschedparam. If a priority of 0 was - // requested, set the thread priority after creating it, below. - if (priority > 0) -# endif /* sun && ACE_HAS_ONLY_SCHED_OTHER */ + (void) ACE_ADAPT_RETVAL(::pthread_attr_setschedparam (&attr, &sparam), + result); + if (result != 0) { - (void) ACE_ADAPT_RETVAL(::pthread_attr_setschedparam (&attr, &sparam), - result); - if (result != 0) - { - ::pthread_attr_destroy (&attr); - return -1; - } + ::pthread_attr_destroy (&attr); + return -1; } } } @@ -3881,14 +3621,12 @@ ACE_OS::thr_create (ACE_THR_FUNC func, { if (ACE_ADAPT_RETVAL(::pthread_attr_setcreatesuspend_np(&attr), result) != 0) { - ::pthread_attr_destroy (&attr); return -1; } } # endif /* !ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP */ -# if ! defined(ACE_LACKS_THR_CONCURRENCY_FUNCS) if (ACE_BIT_ENABLED (flags, THR_NEW_LWP)) { // Increment the number of LWPs by one to emulate the @@ -3915,7 +3653,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, return -1; } } -# endif /* ! ACE_LACKS_THR_CONCURRENCY_FUNCS */ } ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_create (thr_id, @@ -3932,75 +3669,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, if (result != -1) *thr_handle = *thr_id; -# if defined (sun) && defined (ACE_HAS_ONLY_SCHED_OTHER) - // SunOS prior to 5.7: - - // If the priority is 0, then we might have to set it now because we - // couldn't set it with ::pthread_attr_setschedparam, as noted - // above. This doesn't provide strictly correct behavior, because - // the thread was created (above) with the priority of its parent. - // (That applies regardless of the inherit_sched attribute: if it - // was PTHREAD_INHERIT_SCHED, then it certainly inherited its - // parent's priority. If it was PTHREAD_EXPLICIT_SCHED, then "attr" - // was initialized by the SunOS ::pthread_attr_init () to contain - // NULL for the priority, which indicated to SunOS ::pthread_create - // () to inherit the parent priority.) - if (priority == 0) - { - // Check the priority of this thread, which is the parent - // of the newly created thread. If it is 0, then the - // newly created thread will have inherited the priority - // of 0, so there's no need to explicitly set it. - struct sched_param sparam; - int policy = 0; - ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_getschedparam (thr_self (), - &policy, - &sparam), - result), int, - result); - - // The only policy supported by by SunOS, thru version 5.6, - // is SCHED_OTHER, so that's hard-coded here. - policy = ACE_SCHED_OTHER; - - if (sparam.sched_priority != 0) - { - ACE_OS::memset ((void *) &sparam, 0, sizeof sparam); - // The memset to 0 sets the priority to 0, so we don't need - // to explicitly set sparam.sched_priority. - - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setschedparam (*thr_id, - policy, - &sparam), - result), - int); - } - } - -# if defined (ACE_NEEDS_LWP_PRIO_SET) -# if 0 - // It would be useful if we could make this work. But, it requires - // a mechanism for determining the ID of an LWP to which another - // thread is bound. Is there a way to do that? Instead, just rely - // on the code in ACE_Thread_Adapter::invoke () to set the LWP - // priority. - - // If the thread is bound, then set the priority on its LWP. - if (ACE_BIT_ENABLED (flags, THR_BOUND)) - { - ACE_Sched_Params sched_params (ACE_BIT_ENABLED (flags, THR_SCHED_FIFO) || - ACE_BIT_ENABLED (flags, THR_SCHED_RR) ? - ACE_SCHED_FIFO : - ACE_SCHED_OTHER, - priority); - result = ACE_OS::lwp_setparams (sched_params, - /* ? How do we find the ID of the LWP - to which *thr_id is bound? */); - } -# endif /* 0 */ -# endif /* ACE_NEEDS_LWP_PRIO_SET */ - -# endif /* sun && ACE_HAS_ONLY_SCHED_OTHER */ auto_thread_args.release (); // *** Set pthread name (second try) @@ -4018,51 +3686,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # endif /* ACE_HAS_PTHREAD_SETNAME_NP */ # endif /* !ACE_HAS_PTHREAD_ATTR_SETNAME */ - return result; -# elif defined (ACE_HAS_STHREADS) - int result; - int start_suspended = ACE_BIT_ENABLED (flags, THR_SUSPENDED); - - if (priority != ACE_DEFAULT_THREAD_PRIORITY) - // If we need to set the priority, then we need to start the - // thread in a suspended mode. - ACE_SET_BITS (flags, THR_SUSPENDED); - - ACE_OSCALL (ACE_ADAPT_RETVAL (::thr_create (stack, stacksize, - thread_args->entry_point (), - thread_args, - flags, thr_id), result), - int, result); - - if (result != -1) - { - // With SunOS threads, ACE_thread_t and ACE_hthread_t are the same. - *thr_handle = *thr_id; - - if (priority != ACE_DEFAULT_THREAD_PRIORITY) - { - // Set the priority of the new thread and then let it - // continue, but only if the user didn't start it suspended - // in the first place! - result = ACE_OS::thr_setprio (*thr_id, priority); - if (result != 0) - { - errno = result; - return -1; - } - - if (start_suspended == 0) - { - result = ACE_OS::thr_continue (*thr_id); - if (result != 0) - { - errno = result; - return -1; - } - } - } - } - auto_thread_args.release (); return result; # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (thr_name); @@ -4078,7 +3701,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, flags | THR_SUSPENDED); // Have to duplicate the handle because // CWinThread::~CWinThread() closes the original handle. -# if !defined (ACE_HAS_WINCE) (void) ::DuplicateHandle (::GetCurrentProcess (), cwin_thread->m_hThread, ::GetCurrentProcess (), @@ -4086,7 +3708,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, 0, TRUE, DUPLICATE_SAME_ACCESS); -# endif /* ! ACE_HAS_WINCE */ *thr_id = cwin_thread->m_nThreadID; if (ACE_BIT_ENABLED (flags, THR_SUSPENDED) == 0) @@ -4223,7 +3844,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, return 0; } -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (func); ACE_UNUSED_ARG (args); @@ -4245,8 +3866,6 @@ ACE_OS::thr_exit (ACE_THR_FUNC_RETURN status) #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_EXIT) ::pthread_exit (status); -# elif defined (ACE_HAS_STHREADS) - ::thr_exit (status); # elif defined (ACE_HAS_WTHREADS) // Can't call it here because on NT, the thread is exited // directly by ACE_Thread_Adapter::invoke (). @@ -4522,11 +4141,6 @@ ACE_OS::thr_keycreate_native (ACE_OS_thread_key_t *key, ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_key_create (key, dest), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_keycreate (key, dest), - result), - int); # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (dest); *key = ::TlsAlloc (); @@ -4534,7 +4148,7 @@ ACE_OS::thr_keycreate_native (ACE_OS_thread_key_t *key, if (*key == ACE_SYSCALL_FAILED) ACE_FAIL_RETURN (-1); return 0; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (dest); @@ -4628,9 +4242,6 @@ ACE_OS::thr_keyfree_native (ACE_OS_thread_key_t key) # endif /* ACE_LACKS_PTHREAD_KEY_DELETE */ # elif defined (ACE_HAS_THR_KEYDELETE) return ::thr_keydelete (key); -# elif defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (key); - ACE_NOTSUP_RETURN (-1); # elif defined (ACE_HAS_WTHREADS) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::TlsFree (key), ace_result_), int, -1); # else @@ -4687,36 +4298,7 @@ ACE_OS::thr_setprio (const ACE_Sched_Priority prio) ACE_hthread_t my_thread_id; ACE_OS::thr_self (my_thread_id); - int const status = ACE_OS::thr_setprio (my_thread_id, prio); - -#if defined (ACE_NEEDS_LWP_PRIO_SET) - // If the thread is in the RT class, then set the priority on its - // LWP. (Instead of doing this if the thread is in the RT class, it - // should be done for all bound threads. But, there doesn't appear - // to be an easy way to determine if the thread is bound.) - - if (status == 0) - { - // Find what scheduling class the thread's LWP is in. - ACE_Sched_Params sched_params (ACE_SCHED_OTHER, 0); - if (ACE_OS::lwp_getparams (sched_params) == -1) - { - return -1; - } - else if (sched_params.policy () == ACE_SCHED_FIFO || - sched_params.policy () == ACE_SCHED_RR) - { - // This thread's LWP is in the RT class, so we need to set - // its priority. - sched_params.priority (prio); - return ACE_OS::lwp_setparams (sched_params); - } - // else this is not an RT thread. Nothing more needs to be - // done. - } -#endif /* ACE_NEEDS_LWP_PRIO_SET */ - - return status; + return ACE_OS::thr_setprio (my_thread_id, prio); } # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) @@ -4730,17 +4312,14 @@ ACE_OS::thr_setspecific_native (ACE_OS_thread_key_t key, void *data) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setspecific (key, data), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), result), int); # elif defined (ACE_HAS_WTHREADS) ::TlsSetValue (key, data); return 0; -# else /* ACE_HAS_STHREADS */ +# else /* ACE_HAS_PTHREADS */ ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (data); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (data); @@ -5141,7 +4720,7 @@ vx_execae (FUNCPTR entry, char* arg, int prio, int opt, size_t stacksz, ...) if (ret == ACE_VX_TASK_ID_ERROR) return 255; - while( ret > 0 && ::taskIdVerify (ret) != ERROR ) + while( ::taskIdVerify (ret) != ERROR ) ::taskDelay (3 * ::sysClkRateGet ()); // ::taskSpawn () returns TASK_ID_ERROR on failure: return _vx_call_rc instead if diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index 32ffcdf915c00..18d38698efa88 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -45,18 +45,6 @@ # endif # define ACE_EXPORT_MACRO ACE_Export -# if defined (ACE_HAS_PRIOCNTL) - // Need to #include thread.h before #defining THR_BOUND, etc., - // when building without threads on SunOS 5.x. -# if defined (sun) -# include /**/ -# endif /* sun */ - - // Need to #include these before #defining USYNC_PROCESS on SunOS 5.x. -# include /**/ -# include /**/ -# endif /* ACE_HAS_PRIOCNTL */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL # if defined (ACE_WIN32) @@ -88,17 +76,9 @@ extern "C" { # if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) -# include /**/ -# include /**/ -# define ACE_SCOPE_PROCESS P_PID -# define ACE_SCOPE_LWP P_LWPID -# define ACE_SCOPE_THREAD (ACE_SCOPE_LWP + 1) -# else -# define ACE_SCOPE_PROCESS 0 -# define ACE_SCOPE_LWP 1 -# define ACE_SCOPE_THREAD 2 -# endif /* ACE_HAS_STHREADS */ +# define ACE_SCOPE_PROCESS 0 +# define ACE_SCOPE_LWP 1 +# define ACE_SCOPE_THREAD 2 # if !defined (ACE_HAS_PTHREADS) # define ACE_SCHED_OTHER 0 @@ -106,57 +86,7 @@ extern "C" { # define ACE_SCHED_RR 2 # endif /* ! ACE_HAS_PTHREADS */ -# if defined (ACE_HAS_PTHREADS) -// moved to pthread.h -# elif defined (ACE_HAS_STHREADS) - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -// Solaris threads, without PTHREADS. -// Typedefs to help compatibility with Windows NT and Pthreads. -typedef thread_t ACE_thread_t; -// Native TSS key type (not for general use) -typedef thread_key_t ACE_OS_thread_key_t; -// Application TSS key type (use this type except in TSS Emulation) -# if defined (ACE_HAS_TSS_EMULATION) - typedef u_int ACE_thread_key_t; -# else /* ! ACE_HAS_TSS_EMULATION */ - typedef ACE_OS_thread_key_t ACE_thread_key_t; -# endif /* ! ACE_HAS_TSS_EMULATION */ -typedef mutex_t ACE_mutex_t; -# if !defined (ACE_LACKS_RWLOCK_T) -typedef rwlock_t ACE_rwlock_t; -# endif /* !ACE_LACKS_RWLOCK_T */ -# if !defined (ACE_HAS_POSIX_SEM) && !defined (ACE_USES_FIFO_SEM) -typedef sema_t ACE_sema_t; -# endif /* !ACE_HAS_POSIX_SEM */ - -typedef cond_t ACE_cond_t; -struct ACE_Export ACE_condattr_t -{ - int type; -}; -struct ACE_Export ACE_mutexattr_t -{ - int type; -}; -typedef ACE_thread_t ACE_hthread_t; -typedef ACE_mutex_t ACE_thread_mutex_t; - -ACE_END_VERSIONED_NAMESPACE_DECL - -# define THR_CANCEL_DISABLE 0 -# define THR_CANCEL_ENABLE 0 -# define THR_CANCEL_DEFERRED 0 -# define THR_CANCEL_ASYNCHRONOUS 0 -# define THR_JOINABLE 0 -# define THR_SCHED_FIFO 0 -# define THR_SCHED_RR 0 -# define THR_SCHED_DEFAULT 0 -# define THR_INHERIT_SCHED 0 -# define THR_SCOPE_PROCESS 0 - -# elif defined (ACE_VXWORKS) +# if defined (ACE_VXWORKS) # include /**/ // for sysClkRateGet() # include /**/ # if !defined (__RTP__) @@ -230,8 +160,8 @@ typedef struct typedef ACE_VX_TASK_ID ACE_thread_t; typedef ACE_VX_TASK_ID ACE_hthread_t; // Key type: the ACE TSS emulation requires the key type be unsigned, -// for efficiency. (Current POSIX and Solaris TSS implementations also -// use u_int, so the ACE TSS emulation is compatible with them.) +// for efficiency. (Current POSIX implementation use u_int, so the +// ACE TSS emulation is compatible with them.) // Native TSS key type typedef u_int ACE_OS_thread_key_t; // Application TSS key type (use this type except in TSS Emulation) @@ -264,31 +194,7 @@ typedef struct typedef HANDLE ACE_event_t; # if defined (ACE_WIN32) -//@@ ACE_USES_WINCE_SEMA_SIMULATION is used to debug -// semaphore simulation on WinNT. It should be -// changed to ACE_USES_HAS_WINCE at some later point. -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) typedef HANDLE ACE_sema_t; -# else -/** - * @class ACE_sema_t - * - * @brief Semaphore simulation for Windows CE. - */ -class ACE_Export ACE_sema_t -{ -public: - /// Serializes access to @c count_. - ACE_thread_mutex_t lock_; - - /// This event is signaled whenever the count becomes non-zero. - ACE_event_t count_nonzero_; - - /// Current count of the semaphore. - u_int count_; -}; - -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # endif /* defined (ACE_WIN32) */ ACE_END_VERSIONED_NAMESPACE_DECL @@ -340,7 +246,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_cond_t { public: - /// Returns the number of waiters. long waiters () const; @@ -417,7 +322,6 @@ struct ACE_Export ACE_rwlock_t { public: //protected: - /// Serialize access to internal state. ACE_mutex_t lock_; @@ -450,11 +354,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef pthread_rwlock_t ACE_rwlock_t; ACE_END_VERSIONED_NAMESPACE_DECL -# elif defined (ACE_HAS_STHREADS) -# include /**/ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -typedef rwlock_t ACE_rwlock_t; -ACE_END_VERSIONED_NAMESPACE_DECL # endif /* ACE_LACKS_RWLOCK_T */ // Define some default thread priorities on all threaded platforms, if @@ -769,23 +668,10 @@ typedef DWORD ACE_id_t; typedef int ACE_pri_t; # define ACE_SELF (0) #else /* !defined (ACE_WIN32) */ -# if defined (ACE_HAS_IDTYPE_T) - typedef idtype_t ACE_idtype_t; -# else typedef int ACE_idtype_t; -# endif /* ACE_HAS_IDTYPE_T */ -# if defined (ACE_HAS_STHREADS) -# if defined (ACE_LACKS_PRI_T) - typedef int pri_t; -# endif /* ACE_LACKS_PRI_T */ - typedef id_t ACE_id_t; -# define ACE_SELF P_MYID - typedef pri_t ACE_pri_t; -# else /* ! ACE_HAS_STHREADS */ typedef long ACE_id_t; # define ACE_SELF (-1) typedef short ACE_pri_t; -# endif /* ! ACE_HAS_STHREADS */ #endif /* !defined (ACE_WIN32) */ # if defined (ACE_HAS_TSS_EMULATION) @@ -928,7 +814,7 @@ class ACE_TSS_Ref ACE_TSS_Ref (ACE_thread_t id); /// Default constructor - ACE_TSS_Ref (void); + ACE_TSS_Ref (); /// Check for equality. bool operator== (const ACE_TSS_Ref &) const; @@ -937,7 +823,6 @@ class ACE_TSS_Ref bool operator!= (const ACE_TSS_Ref &) const; // private: - /// ID of thread using a specific key. ACE_thread_t tid_; }; @@ -960,7 +845,7 @@ class ACE_TSS_Info Destructor dest = 0); /// Default constructor - ACE_TSS_Info (void); + ACE_TSS_Info (); /// Returns 1 if the key is in use, 0 if not. int key_in_use () const { return thread_count_ != -1; } @@ -976,7 +861,7 @@ class ACE_TSS_Info bool operator!= (const ACE_TSS_Info &) const; /// Dump the state. - void dump (void); + void dump (); private: /// Key to the thread-specific storage item. @@ -1009,7 +894,7 @@ class ACE_TSS_Keys ACE_ALLOC_HOOK_DECLARE; /// Default constructor, to initialize all bits to zero (unused). - ACE_TSS_Keys (void); + ACE_TSS_Keys (); /// Mark the specified key as being in use, if it was not already so marked. /// Returns 1 if the had already been marked, 0 if not. @@ -1058,10 +943,6 @@ extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args); # define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME, (void *) A); # define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) # elif defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CLEANUP) -// Though we are defining a extern "C" function to match the prototype of -// pthread_cleanup_push, it is undone by the Solaris header file -// /usr/include/pthread.h. So this macro generates a warning under Solaris -// with SunCC. This is a bug in the Solaris header file. extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args); # define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME, (void *) A); # define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) @@ -1362,10 +1243,6 @@ namespace ACE_OS { //@} /// Low-level interface to @c priocntl(2). - /** - * Can't call the following priocntl, because that's a macro on - * Solaris. - */ ACE_NAMESPACE_INLINE_FUNCTION long priority_control (ACE_idtype_t, ACE_id_t, int, void *); diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 9a7e0c2af377c..a33b50b076f26 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -16,10 +16,6 @@ # include "ace/Handle_Set.h" # endif /* ACE_USES_FIFO_SEM */ -#if defined (ACE_HAS_PRIOCNTL) -# include /**/ -#endif /* ACE_HAS_PRIOCNTL */ - #if defined (ACE_HAS_ALLOC_HOOKS) # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ @@ -247,15 +243,10 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_broadcast (cv), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_broadcast (cv), - result), - int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::WakeAllConditionVariable (cv); return 0; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); ACE_NOTSUP_RETURN (-1); @@ -270,13 +261,10 @@ ACE_OS::cond_destroy (ACE_cond_t *cv) # if defined (ACE_HAS_PTHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_destroy (cv), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_destroy (cv), result), int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) // Windows doesn't have a destroy return 0; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); ACE_NOTSUP_RETURN (-1); @@ -312,17 +300,10 @@ ACE_OS::cond_init (ACE_cond_t *cv, result = -1; // ACE_ADAPT_RETVAL used it for intermediate status return result; -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_init (cv, - attributes.type, - arg), - result), - int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::InitializeConditionVariable (cv); return 0; -# endif /* ACE_HAS_PTHREADS vs. ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); ACE_UNUSED_ARG (attributes); @@ -360,13 +341,10 @@ ACE_OS::cond_signal (ACE_cond_t *cv) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_signal (cv), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_signal (cv), result), int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::WakeConditionVariable (cv); return 0; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); ACE_NOTSUP_RETURN (-1); @@ -383,10 +361,6 @@ ACE_OS::cond_wait (ACE_cond_t *cv, int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_wait (cv, external_mutex), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_wait (cv, external_mutex), result), - int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, &external_mutex->thr_mutex_, INFINITE), result), @@ -420,20 +394,12 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, (ACE_TIMESPEC_PTR) &ts), result), int, result); - // We need to adjust this to make the POSIX and Solaris return - // values consistent. EAGAIN is from Pthreads DRAFT4 (HP-UX 10.20 and down) + // We need to adjust this to make the POSIX return + // values consistent. EAGAIN is from Pthreads DRAFT4 if (result == -1 && (errno == ETIMEDOUT || errno == EAGAIN)) errno = ETIME; -# elif defined (ACE_HAS_STHREADS) - ACE_OSCALL (ACE_ADAPT_RETVAL (timeout == 0 - ? ::cond_wait (cv, external_mutex) - : ::cond_timedwait (cv, - external_mutex, - (timestruc_t*)&ts), - result), - int, result); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) int msec_timeout = 0; if (timeout != 0) @@ -450,7 +416,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, int, result); return result; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ if (timeout != 0) timeout->set (ts); // Update the time value before returning. @@ -568,18 +534,10 @@ ACE_OS::event_init (ACE_event_t *event, #endif /* ACE_HAS_WCHAR */ ACE_INLINE long -ACE_OS::priority_control (ACE_idtype_t idtype, ACE_id_t identifier, int cmd, void *arg) +ACE_OS::priority_control (ACE_idtype_t /*idtype*/, ACE_id_t /*identifier*/, int /*cmd*/, void */*arg*/) { ACE_OS_TRACE ("ACE_OS::priority_control"); -#if defined (ACE_HAS_PRIOCNTL) - return priocntl (idtype, identifier, cmd, static_cast (arg)); -#else /* ! ACE_HAS_PRIOCNTL*/ - ACE_UNUSED_ARG (idtype); - ACE_UNUSED_ARG (identifier); - ACE_UNUSED_ARG (cmd); - ACE_UNUSED_ARG (arg); ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_PRIOCNTL*/ } // This method is used to prepare the recursive mutex for releasing @@ -609,15 +567,7 @@ ACE_OS::recursive_mutex_cond_unlock (ACE_recursive_thread_mutex_t *m, // Windows variants that depend on existing values and limits. state.relock_count_ = 0; - while ( -# if !defined (ACE_HAS_WINCE) - m->LockCount > 0 && m->RecursionCount > 1 -# else - // WinCE doesn't have RecursionCount and the LockCount semantic - // Mobile 5 has it 1-indexed. - m->LockCount > 1 -# endif /* ACE_HAS_WINCE */ - ) + while (m->LockCount > 0 && m->RecursionCount > 1) { // This may fail if the current thread doesn't own the mutex. If it // does fail, it'll be on the first try, so don't worry about resetting @@ -1028,7 +978,7 @@ ACE_OS::rw_rdlock (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_rdlock (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_rdlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1079,7 +1029,7 @@ ACE_OS::rw_tryrdlock (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_tryrdlock (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_tryrdlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1122,7 +1072,7 @@ ACE_OS::rw_trywrlock (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_trywrlock (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_trywrlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1171,8 +1121,7 @@ ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw) result), int); # elif !defined (ACE_LACKS_RWLOCK_T) - // Some native rwlocks, such as those on Solaris, don't - // support the upgrade feature . . . + // Some native rwlocks ACE_UNUSED_ARG (rw); ACE_NOTSUP_RETURN (-1); # else /* NT, POSIX, and VxWorks don't support this natively. */ @@ -1243,7 +1192,7 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_unlock (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_unlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1302,7 +1251,7 @@ ACE_OS::rw_wrlock (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_wrlock (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_wrlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1355,7 +1304,7 @@ ACE_OS::rwlock_destroy (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_destroy (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_destroy (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1364,7 +1313,7 @@ ACE_OS::rwlock_destroy (ACE_rwlock_t *rw) ACE_OS::cond_destroy (&rw->waiting_readers_); ACE_OS::cond_destroy (&rw->waiting_important_writer_); return ACE_OS::cond_destroy (&rw->waiting_writers_); -# endif /* ACE_HAS_STHREADS && !defined (ACE_LACKS_RWLOCK_T) */ +# endif /* !defined (ACE_LACKS_RWLOCK_T) */ #else ACE_UNUSED_ARG (rw); ACE_NOTSUP_RETURN (-1); @@ -1474,28 +1423,18 @@ ACE_OS::sema_destroy (ACE_sema_t *s) int r2 = ACE_OS::close (s->fd_[1]); /* ignore error */ return r0 != 0 || r1 != 0 || r2 != 0 ? -1 : 0; #elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_destroy (s), result), int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) int r1 = ACE_OS::mutex_destroy (&s->lock_); int r2 = ACE_OS::cond_destroy (&s->count_nonzero_); return r1 != 0 || r2 != 0 ? -1 : 0; # elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CloseHandle (*s), ace_result_), int, -1); -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - // Free up underlying objects of the simulated semaphore. - int const r1 = ACE_OS::thread_mutex_destroy (&s->lock_); - int const r2 = ACE_OS::event_destroy (&s->count_nonzero_); - return r1 != 0 || r2 != 0 ? -1 : 0; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) int result; ACE_OSCALL (::semDelete (s->sema_), int, result); s->sema_ = 0; return result; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); @@ -1504,7 +1443,6 @@ ACE_OS::sema_destroy (ACE_sema_t *s) // NOTE: The previous four function definitions must appear before // ACE_OS::sema_init (). - ACE_INLINE int ACE_OS::sema_init (ACE_sema_t *s, u_int count, @@ -1616,23 +1554,6 @@ ACE_OS::sema_init (ACE_sema_t *s, # else if (name) { -# if defined (sun) || defined (HPUX) - // Solaris and HP-UX require the name to start with a slash. Solaris - // further requires that there be no other slashes than the first. - const char *last_slash = ACE_OS::strrchr (name, '/'); - char name2[MAXPATHLEN]; - if (0 == last_slash) - { - ACE_OS::strcpy (name2, "/"); - ACE_OS::strcat (name2, name); - name = name2; - } -# if defined (sun) - else - name = last_slash; // Chop off chars preceding last slash -# endif /* sun */ -# endif /* sun || HPUX */ - ACE_ALLOCATOR_RETURN (s->name_, ACE_OS::strdup (name), -1); @@ -1755,15 +1676,7 @@ ACE_OS::sema_init (ACE_sema_t *s, return 0; #elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (max); - ACE_UNUSED_ARG (sa); - ACE_UNUSED_ARG (attributes); - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_init (s, count, type, arg), result), - int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) ACE_UNUSED_ARG (max); ACE_UNUSED_ARG (sa); int result = -1; @@ -1790,7 +1703,6 @@ ACE_OS::sema_init (ACE_sema_t *s, return result; # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (attributes); -# if ! defined (ACE_USES_WINCE_SEMA_SIMULATION) ACE_UNUSED_ARG (type); ACE_UNUSED_ARG (arg); // Create the semaphore with its value initialized to and @@ -1812,40 +1724,6 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_OS::set_errno_to_last_error (); return 0; } -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - int result = -1; - - // Initialize internal object for semaphore simulation. - // Grab the lock as soon as possible when we initializing - // the semaphore count. Notice that we initialize the - // event object as "manually reset" so we can amortize the - // cost for singling/reseting the event. - // @@ I changed the mutex type to thread_mutex. Notice that this - // is basically a CriticalSection object and doesn't not has - // any security attribute whatsoever. However, since this - // semaphore implementation only works within a process, there - // shouldn't any security issue at all. - if (ACE_OS::thread_mutex_init (&s->lock_, type, name, (ACE_mutexattr_t *)arg) == 0 - && ACE_OS::event_init (&s->count_nonzero_, 1, - count > 0, type, name, arg, sa) == 0 - && ACE_OS::thread_mutex_lock (&s->lock_) == 0) - { - s->count_ = count; - - if (ACE_OS::thread_mutex_unlock (&s->lock_) == 0) - result = 0; - } - - // Destroy the internal objects if we didn't initialize - // either of them successfully. Don't bother to check - // for errors. - if (result == -1) - { - ACE_OS::thread_mutex_destroy (&s->lock_); - ACE_OS::event_destroy (&s->count_nonzero_); - } - return result; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) ACE_UNUSED_ARG (attributes); ACE_UNUSED_ARG (name); @@ -1855,7 +1733,7 @@ ACE_OS::sema_init (ACE_sema_t *s, s->name_ = 0; s->sema_ = ::semCCreate (type, count); return s->sema_ ? 0 : -1; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (s); ACE_UNUSED_ARG (count); @@ -1895,7 +1773,6 @@ ACE_OS::sema_init (ACE_sema_t *s, { # if defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (attributes); -# if ! defined (ACE_USES_WINCE_SEMA_SIMULATION) ACE_UNUSED_ARG (type); ACE_UNUSED_ARG (arg); // Create the semaphore with its value initialized to and @@ -1917,40 +1794,6 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_OS::set_errno_to_last_error (); return 0; } -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - int result = -1; - - // Initialize internal object for semaphore simulation. - // Grab the lock as soon as possible when we initializing - // the semaphore count. Notice that we initialize the - // event object as "manually reset" so we can amortize the - // cost for singling/reseting the event. - // @@ I changed the mutex type to thread_mutex. Notice that this - // is basically a CriticalSection object and doesn't not has - // any security attribute whatsoever. However, since this - // semaphore implementation only works within a process, there - // shouldn't any security issue at all. - if (ACE_OS::thread_mutex_init (&s->lock_, type, name, (ACE_mutexattr_t *)arg) == 0 - && ACE_OS::event_init (&s->count_nonzero_, 1, - count > 0, type, name, arg, sa) == 0 - && ACE_OS::thread_mutex_lock (&s->lock_) == 0) - { - s->count_ = count; - - if (ACE_OS::thread_mutex_unlock (&s->lock_) == 0) - result = 0; - } - - // Destroy the internal objects if we didn't initialize - // either of them successfully. Don't bother to check - // for errors. - if (result == -1) - { - ACE_OS::thread_mutex_destroy (&s->lock_); - ACE_OS::event_destroy (&s->count_nonzero_); - } - return result; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # else /* ACE_HAS_WTHREADS */ // Just call the normal char version. return ACE_OS::sema_init (s, count, type, attributes, ACE_Wide_To_Ascii (name).char_rep (), arg, max, sa); @@ -2005,10 +1848,7 @@ ACE_OS::sema_post (ACE_sema_t *s) return 0; return -1; # elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_post (s), result), int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) int result = -1; if (ACE_OS::mutex_lock (&s->lock_) == 0) @@ -2024,32 +1864,12 @@ ACE_OS::sema_post (ACE_sema_t *s) } return result; # elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::ReleaseSemaphore (*s, 1, 0), ace_result_), int, -1); -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - int result = -1; - - // Since we are simulating semaphores, we need to update semaphore - // count manually. Grab the lock to prevent race condition first. - if (ACE_OS::thread_mutex_lock (&s->lock_) == 0) - { - // Check the original state of event object. Single the event - // object in transition from semaphore not available to - // semaphore available. - if (s->count_++ <= 0) - result = ACE_OS::event_signal (&s->count_nonzero_); - else - result = 0; - - ACE_OS::thread_mutex_unlock (&s->lock_); - } - return result; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) return ::semGive (s->sema_); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); @@ -2059,16 +1879,16 @@ ACE_OS::sema_post (ACE_sema_t *s) ACE_INLINE int ACE_OS::sema_post (ACE_sema_t *s, u_int release_count) { -#if defined (ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) +#if defined (ACE_WIN32) // Win32 supports this natively. ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::ReleaseSemaphore (*s, release_count, 0), ace_result_), int, -1); #else // On POSIX platforms we need to emulate this ourselves. // @@ We can optimize on this implementation. However, - // the semaphore promitive on Win32 doesn't allow one + // the semaphore primitive on Win32 doesn't allow one // to increase a semaphore to more than the count it was - // first initialized. Posix and solaris don't seem to have + // first initialized. Posix doesn't seem to have // this restriction. Should we impose the restriction in // our semaphore simulation? for (size_t i = 0; i < release_count; i++) @@ -2109,14 +1929,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s) return rc == 1 ? 0 : (-1); # elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - // STHREADS semaphores set errno to EBUSY if trywait fails. - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_trywait (s), - result), - int); -# elif defined (ACE_HAS_PTHREADS) - +# if defined (ACE_HAS_PTHREADS) int result = -1; if (ACE_OS::mutex_lock (&s->lock_) == 0) @@ -2133,7 +1946,6 @@ ACE_OS::sema_trywait (ACE_sema_t *s) } return result; # elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) DWORD result = ::WaitForSingleObject (*s, 0); if (result == WAIT_OBJECT_0) @@ -2147,41 +1959,6 @@ ACE_OS::sema_trywait (ACE_sema_t *s) // This is a hack, we need to find an appropriate mapping... return -1; } -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - // Check the status of semaphore first. Return immediately - // if the semaphore is not available and avoid grabing the - // lock. - DWORD result = ::WaitForSingleObject (s->count_nonzero_, 0); - - if (result == WAIT_OBJECT_0) // Proceed when it is available. - { - ACE_OS::thread_mutex_lock (&s->lock_); - - // Need to double check if the semaphore is still available. - // The double checking scheme will slightly affect the - // efficiency if most of the time semaphores are not blocked. - result = ::WaitForSingleObject (s->count_nonzero_, 0); - if (result == WAIT_OBJECT_0) - { - // Adjust the semaphore count. Only update the event - // object status when the state changed. - s->count_--; - if (s->count_ <= 0) - ACE_OS::event_reset (&s->count_nonzero_); - result = 0; - } - - ACE_OS::thread_mutex_unlock (&s->lock_); - } - - // Translate error message to errno used by ACE. - if (result == WAIT_TIMEOUT) - errno = EBUSY; - else - ACE_OS::set_errno_to_last_error (); - // This is taken from the hack above. ;) - return -1; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) if (::semTake (s->sema_, NO_WAIT) == ERROR) if (errno == S_objLib_OBJ_UNAVAILABLE) @@ -2196,7 +1973,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s) else // got the semaphore return 0; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); @@ -2215,10 +1992,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) return 0; return -1; # elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_wait (s), result), int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) int result = 0; ACE_PTHREAD_CLEANUP_PUSH (&s->lock_); @@ -2252,7 +2026,6 @@ ACE_OS::sema_wait (ACE_sema_t *s) return result < 0 ? -1 : result; # elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) switch (::WaitForSingleObject (*s, INFINITE)) { case WAIT_OBJECT_0: @@ -2263,49 +2036,9 @@ ACE_OS::sema_wait (ACE_sema_t *s) return -1; } /* NOTREACHED */ -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - // Timed wait. - int result = -1; - for (;;) - // Check if the semaphore is avialable or not and wait forever. - // Don't bother to grab the lock if it is not available (to avoid - // deadlock.) - switch (::WaitForSingleObject (s->count_nonzero_, INFINITE)) - { - case WAIT_OBJECT_0: - ACE_OS::thread_mutex_lock (&s->lock_); - - // Need to double check if the semaphore is still available. - // This time, we shouldn't wait at all. - if (::WaitForSingleObject (s->count_nonzero_, 0) == WAIT_OBJECT_0) - { - // Decrease the internal counter. Only update the event - // object's status when the state changed. - s->count_--; - if (s->count_ <= 0) - ACE_OS::event_reset (&s->count_nonzero_); - result = 0; - } - - ACE_OS::thread_mutex_unlock (&s->lock_); - // if we didn't get a hold on the semaphore, the result won't - // be 0 and thus, we'll start from the beginning again. - if (result == 0) - return 0; - break; - - default: - // Since we wait indefinitely, anything other than - // WAIT_OBJECT_O indicates an error. - ACE_OS::set_errno_to_last_error (); - // This is taken from the hack above. ;) - return -1; - } - /* NOTREACHED */ -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) return ::semTake (s->sema_, WAIT_FOREVER); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); @@ -2410,11 +2143,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) return -1; # elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (s); - ACE_UNUSED_ARG (tv); - ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) int result = 0; ACE_Errno_Guard error (errno); @@ -2455,7 +2184,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) ACE_PTHREAD_CLEANUP_POP (0); return result < 0 ? -1 : result; # elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) int msec_timeout; if (tv == ACE_Time_Value::zero) @@ -2489,78 +2217,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) return -1; } /* NOTREACHED */ -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - // Note that in this mode, the acquire is done in two steps, and - // we may get signaled but cannot grab the semaphore before - // timeout. In that case, we'll need to restart the process with - // updated timeout value. - - // tv is an absolute time, but we need relative to work with the Windows - // API. Also, some users have become accustomed to using a 0 time value - // as a shortcut for "now", which works on non-Windows because 0 is - // always earlier than now. However, the need to convert to relative time - // means we need to watch out for this case. - ACE_Time_Value relative_time (ACE_Time_Value::zero); - if (tv != ACE_Time_Value::zero) - relative_time = tv.to_relative_time (); - int result = -1; - - // While we are not timeout yet. >= 0 will let this go through once - // and if not able to get the object, it should hit WAIT_TIMEOUT - // right away. - while (relative_time >= ACE_Time_Value::zero) - { - // Wait for our turn to get the object. - switch (::WaitForSingleObject (s->count_nonzero_, relative_time.msec ())) - { - case WAIT_OBJECT_0: - ACE_OS::thread_mutex_lock (&s->lock_); - - // Need to double check if the semaphore is still available. - // We can only do a "try lock" styled wait here to avoid - // blocking threads that want to signal the semaphore. - if (::WaitForSingleObject (s->count_nonzero_, 0) == WAIT_OBJECT_0) - { - // As before, only reset the object when the semaphore - // is no longer available. - s->count_--; - if (s->count_ <= 0) - ACE_OS::event_reset (&s->count_nonzero_); - result = 0; - } - - ACE_OS::thread_mutex_unlock (&s->lock_); - - // Only return when we successfully get the semaphore. - if (result == 0) - { - tv = tv.now (); // Update to time acquired - return 0; - } - break; - - // We have timed out. - case WAIT_TIMEOUT: - errno = ETIME; - return -1; - - // What? - default: - ACE_OS::set_errno_to_last_error (); - // This is taken from the hack above. ;) - return -1; - }; - - // Haven't been able to get the semaphore yet, update the - // timeout value to reflect the remaining time we want to wait. - // in case of tv == 0 relative_time will now be < 0 and we will be out of time - relative_time = tv.to_relative_time (); - } - - // We have timed out. - errno = ETIME; - return -1; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) // Note that we must convert between absolute time (which is // passed as a parameter) and relative time (which is what @@ -2586,7 +2242,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) tv = tv.now (); // Update to time acquired return 0; } -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (s); ACE_UNUSED_ARG (tv); @@ -2682,14 +2338,6 @@ ACE_OS::sigwait (sigset_t *sset, int *sig) # if (defined (__FreeBSD__) && (__FreeBSD__ < 3)) ACE_UNUSED_ARG (sset); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_STHREADS) - # if (_POSIX_C_SOURCE - 0 >= 199506L) || defined (_POSIX_PTHREAD_SEMANTICS) - errno = ::sigwait (sset, sig); - return errno == 0 ? *sig : -1; - #else - *sig = ::sigwait (sset); - return *sig; - #endif /* _POSIX_C_SOURCE - 0 >= 199506L || _POSIX_PTHREAD_SEMANTICS */ # elif defined (ACE_HAS_PTHREADS) # if defined (CYGWIN32) // Cygwin has sigwait definition, but it is not implemented @@ -2777,10 +2425,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) { ACE_OS_TRACE ("ACE_OS::thr_continue"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_continue (target_thread), result), int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREAD_CONTINUE) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_continue (target_thread), @@ -2808,7 +2453,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) return 0; # elif defined (ACE_HAS_VXTHREADS) return ::taskResume (target_thread); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (target_thread); ACE_NOTSUP_RETURN (-1); @@ -2820,13 +2465,11 @@ ACE_OS::thr_getconcurrency () { ACE_OS_TRACE ("ACE_OS::thr_getconcurrency"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - return ::thr_getconcurrency (); -# elif defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_GETCONCURRENCY) +# if defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_GETCONCURRENCY) return pthread_getconcurrency (); # else ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAS_THREADS */ @@ -2849,17 +2492,9 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) result); priority = param.sched_priority; return result; -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (ht_id, &priority), result), int); # elif defined (ACE_HAS_WTHREADS) ACE_Errno_Guard error (errno); - -# if defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) - priority = ::CeGetThreadPriority (ht_id); -# else priority = ::GetThreadPriority (ht_id); -# endif /* defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) */ # if defined (ACE_HAS_PHARLAP) # if defined (ACE_PHARLAP_LABVIEW_RT) @@ -2868,14 +2503,12 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) DWORD timeslice = ::EtsGetTimeSlice (); policy = timeslice == 0 ? ACE_SCHED_OTHER : ACE_SCHED_FIFO; # endif /* ACE_PHARLAP_LABVIEW_RT */ -# elif !defined (ACE_HAS_WINCE) - DWORD priority_class = ::GetPriorityClass (::GetCurrentProcess ()); +# else + DWORD const priority_class = ::GetPriorityClass (::GetCurrentProcess ()); if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR) ACE_FAIL_RETURN (-1); - policy = - (priority_class == - REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER; + policy = (priority_class == REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER; # endif /* ACE_HAS_PHARLAP */ return 0; @@ -2885,7 +2518,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) ACE_UNUSED_ARG (ht_id); ACE_UNUSED_ARG (priority); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (ht_id); ACE_UNUSED_ARG (priority); @@ -2909,9 +2542,6 @@ ACE_OS::thr_getspecific_native (ACE_OS_thread_key_t key, void **data) # if defined (ACE_HAS_PTHREADS) *data = pthread_getspecific (key); return 0; -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), result), int); # elif defined (ACE_HAS_WTHREADS) *data = ::TlsGetValue (key); if (*data == 0 && ::GetLastError () != NO_ERROR) @@ -2967,11 +2597,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle, { ACE_OS_TRACE ("ACE_OS::thr_join"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (thr_handle, 0, status), result), - int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) # if defined (ACE_LACKS_PTHREAD_JOIN) ACE_UNUSED_ARG (thr_handle); ACE_UNUSED_ARG (status); @@ -3016,7 +2642,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle, ACE_UNUSED_ARG (thr_handle); ACE_UNUSED_ARG (status); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (thr_handle); ACE_UNUSED_ARG (status); @@ -3031,11 +2657,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, { ACE_OS_TRACE ("ACE_OS::thr_join"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (waiter_id, thr_id, status), result), - int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) # if defined (ACE_LACKS_PTHREAD_JOIN) ACE_UNUSED_ARG (waiter_id); ACE_UNUSED_ARG (thr_id); @@ -3055,7 +2677,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, // This could be implemented if the DLL-Main function or the // task exit base class some log the threads which have exited ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (waiter_id); ACE_UNUSED_ARG (thr_id); @@ -3081,11 +2703,6 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum) result), int); # endif /* ACE_LACKS_PTHREAD_KILL */ -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_kill (thr_id, signum), - result), - int); # elif defined (ACE_HAS_VXTHREADS) //FUZZ: disable check_for_lack_ACE_OS return ::kill (thr_id, signum); @@ -3094,7 +2711,7 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum) ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (signum); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (signum); @@ -3107,14 +2724,7 @@ ACE_OS::thr_min_stack () { ACE_OS_TRACE ("ACE_OS::thr_min_stack"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) -# if defined (ACE_HAS_THR_MINSTACK) - // Tandem did some weirdo mangling of STHREAD names... - return ::thr_minstack (); -# else - return ::thr_min_stack (); -# endif /* !ACE_HAS_THR_MINSTACK */ -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) # if defined (_SC_THREAD_STACK_MIN) return (size_t) ACE_OS::sysconf (_SC_THREAD_STACK_MIN); # elif defined (PTHREAD_STACK_MIN) @@ -3136,7 +2746,7 @@ ACE_OS::thr_min_stack () return status == OK ? taskDesc.td_stackSize : 0; # else /* Should not happen... */ ACE_NOTSUP_RETURN (0); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_NOTSUP_RETURN (0); #endif /* ACE_HAS_THREADS */ @@ -3192,13 +2802,11 @@ ACE_OS::thr_self () # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. return pthread_self (); -# elif defined (ACE_HAS_STHREADS) - return ::thr_self (); # elif defined (ACE_HAS_WTHREADS) return ::GetCurrentThreadId (); # elif defined (ACE_HAS_VXTHREADS) return ::taskIdSelf (); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else return 1; // Might as well make it the first thread ;-) #endif /* ACE_HAS_THREADS */ @@ -3228,13 +2836,11 @@ ACE_OS::thr_self (ACE_hthread_t &self) self = pthread_self (); # elif defined (ACE_HAS_THREAD_SELF) self = ::thread_self (); -# elif defined (ACE_HAS_STHREADS) - self = ::thr_self (); # elif defined (ACE_HAS_WTHREADS) self = ::GetCurrentThread (); # elif defined (ACE_HAS_VXTHREADS) self = ::taskIdSelf (); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else self = 1; // Might as well make it the main thread ;-) #endif /* ACE_HAS_THREADS */ @@ -3276,10 +2882,6 @@ ACE_OS::thr_setcancelstate (int new_state, int *old_state) break; } return result; -# elif defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (new_state); - ACE_UNUSED_ARG (old_state); - ACE_NOTSUP_RETURN (-1); # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (new_state); ACE_UNUSED_ARG (old_state); @@ -3349,18 +2951,13 @@ ACE_OS::thr_setconcurrency (int hint) { ACE_OS_TRACE ("ACE_OS::thr_setconcurrency"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setconcurrency (hint), - result), - int); -# elif defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_SETCONCURRENCY) +# if defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_SETCONCURRENCY) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setconcurrency (hint), result), int); # else ACE_UNUSED_ARG (hint); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (hint); ACE_NOTSUP_RETURN (-1); @@ -3397,21 +2994,10 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) ¶m), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setprio (ht_id, priority), result), int); # elif defined (ACE_HAS_WTHREADS) - -# if defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CeSetThreadPriority (ht_id, priority), - ace_result_), - int, -1); -# else ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetThreadPriority (ht_id, priority), ace_result_), int, -1); -# endif /* defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) */ - # elif defined (ACE_HAS_VXTHREADS) ACE_OSCALL_RETURN (::taskPrioritySet (ht_id, priority), int); # else @@ -3419,7 +3005,7 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) ACE_UNUSED_ARG (ht_id); ACE_UNUSED_ARG (priority); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (ht_id); ACE_UNUSED_ARG (priority); @@ -3435,7 +3021,7 @@ ACE_OS::thr_sigsetmask (int how, ACE_OS_TRACE ("ACE_OS::thr_sigsetmask"); #if defined (ACE_HAS_THREADS) # if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK) - // DCE threads and Solaris 2.4 have no such function. + // DCE threads ACE_UNUSED_ARG (osm); ACE_UNUSED_ARG (nsm); ACE_UNUSED_ARG (how); @@ -3444,9 +3030,6 @@ ACE_OS::thr_sigsetmask (int how, # elif defined (ACE_HAS_SIGTHREADMASK) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sigthreadmask (how, nsm, osm), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_sigsetmask (how, nsm, osm), result), int); # elif defined (ACE_HAS_PTHREADS) # if !defined (ACE_LACKS_PTHREAD_SIGMASK) int result; @@ -3511,10 +3094,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) { ACE_OS_TRACE ("ACE_OS::thr_suspend"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_suspend (target_thread), result), int, -1); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREAD_SUSPEND) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend (target_thread), result), int); @@ -3533,7 +3113,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) /* NOTREACHED */ # elif defined (ACE_HAS_VXTHREADS) return ::taskSuspend (target_thread); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (target_thread); ACE_NOTSUP_RETURN (-1); @@ -3547,9 +3127,6 @@ ACE_OS::thr_testcancel () #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL) pthread_testcancel (); -# elif defined (ACE_HAS_STHREADS) -# elif defined (ACE_HAS_WTHREADS) -# elif defined (ACE_HAS_VXTHREADS) # else // no-op: can't use ACE_NOTSUP_RETURN because there is no return value # endif /* ACE_HAS_PTHREADS */ @@ -3564,8 +3141,6 @@ ACE_OS::thr_yield () #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) ::sched_yield (); -# elif defined (ACE_HAS_STHREADS) - ::thr_yield (); # elif defined (ACE_HAS_WTHREADS) ::Sleep (0); # elif defined (ACE_HAS_VXTHREADS) @@ -3574,7 +3149,7 @@ ACE_OS::thr_yield () // Now, it does seem to work. The context_switch_time test // works fine with task_delay set to 0. ::taskDelay (0); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ; #endif /* ACE_HAS_THREADS */ @@ -3622,13 +3197,13 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m, } return 0; -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) +# elif defined (ACE_HAS_PTHREADS) // Force the use of USYNC_THREAD! return ACE_OS::mutex_init (m, USYNC_THREAD, name, arg, 0, lock_type); # elif defined (ACE_HAS_VXTHREADS) return mutex_init (m, lock_type, name, arg); -# endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (m); @@ -3665,12 +3240,12 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m, } return 0; -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) +# elif defined (ACE_HAS_PTHREADS) // Force the use of USYNC_THREAD! return ACE_OS::mutex_init (m, USYNC_THREAD, name, arg, 0, lock_type); # elif defined (ACE_HAS_VXTHREADS) return mutex_init (m, lock_type, name, arg); -# endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (m); ACE_UNUSED_ARG (lock_type); @@ -3740,7 +3315,7 @@ ACE_OS::thread_mutex_trylock (ACE_thread_mutex_t *m) # if defined (ACE_HAS_WTHREADS) # if defined (ACE_HAS_WIN32_TRYLOCK) BOOL result = ::TryEnterCriticalSection (m); - if (result == TRUE) + if (result) { return 0; } @@ -3753,7 +3328,7 @@ ACE_OS::thread_mutex_trylock (ACE_thread_mutex_t *m) ACE_UNUSED_ARG (m); ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_WIN32_TRYLOCK */ -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (ACE_VXWORKS) +# elif defined (ACE_HAS_PTHREADS) || defined (ACE_VXWORKS) return ACE_OS::mutex_trylock (m); #endif /* Threads variety case */ diff --git a/ACE/ace/OS_NS_arpa_inet.cpp b/ACE/ace/OS_NS_arpa_inet.cpp index b0f7125ca2f0a..8b20b1bbfaf3f 100644 --- a/ACE/ace/OS_NS_arpa_inet.cpp +++ b/ACE/ace/OS_NS_arpa_inet.cpp @@ -85,7 +85,7 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr) return 1; } # endif // ACE_LACKS_INET_ADDR -#elif defined (ACE_VXWORKS) +#elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x700) // inet_aton() returns OK (0) on success and ERROR (-1) on failure. // Must reset errno first. Refer to WindRiver SPR# 34949, SPR# 36026 ::errnoSet(0); diff --git a/ACE/ace/OS_NS_arpa_inet.h b/ACE/ace/OS_NS_arpa_inet.h index f33340376f67e..4c6a44e8e9df0 100644 --- a/ACE/ace/OS_NS_arpa_inet.h +++ b/ACE/ace/OS_NS_arpa_inet.h @@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION unsigned long inet_addr (const char *name); @@ -53,7 +52,6 @@ namespace ACE_OS { int inet_pton (int family, const char *strptr, void *addrptr); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_arpa_inet.inl b/ACE/ace/OS_NS_arpa_inet.inl index 49343444e98df..eaaa7dc832cf0 100644 --- a/ACE/ace/OS_NS_arpa_inet.inl +++ b/ACE/ace/OS_NS_arpa_inet.inl @@ -69,7 +69,6 @@ ACE_OS::inet_pton (int family, const char *strptr, void *addrptr) #if defined ACE_HAS_IPV6 && !defined ACE_LACKS_INET_PTON return ::inet_pton (family, strptr, addrptr); #else - if (family == AF_INET) { if (ACE_OS::inet_aton (strptr, static_cast (addrptr))) diff --git a/ACE/ace/OS_NS_ctype.h b/ACE/ace/OS_NS_ctype.h index 2bff7a3c3adb8..acc38a308a421 100644 --- a/ACE/ace/OS_NS_ctype.h +++ b/ACE/ace/OS_NS_ctype.h @@ -36,7 +36,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - // these are non-standard names... /** @name Functions from @@ -48,7 +47,6 @@ namespace ACE_OS { * here. Instead, we change by prepending "ace_". */ //@{ - /// Returns true if the character is an alphanumeric character. ACE_NAMESPACE_INLINE_FUNCTION int ace_isalnum (ACE_TCHAR c); diff --git a/ACE/ace/OS_NS_devctl.h b/ACE/ace/OS_NS_devctl.h index c1ed2975b90ce..982dee5db42a7 100644 --- a/ACE/ace/OS_NS_devctl.h +++ b/ACE/ace/OS_NS_devctl.h @@ -19,12 +19,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int posix_devctl (int filedes, int dcmd, void *dev_data_ptr, size_t nbyte, int *dev_info_ptr); - } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp index a5efb466c06ea..449a0c966941c 100644 --- a/ACE/ace/OS_NS_dirent.cpp +++ b/ACE/ace/OS_NS_dirent.cpp @@ -1,7 +1,6 @@ #include "ace/OS_NS_dirent.h" - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_dirent.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h index d426e8a61a257..5d0a3f5addd1b 100644 --- a/ACE/ace/OS_NS_dirent.h +++ b/ACE/ace/OS_NS_dirent.h @@ -41,12 +41,7 @@ extern "C" { #elif defined (ACE_SCANDIR_CMP_USES_CONST_VOIDPTR) typedef int (*ACE_SCANDIR_OS_COMPARATOR)(const void *f1, const void *f2); #endif /* ACE_SCANDIR_CMP_USES_VOIDPTR */ - typedef int (*ACE_SCANDIR_COMPARATOR)(const ACE_DIRENT **f1, - const ACE_DIRENT **f2); - -#if defined (ACE_SCANDIR_SEL_LACKS_CONST) - typedef int (*ACE_SCANDIR_OS_SELECTOR)(ACE_DIRENT *filename); -#endif /* ACE_SCANDIR_SEL_LACKS_CONST */ + typedef int (*ACE_SCANDIR_COMPARATOR)(const ACE_DIRENT **f1, const ACE_DIRENT **f2); typedef int (*ACE_SCANDIR_SELECTOR)(const ACE_DIRENT *filename); } @@ -56,7 +51,6 @@ extern "C" { * be usable later as there is no way to save the macro definition * using the pre-processor. */ - #if !defined (ACE_LACKS_REWINDDIR) # if !defined (ACE_HAS_WREWINDDIR) || !defined (ACE_USES_WCHAR) inline void ace_rewinddir_helper (ACE_DIR *dir) @@ -74,7 +68,6 @@ inline void ace_rewinddir_helper (ACE_DIR *dir) ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION void closedir (ACE_DIR *); diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl index f55ec13406e25..88a5154e0a5db 100644 --- a/ACE/ace/OS_NS_dirent.inl +++ b/ACE/ace/OS_NS_dirent.inl @@ -37,8 +37,6 @@ opendir (const ACE_TCHAR *filename) return ::ACE_OS::opendir_emulation (filename); # elif defined (ACE_HAS_WOPENDIR) && defined (ACE_USES_WCHAR) return ::wopendir (filename); -# elif defined (ACE_HAS_NONCONST_OPENDIR) - return ::opendir (const_cast (filename)); # else /* ! ACE_WIN32 && ACE_LACKS_OPENDIR */ return ::opendir (ACE_TEXT_ALWAYS_CHAR (filename)); # endif /* ACE_WIN32 && ACE_LACKS_OPENDIR */ @@ -88,11 +86,7 @@ scandir (const ACE_TCHAR *dirname, #if defined (ACE_HAS_SCANDIR) return ::scandir (ACE_TEXT_ALWAYS_CHAR (dirname), namelist, -# if defined (ACE_SCANDIR_SEL_LACKS_CONST) - reinterpret_cast (selector), -# else selector, -# endif /* ACE_SCANDIR_SEL_LACKS_CONST */ # if defined (ACE_SCANDIR_CMP_USES_VOIDPTR) || \ defined (ACE_SCANDIR_CMP_USES_CONST_VOIDPTR) reinterpret_cast (comparator)); diff --git a/ACE/ace/OS_NS_dlfcn.h b/ACE/ace/OS_NS_dlfcn.h index 733d8f7f2b440..7157cba9c40a6 100644 --- a/ACE/ace/OS_NS_dlfcn.h +++ b/ACE/ace/OS_NS_dlfcn.h @@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - //@{ @name A set of wrappers for explicit dynamic linking. ACE_NAMESPACE_INLINE_FUNCTION int dlclose (ACE_SHLIB_HANDLE handle); diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl index 840ef48e1bb17..b9928e2936ab6 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -40,22 +40,6 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) return ::dlclose (handle); #elif defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FreeLibrary (handle), ace_result_), int, -1); -#elif defined (__hpux) - // HP-UX 10.x and 32-bit 11.00 do not pay attention to the ref count - // when unloading a dynamic lib. So, if the ref count is more than - // 1, do not unload the lib. This will cause a library loaded more - // than once to not be unloaded until the process runs down, but - // that's life. It's better than unloading a library that's in use. - // So far as I know, there's no way to decrement the refcnt that the - // kernel is looking at - the shl_descriptor is a copy of what the - // kernel has, not the actual struct. On 64-bit HP-UX using dlopen, - // this problem has been fixed. - struct shl_descriptor desc; - if (shl_gethandle_r (handle, &desc) == -1) - return -1; - if (desc.ref_count > 1) - return 0; - return ::shl_unload (handle); #else ACE_UNUSED_ARG (handle); ACE_NOTSUP_RETURN (-1); @@ -79,7 +63,7 @@ ACE_OS::dlerror () # else return const_cast (err); # endif /* ACE_USES_WCHAR */ -# elif defined (__hpux) || defined (ACE_VXWORKS) +# elif defined (ACE_VXWORKS) //FUZZ: disable check_for_lack_ACE_OS return ::strerror(errno); //FUZZ: enable check_for_lack_ACE_OS @@ -133,8 +117,6 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, ACE_UNUSED_ARG (mode); ACE_WIN32CALL_RETURN (ACE_TEXT_LoadLibrary (fname), ACE_SHLIB_HANDLE, 0); -# elif defined (__hpux) - return ::shl_load(fname, mode, 0L); # elif defined (ACE_VXWORKS) && !defined (__RTP__) ACE_UNUSED_ARG (mode); MODULE* handle = 0; @@ -182,25 +164,14 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, return nullptr; // Get the correct OS type. -#if defined (ACE_HAS_WINCE) - // CE (at least thru Pocket PC 2003) offers GetProcAddressW, not ...A, so - // we always need a wide-char string. - const wchar_t *symbolname = 0; -# if defined (ACE_USES_WCHAR) - symbolname = sname; -# else - ACE_Ascii_To_Wide sname_xlate (sname); - symbolname = sname_xlate.wchar_rep (); -# endif /* ACE_USES_WCHAR */ -#elif defined (ACE_USES_WCHAR) - // WinCE is WCHAR always; other platforms need a char * symbol name +#if defined (ACE_USES_WCHAR) ACE_Wide_To_Ascii w_sname (sname); char *symbolname = w_sname.char_rep (); #elif defined (ACE_VXWORKS) char *symbolname = const_cast (sname); #else const char *symbolname = sname; -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_USES_WCHAR */ # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) @@ -217,21 +188,9 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, # else return ::dlsym (handle, symbolname); # endif /* ACE_USES_ASM_SYMBOL_IN_DLSYM */ - # elif defined (ACE_WIN32) - ACE_WIN32CALL_RETURN (::GetProcAddress (handle, symbolname), void *, 0); - -# elif defined (__hpux) - - void *value {}; - int status = 0; - shl_t _handle = handle; - ACE_OSCALL (::shl_findsym(&_handle, symbolname, TYPE_UNDEFINED, &value), int, status); - return status == 0 ? value : nullptr; - # elif defined (ACE_VXWORKS) && !defined (__RTP__) - // For now we use the VxWorks global symbol table // which resolves the most recently loaded symbols, which resolve // mostly what we want.. diff --git a/ACE/ace/OS_NS_errno.h b/ACE/ace/OS_NS_errno.h index 3c26f5fe7261c..eedece4661d7d 100644 --- a/ACE/ace/OS_NS_errno.h +++ b/ACE/ace/OS_NS_errno.h @@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int last_error (); @@ -51,44 +50,10 @@ namespace ACE_OS { } /* namespace ACE_OS */ -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -/** - * @class ACE_CE_Errno - * - * Some versions of CE don't support @c errno and some versions' - * implementations are busted. So we implement our own. - * Our implementation takes up one Tls key, however, it does not - * allocate memory from the heap so there's no problem with cleaning - * up the errno when a thread exit. - */ -class ACE_Export ACE_CE_Errno -{ -public: - ACE_CE_Errno () = default; - static void init (); - static void fini (); - static ACE_CE_Errno *instance (); - - operator int () const; - int operator= (int); - -private: - static ACE_CE_Errno *instance_; - static DWORD errno_key_; -}; - -# define errno (* (ACE_CE_Errno::instance ())) -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -# define ACE_ERRNO_TYPE ACE_CE_Errno -# define ACE_ERRNO_GET ACE_CE_Errno::instance ()->operator int() -#else -# if !defined (ACE_ERRNO_TYPE) -# define ACE_ERRNO_TYPE int -# endif /* !ACE_ERRNO_TYPE */ -# define ACE_ERRNO_GET errno -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ +#if !defined (ACE_ERRNO_TYPE) +# define ACE_ERRNO_TYPE int +#endif /* !ACE_ERRNO_TYPE */ +#define ACE_ERRNO_GET errno ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_errno.inl b/ACE/ace/OS_NS_errno.inl index 9dcbe998360c8..d77546fe3f988 100644 --- a/ACE/ace/OS_NS_errno.inl +++ b/ACE/ace/OS_NS_errno.inl @@ -52,29 +52,4 @@ ACE_OS::set_errno_to_wsa_last_error () # endif /* defined(ACE_WIN32) */ } -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - -ACE_INLINE ACE_CE_Errno * -ACE_CE_Errno::instance () -{ - // This should be inlined. - return ACE_CE_Errno::instance_; -} - -ACE_INLINE -ACE_CE_Errno::operator int () const -{ - return (int) TlsGetValue (ACE_CE_Errno::errno_key_); -} - -ACE_INLINE int -ACE_CE_Errno::operator= (int x) -{ - // error checking? - TlsSetValue (ACE_CE_Errno::errno_key_, (void *) x); - return x; -} - -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_fcntl.cpp b/ACE/ace/OS_NS_fcntl.cpp index f462b0d75ddfe..ab6bd35fef201 100644 --- a/ACE/ace/OS_NS_fcntl.cpp +++ b/ACE/ace/OS_NS_fcntl.cpp @@ -76,16 +76,6 @@ ACE_OS::open (const char *filename, SECURITY_ATTRIBUTES sa_buffer; SECURITY_DESCRIPTOR sd_buffer; -#if defined (ACE_HAS_WINCE) - ACE_HANDLE h = ::CreateFileW (ACE_Ascii_To_Wide (filename).wchar_rep (), - access, - shared_mode, - ACE_OS::default_win32_security_attributes_r - (sa, &sa_buffer, &sd_buffer), - creation, - flags, - 0); -#else /* ACE_HAS_WINCE */ ACE_HANDLE h = ::CreateFileA (filename, access, shared_mode, @@ -94,7 +84,6 @@ ACE_OS::open (const char *filename, creation, flags, 0); -#endif /* ACE_HAS_WINCE */ if (ACE_BIT_ENABLED (mode, _O_APPEND)) { diff --git a/ACE/ace/OS_NS_fcntl.h b/ACE/ace/OS_NS_fcntl.h index e95b50aa21313..17c7c7d43de04 100644 --- a/ACE/ace/OS_NS_fcntl.h +++ b/ACE/ace/OS_NS_fcntl.h @@ -34,7 +34,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int fcntl (ACE_HANDLE handle, int cmd, diff --git a/ACE/ace/OS_NS_macros.h b/ACE/ace/OS_NS_macros.h index e901019ddb0c2..ac1c5e2f941c5 100644 --- a/ACE/ace/OS_NS_macros.h +++ b/ACE/ace/OS_NS_macros.h @@ -76,7 +76,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL LONG -inline ACE_High_Part (ACE_OFF_T value) +inline ACE_High_Part (LONGLONG value) { LARGE_INTEGER new_value; new_value.QuadPart = value; @@ -102,6 +102,18 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* _FILE_OFFSET_BITS==64 */ #endif /* ACE_WIN32 */ +// 64-bit quad-word definitions. +#if defined (ACE_WIN32) +# if defined (_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +typedef unsigned __int64 ACE_QWORD; +inline ACE_QWORD ACE_Make_QWORD (DWORD lo, DWORD hi) { return ACE_QWORD (lo) | (ACE_QWORD (hi) << 32); } +inline DWORD ACE_Low_DWORD (ACE_QWORD q) { return (DWORD) q; } +inline DWORD ACE_High_DWORD (ACE_QWORD q) { return (DWORD) (q >> 32); } +ACE_END_VERSIONED_NAMESPACE_DECL +# endif /* _FILE_OFFSET_BITS==64 */ +#endif /* ACE_WIN32 */ + # include /**/ "ace/post.h" #endif /* ACE_OS_NS_MACROS_H */ diff --git a/ACE/ace/OS_NS_math.h b/ACE/ace/OS_NS_math.h index daf9e9f70c4cd..ede8de33bd1ca 100644 --- a/ACE/ace/OS_NS_math.h +++ b/ACE/ace/OS_NS_math.h @@ -91,16 +91,6 @@ namespace ACE_OS return std::floor (x); } -#if defined (ACE_HAS_WINCE) - /// Windows CE has an intrinsic floor for float - template <> - inline - float floor (float x) - { - return std::floorf (x); - } -#endif - /// This method computes the smallest integral value not less than x. template inline @@ -109,20 +99,9 @@ namespace ACE_OS return std::ceil (x); } -#if defined (ACE_HAS_WINCE) - /// Windows CE has an intrinsic ceil for float - template <> - inline - float ceil (float x) - { - return std::ceilf (x); - } -#endif - /// This method computes the base-2 logarithm of x. ACE_NAMESPACE_INLINE_FUNCTION double log2 (double x); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp index ad94993552529..6ede903602652 100644 --- a/ACE/ace/OS_NS_netdb.cpp +++ b/ACE/ace/OS_NS_netdb.cpp @@ -34,12 +34,6 @@ # include "ace/Malloc_Base.h" #endif -// Include if_arp so that getmacaddr can use the -// arp structure. -#if defined (sun) -# include /**/ -#endif - #include ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -49,7 +43,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) { ACE_OS_TRACE ("ACE_OS::getmacaddress"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) # if !defined (ACE_HAS_PHARLAP) /** Define a structure for use with the netbios routine */ struct ADAPTERSTAT @@ -131,58 +125,6 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_PHARLAP_RT */ # endif /* ACE_HAS_PHARLAP */ -#elif defined (sun) - - /** obtain the local host name */ - char hostname [MAXHOSTNAMELEN]; - ACE_OS::hostname (hostname, sizeof (hostname)); - - /** Get the hostent to use with ioctl */ - struct hostent *phost = - ACE_OS::gethostbyname (hostname); - - if (phost == 0) - return -1; - - ACE_HANDLE handle = - ACE_OS::socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); - - if (handle == ACE_INVALID_HANDLE) - return -1; - - char **paddrs = phost->h_addr_list; - - struct arpreq ar; - - struct sockaddr_in *psa = - (struct sockaddr_in *)&(ar.arp_pa); - - ACE_OS::memset (&ar, - 0, - sizeof (struct arpreq)); - - psa->sin_family = AF_INET; - - ACE_OS::memcpy (&(psa->sin_addr), - *paddrs, - sizeof (struct in_addr)); - - if (ACE_OS::ioctl (handle, - SIOCGARP, - &ar) == -1) - { - ACE_OS::close (handle); - return -1; - } - - ACE_OS::close (handle); - - ACE_OS::memcpy (node->node, - ar.arp_ha.sa_data, - 6); - - return 0; - #elif defined (ACE_LINUX) && !defined (ACE_LACKS_NETWORKING) // It's easiest to know the first MAC-using interface. Use the BSD @@ -563,7 +505,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL int -ACE_OS::netdb_acquire (void) +ACE_OS::netdb_acquire () { return ACE_OS::thread_mutex_lock ((ACE_thread_mutex_t *) ACE_OS_Object_Manager::preallocated_object[ @@ -571,7 +513,7 @@ ACE_OS::netdb_acquire (void) } int -ACE_OS::netdb_release (void) +ACE_OS::netdb_release () { return ACE_OS::thread_mutex_unlock ((ACE_thread_mutex_t *) ACE_OS_Object_Manager::preallocated_object[ diff --git a/ACE/ace/OS_NS_netdb.h b/ACE/ace/OS_NS_netdb.h index d08d2711d3023..bcf82cf22bc61 100644 --- a/ACE/ace/OS_NS_netdb.h +++ b/ACE/ace/OS_NS_netdb.h @@ -34,7 +34,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION struct hostent *gethostbyaddr (const char *addr, int length, @@ -135,10 +134,10 @@ namespace ACE_OS # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) extern ACE_Export - int netdb_acquire (void); + int netdb_acquire (); extern ACE_Export - int netdb_release (void); + int netdb_release (); # endif /* defined (ACE_MT_SAFE) && ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ } /* namespace ACE_OS */ diff --git a/ACE/ace/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl index ad67751c875c8..0bedbe2a2d03b 100644 --- a/ACE/ace/OS_NS_netdb.inl +++ b/ACE/ace/OS_NS_netdb.inl @@ -4,7 +4,7 @@ #include "ace/OS_NS_errno.h" #if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) -# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && !defined (HPUX_11) +# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \ do \ { \ @@ -22,7 +22,7 @@ return ace_result_; \ } \ } while(0) -# else /* ! (ACE_MT_SAFE && ACE_MT_SAFE != 0 && !HPUX_11) */ +# else /* ! (ACE_MT_SAFE && ACE_MT_SAFE != 0) */ # define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \ do \ { \ @@ -53,7 +53,7 @@ ACE_OS::gethostbyaddr (const char *addr, int length, int type) if (0 == addr || '\0' == addr[0]) return 0; -# if defined (ACE_VXWORKS) +# if defined (ACE_VXWORKS_HAS_GETHOSTBYADDR_REENTRANT) // VxWorks 6.x has a gethostbyaddr() that is threadsafe and // returns an heap-allocated hostentry structure. // just call ACE_OS::gethostbyaddr_r () which knows how to handle this. @@ -104,20 +104,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, if (0 == addr || '\0' == addr[0]) return 0; -# if defined (AIX) - ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); - - //FUZZ: disable check_for_lack_ACE_OS - if (::gethostbyaddr_r ((char *) addr, length, type, result, - (struct hostent_data *) buffer)== 0) - return result; - //FUZZ: enable check_for_lack_ACE_OS - else - { - *h_errnop = h_errno; - return (struct hostent *) 0; - } -# elif defined (__GLIBC__) +# if defined (__GLIBC__) // GNU C library has a different signature ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); @@ -134,7 +121,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, //FUZZ: enable check_for_lack_ACE_OS else return (struct hostent *) 0; -# elif defined (ACE_VXWORKS) +# elif defined (ACE_VXWORKS_HAS_GETHOSTBYADDR_REENTRANT) ACE_UNUSED_ARG (h_errnop); // VxWorks 6.x has a threadsafe gethostbyaddr() which returns a heap-allocated // data structure which needs to be freed with hostentFree() @@ -199,7 +186,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, struct hostent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) */ +# endif /* defined (__GLIBC__) */ # elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); @@ -238,10 +225,12 @@ ACE_OS::gethostbyname (const char *name) if (0 == name || '\0' == name[0]) return 0; -# if defined (ACE_VXWORKS) +# if defined (ACE_VXWORKS_HAS_GETHOSTBYNAME_REENTRANT) // VxWorks 6.x has a gethostbyname() that is threadsafe and // returns an heap-allocated hostentry structure. // just call ACE_OS::gethostbyname_r () which knows how to handle this. + // With VxWorks 7 it depends on the GETHOSTBYNAME_REENTRANT + // define struct hostent hentry; ACE_HOSTENT_DATA buf; int h_error; // Not the same as errno! @@ -281,29 +270,7 @@ ACE_OS::gethostbyname_r (const char *name, if (0 == name || '\0' == name[0]) return (struct hostent *)0; -# if (defined (ACE_AIX_MINOR_VERS) && (ACE_AIX_MINOR_VERS > 2)) - ACE_UNUSED_ARG (result); - ACE_UNUSED_ARG (buffer); - ACE_UNUSED_ARG (h_errnop); - - // gethostbyname returns thread-specific storage on Digital Unix and - // AIX 4.3 - //FUZZ: disable check_for_lack_ACE_OS - ACE_SOCKCALL_RETURN (::gethostbyname (name), struct hostent *, 0); - //FUZZ: enable check_for_lack_ACE_OS -# elif defined (AIX) - ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); - - //FUZZ: disable check_for_lack_ACE_OS - if (::gethostbyname_r (name, result, (struct hostent_data *) buffer) == 0) - return result; - //FUZZ: enable check_for_lack_ACE_OS - else - { - *h_errnop = h_errno; - return (struct hostent *) 0; - } -# elif defined (__GLIBC__) +# if defined (__GLIBC__) // GNU C library has a different signature ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); @@ -318,10 +285,11 @@ ACE_OS::gethostbyname_r (const char *name, //FUZZ: enable check_for_lack_ACE_OS else return (struct hostent *) 0; -# elif defined (ACE_VXWORKS) +# elif defined (ACE_VXWORKS_HAS_GETHOSTBYNAME_REENTRANT) ACE_UNUSED_ARG (h_errnop); // VxWorks 6.x has a threadsafe gethostbyname() which returns a heap-allocated // data structure which needs to be freed with hostentFree() + // With VxWorks 7 it depends on the GETHOSTBYNAME_REENTRANT macro //FUZZ: disable check_for_lack_ACE_OS struct hostent* hp = ::gethostbyname (name); //FUZZ: enable check_for_lack_ACE_OS @@ -363,7 +331,7 @@ ACE_OS::gethostbyname_r (const char *name, } else { - return (struct hostent *) 0; + return nullptr; } # else # if defined(ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) @@ -383,7 +351,7 @@ ACE_OS::gethostbyname_r (const char *name, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) */ +# endif /* defined (__GLIBC__) */ # elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); @@ -509,14 +477,7 @@ ACE_OS::getprotobyname_r (const char *name, ACE_UNUSED_ARG (buffer); ACE_NOTSUP_RETURN (0); #elif defined (ACE_HAS_REENTRANT_FUNCTIONS) -# if defined (AIX) - //FUZZ: disable check_for_lack_ACE_OS - if (::getprotobyname_r (name, result, (struct protoent_data *) buffer) == 0) - return result; - else - return 0; - //FUZZ: enable check_for_lack_ACE_OS -# elif defined (__GLIBC__) +#if defined (__GLIBC__) // GNU C library has a different signature //FUZZ: disable check_for_lack_ACE_OS if (::getprotobyname_r (name, @@ -545,7 +506,7 @@ ACE_OS::getprotobyname_r (const char *name, struct protoent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) */ +# endif /* defined (__GLIBC__) */ #elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); @@ -590,14 +551,7 @@ ACE_OS::getprotobynumber_r (int proto, ACE_UNUSED_ARG (buffer); ACE_NOTSUP_RETURN (0); #elif defined (ACE_HAS_REENTRANT_FUNCTIONS) -# if defined (AIX) - //FUZZ: disable check_for_lack_ACE_OS - if (::getprotobynumber_r (proto, result, (struct protoent_data *) buffer) == 0) - return result; - //FUZZ: enable check_for_lack_ACE_OS - else - return 0; -# elif defined (__GLIBC__) +# if defined (__GLIBC__) // GNU C library has a different signature //FUZZ: disable check_for_lack_ACE_OS if (::getprotobynumber_r (proto, @@ -623,7 +577,7 @@ ACE_OS::getprotobynumber_r (int proto, struct protoent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) */ +# endif /* defined (__GLIBC__) */ #else ACE_UNUSED_ARG (buffer); ACE_UNUSED_ARG (result); @@ -674,16 +628,7 @@ ACE_OS::getservbyname_r (const char *svc, ACE_UNUSED_ARG (buf); ACE_NOTSUP_RETURN (0); #elif defined (ACE_HAS_REENTRANT_FUNCTIONS) -# if defined (AIX) - ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); - - //FUZZ: disable check_for_lack_ACE_OS - if (::getservbyname_r (svc, proto, result, (struct servent_data *) buf) == 0) - return result; - //FUZZ: enable check_for_lack_ACE_OS - else - return (struct servent *) 0; -# elif defined (__GLIBC__) +# if defined (__GLIBC__) // GNU C library has a different signature ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); @@ -713,7 +658,7 @@ ACE_OS::getservbyname_r (const char *svc, struct servent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) */ +# endif /* defined (__GLIBC__) */ #elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (result); @@ -735,7 +680,6 @@ ACE_OS::getservbyname_r (const char *svc, #endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */ } - ACE_INLINE int ACE_OS::getaddrinfo (const char *name, const char *service, const addrinfo *hints, addrinfo **result) diff --git a/ACE/ace/OS_NS_poll.h b/ACE/ace/OS_NS_poll.h index a4f21d62f494f..75291a0e15584 100644 --- a/ACE/ace/OS_NS_poll.h +++ b/ACE/ace/OS_NS_poll.h @@ -35,7 +35,6 @@ class ACE_Time_Value; namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int poll (struct pollfd *pollfds, unsigned long len, @@ -45,7 +44,6 @@ namespace ACE_OS int poll (struct pollfd *pollfds, unsigned long len, const ACE_Time_Value &tv); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl index 3353f649469cb..74eae66e5171e 100644 --- a/ACE/ace/OS_NS_pwd.inl +++ b/ACE/ace/OS_NS_pwd.inl @@ -48,14 +48,6 @@ ACE_OS::getpwnam_r (const char *name, ACE_UNUSED_ARG (bufsize); ACE_UNUSED_ARG (result); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_HAS_STHREADS) - if (::getpwnam_r (name, pwd, buffer, bufsize) != 0) - { - *result = 0; - return -1; - } - *result = pwd; - return 0; #else return ::getpwnam_r (name, pwd, buffer, bufsize, result); #endif /* ACE_LACKS_PWD_FUNCTIONS */ diff --git a/ACE/ace/OS_NS_regex.h b/ACE/ace/OS_NS_regex.h index cffd6c9436181..57e6fe0cf6191 100644 --- a/ACE/ace/OS_NS_regex.h +++ b/ACE/ace/OS_NS_regex.h @@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - // non=standard.. //@{ @name A set of wrappers for regular expressions. ACE_NAMESPACE_INLINE_FUNCTION diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h index 1fb6ca3b11490..809920dfa3cf7 100644 --- a/ACE/ace/OS_NS_signal.h +++ b/ACE/ace/OS_NS_signal.h @@ -141,7 +141,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef struct sigaction ACE_SIGACTION; namespace ACE_OS { - //@{ @name A set of wrappers for Signals. ACE_NAMESPACE_INLINE_FUNCTION diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl index 8317bf3b6b8ac..5211a0730e286 100644 --- a/ACE/ace/OS_NS_signal.inl +++ b/ACE/ace/OS_NS_signal.inl @@ -56,7 +56,7 @@ sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa) ACE_OS_TRACE ("ACE_OS::sigaction"); if (signum == 0) return 0; -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) struct sigaction sa; if (osa == 0) @@ -78,7 +78,7 @@ sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa) return ::sigaction (signum, const_cast (nsa), osa); #else return ::sigaction (signum, nsa, osa); -#endif /* ACE_WIN32 !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } ACE_INLINE int @@ -189,15 +189,16 @@ signal (int signum, ACE_SignalHandler func) if (signum == 0) return 0; else -#if (defined ACE_WIN32 && !defined ACE_HAS_WINCE) || \ + { +#if (defined ACE_WIN32) || \ (!defined ACE_LACKS_UNIX_SIGNALS && !defined ACE_LACKS_SIGNAL) - return ::signal (signum, func); + return ::signal (signum, func); #else - // @@ WINCE: Don't know how to implement signal on WinCE (yet.) - ACE_UNUSED_ARG (signum); - ACE_UNUSED_ARG (func); - ACE_NOTSUP_RETURN (0); // Should return SIG_ERR but it is not defined on WinCE. -#endif /* defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) || !defined (ACE_LACKS_UNIX_SIGNALS) */ + ACE_UNUSED_ARG (signum); + ACE_UNUSED_ARG (func); + ACE_NOTSUP_RETURN (0); // Should return SIG_ERR but maybe not defined on all platforms +#endif /* defined (ACE_WIN32) || !defined (ACE_LACKS_UNIX_SIGNALS) */ + } } ACE_INLINE int diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp index 0eba78f34c679..76db871d18de3 100644 --- a/ACE/ace/OS_NS_stdio.cpp +++ b/ACE/ace/OS_NS_stdio.cpp @@ -26,7 +26,7 @@ ACE_TEXT_OSVERSIONINFO ACE_OS::win32_versioninfo_; HINSTANCE ACE_OS::win32_resource_module_; ACE_END_VERSIONED_NAMESPACE_DECL -# if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1) && !defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1) // This function is called by the OS when the ACE DLL is loaded. We // use it to determine the default module containing ACE's resources. extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID) @@ -51,7 +51,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - void ace_flock_t::dump () const { @@ -87,7 +86,7 @@ ace_flock_t::dump () const /*****************************************************************************/ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) namespace { /// Translate fopen's mode char to open's mode. This helper function diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h index 0336645831534..3d592c526f736 100644 --- a/ACE/ace/OS_NS_stdio.h +++ b/ACE/ace/OS_NS_stdio.h @@ -27,12 +27,11 @@ #include "ace/os_include/os_errno.h" #include /**/ "ace/ACE_export.h" -/* OPENVMS needs unistd for cuserid() */ -#if defined (CYGWIN32) || defined (ACE_OPENVMS) +#if defined (CYGWIN32) # include "ace/os_include/os_unistd.h" -#endif /* CYGWIN32 || ACE_OPENVMS */ +#endif /* CYGWIN32 */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) # include "io.h" #endif @@ -135,10 +134,9 @@ inline char *ace_cuserid(char *user) #endif /* !ACE_LACKS_CUSERID && !ACE_HAS_ALT_CUSERID && ... */ # if defined (ACE_LACKS_FILELOCKS) -# if ! defined (ACE_VXWORKS) && ! defined (ACE_HAS_RTEMS) && !defined (INTEGRITY) +# if ! defined (ACE_VXWORKS) && !defined (INTEGRITY) // VxWorks defines struct flock in sys/fcntlcom.h. But it doesn't -// appear to support flock (). RTEMS defines struct flock but -// currently does not support locking. +// appear to support flock (). struct flock { short l_type; @@ -155,7 +153,6 @@ struct flock ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - /** * @class ace_flock_t * @@ -300,7 +297,7 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION ACE_HANDLE fileno (FILE *stream); -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) extern ACE_Export #else ACE_NAMESPACE_INLINE_FUNCTION @@ -308,19 +305,19 @@ namespace ACE_OS { FILE *fopen (const char *filename, const char *mode); #if defined (ACE_HAS_WCHAR) -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) extern ACE_Export #else ACE_NAMESPACE_INLINE_FUNCTION #endif /* ACE_WIN32 */ FILE *fopen (const char *filename, const wchar_t *mode); -# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +# if defined (ACE_WIN32) extern ACE_Export # else ACE_NAMESPACE_INLINE_FUNCTION # endif /* ACE_WIN32 */ FILE *fopen (const wchar_t *filename, const wchar_t *mode); -# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +# if defined (ACE_WIN32) extern ACE_Export # else ACE_NAMESPACE_INLINE_FUNCTION @@ -340,14 +337,14 @@ namespace ACE_OS { // = Win32 OS version determination function. /// Return the win32 OSVERSIONINFO structure. ACE_NAMESPACE_INLINE_FUNCTION - const ACE_TEXT_OSVERSIONINFO &get_win32_versioninfo (void); + const ACE_TEXT_OSVERSIONINFO &get_win32_versioninfo (); // = A pair of functions for modifying ACE's Win32 resource usage. /// Return the handle of the module containing ACE's resources. By /// default, for a DLL build of ACE this is a handle to the ACE DLL /// itself, and for a static build it is a handle to the executable. ACE_NAMESPACE_INLINE_FUNCTION - HINSTANCE get_win32_resource_module (void); + HINSTANCE get_win32_resource_module (); /// Allow an application to modify which module contains ACE's /// resources. This is mainly useful for a static build of ACE where diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index b97adfdbbc9d3..6066165912e23 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -364,7 +364,7 @@ ACE_OS::cuserid (char *user, size_t maxlen) ::remCurIdGet (user, 0); return user; } -#elif defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) +#elif defined (ACE_HAS_PHARLAP) ACE_UNUSED_ARG (user); ACE_UNUSED_ARG (maxlen); ACE_NOTSUP_RETURN (0); @@ -458,11 +458,7 @@ ACE_OS::cuserid (char *user, size_t maxlen) ACE_INLINE wchar_t * ACE_OS::cuserid (wchar_t *user, size_t maxlen) { -# if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (user); - ACE_UNUSED_ARG (maxlen); - ACE_NOTSUP_RETURN (0); -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) BOOL const result = GetUserNameW (user, (u_long *) &maxlen); if (result == FALSE) ACE_FAIL_RETURN (0); @@ -499,13 +495,7 @@ ACE_INLINE FILE * ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) { ACE_OS_TRACE ("ACE_OS::fdopen"); -#if defined (ACE_HAS_WINCE) -# if defined (ACE_HAS_NONCONST_WFDOPEN) - return ::_wfdopen ((int)handle, const_cast (ACE_TEXT_ALWAYS_WCHAR (mode))); -# else - return ::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode)); -# endif -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) // kernel file handle -> FILE* conversion... // Options: _O_APPEND, _O_RDONLY and _O_TEXT are lost @@ -534,7 +524,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) ACE_NOTSUP_RETURN (0); #else return ::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode)); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } ACE_INLINE int @@ -612,7 +602,7 @@ ACE_OS::fileno (FILE *stream) #endif } -#if !(defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if !defined (ACE_WIN32) // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. ACE_INLINE FILE * ACE_OS::fopen (const char *filename, const char *mode) @@ -636,28 +626,20 @@ ACE_INLINE FILE * ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); -#if defined (ACE_HAS_WINCE) - return ::_wfopen (filename, mode); -#else // Non-Windows doesn't use wchar_t file systems. ACE_Wide_To_Ascii n_filename (filename); ACE_Wide_To_Ascii n_mode (mode); return ::fopen (n_filename.char_rep (), n_mode.char_rep ()); -#endif /* ACE_HAS_WINCE */ } + // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. ACE_INLINE FILE * ACE_OS::fopen (const wchar_t *filename, const char *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); -#if defined (ACE_HAS_WINCE) - ACE_Ascii_To_Wide n_mode (mode); - return ::_wfopen (filename, n_mode.wchar_rep ()); -#else // Non-Windows doesn't use wchar_t file systems. ACE_Wide_To_Ascii n_filename (filename); return ::fopen (n_filename.char_rep (), mode); -#endif /* ACE_HAS_WINCE */ } #endif /* ACE_HAS_WCHAR */ @@ -803,7 +785,7 @@ ACE_OS::perror (const char *s) ACE_UNUSED_ARG (s); #else ::perror (s); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_LACKS_PERROR */ } #if defined (ACE_HAS_WCHAR) @@ -859,13 +841,6 @@ ACE_OS::rename (const char *old_name, ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_WINCE) - // Win CE is always wide-char. - ACE_UNUSED_ARG (flags); - if (0 == ::MoveFile (ACE_TEXT_CHAR_TO_TCHAR (old_name), - ACE_TEXT_CHAR_TO_TCHAR (new_name))) - ACE_FAIL_RETURN (-1); - return 0; # elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) // NT4 (and up) provides a way to rename/move a file with similar semantics // to what's usually done on UNIX - if there's an existing file with @@ -881,7 +856,7 @@ ACE_OS::rename (const char *old_name, # else ACE_UNUSED_ARG (flags); return ::rename (old_name, new_name); -# endif /* ACE_HAS_WINCE */ +# endif /* ACE_LACKS_RENAME */ } #if defined (ACE_HAS_WCHAR) @@ -895,11 +870,6 @@ ACE_OS::rename (const wchar_t *old_name, ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (flags); - if (::MoveFileW (old_name, new_name) == 0) - ACE_FAIL_RETURN (-1); - return 0; # elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) // NT4 (and up) provides a way to rename/move a file with similar semantics // to what's usually done on UNIX - if there's an existing file with @@ -917,14 +887,14 @@ ACE_OS::rename (const wchar_t *old_name, ACE_Wide_To_Ascii nold_name (old_name); ACE_Wide_To_Ascii nnew_name (new_name); return ACE_OS::rename (nold_name.char_rep (), nnew_name.char_rep (), flags); -# endif /* ACE_HAS_WINCE */ +# endif /* ACE_LACKS_RENAME */ } #endif /* ACE_HAS_WCHAR */ ACE_INLINE void ACE_OS::rewind (FILE *fp) { -#if !defined (ACE_HAS_WINCE) && !defined (ACE_MQX) +#if !defined (ACE_MQX) ACE_OS_TRACE ("ACE_OS::rewind"); # if defined (ACE_LACKS_REWIND) ACE_UNUSED_ARG (fp); @@ -933,9 +903,9 @@ ACE_OS::rewind (FILE *fp) # endif /* ACE_LACKS_REWIND */ #else // This isn't perfect since it doesn't reset EOF, but it's probably - // the closest we can get on WINCE. + // the closest we can get on MQX. (void) std::fseek (fp, 0L, SEEK_SET); -#endif /* ACE_HAS_WINCE */ +#endif /* !ACE_MQX */ } #if !defined (ACE_DISABLE_TEMPNAM) @@ -1098,9 +1068,8 @@ ACE_INLINE int ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) { # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ - (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ defined (ACE_HAS_VSWPRINTF) || \ - (defined (_MSC_VER) && !defined (ACE_HAS_WINCE)) + (defined (_MSC_VER)) // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a // maxlen argument. Since this method doesn't supply one, pass in @@ -1178,10 +1147,8 @@ ACE_INLINE int ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_list ap) { # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ - (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ defined (ACE_HAS_VSWPRINTF) || \ defined (ACE_WIN32) - int result; # if defined (ACE_WIN32) && !defined (ACE_HAS_C99_VSNWPRINTF) diff --git a/ACE/ace/OS_NS_stdlib.cpp b/ACE/ace/OS_NS_stdlib.cpp index 7caa1a5058d06..1bef126ab39ec 100644 --- a/ACE/ace/OS_NS_stdlib.cpp +++ b/ACE/ace/OS_NS_stdlib.cpp @@ -37,13 +37,7 @@ ACE_EXIT_HOOK ACE_OS::exit_hook_ = 0; void * ACE_OS::calloc (size_t elements, size_t sizeof_elements) { -#if !defined (ACE_HAS_WINCE) return ACE_CALLOC_FUNC (elements, sizeof_elements); -#else - // @@ This will probably not work since it doesn't consider - // alignment properly. - return ACE_MALLOC_FUNC (elements * sizeof_elements); -#endif /* ACE_HAS_WINCE */ } void @@ -51,13 +45,13 @@ ACE_OS::exit (int status) { ACE_OS_TRACE ("ACE_OS::exit"); -#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER) +#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER) // Shut down the ACE_Object_Manager, if it had registered its exit_hook. // With ACE_HAS_NONSTATIC_OBJECT_MANAGER, the ACE_Object_Manager is // instantiated on the main's stack. ::exit () doesn't destroy it. if (exit_hook_) (*exit_hook_) (); -#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ +#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ #if defined (ACE_WIN32) ::ExitProcess ((UINT) status); @@ -90,9 +84,7 @@ ACE_OS::free (void *ptr) ACE_TCHAR * ACE_OS::getenvstrings () { -#if defined (ACE_LACKS_GETENVSTRINGS) - ACE_NOTSUP_RETURN (0); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) return ::GetEnvironmentStringsW (); # else /* ACE_USES_WCHAR */ @@ -110,13 +102,6 @@ ACE_OS::getenvstrings () ACE_TCHAR * ACE_OS::strenvdup (const ACE_TCHAR *str) { -#if defined (ACE_HAS_WINCE) - // WinCE doesn't have environment variables so we just skip it. - return ACE_OS::strdup (str); -#elif defined (ACE_LACKS_STRENVDUP) - ACE_UNUSED_ARG (str); - ACE_NOTSUP_RETURN (0); -#else const ACE_TCHAR * start = 0; if ((start = ACE_OS::strchr (str, ACE_TEXT ('$'))) != 0) { @@ -135,20 +120,17 @@ ACE_OS::strenvdup (const ACE_TCHAR *str) size_t buf_len = ACE_OS::strlen (str) + 1; if (temp != 0) buf_len += ACE_OS::strlen (temp) - var_len; - ACE_TCHAR * buf_p = buf; - if (buf_len > ACE_DEFAULT_ARGV_BUFSIZ) - { - buf_p = + ACE_TCHAR * buf_p = #if defined (ACE_HAS_ALLOC_HOOKS) - (ACE_TCHAR *) ACE_Allocator::instance()->malloc (buf_len * sizeof (ACE_TCHAR)); + (ACE_TCHAR *) ACE_Allocator::instance()->malloc (buf_len * sizeof (ACE_TCHAR)); #else - (ACE_TCHAR *) ACE_OS::malloc (buf_len * sizeof (ACE_TCHAR)); + (ACE_TCHAR *) ACE_OS::malloc (buf_len * sizeof (ACE_TCHAR)); #endif /* ACE_HAS_ALLOC_HOOKS */ - if (buf_p == 0) - { - errno = ENOMEM; - return 0; - } + + if (buf_p == 0) + { + errno = ENOMEM; + return 0; } ACE_TCHAR * p = buf_p; size_t const len = start - str; @@ -169,11 +151,10 @@ ACE_OS::strenvdup (const ACE_TCHAR *str) *p = ACE_TEXT ('\0'); } ACE_OS::strcpy (p, &start[var_len]); - return (buf_p == buf) ? ACE_OS::strdup (buf) : buf_p; + return buf_p; } else return ACE_OS::strdup (str); -#endif /* ACE_HAS_WINCE */ } #if !defined (ACE_HAS_ITOA) @@ -1124,7 +1105,7 @@ ACE_OS::mkstemp_emulation (ACE_TCHAR * s) static unsigned int const NUM_CHARS = 6; // Do not change! // Use ACE_Time_Value::msec(ACE_UINT64&) as opposed to - // ACE_Time_Value::msec(void) to avoid truncation. + // ACE_Time_Value::msec() to avoid truncation. ACE_UINT64 msec; // Use a const ACE_Time_Value to resolve ambiguity between diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index 673d8425d4aa0..bfa3ecb58f20d 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -91,7 +91,6 @@ inline int ace_rand_r_helper (unsigned *seed) ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - /** @name Non-standard functions * * These functions aren't in the standard. diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index b76ee71c5bd7e..d40c139c86097 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -19,8 +19,6 @@ ACE_OS::_exit (int status) ACE_OS_TRACE ("ACE_OS::_exit"); #if defined (ACE_VXWORKS) ::exit (status); -#elif defined (ACE_HAS_WINCE) - ::TerminateProcess (::GetCurrentProcess (), status); #elif defined (ACE_MQX) _mqx_exit (status); #elif !defined (ACE_LACKS__EXIT) @@ -110,12 +108,6 @@ ACE_OS::atop (const char *s) ACE_TRACE ("ACE_OS::atop"); #if defined (ACE_WIN64) intptr_t ip = ::_atoi64 (s); -#elif defined (ACE_OPENVMS) -# if !defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64) - int ip = ::atoi (s); -# else - intptr_t ip = ::atoi (s); -# endif #else intptr_t ip = ::atoi (s); #endif /* ACE_WIN64 */ @@ -129,12 +121,6 @@ ACE_OS::atop (const wchar_t *s) { # if defined (ACE_WIN64) intptr_t ip = ::_wtoi64 (s); -# elif defined (ACE_OPENVMS) -# if !defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64) - int ip = ACE_OS::atoi (s); -# else - intptr_t ip = ACE_OS::atoi (s); -# endif # else intptr_t ip = ACE_OS::atoi (s); # endif /* ACE_WIN64 */ @@ -336,7 +322,7 @@ ACE_OS::putenv (const char *string) ACE_NOTSUP_RETURN (0); #elif defined (ACE_PUTENV_EQUIVALENT) return ACE_PUTENV_EQUIVALENT (const_cast (string)); -#else /* ! ACE_HAS_WINCE */ +#else return ACE_STD_NAMESPACE::putenv (const_cast (string)); #endif /* ACE_LACKS_PUTENV && ACE_HAS_SETENV */ } @@ -430,7 +416,7 @@ ACE_OS::rand_r (unsigned int *seed) # endif /* ACE_LACKS_RAND_R */ } -# if !defined (ACE_LACKS_REALPATH) +#if !defined (ACE_LACKS_REALPATH) ACE_INLINE char * ACE_OS::realpath (const char *file_name, char *resolved_name) @@ -462,7 +448,7 @@ ACE_OS::realpath (const wchar_t *file_name, # endif /* ! ACE_WIN32 */ } # endif /* ACE_HAS_WCHAR */ -#endif /* ACE_HAS_WINCE */ +#endif /* !ACE_LACKS_REALPATH */ ACE_INLINE ACE_EXIT_HOOK ACE_OS::set_exit_hook (ACE_EXIT_HOOK exit_hook) diff --git a/ACE/ace/OS_NS_string.h b/ACE/ace/OS_NS_string.h index a57539ace1442..0e7e3a662207a 100644 --- a/ACE/ace/OS_NS_string.h +++ b/ACE/ace/OS_NS_string.h @@ -33,7 +33,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - /** @name Functions from * * Included are the functions defined in and their @@ -42,7 +41,6 @@ namespace ACE_OS { * @todo To be complete, we should add strcoll, and strxfrm. */ //@{ - /// Finds characters in a buffer (const void version). ACE_NAMESPACE_INLINE_FUNCTION const void *memchr (const void *s, int c, size_t len); diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl index 94f0380ea4317..f58a30520bc19 100644 --- a/ACE/ace/OS_NS_string.inl +++ b/ACE/ace/OS_NS_string.inl @@ -403,8 +403,6 @@ ACE_OS::strstr (const wchar_t *s, const wchar_t *t) { # if defined (ACE_LACKS_WCSSTR) return ACE_OS::wcsstr_emulation (s, t); -# elif defined (HPUX) - return const_cast (::wcswcs (s, t)); # else /* ACE_LACKS_WCSSTR */ return const_cast (::wcsstr (s, t)); # endif /* ACE_LACKS_WCSSTR */ @@ -423,8 +421,6 @@ ACE_OS::strstr (wchar_t *s, const wchar_t *t) { # if defined (ACE_LACKS_WCSSTR) return ACE_OS::wcsstr_emulation (s, t); -# elif defined (HPUX) - return ::wcswcs (s, t); # else /* ACE_LACKS_WCSSTR */ return ::wcsstr (s, t); # endif /* ACE_LACKS_WCSSTR */ diff --git a/ACE/ace/OS_NS_strings.cpp b/ACE/ace/OS_NS_strings.cpp index d09d152fd2e58..964549785ad4a 100644 --- a/ACE/ace/OS_NS_strings.cpp +++ b/ACE/ace/OS_NS_strings.cpp @@ -1,7 +1,6 @@ #include "ace/OS_NS_strings.h" - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_strings.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/ACE/ace/OS_NS_strings.h b/ACE/ace/OS_NS_strings.h index 5da352220ba38..c57ca0573eaa8 100644 --- a/ACE/ace/OS_NS_strings.h +++ b/ACE/ace/OS_NS_strings.h @@ -35,7 +35,6 @@ class ACE_Time_Value; namespace ACE_OS { - /// Compares two strings (case insensitive const char version). ACE_NAMESPACE_INLINE_FUNCTION int strcasecmp (const char *s, const char *t); diff --git a/ACE/ace/OS_NS_stropts.cpp b/ACE/ace/OS_NS_stropts.cpp index bdcd3317c7f10..a3360172787d4 100644 --- a/ACE/ace/OS_NS_stropts.cpp +++ b/ACE/ace/OS_NS_stropts.cpp @@ -1,7 +1,5 @@ #include "ace/OS_NS_stropts.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_stropts.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/ACE/ace/OS_NS_stropts.h b/ACE/ace/OS_NS_stropts.h index 7b48d769b785b..dfcd6a9b30f7c 100644 --- a/ACE/ace/OS_NS_stropts.h +++ b/ACE/ace/OS_NS_stropts.h @@ -81,7 +81,6 @@ class ACE_Export ACE_Str_Buf : public strbuf class ACE_QoS; namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int getmsg (ACE_HANDLE handle, struct strbuf *ctl, @@ -148,7 +147,6 @@ namespace ACE_OS { const struct strbuf *data, int band, int flags); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_stropts.inl b/ACE/ace/OS_NS_stropts.inl index 547a80cb3d5b2..203e090a19d2b 100644 --- a/ACE/ace/OS_NS_stropts.inl +++ b/ACE/ace/OS_NS_stropts.inl @@ -13,11 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_LACKS_CONST_STRBUF_PTR) -typedef struct strbuf *ACE_STRBUF_TYPE; -#else typedef const struct strbuf *ACE_STRBUF_TYPE; -#endif /* ACE_LACKS_CONST_STRBUF_PTR */ ACE_INLINE ACE_Str_Buf::ACE_Str_Buf (void *b, int l, int max) diff --git a/ACE/ace/OS_NS_sys_mman.h b/ACE/ace/OS_NS_sys_mman.h index ffcd4df547cf8..fd155fa2b2bb5 100644 --- a/ACE/ace/OS_NS_sys_mman.h +++ b/ACE/ace/OS_NS_sys_mman.h @@ -35,7 +35,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - //@{ @name A set of wrappers for memory mapped files. ACE_NAMESPACE_INLINE_FUNCTION int madvise (caddr_t addr, @@ -76,7 +75,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int shm_unlink (const ACE_TCHAR *path); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl index 905b0b5e08adc..5ff514997b554 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -45,15 +45,6 @@ ACE_OS::mmap (void *addr, #endif /* !defined (ACE_WIN32) || defined (ACE_HAS_PHARLAP) */ #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) - -# if defined(ACE_HAS_WINCE) - ACE_UNUSED_ARG (addr); - if (ACE_BIT_ENABLED (flags, MAP_FIXED)) // not supported - { - errno = EINVAL; - return MAP_FAILED; - } -# else if (!ACE_BIT_ENABLED (flags, MAP_FIXED)) addr = 0; else if (addr == 0) // can not map to address 0 @@ -61,7 +52,6 @@ ACE_OS::mmap (void *addr, errno = EINVAL; return MAP_FAILED; } -# endif int nt_flags = 0; ACE_HANDLE local_handle = ACE_INVALID_HANDLE; @@ -72,14 +62,8 @@ ACE_OS::mmap (void *addr, if (ACE_BIT_ENABLED (flags, MAP_PRIVATE)) { -# if defined(ACE_HAS_WINCE) - // PAGE_WRITECOPY is not avaible on CE, but this should be the same - // as PAGE_READONLY according to MSDN - nt_flags = FILE_MAP_ALL_ACCESS; -# else prot = PAGE_WRITECOPY; nt_flags = FILE_MAP_COPY; -# endif // ACE_HAS_WINCE } else if (ACE_BIT_ENABLED (flags, MAP_SHARED)) { @@ -124,20 +108,12 @@ ACE_OS::mmap (void *addr, DWORD low_off = ACE_LOW_PART (off); DWORD high_off = ACE_HIGH_PART (off); -# if defined (ACE_HAS_WINCE) - void *addr_mapping = ::MapViewOfFile (*file_mapping, - nt_flags, - high_off, - low_off, - len); -# else void *addr_mapping = ::MapViewOfFileEx (*file_mapping, nt_flags, high_off, low_off, len, addr); -# endif /* ACE_HAS_WINCE */ // Only close this down if we used the temporary. if (file_mapping == &local_handle) @@ -154,11 +130,6 @@ ACE_OS::mmap (void *addr, flags |= ACE_OS_EXTRA_MMAP_FLAGS; # endif /* ACE_OS_EXTRA_MMAP_FLAGS */ ACE_UNUSED_ARG (file_mapping); -# if defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - ::fsync(file_handle); - //FUZZ: enable check_for_lack_ACE_OS -# endif //FUZZ: disable check_for_lack_ACE_OS ACE_OSCALL_RETURN ((void *) ::mmap ((ACE_MMAP_TYPE) addr, len, @@ -264,10 +235,6 @@ ACE_OS::shm_open (const ACE_TCHAR *filename, filename = buf; #endif return ::shm_open (ACE_TEXT_ALWAYS_CHAR(filename), mode, perms); -#elif defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - return ::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd")); - //FUZZ: enable check_for_lack_ACE_OS #else /* ! ACE_HAS_SHM_OPEN */ // Just use ::open. return ACE_OS::open (filename, mode, perms, sa); diff --git a/ACE/ace/OS_NS_sys_msg.h b/ACE/ace/OS_NS_sys_msg.h index aabf25768c230..69a8d83461759 100644 --- a/ACE/ace/OS_NS_sys_msg.h +++ b/ACE/ace/OS_NS_sys_msg.h @@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - //@{ @name A set of wrappers for System V message queues. ACE_NAMESPACE_INLINE_FUNCTION int msgctl (int msqid, diff --git a/ACE/ace/OS_NS_sys_resource.h b/ACE/ace/OS_NS_sys_resource.h index 9b4fbc999e1ea..8344b03dc53a3 100644 --- a/ACE/ace/OS_NS_sys_resource.h +++ b/ACE/ace/OS_NS_sys_resource.h @@ -33,7 +33,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int getrlimit (int resource, struct rlimit *rl); @@ -46,7 +45,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int setrlimit (int resource, const struct rlimit *rl); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_resource.inl b/ACE/ace/OS_NS_sys_resource.inl index dad59017602b9..ede0171928b63 100644 --- a/ACE/ace/OS_NS_sys_resource.inl +++ b/ACE/ace/OS_NS_sys_resource.inl @@ -31,11 +31,6 @@ ACE_OS::getrusage (int who, struct rusage *ru) #if defined (ACE_HAS_GETRUSAGE) # if defined (ACE_WIN32) ACE_UNUSED_ARG (who); - -# if defined (ACE_LACKS_GETPROCESSTIMES) - ACE_UNUSED_ARG (ru); - ACE_NOTSUP_RETURN (-1); -# else FILETIME dummy_1; FILETIME dummy_2; ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetProcessTimes (::GetCurrentProcess(), @@ -45,7 +40,6 @@ ACE_OS::getrusage (int who, struct rusage *ru) &ru->ru_utime), ace_result_), int, -1); -# endif /* ACE_LACKS_WIN32_GETPROCESSTIMES */ # else # if defined (ACE_HAS_RUSAGE_WHO_ENUM) return ::getrusage ((ACE_HAS_RUSAGE_WHO_ENUM) who, ru); diff --git a/ACE/ace/OS_NS_sys_select.h b/ACE/ace/OS_NS_sys_select.h index 807cdbab7f78f..d1e74768677e8 100644 --- a/ACE/ace/OS_NS_sys_select.h +++ b/ACE/ace/OS_NS_sys_select.h @@ -56,7 +56,6 @@ namespace ACE_OS fd_set *wfds, fd_set *efds, const ACE_Time_Value &tv); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_sendfile.cpp b/ACE/ace/OS_NS_sys_sendfile.cpp index a47fce717fdde..6b744fd8ad188 100644 --- a/ACE/ace/OS_NS_sys_sendfile.cpp +++ b/ACE/ace/OS_NS_sys_sendfile.cpp @@ -1,9 +1,9 @@ #include "ace/OS_NS_sys_sendfile.h" #include "ace/OS_NS_sys_mman.h" -#if defined (ACE_WIN32) || defined (HPUX) +#if defined (ACE_WIN32) # include "ace/OS_NS_sys_socket.h" -#endif /* ACE_WIN32 || HPUX */ +#endif /* ACE_WIN32 */ #include "ace/OS_NS_unistd.h" @@ -50,7 +50,7 @@ ACE_OS::sendfile_emulation (ACE_HANDLE out_fd, else if (buf == MAP_FAILED) return -1; -#if defined (ACE_WIN32) || defined (HPUX) +#if defined (ACE_WIN32) ssize_t const r = ACE_OS::send (out_fd, static_cast (buf), count); #else diff --git a/ACE/ace/OS_NS_sys_socket.cpp b/ACE/ace/OS_NS_sys_socket.cpp index e7a6a0647bbd1..0661b44b2b5c2 100644 --- a/ACE/ace/OS_NS_sys_socket.cpp +++ b/ACE/ace/OS_NS_sys_socket.cpp @@ -104,19 +104,12 @@ ACE_OS::socket_init (int version_high, int version_low) int error = WSAStartup (version_requested, &wsa_data); if (error != 0) -# if defined (ACE_HAS_WINCE) { - ACE_TCHAR fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d"); - ACE_TCHAR buf[80]; // @@ Eliminate magic number. - ACE_OS::snprintf (buf, 80, fmt, ACE_TEXT ("WSAStartup %d"), error); - ::MessageBox (0, buf, ACE_TEXT ("WSAStartup failed!"), MB_OK); + ACE_OS::fprintf (stderr, + "ACE_OS::socket_init; WSAStartup failed, " + "WSAGetLastError returned %d\n", + error); } -# else - ACE_OS::fprintf (stderr, - "ACE_OS::socket_init; WSAStartup failed, " - "WSAGetLastError returned %d\n", - error); -# endif /* ACE_HAS_WINCE */ ACE_OS::socket_initialized_ = 1; } @@ -136,17 +129,10 @@ ACE_OS::socket_fini () if (WSACleanup () != 0) { int error = ::WSAGetLastError (); -# if defined (ACE_HAS_WINCE) - ACE_TCHAR fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d"); - ACE_TCHAR buf[80]; // @@ Eliminate magic number. - ACE_OS::snprintf (buf, 80, fmt, ACE_TEXT ("WSACleanup %d"), error); - ::MessageBox (0, buf , ACE_TEXT ("WSACleanup failed!"), MB_OK); -# else ACE_OS::fprintf (stderr, "ACE_OS::socket_fini; WSACleanup failed, " "WSAGetLastError returned %d\n", error); -# endif /* ACE_HAS_WINCE */ } ACE_OS::socket_initialized_ = 0; } diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h index 27218a44dd9bb..17ef39ac53023 100644 --- a/ACE/ace/OS_NS_sys_socket.h +++ b/ACE/ace/OS_NS_sys_socket.h @@ -75,7 +75,6 @@ class ACE_QoS_Params; namespace ACE_OS { - # if defined (ACE_WIN32) /// Keeps track of whether we've already initialized WinSock... extern ACE_Export int socket_initialized_; @@ -315,7 +314,6 @@ namespace ACE_OS int type, int protocol, ACE_HANDLE sv[2]); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h index cac80f04e01a9..3891f716b2644 100644 --- a/ACE/ace/OS_NS_sys_stat.h +++ b/ACE/ace/OS_NS_sys_stat.h @@ -37,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef struct stati64 ACE_stat; # define ACE_STAT_FUNC_NAME ::_stati64 # define ACE_WSTAT_FUNC_NAME ::_wstati64 -# elif !defined (ACE_HAS_WINCE) && defined (_MSC_VER) +# elif defined (_MSC_VER) typedef struct _stat64 ACE_stat; # define ACE_STAT_FUNC_NAME ::_stat64 # define ACE_WSTAT_FUNC_NAME ::_wstat64 @@ -52,7 +52,7 @@ typedef struct stat ACE_stat; # endif /**/ # else // Default file offset case. -# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +# if defined (ACE_WIN32) typedef struct _stat ACE_stat; # define ACE_STAT_FUNC_NAME ::_stat # define ACE_WSTAT_FUNC_NAME ::_wstat @@ -65,7 +65,6 @@ typedef struct stat ACE_stat; namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION ACE_HANDLE creat (const ACE_TCHAR *filename, mode_t mode); @@ -118,7 +117,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION mode_t umask (mode_t cmask); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl index 080108478e21a..aa78327a19283 100644 --- a/ACE/ace/OS_NS_sys_stat.inl +++ b/ACE/ace/OS_NS_sys_stat.inl @@ -28,12 +28,7 @@ namespace ACE_OS fstat (ACE_HANDLE handle, ACE_stat *stp) { ACE_OS_TRACE ("ACE_OS::fstat"); -#if defined (ACE_HAS_X86_STAT_MACROS) - // Solaris for intel uses an macro for fstat(), this is a wrapper - // for _fxstat() use of the macro. - // causes compile and runtime problems. - return ::_fxstat (_STAT_VER, handle, stp); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) BY_HANDLE_FILE_INFORMATION fdata; if (::GetFileInformationByHandle (handle, &fdata) == FALSE) @@ -71,13 +66,8 @@ namespace ACE_OS #elif defined (ACE_MQX) return MQX_Filesystem::inst ().fstat (handle, stp); #else -# if defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - ::fsync(handle); - //FUZZ: enable check_for_lack_ACE_OS -# endif return ::fstat (handle, stp); -#endif /* !ACE_HAS_X86_STAT_MACROS */ +#endif /* !ACE_WIN32 */ } // This function returns the number of bytes in the file referenced by @@ -135,11 +125,7 @@ namespace ACE_OS ACE_OS_TRACE ("ACE_OS::lstat"); # if defined (ACE_LACKS_LSTAT) return ACE_OS::stat (file, stp); -# elif defined (ACE_HAS_X86_STAT_MACROS) - // Solaris for intel uses an macro for lstat(), this macro is a - // wrapper for _lxstat(). - return ::_lxstat (_STAT_VER, file, stp); -# else /* !ACE_HAS_X86_STAT_MACROS */ +# else /* !ACE_LACKS_LSTAT */ return ::lstat (file, stp); # endif /* ACE_LACKS_LSTAT */ } @@ -160,12 +146,7 @@ namespace ACE_OS ACE_INLINE int mkdir (const char *path, mode_t mode) { -#if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (mode); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_CHAR_TO_TCHAR (path), 0), - ace_result_), - int, -1); -#elif defined (ACE_MKDIR_LACKS_MODE) +#if defined (ACE_MKDIR_LACKS_MODE) ACE_UNUSED_ARG (mode); # if defined (ACE_MKDIR_EQUIVALENT) return ACE_MKDIR_EQUIVALENT (path); @@ -182,17 +163,12 @@ namespace ACE_OS ACE_INLINE int mkdir (const wchar_t *path, mode_t mode) { -#if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (mode); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (CreateDirectoryW (path, 0), - ace_result_), - int, -1); -#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) +#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_UNUSED_ARG (mode); return ::_wmkdir (path); #else return ACE_OS::mkdir (ACE_Wide_To_Ascii (path).char_rep (), mode); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_WIN32 && ACE_USES_WCHAR */ } #endif /* ACE_HAS_WCHAR */ @@ -214,45 +190,13 @@ namespace ACE_OS stat (const char *file, ACE_stat *stp) { ACE_OS_TRACE ("ACE_OS::stat"); -#if defined (ACE_HAS_NONCONST_STAT) - return ::stat (const_cast (file), stp); -#elif defined (ACE_LACKS_STAT) +#if defined (ACE_LACKS_STAT) ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_HAS_WINCE) - ACE_TEXT_WIN32_FIND_DATA fdata; - - int rc = 0; - HANDLE const fhandle = ::FindFirstFile (ACE_TEXT_CHAR_TO_TCHAR (file), &fdata); - if (fhandle == INVALID_HANDLE_VALUE) - { - ACE_OS::set_errno_to_last_error (); - return -1; - } - else if (fdata.nFileSizeHigh != 0) - { - errno = EINVAL; - rc = -1; - } - else - { - stp->st_mode = static_cast(fdata.dwFileAttributes); - stp->st_size = fdata.nFileSizeLow; - stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec (); - stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec (); - stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec (); - } - - ::FindClose (fhandle); - return rc; -#elif defined (ACE_HAS_X86_STAT_MACROS) - // Solaris for intel uses an macro for stat(), this macro is a - // wrapper for _xstat(). - return ::_xstat (_STAT_VER, file, stp); #elif defined (ACE_MQX) return MQX_Filesystem::inst ().stat (file, stp); #else return ACE_STAT_FUNC_NAME (file, stp); -#endif /* ACE_HAS_NONCONST_STAT */ +#endif /* ACE_LACKS_STAT */ } #if defined (ACE_HAS_WCHAR) @@ -260,40 +204,14 @@ namespace ACE_OS stat (const wchar_t *file, ACE_stat *stp) { ACE_OS_TRACE ("ACE_OS::stat"); -#if defined (ACE_HAS_WINCE) - WIN32_FIND_DATAW fdata; - - int rc = 0; - HANDLE const fhandle = ::FindFirstFileW (file, &fdata); - if (fhandle == INVALID_HANDLE_VALUE) - { - ACE_OS::set_errno_to_last_error (); - return -1; - } - else if (fdata.nFileSizeHigh != 0) - { - errno = EINVAL; - rc = -1; - } - else - { - stp->st_mode = static_cast(fdata.dwFileAttributes); - stp->st_size = fdata.nFileSizeLow; - stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec (); - stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec (); - stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec (); - } - - ::FindClose (fhandle); - return rc; -#elif defined (__BORLANDC__) \ - || defined (_MSC_VER) \ - || (defined (__MINGW32__) && !defined (__MINGW64_VERSION_MAJOR)) +#if defined (__BORLANDC__) \ + || defined (_MSC_VER) \ + || (defined (__MINGW32__) && !defined (__MINGW64_VERSION_MAJOR)) return ACE_WSTAT_FUNC_NAME (file, stp); -#else /* ACE_HAS_WINCE */ +#else ACE_Wide_To_Ascii nfile (file); return ACE_OS::stat (nfile.char_rep (), stp); -#endif /* ACE_HAS_WINCE */ +#endif /* __BORLANDC__ */ } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl index ba9ec109a7b9a..8ebfb40585379 100644 --- a/ACE/ace/OS_NS_sys_time.inl +++ b/ACE/ace/OS_NS_sys_time.inl @@ -26,25 +26,10 @@ ACE_OS::gettimeofday () } return ACE_Time_Value (ts); - -#elif defined (ACE_WIN32) && defined (ACE_LACKS_GETSYSTEMTIMEASFILETIME) - SYSTEMTIME tsys; - FILETIME tfile; - ::GetSystemTime (&tsys); - ::SystemTimeToFileTime (&tsys, &tfile); - return ACE_Time_Value (tfile); #elif defined (ACE_WIN32) FILETIME tfile; ::GetSystemTimeAsFileTime (&tfile); return ACE_Time_Value (tfile); -#elif defined (ACE_HAS_AIX_HI_RES_TIMER) - timebasestruct_t tb; - - ::read_real_time (&tb, TIMEBASE_SZ); - ::time_base_to_time (&tb, TIMEBASE_SZ); - - tv.tv_sec = tb.tb_high; - tv.tv_usec = tb.tb_low / 1000L; #else # if defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY) || \ defined (ACE_HAS_VOIDPTR_GETTIMEOFDAY) || \ diff --git a/ACE/ace/OS_NS_sys_uio.h b/ACE/ace/OS_NS_sys_uio.h index ece317202be70..2487d71c2889d 100644 --- a/ACE/ace/OS_NS_sys_uio.h +++ b/ACE/ace/OS_NS_sys_uio.h @@ -33,7 +33,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION ssize_t readv (ACE_HANDLE handle, const iovec *iov, diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp index b073a641a59d4..604947b5825e0 100644 --- a/ACE/ace/OS_NS_sys_utsname.cpp +++ b/ACE/ace/OS_NS_sys_utsname.cpp @@ -164,8 +164,6 @@ ACE_OS::uname (ACE_utsname *name) # endif case PROCESSOR_ARCHITECTURE_UNKNOWN: default: - // @@ We could provide WinCE specific info here. But let's - // defer that to some later point. ACE_OS::strcpy (processor, "Unknown"); break; } diff --git a/ACE/ace/OS_NS_sys_utsname.h b/ACE/ace/OS_NS_sys_utsname.h index 6c9a71efa9bf5..249f4d7eebf0f 100644 --- a/ACE/ace/OS_NS_sys_utsname.h +++ b/ACE/ace/OS_NS_sys_utsname.h @@ -55,10 +55,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - extern ACE_Export int uname (ACE_utsname *name); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_wait.h b/ACE/ace/OS_NS_sys_wait.h index dc9f1eafbd7f7..4d14145cc408d 100644 --- a/ACE/ace/OS_NS_sys_wait.h +++ b/ACE/ace/OS_NS_sys_wait.h @@ -33,7 +33,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - /// Calls OS @c ::wait function, so it's only portable to UNIX/POSIX /// platforms. ACE_NAMESPACE_INLINE_FUNCTION @@ -66,7 +65,6 @@ namespace ACE_OS ACE_exitcode *status = 0, int wait_options = 0, ACE_HANDLE handle = 0); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 526507eeb1b23..3303e0588b401 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -11,212 +11,8 @@ #include "ace/OS_NS_Thread.h" #include "ace/Object_Manager_Base.h" -#if defined (ACE_HAS_WINCE) -# include "ace/OS_NS_stdio.h" /* Need ACE_OS::sprintf() */ - -namespace -{ - ACE_TCHAR const * const ACE_OS_day_of_week_name[] = - { - ACE_TEXT ("Sun"), - ACE_TEXT ("Mon"), - ACE_TEXT ("Tue"), - ACE_TEXT ("Wed"), - ACE_TEXT ("Thu"), - ACE_TEXT ("Fri"), - ACE_TEXT ("Sat") - }; - - ACE_TCHAR const * const ACE_OS_month_name[] = - { - ACE_TEXT ("Jan"), - ACE_TEXT ("Feb"), - ACE_TEXT ("Mar"), - ACE_TEXT ("Apr"), - ACE_TEXT ("May"), - ACE_TEXT ("Jun"), - ACE_TEXT ("Jul"), - ACE_TEXT ("Aug"), - ACE_TEXT ("Sep"), - ACE_TEXT ("Oct"), - ACE_TEXT ("Nov"), - ACE_TEXT ("Dec") - }; - - static ACE_TCHAR const ACE_OS_CTIME_R_FMTSTR[] = ACE_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n"); -} /* end blank namespace */ -#endif /* ACE_HAS_WINCE */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL -# if defined (ACE_HAS_WINCE) -ACE_TCHAR * -ACE_OS::ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen) -{ - // buflen must be at least 26 wchar_t long. - if (buflen < 26) // Again, 26 is a magic number. - { - errno = ERANGE; - return 0; - } - // This is really stupid, converting FILETIME to timeval back and - // forth. It assumes FILETIME and DWORDLONG are the same structure - // internally. - ULARGE_INTEGER _100ns; - _100ns.QuadPart = (DWORDLONG) *clock * 10000 * 1000 - + ACE_Time_Value::FILETIME_to_timval_skew; - FILETIME file_time; - file_time.dwLowDateTime = _100ns.LowPart; - file_time.dwHighDateTime = _100ns.HighPart; - - FILETIME localtime; - SYSTEMTIME systime; - FileTimeToLocalFileTime (&file_time, &localtime); - FileTimeToSystemTime (&localtime, &systime); - ACE_OS::snprintf (buf, buflen, ACE_OS_CTIME_R_FMTSTR, - ACE_OS_day_of_week_name[systime.wDayOfWeek], - ACE_OS_month_name[systime.wMonth - 1], - systime.wDay, - systime.wHour, - systime.wMinute, - systime.wSecond, - systime.wYear); - return buf; -} -# endif /* ACE_HAS_WINCE */ - -# if defined (ACE_LACKS_DIFFTIME) -double -ACE_OS::difftime (time_t t1, time_t t0) -{ - /* return t1 - t0 in seconds */ - struct tm tms[2], *ptms[2], temp; - double seconds; - int swap = 0; - - /* extract the tm structure from time_t */ - ptms[1] = ::gmtime_r (&t1, &tms[1]); - if (ptms[1] == 0) return 0.0; - - ptms[0] = ::gmtime_r (&t0, &tms[0]); - if (ptms[0] == 0) return 0.0; - - /* make sure t1 is > t0 */ - if (tms[1].tm_year < tms[0].tm_year) - swap = 1; - else if (tms[1].tm_year == tms[0].tm_year) - { - if (tms[1].tm_yday < tms[0].tm_yday) - swap = 1; - else if (tms[1].tm_yday == tms[0].tm_yday) - { - if (tms[1].tm_hour < tms[0].tm_hour) - swap = 1; - else if (tms[1].tm_hour == tms[0].tm_hour) - { - if (tms[1].tm_min < tms[0].tm_min) - swap = 1; - else if (tms[1].tm_min == tms[0].tm_min) - { - if (tms[1].tm_sec < tms[0].tm_sec) - swap = 1; - } - } - } - } - - if (swap) - temp = tms[0], tms[0] = tms[1], tms[1] = temp; - - seconds = 0.0; - if (tms[1].tm_year > tms[0].tm_year) - { - // Accumulate the time until t[0] catches up to t[1]'s year. - seconds = 60 - tms[0].tm_sec; - tms[0].tm_sec = 0; - tms[0].tm_min += 1; - seconds += 60 * (60 - tms[0].tm_min); - tms[0].tm_min = 0; - tms[0].tm_hour += 1; - seconds += 60*60 * (24 - tms[0].tm_hour); - tms[0].tm_hour = 0; - tms[0].tm_yday += 1; - -# define ISLEAPYEAR(y) ((y)&3u?0:(y)%25u?1:(y)/25u&12?0:1) - - if (ISLEAPYEAR(tms[0].tm_year)) - seconds += 60*60*24 * (366 - tms[0].tm_yday); - else - seconds += 60*60*24 * (365 - tms[0].tm_yday); - - tms[0].tm_yday = 0; - tms[0].tm_year += 1; - - while (tms[1].tm_year > tms[0].tm_year) - { - if (ISLEAPYEAR(tms[0].tm_year)) - seconds += 60*60*24 * 366; - else - seconds += 60*60*24 * 365; - - tms[0].tm_year += 1; - } - -# undef ISLEAPYEAR - - } - else - { - // Normalize - if (tms[1].tm_sec < tms[0].tm_sec) - { - if (tms[1].tm_min == 0) - { - if (tms[1].tm_hour == 0) - { - tms[1].tm_yday -= 1; - tms[1].tm_hour += 24; - } - tms[1].tm_hour -= 1; - tms[1].tm_min += 60; - } - tms[1].tm_min -= 1; - tms[1].tm_sec += 60; - } - tms[1].tm_sec -= tms[0].tm_sec; - - if (tms[1].tm_min < tms[0].tm_min) - { - if (tms[1].tm_hour == 0) - { - tms[1].tm_yday -= 1; - tms[1].tm_hour += 24; - } - tms[1].tm_hour -= 1; - tms[1].tm_min += 60; - } - tms[1].tm_min -= tms[0].tm_min; - - if (tms[1].tm_hour < tms[0].tm_hour) - { - tms[1].tm_yday -= 1; - tms[1].tm_hour += 24; - } - tms[1].tm_hour -= tms[0].tm_hour; - - tms[1].tm_yday -= tms[0].tm_yday; - } - - // accumulate the seconds - seconds += tms[1].tm_sec; - seconds += 60 * tms[1].tm_min; - seconds += 60*60 * tms[1].tm_hour; - seconds += 60*60*24 * tms[1].tm_yday; - - return seconds; -} -# endif /* ACE_LACKS_DIFFTIME */ - struct tm * ACE_OS::localtime_r (const time_t *t, struct tm *res) { @@ -224,51 +20,6 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res) #if defined (ACE_HAS_TR24731_2005_CRT) ACE_SECURECRTCALL (localtime_s (res, t), struct tm *, 0, res); return res; -#elif defined (ACE_HAS_WINCE) - // This is really stupid, converting FILETIME to timeval back and - // forth. It assumes FILETIME and DWORDLONG are the same structure - // internally. - - TIME_ZONE_INFORMATION pTz; - - const unsigned short int __mon_yday[2][13] = - { - /* Normal years. */ - { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, - /* Leap years. */ - { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } - }; - - ULARGE_INTEGER _100ns; - ::GetTimeZoneInformation (&pTz); - - _100ns.QuadPart = (DWORDLONG) *t * 10000 * 1000 + ACE_Time_Value::FILETIME_to_timval_skew; - FILETIME file_time; - file_time.dwLowDateTime = _100ns.LowPart; - file_time.dwHighDateTime = _100ns.HighPart; - - FILETIME localtime; - SYSTEMTIME systime; - FileTimeToLocalFileTime (&file_time, &localtime); - FileTimeToSystemTime (&localtime, &systime); - - res->tm_hour = systime.wHour; - res->tm_isdst = pTz.DaylightBias != 0; - - int iLeap; - iLeap = (res->tm_year % 4 == 0 && (res->tm_year% 100 != 0 || res->tm_year % 400 == 0)); - // based on leap select which group to use - - res->tm_mday = systime.wDay; - res->tm_min = systime.wMinute; - res->tm_mon = systime.wMonth - 1; - res->tm_sec = systime.wSecond; - res->tm_wday = systime.wDayOfWeek; - res->tm_yday = __mon_yday[iLeap][systime.wMonth] + systime.wDay; - res->tm_year = systime.wYear;// this the correct year but bias the value to start at the 1900 - res->tm_year = res->tm_year - 1900; - - return res; #elif defined (ACE_LACKS_LOCALTIME_R) ACE_OS_GUARD @@ -291,28 +42,11 @@ time_t ACE_OS::mktime (struct tm *t) { ACE_OS_TRACE ("ACE_OS::mktime"); -# if defined (ACE_HAS_WINCE) - SYSTEMTIME t_sys; - FILETIME t_file; - t_sys.wSecond = t->tm_sec; - t_sys.wMinute = t->tm_min; - t_sys.wHour = t->tm_hour; - t_sys.wDay = t->tm_mday; - t_sys.wMonth = t->tm_mon + 1; // SYSTEMTIME is 1-indexed, tm is 0-indexed - t_sys.wYear = t->tm_year + 1900; // SYSTEMTIME is real; tm is since 1900 - t_sys.wDayOfWeek = t->tm_wday; // Ignored in below function call. - t_sys.wMilliseconds = 0; - if (SystemTimeToFileTime (&t_sys, &t_file) == 0) - return -1; - ACE_Time_Value tv (t_file); - return tv.sec (); -# else -# if defined (ACE_HAS_THREADS) && !defined (ACE_HAS_MT_SAFE_MKTIME) +#if defined (ACE_HAS_THREADS) && !defined (ACE_HAS_MT_SAFE_MKTIME) ACE_OS_GUARD -# endif /* ACE_HAS_THREADS && ! ACE_HAS_MT_SAFE_MKTIME */ +#endif /* ACE_HAS_THREADS && ! ACE_HAS_MT_SAFE_MKTIME */ return std::mktime (t); -# endif /* ACE_HAS_WINCE */ } #if defined (ACE_LACKS_STRPTIME) diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index d155dc3636f24..615d591c424ee 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -116,17 +116,6 @@ inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) } #endif /* !ACE_LACKS_LOCALTIME_R */ -#if !defined (ACE_LACKS_DIFFTIME) -# if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ - && defined (_MSC_VER) - // The WinCE 6.0/7.0 SDK ships with a diff_time that uses __time32_t as type - // not time_t. This resolves in compilation warnings because time_t - // can be 64bit. Disable at this moment the warning for just this method - // else we get two compile warnings on each source file that includes - // this file. -# pragma warning (push) -# pragma warning (disable: 4244) -# endif /// Helper for the ACE_OS::difftime() function /** * We moved the difftime code that used to be in ACE_OS::difftime() @@ -140,19 +129,9 @@ inline double ace_difftime(time_t t1, time_t t0) { return difftime (t1, t0); } -# if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ - && defined (_MSC_VER) -# pragma warning (pop) -# endif -#endif /* !ACE_LACKS_DIFFTIME */ # if defined (ACE_WIN32) -// 64-bit quad-word definitions. -typedef unsigned __int64 ACE_QWORD; typedef unsigned __int64 ACE_hrtime_t; -inline ACE_QWORD ACE_MAKE_QWORD (DWORD lo, DWORD hi) { return ACE_QWORD (lo) | (ACE_QWORD (hi) << 32); } -inline DWORD ACE_LOW_DWORD (ACE_QWORD q) { return (DWORD) q; } -inline DWORD ACE_HIGH_DWORD (ACE_QWORD q) { return (DWORD) (q >> 32); } # elif defined (_TNS_R_TARGET) typedef long long ACE_hrtime_t; # else /* !ACE_WIN32 */ @@ -197,18 +176,10 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION ACE_TCHAR *ctime (const time_t *t); -#if defined (ACE_HAS_WINCE) && !defined (_DEBUG) - extern ACE_EXPORT_MACRO -#else ACE_NAMESPACE_INLINE_FUNCTION -#endif ACE_TCHAR *ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen); -#if !defined (ACE_LACKS_DIFFTIME) ACE_NAMESPACE_INLINE_FUNCTION -#else - extern ACE_Export -#endif /* ! ACE_LACKS_DIFFTIME */ double difftime (time_t t1, time_t t0); diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index 03bb984d762e2..a41b805d4d0da 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -94,11 +94,6 @@ ACE_OS::ctime (const time_t *t) #if defined (ACE_LACKS_CTIME) ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_HAS_WINCE) - static ACE_TCHAR buf [ctime_buf_size]; - return ACE_OS::ctime_r (t, - buf, - ctime_buf_size); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) return ::_wctime (t); #else @@ -119,10 +114,9 @@ ACE_OS::ctime (const time_t *t) # else return ::ctime (t); # endif /* ACE_USES_WCHAR */ -# endif /* ACE_HAS_WINCE */ +# endif /* ACE_LACKS_CTIME */ } -#if !defined (ACE_HAS_WINCE) /* CE version in OS.cpp */ ACE_INLINE ACE_TCHAR * ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) { @@ -198,7 +192,6 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return buf; #endif /* ACE_HAS_REENTRANT_FUNCTIONS */ } -#endif /* !ACE_HAS_WINCE */ #if defined (ACE_USES_ULONG_FOR_STAT_TIME) ACE_INLINE ACE_TCHAR * @@ -242,13 +235,11 @@ ACE_OS::localtime_r (const unsigned long *clock, #endif -#if !defined (ACE_LACKS_DIFFTIME) ACE_INLINE double ACE_OS::difftime (time_t t1, time_t t0) { return ::ace_difftime (t1, t0); } -#endif /* ! ACE_LACKS_DIFFTIME */ ACE_INLINE ACE_hrtime_t ACE_OS::gethrtime (const ACE_HRTimer_Op op) @@ -257,14 +248,6 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) #if defined (ACE_HAS_HI_RES_TIMER) ACE_UNUSED_ARG (op); return ::gethrtime (); -#elif defined (ACE_HAS_AIX_HI_RES_TIMER) - ACE_UNUSED_ARG (op); - timebasestruct_t tb; - - ::read_real_time(&tb, TIMEBASE_SZ); - ::time_base_to_time(&tb, TIMEBASE_SZ); - - return ACE_hrtime_t(tb.tb_high) * ACE_ONE_SECOND_IN_NSECS + tb.tb_low; #elif defined (ACE_WIN32) ACE_UNUSED_ARG(op); LARGE_INTEGER freq; @@ -398,8 +381,7 @@ ACE_OS::nanosleep (const struct timespec *requested, #if defined (ACE_HAS_CLOCK_GETTIME) // ::nanosleep () is POSIX 1003.1b. So is ::clock_gettime (). So, // if ACE_HAS_CLOCK_GETTIME is defined, then ::nanosleep () should - // be available on the platform. On Solaris 2.x, both functions - // require linking with -lposix4. + // be available on the platform return ::nanosleep ((ACE_TIMESPEC_PTR) requested, remaining); #else ACE_UNUSED_ARG (remaining); @@ -462,7 +444,7 @@ namespace ACE_OS { } /* namespace ACE_OS */ #else ACE_INLINE long -ACE_OS::timezone (void) +ACE_OS::timezone () { return ::ace_timezone (); } diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index edc64725a6f51..49b5736f97017 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -52,10 +52,6 @@ ACE_OS::argv_to_string (int argc, bool substitute_env_args, bool quote_args) { -#if defined (ACE_LACKS_STRENVDUP) - ACE_UNUSED_ARG (substitute_env_args); -#endif /* ACE_LACKS_STRENVDUP */ - if (argc <= 0 || argv == 0 || argv[0] == 0) return 0; @@ -67,7 +63,6 @@ ACE_OS::argv_to_string (int argc, for (int i = 0; i < argc; ++i) { -#if !defined (ACE_LACKS_STRENVDUP) // Account for environment variables. if (substitute_env_args && ACE_OS::strchr (argv[i], ACE_TEXT ('$')) != 0) @@ -98,7 +93,6 @@ ACE_OS::argv_to_string (int argc, return 0; } } -#endif /* ACE_LACKS_STRENVDUP */ // If must quote, we only do it if the arg contains spaces, or // is empty. Perhaps a check for other c | ord(c) <= 32 is in // order? @@ -261,12 +255,7 @@ ACE_OS::fork (const ACE_TCHAR *program_name) ACE_UNUSED_ARG (program_name); ACE_NOTSUP_RETURN (pid_t (-1)); # else - pid_t const pid = -# if defined (ACE_HAS_STHREADS) - ::fork1 (); -#else - ::fork (); -#endif /* ACE_HAS_STHREADS */ + pid_t const pid = ::fork (); #if !defined (ACE_HAS_MINIMAL_ACE_OS) && !defined (ACE_HAS_THREADS) @@ -308,7 +297,6 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[]) if (ACE_OS::argv_to_string (argv, buf) != -1) { PROCESS_INFORMATION process_info; -# if !defined (ACE_HAS_WINCE) ACE_TEXT_STARTUPINFO startup_info; ACE_OS::memset ((void *) &startup_info, 0, @@ -325,18 +313,6 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[]) 0, // No current directory. &startup_info, &process_info)) -# else - if (ACE_TEXT_CreateProcess (0, - buf, - 0, // No process attributes. - 0, // No thread attributes. - FALSE, // Can's inherit handles on CE - 0, // Don't create a new console window. - 0, // No environment. - 0, // No current directory. - 0, // Can't use startup info on CE - &process_info)) -# endif /* ! ACE_HAS_WINCE */ { // Free resources allocated in kernel. ACE_OS::close (process_info.hThread); @@ -422,12 +398,6 @@ ACE_OS::num_processors () return num_processors; else return -1; -#elif defined (__hpux) - struct pst_dynamic psd; - if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) - return psd.psd_max_proc_cnt; - else - return -1; #else ACE_NOTSUP_RETURN (-1); #endif @@ -476,12 +446,6 @@ ACE_OS::num_processors_online () return num_processors; else return -1; -#elif defined (__hpux) - struct pst_dynamic psd; - if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) - return psd.psd_proc_cnt; - else - return -1; #else ACE_NOTSUP_RETURN (-1); #endif @@ -792,10 +756,6 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, ACE_TCHAR **&argv, bool substitute_env_args) { -#if defined (ACE_LACKS_STRENVDUP) - ACE_UNUSED_ARG (substitute_env_args); -#endif /* ACE_LACKS_STRENVDUP */ - // Reset the number of arguments argc = 0; @@ -901,7 +861,6 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, *cp = ACE_TEXT ('\0'); -#if !defined (ACE_LACKS_STRENVDUP) // Check for environment variable substitution here. if (substitute_env_args) { argv[i] = ACE_OS::strenvdup (argp); @@ -919,7 +878,6 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, } } else -#endif /* ACE_LACKS_STRENVDUP */ { argv[i] = ACE_OS::strdup (argp); diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h index 6686583efa3a0..6d4f270d13214 100644 --- a/ACE/ace/OS_NS_unistd.h +++ b/ACE/ace/OS_NS_unistd.h @@ -36,7 +36,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int access (const char *path, int amode); @@ -120,8 +119,8 @@ namespace ACE_OS char *const argv[]); //@{ - /// Forks and exec's a process in a manner that works on Solaris and - /// NT. argv[0] must be the full path name to the executable. + /// Forks and exec's a process in a manner that works Windows. + /// argv[0] must be the full path name to the executable. ACE_NAMESPACE_INLINE_FUNCTION pid_t fork (); @@ -354,7 +353,6 @@ namespace ACE_OS const void *buf, size_t len, size_t *bytes_transferred = 0); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 5c249d1fe599d..8c5d2834ade55 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -16,10 +16,6 @@ # include "ace/OS_NS_stdio.h" #endif /* ACE_LACKS_ACCESS */ -#if defined (ACE_HAS_ACCESS_EMULATION) -# include "ace/os_include/os_unistd.h" -#endif /* ACE_HAS_ACCESS_EMULATION */ - #if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x690) # if defined (__RTP__) # include "ace/os_include/os_strings.h" @@ -39,23 +35,9 @@ ACE_OS::access (const char *path, int amode) { ACE_OS_TRACE ("ACE_OS::access"); #if defined (ACE_LACKS_ACCESS) -# if defined (ACE_HAS_ACCESS_EMULATION) - // @@ WINCE: There should be a Win32 API that can do this. - // Hard coded read access here. - ACE_UNUSED_ARG (amode); - FILE* handle = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(path), - ACE_TEXT ("r")); - if (handle != 0) - { - ACE_OS::fclose (handle); - return 0; - } - return -1; -# else ACE_UNUSED_ARG (path); ACE_UNUSED_ARG (amode); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_ACCESS_EMULATION */ #elif defined(ACE_WIN32) // Windows doesn't support checking X_OK(6) # if defined (ACE_ACCESS_EQUIVALENT) @@ -73,11 +55,11 @@ ACE_OS::access (const char *path, int amode) ACE_INLINE int ACE_OS::access (const wchar_t *path, int amode) { -#if defined (ACE_WIN32) && !defined (ACE_LACKS__WACCESS) +#if defined (ACE_WIN32) return ::_waccess (path, amode); -#else /* ACE_WIN32 && !ACE_HAS_WINCE */ +#else /* ACE_WIN32 */ return ACE_OS::access (ACE_Wide_To_Ascii (path).char_rep (), amode); -#endif /* ACE_WIN32 && !ACE_LACKS__WACCESS */ +#endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ @@ -101,7 +83,7 @@ ACE_OS::getpagesize () SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return (long) sys_info.dwPageSize; -#elif defined (_SC_PAGESIZE) && !defined (ACE_HAS_NOTSUP_SC_PAGESIZE) +#elif defined (_SC_PAGESIZE) return ::sysconf (_SC_PAGESIZE); #elif defined (ACE_HAS_GETPAGESIZE) return ::getpagesize (); @@ -127,26 +109,18 @@ ACE_INLINE int ACE_OS::chdir (const char *path) { ACE_OS_TRACE ("ACE_OS::chdir"); -#if defined (ACE_LACKS_CHDIR) - ACE_UNUSED_ARG (path); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_HAS_NONCONST_CHDIR) - return ::chdir (const_cast (path)); -#elif defined (ACE_CHDIR_EQUIVALENT) +#if defined (ACE_CHDIR_EQUIVALENT) return ACE_CHDIR_EQUIVALENT (path); #else return ::chdir (path); -#endif /* ACE_HAS_NONCONST_CHDIR */ +#endif /* ACE_CHDIR_EQUIVALENT */ } #if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::chdir (const wchar_t *path) { -#if defined (ACE_LACKS_CHDIR) - ACE_UNUSED_ARG (path); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) return ::_wchdir (path); #else /* ACE_WIN32 */ return ACE_OS::chdir (ACE_Wide_To_Ascii (path).char_rep ()); @@ -157,11 +131,7 @@ ACE_OS::chdir (const wchar_t *path) ACE_INLINE int ACE_OS::rmdir (const char *path) { -#if defined (ACE_HAS_WINCE) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR(path)), - ace_result_), - int, -1); -#elif defined (ACE_RMDIR_EQUIVALENT) +#if defined (ACE_RMDIR_EQUIVALENT) return ACE_RMDIR_EQUIVALENT (path); #else return ::rmdir (path); @@ -172,16 +142,12 @@ ACE_OS::rmdir (const char *path) ACE_INLINE int ACE_OS::rmdir (const wchar_t *path) { -#if defined (ACE_HAS_WINCE) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectoryW (path), - ace_result_), - int, -1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) return ::_wrmdir (path); #else ACE_Wide_To_Ascii n_path (path); return ACE_OS::rmdir (n_path.char_rep ()); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ @@ -257,7 +223,7 @@ ACE_OS::dup(ACE_HANDLE handle, pid_t pid) #else ACE_UNUSED_ARG (pid); return ::dup(handle); -#endif /*ACE_WIN32 && !ACE_HAS_WINCE*/ +#endif /* ACE_LACKS_DUP */ } ACE_INLINE int @@ -414,11 +380,7 @@ ACE_INLINE char * ACE_OS::getcwd (char *buf, size_t size) { ACE_OS_TRACE ("ACE_OS::getcwd"); -#if defined (ACE_LACKS_GETCWD) - ACE_UNUSED_ARG (buf); - ACE_UNUSED_ARG (size); - ACE_NOTSUP_RETURN (0); -#elif defined (ACE_GETCWD_EQUIVALENT) +#if defined (ACE_GETCWD_EQUIVALENT) return ACE_GETCWD_EQUIVALENT (buf, static_cast (size)); #elif defined (ACE_WIN32) return ::getcwd (buf, static_cast (size)); @@ -431,11 +393,7 @@ ACE_OS::getcwd (char *buf, size_t size) ACE_INLINE wchar_t * ACE_OS::getcwd (wchar_t *buf, size_t size) { -# if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (buf); - ACE_UNUSED_ARG (size); - ACE_NOTSUP_RETURN (0); -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) return ::_wgetcwd (buf, static_cast (size)); # else char *narrow_buf = new char[size]; @@ -566,7 +524,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_UNUSED_ARG (maxnamelen); ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_PHARLAP_RT */ -#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) +#elif defined (ACE_VXWORKS) return ::gethostname (name, maxnamelen); #elif defined (ACE_WIN32) if (::gethostname (name, ACE_Utils::truncate_cast (maxnamelen)) == 0) @@ -607,11 +565,11 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_INLINE int ACE_OS::hostname (wchar_t name[], size_t maxnamelen) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (GetComputerNameW (name, LPDWORD (&maxnamelen)), ace_result_), int, -1); -#else /* ACE_WIN32 && !ACE_HAS_WINCE */ +#else /* ACE_WIN32 */ // Emulate using the char version char *char_name = 0; @@ -622,7 +580,7 @@ ACE_OS::hostname (wchar_t name[], size_t maxnamelen) delete [] char_name; return result; -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ @@ -1097,18 +1055,10 @@ ACE_OS::sysconf (int name) } ACE_INLINE long -ACE_OS::sysinfo (int cmd, char *buf, long count) +ACE_OS::sysinfo (int /*cmd*/, char */*buf*/, long /*count*/) { ACE_OS_TRACE ("ACE_OS::sysinfo"); -#if defined (ACE_HAS_SYSV_SYSINFO) - return ::sysinfo (cmd, buf, count); -#else - ACE_UNUSED_ARG (cmd); - ACE_UNUSED_ARG (buf); - ACE_UNUSED_ARG (count); - ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_SYSV_SYSINFO */ } ACE_INLINE int @@ -1214,20 +1164,14 @@ ACE_INLINE int ACE_OS::unlink (const char *path) { ACE_OS_TRACE ("ACE_OS::unlink"); -# if defined (ACE_HAS_NONCONST_UNLINK) - return ::unlink (const_cast (path)); -# elif defined (ACE_HAS_WINCE) - // @@ The problem is, DeleteFile is not actually equals to unlink. ;( - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_CHAR_TO_TCHAR (path)), ace_result_), - int, -1); -# elif defined (ACE_LACKS_UNLINK) +#if defined (ACE_LACKS_UNLINK) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_UNLINK_EQUIVALENT) +#elif defined (ACE_UNLINK_EQUIVALENT) return ACE_UNLINK_EQUIVALENT (path); -# else +#else return ::unlink (path); -# endif /* ACE_HAS_NONCONST_UNLINK */ +#endif /* ACE_LACKS_UNLINK */ } #if defined (ACE_HAS_WCHAR) @@ -1235,16 +1179,12 @@ ACE_INLINE int ACE_OS::unlink (const wchar_t *path) { ACE_OS_TRACE ("ACE_OS::unlink"); -# if defined (ACE_HAS_WINCE) - // @@ The problem is, DeleteFile is not actually equals to unlink. ;( - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFileW (path), ace_result_), - int, -1); -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) return ::_wunlink (path); # else ACE_Wide_To_Ascii npath (path); return ACE_OS::unlink (npath.char_rep ()); -# endif /* ACE_HAS_WINCE */ +# endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/OS_NS_wchar.cpp b/ACE/ace/OS_NS_wchar.cpp index aa914be249ba7..5d8e684be3831 100644 --- a/ACE/ace/OS_NS_wchar.cpp +++ b/ACE/ace/OS_NS_wchar.cpp @@ -107,7 +107,6 @@ ACE_OS::wcscspn_emulation (const wchar_t *s, const wchar_t *reject) for (scan = s; *scan; scan++) { - for (rej_scan = reject; *rej_scan; rej_scan++) if (*scan == *rej_scan) return count; diff --git a/ACE/ace/OS_NS_wchar.h b/ACE/ace/OS_NS_wchar.h index 6fa8c15197ed3..5f5f0eb8379c3 100644 --- a/ACE/ace/OS_NS_wchar.h +++ b/ACE/ace/OS_NS_wchar.h @@ -37,7 +37,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - typedef ACE_WCHAR_T WChar; #if defined (ACE_HAS_WCHAR) diff --git a/ACE/ace/OS_NS_wctype.h b/ACE/ace/OS_NS_wctype.h index f20f2043489be..20d7dc3a88a1a 100644 --- a/ACE/ace/OS_NS_wctype.h +++ b/ACE/ace/OS_NS_wctype.h @@ -34,7 +34,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - // these are non-standard names... /** @name Functions from diff --git a/ACE/ace/OS_QoS.h b/ACE/ace/OS_QoS.h index e84c633b80612..70ea271eed720 100644 --- a/ACE/ace/OS_QoS.h +++ b/ACE/ace/OS_QoS.h @@ -293,11 +293,9 @@ class ACE_Export ACE_QoS #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) #else private: - ACE_Flow_Spec *sending_flowspec_; ACE_Flow_Spec *receiving_flowspec_; #endif - }; /** diff --git a/ACE/ace/OS_TLI.cpp b/ACE/ace/OS_TLI.cpp index 1ae8e540e15ec..9ca114803ca61 100644 --- a/ACE/ace/OS_TLI.cpp +++ b/ACE/ace/OS_TLI.cpp @@ -1,7 +1,6 @@ #include "ace/OS_TLI.h" - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_TLI.inl" #endif /* !ACE_HAS_INLINED_OSCALLS */ diff --git a/ACE/ace/OS_TLI.h b/ACE/ace/OS_TLI.h index c8b82bfd10efc..ab9fb5f3724f0 100644 --- a/ACE/ace/OS_TLI.h +++ b/ACE/ace/OS_TLI.h @@ -39,20 +39,8 @@ struct t_uderr { }; struct netbuf { }; # else /* !(ACE_HAS_TLI || ACE_HAS_XTI) */ - -# if defined (ACE_HAS_CONFLICTING_XTI_MACROS) - // Make sure tcp.h gets included before sys/xti.h. -# include "ace/os_include/netinet/os_tcp.h" -# undef TCP_NODELAY -# undef TCP_MAXSEG -# endif /* ACE_HAS_CONFLICTING_XTI_MACROS */ - # if defined (ACE_HAS_XTI) -# if defined (ACE_HAS_SYS_XTI_H) /* Nonstandard header placement */ -# define class ace_xti_class -# include /**/ -# undef class -# elif defined (ACE_HAS_FORE_ATM_XTI) +# if defined (ACE_HAS_FORE_ATM_XTI) # include /**/ # include /**/ # include /**/ @@ -68,7 +56,6 @@ struct netbuf { }; // desired, local or peer, while t_getprotaddr() gets both at once. // t_getname() has values defined for the type, so these aren't defined // for XTI systems. So, define them here for ACE API users to use. - // These values were taken from sys/tiuser.h on Solaris. # if !defined (LOCALNAME) # define LOCALNAME 0 # endif @@ -113,18 +100,6 @@ extern "C" } # endif /* !ACE_HAS_TLI_PROTOTYPES */ -# if defined (ACE_HAS_TIUSER_H) -# include /**/ -# else - /* What to do here??? Is there a tli.h? */ -# endif /* ACE_HAS_TIUSER_H */ - -# if defined (ACE_HAS_SVR4_TLI) - // t_getname is a TLI extension added by some platforms before XTI - // was widely available. However, it's not often in the system's - // header files. Sun OS, for example, is like this. - extern "C" int t_getname (int, struct netbuf *, int); -# endif /* ACE_HAS_SVR4_TLI */ # endif /* !ACE_HAS_XTI */ # endif /* ACE_HAS_XTI || ACE_HAS_TLI */ @@ -243,7 +218,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int t_unbind (ACE_HANDLE fildes); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_TLI.inl b/ACE/ace/OS_TLI.inl index e2bc18c830fb0..48d55ccc64612 100644 --- a/ACE/ace/OS_TLI.inl +++ b/ACE/ace/OS_TLI.inl @@ -87,11 +87,7 @@ ACE_INLINE void t_error (const char *errmsg) { #if defined (ACE_HAS_TLI) -#if defined (ACE_HAS_BROKEN_T_ERROR) - ::t_error (const_cast (errmsg)); -#else ::t_error (errmsg); -#endif /* ACE_HAS_BROKEN_T_ERROR */ #else ACE_UNUSED_ARG (errmsg); #endif /* ACE_HAS_TLI */ @@ -163,16 +159,13 @@ t_getname (ACE_HANDLE handle, struct netbuf *namep, int type) else namep->len = peer.addr.len; return 0; - -#elif defined (ACE_HAS_SVR4_TLI) - return ::t_getname (handle, namep, type); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (namep); ACE_UNUSED_ARG (type); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_SVR4_TLI */ +#endif /* ACE_HAS_XTI */ } ACE_INLINE int diff --git a/ACE/ace/OS_Thread_Adapter.cpp b/ACE/ace/OS_Thread_Adapter.cpp index 514cc692a40f0..bdf52d7fd50fc 100644 --- a/ACE/ace/OS_Thread_Adapter.cpp +++ b/ACE/ace/OS_Thread_Adapter.cpp @@ -57,23 +57,6 @@ ACE_OS_Thread_Adapter::invoke () // not to access anywhere below this point. delete this; -#if defined (ACE_NEEDS_LWP_PRIO_SET) - // On SunOS, the LWP priority needs to be set in order to get - // preemption when running in the RT class. This is the ACE way to - // do that . . . - ACE_hthread_t thr_handle; - ACE_OS::thr_self (thr_handle); - int prio; - - // thr_getprio () on the current thread should never fail. - ACE_OS::thr_getprio (thr_handle, prio); - - // ACE_OS::thr_setprio () has the special logic to set the LWP priority, - // if running in the RT class. - ACE_OS::thr_setprio (prio); - -#endif /* ACE_NEEDS_LWP_PRIO_SET */ - if (cancel_flags != 0) { // If both flags are set, ignore this. diff --git a/ACE/ace/OS_Thread_Adapter.h b/ACE/ace/OS_Thread_Adapter.h index 738e5e8823038..af0ea6aa94e4b 100644 --- a/ACE/ace/OS_Thread_Adapter.h +++ b/ACE/ace/OS_Thread_Adapter.h @@ -55,14 +55,13 @@ class ACE_Export ACE_OS_Thread_Adapter : public ACE_Base_Thread_Adapter * @c this, thereby rendering the object useless after the call * returns. */ - virtual ACE_THR_FUNC_RETURN invoke (void); + virtual ACE_THR_FUNC_RETURN invoke (); ACE_ALLOC_HOOK_DECLARE; protected: - /// Ensure that this object is allocated on the heap. - ~ACE_OS_Thread_Adapter (void); + ~ACE_OS_Thread_Adapter (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_main.cpp b/ACE/ace/OS_main.cpp index 74b917da9f78d..1fbacb1ba9310 100644 --- a/ACE/ace/OS_main.cpp +++ b/ACE/ace/OS_main.cpp @@ -51,7 +51,7 @@ ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */ ACE_END_VERSIONED_NAMESPACE_DECL -# elif !defined (ACE_HAS_WINCE) +# else ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -94,60 +94,9 @@ ace_os_main_i (ACE_Main_Base &mbase, int argc, char *argv[]) /* user's entry poi ACE_END_VERSIONED_NAMESPACE_DECL -# else /* ACE_HAS_WINCE */ +# endif /* !ACE_WIN32 */ -// CE only gets a command line string; no argv. So we need to convert it -// when the main entrypoint expects argc/argv. ACE_ARGV supports this. -# include "ace/OS_NS_string.h" -# include "ace/OS_NS_ctype.h" -# include "ace/ACE.h" -# include "ace/ARGV.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_Main_Base::~ACE_Main_Base () -{ -} - -int ACE_Main_Base::run (HINSTANCE, - HINSTANCE, - LPWSTR lpCmdLine, - int) -{ - ACE_TCHAR cmdline[1024]; - ACE_TCHAR msg_file [MAXPATHLEN]; - if (ACE_TEXT_GetModuleFileName (0, msg_file, MAXPATHLEN)) - { - bool quote = false; - for (size_t i(0); !quote && msg_file[i]; ++i) - { - if (ACE_OS::ace_isspace (msg_file[i])) quote = true; - } - ACE_TCHAR *cmd_iter = cmdline; - if (quote) - { - *cmd_iter++ = ACE_TEXT ('"'); - } - ACE_OS::strcpy (cmd_iter, msg_file); - ACE_OS::strcat (cmd_iter, quote ? ACE_TEXT ("\" ") : ACE_TEXT (" ")); - } - else - { - ACE_OS::strcpy (cmdline, ACE_TEXT ("program ")); - } - ACE_OS::strcat (cmdline, ACE_TEXT_WCHAR_TO_TCHAR (lpCmdLine)); - ACE_ARGV ce_argv (cmdline); - ACE::init (); - ACE_MAIN_OBJECT_MANAGER - int const i = this->run_i (ce_argv.argc (), ce_argv.argv ()); - ACE::fini (); - return i; -} -ACE_END_VERSIONED_NAMESPACE_DECL - -# endif /* !ACE_HAS_WINCE */ - -#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ +#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ #endif /* ACE_DOESNT_DEFINE_MAIN */ diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h index 5f90e56b2c292..873e4e0ecb424 100644 --- a/ACE/ace/OS_main.h +++ b/ACE/ace/OS_main.h @@ -27,10 +27,6 @@ # if !defined (ACE_DOESNT_DEFINE_MAIN) -# if defined (ACE_HAS_RTEMS) -extern char* rtems_progname; -# endif /* ACE_HAS_RTEMS */ - #if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640) && defined (__RTP__) # include #endif @@ -101,25 +97,6 @@ ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., main */ \ int \ ace_main_i -# elif defined (ACE_HAS_RTEMS) - -# define main \ -ACE_MAIN (int, char *[]); /* forward decl to gobble up the 'int' if there is one */ \ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ -int ace_os_main_i (int, char *[]); \ -ACE_END_VERSIONED_NAMESPACE_DECL \ -int \ -ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., main */ \ -{ \ - if ((argc > 0) && argv && argv[0]) \ - rtems_progname = argv[0]; \ - else \ - rtems_progname = "RTEMS"; \ - return ace_os_main_i (argc, argv); /* what the user calls "main" */ \ -} \ -int \ -ace_main_i - # elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640) && defined (__RTP__) # define main \ @@ -151,7 +128,7 @@ ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., main */ \ ACE_Proper_Export_Flag int \ ace_main_i -# elif !defined (ACE_HAS_WINCE) +# else # if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) @@ -230,78 +207,8 @@ int \ ace_main_i # endif /* ACE_WIN32 && ACE_USES_WCHAR */ - -# else /* ACE_HAS_WINCE */ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -class ACE_Export ACE_Main_Base -{ -public: - virtual ~ACE_Main_Base (void); - int run (HINSTANCE, HINSTANCE, LPWSTR, int); - virtual int run_i (int, ACE_TCHAR *[]) = 0; -}; - -ACE_END_VERSIONED_NAMESPACE_DECL - -# if defined (ACE_TMAIN) // Use WinMain on CE; others give warning/error. -# undef ACE_TMAIN -# endif // ACE_TMAIN - -// Support for ACE_TMAIN, which is a recommended way. It would be nice if -// CE had CommandLineToArgvW()... but it's only on NT3.5 and up. - -# define ACE_TMAIN \ -ace_tmain_i (int, ACE_TCHAR *[]); \ -class ACE_Main : public ACE_Main_Base {int run_i (int argc, ACE_TCHAR *argv[]);}; \ -inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[]) \ -{ \ - return ace_tmain_i (argc, argv); \ -} \ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \ -{ \ - ACE_Main m; \ - return m.run (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \ -} \ -int ace_tmain_i - -// Support for wchar_t but still can't fit to CE because of the command -// line parameters. -# define wmain \ -ace_wmain_i (int, ACE_TCHAR *[]); \ -ACE_Export int ace_os_winwmain_i (ACE_Main_Base&, hInstance, hPrevInstance, lpCmdLine, nCmdShow); /* forward declaration */ \ -class ACE_Main : public ACE_Main_Base {int run_i (int argc, ACE_TCHAR *argv[]);}; \ -inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[]) \ -{ \ - return ace_wmain_i (argc, argv); \ -} \ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \ -{ \ - return ace_os_winwmain_i (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \ -} \ -int ace_wmain_i - -// Supporting legacy 'main' is A LOT easier for users than changing existing -// code on WinCE. Unfortunately, evc 3 can't grok a #include within the macro -// expansion, so it needs to go out here. -# include "ace/Argv_Type_Converter.h" -# define main \ -ace_main_i (int, ACE_TCHAR *[]); \ -ACE_Export int ace_os_winmain_i (ACE_Main_Base&, hInstance, hPrevInstance, lpCmdLine, nCmdShow); /* forward declaration */ \ -class ACE_Main : public ACE_Main_Base {int run_i (int argc, ACE_TCHAR *argv[]);}; \ -inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[]) \ -{ \ - return ace_main_i (argc, argv); \ -} \ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \ -{ \ - return ace_os_winmain_i (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \ -} \ -int ace_main_i - # endif -# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ +# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ # ifdef ACE_MQX # include diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp index 56edf6ec3146c..5570194717501 100644 --- a/ACE/ace/Object_Manager.cpp +++ b/ACE/ace/Object_Manager.cpp @@ -28,7 +28,7 @@ #include "ace/Null_Mutex.h" #include "ace/Mutex.h" #include "ace/RW_Thread_Mutex.h" -#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) # include "ace/OS_NS_stdlib.h" # include /**/ #endif // ACE_DISABLE_WIN32_ERROR_WINDOWS @@ -53,7 +53,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Note the following fix was derived from that proposed by Jochen Kalmbach // http://blog.kalmbachnet.de/?postid=75 -#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) LPTOP_LEVEL_EXCEPTION_FILTER WINAPI ACEdisableSetUnhandledExceptionFilter ( LPTOP_LEVEL_EXCEPTION_FILTER /*lpTopLevelExceptionFilter*/) { @@ -257,7 +257,7 @@ ACE_Object_Manager::init () } # endif /* ACE_HAS_TSS_EMULATION */ -#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) #if defined (_DEBUG) && (defined (_MSC_VER) || defined (__INTEL_COMPILER) || defined (__MINGW32__)) _CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_ERROR, _CRTDBG_FILE_STDERR ); diff --git a/ACE/ace/Object_Manager.h b/ACE/ace/Object_Manager.h index f4a7a48845b0b..27ac68717d7f6 100644 --- a/ACE/ace/Object_Manager.h +++ b/ACE/ace/Object_Manager.h @@ -195,7 +195,6 @@ template class ACE_Cleanup_Adapter; */ class ACE_Export ACE_Object_Manager : public ACE_Object_Manager_Base { - public: ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp index 0cf1b6c9e89d6..3db3504db5206 100644 --- a/ACE/ace/Object_Manager_Base.cpp +++ b/ACE/ace/Object_Manager_Base.cpp @@ -78,7 +78,7 @@ ACE_Object_Manager_Base::shutting_down_i () extern "C" void -ACE_OS_Object_Manager_Internal_Exit_Hook (void) +ACE_OS_Object_Manager_Internal_Exit_Hook () { if (ACE_OS_Object_Manager::instance_) ACE_OS_Object_Manager::instance ()->fini (); @@ -137,7 +137,7 @@ ACE_OS_Object_Manager::thread_hook () #if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_SEH_EXCEPT_HANDLER -ACE_OS_Object_Manager::seh_except_selector (void) +ACE_OS_Object_Manager::seh_except_selector () { return ACE_OS_Object_Manager::instance ()->seh_except_selector_; } @@ -154,7 +154,7 @@ ACE_OS_Object_Manager::seh_except_selector (ACE_SEH_EXCEPT_HANDLER n) } ACE_SEH_EXCEPT_HANDLER -ACE_OS_Object_Manager::seh_except_handler (void) +ACE_OS_Object_Manager::seh_except_handler () { return ACE_OS_Object_Manager::instance ()->seh_except_handler_; } @@ -199,7 +199,6 @@ ACE_OS_Object_Manager::instance () // ACE_ASSERT (instance_pointer == instance_); instance_pointer->dynamically_allocated_ = true; - } return instance_; @@ -217,26 +216,20 @@ ACE_OS_Object_Manager::init () if (this == instance_) { # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -# if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - ACE_CE_Errno::init (); -# endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t, ACE_OS_MONITOR_LOCK) if (ACE_OS::thread_mutex_init - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast (ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_OS_MONITOR_LOCK")); ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_CLEANUP_LOCK) if (ACE_OS::recursive_mutex_init - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_TSS_CLEANUP_LOCK")); ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t, ACE_LOG_MSG_INSTANCE_LOCK) if (ACE_OS::thread_mutex_init - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast (ACE_OS_Object_Manager::preallocated_object[ACE_LOG_MSG_INSTANCE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK")); @@ -244,7 +237,6 @@ ACE_OS_Object_Manager::init () ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_KEY_LOCK) if (ACE_OS::recursive_mutex_init - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_KEY_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_TSS_KEY_LOCK")); @@ -252,7 +244,6 @@ ACE_OS_Object_Manager::init () ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_BASE_LOCK) if (ACE_OS::recursive_mutex_init - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_TSS_BASE_LOCK")); @@ -344,7 +335,6 @@ ACE_OS_Object_Manager::fini () # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK) if (ACE_OS::thread_mutex_destroy - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast (ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0) # ifdef ACE_LACKS_PTHREAD_MUTEX_DESTROY if (errno != ENOTSUP) @@ -356,7 +346,6 @@ ACE_OS_Object_Manager::fini () ACE_OS_MONITOR_LOCK) # if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK) if (ACE_OS::recursive_mutex_destroy - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0) # ifdef ACE_LACKS_PTHREAD_MUTEX_DESTROY if (errno != ENOTSUP) @@ -368,7 +357,6 @@ ACE_OS_Object_Manager::fini () ACE_TSS_CLEANUP_LOCK) # if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK) if (ACE_OS::thread_mutex_destroy - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast (ACE_OS_Object_Manager::preallocated_object [ACE_LOG_MSG_INSTANCE_LOCK])) != 0) # ifdef ACE_LACKS_PTHREAD_MUTEX_DESTROY if (errno != ENOTSUP) @@ -381,7 +369,6 @@ ACE_OS_Object_Manager::fini () # if defined (ACE_HAS_TSS_EMULATION) # if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK) if (ACE_OS::recursive_mutex_destroy - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_KEY_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_TSS_KEY_LOCK")); @@ -391,7 +378,6 @@ ACE_OS_Object_Manager::fini () # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) # if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK) if (ACE_OS::recursive_mutex_destroy - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_TSS_BASE_LOCK")); @@ -400,9 +386,6 @@ ACE_OS_Object_Manager::fini () ACE_TSS_BASE_LOCK) # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */ # endif /* ACE_HAS_TSS_EMULATION */ -# if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - ACE_CE_Errno::fini (); -# endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ # endif /* ACE_MT_SAFE */ #endif /* ! ACE_HAS_STATIC_PREALLOCATION */ } @@ -444,39 +427,17 @@ ACE_OS_Object_Manager::print_error_message (unsigned int line_number, const ACE_TCHAR *message) { // To avoid duplication of these const strings in OS.o. -#if !defined (ACE_HAS_WINCE) -# ifndef ACE_LACKS_STDERR +#ifndef ACE_LACKS_STDERR fprintf (stderr, "ace/Object_Manager_Base.cpp, line %u: %s ", line_number, ACE_TEXT_ALWAYS_CHAR (message)); -# else - ACE_UNUSED_ARG (line_number); - ACE_UNUSED_ARG (message); -# endif -# if !defined (ACE_LACKS_PERROR) - perror ("failed"); -# endif /* ACE_LACKS_PERROR */ #else - // @@ Need to use the following information. ACE_UNUSED_ARG (line_number); ACE_UNUSED_ARG (message); - - ACE_TCHAR *lpMsgBuf = 0; - ::FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, - 0, - ::GetLastError (), - MAKELANGID (LANG_NEUTRAL, - SUBLANG_DEFAULT), - // Default language - (ACE_TCHAR *) &lpMsgBuf, - 0, - 0); - ::MessageBox (0, - lpMsgBuf, - ACE_TEXT ("ACE_OS error"), - MB_OK); #endif +#if !defined (ACE_LACKS_PERROR) + perror ("failed"); +#endif /* ACE_LACKS_PERROR */ } int diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h index 22fa9d206026b..fe4b9285d7761 100644 --- a/ACE/ace/Object_Manager_Base.h +++ b/ACE/ace/Object_Manager_Base.h @@ -116,7 +116,7 @@ class ACE_Export ACE_Object_Manager_Base }; extern "C" -void ACE_OS_Object_Manager_Internal_Exit_Hook (void); +void ACE_OS_Object_Manager_Internal_Exit_Hook (); // @@ This forward declaration should go away. class ACE_Log_Msg; diff --git a/ACE/ace/Obstack_T.h b/ACE/ace/Obstack_T.h index 5de08a1669f9a..27d08d37976dd 100644 --- a/ACE/ace/Obstack_T.h +++ b/ACE/ace/Obstack_T.h @@ -114,13 +114,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Obstack_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Obstack_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Obstack_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_OBSTACK_T_H */ diff --git a/ACE/ace/PI_Malloc.h b/ACE/ace/PI_Malloc.h index db21328abf5c9..804bdec0bf822 100644 --- a/ACE/ace/PI_Malloc.h +++ b/ACE/ace/PI_Malloc.h @@ -59,7 +59,7 @@ class ACE_Export ACE_PI_Control_Block class ACE_Export ACE_Malloc_Header { public: - ACE_Malloc_Header (void); + ACE_Malloc_Header (); /// Points to next block if on free list. MALLOC_HEADER_PTR next_block_; @@ -109,10 +109,10 @@ class ACE_Export ACE_PI_Control_Block ACE_Name_Node (const ACE_Name_Node &); /// Constructor. - ACE_Name_Node (void); + ACE_Name_Node (); /// Constructor. - ~ACE_Name_Node (void); + ~ACE_Name_Node (); /// Initialize a name node pointer. static void init_ptr (NAME_NODE_PTR *ptr, @@ -146,7 +146,7 @@ class ACE_Export ACE_PI_Control_Block }; /// Print out a bunch of size info for debugging. - static void print_alignment_info (void); + static void print_alignment_info (); /// Reference counter. int ref_counter_; diff --git a/ACE/ace/PI_Malloc.inl b/ACE/ace/PI_Malloc.inl index 98cdca3ae0394..4f38f067c565f 100644 --- a/ACE/ace/PI_Malloc.inl +++ b/ACE/ace/PI_Malloc.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_PI_Control_Block::ACE_Name_Node::~ACE_Name_Node (void) +ACE_PI_Control_Block::ACE_Name_Node::~ACE_Name_Node () { } diff --git a/ACE/ace/POSIX_Asynch_IO.cpp b/ACE/ace/POSIX_Asynch_IO.cpp index 0631292ce782b..c032bca87b932 100644 --- a/ACE/ace/POSIX_Asynch_IO.cpp +++ b/ACE/ace/POSIX_Asynch_IO.cpp @@ -1741,7 +1741,6 @@ class ACE_Export ACE_POSIX_Asynch_Transmit_Handler : public ACE_Handler int transmit (); protected: - /// The asynch result pointer made from the initial transmit file /// request. ACE_POSIX_Asynch_Transmit_File_Result *result_; @@ -1968,7 +1967,6 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_read_file (const ACE_Asynch_Read_File: // Failure. if (result.success () == 0) { - // ACE_SEH_TRY { this->result_->complete (this->bytes_transferred_, diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h index e98a7151d369f..13a5e8e47ca90 100644 --- a/ACE/ace/POSIX_Asynch_IO.h +++ b/ACE/ace/POSIX_Asynch_IO.h @@ -103,7 +103,7 @@ class ACE_Export ACE_POSIX_Asynch_Result : public virtual ACE_Asynch_Result_Impl int post_completion (ACE_Proactor_Impl *proactor); /// Destructor. - virtual ~ACE_POSIX_Asynch_Result (void); + virtual ~ACE_POSIX_Asynch_Result (); /// Simulate error value to use in the post_completion () void set_error (u_long errcode); @@ -170,7 +170,7 @@ class ACE_Export ACE_POSIX_Asynch_Operation : public virtual ACE_Asynch_Operatio ACE_Proactor *proactor = 0); /// Check the documentation for ACE_Asynch_Operation::cancel. - int cancel (void); + int cancel (); // = Access methods. @@ -185,7 +185,7 @@ class ACE_Export ACE_POSIX_Asynch_Operation : public virtual ACE_Asynch_Operatio ACE_POSIX_Asynch_Operation (ACE_POSIX_Proactor *posix_proactor); /// Destructor. - virtual ~ACE_POSIX_Asynch_Operation (void); + virtual ~ACE_POSIX_Asynch_Operation (); // This call is for the POSIX implementation. This method is used by // ACE_Asynch_Operation to store some information with the @@ -222,7 +222,6 @@ class ACE_Export ACE_POSIX_Asynch_Operation : public virtual ACE_Asynch_Operatio class ACE_Export ACE_POSIX_Asynch_Read_Stream_Result : public virtual ACE_Asynch_Read_Stream_Result_Impl, public ACE_POSIX_Asynch_Result { - /// Factory classes will have special permissions. friend class ACE_POSIX_Asynch_Read_Stream; @@ -260,7 +259,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_Stream_Result : public virtual ACE_Asynch u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Read_Stream_Result (void); + virtual ~ACE_POSIX_Asynch_Read_Stream_Result (); // aiocb::aio_nbytes // Bytes requested when the asynchronous read was initiated. @@ -294,7 +293,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_Stream : public virtual ACE_Asynch_Read_S int signal_number = 0); /// Destructor. - virtual ~ACE_POSIX_Asynch_Read_Stream (void); + virtual ~ACE_POSIX_Asynch_Read_Stream (); }; @@ -347,7 +346,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_Stream_Result : public virtual ACE_Async u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Write_Stream_Result (void); + virtual ~ACE_POSIX_Asynch_Write_Stream_Result (); protected: // aiocb::aio_nbytes @@ -383,7 +382,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_Stream : public virtual ACE_Asynch_Write int signal_number = 0); /// Destructor. - virtual ~ACE_POSIX_Asynch_Write_Stream (void); + virtual ~ACE_POSIX_Asynch_Write_Stream (); }; /** @@ -401,8 +400,6 @@ class ACE_Export ACE_POSIX_Asynch_Read_File_Result : public virtual ACE_Asynch_R /// The Proactor constructs the Result class for faking results. friend class ACE_POSIX_Proactor; -public: - protected: /// Constructor is protected since creation is limited to /// ACE_Asynch_Read_File factory. @@ -424,7 +421,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_File_Result : public virtual ACE_Asynch_R u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Read_File_Result (void); + virtual ~ACE_POSIX_Asynch_Read_File_Result (); }; /** @@ -446,7 +443,6 @@ class ACE_Export ACE_POSIX_Asynch_Read_File_Result : public virtual ACE_Asynch_R class ACE_Export ACE_POSIX_Asynch_Read_File : public virtual ACE_Asynch_Read_File_Impl, public ACE_POSIX_Asynch_Read_Stream { - public: /// Constructor. ACE_POSIX_Asynch_Read_File (ACE_POSIX_Proactor *posix_proactor); @@ -465,7 +461,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_File : public virtual ACE_Asynch_Read_Fil int signal_number = 0); /// Destructor. - virtual ~ACE_POSIX_Asynch_Read_File (void); + virtual ~ACE_POSIX_Asynch_Read_File (); private: /** @@ -528,7 +524,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_File_Result : public virtual ACE_Asynch_ u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Write_File_Result (void); + virtual ~ACE_POSIX_Asynch_Write_File_Result (); }; /** @@ -560,7 +556,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_File : public virtual ACE_Asynch_Write_F int signal_number = 0); /// Destructor. - virtual ~ACE_POSIX_Asynch_Write_File (void); + virtual ~ACE_POSIX_Asynch_Write_File (); private: /** @@ -629,7 +625,7 @@ class ACE_Export ACE_POSIX_Asynch_Accept_Result : public virtual ACE_Asynch_Acce u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Accept_Result (void); + virtual ~ACE_POSIX_Asynch_Accept_Result (); // aiocb::aio_nbytes // Bytes requested when the asynchronous read was initiated. @@ -658,12 +654,11 @@ class ACE_Export ACE_POSIX_Asynch_Accept : public ACE_Event_Handler { public: - /// Constructor. ACE_POSIX_Asynch_Accept (ACE_POSIX_Proactor * posix_proactor); /// Destructor. - virtual ~ACE_POSIX_Asynch_Accept (void); + virtual ~ACE_POSIX_Asynch_Accept (); /** * This belongs to ACE_POSIX_Asynch_Operation. We forward @@ -698,7 +693,7 @@ class ACE_Export ACE_POSIX_Asynch_Accept : * Cancel all pending pseudo-asynchronus requests * Behavior as usual AIO request */ - int cancel (void); + int cancel (); /** * Close performs cancellation of all pending requests @@ -764,7 +759,6 @@ class ACE_Export ACE_POSIX_Asynch_Connect_Result : public virtual ACE_Asynch_Con friend class ACE_POSIX_Proactor; public: - /// I/O handle for the connection. ACE_HANDLE connect_handle () const; @@ -785,7 +779,7 @@ class ACE_Export ACE_POSIX_Asynch_Connect_Result : public virtual ACE_Asynch_Con u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Connect_Result (void); + virtual ~ACE_POSIX_Asynch_Connect_Result (); // aiocb::aio_filedes // I/O handle for the new connection. @@ -802,12 +796,11 @@ class ACE_Export ACE_POSIX_Asynch_Connect : public ACE_Event_Handler { public: - /// Constructor. ACE_POSIX_Asynch_Connect (ACE_POSIX_Proactor * posix_proactor); /// Destructor. - virtual ~ACE_POSIX_Asynch_Connect (void); + virtual ~ACE_POSIX_Asynch_Connect (); /** * This belongs to ACE_POSIX_Asynch_Operation. We forward @@ -838,12 +831,12 @@ class ACE_Export ACE_POSIX_Asynch_Connect : * Cancel all pending pseudo-asynchronus requests * Behavior as usual AIO request */ - int cancel (void); + int cancel (); /** * Close performs cancellation of all pending requests. */ - int close (void); + int close (); /// virtual from ACE_Event_Handler ACE_HANDLE get_handle () const; @@ -963,7 +956,7 @@ class ACE_Export ACE_POSIX_Asynch_Transmit_File_Result : public virtual ACE_Asyn u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Transmit_File_Result (void); + virtual ~ACE_POSIX_Asynch_Transmit_File_Result (); /// Network I/O handle. ACE_HANDLE socket_; @@ -1022,7 +1015,7 @@ class ACE_Export ACE_POSIX_Asynch_Transmit_File : public virtual ACE_Asynch_Tran int signal_number = 0); /// Destructor. - virtual ~ACE_POSIX_Asynch_Transmit_File (void); + virtual ~ACE_POSIX_Asynch_Transmit_File (); }; @@ -1044,7 +1037,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_Dgram : public virtual ACE_Asynch_Read_Dg public: /// Constructor. ACE_POSIX_Asynch_Read_Dgram (ACE_POSIX_Proactor *posix_proactor); - virtual ~ACE_POSIX_Asynch_Read_Dgram (void); + virtual ~ACE_POSIX_Asynch_Read_Dgram (); /** This method queues an asynchronous read. Up to * @a message_block->total_size() bytes will be read and stored in the @@ -1077,7 +1070,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_Dgram : public virtual ACE_Asynch_Read_Dg protected: /// Do-nothing constructor. - ACE_POSIX_Asynch_Read_Dgram (void); + ACE_POSIX_Asynch_Read_Dgram (); }; /** @@ -1129,7 +1122,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_Dgram_Result : public virtual ACE_Asynch u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Write_Dgram_Result (void); + virtual ~ACE_POSIX_Asynch_Write_Dgram_Result (); /// The number of bytes which were requested at the start of the /// asynchronous write. @@ -1143,7 +1136,6 @@ class ACE_Export ACE_POSIX_Asynch_Write_Dgram_Result : public virtual ACE_Asynch /// I/O handle used for writing. ACE_HANDLE handle_; - }; /** @@ -1168,7 +1160,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_Dgram : public virtual ACE_Asynch_Write_ ACE_POSIX_Asynch_Write_Dgram (ACE_POSIX_Proactor *posix_proactor); /// Destructor - virtual ~ACE_POSIX_Asynch_Write_Dgram (void); + virtual ~ACE_POSIX_Asynch_Write_Dgram (); /** This method queues an asynchronous send. Up to * @a message_block->total_length bytes will be sent, beginning at the @@ -1201,7 +1193,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_Dgram : public virtual ACE_Asynch_Write_ protected: /// Do-nothing constructor. - ACE_POSIX_Asynch_Write_Dgram (void); + ACE_POSIX_Asynch_Write_Dgram (); }; @@ -1216,7 +1208,6 @@ class ACE_Export ACE_POSIX_Asynch_Write_Dgram : public virtual ACE_Asynch_Write_ class ACE_Export ACE_POSIX_Asynch_Read_Dgram_Result : public virtual ACE_Asynch_Read_Dgram_Result_Impl, public virtual ACE_POSIX_Asynch_Result { - /// Factory classes will have special permissions. friend class ACE_POSIX_Asynch_Read_Dgram; @@ -1263,7 +1254,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_Dgram_Result : public virtual ACE_Asynch_ u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Read_Dgram_Result (void); + virtual ~ACE_POSIX_Asynch_Read_Dgram_Result (); /// Bytes requested when the asynchronous read was initiated. size_t bytes_to_read_; @@ -1281,7 +1272,6 @@ class ACE_Export ACE_POSIX_Asynch_Read_Dgram_Result : public virtual ACE_Asynch_ /// I/O handle used for reading. ACE_HANDLE handle_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/POSIX_CB_Proactor.cpp b/ACE/ace/POSIX_CB_Proactor.cpp index ef58e76d5ae1f..44fd9d4a41ca8 100644 --- a/ACE/ace/POSIX_CB_Proactor.cpp +++ b/ACE/ace/POSIX_CB_Proactor.cpp @@ -97,7 +97,6 @@ ACE_POSIX_CB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) int ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds) { - int result_wait=0; // Wait for the signals. diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 225e4acc18e61..e720c06dbe75f 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -6,10 +6,6 @@ #include "ace/POSIX_Proactor.inl" #endif /* __ACE_INLINE__ */ -# if defined (ACE_HAS_SYS_SYSTEMINFO_H) -# include /**/ -# endif /* ACE_HAS_SYS_SYSTEMINFO_H */ - #include "ace/ACE.h" #include "ace/Flag_Manip.h" #include "ace/Task_T.h" @@ -19,10 +15,6 @@ #include "ace/OS_NS_signal.h" #include "ace/OS_NS_unistd.h" -#if defined (sun) -# include "ace/OS_NS_strings.h" -#endif /* sun */ - // ********************************************************************* ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -59,31 +51,8 @@ class ACE_POSIX_Wakeup_Completion : public ACE_POSIX_Asynch_Result ACE_POSIX_Proactor::ACE_POSIX_Proactor () : os_id_ (ACE_OS_UNDEFINED) { -#if defined(sun) - - os_id_ = ACE_OS_SUN; // set family - - char Buf [32]; - - ::memset(Buf,0,sizeof(Buf)); - - ACE_OS::sysinfo (SI_RELEASE , Buf, sizeof(Buf)-1); - - if (ACE_OS::strcasecmp (Buf , "5.6") == 0) - os_id_ = ACE_OS_SUN_56; - else if (ACE_OS::strcasecmp (Buf , "5.7") == 0) - os_id_ = ACE_OS_SUN_57; - else if (ACE_OS::strcasecmp (Buf , "5.8") == 0) - os_id_ = ACE_OS_SUN_58; - -#elif defined(HPUX) - - os_id_ = ACE_OS_HPUX; // set family - -#elif defined(__OpenBSD) - +#if defined(__OpenBSD) os_id_ = ACE_OS_OPENBSD; // set family - // do the same //#else defined (LINUX, __FreeBSD__ ...) @@ -688,7 +657,6 @@ ACE_AIOCB_Notify_Pipe_Manager::~ACE_AIOCB_Notify_Pipe_Manager () h = this->pipe_.read_handle (); if ( h != ACE_INVALID_HANDLE) ACE_OS::closesocket (h); - } @@ -764,7 +732,6 @@ ACE_POSIX_AIOCB_Proactor::ACE_POSIX_AIOCB_Proactor (size_t max_aio_operations) // start pseudo-asynchronous accept task // one per all future acceptors this->get_asynch_pseudo_task().start (); - } // Special protected constructor for ACE_SUN_Proactor @@ -937,16 +904,12 @@ void ACE_POSIX_AIOCB_Proactor::check_max_aio_num () aiocb_list_max_size_ = max_os_aio_num; #endif -#if defined (HPUX) || defined (__FreeBSD__) - // Although HPUX 11.00 allows to start 2048 AIO's for all process in - // system it has a limit 256 max elements for aio_suspend () It is a - // pity, but ... - +#if defined (__FreeBSD__) long max_os_listio_num = ACE_OS::sysconf (_SC_AIO_LISTIO_MAX); if (max_os_listio_num > 0 && aiocb_list_max_size_ > (unsigned long) max_os_listio_num) aiocb_list_max_size_ = max_os_listio_num; -#endif /* HPUX || __FreeBSD__ */ +#endif /* __FreeBSD__ */ // check for user-defined value // ACE_AIO_MAX_SIZE if defined in POSIX_Proactor.h @@ -1218,7 +1181,6 @@ ACE_POSIX_AIOCB_Proactor::find_completed_aio (int &error_status, error_status, transfer_count)) // completed break; - } // end for if (count == 0) // all processed , nothing found @@ -1860,7 +1822,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) int error_status = 0; size_t transfer_count = 0; - if (sig_info.si_code == SI_ASYNCIO || this->os_id_ == ACE_OS_SUN_56) + if (sig_info.si_code == SI_ASYNCIO) { flg_aio = 1; // AIO signal received // define index to start @@ -1870,21 +1832,6 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) #else index = static_cast (sig_info.si_value.sival_int); #endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ - // Assume we have a correctly-functioning implementation, and that - // there is one I/O to process, and it's correctly specified in the - // siginfo received. There are, however, some special situations - // where this isn't true... - if (os_id_ == ACE_OS_SUN_56) // Solaris 6 - { - // 1. Solaris 6 always loses any RT signal, - // if it has more SIGQUEMAX=32 pending signals - // so we should scan the whole aiocb list - // 2. Moreover,it has one more bad habit - // to notify aio completion - // with SI_QUEUE code instead of SI_ASYNCIO, hence the - // OS_SUN_56 addition to the si_code check, above. - count = aiocb_list_max_size_; - } } else if (sig_info.si_code != SI_QUEUE) { @@ -1995,7 +1942,6 @@ ACE_POSIX_Wakeup_Completion::complete (size_t /* bytes_transferred */, const void * /* completion_key */, u_long /* error */) { - ACE_Handler *handler = this->handler_proxy_.get ()->handler (); if (handler != 0) handler->handle_wakeup (); diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h index 076c0847a59f6..143e16b269b41 100644 --- a/ACE/ace/POSIX_Proactor.h +++ b/ACE/ace/POSIX_Proactor.h @@ -64,9 +64,6 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl /// Signals notifications PROACTOR_SIG = 2, - /// SUN specific aiowait() - PROACTOR_SUN = 3, - /// Callback notifications PROACTOR_CB = 4 }; @@ -78,13 +75,6 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl ACE_OS_WIN = 0x0100, // for future ACE_OS_WIN_NT = ACE_OS_WIN | 0x0001, ACE_OS_WIN_2000 = ACE_OS_WIN | 0x0002, - ACE_OS_SUN = 0x0200, // Sun Solaris family - ACE_OS_SUN_55 = ACE_OS_SUN | 0x0001, - ACE_OS_SUN_56 = ACE_OS_SUN | 0x0002, - ACE_OS_SUN_57 = ACE_OS_SUN | 0x0004, - ACE_OS_SUN_58 = ACE_OS_SUN | 0x0008, - ACE_OS_HPUX = 0x0400, // HPUX family - ACE_OS_HPUX_11 = ACE_OS_HPUX | 0x0001, ACE_OS_LINUX = 0x0800, // Linux family ACE_OS_FREEBSD = 0x1000, // FreeBSD family ACE_OS_IRIX = 0x2000, // SGI IRIX family @@ -96,13 +86,13 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl ACE_OPCODE_WRITE = 2 }; - virtual Proactor_Type get_impl_type (void); + virtual Proactor_Type get_impl_type (); /// Virtual destructor. - virtual ~ACE_POSIX_Proactor (void); + virtual ~ACE_POSIX_Proactor (); /// Close down the Proactor. - virtual int close (void); + virtual int close (); /** * Dispatch a single set of events. If @a wait_time elapses before @@ -118,7 +108,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. */ - virtual int handle_events (void) = 0; + virtual int handle_events () = 0; /** * Post a result to the completion port of the Proactor. If errors @@ -142,7 +132,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl const void *completion_key); /// @@ This is a no-op on POSIX platforms. Returns 0. - int wake_up_dispatch_threads (void); + int wake_up_dispatch_threads (); /// @@ This is a no-op on POSIX platforms. Returns 0. int close_dispatch_threads (int wait); @@ -157,7 +147,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl // Methods used to create Asynch IO factory and result objects. We // create the right objects here in these methods. - virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void); + virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (); virtual ACE_Asynch_Read_Stream_Result_Impl * create_asynch_read_stream_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -168,7 +158,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void); + virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (); virtual ACE_Asynch_Write_Stream_Result_Impl * create_asynch_write_stream_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -179,7 +169,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void); + virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (); virtual ACE_Asynch_Read_File_Result_Impl * create_asynch_read_file_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -192,7 +182,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void); + virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (); virtual ACE_Asynch_Write_File_Result_Impl * create_asynch_write_file_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -205,7 +195,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void); + virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (); virtual ACE_Asynch_Read_Dgram_Result_Impl * create_asynch_read_dgram_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -218,7 +208,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void); + virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (); virtual ACE_Asynch_Write_Dgram_Result_Impl * create_asynch_write_dgram_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -230,7 +220,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void); + virtual ACE_Asynch_Accept_Impl *create_asynch_accept (); virtual ACE_Asynch_Accept_Result_Impl * create_asynch_accept_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE listen_handle, @@ -242,7 +232,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void); + virtual ACE_Asynch_Connect_Impl *create_asynch_connect (); virtual ACE_Asynch_Connect_Result_Impl * create_asynch_connect_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE connect_handle, @@ -251,7 +241,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void); + virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (); virtual ACE_Asynch_Transmit_File_Result_Impl * create_asynch_transmit_file_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE socket, @@ -279,7 +269,7 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl protected: /// Constructor. - ACE_POSIX_Proactor (void); + ACE_POSIX_Proactor (); /** * Protect against structured exceptions caused by user code when @@ -309,7 +299,6 @@ class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl private: /// Task to process pseudo-asynchronous accept/connect ACE_Asynch_Pseudo_Task pseudo_task_; - }; // Forward declarations. @@ -324,7 +313,6 @@ class ACE_AIOCB_Notify_Pipe_Manager; */ class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor { - /// Handler needs to call application specific code. friend class ACE_AIOCB_Notify_Pipe_Manager; @@ -340,13 +328,13 @@ class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor /// which can be started at the same time ACE_POSIX_AIOCB_Proactor (size_t nmaxop = ACE_AIO_DEFAULT_SIZE); - virtual Proactor_Type get_impl_type (void); + virtual Proactor_Type get_impl_type (); /// Destructor. - virtual ~ACE_POSIX_AIOCB_Proactor (void); + virtual ~ACE_POSIX_AIOCB_Proactor (); /// Close down the Proactor. - virtual int close (void); + virtual int close (); /** * Dispatch a single set of events. If @a wait_time elapses before @@ -363,7 +351,7 @@ class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. */ - virtual int handle_events (void); + virtual int handle_events (); /// Post a result to the completion port of the Proactor. virtual int post_completion (ACE_POSIX_Asynch_Result *result); @@ -385,7 +373,6 @@ class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor virtual int cancel_aio (ACE_HANDLE h); protected: - /// Special constructor for ACE_SUN_Proactor /// and ACE_POSIX_SIG_Proactor ACE_POSIX_AIOCB_Proactor (size_t nmaxop, @@ -398,20 +385,20 @@ class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor size_t &transfer_count); /// Create aiocb list - int create_result_aiocb_list (void); + int create_result_aiocb_list (); /// Call this method from derived class when virtual table is /// built. - int delete_result_aiocb_list (void); + int delete_result_aiocb_list (); /// Call these methods from derived class when virtual table is /// built. - void create_notify_manager (void); - void delete_notify_manager (void); + void create_notify_manager (); + void delete_notify_manager (); /// Define the maximum number of asynchronous I/O requests /// for the current OS - void check_max_aio_num (void) ; + void check_max_aio_num (); /// To identify requests from Notify_Pipe_Manager void set_notify_handle (ACE_HANDLE h); @@ -424,7 +411,7 @@ class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor int handle_events_i (u_long milli_seconds); /// Start deferred AIO if necessary - int start_deferred_aio (void); + int start_deferred_aio (); /// Cancel running or deferred AIO virtual int cancel_aiocb (ACE_POSIX_Asynch_Result * result); @@ -449,13 +436,13 @@ class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor int putq_result (ACE_POSIX_Asynch_Result *result); /// Get "post_completed" result from the internal queue - ACE_POSIX_Asynch_Result * getq_result (void); + ACE_POSIX_Asynch_Result * getq_result (); /// Clear the internal results queue - int clear_result_queue (void); + int clear_result_queue (); /// Process the internal results queue - int process_result_queue (void); + int process_result_queue (); /// This class takes care of doing when we use @@ -505,7 +492,6 @@ class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor */ class ACE_Export ACE_POSIX_SIG_Proactor : public ACE_POSIX_AIOCB_Proactor { - /** * This class does the registering of Asynch Operations with the * Proactor which is necessary in the SIG strategy, because we need @@ -521,7 +507,7 @@ class ACE_Export ACE_POSIX_SIG_Proactor : public ACE_POSIX_AIOCB_Proactor */ ACE_POSIX_SIG_Proactor (size_t nmaxop = ACE_AIO_DEFAULT_SIZE); - virtual Proactor_Type get_impl_type (void); + virtual Proactor_Type get_impl_type (); /** * This constructor should be used to tell the Proactor to mask and @@ -533,7 +519,7 @@ class ACE_Export ACE_POSIX_SIG_Proactor : public ACE_POSIX_AIOCB_Proactor size_t nmaxop = ACE_AIO_DEFAULT_SIZE); /// Destructor. - virtual ~ACE_POSIX_SIG_Proactor (void); + virtual ~ACE_POSIX_SIG_Proactor (); /** * Dispatch a single set of events. If @a wait_time elapses before @@ -550,7 +536,7 @@ class ACE_Export ACE_POSIX_SIG_Proactor : public ACE_POSIX_AIOCB_Proactor * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. */ - virtual int handle_events (void); + virtual int handle_events (); /// Post a result to the completion port of the Proactor. /// now it is implemented in base ACE_POSIX_AIOCB_Proactor class @@ -634,7 +620,7 @@ class ACE_Export ACE_POSIX_Asynch_Timer : public ACE_POSIX_Asynch_Result int signal_number = ACE_SIGRTMIN); /// Destructor. - ~ACE_POSIX_Asynch_Timer (void) override = default; + ~ACE_POSIX_Asynch_Timer () override = default; /// This method calls the handler's handle_timeout method. void complete (size_t bytes_transferred, diff --git a/ACE/ace/POSIX_Proactor.inl b/ACE/ace/POSIX_Proactor.inl index c6edd4a5ca87a..62682af3f3525 100644 --- a/ACE/ace/POSIX_Proactor.inl +++ b/ACE/ace/POSIX_Proactor.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Asynch_Pseudo_Task& ACE_POSIX_Proactor::get_asynch_pseudo_task (void) +ACE_Asynch_Pseudo_Task& ACE_POSIX_Proactor::get_asynch_pseudo_task () { return this->pseudo_task_; } diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp index c69ea82f806b7..8af6e554b6695 100644 --- a/ACE/ace/Pagefile_Memory_Pool.cpp +++ b/ACE/ace/Pagefile_Memory_Pool.cpp @@ -20,13 +20,8 @@ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) -#if !defined (ACE_HAS_WINCE) -#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\ +#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd) \ MapViewOfFileEx (_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd) -#else //if !defined (ACE_HAS_WINCE) -#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\ - MapViewOfFile (_hnd, _access, _offHigh, _offLow, _nBytes) -#endif /* !ACE_HAS_WINCE */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -55,26 +50,22 @@ ACE_Pagefile_Memory_Pool::ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_sto { this->local_cb_.req_base_ = options->base_addr_; this->local_cb_.mapped_base_ = 0; - this->local_cb_.sh_.max_size_ = - options->max_size_; + this->local_cb_.sh_.max_size_ = options->max_size_; this->local_cb_.sh_.mapped_size_ = 0; - this->local_cb_.sh_.free_offset_ = - this->local_cb_.sh_.mapped_size_; + this->local_cb_.sh_.free_offset_ = this->local_cb_.sh_.mapped_size_; this->local_cb_.sh_.free_size_ = 0; } else { this->local_cb_.req_base_ = 0; this->local_cb_.mapped_base_ = 0; - this->local_cb_.sh_.max_size_ = - this->round_to_chunk_size (page_size_) ; + this->local_cb_.sh_.max_size_ = this->round_to_chunk_size (page_size_) ; this->local_cb_.sh_.mapped_size_ = 0; - this->local_cb_.sh_.free_offset_ = - this->local_cb_.sh_.mapped_size_; + this->local_cb_.sh_.free_offset_ = this->local_cb_.sh_.mapped_size_; this->local_cb_.sh_.free_size_ = 0; } - int update_backing_store_name = backing_store_name == 0 ? 0 : 1; + int const update_backing_store_name = backing_store_name == 0 ? 0 : 1; if (backing_store_name == 0) // Only create a new unique filename for the backing store file if @@ -183,7 +174,7 @@ ACE_Pagefile_Memory_Pool::remap (void *addr) } int -ACE_Pagefile_Memory_Pool::unmap (void) +ACE_Pagefile_Memory_Pool::unmap () { #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) ACE_BASED_POINTER_REPOSITORY::instance ()->unbind diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h index bc650da1e7687..254a5a7ad8a33 100644 --- a/ACE/ace/Pagefile_Memory_Pool.h +++ b/ACE/ace/Pagefile_Memory_Pool.h @@ -127,7 +127,7 @@ class ACE_Export ACE_Pagefile_Memory_Pool int map (int &firstTime, size_t appendBytes = 0); /// Release the mapping. - int unmap (void); + int unmap (); private: /** diff --git a/ACE/ace/Pair_T.h b/ACE/ace/Pair_T.h index 36c32500e3713..ac352ef5d5423 100644 --- a/ACE/ace/Pair_T.h +++ b/ACE/ace/Pair_T.h @@ -63,13 +63,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Pair_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Pair_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Pair_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_PAIR_T_H */ diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp index 006f0e5971069..76b763da3dfed 100644 --- a/ACE/ace/Parse_Node.cpp +++ b/ACE/ace/Parse_Node.cpp @@ -510,7 +510,6 @@ ACE_Location_Node::open_dll (int & yyerrno) } return 0; - } void @@ -701,14 +700,9 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *, return 0; } -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int const temp_p = reinterpret_cast (func_p); -#else intptr_t const temp_p = reinterpret_cast (func_p); -#endif - ACE_Service_Factory_Ptr func = - reinterpret_cast (temp_p); + ACE_Service_Factory_Ptr func = reinterpret_cast (temp_p); // Invoke the factory function and record it's return value. this->symbol_ = (*func) (gobbler); diff --git a/ACE/ace/Parse_Node.h b/ACE/ace/Parse_Node.h index 89217ff9dea14..2fac713694e96 100644 --- a/ACE/ace/Parse_Node.h +++ b/ACE/ace/Parse_Node.h @@ -45,9 +45,9 @@ class ACE_Service_Type; class ACE_Parse_Node { public: - ACE_Parse_Node (void); + ACE_Parse_Node (); explicit ACE_Parse_Node (const ACE_TCHAR *name); - virtual ~ACE_Parse_Node (void); + virtual ~ACE_Parse_Node (); ACE_Parse_Node *link () const; void link (ACE_Parse_Node *); @@ -86,7 +86,7 @@ class ACE_Suspend_Node : public ACE_Parse_Node { public: ACE_Suspend_Node (const ACE_TCHAR *name); - ~ACE_Suspend_Node (void); + ~ACE_Suspend_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -114,7 +114,7 @@ class ACE_Resume_Node : public ACE_Parse_Node { public: ACE_Resume_Node (const ACE_TCHAR *name); - ~ACE_Resume_Node (void); + ~ACE_Resume_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -142,7 +142,7 @@ class ACE_Remove_Node : public ACE_Parse_Node { public: ACE_Remove_Node (const ACE_TCHAR *name); - ~ACE_Remove_Node (void); + ~ACE_Remove_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -170,7 +170,7 @@ class ACE_Static_Node : public ACE_Parse_Node { public: ACE_Static_Node (const ACE_TCHAR *name, ACE_TCHAR *params = 0); - virtual ~ACE_Static_Node (void); + virtual ~ACE_Static_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); virtual const ACE_Service_Type *record (const ACE_Service_Gestalt *g) const; @@ -209,7 +209,7 @@ class ACE_Dynamic_Node : public ACE_Static_Node public: ACE_Dynamic_Node (ACE_Service_Type_Factory const *, ACE_TCHAR *params); - virtual ~ACE_Dynamic_Node (void); + virtual ~ACE_Dynamic_Node (); // virtual const ACE_Service_Type *record () const; virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -242,7 +242,7 @@ class ACE_Stream_Node : public ACE_Parse_Node { public: ACE_Stream_Node (const ACE_Static_Node *, const ACE_Parse_Node *); - virtual ~ACE_Stream_Node (void); + virtual ~ACE_Stream_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -274,7 +274,7 @@ class ACE_Dummy_Node : public ACE_Parse_Node { public: ACE_Dummy_Node (const ACE_Static_Node *, const ACE_Parse_Node *); - ~ACE_Dummy_Node (void); + ~ACE_Dummy_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -306,13 +306,13 @@ class ACE_Dummy_Node : public ACE_Parse_Node class ACE_Location_Node { public: - ACE_Location_Node (void); - const ACE_DLL &dll (void); + ACE_Location_Node (); + const ACE_DLL &dll (); const ACE_TCHAR *pathname () const; void pathname (const ACE_TCHAR *h); int dispose () const; - virtual ~ACE_Location_Node (void); + virtual ~ACE_Location_Node (); virtual void set_symbol (void *h); /// Will update the yyerrno member and/or corresponding configuration @@ -367,7 +367,7 @@ class ACE_Object_Node : public ACE_Location_Node virtual void *symbol (ACE_Service_Gestalt *config, int &yyerrno, ACE_Service_Object_Exterminator * = 0); - virtual ~ACE_Object_Node (void); + virtual ~ACE_Object_Node (); /// Dump the state of an object. void dump () const; @@ -400,7 +400,7 @@ class ACE_Function_Node : public ACE_Location_Node virtual void *symbol (ACE_Service_Gestalt *config, int &yyerrno, ACE_Service_Object_Exterminator *gobbler = 0); - virtual ~ACE_Function_Node (void); + virtual ~ACE_Function_Node (); /// Dump the state of an object. void dump () const; @@ -409,7 +409,6 @@ class ACE_Function_Node : public ACE_Location_Node ACE_ALLOC_HOOK_DECLARE; private: - /// Return mangled function name that takes into account ACE /// versioned namespace. /** @@ -430,7 +429,6 @@ class ACE_Function_Node : public ACE_Location_Node ACE_TCHAR * make_func_name (ACE_TCHAR const * func_name); private: - /// Name of the function that we're parsing. const ACE_TCHAR *function_name_; @@ -457,7 +455,7 @@ class ACE_Static_Function_Node : public ACE_Location_Node virtual void *symbol (ACE_Service_Gestalt *config, int &yyerrno, ACE_Service_Object_Exterminator * = 0); - virtual ~ACE_Static_Function_Node (void); + virtual ~ACE_Static_Function_Node (); /// Dump the state of an object. void dump () const; @@ -485,7 +483,7 @@ class ACE_Service_Type_Factory ACE_Location_Node *location, bool active); - ~ACE_Service_Type_Factory (void); + ~ACE_Service_Type_Factory (); ACE_Service_Type *make_service_type (ACE_Service_Gestalt *pcfg) const; @@ -495,7 +493,6 @@ class ACE_Service_Type_Factory ACE_ALLOC_HOOK_DECLARE; private: - /** * Not implemented to enforce no copying */ diff --git a/ACE/ace/Ping_Socket.h b/ACE/ace/Ping_Socket.h index 9e16cf184473a..59faff255b5e1 100644 --- a/ACE/ace/Ping_Socket.h +++ b/ACE/ace/Ping_Socket.h @@ -40,14 +40,14 @@ class ACE_Export ACE_Ping_Socket : public ACE_ICMP_Socket typedef ACE_ICMP_Socket inherited; public: /// Default constructor. - ACE_Ping_Socket (void); + ACE_Ping_Socket (); ACE_Ping_Socket (ACE_Addr const & local, int protocol = IPPROTO_ICMP, int reuse_addr = 0); /// Destructor. - ~ACE_Ping_Socket (void); + ~ACE_Ping_Socket (); /// Wrapper around the BSD-style @c socket system call (no QoS). int open (ACE_Addr const & local = ACE_Addr::sap_any, @@ -67,7 +67,7 @@ class ACE_Export ACE_Ping_Socket : public ACE_ICMP_Socket bool to_connect = false, ACE_Time_Value const * timeout = &time_default_); - char * icmp_recv_buff (void); + char * icmp_recv_buff (); /// Dump the state of an object. void dump () const; @@ -76,7 +76,6 @@ class ACE_Export ACE_Ping_Socket : public ACE_ICMP_Socket ACE_ALLOC_HOOK_DECLARE; public: - enum { PING_BUFFER_SIZE = (1024 * 2) diff --git a/ACE/ace/Ping_Socket.inl b/ACE/ace/Ping_Socket.inl index b6fcf0be113fb..4c5373a3c86eb 100644 --- a/ACE/ace/Ping_Socket.inl +++ b/ACE/ace/Ping_Socket.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE char * -ACE_Ping_Socket::icmp_recv_buff (void) +ACE_Ping_Socket::icmp_recv_buff () { return this->icmp_recv_buff_; } diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp index 250764f93f654..dc6aa4c7ddf6f 100644 --- a/ACE/ace/Pipe.cpp +++ b/ACE/ace/Pipe.cpp @@ -97,10 +97,13 @@ ACE_Pipe::open (int buffer_size) } else { - ACE_INET_Addr sv_addr (my_addr.get_port_number (), ACE_LOCALHOST); - + ACE_INET_Addr sv_addr; + if (sv_addr.set (my_addr.get_port_number (), ACE_LOCALHOST) == -1) + { + result = -1; + } // Establish a connection within the same process. - if (connector.connect (writer, sv_addr) == -1) + else if (connector.connect (writer, sv_addr) == -1) { result = -1; } @@ -225,21 +228,6 @@ ACE_Pipe::open (int buffer_size) return -1; } # endif /* ! ACE_LACKS_SO_SNDBUF */ -# if defined (ACE_OPENVMS) && !defined (ACE_LACKS_TCP_NODELAY) - int one = 1; - // OpenVMS implements socketpair(AF_UNIX...) by returning AF_INET sockets. - // Since these are plagued by Nagle as any other INET socket we need to set - // TCP_NODELAY on the write handle. - if (ACE_OS::setsockopt (this->handles_[1], - ACE_IPPROTO_TCP, - TCP_NODELAY, - reinterpret_cast (&one), - sizeof (one)) == -1) - { - this->close (); - return -1; - } -# endif /* ACE_OPENVMS && !ACE_LACKS_TCP_NODELAY */ #endif /* ! ACE_LACKS_SOCKETPAIR && ! ACE_HAS_STREAM_PIPES */ // Point both the read and write HANDLES to the appropriate socket // HANDLEs. diff --git a/ACE/ace/Pipe.h b/ACE/ace/Pipe.h index c257341b3562c..c615f8870ccac 100644 --- a/ACE/ace/Pipe.h +++ b/ACE/ace/Pipe.h @@ -43,7 +43,7 @@ class ACE_Export ACE_Pipe { public: /// Default constructor (does nothing...). - ACE_Pipe (void); + ACE_Pipe (); /// Open the pipe and initialize the handles. ACE_Pipe (ACE_HANDLE handles[2]); @@ -52,7 +52,7 @@ class ACE_Export ACE_Pipe ACE_Pipe (ACE_HANDLE read, ACE_HANDLE write); /// Default dtor. It doesn't close the handles for you. - ~ACE_Pipe (void); + ~ACE_Pipe (); /// Open the pipe and initialize the handles. int open (ACE_HANDLE handles[2]); @@ -61,9 +61,9 @@ class ACE_Export ACE_Pipe int open (int buffer_size = ACE_DEFAULT_MAX_SOCKET_BUFSIZ); /// Close down the pipe HANDLEs; - int close (void); - int close_read (void); - int close_write (void); + int close (); + int close_read (); + int close_write (); // = Accessors. diff --git a/ACE/ace/Pipe.inl b/ACE/ace/Pipe.inl index 35af84ff28771..0e54a3c34d1f5 100644 --- a/ACE/ace/Pipe.inl +++ b/ACE/ace/Pipe.inl @@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Pipe::~ACE_Pipe (void) +ACE_Pipe::~ACE_Pipe () { ACE_TRACE ("ACE_Pipe::~ACE_Pipe"); // Notice that the destructor doesn't close the handles for you. diff --git a/ACE/ace/Priority_Reactor.cpp b/ACE/ace/Priority_Reactor.cpp index e441897254076..4036aaed213d6 100644 --- a/ACE/ace/Priority_Reactor.cpp +++ b/ACE/ace/Priority_Reactor.cpp @@ -2,7 +2,6 @@ #include "ace/Malloc_T.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL using QUEUE_ITERATOR = ACE_Unbounded_Queue_Iterator; @@ -148,7 +147,6 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles, while (!bucket_[i]->is_empty () && number_dispatched < number_of_active_handles) { - ACE_Event_Tuple et; bucket_[i]->dequeue_head (et); diff --git a/ACE/ace/Priority_Reactor.h b/ACE/ace/Priority_Reactor.h index 0ff760895bdfc..7368579d702b6 100644 --- a/ACE/ace/Priority_Reactor.h +++ b/ACE/ace/Priority_Reactor.h @@ -46,7 +46,7 @@ class ACE_Export ACE_Priority_Reactor : public ACE_Select_Reactor ACE_Timer_Queue * = 0); /// Close down the select_reactor and release all of its resources. - virtual ~ACE_Priority_Reactor (void); + virtual ~ACE_Priority_Reactor (); /// Dump the state of an object. void dump () const; @@ -68,7 +68,7 @@ class ACE_Export ACE_Priority_Reactor : public ACE_Select_Reactor private: /// A small helper to initialize the bucket. - void init_bucket (void); + void init_bucket (); /// Build the bucket from the given dispatch_mask. Return -1 on /// failure, 0 otherwise. diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index 61b7b9debe7f0..f3230148e5ca8 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -9,9 +9,9 @@ #include "ace/Object_Manager.h" #include "ace/Task_T.h" -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) +#if !defined (ACE_LACKS_ACE_SVCCONF) # include "ace/Service_Config.h" -#endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ +#endif /* !ACE_LACKS_ACE_SVCCONF */ #include "ace/Task_T.h" #include "ace/Log_Category.h" @@ -336,7 +336,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, # endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ # endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */ # endif /* ACE_POSIX_AIOCB_PROACTOR */ -#elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#elif defined (ACE_WIN32) // WIN_Proactor. ACE_NEW (implementation, ACE_WIN32_Proactor); @@ -437,13 +437,13 @@ ACE_Proactor::name () int ACE_Proactor::check_reconfiguration (ACE_Proactor *) { -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) +#if !defined (ACE_LACKS_ACE_SVCCONF) if (ACE_Service_Config::reconfig_occurred ()) { ACE_Service_Config::reconfigure (); return 1; } -#endif /* ! ACE_HAS_WINCE || ! ACE_LACKS_ACE_SVCCONF */ +#endif /* !ACE_LACKS_ACE_SVCCONF */ return 0; } @@ -1135,12 +1135,12 @@ ACE_Proactor::instance (ACE_Proactor *) } void -ACE_Proactor::close_singleton (void) +ACE_Proactor::close_singleton () { } int -ACE_Proactor::run_event_loop (void) +ACE_Proactor::run_event_loop () { // not implemented return -1; @@ -1154,14 +1154,14 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &) } int -ACE_Proactor::end_event_loop (void) +ACE_Proactor::end_event_loop () { // not implemented return -1; } sig_atomic_t -ACE_Proactor::event_loop_done (void) +ACE_Proactor::event_loop_done () { return sig_atomic_t (1); } diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h index a2c87f35cdf7f..556bb63b5884a 100644 --- a/ACE/ace/Proactor.h +++ b/ACE/ace/Proactor.h @@ -59,7 +59,7 @@ class ACE_Export ACE_Proactor_Handle_Timeout_Upcall public: /// Constructor. - ACE_Proactor_Handle_Timeout_Upcall (void); + ACE_Proactor_Handle_Timeout_Upcall (); /// This method is called when a timer is registered. int registration (ACE_Proactor_Timer_Queue &timer_queue, @@ -174,7 +174,7 @@ class ACE_Export ACE_Proactor ACE_Proactor_Timer_Queue *tq = 0); /// Destruction. - ~ACE_Proactor (void); + ~ACE_Proactor (); /// Get pointer to a process-wide ACE_Proactor. @a threads should /// be part of another method. @@ -186,23 +186,23 @@ class ACE_Export ACE_Proactor bool delete_proactor = false); /// Delete the dynamically allocated Singleton. - static void close_singleton (void); + static void close_singleton (); /// Cleanup method, used by the ACE_Object_Manager to destroy the /// singleton. static void cleanup (void *instance, void *arg); /// Name of dll in which the singleton instance lives. - static const ACE_TCHAR *dll_name (void); + static const ACE_TCHAR *dll_name (); /// Name of component--ACE_Proactor in this case. - static const ACE_TCHAR *name (void); + static const ACE_TCHAR *name (); // = Proactor event loop management methods. /// Run the event loop until the method /// returns -1 or the method is invoked. - static int run_event_loop (void); + static int run_event_loop (); /** * Run the event loop until the method @@ -217,13 +217,13 @@ class ACE_Export ACE_Proactor * This method wakes up all the threads blocked on waiting for * completions and end the event loop. */ - static int end_event_loop (void); + static int end_event_loop (); /** * Resets the static so that the * method can be restarted. */ - static int reset_event_loop (void); + static int reset_event_loop (); /** * The singleton proactor is used by the ACE_Service_Config. @@ -233,14 +233,14 @@ class ACE_Export ACE_Proactor static int check_reconfiguration (ACE_Proactor *); /// Report if the event loop is finished. - static int event_loop_done (void); + static int event_loop_done (); /// Close the associated @c ACE_Proactor_Impl implementation object. /** * If @arg delete_implementation was specified to the @c open() method, * the implementation object is also deleted. */ - int close (void); + int close (); /** * You can add a hook to various run_event methods and the hook will @@ -274,14 +274,14 @@ class ACE_Export ACE_Proactor * and notifies the ACE_Proactor so that it can wake up * and close down gracefully. */ - int proactor_end_event_loop (void); + int proactor_end_event_loop (); /// Report if the ACE_Proactor event loop is finished. - int proactor_event_loop_done (void); + int proactor_event_loop_done (); /// Resets the static so that the /// method can be restarted. - int proactor_reset_event_loop (void); + int proactor_reset_event_loop (); /// This method adds the @a handle to the I/O completion port. This @@ -354,10 +354,10 @@ class ACE_Export ACE_Proactor * @return Returns 1 when a completion is dispatched. On error, returns -1 * and sets errno accordingly. */ - int handle_events (void); + int handle_events (); /// Add wakeup dispatch threads (reinit). - int wake_up_dispatch_threads (void); + int wake_up_dispatch_threads (); /// Close all dispatch threads. int close_dispatch_threads (int wait); @@ -391,37 +391,37 @@ class ACE_Export ACE_Proactor /// Create the correct implementation class for doing /// Asynch_Read_Stream. - ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void); + ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (); /// Create the correct implementation class for doing /// Asynch_Write_Stream. - ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void); + ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (); /// Create the correct implementation class for doing /// Asynch_Read_File. - ACE_Asynch_Read_File_Impl *create_asynch_read_file (void); + ACE_Asynch_Read_File_Impl *create_asynch_read_file (); /// Create the correct implementation class for doing /// Asynch_Write_File. - ACE_Asynch_Write_File_Impl *create_asynch_write_file (void); + ACE_Asynch_Write_File_Impl *create_asynch_write_file (); /// Create the correct implementation class for doing Asynch_Accept. - ACE_Asynch_Accept_Impl *create_asynch_accept (void); + ACE_Asynch_Accept_Impl *create_asynch_accept (); /// Create the correct implementation class for doing Asynch_Connect. - ACE_Asynch_Connect_Impl *create_asynch_connect (void); + ACE_Asynch_Connect_Impl *create_asynch_connect (); /// Create the correct implementation class for doing /// Asynch_Transmit_File. - ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void); + ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (); /// Create the correct implementation class for doing /// Asynch_Read_Dgram. - ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void); + ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (); /// Create the correct implementation class for doing /// Asynch_Write_Dgram. - ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void); + ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (); // = Factory methods for the results @@ -561,7 +561,6 @@ class ACE_Export ACE_Proactor int signal_number = ACE_SIGRTMIN); protected: - /** * Post completions to the completion port so that all * threads can wake up. This is used in conjunction with the @@ -642,8 +641,8 @@ class ACE_Export ACE_Proactor class Timer_Queue {}; ACE_Proactor (size_t /* number_of_threads */ = 0, Timer_Queue * /* tq */ = 0) {} - ~ACE_Proactor (void) {} - int handle_events (void) { return -1; } + ~ACE_Proactor () {} + int handle_events () { return -1; } int handle_events (ACE_Time_Value &) { return -1; } /// Placeholder to enable compilation on non-Win32 platforms @@ -653,19 +652,19 @@ class ACE_Export ACE_Proactor static ACE_Proactor *instance (ACE_Proactor *); /// Placeholder to enable compilation on non-Win32 platforms - static void close_singleton (void); + static void close_singleton (); /// Placeholder to enable compilation on non-Win32 platforms - static int run_event_loop (void); + static int run_event_loop (); /// Placeholder to enable compilation on non-Win32 platforms static int run_event_loop (ACE_Time_Value &tv); /// Placeholder to enable compilation on non-Win32 platforms - static int end_event_loop (void); + static int end_event_loop (); /// Placeholder to enable compilation on non-Win32 platforms - static sig_atomic_t event_loop_done (void); + static sig_atomic_t event_loop_done (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Proactor.inl b/ACE/ace/Proactor.inl index c5027092b0467..e412c673504e0 100644 --- a/ACE/ace/Proactor.inl +++ b/ACE/ace/Proactor.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_Proactor::run_event_loop (void) +ACE_Proactor::run_event_loop () { ACE_TRACE ("ACE_Proactor::run_event_loop"); ACE_Proactor * const p = ACE_Proactor::instance (); @@ -27,7 +27,7 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &tv) } ACE_INLINE int -ACE_Proactor::reset_event_loop(void) +ACE_Proactor::reset_event_loop() { ACE_TRACE ("ACE_Proactor::reset_event_loop"); ACE_Proactor * const p = ACE_Proactor::instance (); @@ -39,7 +39,7 @@ ACE_Proactor::reset_event_loop(void) } ACE_INLINE int -ACE_Proactor::end_event_loop (void) +ACE_Proactor::end_event_loop () { ACE_TRACE ("ACE_Proactor::end_event_loop"); ACE_Proactor * const p = ACE_Proactor::instance (); @@ -51,7 +51,7 @@ ACE_Proactor::end_event_loop (void) } ACE_INLINE int -ACE_Proactor::event_loop_done (void) +ACE_Proactor::event_loop_done () { ACE_TRACE ("ACE_Proactor::event_loop_done"); ACE_Proactor * const p = ACE_Proactor::instance (); diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index 73547b9976b4f..afa7a0da98d5b 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -137,31 +137,7 @@ ACE_Process::spawn (ACE_Process_Options &options) } } -#if defined (ACE_HAS_WINCE) - // Note that WinCE does not have process name included in the command line as argv[0] - // like other OS environment. Therefore, it is user's whole responsibility to call - // 'ACE_Process_Options::process_name(const ACE_TCHAR *name)' to set the proper - // process name (the execution file name with path if needed). - BOOL fork_result = - ACE_TEXT_CreateProcess (options.process_name(), - options.command_line_buf(), - options.get_process_attributes(), // must be NULL in CE - options.get_thread_attributes(), // must be NULL in CE - options.handle_inheritance(), // must be false in CE - options.creation_flags(), // must be NULL in CE - options.env_buf(), // environment variables, must be NULL in CE - options.working_directory(), // must be NULL in CE - options.startup_info(), // must be NULL in CE - &this->process_info_); - - if (fork_result) - { - parent (this->getpid ()); - return this->getpid (); - } - return ACE_INVALID_PID; - -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) void* env_buf = options.env_buf (); DWORD flags = options.creation_flags (); # if defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) @@ -214,67 +190,6 @@ ACE_Process::spawn (ACE_Process_Options &options) return this->getpid (); } return ACE_INVALID_PID; - -#elif defined(ACE_OPENVMS) - if (ACE_BIT_ENABLED (options.creation_flags (), - ACE_Process_Options::NO_EXEC)) - ACE_NOTSUP_RETURN (ACE_INVALID_PID); - - int saved_stdin = ACE_STDIN; - int saved_stdout = ACE_STDOUT; - int saved_stderr = ACE_STDERR; - // Save STD file descriptors and redirect - if (options.get_stdin () != ACE_INVALID_HANDLE) { - if ((saved_stdin = ACE_OS::dup (ACE_STDIN)) == -1 && errno != EBADF) - ACE_OS::exit (errno); - if (ACE_OS::dup2 (options.get_stdin (), ACE_STDIN) == -1) - ACE_OS::exit (errno); - } - if (options.get_stdout () != ACE_INVALID_HANDLE) { - if ((saved_stdout = ACE_OS::dup (ACE_STDOUT)) == -1 && errno != EBADF) - ACE_OS::exit (errno); - if (ACE_OS::dup2 (options.get_stdout (), ACE_STDOUT) == -1) - ACE_OS::exit (errno); - } - if (options.get_stderr () != ACE_INVALID_HANDLE) { - if ((saved_stderr = ACE_OS::dup (ACE_STDERR)) == -1 && errno != EBADF) - ACE_OS::exit (errno); - if (ACE_OS::dup2 (options.get_stderr (), ACE_STDERR) == -1) - ACE_OS::exit (errno); - } - - if (options.working_directory () != 0) - ACE_NOTSUP_RETURN (ACE_INVALID_PID); - - this->child_id_ = vfork(); - if (this->child_id_ == 0) { - ACE_OS::execvp (options.process_name (), - options.command_line_argv ()); - // something went wrong - this->child_id_ = ACE_INVALID_PID; - } - - // restore STD file descriptors (if necessary) - if (options.get_stdin () != ACE_INVALID_HANDLE) { - if (saved_stdin == -1) - ACE_OS::close (ACE_STDIN); - else - ACE_OS::dup2 (saved_stdin, ACE_STDIN); - } - if (options.get_stdout () != ACE_INVALID_HANDLE) { - if (saved_stdout == -1) - ACE_OS::close (ACE_STDOUT); - else - ACE_OS::dup2 (saved_stdout, ACE_STDOUT); - } - if (options.get_stderr () != ACE_INVALID_HANDLE) { - if (saved_stderr == -1) - ACE_OS::close (ACE_STDERR); - else - ACE_OS::dup2 (saved_stderr, ACE_STDERR); - } - - return this->child_id_; #elif defined (ACE_VXWORKS) && defined (__RTP__) if (ACE_BIT_ENABLED (options.creation_flags (), ACE_Process_Options::NO_EXEC)) @@ -761,8 +676,7 @@ ACE_Process::close_passed_handles () } #if defined (ACE_WIN32) && \ - defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) && \ - !defined (ACE_HAS_WINCE) + defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) wchar_t* ACE_Process::convert_env_buffer (const char* env) const { @@ -818,12 +732,9 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, size_t max_env_args, size_t max_cmdline_args) : -#if !defined (ACE_HAS_WINCE) inherit_environment_ (inherit_environment), -#endif /* ACE_HAS_WINCE */ creation_flags_ (0), avoid_zombies_ (0), -#if !defined (ACE_HAS_WINCE) #if defined (ACE_WIN32) environment_inherited_ (0), process_attributes_ (0), @@ -847,7 +758,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, environment_buf_len_ (env_buf_len), max_environment_args_ (max_env_args), max_environ_argv_index_ (max_env_args - 1), -#endif /* !ACE_HAS_WINCE */ command_line_argv_calculated_ (false), command_line_buf_ (0), command_line_copy_ (0), @@ -867,13 +777,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, command_line_buf_[0] = '\0'; process_name_[0] = '\0'; -#if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG(inherit_environment); - ACE_UNUSED_ARG(env_buf_len); - ACE_UNUSED_ARG(max_env_args); -#endif - -#if !defined (ACE_HAS_WINCE) working_directory_[0] = '\0'; #if defined (ACE_HAS_ALLOC_HOOKS) ACE_ALLOCATOR (environment_buf_, @@ -897,7 +800,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, sizeof this->startup_info_); this->startup_info_.cb = sizeof this->startup_info_; #endif /* ACE_WIN32 */ -#endif /* !ACE_HAS_WINCE */ #if defined (ACE_HAS_ALLOC_HOOKS) ACE_ALLOCATOR (command_line_argv_, static_cast(ACE_Allocator::instance()->malloc(sizeof(ACE_TCHAR*) * max_cmdline_args))); @@ -907,10 +809,9 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, #endif /* ACE_HAS_ALLOC_HOOKS */ } -#if !defined (ACE_HAS_WINCE) #if defined (ACE_WIN32) void -ACE_Process_Options::inherit_environment (void) +ACE_Process_Options::inherit_environment () { // Ensure only once execution. if (environment_inherited_) @@ -928,8 +829,8 @@ ACE_Process_Options::inherit_environment (void) for (WCHAR *iter = existing_wide_env; *iter; ++iter) { ACE_Wide_To_Ascii wta (iter); - size_t len = ACE_OS::strlen (wta.char_rep ()); - size_t idx = temp_narrow_env.size (); + size_t const len = ACE_OS::strlen (wta.char_rep ()); + size_t const idx = temp_narrow_env.size (); temp_narrow_env.resize (idx + len + 1, 0); ACE_OS::strncpy (&temp_narrow_env[idx], wta.char_rep (), len); iter += len; @@ -945,7 +846,7 @@ ACE_Process_Options::inherit_environment (void) while (existing_environment[slot] != '\0') { - size_t len = ACE_OS::strlen (existing_environment + slot); + size_t const len = ACE_OS::strlen (existing_environment + slot); // Add the string to our env buffer. if (this->setenv_i (existing_environment + slot, len) == -1) @@ -975,7 +876,6 @@ ACE_Process_Options::env_argv () { return environment_argv_; } - #endif /* ACE_WIN32 */ int @@ -984,8 +884,7 @@ ACE_Process_Options::setenv (ACE_TCHAR *envp[]) int i = 0; while (envp[i]) { - if (this->setenv_i (envp[i], - ACE_OS::strlen (envp[i])) == -1) + if (this->setenv_i (envp[i], ACE_OS::strlen (envp[i])) == -1) return -1; i++; } @@ -1009,8 +908,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *format, ...) va_start (argp, format); // Add the rest of the varargs. - int status = ACE_OS::vsnprintf (stack_buf, DEFAULT_COMMAND_LINE_BUF_LEN, - format, argp); + int status = ACE_OS::vsnprintf (stack_buf, DEFAULT_COMMAND_LINE_BUF_LEN, format, argp); // End varargs. va_end (argp); @@ -1018,8 +916,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *format, ...) return -1; // Append the string to are environment buffer. - if (this->setenv_i (stack_buf, - ACE_OS::strlen (stack_buf)) == -1) + if (this->setenv_i (stack_buf, ACE_OS::strlen (stack_buf)) == -1) return -1; #if defined (ACE_WIN32) @@ -1041,14 +938,9 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name, ACE_NEW_RETURN (newformat, ACE_TCHAR[buflen], -1); std::unique_ptr safe_newformat (newformat); -# if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - const ACE_TCHAR *fmt = ACE_TEXT ("%ls=%ls"); -# else - const ACE_TCHAR *fmt = ACE_TEXT ("%s=%s"); -# endif - // Add in the variable name. - ACE_OS::snprintf (safe_newformat.get (), buflen, fmt, + ACE_OS::snprintf (safe_newformat.get (), buflen, + ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT ("=%") ACE_TEXT_PRIs, variable_name, format); // Add the rest of the varargs. @@ -1141,8 +1033,7 @@ ACE_Process_Options::setenv_i (ACE_TCHAR *assignment, len * sizeof (ACE_TCHAR)); // Update the argv array. - environment_argv_[environment_argv_index_++] = - environment_buf_ + environment_buf_index_; + environment_argv_[environment_argv_index_++] = environment_buf_ + environment_buf_index_; environment_argv_[environment_argv_index_] = 0; // Update our index. @@ -1176,7 +1067,6 @@ ACE_Process_Options::set_handles (ACE_HANDLE std_in, // processes that were launched from services. In this case we need to make // sure not to return -1 from setting std_in so that we can process std_out // and std_err. - if (std_in) { if (!::DuplicateHandle (::GetCurrentProcess (), @@ -1239,12 +1129,9 @@ ACE_Process_Options::release_handles () set_handles_called_ = 0; } } -#endif /* !ACE_HAS_WINCE */ - ACE_Process_Options::~ACE_Process_Options () { -#if !defined (ACE_HAS_WINCE) release_handles(); #if defined (ACE_HAS_ALLOC_HOOKS) ACE_Allocator::instance()->free(environment_buf_); @@ -1253,7 +1140,6 @@ ACE_Process_Options::~ACE_Process_Options () delete [] environment_buf_; delete [] environment_argv_; #endif /* ACE_HAS_ALLOC_HOOKS */ -#endif /* !ACE_HAS_WINCE */ #if defined (ACE_HAS_ALLOC_HOOKS) ACE_Allocator::instance()->free(command_line_buf_); #else @@ -1336,11 +1222,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...) return 0; } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE) -/** - * @note Not available on Windows CE because it doesn't have a char version of - * vsprintf. - */ +#if defined (ACE_HAS_WCHAR) int ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...) { @@ -1367,20 +1249,16 @@ ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...) command_line_argv_calculated_ = false; return 0; } -#endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */ +#endif /* ACE_HAS_WCHAR */ #endif // ACE_LACKS_VA_FUNCTIONS ACE_TCHAR * ACE_Process_Options::env_buf () { -#if !defined (ACE_HAS_WINCE) if (environment_buf_[0] == '\0') return 0; else return environment_buf_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_TCHAR * const * @@ -1421,12 +1299,8 @@ ACE_Process_Options::command_line_argv () int ACE_Process_Options::pass_handle (ACE_HANDLE h) { -#if defined (ACE_HAS_WINCE) - ACE_NOTSUP_RETURN (-1); -#else this->handles_passed_.set_bit (h); return 0; -#endif /* ACE_HAS_WINCE */ } // Get a copy of the handles the ACE_Process_Options duplicated @@ -1453,10 +1327,6 @@ ACE_Process_Options::passed_handles (ACE_Handle_Set &set) const return 1; } -ACE_Managed_Process::~ACE_Managed_Process () -{ -} - ACE_ALLOC_HOOK_DEFINE(ACE_Managed_Process) void diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h index 045daf6022927..70aa7c2f0d306 100644 --- a/ACE/ace/Process.h +++ b/ACE/ace/Process.h @@ -35,11 +35,6 @@ class ACE_Time_Value; * * This class controls the options passed to (or * and ). - * Notice that on Windows CE, creating a process merely means - * instantiating a new process. You can't set the handles (since - * there's no stdin, stdout and stderr,) specify process/thread - * options, set environment,... So, basically, this class only - * set the command line and nothing else. * Notice that on UNIX platforms, if the is used, the * is using the system call. It means that the * should include a full path to the program file @@ -169,10 +164,10 @@ class ACE_Export ACE_Process_Options #endif /* !ACE_USES_WCHAR */ ; -#if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WCHAR) /// Anti-TChar version of command_line () int command_line (const ACE_ANTI_TCHAR *format, ...); -#endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */ +#endif /* ACE_HAS_WCHAR */ #endif // ACE_LACKS_VA_FUNCTIONS /// Same as above in argv format. @a argv must be null terminated. @@ -307,7 +302,7 @@ class ACE_Export ACE_Process_Options // = Non-portable accessors for when you "just have to use them." /// Used for setting and getting. - ACE_TEXT_STARTUPINFO *startup_info (void); + ACE_TEXT_STARTUPINFO *startup_info (); /// Get the process_attributes. Returns NULL if /// set_process_attributes has not been set. @@ -315,7 +310,7 @@ class ACE_Export ACE_Process_Options /// If this is called, a non-null process attributes is sent to /// CreateProcess. - LPSECURITY_ATTRIBUTES set_process_attributes (void); + LPSECURITY_ATTRIBUTES set_process_attributes (); /// Get the thread_attributes. Returns NULL if set_thread_attributes /// has not been set. @@ -323,7 +318,7 @@ class ACE_Export ACE_Process_Options /// If this is called, a non-null thread attributes is sent to /// CreateProcess. - LPSECURITY_ATTRIBUTES set_thread_attributes (void); + LPSECURITY_ATTRIBUTES set_thread_attributes (); /// Get user token. Return ACE_INVALID_HANDLE if it has not been set. HANDLE get_user_token () const; @@ -365,8 +360,6 @@ class ACE_Export ACE_Process_Options void inherit_environment (bool nv); #endif /* ACE_WIN32 */ protected: - -#if !defined (ACE_HAS_WINCE) /// Add @a assignment to environment_buf_ and adjust /// environment_argv_. @a len is the strlen of @a assignment. int setenv_i (ACE_TCHAR *assignment, size_t len); @@ -374,7 +367,6 @@ class ACE_Export ACE_Process_Options /// Whether the child process inherits the current process /// environment. bool inherit_environment_; -#endif /* !ACE_HAS_WINCE */ /// Default 0. u_long creation_flags_; @@ -382,10 +374,10 @@ class ACE_Export ACE_Process_Options /// Avoid zombies for spawned processes. int avoid_zombies_; -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) /// Helper function to grab win32 environment and stick it in /// environment_buf_ using this->setenv_i. - void inherit_environment (void); + void inherit_environment (); /// Ensures once only call to inherit environment. int environment_inherited_; @@ -425,7 +417,6 @@ class ACE_Export ACE_Process_Options /// Default true. bool handle_inheritance_; -#if !defined (ACE_HAS_WINCE) /// Is 1 if stdhandles was called. int set_handles_called_; @@ -453,7 +444,6 @@ class ACE_Export ACE_Process_Options /// The current working directory. ACE_TCHAR working_directory_[MAXPATHLEN + 1]; -#endif /* !ACE_HAS_WINCE */ /// Ensures command_line_argv is only calculated once. bool command_line_argv_calculated_; @@ -638,7 +628,7 @@ class ACE_Export ACE_Process void close_passed_handles (); #if defined (ACE_WIN32) - PROCESS_INFORMATION process_info (void); + PROCESS_INFORMATION process_info (); #endif /* ACE_WIN32 */ private: @@ -668,9 +658,7 @@ class ACE_Export ACE_Process ACE_Handle_Set dup_handles_; private: -#if defined (ACE_WIN32) && \ - defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) && \ - !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) wchar_t* convert_env_buffer (const char* env) const; #endif }; @@ -688,13 +676,12 @@ class ACE_Export ACE_Managed_Process : public ACE_Process { public: /// Cleanup by deleting @c this. - virtual void unmanage (); + void unmanage () override; ACE_ALLOC_HOOK_DECLARE; protected: - /// Make sure that we're allocated dynamically! - virtual ~ACE_Managed_Process (); + ~ACE_Managed_Process () override = default; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl index 23632aece85b0..4b742af07e495 100644 --- a/ACE/ace/Process.inl +++ b/ACE/ace/Process.inl @@ -28,7 +28,7 @@ ACE_Process_Options::use_unicode_environment () const #if defined (ACE_WIN32) ACE_INLINE PROCESS_INFORMATION -ACE_Process::process_info (void) +ACE_Process::process_info () { return process_info_; } @@ -115,7 +115,7 @@ ACE_Process::exit_code (ACE_exitcode code) ACE_INLINE u_long ACE_Process_Options::creation_flags () const { -#if defined (ACE_USES_WCHAR) && defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_USES_WCHAR) && defined (ACE_WIN32) return creation_flags_ | CREATE_UNICODE_ENVIRONMENT; #else return creation_flags_; @@ -168,55 +168,35 @@ ACE_Process_Options::avoid_zombies (int avoid_zombies) #if defined (ACE_WIN32) ACE_INLINE ACE_TEXT_STARTUPINFO * -ACE_Process_Options::startup_info (void) +ACE_Process_Options::startup_info () { -#if !defined (ACE_HAS_WINCE) return &startup_info_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE LPSECURITY_ATTRIBUTES ACE_Process_Options::get_process_attributes () const { -#if !defined (ACE_HAS_WINCE) return process_attributes_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE LPSECURITY_ATTRIBUTES -ACE_Process_Options::set_process_attributes (void) +ACE_Process_Options::set_process_attributes () { -#if !defined (ACE_HAS_WINCE) process_attributes_ = &security_buf1_; return process_attributes_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE LPSECURITY_ATTRIBUTES ACE_Process_Options::get_thread_attributes () const { -#if !defined (ACE_HAS_WINCE) return thread_attributes_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE LPSECURITY_ATTRIBUTES -ACE_Process_Options::set_thread_attributes (void) +ACE_Process_Options::set_thread_attributes () { -#if !defined (ACE_HAS_WINCE) thread_attributes_ = &security_buf2_; return thread_attributes_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE HANDLE ACE_Process_Options::get_user_token () const @@ -338,35 +318,23 @@ ACE_Process_Options::command_line_buf (size_t *max_lenp) ACE_INLINE ACE_TCHAR * ACE_Process_Options::working_directory () { -#if !defined (ACE_HAS_WINCE) if (working_directory_[0] == '\0') return 0; else return working_directory_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE void ACE_Process_Options::working_directory (const char *wd) { -#if !defined(ACE_HAS_WINCE) ACE_OS::strcpy (working_directory_, ACE_TEXT_CHAR_TO_TCHAR (wd)); -#else - ACE_UNUSED_ARG (wd); -#endif /* !ACE_HAS_WINCE */ } #if defined (ACE_HAS_WCHAR) ACE_INLINE void ACE_Process_Options::working_directory (const wchar_t *wd) { -#if !defined(ACE_HAS_WINCE) ACE_OS::strcpy (working_directory_, ACE_TEXT_WCHAR_TO_TCHAR (wd)); -#else - ACE_UNUSED_ARG (wd); -#endif /* !ACE_HAS_WINCE */ } #endif /* ACE_HAS_WCHAR */ @@ -385,38 +353,4 @@ ACE_Process_Options::process_name () return this->process_name_; } -#if defined (ACE_HAS_WINCE) -// Here is a collection of inline functions which are defined only -// under CE. They are not empty on most other platforms. - -ACE_INLINE int -ACE_Process_Options::setenv (ACE_TCHAR * /* envp */[]) -{ - return -1; -} - -ACE_INLINE int -ACE_Process_Options::setenv (const ACE_TCHAR * /* format */, ...) -{ - return -1; -} - -ACE_INLINE int -ACE_Process_Options::setenv (const ACE_TCHAR * /* variable_name */, - const ACE_TCHAR * /* format */, - ...) -{ - return -1; -} - -ACE_INLINE int -ACE_Process_Options::set_handles (ACE_HANDLE /* std_in */, - ACE_HANDLE /* std_out */, - ACE_HANDLE /* std_err */) -{ - return -1; -} - -#endif /* ACE_HAS_WINCE */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Process_Mutex.h b/ACE/ace/Process_Mutex.h index aacf8700d3952..c68638f7d2681 100644 --- a/ACE/ace/Process_Mutex.h +++ b/ACE/ace/Process_Mutex.h @@ -126,7 +126,7 @@ class ACE_Export ACE_Process_Mutex * @note The destructor will not release an acquired mutex except * on Windows. */ - ~ACE_Process_Mutex (void); + ~ACE_Process_Mutex (); /** * Explicitly destroy the mutex. Note that only one thread should @@ -135,14 +135,14 @@ class ACE_Export ACE_Process_Mutex * * @return 0 on success; -1 on failure. */ - int remove (void); + int remove (); /** * Acquire lock ownership (wait on queue if necessary). * * @return 0 on success; -1 on failure. */ - int acquire (void); + int acquire (); /** * Acquire lock ownership, but timeout if lock if hasn't been @@ -161,37 +161,37 @@ class ACE_Export ACE_Process_Mutex * @return 0 on success; -1 on failure. If the lock could not be acquired * because someone else already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /// Release lock and unblock a thread at head of queue. - int release (void); + int release (); /// Acquire lock ownership (wait on queue if necessary). - int acquire_read (void); + int acquire_read (); /// Acquire lock ownership (wait on queue if necessary). - int acquire_write (void); + int acquire_write (); /** * Conditionally acquire a lock (i.e., won't block). Returns -1 on * failure. If we "failed" because someone else already had the * lock, @c errno is set to @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /** * Conditionally acquire a lock (i.e., won't block). Returns -1 on * failure. If we "failed" because someone else already had the * lock, @c errno is set to @c EBUSY. */ - int tryacquire_write (void); + int tryacquire_write (); /** * This is only here for consistency with the other synchronization * APIs and usability with Lock adapters. Assumes the caller already has * acquired the mutex and returns 0 in all cases. */ - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); #if !defined (_ACE_USE_SV_SEM) /// Return the underlying mutex. @@ -217,7 +217,7 @@ class ACE_Export ACE_Process_Mutex ACE_TCHAR name_[ACE_UNIQUE_NAME_LEN]; /// Create and return the unique name. - const ACE_TCHAR *unique_name (void); + const ACE_TCHAR *unique_name (); #if defined (_ACE_USE_SV_SEM) /// We need this to get the right semantics... diff --git a/ACE/ace/Process_Mutex.inl b/ACE/ace/Process_Mutex.inl index 717f495042135..9a1b37a5f9994 100644 --- a/ACE/ace/Process_Mutex.inl +++ b/ACE/ace/Process_Mutex.inl @@ -12,14 +12,14 @@ ACE_Process_Mutex::lock () const // Explicitly destroy the mutex. ACE_INLINE int -ACE_Process_Mutex::remove (void) +ACE_Process_Mutex::remove () { return this->lock_.remove (); } // Acquire lock ownership (wait on priority queue if necessary). ACE_INLINE int -ACE_Process_Mutex::acquire (void) +ACE_Process_Mutex::acquire () { #if defined (_ACE_USE_SV_SEM) return this->lock_.acquire (0, SEM_UNDO); @@ -42,7 +42,7 @@ ACE_Process_Mutex::acquire (ACE_Time_Value &tv) // Conditionally acquire lock (i.e., don't wait on queue). ACE_INLINE int -ACE_Process_Mutex::tryacquire (void) +ACE_Process_Mutex::tryacquire () { #if defined (_ACE_USE_SV_SEM) return this->lock_.tryacquire (0, SEM_UNDO); @@ -53,7 +53,7 @@ ACE_Process_Mutex::tryacquire (void) // Release lock and unblock a thread at head of priority queue. ACE_INLINE int -ACE_Process_Mutex::release (void) +ACE_Process_Mutex::release () { #if defined (_ACE_USE_SV_SEM) return this->lock_.release (0, SEM_UNDO); @@ -64,7 +64,7 @@ ACE_Process_Mutex::release (void) // Acquire lock ownership (wait on priority queue if necessary). ACE_INLINE int -ACE_Process_Mutex::acquire_read (void) +ACE_Process_Mutex::acquire_read () { #if defined (_ACE_USE_SV_SEM) return this->lock_.acquire_read (0, SEM_UNDO); @@ -75,7 +75,7 @@ ACE_Process_Mutex::acquire_read (void) // Acquire lock ownership (wait on priority queue if necessary). ACE_INLINE int -ACE_Process_Mutex::acquire_write (void) +ACE_Process_Mutex::acquire_write () { #if defined (_ACE_USE_SV_SEM) return this->lock_.acquire_write (0, SEM_UNDO); @@ -86,7 +86,7 @@ ACE_Process_Mutex::acquire_write (void) // Conditionally acquire a lock (i.e., won't block). ACE_INLINE int -ACE_Process_Mutex::tryacquire_read (void) +ACE_Process_Mutex::tryacquire_read () { #if defined (_ACE_USE_SV_SEM) return this->lock_.tryacquire_read (0, SEM_UNDO); @@ -97,7 +97,7 @@ ACE_Process_Mutex::tryacquire_read (void) // Conditionally acquire a lock (i.e., won't block). ACE_INLINE int -ACE_Process_Mutex::tryacquire_write (void) +ACE_Process_Mutex::tryacquire_write () { #if defined (_ACE_USE_SV_SEM) return this->lock_.tryacquire_write (0, SEM_UNDO); @@ -107,7 +107,7 @@ ACE_Process_Mutex::tryacquire_write (void) } ACE_INLINE int -ACE_Process_Mutex::tryacquire_write_upgrade (void) +ACE_Process_Mutex::tryacquire_write_upgrade () { return 0; } diff --git a/ACE/ace/Process_Semaphore.h b/ACE/ace/Process_Semaphore.h index 8d6860fa2adcf..e8fed85e7c499 100644 --- a/ACE/ace/Process_Semaphore.h +++ b/ACE/ace/Process_Semaphore.h @@ -51,11 +51,11 @@ class ACE_Export ACE_Process_Semaphore * should call this method since it doesn't protect against race * conditions. */ - int remove (void); + int remove (); /// Block the thread until the semaphore count becomes greater than /// 0, then decrement it. - int acquire (void); + int acquire (); /** * Conditionally decrement the semaphore if count is greater than 0 @@ -63,24 +63,24 @@ class ACE_Export ACE_Process_Semaphore * because someone else already had the lock, @c errno is set to * @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /// Increment the semaphore, potentially unblocking a waiting thread. - int release (void); + int release (); /** * Acquire semaphore ownership. This calls acquire() and is only * here to make the ACE_Process_Semaphore interface consistent * with the other synchronization APIs. */ - int acquire_read (void); + int acquire_read (); /** * Acquire semaphore ownership. This calls acquire() and is only * here to make the ACE_Process_Semaphore interface consistent * with the other synchronization APIs. */ - int acquire_write (void); + int acquire_write (); /** * Conditionally acquire semaphore (i.e., won't block). This calls @@ -89,7 +89,7 @@ class ACE_Export ACE_Process_Semaphore * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /** * Conditionally acquire semaphore (i.e., won't block). This calls @@ -98,7 +98,7 @@ class ACE_Export ACE_Process_Semaphore * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire_write (void); + int tryacquire_write (); /** * This is only here to make the ACE_Process_Semaphore @@ -106,7 +106,7 @@ class ACE_Export ACE_Process_Semaphore * Assumes the caller has already acquired the semaphore using one of * the above calls, and returns 0 (success) always. */ - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) /// Return the underlying lock. diff --git a/ACE/ace/Process_Semaphore.inl b/ACE/ace/Process_Semaphore.inl index 4abff5c70c006..d80c98e57d49d 100644 --- a/ACE/ace/Process_Semaphore.inl +++ b/ACE/ace/Process_Semaphore.inl @@ -15,7 +15,7 @@ ACE_Process_Semaphore::lock () const // other synchronization APIs. ACE_INLINE int -ACE_Process_Semaphore::acquire_read (void) +ACE_Process_Semaphore::acquire_read () { return this->acquire (); } @@ -25,7 +25,7 @@ ACE_Process_Semaphore::acquire_read (void) // other synchronization APIs. ACE_INLINE int -ACE_Process_Semaphore::acquire_write (void) +ACE_Process_Semaphore::acquire_write () { return this->acquire (); } @@ -35,7 +35,7 @@ ACE_Process_Semaphore::acquire_write (void) // interface consistent with the other synchronization APIs. ACE_INLINE int -ACE_Process_Semaphore::tryacquire_read (void) +ACE_Process_Semaphore::tryacquire_read () { return this->tryacquire (); } @@ -45,7 +45,7 @@ ACE_Process_Semaphore::tryacquire_read (void) // interface consistent with the other synchronization APIs. ACE_INLINE int -ACE_Process_Semaphore::tryacquire_write (void) +ACE_Process_Semaphore::tryacquire_write () { return this->tryacquire (); } @@ -55,7 +55,7 @@ ACE_Process_Semaphore::tryacquire_write (void) // Assumes the caller has already acquired the semaphore using one of // the above calls, and returns 0 (success) always. ACE_INLINE int -ACE_Process_Semaphore::tryacquire_write_upgrade (void) +ACE_Process_Semaphore::tryacquire_write_upgrade () { return 0; } diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp index 1dd78c0accbc7..838e7860b8ae3 100644 --- a/ACE/ace/Profile_Timer.cpp +++ b/ACE/ace/Profile_Timer.cpp @@ -7,12 +7,7 @@ #include "ace/Log_Category.h" #include "ace/OS_NS_string.h" -#if defined (ACE_HAS_PRUSAGE_T) -#include "ace/OS_NS_fcntl.h" -#include "ace/OS_NS_unistd.h" -#endif - -#if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32) +#if defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) #include "ace/OS_NS_stdio.h" #if defined (ACE_HAS_ALLOC_HOOKS) @@ -40,32 +35,17 @@ ACE_Profile_Timer::ACE_Profile_Timer () ACE_OS::memset (&this->begin_usage_, 0, sizeof this->begin_usage_); ACE_OS::memset (&this->last_usage_, 0, sizeof this->last_usage_); -# if defined (ACE_HAS_PRUSAGE_T) - ACE_OS::memset (&this->last_usage_, 0, sizeof this->last_usage_); - char buf[20]; - ACE_OS::sprintf (buf, 20, "/proc/%d", static_cast (ACE_OS::getpid ())); - - this->proc_handle_ = ACE_OS::open (buf, O_RDONLY, 0); - if (this->proc_handle_ == -1) - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - buf)); -# elif defined (ACE_HAS_GETRUSAGE) +# if defined (ACE_HAS_GETRUSAGE) ACE_OS::memset (&this->begin_time_, 0, sizeof this->begin_time_); ACE_OS::memset (&this->end_time_, 0, sizeof this->end_time_); ACE_OS::memset (&this->last_time_, 0, sizeof this->last_time_); -# endif /* ACE_HAS_PRUSAGE_T */ +# endif /* ACE_HAS_GETRUSAGE */ } // Terminate the interval timer. ACE_Profile_Timer::~ACE_Profile_Timer () { ACE_TRACE ("ACE_Profile_Timer::~ACE_Profile_Timer"); -# if defined (ACE_HAS_PRUSAGE_T) - if (ACE_OS::close (this->proc_handle_) == -1) - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_Profile_Timer::~ACE_Profile_Timer"))); -# endif /* ACE_HAS_PRUSAGE_T */ } // Return the resource utilization. @@ -77,92 +57,7 @@ ACE_Profile_Timer::get_rusage (ACE_Profile_Timer::Rusage &usage) usage = this->end_usage_; } -# if defined (ACE_HAS_PRUSAGE_T) - -// Compute the amount of resource utilization since the start time. - -void -ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &rusage) -{ - ACE_TRACE ("ACE_Profile_Timer::elapsed_rusage"); - rusage.pr_lwpid = - this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid; - rusage.pr_count = - this->end_usage_.pr_count - this->last_usage_.pr_count; - rusage.pr_minf = - this->end_usage_.pr_minf - this->last_usage_.pr_minf; - rusage.pr_majf = - this->end_usage_.pr_majf - this->last_usage_.pr_majf; - rusage.pr_inblk = - this->end_usage_.pr_inblk - this->last_usage_.pr_inblk; - rusage.pr_oublk = - this->end_usage_.pr_oublk - this->last_usage_.pr_oublk; - rusage.pr_msnd = - this->end_usage_.pr_msnd - this->last_usage_.pr_msnd; - rusage.pr_mrcv = - this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv; - rusage.pr_sigs = - this->end_usage_.pr_sigs - this->last_usage_.pr_sigs; - this->subtract (rusage.pr_wtime, - this->end_usage_.pr_wtime, - this->last_usage_.pr_wtime); - this->subtract (rusage.pr_ltime, - this->end_usage_.pr_ltime, - this->last_usage_.pr_ltime); - this->subtract (rusage.pr_slptime, - this->end_usage_.pr_slptime, - this->last_usage_.pr_slptime); - rusage.pr_vctx = - this->end_usage_.pr_vctx - this->last_usage_.pr_vctx; - rusage.pr_ictx = - this->end_usage_.pr_ictx - this->last_usage_.pr_ictx; - rusage.pr_sysc = - this->end_usage_.pr_sysc - this->last_usage_.pr_sysc; - rusage.pr_ioch = - this->end_usage_.pr_ioch - this->last_usage_.pr_ioch; -} - -// Compute the elapsed time. - -void -ACE_Profile_Timer::compute_times (ACE_Elapsed_Time &et) -{ - ACE_TRACE ("ACE_Profile_Timer::compute_times"); - timespec_t td; - - ACE_Profile_Timer::Rusage &end = this->end_usage_; - ACE_Profile_Timer::Rusage &begin = this->begin_usage_; - - this->subtract (td, end.pr_tstamp, begin.pr_tstamp); - // Convert nanoseconds into seconds. - et.real_time = td.tv_sec + ((double) td.tv_nsec) / ACE_ONE_SECOND_IN_NSECS; - this->subtract (td, end.pr_utime, begin.pr_utime); - // Convert nanoseconds into seconds. - et.user_time = td.tv_sec + ((double) td.tv_nsec) / ACE_ONE_SECOND_IN_NSECS; - this->subtract (td, end.pr_stime, begin.pr_stime); - // Convert nanoseconds into seconds. - et.system_time = td.tv_sec + ((double) td.tv_nsec) / ACE_ONE_SECOND_IN_NSECS; -} - -// Determine the difference between T1 and T2. - -void -ACE_Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) -{ - ACE_TRACE ("ACE_Profile_Timer::subtract"); - tdiff.tv_sec = t1.tv_sec - t0.tv_sec; - tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; - - // Normalize the time. - - while (tdiff.tv_nsec < 0) - { - tdiff.tv_sec--; - tdiff.tv_nsec += ACE_ONE_SECOND_IN_NSECS; - } -} - -# elif defined (ACE_HAS_GETRUSAGE) +# if defined (ACE_HAS_GETRUSAGE) // Compute the amount of resource utilization since the start time. void @@ -255,7 +150,7 @@ ACE_Profile_Timer::subtract (timeval &tdiff, timeval &t1, timeval &t0) } } -# endif /* ACE_HAS_PRUSAGE_T */ +# endif /* ACE_HAS_GETRUSAGE */ // Compute the amount of time that has elapsed between start and stop. @@ -269,7 +164,7 @@ ACE_Profile_Timer::elapsed_time (ACE_Elapsed_Time &et) ACE_END_VERSIONED_NAMESPACE_DECL -#elif defined (ACE_WIN32) /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) */ +#elif defined (ACE_WIN32) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -283,7 +178,7 @@ ACE_Profile_Timer::dump () const } // Initialize interval timer. -ACE_Profile_Timer::ACE_Profile_Timer (void) +ACE_Profile_Timer::ACE_Profile_Timer () : timer_ () { ACE_TRACE ("ACE_Profile_Timer::ACE_Profile_Timer"); @@ -394,7 +289,7 @@ ACE_Profile_Timer::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_Profile_Timer::ACE_Profile_Timer (void) +ACE_Profile_Timer::ACE_Profile_Timer () : timer_ () { ACE_TRACE ("ACE_Profile_Timer::ACE_Profile_Timer"); @@ -433,5 +328,4 @@ ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* defined (ACE_HAS_PRUSAGE_T) || - defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) */ +#endif /* defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) */ diff --git a/ACE/ace/Profile_Timer.h b/ACE/ace/Profile_Timer.h index f26e173fd1e33..9419f19c50594 100644 --- a/ACE/ace/Profile_Timer.h +++ b/ACE/ace/Profile_Timer.h @@ -61,10 +61,10 @@ class ACE_Export ACE_Profile_Timer // = Timer methods. /// Activate the timer. - int start (void); + int start (); /// Stop the timer. - int stop (void); + int stop (); // = Resource utilization methods. /// Compute the time elapsed between calls to @c start() and @c stop(). @@ -96,14 +96,7 @@ class ACE_Export ACE_Profile_Timer /// Keep track of the last rusage for incremental timing. ACE_Profile_Timer::Rusage last_usage_; -#if defined (ACE_HAS_PRUSAGE_T) - /// Subtract two timestructs and store their difference. - void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); - - /// I/O handle for /proc file system. - ACE_HANDLE proc_handle_; - -#elif defined (ACE_HAS_GETRUSAGE) +#if defined (ACE_HAS_GETRUSAGE) /// Subtract two timestructs and store their difference. void subtract (timeval &tdiff, timeval &t0, @@ -117,12 +110,12 @@ class ACE_Export ACE_Profile_Timer /// Keep track of the last time for incremental timing. timeval last_time_; -#endif /* ACE_HAS_PRUSAGE_T */ +#endif /* ACE_HAS_GETRUSAGE */ -#if defined (ACE_WIN32) || (!defined (ACE_HAS_PRUSAGE_T) && !defined (ACE_HAS_GETRUSAGE)) +#if defined (ACE_WIN32) || !defined (ACE_HAS_GETRUSAGE) /// The high resolution timer ACE_High_Res_Timer timer_; -#endif /* ACE_WIN32 || !ACE_HAS_PRUSAGE_T && !ACE_HAS_GETRUSAGE */ +#endif /* ACE_WIN32 || !ACE_HAS_GETRUSAGE */ }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Profile_Timer.inl b/ACE/ace/Profile_Timer.inl index d0fd3afc58f1e..f4be327fac877 100644 --- a/ACE/ace/Profile_Timer.inl +++ b/ACE/ace/Profile_Timer.inl @@ -3,35 +3,8 @@ #include "ace/OS_NS_sys_resource.h" #include "ace/Global_Macros.h" -#if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32) - -# if defined (ACE_HAS_PRUSAGE_T) -# include "ace/OS_NS_stropts.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE int -ACE_Profile_Timer::start () -{ - ACE_TRACE ("ACE_Profile_Timer::start"); - return ACE_OS::ioctl (this->proc_handle_, - PIOCUSAGE, - &this->begin_usage_); -} - -ACE_INLINE int -ACE_Profile_Timer::stop () -{ - ACE_TRACE ("ACE_Profile_Timer::stop"); - this->last_usage_ = this->end_usage_; - return ACE_OS::ioctl (this->proc_handle_, - PIOCUSAGE, - &this->end_usage_); -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -# elif defined (ACE_HAS_GETRUSAGE) +#if defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) +# if defined (ACE_HAS_GETRUSAGE) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -59,7 +32,7 @@ ACE_Profile_Timer::stop () ACE_END_VERSIONED_NAMESPACE_DECL -# endif /* ACE_HAS_PRUSAGE_T */ +# endif /* ACE_HAS_GETRUSAGE */ #elif defined (ACE_WIN32) @@ -123,4 +96,4 @@ ACE_Profile_Timer::~ACE_Profile_Timer () ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) */ +#endif /* defined (ACE_HAS_GETRUSAGE) */ diff --git a/ACE/ace/QoS/ACE_QoS.rc b/ACE/ace/QoS/ACE_QoS.rc new file mode 100644 index 0000000000000..421855dc8ba82 --- /dev/null +++ b/ACE/ace/QoS/ACE_QoS.rc @@ -0,0 +1,30 @@ +#include "../Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACE_QoS\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACE_QoSDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACE_QoS.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/ace/QoS/QoS_Decorator.cpp b/ACE/ace/QoS/QoS_Decorator.cpp index 3f2d9b15bf308..3cbe77a40d491 100644 --- a/ACE/ace/QoS/QoS_Decorator.cpp +++ b/ACE/ace/QoS/QoS_Decorator.cpp @@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_QOS_DECORATOR) // Constructor. -ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base (void) +ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base () {} // Constructor. @@ -17,7 +17,7 @@ ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base (ACE_Event_Handler } // Destructor. -ACE_QoS_Decorator_Base::~ACE_QoS_Decorator_Base (void) +ACE_QoS_Decorator_Base::~ACE_QoS_Decorator_Base () { } @@ -43,7 +43,7 @@ ACE_QoS_Decorator_Base::handle_qos (ACE_HANDLE fd) } // Constructor. -ACE_QoS_Decorator::ACE_QoS_Decorator (void) +ACE_QoS_Decorator::ACE_QoS_Decorator () {} // Constructor. @@ -61,7 +61,7 @@ ACE_QoS_Decorator::ACE_QoS_Decorator (ACE_Event_Handler *event_handler, } // Destructor. -ACE_QoS_Decorator::~ACE_QoS_Decorator (void) +ACE_QoS_Decorator::~ACE_QoS_Decorator () { delete this->decorator_base_; delete this->qos_event_handler_; @@ -98,7 +98,7 @@ ACE_QoS_Decorator::handle_qos (ACE_HANDLE fd) // if the application is using RAPI. Note that it is a no-op for GQoS // because an extra socket for handling QoS events is not required. int -ACE_QoS_Decorator::init (void) +ACE_QoS_Decorator::init () { #if defined (ACE_HAS_RAPI) @@ -110,11 +110,10 @@ ACE_QoS_Decorator::init (void) ACE_Event_Handler::READ_MASK); #endif return 0; - } // Constructor. -ACE_QoS_Event_Handler::ACE_QoS_Event_Handler (void) +ACE_QoS_Event_Handler::ACE_QoS_Event_Handler () { } @@ -126,7 +125,7 @@ ACE_QoS_Event_Handler::ACE_QoS_Event_Handler (ACE_QoS_Decorator_Base } // Destructor. -ACE_QoS_Event_Handler::~ACE_QoS_Event_Handler (void) +ACE_QoS_Event_Handler::~ACE_QoS_Event_Handler () { } diff --git a/ACE/ace/QoS/QoS_Decorator.h b/ACE/ace/QoS/QoS_Decorator.h index b6ff20c74e4bc..4b578cec30fea 100644 --- a/ACE/ace/QoS/QoS_Decorator.h +++ b/ACE/ace/QoS/QoS_Decorator.h @@ -40,18 +40,16 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_QoS_Export ACE_QoS_Decorator_Base : public ACE_Event_Handler { - public: - // Initialization and termination methods. /// Constructor. - ACE_QoS_Decorator_Base (void); + ACE_QoS_Decorator_Base (); /// Constructor. ACE_QoS_Decorator_Base (ACE_Event_Handler *event_handler); /// Destructor. - ~ACE_QoS_Decorator_Base (void); + ~ACE_QoS_Decorator_Base (); /// Forwards the request to its event_handler_ component. virtual ACE_HANDLE get_handle () const; @@ -63,10 +61,8 @@ class ACE_QoS_Export ACE_QoS_Decorator_Base : public ACE_Event_Handler virtual int handle_qos (ACE_HANDLE fd); private: - /// The event handler that is decorated by this class. ACE_Event_Handler *event_handler_; - }; /** @@ -81,9 +77,8 @@ class ACE_QoS_Export ACE_QoS_Decorator_Base : public ACE_Event_Handler */ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler { - /// Destructor. - ~ACE_QoS_Event_Handler (void); + ~ACE_QoS_Event_Handler (); /// Returns the RAPI file descriptor for receiving QoS events. virtual ACE_HANDLE get_handle () const; @@ -97,10 +92,9 @@ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler friend class ACE_QoS_Decorator; private: - /// Constructor is private because only ACE_QoS_Decorator should /// create this object. - ACE_QoS_Event_Handler (void); + ACE_QoS_Event_Handler (); /// The QoS Decorator passes in its base for this handler to use. ACE_QoS_Event_Handler (ACE_QoS_Decorator_Base *decorator_base); @@ -110,7 +104,6 @@ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler /// Requests on the class are forwarded to this base class; ACE_QoS_Decorator_Base *decorator_base_; - }; /** @@ -124,12 +117,10 @@ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler */ class ACE_QoS_Export ACE_QoS_Decorator : public ACE_QoS_Decorator_Base { - public: - // Initialization and termination methods. /// Constructor. - ACE_QoS_Decorator (void); + ACE_QoS_Decorator (); /// Constructor. ACE_QoS_Decorator (ACE_Event_Handler *event_handler, @@ -137,7 +128,7 @@ class ACE_QoS_Export ACE_QoS_Decorator : public ACE_QoS_Decorator_Base ACE_Reactor *reactor = ACE_Reactor::instance ()); /// Destructor. - ~ACE_QoS_Decorator (void); + ~ACE_QoS_Decorator (); /// Calls the base class get_handle (). virtual ACE_HANDLE get_handle () const; @@ -150,10 +141,9 @@ class ACE_QoS_Export ACE_QoS_Decorator : public ACE_QoS_Decorator_Base /// This method registers the QoS Event Handler with the Reactor /// to receive RAPI events. - int init (void); + int init (); private: - /// Requests on the class are forwarded to this base class; ACE_QoS_Decorator_Base *decorator_base_; @@ -168,7 +158,6 @@ class ACE_QoS_Export ACE_QoS_Decorator : public ACE_QoS_Decorator_Base /// If the application wants to use an instance of Reactor other /// than the Singleton one. ACE_Reactor *reactor_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/QoS/QoS_Manager.cpp b/ACE/ace/QoS/QoS_Manager.cpp index c7bbbb09182ba..d5437c918964b 100644 --- a/ACE/ace/QoS/QoS_Manager.cpp +++ b/ACE/ace/QoS/QoS_Manager.cpp @@ -6,10 +6,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_QOS_MANAGER) -ACE_QoS_Manager::ACE_QoS_Manager (void) +ACE_QoS_Manager::ACE_QoS_Manager () {} -ACE_QoS_Manager::~ACE_QoS_Manager (void) +ACE_QoS_Manager::~ACE_QoS_Manager () {} // Adds the given session to the list of session objects joined by @@ -29,7 +29,7 @@ ACE_QoS_Manager::join_qos_session (ACE_QoS_Session *qos_session) // Returns the QoS session set for this socket. ACE_Unbounded_Set -ACE_QoS_Manager::qos_session_set (void) +ACE_QoS_Manager::qos_session_set () { return this->qos_session_set_; } diff --git a/ACE/ace/QoS/QoS_Manager.h b/ACE/ace/QoS/QoS_Manager.h index c57eeb6405f93..5b2b863a55244 100644 --- a/ACE/ace/QoS/QoS_Manager.h +++ b/ACE/ace/QoS/QoS_Manager.h @@ -40,13 +40,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_QoS_Export ACE_QoS_Manager { - public: /// Default constructor. - ACE_QoS_Manager (void); + ACE_QoS_Manager (); /// Default destructor. - ~ACE_QoS_Manager (void); + ~ACE_QoS_Manager (); /** * Join the given QoS session. A socket can join multiple QoS @@ -58,10 +57,9 @@ class ACE_QoS_Export ACE_QoS_Manager typedef ACE_Unbounded_Set ACE_QOS_SESSION_SET; /// Get the QoS session set. - ACE_QOS_SESSION_SET qos_session_set (void); + ACE_QOS_SESSION_SET qos_session_set (); private: - /// Set of QoS sessions that this socket has joined. ACE_QOS_SESSION_SET qos_session_set_; }; diff --git a/ACE/ace/QoS/QoS_Session.h b/ACE/ace/QoS/QoS_Session.h index bfa19ef8878bc..1bc7da691fcc5 100644 --- a/ACE/ace/QoS/QoS_Session.h +++ b/ACE/ace/QoS/QoS_Session.h @@ -41,9 +41,7 @@ typedef int ACE_Protocol_ID; */ class ACE_QoS_Export ACE_QoS_Session { - public: - enum RSVP_Event_Type { RSVP_PATH_EVENT, @@ -64,14 +62,14 @@ class ACE_QoS_Export ACE_QoS_Session /// to shutup g++. - virtual ~ACE_QoS_Session (void) {}; + virtual ~ACE_QoS_Session () {}; /// Open a QoS session [dest IP, dest port, Protocol ID]. virtual int open (ACE_INET_Addr dest_addr, ACE_Protocol_ID protocol_id) = 0; /// Close the QoS Session. - virtual int close (void) = 0; + virtual int close () = 0; /// Returns the QoS in the current session. virtual ACE_QoS qos () const = 0; @@ -99,7 +97,7 @@ class ACE_QoS_Export ACE_QoS_Session * underlying session. This method updates the QoS object associated * with this session. */ - virtual int update_qos (void) = 0; + virtual int update_qos () = 0; /// Get/Set methods for the flags_. virtual ACE_End_Point_Type flags () const = 0; @@ -112,12 +110,12 @@ class ACE_QoS_Export ACE_QoS_Session virtual void session_id (const int session_id) = 0; /// Get the file descriptor on which RSVP events will occur. - virtual ACE_HANDLE rsvp_events_handle (void) = 0; + virtual ACE_HANDLE rsvp_events_handle () = 0; virtual void rsvp_event_type (RSVP_Event_Type event_type) = 0; ///Set the RAPI event that last occurred - virtual RSVP_Event_Type rsvp_event_type (void) = 0; + virtual RSVP_Event_Type rsvp_event_type () = 0; ///Get the RAPI event that last occurred @@ -145,10 +143,9 @@ class ACE_QoS_Export ACE_QoS_Session * meaningful only when the underlying implementation has * versioning. */ - virtual int version (void) = 0; + virtual int version () = 0; protected: - /// Source port if this is a Sender session. Used for rapi_sender (). u_short source_port_; @@ -172,7 +169,6 @@ class ACE_QoS_Export ACE_QoS_Session RSVP_Event_Type rsvp_event_type_; //Has the last rsvp event that occurred - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/QoS/QoS_Session_Factory.cpp b/ACE/ace/QoS/QoS_Session_Factory.cpp index 1c815b6af2acd..3ff403db99d8a 100644 --- a/ACE/ace/QoS/QoS_Session_Factory.cpp +++ b/ACE/ace/QoS/QoS_Session_Factory.cpp @@ -17,12 +17,12 @@ const enum ACE_QoS_Session_Factory::ACE_QoS_Session_Type # error "QoS type not supported. Cannot build." #endif /* ACE_HAS_RAPI */ -ACE_QoS_Session_Factory::ACE_QoS_Session_Factory (void) +ACE_QoS_Session_Factory::ACE_QoS_Session_Factory () { ACE_TRACE ("ACE_QoS_Session_Factory::ACE_QoS_Session_Factory"); } -ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory (void) +ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory () { ACE_TRACE ("ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory"); } @@ -31,7 +31,6 @@ ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory (void) ACE_QoS_Session * ACE_QoS_Session_Factory::create_session (ACE_QoS_Session_Type qos_session_type) { - ACE_QoS_Session * qos_session = 0; #if defined (ACE_HAS_RAPI) @@ -61,7 +60,6 @@ ACE_QoS_Session_Factory::create_session (ACE_QoS_Session_Type qos_session_type) int ACE_QoS_Session_Factory::destroy_session (ACE_QoS_Session *qos_session) { - if ((qos_session != 0) && (this->remove_session (qos_session) == -1)) ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in destroying session\n")), diff --git a/ACE/ace/QoS/QoS_Session_Factory.h b/ACE/ace/QoS/QoS_Session_Factory.h index cdb48235fbac2..db5b9e624ade7 100644 --- a/ACE/ace/QoS/QoS_Session_Factory.h +++ b/ACE/ace/QoS/QoS_Session_Factory.h @@ -40,10 +40,10 @@ class ACE_QoS_Export ACE_QoS_Session_Factory { public : /// Default constructor. - ACE_QoS_Session_Factory (void); + ACE_QoS_Session_Factory (); /// Default destructor. - ~ACE_QoS_Session_Factory (void); + ~ACE_QoS_Session_Factory (); /// Types of sessions for this factory to manage. enum ACE_QoS_Session_Type @@ -69,7 +69,6 @@ public : int destroy_session (ACE_QoS_Session *qos_session); private: - /// Used by the create_session () to add new sessions to the /// set of sessions created by this factory. int add_session (ACE_QoS_Session *qos_session); @@ -81,7 +80,6 @@ public : /// Unordered set of QoS Sessions. typedef ACE_Unbounded_Set QOS_SESSION_SET; QOS_SESSION_SET qos_session_set_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp index 28d42bc0b8218..f552755488e32 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.cpp +++ b/ACE/ace/QoS/QoS_Session_Impl.cpp @@ -212,7 +212,6 @@ rsvp_callback (rapi_sid_t /* sid */, ACELIB_DEBUG ((LM_DEBUG, "Unknown RSVP Event Received\n")); break; - } // Set the updated ACE_QoS for the RSVP callback argument(QoS session). @@ -223,7 +222,7 @@ rsvp_callback (rapi_sid_t /* sid */, } // Constructor. -ACE_RAPI_Session::ACE_RAPI_Session (void) +ACE_RAPI_Session::ACE_RAPI_Session () { ACE_TRACE ("ACE_RAPI_Session::ACE_RAPI_Session"); //this->source_port (DEFAULT_SOURCE_SENDER_PORT); @@ -270,7 +269,7 @@ ACE_RAPI_Session::open (ACE_INET_Addr dest_addr, // Close the RAPI QoS Session. int -ACE_RAPI_Session::close (void) +ACE_RAPI_Session::close () { this->rsvp_error = rapi_release(this->session_id_); @@ -288,7 +287,7 @@ ACE_RAPI_Session::close (void) //Get the most recent RSVP event that occurred ACE_QoS_Session::RSVP_Event_Type -ACE_RAPI_Session::rsvp_event_type (void) +ACE_RAPI_Session::rsvp_event_type () { return this->rsvp_event_type_; } @@ -305,7 +304,6 @@ ACE_RAPI_Session::qos (ACE_SOCK * /* socket */, ACE_QoS_Manager * /* qos_manager */, const ACE_QoS &ace_qos) { - // If sender : call sending_qos () // If receiver : call receiving_qos () // If both : call sending_qos () and receiving_qos () @@ -425,7 +423,6 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) int ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) { - ACE_Flow_Spec *receiving_flowspec = ace_qos.receiving_flowspec (); if (receiving_flowspec == 0) { @@ -526,7 +523,7 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) } int -ACE_RAPI_Session::update_qos (void) +ACE_RAPI_Session::update_qos () { // Update the session QoS Parameters based on the RSVP Event Received. if ((rsvp_error = rapi_dispatch ()) != 0) @@ -627,7 +624,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL int ACE_GQoS_Session::GQoS_session_id = 0; // Constructor. -ACE_GQoS_Session::ACE_GQoS_Session (void) +ACE_GQoS_Session::ACE_GQoS_Session () { ACE_TRACE ("ACE_GQoS_Session::ACE_GQoS_Session"); } @@ -647,7 +644,7 @@ ACE_GQoS_Session::open (ACE_INET_Addr dest_addr, // Close the GQoS Session. int -ACE_GQoS_Session::close (void) +ACE_GQoS_Session::close () { // TBD. return 0; @@ -659,7 +656,6 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, ACE_QoS_Manager *qos_manager, const ACE_QoS &ace_qos) { - // Confirm if the current session is one of the QoS sessions // subscribed to by the given socket. @@ -691,7 +687,7 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, } int -ACE_GQoS_Session::update_qos (void) +ACE_GQoS_Session::update_qos () { // WSAIoctl (GET_QOS) call goes here... return 0; @@ -699,7 +695,7 @@ ACE_GQoS_Session::update_qos (void) //Get the most recent RSVP event that occurred ACE_QoS_Session::RSVP_Event_Type -ACE_GQoS_Session::rsvp_event_type (void) +ACE_GQoS_Session::rsvp_event_type () { return this->rsvp_event_type_; } diff --git a/ACE/ace/QoS/QoS_Session_Impl.h b/ACE/ace/QoS/QoS_Session_Impl.h index 6fda16087dc61..d87af62f6bc19 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.h +++ b/ACE/ace/QoS/QoS_Session_Impl.h @@ -38,7 +38,7 @@ class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session { public: /// Default destructor. - ~ACE_RAPI_Session (void); + ~ACE_RAPI_Session (); /// Error handling for RSVP callback static int rsvp_error; @@ -48,7 +48,7 @@ class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session ACE_Protocol_ID protocol_id); /// Close the RAPI QoS Session. - virtual int close (void); + virtual int close (); /// Returns the QoS for this RAPI session. virtual ACE_QoS qos () const; @@ -73,7 +73,7 @@ class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session * It is a mechanism of updating the QoS for this session asynchronously, as * RSVP events occur. */ - virtual int update_qos (void); + virtual int update_qos (); /// Get methods for the flags_. virtual ACE_End_Point_Type flags () const; @@ -88,13 +88,13 @@ class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session virtual void session_id (const int session_id); /// Get the RAPI file descriptor for RSVP events. - virtual ACE_HANDLE rsvp_events_handle (void); + virtual ACE_HANDLE rsvp_events_handle (); ///Set the RAPI event that last occurred virtual void rsvp_event_type (RSVP_Event_Type event_type); ///Get the RAPI event that last occurred - virtual RSVP_Event_Type rsvp_event_type (void); + virtual RSVP_Event_Type rsvp_event_type (); /// Get the destination address for this RAPI session. virtual ACE_INET_Addr dest_addr () const; @@ -124,7 +124,7 @@ class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session private: /// Default constuctor. Constructor is defined private so that only /// the friend factory can instantiate this class. - ACE_RAPI_Session (void); + ACE_RAPI_Session (); /// Construct a simplified RAPI Sender TSpec object /// from an ACE_Flow_Spec object. Used internally by this class. @@ -139,7 +139,6 @@ class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session /// Set receiving QoS for this RAPI session. int receiving_qos (const ACE_QoS &ace_qos); - }; ACE_END_VERSIONED_NAMESPACE_DECL @@ -159,9 +158,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session { public: - /// Default destructor. - ~ACE_GQoS_Session (void); + ~ACE_GQoS_Session (); /// This is a session ID generator. It does a lot more than expected /// from an int!. @@ -172,7 +170,7 @@ class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session ACE_Protocol_ID protocol_id); /// Close the GQoS Session. - virtual int close (void); + virtual int close (); /// Returns the QoS for this GQoS session. virtual ACE_QoS qos () const; @@ -194,7 +192,7 @@ class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session /// Calls the ioctl (ACE_SIO_GET_QOS). It is a mechanism of updating the /// QoS for this session asynchronously, as RSVP events occur. - virtual int update_qos (void); + virtual int update_qos (); /// Get/Set methods for the flags_. virtual ACE_End_Point_Type flags () const; @@ -225,12 +223,12 @@ class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session virtual void session_id (const int session_id); /// Get the file descriptor of the underlying socket. - virtual ACE_HANDLE rsvp_events_handle (void); + virtual ACE_HANDLE rsvp_events_handle (); virtual void rsvp_event_type (RSVP_Event_Type event_type); ///Set the RAPI event that last occurred - virtual RSVP_Event_Type rsvp_event_type (void); + virtual RSVP_Event_Type rsvp_event_type (); ///Get the RAPI event that last occurred /// GQoS version. diff --git a/ACE/ace/QoS/QoS_Session_Impl.inl b/ACE/ace/QoS/QoS_Session_Impl.inl index f78b8adc68fa0..d2ed0ecc34e2d 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.inl +++ b/ACE/ace/QoS/QoS_Session_Impl.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_HAS_RAPI) ACE_INLINE -ACE_RAPI_Session::~ACE_RAPI_Session (void) +ACE_RAPI_Session::~ACE_RAPI_Session () { ACE_TRACE ("ACE_RAPI_Session::~ACE_RAPI_Session"); } @@ -40,7 +40,7 @@ ACE_RAPI_Session::session_id (const int session_id) // Get the RAPI file desciptor for RSVP events. ACE_INLINE ACE_HANDLE -ACE_RAPI_Session::rsvp_events_handle (void) +ACE_RAPI_Session::rsvp_events_handle () { int rapi_fd = rapi_getfd (this->session_id ()); if (rapi_fd == -1) @@ -111,7 +111,7 @@ ACE_RAPI_Session::source_addr (ACE_INET_Addr* source_addr) // RAPI version. Returned value = 100 * major-version + minor-version. ACE_INLINE int -ACE_RAPI_Session::version (void) +ACE_RAPI_Session::version () { return 0; } @@ -119,7 +119,7 @@ ACE_RAPI_Session::version (void) #endif /* ACE_HAS_RAPI */ ACE_INLINE -ACE_GQoS_Session::~ACE_GQoS_Session (void) +ACE_GQoS_Session::~ACE_GQoS_Session () { ACE_TRACE ("ACE_GQoS_Session::~ACE_GQoS_Session"); } @@ -157,7 +157,7 @@ ACE_GQoS_Session::session_id (const int session_id) // Currently returns 0 because GQoS does not have a special // descriptor for QoS events. ACE_INLINE ACE_HANDLE -ACE_GQoS_Session::rsvp_events_handle (void) +ACE_GQoS_Session::rsvp_events_handle () { return 0; } @@ -218,7 +218,7 @@ ACE_GQoS_Session::source_addr (ACE_INET_Addr* source_addr) // GQoS version. ACE_INLINE int -ACE_GQoS_Session::version (void) +ACE_GQoS_Session::version () { return 0; } diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h index 3d1ca20e8811b..86fc8bfa36a1e 100644 --- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h +++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h @@ -40,7 +40,7 @@ class ACE_QoS_Export ACE_SOCK_Dgram_Mcast_QoS : public ACE_SOCK_Dgram_Mcast // use or instead. /// Default dtor. - ~ACE_SOCK_Dgram_Mcast_QoS (void); + ~ACE_SOCK_Dgram_Mcast_QoS (); // = Multicast group management routines. /** @@ -96,7 +96,7 @@ class ACE_QoS_Export ACE_SOCK_Dgram_Mcast_QoS : public ACE_SOCK_Dgram_Mcast ACE_OVERLAPPED_COMPLETION_FUNC func) const; /// Returns the QoS manager for this socket. - ACE_QoS_Manager qos_manager (void); + ACE_QoS_Manager qos_manager (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.inl b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.inl index e3cad2380f9dd..108293431c806 100644 --- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.inl +++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_SOCK_Dgram_Mcast_QoS::~ACE_SOCK_Dgram_Mcast_QoS (void) +ACE_SOCK_Dgram_Mcast_QoS::~ACE_SOCK_Dgram_Mcast_QoS () { } @@ -46,7 +46,7 @@ ACE_SOCK_Dgram_Mcast_QoS::send (const void *buf, } ACE_INLINE ACE_QoS_Manager -ACE_SOCK_Dgram_Mcast_QoS::qos_manager (void) +ACE_SOCK_Dgram_Mcast_QoS::qos_manager () { return this->qos_manager_; } diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp index 99066b8c59976..2cb897dba235f 100644 --- a/ACE/ace/QtReactor/QtReactor.cpp +++ b/ACE/ace/QtReactor/QtReactor.cpp @@ -40,7 +40,7 @@ ACE_QtReactor::ACE_QtReactor (size_t size, reopen_notification_pipe(); } -void ACE_QtReactor::reopen_notification_pipe( void) +void ACE_QtReactor::reopen_notification_pipe() { // When the ACE_Select_Reactor is constructed it creates the notify // pipe and registers it with the register_handler_i() method. The @@ -67,7 +67,7 @@ void ACE_QtReactor::reopen_notification_pipe( void) #endif /* ACE_MT_SAFE */ } -ACE_QtReactor::~ACE_QtReactor (void) +ACE_QtReactor::~ACE_QtReactor () { // iterate over QSocketNotifiers for read and release them MAP::ITERATOR iter = this->read_notifier_.begin (); @@ -114,7 +114,7 @@ ACE_QtReactor::qapplication (QApplication *qapp) } void -ACE_QtReactor::timeout_event (void) +ACE_QtReactor::timeout_event () { // Deal with any timer events ACE_Select_Reactor_Handle_Set handle_set; @@ -396,7 +396,6 @@ ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle) if ((this->exception_notifier_.find (handle, qsock_notifier) == -1)) { - ACE_NEW (qsock_notifier, QSocketNotifier (ACE_QT_HANDLE_TYPE(handle), QSocketNotifier::Exception, this)); @@ -509,7 +508,7 @@ ACE_QtReactor::remove_handler_i (const ACE_Handle_Set &handles, // first timeout in the Reactor's Timer_Queue. void -ACE_QtReactor::reset_timeout (void) +ACE_QtReactor::reset_timeout () { if (this->qtime_ != 0) { @@ -660,7 +659,6 @@ ACE_QtReactor::wait_for_multiple_events ( nfound = QtWaitForMultipleEvents (static_cast (width), handle_set, max_wait_time); - } while( nfound == -1 && this->handle_error () > 0 ); if (nfound > 0) diff --git a/ACE/ace/QtReactor/QtReactor.h b/ACE/ace/QtReactor/QtReactor.h index 6bafe3c7f4c15..25fed71affb13 100644 --- a/ACE/ace/QtReactor/QtReactor.h +++ b/ACE/ace/QtReactor/QtReactor.h @@ -120,7 +120,7 @@ class ACE_QtReactor_Export ACE_QtReactor bool mask_signals = true, int s_queue = ACE_SELECT_TOKEN::FIFO); - virtual ~ACE_QtReactor (void); + virtual ~ACE_QtReactor (); void qapplication (QApplication *qapp); @@ -197,9 +197,9 @@ class ACE_QtReactor_Export ACE_QtReactor private: /// This method ensures there's an Qt timeout for the first timeout /// in the Reactor's Timer_Queue. - void reset_timeout (void); + void reset_timeout (); /// reopens notification pipe to create SocketNotifier for it - void reopen_notification_pipe(void); + void reopen_notification_pipe(); #ifdef ACE_HAS_QT5 /// Recover the socket's ACE_HANDLE based on the sender of the Qt signal. @@ -223,7 +223,7 @@ private slots: void exception_event (ACE_QT_HANDLE_TYPE p_handle); /// Dispatch a timeout event - void timeout_event (void); + void timeout_event (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h index c8ef635b3a4ac..0bf1f40d9a7b7 100644 --- a/ACE/ace/RB_Tree.h +++ b/ACE/ace/RB_Tree.h @@ -89,7 +89,6 @@ class ACE_RB_Tree_Node : public ACE_RB_Tree_Node_Base void right (ACE_RB_Tree_Node * r); private: - /// The key. EXT_ID k_; @@ -119,11 +118,9 @@ class ACE_RB_Tree_Base /** * @note This method is inlined here rather than in RB_Tree.inl * since that file may be included multiple times when - * inlining is disabled and on platforms where - * @c ACE_TEMPLATES_REQUIRE_SOURCE is defined. In those - * platform/configuration combinations, multiple definitions - * of this method occurred. Placing the definition inline in - * the header avoids such errors. + * inlining is disabled. In those platform/configuration + * combinations, multiple definitions of this method occurred. + * Placing the definition inline in the header avoids such errors. */ ACE_Allocator * allocator () const { return this->allocator_; } @@ -180,7 +177,6 @@ class ACE_RB_Tree_Base template class ACE_RB_Tree : public ACE_RB_Tree_Base { - public: friend class ACE_RB_Tree_Iterator_Base; friend class ACE_RB_Tree_Iterator; @@ -563,7 +559,6 @@ class ACE_RB_Tree : public ACE_RB_Tree_Base int lessthan (const EXT_ID &k1, const EXT_ID &k2); private: - // = Private members. /// Synchronization variable for the MT_SAFE ACE_RB_Tree. @@ -587,9 +582,7 @@ class ACE_RB_Tree : public ACE_RB_Tree_Base template class ACE_RB_Tree_Iterator_Base { - public: - /// Copy constructor. ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree_Iterator_Base &iter); @@ -672,7 +665,6 @@ class ACE_RB_Tree_Iterator_Base /// Pointer to the node currently under the iterator. ACE_RB_Tree_Node *node_; - }; /** @@ -748,7 +740,7 @@ class ACE_RB_Tree_Iterator : public ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base () : tree_ (0), node_ (0) { - ACE_TRACE ("ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base (void)"); + ACE_TRACE ("ACE_RB_Tree_Iterator_Base::ACE_RB_Tree_Iterator_Base ()"); } // Returns 1 when the iteration has completed, otherwise 0. @@ -807,7 +807,7 @@ ACE_INLINE ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator () : ACE_RB_Tree_Iterator_Base () { - ACE_TRACE ("ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator (void)"); + ACE_TRACE ("ACE_RB_Tree_Iterator::ACE_RB_Tree_Iterator ()"); } // Move forward by one element in the tree. Returns @@ -843,7 +843,7 @@ template ACE_INLINE ACE_RB_Tree_Iterator & ACE_RB_Tree_Iterator::operator++ () { - ACE_TRACE ("ACE_RB_Tree_Iterator operator++ (void)"); + ACE_TRACE ("ACE_RB_Tree_Iterator operator++ ()"); this->forward_i (); return *this; @@ -870,7 +870,7 @@ template ACE_INLINE ACE_RB_Tree_Iterator & ACE_RB_Tree_Iterator::operator-- () { - ACE_TRACE ("ACE_RB_Tree_Iterator operator-- (void)"); + ACE_TRACE ("ACE_RB_Tree_Iterator operator-- ()"); this->reverse_i (); return *this; @@ -896,7 +896,7 @@ ACE_RB_Tree_Iterator::operator-- (int) // be declared and defined in both the derived forward and // reverse iterator classes rather than in the base iterator // class because of a method signature resolution problem -// caused by the existence of the deprecated next (void) +// caused by the existence of the deprecated next () // method in the derived forward iterator class. When that // deprecated method is removed, this method should be removed // from the derived classes and placed in the base class. @@ -1012,7 +1012,7 @@ ACE_INLINE ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator () : ACE_RB_Tree_Iterator_Base () { - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator (void)"); + ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::ACE_RB_Tree_Reverse_Iterator ()"); } // Move forward by one element in the tree. Returns @@ -1048,7 +1048,7 @@ template ACE_INLINE ACE_RB_Tree_Reverse_Iterator & ACE_RB_Tree_Reverse_Iterator::operator++ () { - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::operator++ (void)"); + ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::operator++ ()"); this->reverse_i (); return *this; @@ -1075,7 +1075,7 @@ template ACE_INLINE ACE_RB_Tree_Reverse_Iterator & ACE_RB_Tree_Reverse_Iterator::operator-- () { - ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::operator-- (void)"); + ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator::operator-- ()"); this->forward_i (); return *this; @@ -1101,7 +1101,7 @@ ACE_RB_Tree_Reverse_Iterator::operator-- // be declared and defined in both the derived forward and // reverse iterator classes rather than in the base iterator // class because of a method signature resolution problem -// caused by the existence of the deprecated next (void) +// caused by the existence of the deprecated next () // method in the derived forward iterator class. When that // deprecated method is removed, this method should be removed // from the derived classes and placed in the base class. diff --git a/ACE/ace/README b/ACE/ace/README index d43ec628884f5..99d94841674b6 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -20,9 +20,6 @@ ACE_HAS_DUMP Used to enable the dump() out in order to reduce footprint. By default, it is not defined. -ACE_CAST_CONST Used to work around broken - SunCC ANSI casts that require - an extra const. ACE_DEFINES_DEFAULT_WIN32_SECURITY_ATTRIBUTES Win32 only. Users want to use a predefined security @@ -79,13 +76,6 @@ ACE_HAS_TRACE Defined when ACE_NTRACE=0 to ACE_PAGE_SIZE Defines the page size of the system (not used on Win32 or with ACE_HAS_GETPAGESIZE). -ACE_TEMPLATES_REQUIRE_PRAGMA Compiler's template mechanism - must use a pragma This is used - for AIX's C++ compiler. -ACE_TEMPLATES_REQUIRE_SOURCE Compiler's template mechanim - must see source code (i.e., - .cpp files). This is used for - GNU G++. ACE_TIMEPROBE_ASSERTS_FIXED_SIZE If enabled then ACE_Timeprobe_Ex<>::timeprobe() will assert if the end of the buffer is reached. If disabled, the @@ -145,7 +135,6 @@ ACE_DEFAULT_LD_SEARCH_PATH Specify the platform default search paths. This macro should only be defined on platforms that don't support environment variables at all - (i.e., Windows CE.) ACE_THREADS_DONT_INHERIT_LOG_MSG Specify this if you don't want threads to inherit parent thread's ACE_Log_Msg @@ -156,7 +145,6 @@ ACE_THREAD_MANAGER_USES_SAFE_SPAWN Disable the "check before lock" feature on platforms with aggressive read/write reordering. ACE_HAS_CPU_SET_T Platform delivers cpu_set_t. -ACE_HAS_PRIOCNTL OS has priocntl (2). ACE_HAS_RECURSIVE_MUTEXES Mutexes are inherently recursive (e.g., Win32) ACE_HAS_NONRECURSIVE_MUTEXES In addition to recursive mutexes, @@ -187,8 +175,6 @@ ACE_SCANDIR_CMP_USES_VOIDPTR The OS's scandir() comparator function ACE_SCANDIR_CMP_USES_CONST_VOIDPTR The OS's scandir() comparator function is int (*compare)(const void*, const void*). -ACE_SCANDIR_SEL_LACKS_CONST The OS's scandir() selector function - is int (*selector)(ACE_DIRENT*) ACE_HAS_STDARG_THR_DEST Platform has void (*)(...) prototype for pthread_key_create() @@ -199,13 +185,6 @@ ACE_HAS_4_4BSD_SENDMSG_RECVMSG Platform has BSD 4.4 sendmsg()/recvmsg() APIs. ACE_HAS_P_READ_WRITE Platform has pread() and pwrite() support -ACE_HAS_AIX_BROKEN_SOCKET_HEADER Platform, such as AIX4, needs - to wrap #include of - sys/socket.h with - #undef/#define of - __cplusplus. -ACE_HAS_AIX_HI_RES_TIMER Platform has AIX4 - ::read_real_time () ACE_HAS_ALLOCA Compiler/platform supports alloca() ACE_HAS_ALLOCA_H Compiler/platform has @@ -232,12 +211,6 @@ ACE_HAS_BROKEN_MMAP_H HP/UX does not wrap the ACE_HAS_BROKEN_NESTED_TEMPLATES MSVC has trouble with defining STL containers for nested structs and classes -ACE_HAS_BROKEN_POSIX_TIME Platform defines struct - timespec in -ACE_HAS_BROKEN_T_ERROR Compiler/platform has the wrong - prototype for t_error(), i.e., - t_error(char *) rather than - t_error(const char *). ACE_HAS_BYTESEX_H Platform has . ACE_HAS_CANCEL_IO Platform supports the Win32 CancelIO() function (WinNT 4.0 @@ -254,10 +227,6 @@ ACE_HAS_CLOCK_GETTIME_MONOTONIC Platform supports POSIX.1b clock_gettime () with the clock-id CLOCK_MONOTONIC ACE_HAS_CLOCK_SETTIME Platform supports POSIX.1b clock_settime () -ACE_HAS_CONFLICTING_XTI_MACROS OS's XTI header file defines some - TCP-related macros that netinet/tcp.h - also defines, but they conflict - (only seen on HP-UX 11). ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES Prototypes for both signal() and struct sigaction are consistent. @@ -272,7 +241,7 @@ ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT When a base-class is a then this class template must be explicitly exported ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION For the GCC compiler - on AIX, HPUX and VxWorks we have to + on VxWorks we have to explicitly instantiate static template members else we get multiple instances of the same static. @@ -301,8 +270,6 @@ ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT Optimize ACE_HAS_LLSEEK Platform supports llseek. ACE_HAS_HI_RES_TIMER Compiler/platform supports SunOS high resolution timers -ACE_HAS_IDTYPE_T Compiler/platform supports - idtype_t. ACE_HAS_INLINED_OSCALLS Inline all the static class OS methods to remove call overhead @@ -310,8 +277,6 @@ ACE_HAS_INT_SWAB Platform's swab function has length argument of type int, not ssize_t. ACE_HAS_IP_MULTICAST Platform supports IP multicast ACE_HAS_IPV6 Platform supports IPv6. -ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED gethostbyaddr does not handle - IPv6-mapped-IPv4 addresses ACE_USES_IPV4_IPV6_MIGRATION Enable IPv6 support in ACE on platforms that don't have IPv6 turned on by default. @@ -321,9 +286,6 @@ ACE_HAS_NONSTATIC_OBJECT_MANAGER Causes the ACE_Object_Manager a static (global) instance. ACE_HAS_THR_KEYDELETE Platform supports thr_keydelete (e.g,. UNIXWARE) -ACE_HAS_THR_MINSTACK Platform calls thr_minstack() - rather than thr_min_stack() - (e.g., Tandem). ACE_HAS_LIMITED_RUSAGE_T The rusage_t structure has only two fields. ACE_HAS_LINUX_NPTL Linux platform (with kernel >= 2.6.x) @@ -335,8 +297,6 @@ ACE_HAS_LINUX_NPTL Linux platform (with kernel >= 2.6.x) ACE_HAS_LOG_MSG_NT_EVENT_LOG Platform supports Windows NT event log so we can create an ACE_Log_Msg_Backend to log to it. -ACE_HAS_LONG_MAP_FAILED Platform defines MAP_FAILED as - a long constant. ACE_HAS_MALLOC_STATS Enabled malloc statistics collection. ACE_HAS_MEMCHR Use native implementation of memchr. @@ -351,15 +311,9 @@ ACE_HAS_MT_SAFE_MKTIME Platform supports MT safe ACE_HAS_MUTEX_TIMEOUTS Compiler supports timed mutex acquisitions (e.g. pthread_mutex_timedlock()). -ACE_HAS_NONCONST_CHDIR Platform uses non-const char * - in call to chdir ACE_HAS_NONCONST_CLOCK_SETTIME Platform uses non-const struct timespec * in call to clock_settime -ACE_HAS_NONCONST_OPENDIR Platform uses non-const char * - in call to opendir -ACE_HAS_NONCONST_UNLINK Platform uses non-const char * - in call to unlink ACE_HAS_NONCONST_GETBY Platform uses non-const char * in calls to gethostbyaddr, gethostbyname, getservbyname @@ -376,26 +330,15 @@ ACE_HAS_NONCONST_SENDMSG Platform omits const qualifier ACE_HAS_NONCONST_SETRLIMIT Platform omits const qualifier from rlimit parameter in setrlimit() prototype. -ACE_HAS_NONCONST_STAT Platform's stat function has non const - name argument ACE_HAS_NONCONST_SWAB Platform's swab function has non const src argument ACE_HAS_NONCONST_WRITEV Platform omits const qualifier from iovec parameter in writev() prototype. -ACE_HAS_OLD_MALLOC Compiler/platform uses old - malloc()/free() prototypes - (ugh) -ACE_HAS_ONLY_SCHED_FIFO Platform, e.g., HP NonStop OSS, - only supports SCHED_FIFO - POSIX scheduling policy. -ACE_HAS_ONLY_SCHED_OTHER Platform, e.g., Solaris 2.5, - only supports SCHED_OTHER +ACE_HAS_ONLY_SCHED_OTHER Platform, only supports SCHED_OTHER POSIX scheduling policy. ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R Uses ctime_r & asctime_r with only two parameters vs. three. -ACE_HAS_OSF_TIMOD_H Platform supports the OSF TLI - timod STREAMS module ACE_HAS_3_PARAM_WCSTOK Platform has 3-parameter version of wcstok(), which was added in 1994 in the ISO C standard Normative @@ -417,7 +360,7 @@ ACE_HAS_POSIX_REALTIME_SIGNALS Platform supports POSIX RT signals. constant in . ACE_HAS_POSIX_SEM Platform supports POSIX real-time semaphores (e.g., - VxWorks and Solaris). Corresponds + VxWorks). Corresponds to _POSIX_SEMAPHORES constant in ACE_HAS_POSIX_SEM_TIMEOUT Platform supports timed wait operation @@ -429,8 +372,6 @@ ACE_HAS_PROC_FS Platform supports the /proc in ACE_HAS_POWERPC_TIMER Platform supports PowerPC time-base register. -ACE_HAS_PRUSAGE_T Platform supports the - prusage_t struct ACE_HAS_PTHREADS Platform supports POSIX Pthreads, of one form or another. This macro says the @@ -461,7 +402,6 @@ ACE_HAS_QUANTIFY Quantify'ing. Set by wrapper_macros.GNU ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX). ACE_HAS_REENTRANT_FUNCTIONS Platform supports reentrant functions (i.e., all the POSIX *_r functions). @@ -481,8 +421,6 @@ ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL For Win32: Use Select_Reactor ACE_HAS_SEMUN Compiler/platform defines a union semun for SysV shared memory -ACE_HAS_SET_T_ERRNO Platform has a function to set - t_errno (e.g., Tandem). ACE_HAS_SIGACTION_CONSTP2 Platform's sigaction() function takes const sigaction* as 2nd parameter. ACE_HAS_SIGINFO_T Platform supports SVR4 @@ -499,9 +437,6 @@ ACE_HAS_SIG_ATOMIC_T Compiler/platform defines the sig_atomic_t typedef ACE_HAS_SIG_C_FUNC Compiler requires extern "C" functions for signals. -ACE_HAS_SIZET_SOCKET_LEN OS/compiler uses size_t * - rather than int * for socket - lengths ACE_HAS_SOCKADDR_IN_SIN_LEN Platform has sin_len member in struct sockaddr_in. ACE_HAS_SOCKADDR_IN6_SIN_LEN Platform has sin6_len member in struct @@ -514,13 +449,8 @@ ACE_HAS_SOCKLEN_T Platform provides socklen_t glibc2. ACE_HAS_SOCK_BUF_SIZE_MAX Platform limits the maximum socket message size. -ACE_HAS_SPARCWORKS_401_SIGNALS Compiler has brain-damaged - SPARCwork SunOS 4.x signal - prototype... ACE_HAS_SSIZE_T Compiler supports the ssize_t typedef -ACE_HAS_STHREADS Platform supports Solaris - threads ACE_HAS_STRBUF_T Compiler/platform supports struct strbuf ACE_HAS_STRDUP_EMULATION Use ACE's strdup() emulation (even @@ -538,26 +468,16 @@ ACE_HAS_STRICT Use the STRICT compilation mode on Win32 ACE_HAS_STRUCT_NETDB_DATA Compiler/platform has strange hostent API for socket *_r() calls -ACE_HAS_SUNOS4_SIGNAL_T Compiler has horrible SunOS - 4.x signal handlers... ACE_HAS_SVR4_DYNAMIC_LINKING Compiler/platform supports SVR4 dynamic linking semantics ACE_HAS_SVR4_GETTIMEOFDAY Compiler/platform supports SVR4 gettimeofday() prototype ACE_HAS_SVR4_SIGNAL_T Compiler/platform supports SVR4 signal typedef -ACE_HAS_SVR4_TLI Compiler/platform supports - SVR4 TLI; that is, TLI with extensions - like t_getname(). This is sometimes - used as a pseudonym for TLI on SunOS4. - This is a modifier to ACE_HAS_TLI and - isn't used if ACE_HAS_XTI is set. ACE_HAS_SYSCALL_GETRUSAGE HP/UX has an undefined syscall for GETRUSAGE... ACE_HAS_SYSENT_H Platform provides header -ACE_HAS_SYSV_SYSINFO Platform supports system - configuration information ACE_HAS_SYSV_IPC Platform supports System V IPC (most versions of UNIX, but not Win32) @@ -597,7 +517,7 @@ ACE_HAS_THREAD_SAFE_ACCEPT Platform allows multiple the same port (e.g., WinNT). ACE_HAS_THREAD_SELF Platform has thread_self() rather than pthread_self() - (e.g., DCETHREADS and AIX) + (e.g., DCETHREADS) ACE_HAS_THREAD_SPECIFIC_STORAGE Compiler/platform has thread-specific storage ACE_HAS_THR_C_DEST The pthread_keycreate() @@ -611,10 +531,6 @@ ACE_HAS_TIMEZONE Platform/compiler supports ACE_HAS_TIMEZONE_GETTIMEOFDAY Platform/compiler supports timezone * as second parameter to gettimeofday() -ACE_HAS_TIMOD_H Platform supports TLI timod - STREAMS module -ACE_HAS_TIUSER_H Platform provides TLI tiuser.h - header file. ACE_HAS_TLI Platform supports TLI. Also see ACE_TLI_TCP_DEVICE. If the platform supports XTI, set ACE_HAS_XTI @@ -649,8 +565,6 @@ ACE_HAS_VERSIONED_NAMESPACE Wrap all library code within a defining preprocessor symbol ACE_VERSIONED_NAMESPACE_NAME to desired name. -ACE_LACKS_INTMAX_T Platform lacks the intmax_t type -ACE_LACKS_UINTMAX_T Platform lacks the uintmax_t type. ACE_LACKS_INTPTR_T Platform lacks the intptr_t type ACE_LACKS_UINTPTR_T Platform lacks the uintptr_t type. @@ -721,9 +635,6 @@ ACE_HAS_XTI Platform has XTI ACE_INITIALIZE_MEMORY_BEFORE_USE Memory is explicitly initialized before use. Useful when using a profiler like purify or valgrind -ACE_HRTIME_T_IS_BASIC_TYPE ACE_hrtime_t is a basic type that - doesn't require ACE_U64_TO_U32 - conversion ACE_LACKS_ACCESS Platform lacks access() (e.g., VxWorks) ACE_LACKS_ACE_IOSTREAM Platform can not build @@ -745,9 +656,6 @@ ACE_LACKS_READDIR Platform lacks readdir and the readdir ACE_LACKS_COND_TIMEDWAIT_RESET pthread_cond_timedwait does *not* reset the time argument when the lock is acquired. -ACE_LACKS_CONST_STRBUF_PTR Platform uses struct strbuf * - rather than const struct - strbuf * (e.g., HP/UX 10.x) ACE_LACKS_CONST_TIMESPEC_PTR Platform forgot const in cond_timewait (e.g., HP/UX). ACE_LACKS_COND_T Platform lacks condition @@ -758,7 +666,6 @@ ACE_LACKS_CONDATTR_PSHARED Platform has no implementation pthread_condattr_setpshared(), even though it supports pthreads! -ACE_LACKS_DIFFTIME Platform lacks difftime() implementation ACE_LACKS_DUP2 Platform lacks dup2(). ACE_LACKS_FCNTL Platform lacks POSIX-style fcntl (). ACE_LACKS_FSYNC Platform lacks fsync(). @@ -833,8 +740,6 @@ ACE_LACKS_PERFECT_MULTICAST_FILTERING Platform lacks IGMPv3 "perfect" filterin socket, and all future joins on that socket will fail with an error. ACE_LACKS_PRAGMA_ONCE Compiler complains about #pragma once -ACE_LACKS_PRI_T Platform lacks pri_t (e.g., - Tandem NonStop UNIX). ACE_LACKS_PTHREAD_CANCEL Platform lacks pthread_cancel(). ACE_LACKS_PTHREAD_SCOPE_PROCESS Platform lacks support for @@ -858,9 +763,6 @@ ACE_LACKS_RENAME Platform lacks rename(). ACE_LACKS_RLIMIT Platform/compiler lacks {get,set}rlimit() function (e.g., VxWorks) -ACE_LACKS_RLIMIT_PROTOTYPE Platform/compiler lacks - {get,set}rlimit() prototypes - (e.g., Tandem) ACE_LACKS_READDIR_R Platform uses ACE_HAS_DIRENT but does not have readdir_r (). @@ -891,8 +793,6 @@ ACE_LACKS_SETSCHED Platform lacks (e.g. MVS) ACE_LACKS_SIGACTION Platform lacks struct sigaction (e.g., Win32) -ACE_LACKS_SIGNED_CHAR Platform lacks "signed char" - type (broken!) ACE_LACKS_SIGSET Platform lacks signal sets (e.g., Win32) ACE_LACKS_STRPTIME Platform/compiler lacks the strptime() @@ -935,17 +835,6 @@ ACE_LACKS_TELLDIR Platform uses ACE_HAS_DIRENT ACE_LACKS_THREAD_STACK_SIZE Platform lacks pthread_attr_setstacksize() (e.g., Linux pthreads) -ACE_LACKS_THR_CONCURRENCY_FUNCS (ONLY APPLIES TO SOLARIS) - Platform does not support - thr_getconcurrency/thr_setconcurrency - functions, or their implementation - is effectively a "no-op". This - notably applies for Solaris >= 5.9. - Note that if you build on Solaris 8 - and run on Solaris 9+, you can - encounter thread creation errors - unless you rebuild on the target - platform. ACE_LACKS_TIMEDWAIT_PROTOTYPES MIT pthreads platform lacks the timedwait prototypes ACE_LACKS_TIMESPEC_T Platform does not define @@ -953,9 +842,6 @@ ACE_LACKS_TIMESPEC_T Platform does not define struct timespec. ACE_LACKS_TRUNCATE Platform doesn't have truncate() (e.g., vxworks) -ACE_LACKS_UALARM_PROTOTYPE Platform/compiler lacks the - ualarm() prototype (e.g., - Solaris) ACE_LACKS_CHAR_RIGHT_SHIFTS Compiler does not have any istream operator>> for chars, u_chars, or signed chars. @@ -988,16 +874,8 @@ ACE_LACKS_WIN32_SECURITY_DESCRIPTORS The Windows platform doesn't have security descriptor support. ACE_LACKS_WRITEV Platform doesn't define writev, so use our own - -ACE_NEEDS_DEV_IO_CONVERSION Necessary with some compilers - to pass ACE_TTY_IO as - parameter to DEV_Connector. ACE_NEEDS_HUGE_THREAD_STACKSIZE Required by platforms with small default stacks. -ACE_NEEDS_LWP_PRIO_SET OS has LWPs, and when the - priority of a bound thread is - set, then the LWP priority - must be set also. ACE_NEEDS_SCHED_H Platform needs to #include to get thread scheduling @@ -1088,13 +966,6 @@ A returns. Note: if the allocated block is beyond the current stack limit, the resulting behavior is undefined. - In HPUX: - no equivalent. - - Notes: - in HPUX it has to do new and delete. Affects performance. - - ACE_HAS_AUTOMATIC_INIT_FINI: ---------------------------- @@ -1113,15 +984,6 @@ ACE_HAS_AUTOMATIC_INIT_FINI: _init() and _fini() to be executed as is: dlsym ((char *) handle, "_fini"). - In HPUX: - don't set. - Maybe have to look into shl_load( ), shl_definesym( ), - shl_findsym( ), shl_gethandle( ), shl_getsymbols( ), - shl_unload( ), shl_get( )(3X) - explicit load of shared libraries - Means Service Configurator won't be available. - TBA. - - ACE_HAS_HI_RES_TIMER: --------------------- @@ -1137,10 +999,6 @@ ACE_HAS_HI_RES_TIMER: in the past; it is not correlated in any way to the time of day, and thus is not subject to resetting, drifting, etc. - In HPUX - look into: getclock(), reltimer(), getitimer() - maybe even vtimes structure vm_utime, vm_stime ? - Notes: TBA @@ -1151,9 +1009,6 @@ ACE_LACKS_T_ERRNO: Used In: ace/OS.h - HPUX: - set it. - Notes: if set, adds: extern int t_errno; @@ -1165,9 +1020,6 @@ ACE_HAS_POSIX_NONBLOCK: Used in: ace/OS.h - HPUX: - set it. - Notes: if defined, sets ACE_NONBLOCK and O_NONBLOCK O_NONBLOCK is used in libsrc/Misc/misc.C to do a @@ -1192,13 +1044,6 @@ ACE_HAS_PROC_FS: procfs.h defines things for the prpsinfo structure (basically to do a "ps" from inside a program). - HPUX: - don't set: obviously a different mechanism. - Look into /usr/include/sys/proc.h. The structure is proc. The - pointer to the kernel's proc table may be obtained by - extern struct proc *proc, *procNPROC; - extern int nproc; - ACE_HAS_PRUSAGE_T: ------------------ @@ -1213,10 +1058,6 @@ ACE_HAS_PRUSAGE_T: an interval. This stuff is highly non-portable. - HPUX: - don't set - - ACE_HAS_SEMUN: -------------- @@ -1231,14 +1072,6 @@ ACE_HAS_SEMUN: ushort *array; /* array for GETALL & SETALL */ }; - HPUX: - don't set. - in /usr/include/sem.h: - /* The fourth argument to semctl() varies depending on the value of - its first argument. If desired, "union semun" can be declared - by the user, but this is not necessary since the individual - member can just be passed as the argument. */ - ACE_HAS_SIG_ATOMIC_T: --------------------- @@ -1251,12 +1084,6 @@ ACE_HAS_SIG_ATOMIC_T: typedef int sig_atomic_t; This is used in the Reactor and service configurator. - HPUX: - set it. - in /usr/include/sys/signal.h: - typedef unsigned int sig_atomic_t; - - ACE_HAS_SSIZE_T: ---------------- @@ -1268,11 +1095,6 @@ ACE_HAS_SSIZE_T: typedef int ssize_t; used mostly in IPC_SAP. (don't confuse with size_t). - HPUX: - set it. - in /usr/include/sys/types.h - - ACE_HAS_STRBUF_T: ----------------- @@ -1295,10 +1117,6 @@ ACE_HAS_STRBUF_T: int putmsg(int fildes, const struct strbuf *ctlptr, const struct strbuf *dataptr, int flags); - HPUX: - don't set. - no SYS V.4 streams. - ACE_HAS_STREAMS: ---------------- @@ -1310,10 +1128,6 @@ ACE_HAS_STREAMS: Notes: if defined, includes - HPUX: - don't set. - no SYS V.4 streams. - ACE_HAS_STREAM_PIPES: --------------------- @@ -1336,10 +1150,6 @@ ACE_HAS_STREAM_PIPES: if not set, won't be able to use the SPIPE class (IPC_SAP) with rendezvous handles. - HPUX: - don't set. - No sysV.4 streams. - ACE_HAS_SVR4_DYNAMIC_LINKING: ----------------------------- @@ -1352,12 +1162,6 @@ ACE_HAS_SVR4_DYNAMIC_LINKING: if defined, includes with dlopen(), dlsym(), etc.. - HPUX: - don't set. - has its own: - shl_findsym( ), shl_gethandle( ), shl_getsymbols( ), - shl_unload( ), shl_get( )(3X) - explicit load of shared libraries - ACE_HAS_SVR4_GETTIMEOFDAY: -------------------------- @@ -1372,16 +1176,6 @@ ACE_HAS_SVR4_GETTIMEOFDAY: Solaris: gettimeofday (struct timeval *tp) - HPUX: - don't set. - it has gettimeofday (struct timeval *tp, struct timezone *tzp); - most calls do a: - #if defined (ACE_HAS_SVR4_GETTIMEOFDAY) - ::gettimeofday (&cur_time); - #else - ::gettimeofday (&cur_time, 0); - #endif /* ACE_HAS_SVR4_GETTIMEOFDAY */ - ACE_HAS_POLL: ------------ @@ -1402,9 +1196,6 @@ ACE_USE_POLL_IMPLEMENTATION: Notes: Use the poll() event demultiplexor rather than select(). - HPUX: - set it. - ACE_HAS_SVR4_SIGNAL_T: ---------------------- @@ -1424,26 +1215,6 @@ ACE_HAS_SVR4_SIGNAL_T: typedef void (*SignalHandlerV)(...); #endif /* ACE_HAS_SVR4_SIGNAL_T */ - HPUX: - set it. - - -ACE_HAS_SVR4_TLI: ------------------ - - Used in: - libsrc/IPC_SAP/TLI_SAP/TLI.C - libsrc/IPC_SAP/TLI_SAP/TLI.h - libsrc/IPC_SAP/TLI_SAP/TLI_Stream.C - - Notes: - TLI is the transport layer calls as in: t_bind(), t_open(), t_unbind(), - t_optmgmt(), ... in SunOS and Solaris. - - HPUX: - don't set. - Not supported. - ACE_HAS_SYS_FILIO_H: -------------------- @@ -1464,12 +1235,6 @@ ACE_HAS_SYS_FILIO_H: * in the future OS releases. */ - HPUX: - defines FIOASYNC and some other ones, - defines some like FIOCLEX. - some are never defined. - use #ifdef HP-UX to modify sysincludes.h - ACE_HAS_TEMPLATE_TYPEDEFS: -------------------------- @@ -1512,30 +1277,6 @@ ACE_HAS_THREADS: We use Message_List.h even in a non-threaded environment. our XOMessageList.h does this by #ifdefs around Threaded things. - HPUX: - not until 10.0. - - -ACE_HAS_TIMOD_H: ----------------- - - Used in: - ace/OS.h - - Notes: - if defined, include - - Solaris: - timod is a STREAMS module for use with the Transport Inter- - face (TI) functions of the Network Services library. The - timod module converts a set of ioctl(2) calls into STREAMS - messages that may be consumed by a transport protocol pro- - vider that supports the Transport Interface. This allows a - user to initiate certain TI functions as atomic operations. - - HPUX: - don't set. - ACE_HAS_TIUSER_H: ----------------- @@ -1549,9 +1290,6 @@ ACE_HAS_TIUSER_H: Solaris: in conjunction with t_bind, t_accept, etc.. transport layer. - HPUX: - don't set. - ACE_USE_POLL_IMPLEMENTATION: ---------------------------- diff --git a/ACE/ace/RW_Process_Mutex.h b/ACE/ace/RW_Process_Mutex.h index 71244548ddce9..193c88eb273b7 100644 --- a/ACE/ace/RW_Process_Mutex.h +++ b/ACE/ace/RW_Process_Mutex.h @@ -47,19 +47,19 @@ class ACE_Export ACE_RW_Process_Mutex int flags = O_CREAT|O_RDWR, mode_t mode = ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS); - ~ACE_RW_Process_Mutex (void); + ~ACE_RW_Process_Mutex (); /** * Explicitly destroy the mutex. Note that only one thread should * call this method since it doesn't protect against race * conditions. */ - int remove (void); + int remove (); /// Same as acquire_write(). /// Acquire lock ownership; blocks until the lock is acquired or the /// operation fails. - int acquire (void); + int acquire (); /** * Same as tryacquire_write(). @@ -69,18 +69,18 @@ class ACE_Export ACE_RW_Process_Mutex * @retval -1 on failure. If the lock is already held, @c errno is set * to @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /// Release lock. - int release (void); + int release (); /// Acquire read lock; blocks until the lock is acquired or the /// operation fails. - int acquire_read (void); + int acquire_read (); /// Acquire write lock; blocks until the lock is acquired or the /// operation fails. - int acquire_write (void); + int acquire_write (); /** * Try to acquire the read lock, but do not block if the lock is not @@ -89,7 +89,7 @@ class ACE_Export ACE_RW_Process_Mutex * @retval -1 on failure. If the lock is already held, @c errno is set * to @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /** * Try to acquire the write lock, but do not block if the lock is not @@ -98,11 +98,11 @@ class ACE_Export ACE_RW_Process_Mutex * @retval -1 on failure. If the lock is already held, @c errno is set * to @c EBUSY. */ - int tryacquire_write (void); + int tryacquire_write (); /// Attempt to upgrade a read lock to a write lock. Returns 0 on /// success, -1 on failure. - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); /// Return the underlying lock. const ACE_File_Lock &lock () const; @@ -119,7 +119,7 @@ class ACE_Export ACE_RW_Process_Mutex ACE_TCHAR name_[ACE_UNIQUE_NAME_LEN]; /// Create and return the unique name. - const ACE_TCHAR *unique_name (void); + const ACE_TCHAR *unique_name (); /// We need this to get the readers/writer semantics... ACE_File_Lock lock_; diff --git a/ACE/ace/RW_Process_Mutex.inl b/ACE/ace/RW_Process_Mutex.inl index a82d6f61cdf53..22720738c78c4 100644 --- a/ACE/ace/RW_Process_Mutex.inl +++ b/ACE/ace/RW_Process_Mutex.inl @@ -3,63 +3,63 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Explicitly destroy the mutex. ACE_INLINE int -ACE_RW_Process_Mutex::remove (void) +ACE_RW_Process_Mutex::remove () { return this->lock_.remove (); } // Acquire lock ownership (wait on priority queue if necessary). ACE_INLINE int -ACE_RW_Process_Mutex::acquire (void) +ACE_RW_Process_Mutex::acquire () { return this->lock_.acquire (); } // Conditionally acquire lock (i.e., don't wait on queue). ACE_INLINE int -ACE_RW_Process_Mutex::tryacquire (void) +ACE_RW_Process_Mutex::tryacquire () { return this->lock_.tryacquire (); } // Release lock and unblock a thread at head of priority queue. ACE_INLINE int -ACE_RW_Process_Mutex::release (void) +ACE_RW_Process_Mutex::release () { return this->lock_.release (); } // Acquire lock ownership (wait on priority queue if necessary). ACE_INLINE int -ACE_RW_Process_Mutex::acquire_read (void) +ACE_RW_Process_Mutex::acquire_read () { return this->lock_.acquire_read (); } // Acquire lock ownership (wait on priority queue if necessary). ACE_INLINE int -ACE_RW_Process_Mutex::acquire_write (void) +ACE_RW_Process_Mutex::acquire_write () { return this->lock_.acquire_write (); } // Conditionally acquire a lock (i.e., won't block). ACE_INLINE int -ACE_RW_Process_Mutex::tryacquire_read (void) +ACE_RW_Process_Mutex::tryacquire_read () { return this->lock_.tryacquire_read (); } // Conditionally acquire a lock (i.e., won't block). ACE_INLINE int -ACE_RW_Process_Mutex::tryacquire_write (void) +ACE_RW_Process_Mutex::tryacquire_write () { return this->lock_.tryacquire_write (); } // Conditionally upgrade a lock (i.e., won't block). ACE_INLINE int -ACE_RW_Process_Mutex::tryacquire_write_upgrade (void) +ACE_RW_Process_Mutex::tryacquire_write_upgrade () { return this->lock_.tryacquire_write_upgrade (); } diff --git a/ACE/ace/Reactor.cpp b/ACE/ace/Reactor.cpp index e08c9b9d1419f..d969f84f27714 100644 --- a/ACE/ace/Reactor.cpp +++ b/ACE/ace/Reactor.cpp @@ -169,13 +169,13 @@ ACE_Reactor::name () int ACE_Reactor::check_reconfiguration (ACE_Reactor *) { -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) +#if !defined (ACE_LACKS_ACE_SVCCONF) if (ACE_Service_Config::reconfig_occurred ()) { ACE_Service_Config::reconfigure (); return 1; } -#endif /* ! ACE_HAS_WINCE || ! ACE_LACKS_ACE_SVCCONF */ +#endif /* !ACE_LACKS_ACE_SVCCONF */ return 0; } diff --git a/ACE/ace/Reactor_Notification_Strategy.h b/ACE/ace/Reactor_Notification_Strategy.h index 93f58051d2415..26288543a8dd1 100644 --- a/ACE/ace/Reactor_Notification_Strategy.h +++ b/ACE/ace/Reactor_Notification_Strategy.h @@ -36,14 +36,14 @@ class ACE_Export ACE_Reactor_Notification_Strategy : public ACE_Notification_Str ACE_Reactor_Mask mask); /// Default destructor. - virtual ~ACE_Reactor_Notification_Strategy (void); + virtual ~ACE_Reactor_Notification_Strategy (); - virtual int notify (void); + virtual int notify (); virtual int notify (ACE_Event_Handler *eh, ACE_Reactor_Mask mask); /// Get the reactor - ACE_Reactor *reactor (void); + ACE_Reactor *reactor (); /// Set the reactor void reactor (ACE_Reactor *r); diff --git a/ACE/ace/Reactor_Notification_Strategy.inl b/ACE/ace/Reactor_Notification_Strategy.inl index 92a472cee94f4..9341c850c9e07 100644 --- a/ACE/ace/Reactor_Notification_Strategy.inl +++ b/ACE/ace/Reactor_Notification_Strategy.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Reactor * -ACE_Reactor_Notification_Strategy::reactor (void) +ACE_Reactor_Notification_Strategy::reactor () { return this->reactor_; } diff --git a/ACE/ace/Reactor_Timer_Interface.h b/ACE/ace/Reactor_Timer_Interface.h index 71202e0ccf7c0..c1878b292bf6d 100644 --- a/ACE/ace/Reactor_Timer_Interface.h +++ b/ACE/ace/Reactor_Timer_Interface.h @@ -66,7 +66,6 @@ class ACE_Export ACE_Reactor_Timer_Interface virtual int cancel_timer (ACE_Event_Handler *event_handler, int dont_call_handle_close = 1) = 0; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Reactor_Token_T.cpp b/ACE/ace/Reactor_Token_T.cpp index 827aefcc64a11..01898945b8e02 100644 --- a/ACE/ace/Reactor_Token_T.cpp +++ b/ACE/ace/Reactor_Token_T.cpp @@ -38,13 +38,13 @@ ACE_Reactor_Token_T::ACE_Reactor_Token_T (int s_queue) } template -ACE_Reactor_Token_T::~ACE_Reactor_Token_T (void) +ACE_Reactor_Token_T::~ACE_Reactor_Token_T () { ACE_TRACE ("ACE_Reactor_Token_T::~ACE_Reactor_Token_T"); } template ACE_Reactor_Impl & -ACE_Reactor_Token_T::reactor (void) +ACE_Reactor_Token_T::reactor () { return *this->reactor_; } @@ -58,7 +58,7 @@ ACE_Reactor_Token_T::reactor (ACE_Reactor_Impl &reactor) // Used to wakeup the reactor. template void -ACE_Reactor_Token_T::sleep_hook (void) +ACE_Reactor_Token_T::sleep_hook () { ACE_TRACE ("ACE_Reactor_Token_T::sleep_hook"); ACE_Time_Value ping (ACE_Time_Value::zero); diff --git a/ACE/ace/Reactor_Token_T.h b/ACE/ace/Reactor_Token_T.h index 0f92ec7206c1a..2d7933fb834ef 100644 --- a/ACE/ace/Reactor_Token_T.h +++ b/ACE/ace/Reactor_Token_T.h @@ -55,14 +55,14 @@ class ACE_Reactor_Token_T : public ACE_TOKEN_TYPE ACE_Reactor_Token_T (ACE_Reactor_Impl &r, int s_queue = ACE_TOKEN_TYPE::FIFO); ACE_Reactor_Token_T (int s_queue = ACE_TOKEN_TYPE::FIFO); - virtual ~ACE_Reactor_Token_T (void); + virtual ~ACE_Reactor_Token_T (); /// Called just before a token waiter goes to sleep. /// @see ACE_Token::sleep_hook - virtual void sleep_hook (void); + virtual void sleep_hook (); /// Get the reactor implementation - ACE_Reactor_Impl &reactor (void); + ACE_Reactor_Impl &reactor (); /// Set the reactor implementation void reactor (ACE_Reactor_Impl &); @@ -79,13 +79,7 @@ class ACE_Reactor_Token_T : public ACE_TOKEN_TYPE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Reactor_Token_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reactor_Token_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_REACTOR_TOKEN_T_H */ diff --git a/ACE/ace/Read_Buffer.cpp b/ACE/ace/Read_Buffer.cpp index e3667a66b0762..ba1740651814d 100644 --- a/ACE/ace/Read_Buffer.cpp +++ b/ACE/ace/Read_Buffer.cpp @@ -41,7 +41,6 @@ ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp, this->allocator_ = ACE_Allocator::instance (); } -#if !defined (ACE_HAS_WINCE) ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle, bool close_on_delete, ACE_Allocator *alloc) @@ -56,7 +55,6 @@ ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle, if (this->allocator_ == 0) this->allocator_ = ACE_Allocator::instance (); } -#endif // ACE_HAS_WINCE ACE_Read_Buffer::~ACE_Read_Buffer () { diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h index ea5cbb0c0047a..ee3a96133b053 100644 --- a/ACE/ace/Read_Buffer.h +++ b/ACE/ace/Read_Buffer.h @@ -49,17 +49,13 @@ class ACE_Export ACE_Read_Buffer bool close_on_delete = false, ACE_Allocator * = 0); -#if !defined (ACE_HAS_WINCE) - // Note that ACE_HANDLE = FILE under CE. - /// Read from an open HANDLE. ACE_Read_Buffer (ACE_HANDLE handle, bool close_on_delete = false, ACE_Allocator * = 0); -#endif // ACE_HAS_WINCE /// Closes the FILE *. - ~ACE_Read_Buffer (void); + ~ACE_Read_Buffer (); /** * Returns a pointer dynamically allocated with diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp index 398f56bff1e80..1f7b2dc812988 100644 --- a/ACE/ace/Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Recursive_Thread_Mutex.cpp @@ -79,7 +79,7 @@ int ACE_Recursive_Thread_Mutex::get_nesting_level () { // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level"); -#if defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP) ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_RECURSIVE_MUTEXES) # if defined (ACE_WIN32) @@ -99,7 +99,7 @@ ACE_Recursive_Thread_Mutex::get_nesting_level () nesting_level = this->lock_.nesting_level_; ACE_OS::mutex_unlock (&this->lock_.nesting_mutex_); return nesting_level; -#endif /* !ACE_HAS_WINCE */ +#endif /* ACE_HAS_VXTHREADS || ACE_HAS_PHARLAP */ } void diff --git a/ACE/ace/Recyclable.h b/ACE/ace/Recyclable.h index a78da3e16a942..da2dad0e3d31b 100644 --- a/ACE/ace/Recyclable.h +++ b/ACE/ace/Recyclable.h @@ -57,7 +57,6 @@ class ACE_Export ACE_Recyclable void recycle_state (ACE_Recyclable_State new_state); protected: - /// Constructor. ACE_Recyclable (ACE_Recyclable_State initial_state); diff --git a/ACE/ace/Refcountable_T.h b/ACE/ace/Refcountable_T.h index 73b6d04021e11..5dab2e6e5409a 100644 --- a/ACE/ace/Refcountable_T.h +++ b/ACE/ace/Refcountable_T.h @@ -54,13 +54,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Refcountable_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Refcountable_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Refcountable_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*ACE_REFCOUNTABLE_T_H*/ diff --git a/ACE/ace/Refcounted_Auto_Ptr.h b/ACE/ace/Refcounted_Auto_Ptr.h index f5d18f1f0294e..e63af3a048125 100644 --- a/ACE/ace/Refcounted_Auto_Ptr.h +++ b/ACE/ace/Refcounted_Auto_Ptr.h @@ -183,13 +183,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Refcounted_Auto_Ptr.inl" -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Refcounted_Auto_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Refcounted_Auto_Ptr.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp index 9e63c4421f63f..ddd8e77923eca 100644 --- a/ACE/ace/Registry.cpp +++ b/ACE/ace/Registry.cpp @@ -100,7 +100,7 @@ ACE_Registry::Binding::name (ACE_TString &name) // Name accessors // (String version) ACE_TString -ACE_Registry::Binding::name (void) +ACE_Registry::Binding::name () { return this->name_; } @@ -108,7 +108,7 @@ ACE_Registry::Binding::name (void) // Type accessor ACE_Registry::Binding_Type -ACE_Registry::Binding::type (void) +ACE_Registry::Binding::type () { return this->type_; } @@ -168,7 +168,7 @@ ACE_Registry::Object::type () const // Simple context constructor -ACE_Registry::Naming_Context::Naming_Context (void) +ACE_Registry::Naming_Context::Naming_Context () : key_ ((HKEY) 0), parent_key_ ((HKEY) 0), name_ () @@ -575,7 +575,7 @@ ACE_Registry::Naming_Context::resolve_context (const ACE_TString &name, // Same as unbind_context() with as naming_context int -ACE_Registry::Naming_Context::destroy (void) +ACE_Registry::Naming_Context::destroy () { // hopefully the parent_key_ is still open long result = ACE_TEXT_RegDeleteKey (this->parent_key_, @@ -587,7 +587,7 @@ ACE_Registry::Naming_Context::destroy (void) // Sync content of context to disk int -ACE_Registry::Naming_Context::flush (void) +ACE_Registry::Naming_Context::flush () { long result = ::RegFlushKey (this->key_); ACE_REGISTRY_CALL_RETURN (result); @@ -596,7 +596,7 @@ ACE_Registry::Naming_Context::flush (void) // Close the handle of the context int -ACE_Registry::Naming_Context::close (void) +ACE_Registry::Naming_Context::close () { long result = this->key_ ? ::RegCloseKey (this->key_) : ERROR_SUCCESS; ACE_REGISTRY_CALL_RETURN (result); @@ -676,7 +676,7 @@ ACE_Registry::Naming_Context::key (HKEY key) // Get key HKEY -ACE_Registry::Naming_Context::key (void) +ACE_Registry::Naming_Context::key () { return this->key_; } @@ -692,7 +692,7 @@ ACE_Registry::Naming_Context::parent (HKEY parent) // Get parent HKEY -ACE_Registry::Naming_Context::parent (void) +ACE_Registry::Naming_Context::parent () { return this->parent_key_; } @@ -728,7 +728,7 @@ ACE_Registry::Naming_Context::name (const ACE_TString &name) // Get name // (String version) ACE_TString -ACE_Registry::Naming_Context::name (void) +ACE_Registry::Naming_Context::name () { return this->name_; } @@ -836,12 +836,12 @@ ACE_Registry::Binding_Iterator::Iteration_State::iterator (Binding_Iterator *ite } -ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State (void) +ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State () : index_ (0) { } -ACE_Registry::Binding_Iterator::Iteration_State::~Iteration_State (void) +ACE_Registry::Binding_Iterator::Iteration_State::~Iteration_State () { } @@ -877,7 +877,7 @@ ACE_Registry::Binding_Iterator::next_n (u_long how_many, // Destroy iterator int -ACE_Registry::Binding_Iterator::destroy (void) +ACE_Registry::Binding_Iterator::destroy () { this->reset (); return 0; @@ -893,7 +893,7 @@ ACE_Registry::Binding_Iterator::naming_context (Naming_Context &naming_context) ACE_Registry::Naming_Context & -ACE_Registry::Binding_Iterator::naming_context (void) +ACE_Registry::Binding_Iterator::naming_context () { return *this->naming_context_; } @@ -908,7 +908,7 @@ ACE_Registry::Binding_Iterator::current_enumeration (Iteration_State ¤t_en ACE_Registry::Binding_Iterator::Iteration_State & -ACE_Registry::Binding_Iterator::current_enumeration (void) +ACE_Registry::Binding_Iterator::current_enumeration () { return *this->current_enumeration_; } @@ -1071,12 +1071,6 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co HKEY predefined, const ACE_TCHAR *machine_name) { -#if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG(naming_context); - ACE_UNUSED_ARG(predefined); - ACE_UNUSED_ARG(machine_name); - return -1; -#else long result = -1; if (machine_name != 0 && ACE_OS::strcmp (ACE_TEXT ("localhost"), machine_name) == 0) @@ -1101,10 +1095,9 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co } ACE_REGISTRY_CALL_RETURN (result); -#endif // ACE_HAS_WINCE } -// Check if is the local host +/// Check if @a machine_name is the local host /* static */ int ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name) diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h index 893d4ec9b68d2..8d5e613116e16 100644 --- a/ACE/ace/Registry.h +++ b/ACE/ace/Registry.h @@ -42,7 +42,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Registry { public: - /// International string struct ACE_Export Name_Component { @@ -74,7 +73,7 @@ class ACE_Export ACE_Registry struct ACE_Export Binding { /// Empty (default) constructor - Binding (void); + Binding (); /// Constructor /// (Name version) @@ -98,10 +97,10 @@ class ACE_Export ACE_Registry void name (ACE_TString &name); /// Get Name (String version) - ACE_TString name (void); + ACE_TString name (); /// Type accessor - Binding_Type type (void); + Binding_Type type (); private: /// A binding has a name @@ -189,13 +188,13 @@ class ACE_Export ACE_Registry }; /// Empty constructor: keys will be NULL - Naming_Context (void); + Naming_Context (); /// Constructor: key_ will be set to @a key Naming_Context (const HKEY &key); /// Destructor will call . - ~Naming_Context (void); + ~Naming_Context (); // The following interfaces are for objects @@ -328,7 +327,7 @@ class ACE_Export ACE_Registry int unbind_context (const ACE_TString &name); /// Same as with @c this as naming_context - int destroy (void); + int destroy (); /** * listing function: iterator creator @@ -348,20 +347,20 @@ class ACE_Export ACE_Registry // not part of the CORBA interface /// Sync content of context to disk - int flush (void); + int flush (); /// Close the handle of the context /// @note does not call - int close (void); + int close (); // Accessors /// Get key - HKEY key (void); + HKEY key (); // void parent (HKEY parent); /// Get parent - HKEY parent (void); + HKEY parent (); /// Get name /// (Name version) @@ -371,7 +370,7 @@ class ACE_Export ACE_Registry void name (ACE_TString &name); /// Get name (String version) - ACE_TString name (void); + ACE_TString name (); protected: /// Set key @@ -419,7 +418,7 @@ class ACE_Export ACE_Registry friend class Naming_Context; /// Default constructor - Binding_Iterator (void); + Binding_Iterator (); /// Next entry int next_one (Binding &binding); @@ -429,16 +428,15 @@ class ACE_Export ACE_Registry Binding_List &list); /// Cleanup - int destroy (void); + int destroy (); /// Reset the internal state of the iterator - void reset (void); + void reset (); /// Get naming_context that the iterator is iterating over - Naming_Context &naming_context (void); + Naming_Context &naming_context (); private: - /// Set naming_context that the iterator is iterating over void naming_context (Naming_Context& naming_context); @@ -458,10 +456,10 @@ class ACE_Export ACE_Registry { public: /// Constructor - Iteration_State (void); + Iteration_State (); /// Destructor - virtual ~Iteration_State (void); + virtual ~Iteration_State (); /// Set the iterator reference. void iterator (Binding_Iterator *iterator); @@ -471,7 +469,7 @@ class ACE_Export ACE_Registry Binding_List &list) = 0; /// Reset state - void reset (void); + void reset (); protected: /// Pointer to parent iterator @@ -522,7 +520,7 @@ class ACE_Export ACE_Registry void current_enumeration (Iteration_State& current_enumeration); /// Get current_enumeration - Iteration_State ¤t_enumeration (void); + Iteration_State ¤t_enumeration (); }; }; diff --git a/ACE/ace/Registry_Name_Space.h b/ACE/ace/Registry_Name_Space.h index ee4ea7418a3b9..a3b770928ee7a 100644 --- a/ACE/ace/Registry_Name_Space.h +++ b/ACE/ace/Registry_Name_Space.h @@ -123,7 +123,6 @@ class ACE_Export ACE_Registry_Name_Space : public ACE_Name_Space void dump () const; private: - /// current context ACE_Registry::Naming_Context context_; }; diff --git a/ACE/ace/Remote_Name_Space.h b/ACE/ace/Remote_Name_Space.h index cdda6074e68db..3db871764c824 100644 --- a/ACE/ace/Remote_Name_Space.h +++ b/ACE/ace/Remote_Name_Space.h @@ -46,7 +46,7 @@ class ACE_Export ACE_Remote_Name_Space : public ACE_Name_Space { public: /// "Do-nothing" constructor. - ACE_Remote_Name_Space (void); + ACE_Remote_Name_Space (); /** * Specifies the scope of this namespace, opens and memory-maps the @@ -64,7 +64,7 @@ class ACE_Export ACE_Remote_Name_Space : public ACE_Name_Space /// destructor, do some cleanup :TBD: last dtor should "compress" /// file - ~ACE_Remote_Name_Space (void); + ~ACE_Remote_Name_Space (); /// Bind a new name to a naming context (Wide character strings). virtual int bind (const ACE_NS_WString &name_in, diff --git a/ACE/ace/Remote_Tokens.cpp b/ACE/ace/Remote_Tokens.cpp index 866f791620129..315b464f0bf9b 100644 --- a/ACE/ace/Remote_Tokens.cpp +++ b/ACE/ace/Remote_Tokens.cpp @@ -32,18 +32,18 @@ ACE_TSS_Connection::set_server_address (const ACE_INET_Addr &server_address) } // Necessary to make some compilers work... -ACE_TSS_Connection::ACE_TSS_Connection (void) +ACE_TSS_Connection::ACE_TSS_Connection () { ACE_TRACE ("ACE_TSS_Connection::ACE_TSS_Connection"); } -ACE_TSS_Connection::~ACE_TSS_Connection (void) +ACE_TSS_Connection::~ACE_TSS_Connection () { ACE_TRACE ("ACE_TSS_Connection::~ACE_TSS_Connection"); } ACE_SOCK_Stream * -ACE_TSS_Connection::get_connection (void) +ACE_TSS_Connection::get_connection () { return ACE_TSS::operator-> (); } @@ -71,7 +71,7 @@ ACE_TSS_Connection::make_TSS_TYPE () const return stream; } -ACE_TSS_Connection::operator ACE_SOCK_Stream *(void) +ACE_TSS_Connection::operator ACE_SOCK_Stream *() { return this->get_connection (); } @@ -91,12 +91,12 @@ ACE_TSS_Connection::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy (void) +ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy () { ACE_TRACE ("ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy"); } -ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy (void) +ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy () { ACE_TRACE ("ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy"); } @@ -119,7 +119,7 @@ ACE_Remote_Token_Proxy::set_server_address (const ACE_INET_Addr &server_address) } int -ACE_Remote_Token_Proxy::initiate_connection (void) +ACE_Remote_Token_Proxy::initiate_connection () { ACE_TRACE ("ACE_Remote_Token_Proxy::initiate_connection"); if (token_ == 0) @@ -377,7 +377,7 @@ ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *) } const ACE_TCHAR* -ACE_Remote_Token_Proxy::owner_id (void) +ACE_Remote_Token_Proxy::owner_id () { ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id"); ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_id called\n"))); diff --git a/ACE/ace/Remote_Tokens.h b/ACE/ace/Remote_Tokens.h index e77398412e2d8..0b8a3a8039429 100644 --- a/ACE/ace/Remote_Tokens.h +++ b/ACE/ace/Remote_Tokens.h @@ -70,7 +70,7 @@ class ACE_Export ACE_Remote_Token_Proxy : public ACE_Token_Proxy * is, every thread has only one connection that is used for all * remote tokens. */ - int initiate_connection (void); + int initiate_connection (); /** * Acquire the distributed token. If notify is specified and the @@ -126,7 +126,7 @@ class ACE_Export ACE_Remote_Token_Proxy : public ACE_Token_Proxy virtual void token_acquired (ACE_TPQ_Entry *); /// The client id of the current token holder - virtual const ACE_TCHAR* owner_id (void); + virtual const ACE_TCHAR* owner_id (); /** * Sets the server address for all instances of ACE_Remote_Token_Proxy @@ -140,7 +140,6 @@ class ACE_Export ACE_Remote_Token_Proxy : public ACE_Token_Proxy void dump () const; protected: - /// If shadows report deadlock, go remote anyway int ignore_shadow_deadlock_; @@ -167,7 +166,7 @@ class ACE_Export ACE_Remote_Mutex : public ACE_Remote_Token_Proxy { public: /// Null creation. Remote_Token_Proxy::open must be called. - ACE_Remote_Mutex (void); + ACE_Remote_Mutex (); /// Calls Remote_Token_Proxy::open for you. ACE_Remote_Mutex (const ACE_TCHAR *token_name, @@ -202,7 +201,7 @@ class ACE_Export ACE_Remote_Mutex : public ACE_Remote_Token_Proxy class ACE_Export ACE_Remote_RLock : public ACE_Remote_Token_Proxy { public: - ACE_Remote_RLock (void); + ACE_Remote_RLock (); ACE_Remote_RLock (const ACE_TCHAR *token_name, int ignore_deadlock = 0, @@ -240,7 +239,7 @@ class ACE_Export ACE_Remote_RLock : public ACE_Remote_Token_Proxy class ACE_Export ACE_Remote_WLock : public ACE_Remote_Token_Proxy { public: - ACE_Remote_WLock (void); + ACE_Remote_WLock (); ACE_Remote_WLock (const ACE_TCHAR *token_name, int ignore_deadlock = 0, @@ -276,18 +275,18 @@ class ACE_Export ACE_TSS_Connection : public ACE_TSS { public: // Necessary to make some compilers work... - ACE_TSS_Connection (void); - ~ACE_TSS_Connection (void); + ACE_TSS_Connection (); + ~ACE_TSS_Connection (); /// Retrieve the thread's connection - ACE_SOCK_Stream *get_connection (void); + ACE_SOCK_Stream *get_connection (); /// Factory Method that creates a new SOCK Stream. virtual ACE_SOCK_Stream *make_TSS_TYPE () const; /// Inheritance and operator overloading don't mix. Redefine this /// from ACE_TSS so that we can use it. - operator ACE_SOCK_Stream *(void); + operator ACE_SOCK_Stream *(); /// Set the server address. static void set_server_address (const ACE_INET_Addr &server_address); diff --git a/ACE/ace/Remote_Tokens.inl b/ACE/ace/Remote_Tokens.inl index 84f8e3691ff92..446a76928cfea 100644 --- a/ACE/ace/Remote_Tokens.inl +++ b/ACE/ace/Remote_Tokens.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Remote_Mutex::ACE_Remote_Mutex (void) +ACE_Remote_Mutex::ACE_Remote_Mutex () { ACE_TRACE ("ACE_Remote_Mutex::ACE_Remote_Mutex"); } diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h index 16400fc9305c5..9f0d2ae659f3b 100644 --- a/ACE/ace/Reverse_Lock_T.h +++ b/ACE/ace/Reverse_Lock_T.h @@ -68,7 +68,6 @@ template class ACE_Reverse_Lock : public ACE_Lock { public: - typedef ACE_LOCKING_MECHANISM ACE_LOCK; // = Initialization/Finalization methods. @@ -123,13 +122,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Reverse_Lock_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Reverse_Lock_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reverse_Lock_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_REVERSE_LOCK_T_H */ diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c deleted file mode 100644 index 389169d7a3292..0000000000000 --- a/ACE/ace/Rtems_init.c +++ /dev/null @@ -1,216 +0,0 @@ - -#if defined (ACE_HAS_RTEMS) - -#define RTEMS_BSP_NETWORK_DRIVER_NAME "ne1" -#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_ne_driver_attach -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 256 - -#define CONFIGURE_MAXIMUM_POSIX_THREADS 100 -#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 300 -#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 300 -#define CONFIGURE_MAXIMUM_POSIX_KEYS 100 -#define CONFIGURE_MAXIMUM_POSIX_TIMERS 100 -#define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 10 -#define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES 300 -#define CONFIGURE_POSIX_INIT_THREAD_TABLE -#define CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT Init -#define CONFIGURE_MEMORY_FOR_POSIX (10*1024) -#define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE (10*1024) - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_EXECUTIVE_RAM_SIZE (512*1024) - -#define CONFIGURE_MICROSECONDS_PER_TICK 10000 - -#define CONFIGURE_MAXIMUM_SEMAPHORES 100 -#define CONFIGURE_MAXIMUM_TASKS 100 -#define CONFIGURE_INIT_TASK_PRIORITY 120 -#define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \ - RTEMS_NO_TIMESLICE | \ - RTEMS_NO_ASR | \ - RTEMS_INTERRUPT_LEVEL(0)) - -#include - -char *rtems_progname; - -#define CONFIGURE_INIT - -rtems_task Init (rtems_task_argument argument); - -#include - -#include - -#if !defined (ACE_LACKS_NETWORKING) - -#include - -/* - * Network configuration - * - ************************************************************ - * EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION * - * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! * - ************************************************************ - */ - -#ifndef _RTEMS_NETWORKCONFIG_H_ -#define _RTEMS_NETWORKCONFIG_H_ - -#ifndef RTEMS_BSP_NETWORK_DRIVER_NAME -#warning "RTEMS_BSP_NETWORK_DRIVER_NAME is not defined" -#define RTEMS_BSP_NETWORK_DRIVER_NAME "no_network1" -#endif - -#ifndef RTEMS_BSP_NETWORK_DRIVER_ATTACH -#warning "RTEMS_BSP_NETWORK_DRIVER_ATTACH is not defined" -#define RTEMS_BSP_NETWORK_DRIVER_ATTACH 0 -#endif - -/* #define RTEMS_USE_BOOTP */ - -#include - -/* - * Define RTEMS_SET_ETHERNET_ADDRESS if you want to specify the - * Ethernet address here. If RTEMS_SET_ETHERNET_ADDRESS is not - * defined the driver will choose an address. - */ -#define RTEMS_SET_ETHERNET_ADDRESS -#if (defined (RTEMS_SET_ETHERNET_ADDRESS)) -static char ethernet_address[6] = { 0x00, 0x80, 0x7F, 0x22, 0x61, 0x77 }; - -#endif - -#define RTEMS_USE_LOOPBACK - -#ifdef RTEMS_USE_LOOPBACK -/* - * Loopback interface - */ -int rtems_bsdnet_loopattach(struct rtems_bsdnet_ifconfig *, int); - -#ifdef RTEMS_USE_LOOPBACK_ONLY -static struct rtems_bsdnet_ifconfig netdriver_config = { -#else -static struct rtems_bsdnet_ifconfig loopback_config = { -#endif - "lo0", /* name */ - rtems_bsdnet_loopattach, /* attach function */ - 0, /* link to next interface */ - "127.0.0.1", /* IP address */ - "255.0.0.0", /* IP net mask */ -}; -#endif - -/* - * Default network interface - */ -#ifndef RTEMS_USE_LOOPBACK_ONLY -static struct rtems_bsdnet_ifconfig netdriver_config = { - RTEMS_BSP_NETWORK_DRIVER_NAME, /* name */ - RTEMS_BSP_NETWORK_DRIVER_ATTACH, /* attach function */ - -#ifdef RTEMS_USE_LOOPBACK - &loopback_config, /* link to next interface */ -#else - 0, /* No more interfaces */ -#endif - -#if (defined (RTEMS_USE_BOOTP)) - 0, /* BOOTP supplies IP address */ - 0, /* BOOTP supplies IP net mask */ -#else - "XXX.YYY.ZZZ.XYZ", /* IP address */ - "255.255.255.0", /* IP net mask */ -#endif /* !RTEMS_USE_BOOTP */ - -#if (defined (RTEMS_SET_ETHERNET_ADDRESS)) - ethernet_address, /* Ethernet hardware address */ -#else - 0, /* Driver supplies hardware address */ -#endif - 0 /* Use default driver parameters */ -}; -#endif - -/* - * Network configuration - */ -struct rtems_bsdnet_config rtems_bsdnet_config = { - &netdriver_config, - -#if (defined (RTEMS_USE_BOOTP)) - rtems_bsdnet_do_bootp, -#else - 0, -#endif - - 0, /* Default network task priority */ - 0, /* Default mbuf capacity */ - 0, /* Default mbuf cluster capacity */ - -#if (!defined (RTEMS_USE_BOOTP)) - "rtems_host", /* Host name */ - "nodomain.com", /* Domain name */ - "XXX.YYY.ZZZ.1", /* Gateway */ - "XXX.YYY.ZZZ.1", /* Log host */ - {"XXX.YYY.ZZZ.1" }, /* Name server(s) */ - {"XXX.YYY.ZZZ.1" }, /* NTP server(s) */ - - /* - * A real example -- DO NOT USE THIS YOURSELF!!! - */ - -#if 0 - "dy4", /* Host name */ - "NOT_oarcorp.com", /* Domain name */ - "192.168.1.2", /* Gateway */ - "192.168.1.2", /* Log host */ - {"192.168.1.2" }, /* Name server(s) */ - {"192.168.1.2" }, /* NTP server(s) */ -#endif -#endif /* !RTEMS_USE_BOOTP */ - -}; - -/* - * For TFTP test application - */ -#if (defined (RTEMS_USE_BOOTP)) -#define RTEMS_TFTP_TEST_HOST_NAME "BOOTP_HOST" -#define RTEMS_TFTP_TEST_FILE_NAME "BOOTP_FILE" -#else -#define RTEMS_TFTP_TEST_HOST_NAME "XXX.YYY.ZZZ.XYZ" -#define RTEMS_TFTP_TEST_FILE_NAME "tftptest" -#endif - -#endif /* _RTEMS_NETWORKCONFIG_H_ */ - -#endif /* ACE_LACKS_NETWORKING */ - -extern int main (int, char *[]); - -/* - * RTEMS Startup Task - */ -rtems_task -Init (rtems_task_argument not_used) -{ - int retval = 0; -#if !defined (ACE_LACKS_NETWORKING) - retval = rtems_bsdnet_initialize_network (); -#endif /* ACE_LACKS_NETWORKING */ - if (retval == 0) - { - retval = main (0, 0); - } -} - -#elif !defined (__GNUC__) && !defined (__INTEL_COMPILER) -/* Make compilers stop complaining about an empty translation unit */ -static int shut_up_compiler = 0; -#endif /* ACE_HAS_RTEMS */ diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp index 19af145fa8107..b0c62030d7e38 100644 --- a/ACE/ace/SOCK_Acceptor.cpp +++ b/ACE/ace/SOCK_Acceptor.cpp @@ -13,9 +13,7 @@ #include "ace/SOCK_Acceptor.inl" #endif /* __ACE_INLINE__ */ -#if !defined (ACE_HAS_WINCE) #include "ace/OS_QoS.h" -#endif // ACE_HAS_WINCE ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -154,7 +152,6 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, reset_new_handle); } -#if !defined (ACE_HAS_WINCE) int ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, @@ -206,7 +203,6 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, in_blocking_mode, reset_new_handle); } -#endif // ACE_HAS_WINCE void ACE_SOCK_Acceptor::dump () const diff --git a/ACE/ace/SOCK_Acceptor.h b/ACE/ace/SOCK_Acceptor.h index 1dc947fb9cf2d..a4035fcd92d80 100644 --- a/ACE/ace/SOCK_Acceptor.h +++ b/ACE/ace/SOCK_Acceptor.h @@ -119,7 +119,6 @@ class ACE_Export ACE_SOCK_Acceptor : public ACE_SOCK bool restart = true, bool reset_new_handle = false) const; -#if !defined (ACE_HAS_WINCE) /** * Accept a new ACE_SOCK_Stream connection using the QoS * information in @a qos_params. A @a timeout of 0 means block @@ -136,7 +135,6 @@ class ACE_Export ACE_SOCK_Acceptor : public ACE_SOCK ACE_Time_Value *timeout = 0, bool restart = true, bool reset_new_handle = false) const; -#endif // ACE_HAS_WINCE // = Meta-type info typedef ACE_INET_Addr PEER_ADDR; diff --git a/ACE/ace/SOCK_CODgram.h b/ACE/ace/SOCK_CODgram.h index bbe37f296238c..c52f33f538fb8 100644 --- a/ACE/ace/SOCK_CODgram.h +++ b/ACE/ace/SOCK_CODgram.h @@ -35,7 +35,7 @@ class ACE_Export ACE_SOCK_CODgram : public ACE_SOCK_IO { public: /// Default constructor. - ACE_SOCK_CODgram (void); + ACE_SOCK_CODgram (); /** * Constructor with addresses specified. Calls open(). @@ -78,7 +78,7 @@ class ACE_Export ACE_SOCK_CODgram : public ACE_SOCK_IO int reuse_addr = 0); /// Default dtor. - ~ACE_SOCK_CODgram (void); + ~ACE_SOCK_CODgram (); // Initiate a connected dgram. diff --git a/ACE/ace/SOCK_CODgram.inl b/ACE/ace/SOCK_CODgram.inl index 28f4faf936a88..c649a0e7c2257 100644 --- a/ACE/ace/SOCK_CODgram.inl +++ b/ACE/ace/SOCK_CODgram.inl @@ -2,13 +2,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_SOCK_CODgram::ACE_SOCK_CODgram (void) +ACE_SOCK_CODgram::ACE_SOCK_CODgram () { ACE_TRACE ("ACE_SOCK_CODgram::ACE_SOCK_CODgram"); } ACE_INLINE -ACE_SOCK_CODgram::~ACE_SOCK_CODgram (void) +ACE_SOCK_CODgram::~ACE_SOCK_CODgram () { ACE_TRACE ("ACE_SOCK_CODgram::~ACE_SOCK_CODgram"); } diff --git a/ACE/ace/SOCK_Connector.cpp b/ACE/ace/SOCK_Connector.cpp index cba9987fa0e54..df7cb39adc44f 100644 --- a/ACE/ace/SOCK_Connector.cpp +++ b/ACE/ace/SOCK_Connector.cpp @@ -8,9 +8,7 @@ # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ -#if !defined (ACE_HAS_WINCE) #include "ace/OS_QoS.h" -#endif // ACE_HAS_WINCE #if !defined (__ACE_INLINE__) #include "ace/SOCK_Connector.inl" @@ -216,7 +214,6 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, return this->shared_connect_finish (new_stream, timeout, result); } -#if !defined (ACE_HAS_WINCE) int ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, const ACE_Addr &remote_sap, @@ -264,10 +261,8 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, return this->shared_connect_finish (new_stream, timeout, result); } -#endif // ACE_HAS_WINCE // Try to complete a non-blocking connection. - int ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_sap, @@ -344,7 +339,6 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } -#if !defined (ACE_HAS_WINCE) ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, const ACE_Addr &remote_sap, ACE_QoS_Params qos_params, @@ -374,6 +368,5 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } -#endif // ACE_HAS_WINCE ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SOCK_Connector.h b/ACE/ace/SOCK_Connector.h index 2a7dde20db4a4..ddf4e324434a3 100644 --- a/ACE/ace/SOCK_Connector.h +++ b/ACE/ace/SOCK_Connector.h @@ -90,7 +90,6 @@ class ACE_Export ACE_SOCK_Connector int perms = 0, int protocol = 0); -#if !defined (ACE_HAS_WINCE) /** * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream * object if the connection succeeds. @@ -139,7 +138,6 @@ class ACE_Export ACE_SOCK_Connector u_long flags = 0, int reuse_addr = 0, int perms = 0); -#endif // ACE_HAS_WINCE /** * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream @@ -191,7 +189,6 @@ class ACE_Export ACE_SOCK_Connector int perms = 0, int protocol = 0); -#if !defined (ACE_HAS_WINCE) /** * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream * object if the connection succeeds. @@ -244,7 +241,6 @@ class ACE_Export ACE_SOCK_Connector u_long flags = 0, int reuse_addr = 0, int perms = 0); -#endif // ACE_HAS_WINCE /// Default destructor. ~ACE_SOCK_Connector (); diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index 8c03e610fb0d4..d23422f422588 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -419,8 +419,8 @@ ACE_SOCK_Dgram::send (const iovec iov[], // Determine the total length of all the buffers in . for (i = 0; i < n; i++) -#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX) || defined(ACE_HAS_RTEMS)) - // The iov_len is unsigned on Linux, RTEMS and when using the ACE iovec struct. If we go +#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX)) + // The iov_len is unsigned on Linux and when using the ACE iovec struct. If we go // ahead and try the if, it will emit a warning. if (iov[i].iov_len < 0) return -1; @@ -480,8 +480,8 @@ ACE_SOCK_Dgram::recv (iovec iov[], ACE_UNUSED_ARG (to_addr); for (i = 0; i < n; i++) -#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX) || defined(ACE_HAS_RTEMS)) - // The iov_len is unsigned on Linux, RTEMS and when using the ACE iovec struct. If we go +#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX)) + // The iov_len is unsigned on Linux and when using the ACE iovec struct. If we go // ahead and try the if, it will emit a warning. if (iov[i].iov_len < 0) return -1; diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp index 903bfd742ea27..129fcdce25b00 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.cpp +++ b/ACE/ace/SOCK_Dgram_Bcast.cpp @@ -162,7 +162,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) } -#if !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_VXWORKS) && !defined(__APPLE__) +#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_VXWORKS) && !defined(__APPLE__) for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0; n--, ifr++) #else @@ -180,7 +180,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) ifr = (struct ifreq *) ((caddr_t) &ifr->ifr_addr + ifr->ifr_addr.sa_len)) : (nbytes -= sizeof (struct ifreq), ifr++))) -#endif /* !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_VXWORKS) && !defined(__APPLE__) */ +#endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_VXWORKS) && !defined(__APPLE__) */ { #if defined (__QNX__) || defined (ACE_VXWORKS) // Silently skip link interfaces diff --git a/ACE/ace/SOCK_Dgram_Bcast.h b/ACE/ace/SOCK_Dgram_Bcast.h index cff204214377e..46e4a2d66b832 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.h +++ b/ACE/ace/SOCK_Dgram_Bcast.h @@ -37,7 +37,7 @@ class ACE_Export ACE_Bcast_Node ACE_Bcast_Node *); /// Destructor. - ~ACE_Bcast_Node (void) = default; + ~ACE_Bcast_Node () = default; /// Broadcast address for the interface. ACE_INET_Addr bcast_addr_; @@ -58,7 +58,7 @@ class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram { public: /// Default constructor. - ACE_SOCK_Dgram_Bcast (void); + ACE_SOCK_Dgram_Bcast (); ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, int protocol_family = PF_INET, @@ -67,7 +67,7 @@ class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram const ACE_TCHAR *host_name = 0); /// Default dtor. - ~ACE_SOCK_Dgram_Bcast (void); + ~ACE_SOCK_Dgram_Bcast (); // Initiate a connectionless datagram broadcast endpoint. @@ -79,7 +79,7 @@ class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram const ACE_TCHAR *host_name = 0); /// Close up and release dynamically allocated resources. - int close (void); + int close (); /// Broadcast the datagram to every interface. Returns the average /// number of bytes sent. diff --git a/ACE/ace/SOCK_Dgram_Bcast.inl b/ACE/ace/SOCK_Dgram_Bcast.inl index ae73e7b87adc0..359d06896352a 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.inl +++ b/ACE/ace/SOCK_Dgram_Bcast.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_SOCK_Dgram_Bcast::~ACE_SOCK_Dgram_Bcast (void) +ACE_SOCK_Dgram_Bcast::~ACE_SOCK_Dgram_Bcast () { ACE_TRACE ("ACE_SOCK_Dgram_Bcast::~ACE_SOCK_Dgram_Bcast"); } diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp index 6398ea640b79c..a2bdb57f20c47 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.cpp +++ b/ACE/ace/SOCK_Dgram_Mcast.cpp @@ -18,7 +18,7 @@ #endif #if defined (ACE_HAS_GETIFADDRS) -# if defined (ACE_VXWORKS) +# if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x700) # include /**/ # else # include /**/ @@ -466,7 +466,6 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, } return 0; - } int @@ -691,8 +690,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, } return 1; - - } else { @@ -743,7 +740,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, } return 1; - } #else /* ACE_HAS_IPV6 */ // Unsubscribe on all local multicast-capable network interfaces, by diff --git a/ACE/ace/SOCK_Dgram_Mcast.h b/ACE/ace/SOCK_Dgram_Mcast.h index 1fc3ab2430cd4..203d5454e8c3a 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.h +++ b/ACE/ace/SOCK_Dgram_Mcast.h @@ -98,7 +98,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram { public: - /** * @brief Option parameters. * @@ -393,7 +392,6 @@ class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram mutable ACE_SDM_LOCK subscription_list_lock_; // (Lock type does not need to support recursive locking.) #endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SOCK_Netlink.h b/ACE/ace/SOCK_Netlink.h index d9a8b965b172d..f08b5a361a125 100644 --- a/ACE/ace/SOCK_Netlink.h +++ b/ACE/ace/SOCK_Netlink.h @@ -41,8 +41,8 @@ class ACE_Export ACE_SOCK_Netlink : public ACE_SOCK { public: /// Default constructor. - ACE_SOCK_Netlink(void); - ~ACE_SOCK_Netlink(void); + ACE_SOCK_Netlink(); + ~ACE_SOCK_Netlink(); ACE_SOCK_Netlink (ACE_Netlink_Addr &local, int protocol_family, int protocol); diff --git a/ACE/ace/SOCK_Netlink.inl b/ACE/ace/SOCK_Netlink.inl index 58ad283aabecf..6a9e2da89c2cf 100644 --- a/ACE/ace/SOCK_Netlink.inl +++ b/ACE/ace/SOCK_Netlink.inl @@ -3,13 +3,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_SOCK_Netlink::ACE_SOCK_Netlink (void) +ACE_SOCK_Netlink::ACE_SOCK_Netlink () { ACE_TRACE ("ACE_SOCK_Netlink::ACE_SOCK_Netlink"); } ACE_INLINE -ACE_SOCK_Netlink::~ACE_SOCK_Netlink (void) +ACE_SOCK_Netlink::~ACE_SOCK_Netlink () { ACE_TRACE ("ACE_SOCK_Netlink::~ACE_SOCK_Netlink"); } diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.h b/ACE/ace/SOCK_SEQPACK_Acceptor.h index 16e936127d7ca..2095e222e3249 100644 --- a/ACE/ace/SOCK_SEQPACK_Acceptor.h +++ b/ACE/ace/SOCK_SEQPACK_Acceptor.h @@ -44,7 +44,7 @@ class ACE_Export ACE_SOCK_SEQPACK_Acceptor : public ACE_SOCK { public: /// Default constructor. - ACE_SOCK_SEQPACK_Acceptor (void); + ACE_SOCK_SEQPACK_Acceptor (); /** * Initialize a passive-mode BSD-style acceptor socket (no QoS). @@ -111,10 +111,10 @@ class ACE_Export ACE_SOCK_SEQPACK_Acceptor : public ACE_SOCK int protocol = 132); /// Close the socket. Returns 0 on success and -1 on failure. - int close (void); + int close (); /// Default dtor. - ~ACE_SOCK_SEQPACK_Acceptor (void); + ~ACE_SOCK_SEQPACK_Acceptor (); // = Passive connection methods. /** diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.inl b/ACE/ace/SOCK_SEQPACK_Acceptor.inl index 82577e26651a2..4096729af5d81 100644 --- a/ACE/ace/SOCK_SEQPACK_Acceptor.inl +++ b/ACE/ace/SOCK_SEQPACK_Acceptor.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor (void) +ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor () { ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor"); } diff --git a/ACE/ace/SOCK_SEQPACK_Association.cpp b/ACE/ace/SOCK_SEQPACK_Association.cpp index 4fa2da226f000..700c046f45542 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.cpp +++ b/ACE/ace/SOCK_SEQPACK_Association.cpp @@ -90,11 +90,7 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz int err = 0; size_t len = 0; -#ifndef ACE_HAS_VOID_PTR_SCTP_GETLADDRS err = sctp_getladdrs(this->get_handle(), 0, &laddrs); -#else - err = sctp_getladdrs(this->get_handle(), 0, reinterpret_cast(&laddrs)); -#endif /* ACE_HAS_VOID_PTR_SCTP_GETPADDRS */ if (err > 0) { len = err; diff --git a/ACE/ace/SOCK_SEQPACK_Association.h b/ACE/ace/SOCK_SEQPACK_Association.h index a9a0a80cc6ec2..9e2265d59844a 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.h +++ b/ACE/ace/SOCK_SEQPACK_Association.h @@ -77,13 +77,13 @@ class ACE_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO public: // Initialization and termination methods. /// Constructor. - ACE_SOCK_SEQPACK_Association (void); + ACE_SOCK_SEQPACK_Association (); /// Constructor (sets the underlying ACE_HANDLE with ). ACE_SOCK_SEQPACK_Association (ACE_HANDLE h); /// Destructor. - ~ACE_SOCK_SEQPACK_Association (void); + ~ACE_SOCK_SEQPACK_Association (); /** * Return local endpoint addresses in the referenced array of @@ -161,22 +161,22 @@ class ACE_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO // = Selectively close endpoints. /// Close down the reader. - int close_reader (void); + int close_reader (); /// Close down the writer. - int close_writer (void); + int close_writer (); /** * Close down the socket (we need this to make things work correctly * on Win32, which requires use to do a before doing * the close to avoid losing data). */ - int close (void); + int close (); /** * Abort the association according to RFC 2960 9.1 through the API * in draft-ietf-tsvwg-sctpsocket-09 7.1.4. */ - int abort (void); + int abort (); // = Meta-type info typedef ACE_Multihomed_INET_Addr PEER_ADDR; diff --git a/ACE/ace/SOCK_SEQPACK_Association.inl b/ACE/ace/SOCK_SEQPACK_Association.inl index 98e59c6f42194..ff6c1234ad1e2 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.inl +++ b/ACE/ace/SOCK_SEQPACK_Association.inl @@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association (void) +ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association () { // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association"); } @@ -18,13 +18,13 @@ ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association (ACE_HANDLE h) } ACE_INLINE -ACE_SOCK_SEQPACK_Association::~ACE_SOCK_SEQPACK_Association (void) +ACE_SOCK_SEQPACK_Association::~ACE_SOCK_SEQPACK_Association () { // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::~ACE_SOCK_SEQPACK_Association"); } ACE_INLINE int -ACE_SOCK_SEQPACK_Association::close_reader (void) +ACE_SOCK_SEQPACK_Association::close_reader () { ACE_TRACE ("ACE_SOCK_SEQPACK_Association::close_reader"); if (this->get_handle () != ACE_INVALID_HANDLE) @@ -36,7 +36,7 @@ ACE_SOCK_SEQPACK_Association::close_reader (void) // Shut down just the writing end of a ACE_SOCK. ACE_INLINE int -ACE_SOCK_SEQPACK_Association::close_writer (void) +ACE_SOCK_SEQPACK_Association::close_writer () { ACE_TRACE ("ACE_SOCK_SEQPACK_Association::close_writer"); if (this->get_handle () != ACE_INVALID_HANDLE) diff --git a/ACE/ace/SOCK_SEQPACK_Connector.cpp b/ACE/ace/SOCK_SEQPACK_Connector.cpp index 61572837a45cc..e2522863ed21d 100644 --- a/ACE/ace/SOCK_SEQPACK_Connector.cpp +++ b/ACE/ace/SOCK_SEQPACK_Connector.cpp @@ -37,7 +37,6 @@ ACE_SOCK_SEQPACK_Connector::shared_open (ACE_SOCK_SEQPACK_Association &new_assoc ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_open"); - // Only open a new socket if we don't already have a valid handle. if (new_association.get_handle () == ACE_INVALID_HANDLE && #if defined (ACE_HAS_LKSCTP) diff --git a/ACE/ace/SOCK_SEQPACK_Connector.h b/ACE/ace/SOCK_SEQPACK_Connector.h index 59db01155c8b8..23e3475c9ee6d 100644 --- a/ACE/ace/SOCK_SEQPACK_Connector.h +++ b/ACE/ace/SOCK_SEQPACK_Connector.h @@ -49,7 +49,7 @@ class ACE_Export ACE_SOCK_SEQPACK_Connector { public: /// Default constructor. - ACE_SOCK_SEQPACK_Connector (void); + ACE_SOCK_SEQPACK_Connector (); /** * Actively connect to a peer, producing a connected @c ACE_SOCK_SEQPACK_Association @@ -251,7 +251,7 @@ class ACE_Export ACE_SOCK_SEQPACK_Connector int protocol = 132); /// Default dtor. - ~ACE_SOCK_SEQPACK_Connector (void); + ~ACE_SOCK_SEQPACK_Connector (); // = Completion routine. /** diff --git a/ACE/ace/SOCK_SEQPACK_Connector.inl b/ACE/ace/SOCK_SEQPACK_Connector.inl index 1b04fe2740980..dc91b8f24cd9d 100644 --- a/ACE/ace/SOCK_SEQPACK_Connector.inl +++ b/ACE/ace/SOCK_SEQPACK_Connector.inl @@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // the specified REMOTE_SAP address using a blocking open. ACE_INLINE -ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector (void) +ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector () { ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector"); } @@ -13,7 +13,7 @@ ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector (void) // Do-nothing constructor... ACE_INLINE -ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (void) +ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector () { ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"); } diff --git a/ACE/ace/SPIPE.h b/ACE/ace/SPIPE.h index 485e866274d24..a8b8366673804 100644 --- a/ACE/ace/SPIPE.h +++ b/ACE/ace/SPIPE.h @@ -51,7 +51,7 @@ class ACE_Export ACE_SPIPE : public ACE_IPC_SAP * @return 0 for success; -1 for failure. If a failure occurs, further * error information is available from ACE_OS::last_error(). */ - int close (void); + int close (); /// Close down the SPIPE and remove the rendezvous point from /// the file system. @@ -59,7 +59,7 @@ class ACE_Export ACE_SPIPE : public ACE_IPC_SAP * @return 0 for success; -1 for failure. If a failure occurs, further * error information is available from ACE_OS::last_error(). */ - int remove (void); + int remove (); /// Return the local address of this endpoint. /** diff --git a/ACE/ace/SPIPE_Acceptor.cpp b/ACE/ace/SPIPE_Acceptor.cpp index e3313097ae947..c65f5d89f5c00 100644 --- a/ACE/ace/SPIPE_Acceptor.cpp +++ b/ACE/ace/SPIPE_Acceptor.cpp @@ -11,7 +11,6 @@ #endif // ACE_HAS_STREAM_PIPES - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor () diff --git a/ACE/ace/SPIPE_Acceptor.h b/ACE/ace/SPIPE_Acceptor.h index 817c53bcc1a1e..2f0af3aee8c28 100644 --- a/ACE/ace/SPIPE_Acceptor.h +++ b/ACE/ace/SPIPE_Acceptor.h @@ -46,7 +46,7 @@ class ACE_Export ACE_SPIPE_Acceptor : public ACE_SPIPE { public: /// Default constructor. - ACE_SPIPE_Acceptor (void); + ACE_SPIPE_Acceptor (); /// Initiate a passive-mode STREAM pipe listener. /** @@ -96,10 +96,10 @@ class ACE_Export ACE_SPIPE_Acceptor : public ACE_SPIPE int pipe_mode = PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); /// Close down the passive-mode STREAM pipe listener. - int close (void); + int close (); /// Remove the underlying mounted pipe from the file system. - int remove (void); + int remove (); // = Passive connection acceptance method. /** @@ -155,7 +155,6 @@ class ACE_Export ACE_SPIPE_Acceptor : public ACE_SPIPE ACE_HANDLE pipe_handle_; int already_connected_; #endif /* ACE_HAS_WIN32_NAMED_PIPES */ - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SPIPE_Addr.h b/ACE/ace/SPIPE_Addr.h index bcb2eb510e541..7ad05a91feb52 100644 --- a/ACE/ace/SPIPE_Addr.h +++ b/ACE/ace/SPIPE_Addr.h @@ -106,7 +106,6 @@ class ACE_Export ACE_SPIPE_Addr : public ACE_Addr /// Pathname in the file system. ACE_TCHAR rendezvous_[MAXPATHLEN + 1]; - } SPIPE_addr_; // Contents of an SPIPE address. }; diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp index 2bcf32ce18744..c507b47ee9276 100644 --- a/ACE/ace/SPIPE_Connector.cpp +++ b/ACE/ace/SPIPE_Connector.cpp @@ -67,8 +67,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, ACE_HANDLE handle; ACE_UNUSED_ARG (pipe_mode); -#if defined (ACE_WIN32) && \ - !defined (ACE_HAS_PHARLAP) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) // We need to allow for more than one attempt to connect, // calculate the absolute time at which we give up. ACE_Time_Value absolute_time; @@ -114,7 +113,6 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, } // Get the amount of time remaining for ::WaitNamedPipe. time_out_value = relative_time.msec (); - } // Wait for the named pipe to become available. @@ -149,7 +147,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, handle = ACE::handle_timed_open (timeout, remote_sap.get_path_name (), flags, perms, sa); -#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP || ACE_HAS_WINCE */ +#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP */ new_io.set_handle (handle); new_io.remote_addr_ = remote_sap; // class copy. diff --git a/ACE/ace/SPIPE_Stream.inl b/ACE/ace/SPIPE_Stream.inl index 08b9071b2fab3..6f78a4fe5cdc1 100644 --- a/ACE/ace/SPIPE_Stream.inl +++ b/ACE/ace/SPIPE_Stream.inl @@ -102,9 +102,7 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const ACE_TRACE ("ACE_SPIPE_Stream::send_handle"); #if defined (ACE_HAS_STREAM_PIPES) return ACE_OS::ioctl (this->get_handle (), I_SENDFD, (void *) handle); -#elif defined (ACE_WIN32) && \ - (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) && \ - !defined (ACE_HAS_WINCE) /* CE4 has WS2 but not WSADuplicateSocket */ +#elif defined (ACE_WIN32) && (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) DWORD procID; WSAPROTOCOL_INFO protInfo; ssize_t res = this->recv(&procID, sizeof(procID)); diff --git a/ACE/ace/SSL/ACE_SSL.rc b/ACE/ace/SSL/ACE_SSL.rc new file mode 100644 index 0000000000000..82a7c08eb3b13 --- /dev/null +++ b/ACE/ace/SSL/ACE_SSL.rc @@ -0,0 +1,30 @@ +#include "../Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACE_SSL\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACE_SSLDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACE_SSL.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.cpp b/ACE/ace/SSL/SSL_Asynch_BIO.cpp index 64aa14c6ab9a7..0faa775fc0f1d 100644 --- a/ACE/ace/SSL/SSL_Asynch_BIO.cpp +++ b/ACE/ace/SSL/SSL_Asynch_BIO.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- #include "SSL_Asynch_BIO.h" -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) #include "SSL_Asynch_Stream.h" #include "ace/OS_NS_string.h" diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.h b/ACE/ace/SSL/SSL_Asynch_BIO.h index 70b1a0fcc00be..1d5aec2ff5d5f 100644 --- a/ACE/ace/SSL/SSL_Asynch_BIO.h +++ b/ACE/ace/SSL/SSL_Asynch_BIO.h @@ -25,7 +25,7 @@ #include -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) ACE_BEGIN_VERSIONED_NAMESPACE_DECL extern BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream); diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp index f084c5375e72c..ed5a1e1f440bf 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp @@ -1,7 +1,7 @@ #include "SSL_Asynch_Stream.h" // This only works on platforms with Asynchronous IO support. -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) #if defined (ACE_WIN32) # include "ace/WIN32_Proactor.h" @@ -125,10 +125,9 @@ ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream ( ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), ACE_TEXT ("- cannot allocate new SSL structure") )); - } -ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void) +ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream () { ACE_TRACE ("ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream"); @@ -163,7 +162,7 @@ ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void) // ************************************************************ int -ACE_SSL_Asynch_Stream::close (void) +ACE_SSL_Asynch_Stream::close () { ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1)); @@ -185,7 +184,7 @@ ACE_SSL_Asynch_Stream::close (void) // cancel // ************************************************************ int -ACE_SSL_Asynch_Stream::cancel (void) +ACE_SSL_Asynch_Stream::cancel () { ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1)); @@ -402,7 +401,7 @@ ACE_SSL_Asynch_Stream::write (ACE_Message_Block & message_block, // Main SSL engine // ************************************************************ int -ACE_SSL_Asynch_Stream::do_SSL_state_machine (void) +ACE_SSL_Asynch_Stream::do_SSL_state_machine () { // this protected member should be called // with locked mutex_ @@ -435,7 +434,7 @@ ACE_SSL_Asynch_Stream::do_SSL_state_machine (void) // -1 failure // ************************************************************ int -ACE_SSL_Asynch_Stream::do_SSL_shutdown (void) +ACE_SSL_Asynch_Stream::do_SSL_shutdown () { if (this->flags_ & SF_SHUTDOWN_DONE) // already done return 1; @@ -486,7 +485,7 @@ ACE_SSL_Asynch_Stream::do_SSL_shutdown (void) // -1 failure // ************************************************************ int -ACE_SSL_Asynch_Stream::do_SSL_handshake (void) +ACE_SSL_Asynch_Stream::do_SSL_handshake () { if (SSL_is_init_finished (this->ssl_)) { @@ -551,7 +550,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) } bool -ACE_SSL_Asynch_Stream::post_handshake_check (void) +ACE_SSL_Asynch_Stream::post_handshake_check () { return true; } @@ -560,7 +559,7 @@ ACE_SSL_Asynch_Stream::post_handshake_check (void) // Perform SSL_read call if necessary and notify user // ************************************************************ int -ACE_SSL_Asynch_Stream::do_SSL_read (void) +ACE_SSL_Asynch_Stream::do_SSL_read () { if (this->ext_read_result_ == 0) // nothing to do { @@ -622,7 +621,7 @@ ACE_SSL_Asynch_Stream::do_SSL_read (void) // Perform SSL_write call if necessary and notify user // ************************************************************ int -ACE_SSL_Asynch_Stream::do_SSL_write (void) +ACE_SSL_Asynch_Stream::do_SSL_write () { if (this->ext_write_result_ == 0) // nothing to do { @@ -682,7 +681,7 @@ ACE_SSL_Asynch_Stream::do_SSL_write (void) // 2 - unable to notify NOT NOTIFIED // ************************************************************ int -ACE_SSL_Asynch_Stream::notify_close (void) +ACE_SSL_Asynch_Stream::notify_close () { if (this->flags_ & SF_CLOSE_NTF_SENT) // already sent return 1; @@ -1042,7 +1041,7 @@ ACE_SSL_Asynch_Stream::handle_read_stream ( } void -ACE_SSL_Asynch_Stream::handle_wakeup (void) +ACE_SSL_Asynch_Stream::handle_wakeup () { ACE_Handler * user_handler = 0; @@ -1059,7 +1058,7 @@ ACE_SSL_Asynch_Stream::handle_wakeup (void) } int -ACE_SSL_Asynch_Stream::pending_BIO_count (void) +ACE_SSL_Asynch_Stream::pending_BIO_count () { int ret = 0; diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h index 65a6d5d6b8385..db86bf1f9f816 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.h +++ b/ACE/ace/SSL/SSL_Asynch_Stream.h @@ -18,7 +18,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) #include "SSL_Asynch_BIO.h" @@ -144,7 +144,6 @@ class ACE_SSL_Export ACE_SSL_Asynch_Stream public ACE_Handler { public: - // Use a class/struct to work around scoping // problems for extern "C" free functions with some compilers. For // example, some can't handle @@ -177,11 +176,11 @@ class ACE_SSL_Export ACE_SSL_Asynch_Stream ACE_SSL_Context * context = 0); /// Destructor - virtual ~ACE_SSL_Asynch_Stream (void); + virtual ~ACE_SSL_Asynch_Stream (); - int cancel (void); + int cancel (); - int close (void); + int close (); /// Return a pointer to the underlying SSL structure. SSL *ssl () const; @@ -293,7 +292,7 @@ class ACE_SSL_Export ACE_SSL_Asynch_Stream /// This method is called when all SSL sessions are closed and no /// more pending AIOs exist. It also calls users handle_wakeup(). - virtual void handle_wakeup (void); + virtual void handle_wakeup (); /** * This method will be called after a successful SSL handshake indicating @@ -327,23 +326,23 @@ class ACE_SSL_Export ACE_SSL_Asynch_Stream * * true - Proceed with connection. The default implementation returns true. */ - virtual bool post_handshake_check (void); + virtual bool post_handshake_check (); /** * @name SSL State Machine */ //@{ - int do_SSL_state_machine (void); - int do_SSL_handshake (void); - int do_SSL_read (void); - int do_SSL_write(void); - int do_SSL_shutdown(void); + int do_SSL_state_machine (); + int do_SSL_handshake (); + int do_SSL_read (); + int do_SSL_write(); + int do_SSL_shutdown(); //@} void print_error (int err_ssl, const ACE_TCHAR *pText); - int pending_BIO_count (void); + int pending_BIO_count (); /// This method is called to notify user handler when user's read in /// done. @@ -356,7 +355,7 @@ class ACE_SSL_Export ACE_SSL_Asynch_Stream /// This method is called to notify ourself that SSL session is /// shutdown and that there is no more I/O activity now and in the /// future. - int notify_close(void); + int notify_close(); /** * @name BIO Helpers diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index ebc883ed93ab2..9313dc5717f9b 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -89,7 +89,7 @@ extern "C" // Return the current thread ID. OpenSSL uses this on platforms // that need it. unsigned long - ACE_SSL_THREAD_ID_NAME (void) + ACE_SSL_THREAD_ID_NAME () { return (unsigned long) ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::thr_self (); } @@ -105,7 +105,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_SSL_Context::lock_type * ACE_SSL_Context::locks_ = 0; #endif /* ACE_HAS_THREADS && (OPENSSL_VERSION_NUMBER < 0x10100000L) */ -ACE_SSL_Context::ACE_SSL_Context (void) +ACE_SSL_Context::ACE_SSL_Context () : context_ (0), mode_ (-1), default_verify_mode_ (SSL_VERIFY_NONE), @@ -117,7 +117,7 @@ ACE_SSL_Context::ACE_SSL_Context (void) ACE_SSL_Context::ssl_library_init (); } -ACE_SSL_Context::~ACE_SSL_Context (void) +ACE_SSL_Context::~ACE_SSL_Context () { ACE_TRACE ("ACE_SSL_Context::~ACE_SSL_Context"); @@ -131,7 +131,7 @@ ACE_SSL_Context::~ACE_SSL_Context (void) } ACE_SSL_Context * -ACE_SSL_Context::instance (void) +ACE_SSL_Context::instance () { ACE_TRACE ("ACE_SSL_Context::instance"); @@ -139,7 +139,7 @@ ACE_SSL_Context::instance (void) } void -ACE_SSL_Context::close (void) +ACE_SSL_Context::close () { ACE_TRACE ("ACE_SSL_Context::close"); @@ -147,7 +147,7 @@ ACE_SSL_Context::close (void) } void -ACE_SSL_Context::ssl_library_init (void) +ACE_SSL_Context::ssl_library_init () { ACE_TRACE ("ACE_SSL_Context::ssl_library_init"); @@ -214,7 +214,7 @@ ACE_SSL_Context::ssl_library_init (void) } void -ACE_SSL_Context::ssl_library_fini (void) +ACE_SSL_Context::ssl_library_fini () { ACE_TRACE ("ACE_SSL_Context::ssl_library_fini"); @@ -516,10 +516,10 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, } // SSL_add_dir_cert_subjects_to_stack is defined at 0.9.8a (but not - // on OpenVMS or Mac Classic); it may be available earlier. Change + // on Mac Classic); it may be available earlier. Change // this comparison if so. It's still (1.0.1g) broken on windows too. #if defined (OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090801fL) -# if !defined (OPENSSL_SYS_VMS) && !defined (OPENSSL_SYS_MACINTOSH_CLASSIC) +# if !defined (OPENSSL_SYS_MACINTOSH_CLASSIC) # if !defined (OPENSSL_SYS_WIN32) if (ca_dir != 0) @@ -542,7 +542,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, } } # endif /* !OPENSSL_SYS_WIN32 */ -# endif /* !OPENSSL_SYS_VMS && !OPENSSL_SYS_MACINTOSH_CLASSIC */ +# endif /* !OPENSSL_SYS_MACINTOSH_CLASSIC */ #endif /* OPENSSL_VERSION_NUMBER >= 0.9.8a release */ } @@ -575,7 +575,7 @@ ACE_SSL_Context::private_key (const char *file_name, } int -ACE_SSL_Context::verify_private_key (void) +ACE_SSL_Context::verify_private_key () { ACE_TRACE ("ACE_SSL_Context::verify_private_key"); diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h index 97eae945e62d9..91903f788c30c 100644 --- a/ACE/ace/SSL/SSL_Context.h +++ b/ACE/ace/SSL/SSL_Context.h @@ -57,7 +57,7 @@ class ACE_SSL_Export ACE_SSL_Data_File // **************************************************************** -// NOTE: Solaris studio compilers amongst others will issue warnings if the +// NOTE: Some compilers will issue warnings if the // the correct type of function pointer (i.e. extern "C" ) is not stored/used // of the form: // Warning (Anachronism): Formal argument callback of type diff --git a/ACE/ace/SSL/SSL_Initializer.cpp b/ACE/ace/SSL/SSL_Initializer.cpp index d1b82afd359c2..7f1fcf9668408 100644 --- a/ACE/ace/SSL/SSL_Initializer.cpp +++ b/ACE/ace/SSL/SSL_Initializer.cpp @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL int -ACE_SSL_Initializer::static_init (void) +ACE_SSL_Initializer::static_init () { ACE_Service_Config::process_directive (ace_svc_desc_ACE_SSL_Initializer); return 0; @@ -22,7 +22,7 @@ ACE_SSL_Initializer::init (int, ACE_TCHAR *[]) } int -ACE_SSL_Initializer::fini (void) +ACE_SSL_Initializer::fini () { // Explicitly close the ACE_SSL_Context singleton. ACE_SSL_Context::close (); diff --git a/ACE/ace/SSL/SSL_Initializer.h b/ACE/ace/SSL/SSL_Initializer.h index a19b780523b34..240be859fcce1 100644 --- a/ACE/ace/SSL/SSL_Initializer.h +++ b/ACE/ace/SSL/SSL_Initializer.h @@ -29,7 +29,7 @@ class ACE_SSL_Export ACE_SSL_Initializer { public: /// Used to force the initialization of ACE_SSL. - static int static_init (void); + static int static_init (); /// Create ACE_SSL_Context singleton. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/ace/SSL/SSL_SOCK.cpp b/ACE/ace/SSL/SSL_SOCK.cpp index b82ec7d556f90..1b39192757ed1 100644 --- a/ACE/ace/SSL/SSL_SOCK.cpp +++ b/ACE/ace/SSL/SSL_SOCK.cpp @@ -9,12 +9,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_SSL_SOCK::ACE_SSL_SOCK (void) +ACE_SSL_SOCK::ACE_SSL_SOCK () { ACE_TRACE ("ACE_SSL_SOCK::ACE_SSL_SOCK"); } -ACE_SSL_SOCK::~ACE_SSL_SOCK (void) +ACE_SSL_SOCK::~ACE_SSL_SOCK () { ACE_TRACE ("ACE_SSL_SOCK::~ACE_SSL_SOCK"); } diff --git a/ACE/ace/SSL/SSL_SOCK.h b/ACE/ace/SSL/SSL_SOCK.h index d1c68ea560414..2f0f534c7ba6b 100644 --- a/ACE/ace/SSL/SSL_SOCK.h +++ b/ACE/ace/SSL/SSL_SOCK.h @@ -85,4 +85,3 @@ ACE_END_VERSIONED_NAMESPACE_DECL - diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp index 9ec3d58e9a23e..2fcd75c2c9513 100644 --- a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor) -ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor (void) +ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor () { ACE_TRACE ("ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor"); } @@ -157,7 +157,6 @@ ACE_SSL_SOCK_Acceptor::ssl_accept (ACE_SSL_SOCK_Stream &new_stream, } return (status == -1 ? -1 : 0); - } // General purpose routine for accepting new connections. @@ -198,7 +197,6 @@ ACE_SSL_SOCK_Acceptor::accept (ACE_SSL_SOCK_Stream &new_stream, } return 0; - } int diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.cpp b/ACE/ace/SSL/SSL_SOCK_Connector.cpp index 25a32629b21a4..7d8a462322784 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Connector.cpp @@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Connector) -ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector (void) +ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector () { ACE_TRACE ("ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector"); } @@ -366,7 +366,6 @@ ACE_SSL_SOCK_Connector::complete (ACE_SSL_SOCK_Stream &new_stream, } return 0; - } diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.h b/ACE/ace/SSL/SSL_SOCK_Connector.h index 40a46779053de..41ba382d6c1b6 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.h +++ b/ACE/ace/SSL/SSL_SOCK_Connector.h @@ -55,7 +55,7 @@ class ACE_SSL_Export ACE_SSL_SOCK_Connector { public: /// Default constructor. - ACE_SSL_SOCK_Connector (void); + ACE_SSL_SOCK_Connector (); /** * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream @@ -160,7 +160,7 @@ class ACE_SSL_Export ACE_SSL_SOCK_Connector int perms = 0); /// Default dtor. - virtual ~ACE_SSL_SOCK_Connector (void); + virtual ~ACE_SSL_SOCK_Connector (); /** * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.inl b/ACE/ace/SSL/SSL_SOCK_Connector.inl index 83c99526b6fb0..77163ea97cc2f 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.inl +++ b/ACE/ace/SSL/SSL_SOCK_Connector.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector (void) +ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector () : connector_ () { ACE_TRACE ("ACE_SSL_SOCK_Connector::ACE_SSL_SOCK_Connector"); diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.cpp b/ACE/ace/SSL/SSL_SOCK_Stream.cpp index 113adf25a61f1..7216dce868571 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Stream.cpp @@ -37,7 +37,7 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context) } } -ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream (void) +ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream () { ACE_TRACE ("ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream"); @@ -257,7 +257,6 @@ ACE_SSL_SOCK_Stream::send (size_t n, ...) const // buffer in the varargs occurred. if (result < data_len) break; - } } diff --git a/ACE/ace/SString.inl b/ACE/ace/SString.inl index 75b261a34c277..1757425725c9a 100644 --- a/ACE/ace/SString.inl +++ b/ACE/ace/SString.inl @@ -1,7 +1,5 @@ // -*- C++ -*- -// Include ACE.h only if it hasn't already been included, e.g., if -// ACE_TEMPLATES_REQUIRE_SOURCE, ACE.h won't have been pulled in by -// String_Base.cpp. +// Include ACE.h only if it hasn't already been included #ifndef ACE_ACE_H # include "ace/ACE.h" #endif /* !ACE_ACE_H */ diff --git a/ACE/ace/SUN_Proactor.cpp b/ACE/ace/SUN_Proactor.cpp deleted file mode 100644 index d9b3ba7b0ab71..0000000000000 --- a/ACE/ace/SUN_Proactor.cpp +++ /dev/null @@ -1,316 +0,0 @@ -#include "ace/SUN_Proactor.h" - -#if defined (ACE_HAS_AIO_CALLS) && defined (sun) - -#include "ace/Task_T.h" -#include "ace/Log_Category.h" -#include "ace/Object_Manager.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_SUN_Proactor::ACE_SUN_Proactor (size_t max_aio_operations) - : ACE_POSIX_AIOCB_Proactor (max_aio_operations, - ACE_POSIX_Proactor::PROACTOR_SUN), - condition_ (mutex_) -{ - // To provide correct virtual calls. - create_notify_manager (); - - // we should start pseudo-asynchronous accept task - // one per all future acceptors - - this->get_asynch_pseudo_task ().start (); -} - -// Destructor. -ACE_SUN_Proactor::~ACE_SUN_Proactor (void) -{ - this->close (); -} - -int -ACE_SUN_Proactor::handle_events (ACE_Time_Value &wait_time) -{ - // Decrement with the amount of time spent in the method - ACE_Countdown_Time countdown (&wait_time); - return this->handle_events_i (&wait_time); -} - -int -ACE_SUN_Proactor::handle_events (void) -{ - return this->handle_events_i (0); -} - -int ACE_SUN_Proactor::wait_for_start (ACE_Time_Value * abstime) -{ -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, mutex_, -1)); - - if (this->num_started_aio_ != 0) // double check - return 0; - - return this->condition_.wait (abstime); - -#else - - return 0; // or -1 ??? - -#endif /* ACE_MT_SAFE */ -} - -int -ACE_SUN_Proactor::handle_events_i (ACE_Time_Value *delta) -{ - int retval = 0; - aio_result_t *result = 0; - - if (0 == delta) - { - if (this->num_started_aio_ == 0) - this->wait_for_start (0); - - result = aiowait (0); - } - else - { - if (this->num_started_aio_ == 0) - { - // Decrement delta with the amount of time spent waiting - ACE_Countdown_Time countdown (delta); - ACE_Time_Value tv (*delta); - tv += ACE_OS::gettimeofday (); - if (this->wait_for_start (&tv) == -1) - return -1; - } - struct timeval delta_tv = *delta; - result = aiowait (&delta_tv); - } - - if (result == 0) - { - // timeout, do nothing, - // we should process "post_completed" queue - } - else if (reinterpret_cast (result) == -1) - { - // Check errno for EINVAL,EAGAIN,EINTR ?? - switch (errno) - { - case EINTR : // aiowait() was interrupted by a signal. - case EINVAL: // there are no outstanding asynchronous I/O requests. - break; // we should process "post_completed" queue - - default: // EFAULT - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("%N:%l:(%P | %t)::%p \nNumAIO=%d\n"), - ACE_TEXT("ACE_SUN_Proactor::handle_events: aiowait failed"), - num_started_aio_), - -1); - } - } - else - { - int error_status = 0; - size_t transfer_count = 0; - - ACE_POSIX_Asynch_Result *asynch_result = - find_completed_aio (result, - error_status, - transfer_count); - - if (asynch_result != 0) - { - // Call the application code. - this->application_specific_code (asynch_result, - transfer_count, - 0, // No completion key. - error_status); // Error - retval++; - } - } - - // process post_completed results - retval += this->process_result_queue (); - - return retval > 0 ? 1 : 0 ; - -} - -int -ACE_SUN_Proactor::get_result_status (ACE_POSIX_Asynch_Result* asynch_result, - int &error_status, - size_t &transfer_count) -{ - - // Get the error status of the aio_ operation. - error_status = asynch_result->aio_resultp.aio_errno; - ssize_t op_return = asynch_result->aio_resultp.aio_return; - - // ****** from Sun man pages ********************* - // Upon completion of the operation both aio_return and aio_errno - // are set to reflect the result of the operation. - // AIO_INPROGRESS is not a value used by the system - // so the client may detect a change in state - // by initializing aio_return to this value. - - if (error_status == EINPROGRESS || op_return == AIO_INPROGRESS) - return 0; // not completed - - if (op_return < 0) - transfer_count = 0; // zero bytes transferred - else - transfer_count = static_cast (op_return); - - return 1; // completed -} - -ACE_POSIX_Asynch_Result * -ACE_SUN_Proactor::find_completed_aio (aio_result_t *result, - int &error_status, - size_t &transfer_count) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, mutex_, 0)); - - size_t ai; - error_status = -1; - transfer_count = 0; - - // we call find_completed_aio always with result != 0 - - for (ai = 0; ai < aiocb_list_max_size_; ai++) - if (aiocb_list_[ai] != 0 && //check for non zero - result == &aiocb_list_[ai]->aio_resultp) - break; - - if (ai >= aiocb_list_max_size_) // not found - return 0; // means somebody else uses aio directly!!! - - ACE_POSIX_Asynch_Result *asynch_result = result_list_[ai]; - - if (this->get_result_status (asynch_result, - error_status, - transfer_count) == 0) - { // should never be - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT("%N:%l:(%P | %t)::%p\n"), - ACE_TEXT("ACE_SUN_Proactor::find_completed_aio:") - ACE_TEXT("should never be !!!\n"))); - return 0; - } - - aiocb_list_[ai] = 0; - result_list_[ai] = 0; - aiocb_list_cur_size_--; - - num_started_aio_--; - - start_deferred_aio (); - //make attempt to start deferred AIO - //It is safe as we are protected by mutex_ - - return asynch_result; -} - -// start_aio_i has new return codes -// 0 successful start -// 1 try later, OS queue overflow -// -1 invalid request and other errors - -int -ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) -{ - ACE_TRACE ("ACE_SUN_Proactor::start_aio_i"); - - int ret_val; - const ACE_TCHAR *ptype; - - // ****** from Sun man pages ********************* - // Upon completion of the operation both aio_return and aio_errno - // are set to reflect the result of the operation. - // AIO_INPROGRESS is not a value used by the system - // so the client may detect a change in state - // by initializing aio_return to this value. - result->aio_resultp.aio_return = AIO_INPROGRESS; - result->aio_resultp.aio_errno = EINPROGRESS; - - // Start IO - switch (result->aio_lio_opcode) - { - case LIO_READ : - ptype = ACE_TEXT ("read"); - ret_val = aioread (result->aio_fildes, - (char *) result->aio_buf, - result->aio_nbytes, - result->aio_offset, - SEEK_SET, - &result->aio_resultp); - break; - - case LIO_WRITE : - ptype = ACE_TEXT ("write"); - ret_val = aiowrite (result->aio_fildes, - (char *) result->aio_buf, - result->aio_nbytes, - result->aio_offset, - SEEK_SET, - &result->aio_resultp); - break; - - default: - ptype = ACE_TEXT ("?????"); - ret_val = -1; - break; - } - - if (ret_val == 0) - { - this->num_started_aio_++; - if (this->num_started_aio_ == 1) // wake up condition - this->condition_.broadcast (); - } - else // if (ret_val == -1) - { - if (errno == EAGAIN || errno == ENOMEM) // Defer - retry this later. - ret_val = 1; - else - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l:(%P | %t)::start_aio: aio%s %p\n"), - ptype, - ACE_TEXT ("queueing failed\n"))); - } - - return ret_val; -} - -int -ACE_SUN_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result *result) -{ - ACE_TRACE ("ACE_SUN_Proactor::cancel_aiocb"); - int rc = ::aiocancel (&result->aio_resultp); - if (rc == 0) // AIO_CANCELED - { - // after aiocancel Sun does not notify us - // so we should send notification - // to save POSIX behavoir. - // Also we should do this for deffered aio's - - result->set_error (ECANCELED); - result->set_bytes_transferred (0); - this->putq_result (result); - return 0; - } - - return 2; -} - -ACE_POSIX_Proactor::Proactor_Type -ACE_SUN_Proactor::get_impl_type (void) -{ - return PROACTOR_SUN; -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* ACE_HAS_AIO_CALLS && sun */ diff --git a/ACE/ace/SUN_Proactor.h b/ACE/ace/SUN_Proactor.h deleted file mode 100644 index 376a9cdf60a3d..0000000000000 --- a/ACE/ace/SUN_Proactor.h +++ /dev/null @@ -1,123 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SUN_Proactor.h - * - * @author Alexander Libman - */ -//============================================================================= - -#ifndef ACE_SUN_PROACTOR_H -#define ACE_SUN_PROACTOR_H - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_AIO_CALLS) && defined (sun) - -#include "ace/POSIX_Proactor.h" -#include /**/ // Sun native aio calls - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class ACE_SUN_Proactor - * - * @brief Implementation of the fast and reliable Proactor - * for SunOS 5.6, 5.7, etc. - * - * This proactor, based on ACE_POSIX_AIOCB_Proactor, - * works with Sun native interface for aio calls. - * POSIX_API Native SUN_API - * aio_read aioread - * aio_write aiowrite - * aio_suspend aiowait - * aio_error aio_result_t.errno - * aio_return aio_result_t.return - * On Solaris, the Sun native implementation is more - * reliable and efficient than POSIX implementation. - * There is a problem of lost RT signals with POSIX, if we start - * more than SIGQUEUEMAX asynchronous operations at the same - * time. - * The Sun it is not the standard POSX , instead, - * it has the following structure: - * typedef struct aiocb - * { - * int aio_fildes; File descriptor - * void *aio_buf; buffer location - * size_t aio_nbytes; length of transfer - * off_t aio_offset; file offset - * int aio_reqprio; request priority offset - * sigevent aio_sigevent; signal number and offset - * int aio_lio_opcode; listio operation - * aio_result_t aio_resultp; results - * int aio_state; state flag for List I/O - * int aio__pad[1]; extension padding - * }; - */ -class ACE_Export ACE_SUN_Proactor : public ACE_POSIX_AIOCB_Proactor -{ -public: - virtual Proactor_Type get_impl_type (); - - /// Destructor. - virtual ~ACE_SUN_Proactor (); - - /// Constructor defines max number asynchronous operations that can - /// be started at the same time. - ACE_SUN_Proactor (size_t max_aio_operations = ACE_AIO_DEFAULT_SIZE); - -protected: - /** - * Dispatch a single set of events. If @a wait_time elapses before - * any events occur, return 0. Return 1 on success i.e., when a - * completion is dispatched, non-zero (-1) on errors and errno is - * set accordingly. - */ - virtual int handle_events (ACE_Time_Value &wait_time); - - /** - * Block indefinitely until at least one event is dispatched. - * Dispatch a single set of events. Return 1 on success i.e., when a - * completion is dispatched, non-zero (-1) on errors and errno is - * set accordingly. - */ - virtual int handle_events (); - - /// Internal completion detection and dispatching. - int handle_events_i (ACE_Time_Value *delta); - - /// Initiate an aio operation. - virtual int start_aio_i (ACE_POSIX_Asynch_Result *result); - - /// Check AIO for completion, error and result status - /// Return: 1 - AIO completed , 0 - not completed yet - virtual int get_result_status (ACE_POSIX_Asynch_Result* asynch_result, - int &error_status, - size_t &transfer_count); - - /// Extract the results of aio. - ACE_POSIX_Asynch_Result *find_completed_aio (aio_result_t *result, - int &error_status, - size_t &transfer_count); - - /// From ACE_POSIX_AIOCB_Proactor. - /// Attempt to cancel running request - virtual int cancel_aiocb (ACE_POSIX_Asynch_Result *result); - - /// Specific Sun aiowait - int wait_for_start (ACE_Time_Value * abstime); - - /// Condition variable . - /// used to wait the first AIO start - ACE_SYNCH_CONDITION condition_; -}; - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* ACE_HAS_AIO_CALLS && sun */ -#endif /* ACE_SUN_PROACTOR_H*/ diff --git a/ACE/ace/SV_Message.h b/ACE/ace/SV_Message.h index a75ace4d2ac6e..7b1f5fa352f07 100644 --- a/ACE/ace/SV_Message.h +++ b/ACE/ace/SV_Message.h @@ -34,7 +34,7 @@ class ACE_Export ACE_SV_Message ACE_SV_Message (long type = 0); /// Destructor - ~ACE_SV_Message (void); + ~ACE_SV_Message (); /// Get the message type. long type () const; diff --git a/ACE/ace/SV_Message.inl b/ACE/ace/SV_Message.inl index bc8cc999d7293..68986bb717946 100644 --- a/ACE/ace/SV_Message.inl +++ b/ACE/ace/SV_Message.inl @@ -12,7 +12,7 @@ ACE_SV_Message::ACE_SV_Message (long t) } ACE_INLINE -ACE_SV_Message::~ACE_SV_Message (void) +ACE_SV_Message::~ACE_SV_Message () { ACE_TRACE ("ACE_SV_Message::~ACE_SV_Message"); } diff --git a/ACE/ace/SV_Message_Queue.h b/ACE/ace/SV_Message_Queue.h index 8ded7d843621b..83cbd399ded40 100644 --- a/ACE/ace/SV_Message_Queue.h +++ b/ACE/ace/SV_Message_Queue.h @@ -44,7 +44,7 @@ class ACE_Export ACE_SV_Message_Queue }; /// Open a message queue using the . - ACE_SV_Message_Queue (void); + ACE_SV_Message_Queue (); ACE_SV_Message_Queue (key_t external_id, int create = ACE_SV_Message_Queue::ACE_OPEN, int perms = ACE_DEFAULT_FILE_PERMS); @@ -52,14 +52,14 @@ class ACE_Export ACE_SV_Message_Queue int create = ACE_SV_Message_Queue::ACE_OPEN, int perms = ACE_DEFAULT_FILE_PERMS); - ~ACE_SV_Message_Queue (void); + ~ACE_SV_Message_Queue (); /// Close down this instance of the message queue without removing it /// from the system. - int close (void); + int close (); /// Close down and remove the message queue from the system. - int remove (void); + int remove (); // = Message transfer methods. ssize_t recv (ACE_SV_Message &mb, diff --git a/ACE/ace/SV_Message_Queue.inl b/ACE/ace/SV_Message_Queue.inl index 045b20ccf40a3..969a2f7e73950 100644 --- a/ACE/ace/SV_Message_Queue.inl +++ b/ACE/ace/SV_Message_Queue.inl @@ -16,7 +16,7 @@ ACE_SV_Message_Queue::open (key_t external_id, int create, int perms) // What does it mean to close a message queue?! ACE_INLINE int -ACE_SV_Message_Queue::close (void) +ACE_SV_Message_Queue::close () { ACE_TRACE ("ACE_SV_Message_Queue::close"); this->internal_id_ = -1; @@ -32,7 +32,7 @@ ACE_SV_Message_Queue::control (int option, void *arg) } ACE_INLINE int -ACE_SV_Message_Queue::remove (void) +ACE_SV_Message_Queue::remove () { ACE_TRACE ("ACE_SV_Message_Queue::remove"); int const result = this->control (IPC_RMID); diff --git a/ACE/ace/SV_Semaphore_Complex.h b/ACE/ace/SV_Semaphore_Complex.h index b94932ac66b89..a5e4084220f41 100644 --- a/ACE/ace/SV_Semaphore_Complex.h +++ b/ACE/ace/SV_Semaphore_Complex.h @@ -58,7 +58,7 @@ class ACE_Export ACE_SV_Semaphore_Complex : private ACE_SV_Semaphore_Simple ACE_OPEN = 0 }; - ACE_SV_Semaphore_Complex (void); + ACE_SV_Semaphore_Complex (); ACE_SV_Semaphore_Complex (key_t key, short create = ACE_SV_Semaphore_Complex::ACE_CREATE, int initial_value = 1, @@ -69,7 +69,7 @@ class ACE_Export ACE_SV_Semaphore_Complex : private ACE_SV_Semaphore_Simple int initial_value = 1, u_short nsems = 1, mode_t perms = ACE_DEFAULT_FILE_PERMS); - ~ACE_SV_Semaphore_Complex (void); + ~ACE_SV_Semaphore_Complex (); /// Open or create an array of SV_Semaphores. We return 0 if all is /// OK, else -1. @@ -94,7 +94,7 @@ class ACE_Export ACE_SV_Semaphore_Complex : private ACE_SV_Semaphore_Simple * processes using the ACE_SV_Semaphore, and if this was the last * one, we can remove the ACE_SV_Semaphore. */ - int close (void); + int close (); // = Semaphore acquire and release methods. diff --git a/ACE/ace/SV_Semaphore_Simple.h b/ACE/ace/SV_Semaphore_Simple.h index 0b33c59bbd9e1..600f29488a99d 100644 --- a/ACE/ace/SV_Semaphore_Simple.h +++ b/ACE/ace/SV_Semaphore_Simple.h @@ -55,7 +55,7 @@ class ACE_Export ACE_SV_Semaphore_Simple ACE_OPEN = 0 }; - ACE_SV_Semaphore_Simple (void); + ACE_SV_Semaphore_Simple (); ACE_SV_Semaphore_Simple (key_t key, short flags = ACE_SV_Semaphore_Simple::ACE_CREATE, int initial_value = 1, @@ -74,7 +74,7 @@ class ACE_Export ACE_SV_Semaphore_Simple mode_t perms = ACE_DEFAULT_FILE_PERMS); #endif /* ACE_HAS_WCHAR */ - ~ACE_SV_Semaphore_Simple (void); + ~ACE_SV_Semaphore_Simple (); int open (const char *name, short flags = ACE_SV_Semaphore_Simple::ACE_CREATE, @@ -100,7 +100,7 @@ class ACE_Export ACE_SV_Semaphore_Simple /// Close a ACE_SV_Semaphore, marking it as invalid for subsequent /// operations... - int close (void); + int close (); /** * Remove all SV_Semaphores associated with a particular key. This diff --git a/ACE/ace/SV_Semaphore_Simple.inl b/ACE/ace/SV_Semaphore_Simple.inl index 73a9cae68c11b..f4ce4a4bb0d85 100644 --- a/ACE/ace/SV_Semaphore_Simple.inl +++ b/ACE/ace/SV_Semaphore_Simple.inl @@ -37,7 +37,7 @@ ACE_SV_Semaphore_Simple::control (int cmd, // operations... ACE_INLINE int -ACE_SV_Semaphore_Simple::close (void) +ACE_SV_Semaphore_Simple::close () { ACE_TRACE ("ACE_SV_Semaphore_Simple::close"); #ifdef ACE_HAS_SYSV_IPC diff --git a/ACE/ace/SV_Shared_Memory.h b/ACE/ace/SV_Shared_Memory.h index a6734bb075bf7..3813212446b6a 100644 --- a/ACE/ace/SV_Shared_Memory.h +++ b/ACE/ace/SV_Shared_Memory.h @@ -39,7 +39,7 @@ class ACE_Export ACE_SV_Shared_Memory ACE_OPEN = 0 }; - ACE_SV_Shared_Memory (void); + ACE_SV_Shared_Memory (); ACE_SV_Shared_Memory (key_t external_id, size_t size, int create, @@ -66,10 +66,10 @@ class ACE_Export ACE_SV_Shared_Memory int attach (void *virtual_addr = 0, int flags = 0); /// Detach this shared memory segment. - int detach (void); + int detach (); /// Remove this shared memory segment. - int remove (void); + int remove (); /// Forward to underlying System V . int control (int cmd, void *buf); diff --git a/ACE/ace/SV_Shared_Memory.inl b/ACE/ace/SV_Shared_Memory.inl index 1d31912ebc123..c59cbc655cf1a 100644 --- a/ACE/ace/SV_Shared_Memory.inl +++ b/ACE/ace/SV_Shared_Memory.inl @@ -78,7 +78,7 @@ ACE_SV_Shared_Memory::get_segment_size () const // Removes the shared memory segment. ACE_INLINE int -ACE_SV_Shared_Memory::remove (void) +ACE_SV_Shared_Memory::remove () { ACE_TRACE ("ACE_SV_Shared_Memory::remove"); #if defined (ACE_WIN32) @@ -92,7 +92,7 @@ ACE_SV_Shared_Memory::remove (void) // memory segment. ACE_INLINE int -ACE_SV_Shared_Memory::detach (void) +ACE_SV_Shared_Memory::detach () { ACE_TRACE ("ACE_SV_Shared_Memory::detach"); return ACE_OS::shmdt (this->segment_ptr_); diff --git a/ACE/ace/Sample_History.h b/ACE/ace/Sample_History.h index fea5384037e5c..4c930057a50e1 100644 --- a/ACE/ace/Sample_History.h +++ b/ACE/ace/Sample_History.h @@ -46,7 +46,7 @@ class ACE_Export ACE_Sample_History ACE_Sample_History (size_t max_samples); /// Destructor - ~ACE_Sample_History (void); + ~ACE_Sample_History (); /// Record one sample. /** diff --git a/ACE/ace/Sbrk_Memory_Pool.h b/ACE/ace/Sbrk_Memory_Pool.h index ed7eaad69a0b0..5c38cc3713a54 100644 --- a/ACE/ace/Sbrk_Memory_Pool.h +++ b/ACE/ace/Sbrk_Memory_Pool.h @@ -54,7 +54,7 @@ class ACE_Export ACE_Sbrk_Memory_Pool ACE_Sbrk_Memory_Pool (const ACE_TCHAR *backing_store_name = 0, const OPTIONS *options = 0); - virtual ~ACE_Sbrk_Memory_Pool (void); + virtual ~ACE_Sbrk_Memory_Pool (); // = Implementor operations. /// Ask system for initial chunk of local memory. diff --git a/ACE/ace/Sched_Params.cpp b/ACE/ace/Sched_Params.cpp index 8f63c09343256..409e7120ac546 100644 --- a/ACE/ace/Sched_Params.cpp +++ b/ACE/ace/Sched_Params.cpp @@ -13,73 +13,13 @@ #include "ace/Sched_Params.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS) -# include "ace/OS_NS_string.h" -# include /**/ -#endif /* ACE_HAS_PRIOCNTL && ACE_HAS_THREADS */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL int ACE_Sched_Params::priority_min (const Policy policy, const int scope) { -#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (scope); - - // Assume that ACE_SCHED_OTHER indicates TS class, and that other - // policies indicate RT class. - - // Call ACE_OS::priority_control only for processes (lightweight - // or otherwise). Calling ACE_OS::priority_control for thread - // priorities gives incorrect results. - if (scope == ACE_SCOPE_PROCESS || scope == ACE_SCOPE_LWP) - { - if (policy == ACE_SCHED_OTHER) - { - // Get the priority class ID and attributes. - pcinfo_t pcinfo; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcinfo, 0, sizeof pcinfo); - ACE_OS::strcpy (pcinfo.pc_clname, "TS"); - - if (ACE_OS::priority_control (P_ALL /* ignored */, - P_MYID /* ignored */, - PC_GETCID, - (char *) &pcinfo) == -1) - // Just hope that priority range wasn't configured from -1 - // .. 1 - return -1; - - // OK, now we've got the class ID in pcinfo.pc_cid. In - // addition, the maximum configured time-share priority is in - // ((tsinfo_t *) pcinfo.pc_clinfo)->ts_maxupri. The minimum - // priority is just the negative of that. - - return -((tsinfo_t *) pcinfo.pc_clinfo)->ts_maxupri; - } - else - return 0; - } - else - { - // Here we handle the case for ACE_SCOPE_THREAD. Calling - // ACE_OS::priority_control for thread scope gives incorrect - // results. - switch (policy) - { - case ACE_SCHED_FIFO: - return ACE_THR_PRI_FIFO_MIN; - case ACE_SCHED_RR: - return ACE_THR_PRI_RR_MIN; - case ACE_SCHED_OTHER: - default: - return ACE_THR_PRI_OTHER_MIN; - } - } -#elif defined(ACE_HAS_PTHREADS) && \ - (!defined(ACE_LACKS_SETSCHED)) +#if defined(ACE_HAS_PTHREADS) && !defined(ACE_LACKS_SETSCHED) switch (scope) { case ACE_SCOPE_THREAD: @@ -108,14 +48,10 @@ ACE_Sched_Params::priority_min (const Policy policy, } } -#elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); return THREAD_PRIORITY_IDLE; -#elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - return 255; #elif defined (ACE_VXWORKS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); @@ -128,63 +64,14 @@ ACE_Sched_Params::priority_min (const Policy policy, ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PRIOCNTL && defined (ACE_HAS_STHREADS) */ +#endif /* ACE_HAS_PTHREADS */ } int ACE_Sched_Params::priority_max (const Policy policy, const int scope) { -#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (scope); - - // Call ACE_OS::priority_control only for processes (lightweight - // or otherwise). Calling ACE_OS::priority_control for thread - // priorities gives incorrect results. - if (scope == ACE_SCOPE_PROCESS || scope == ACE_SCOPE_LWP) - { - // Assume that ACE_SCHED_OTHER indicates TS class, and that other - // policies indicate RT class. - - // Get the priority class ID and attributes. - pcinfo_t pcinfo; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcinfo, 0, sizeof pcinfo); - ACE_OS::strcpy (pcinfo.pc_clname, - policy == ACE_SCHED_OTHER ? "TS" : "RT"); - - if (ACE_OS::priority_control (P_ALL /* ignored */, - P_MYID /* ignored */, - PC_GETCID, - (char *) &pcinfo) == -1) - return -1; - - // OK, now we've got the class ID in pcinfo.pc_cid. In addition, - // the maximum configured real-time priority is in ((rtinfo_t *) - // pcinfo.pc_clinfo)->rt_maxpri, or similarly for the TS class. - - return policy == ACE_SCHED_OTHER - ? ((tsinfo_t *) pcinfo.pc_clinfo)->ts_maxupri - : ((rtinfo_t *) pcinfo.pc_clinfo)->rt_maxpri; - } - else - { - // Here we handle the case for ACE_SCOPE_THREAD. Calling - // ACE_OS::priority_control for thread scope gives incorrect - // results. - switch (policy) - { - case ACE_SCHED_FIFO: - return ACE_THR_PRI_FIFO_MAX; - case ACE_SCHED_RR: - return ACE_THR_PRI_RR_MAX; - case ACE_SCHED_OTHER: - default: - return ACE_THR_PRI_OTHER_MAX; - } - } -#elif defined(ACE_HAS_PTHREADS) && \ +#if defined(ACE_HAS_PTHREADS) && \ (!defined(ACE_LACKS_SETSCHED) || \ defined (ACE_HAS_PTHREAD_SCHEDPARAM)) @@ -216,14 +103,10 @@ ACE_Sched_Params::priority_max (const Policy policy, } } -#elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); return THREAD_PRIORITY_TIME_CRITICAL; -#elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - return 0; #elif defined (ACE_VXWORKS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); @@ -236,7 +119,7 @@ ACE_Sched_Params::priority_max (const Policy policy, ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PRIOCNTL && defined (ACE_HAS_STHREADS) */ +#endif /* ACE_HAS_PTHREADS */ } int @@ -244,7 +127,7 @@ ACE_Sched_Params::next_priority (const Policy policy, const int priority, const int scope) { -#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); switch (priority) @@ -272,7 +155,7 @@ ACE_Sched_Params::next_priority (const Policy policy, // including STHREADS, and PTHREADS int const max = priority_max (policy, scope); return priority < max ? priority + 1 : max; -#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) +#elif defined (ACE_VXWORKS) int const max = priority_max (policy, scope); return priority > max ? priority - 1 : max; #else @@ -288,7 +171,7 @@ ACE_Sched_Params::previous_priority (const Policy policy, const int priority, const int scope) { -#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); switch (priority) @@ -316,7 +199,7 @@ ACE_Sched_Params::previous_priority (const Policy policy, // including STHREADS and PTHREADS int const min = priority_min (policy, scope); return priority > min ? priority - 1 : min; -#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) +#elif defined (ACE_VXWORKS) int const min = priority_min (policy, scope); return priority < min ? priority + 1 : min; #else diff --git a/ACE/ace/Sched_Params.h b/ACE/ace/Sched_Params.h index 7ca200bbf460c..5058f17e60a1a 100644 --- a/ACE/ace/Sched_Params.h +++ b/ACE/ace/Sched_Params.h @@ -36,10 +36,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * (ACE_SCHED_OTHER), to which many systems default; priority; * and a time-slice quantum for round-robin scheduling. A * "scope" parameter specifies whether the ACE_Sched_Params - * applies to the current process, current lightweight process - * (LWP) (on Solaris), or current thread. Please see the "NOTE" - * below about not all combinations of parameters being legal on - * a particular platform. + * applies to the current process, or current thread. Please + * see the "NOTE" below about not all combinations of parameters + * being legal on a particular platform. * For the case of thread priorities, it is intended that * usually be called from
    before * any threads have been spawned. If spawned threads inherit @@ -57,11 +56,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_Export ACE_Sched_Params { - // NOTE: Solaris 2.5.x threads in the RT class must set the - // priority of their LWP. The only way to do that through ACE is - // for the RT thread itself to call with - // it's own priority. - // OS Scheduling parameters are complicated and often confusing. // Many thanks to Thilo Kielmann // for his careful review of @@ -142,8 +136,6 @@ class ACE_Export ACE_Sched_Params * process, and the process priority. On some platforms, * such as Win32, the scheduling policy can _only_ be * set at process scope. - * ACE_SCOPE_LWP: lightweight process scope, only used with - * Solaris threads. * ACE_SCOPE_THREAD: sets the scheduling policy for the thread, * if the OS supports it, such as with Posix threads, and the * thread priority. diff --git a/ACE/ace/Select_Reactor.h b/ACE/ace/Select_Reactor.h index 9186d56c68734..84eba7b747f10 100644 --- a/ACE/ace/Select_Reactor.h +++ b/ACE/ace/Select_Reactor.h @@ -47,11 +47,11 @@ class ACE_Export ACE_Guard< ACE_Reactor_Token_T > ACE_Guard (ACE_Reactor_Token_T &, int) {} ~ACE_Guard () = default; - int acquire (void) { return 0; } - int tryacquire (void) { return 0; } - int release (void) { return 0; } - int locked (void) { return 1; } - int remove (void) { return 0; } + int acquire () { return 0; } + int tryacquire () { return 0; } + int release () { return 0; } + int locked () { return 1; } + int remove () { return 0; } void dump () const {} private: diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h index edac5a28aa93f..4ffa1d80640ce 100644 --- a/ACE/ace/Select_Reactor_Base.h +++ b/ACE/ace/Select_Reactor_Base.h @@ -90,7 +90,7 @@ class ACE_Event_Tuple { public: /// Default constructor. - ACE_Event_Tuple (void); + ACE_Event_Tuple (); /// Constructor. ACE_Event_Tuple (ACE_Event_Handler *eh, ACE_HANDLE h); @@ -107,7 +107,6 @@ class ACE_Event_Tuple /// ACE_Event_Handler associated with the ACE_HANDLE. ACE_Event_Handler *event_handler_; - }; /** @@ -129,10 +128,10 @@ class ACE_Export ACE_Select_Reactor_Notify : public ACE_Reactor_Notify { public: /// Constructor. - ACE_Select_Reactor_Notify (void); + ACE_Select_Reactor_Notify (); /// Destructor. - virtual ~ACE_Select_Reactor_Notify (void); + virtual ~ACE_Select_Reactor_Notify (); /// Initialize. virtual int open (ACE_Reactor_Impl *, @@ -140,7 +139,7 @@ class ACE_Export ACE_Select_Reactor_Notify : public ACE_Reactor_Notify int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT); /// Destroy. - virtual int close (void); + virtual int close (); /** * Called by a thread when it wants to unblock the @@ -165,7 +164,7 @@ class ACE_Export ACE_Select_Reactor_Notify : public ACE_Reactor_Notify /// Returns the ACE_HANDLE of the notify pipe on which the reactor /// is listening for notifications so that other threads can unblock /// the Select_Reactor - virtual ACE_HANDLE notify_handle (void); + virtual ACE_HANDLE notify_handle (); /// Handle one of the notify call on the @c handle. This could be /// because of a thread trying to unblock the Reactor_Impl @@ -207,7 +206,7 @@ class ACE_Export ACE_Select_Reactor_Notify : public ACE_Reactor_Notify * dispatch the ACE_Event_Handlers that are passed in via the * notify pipe before breaking out of its recv loop. */ - virtual int max_notify_iterations (void); + virtual int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -328,7 +327,7 @@ class ACE_Export ACE_Select_Reactor_Handler_Repository int open (size_type size); /// Close down the repository. - int close (void); + int close (); // = Search structure operations. @@ -348,7 +347,7 @@ class ACE_Export ACE_Select_Reactor_Handler_Repository ACE_Reactor_Mask mask); /// Remove all the tuples. - int unbind_all (void); + int unbind_all (); // = Sanity checking. @@ -409,7 +408,6 @@ class ACE_Export ACE_Select_Reactor_Handler_Repository class ACE_Export ACE_Select_Reactor_Handler_Repository_Iterator { public: - typedef ACE_Select_Reactor_Handler_Repository::map_type::const_iterator const_base_iterator; @@ -427,7 +425,7 @@ class ACE_Export ACE_Select_Reactor_Handler_Repository_Iterator /// Move forward by one element in the set. Returns @c false when /// all the items in the set have been seen, else @c true. - bool advance (void); + bool advance (); /// Dump the state of an object. void dump () const; @@ -477,7 +475,7 @@ class ACE_Export ACE_Select_Reactor_Impl : public ACE_Reactor_Impl /// its own ie. can it pass on the control of handle resumption to /// the application. The select reactor has no handlers that can be /// resumed by the application. So return 0; - virtual int resumable_handler (void); + virtual int resumable_handler (); protected: /// Allow manipulation of the mask and mask. @@ -488,7 +486,7 @@ class ACE_Export ACE_Select_Reactor_Impl : public ACE_Reactor_Impl /// Enqueue ourselves into the list of waiting threads at the /// appropriate point specified by . - virtual void renew (void) = 0; + virtual void renew () = 0; /// Check to see if the Event_Handler associated with @a handle is /// suspended. Returns 0 if not, 1 if so. @@ -574,7 +572,7 @@ class ACE_Export ACE_Select_Reactor_Impl : public ACE_Reactor_Impl /// Controls/access whether the notify handler should renew the /// Select_Reactor's token or not. - bool supress_notify_renew (void); + bool supress_notify_renew (); void supress_notify_renew (bool sr); private: diff --git a/ACE/ace/Select_Reactor_Base.inl b/ACE/ace/Select_Reactor_Base.inl index 946ae27a14d94..47125eb4fc4b3 100644 --- a/ACE/ace/Select_Reactor_Base.inl +++ b/ACE/ace/Select_Reactor_Base.inl @@ -83,7 +83,7 @@ ACE_Select_Reactor_Handler_Repository_Iterator::done () const // ------------------------------------------------------------------ ACE_INLINE -ACE_Event_Tuple::ACE_Event_Tuple (void) +ACE_Event_Tuple::ACE_Event_Tuple () : handle_ (ACE_INVALID_HANDLE), event_handler_ (0) { @@ -136,7 +136,7 @@ ACE_Select_Reactor_Impl::ACE_Select_Reactor_Impl (bool ms) #endif ACE_INLINE bool -ACE_Select_Reactor_Impl::supress_notify_renew (void) +ACE_Select_Reactor_Impl::supress_notify_renew () { return this->supress_renew_; } diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index 5087c40e60586..d9f02176e6c91 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -90,7 +90,7 @@ ACE_Select_Reactor_T::handler_i (int signum, } template bool -ACE_Select_Reactor_T::initialized (void) +ACE_Select_Reactor_T::initialized () { ACE_TRACE ("ACE_Select_Reactor_T::initialized"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false)); @@ -125,7 +125,7 @@ ACE_Select_Reactor_T::owner (ACE_thread_t *t_id) } template bool -ACE_Select_Reactor_T::restart (void) +ACE_Select_Reactor_T::restart () { ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false)); return this->restart_; @@ -155,7 +155,7 @@ ACE_Select_Reactor_T::requeue_position (int rp) } template int -ACE_Select_Reactor_T::requeue_position (void) +ACE_Select_Reactor_T::requeue_position () { ACE_TRACE ("ACE_Select_Reactor_T::requeue_position"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); @@ -172,7 +172,7 @@ ACE_Select_Reactor_T::max_notify_iterations (int itera } template int -ACE_Select_Reactor_T::max_notify_iterations (void) +ACE_Select_Reactor_T::max_notify_iterations () { ACE_TRACE ("ACE_Select_Reactor_T::max_notify_iterations"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); @@ -181,7 +181,7 @@ ACE_Select_Reactor_T::max_notify_iterations (void) // Enqueue ourselves into the list of waiting threads. template void -ACE_Select_Reactor_T::renew (void) +ACE_Select_Reactor_T::renew () { ACE_TRACE ("ACE_Select_Reactor_T::renew"); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) @@ -225,7 +225,7 @@ ACE_Select_Reactor_T::suspend_handler (ACE_HANDLE hand } template int -ACE_Select_Reactor_T::suspend_handlers (void) +ACE_Select_Reactor_T::suspend_handlers () { ACE_TRACE ("ACE_Select_Reactor_T::suspend_handlers"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); @@ -243,7 +243,7 @@ ACE_Select_Reactor_T::suspend_handlers (void) } template int -ACE_Select_Reactor_T::resume_handlers (void) +ACE_Select_Reactor_T::resume_handlers () { ACE_TRACE ("ACE_Select_Reactor_T::resume_handlers"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); @@ -557,7 +557,7 @@ ACE_Select_Reactor_T::ACE_Select_Reactor_T // event loop thread... template int -ACE_Select_Reactor_T::close (void) +ACE_Select_Reactor_T::close () { ACE_TRACE ("ACE_Select_Reactor_T::close"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); @@ -606,7 +606,7 @@ ACE_Select_Reactor_T::current_info } template -ACE_Select_Reactor_T::~ACE_Select_Reactor_T (void) +ACE_Select_Reactor_T::~ACE_Select_Reactor_T () { ACE_TRACE ("ACE_Select_Reactor_T::~ACE_Select_Reactor_T"); this->close (); @@ -770,7 +770,7 @@ ACE_Select_Reactor_T::handle_events } template int -ACE_Select_Reactor_T::handle_error (void) +ACE_Select_Reactor_T::handle_error () { ACE_TRACE ("ACE_Select_Reactor_T::handle_error"); #if defined (ACE_LINUX) && defined (ERESTARTNOHAND) @@ -984,7 +984,6 @@ ACE_Select_Reactor_T::is_suspended_i (ACE_HANDLE handl return this->suspend_set_.rd_mask_.is_set (handle) || this->suspend_set_.wr_mask_.is_set (handle) || this->suspend_set_.ex_mask_.is_set (handle); - } // Must be called with locks held @@ -1216,7 +1215,6 @@ ACE_Select_Reactor_T::dispatch_io_set if (this->state_changed_) { - handle_iter.reset_state (); this->state_changed_ = false; } @@ -1386,7 +1384,7 @@ ACE_Select_Reactor_T::dispatch } template int -ACE_Select_Reactor_T::release_token (void) +ACE_Select_Reactor_T::release_token () { #if defined (ACE_WIN32) this->token_.release (); @@ -1470,7 +1468,7 @@ ACE_Select_Reactor_T::handle_events_i } template int -ACE_Select_Reactor_T::check_handles (void) +ACE_Select_Reactor_T::check_handles () { ACE_TRACE ("ACE_Select_Reactor_T::check_handles"); @@ -1500,7 +1498,6 @@ ACE_Select_Reactor_T::check_handles (void) ACE_Handle_Set_Iterator check_iter (check_set); while ((h = check_iter ()) != ACE_INVALID_HANDLE) { - #if defined (ACE_WIN32) || defined (__MVS__) || defined (ACE_VXWORKS) // Win32 needs to do the check this way because fstat won't work on // a socket handle. MVS Open Edition needs to do it this way because, diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index dc0fc72a76254..e515bc756b0be 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -123,10 +123,10 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl virtual ACE_Timer_Queue *timer_queue () const; /// Close down the select_reactor and release all of its resources. - virtual int close (void); + virtual int close (); /// Close down the select_reactor and release all of its resources. - virtual ~ACE_Select_Reactor_T (void); + virtual ~ACE_Select_Reactor_T (); // = Event loop drivers. @@ -182,7 +182,7 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl * actively handling events. If it returns non-zero, and * return -1 immediately. */ - virtual int deactivated (void); + virtual int deactivated (); /** * Control whether the Reactor will handle any more incoming events or not. @@ -304,7 +304,7 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl virtual int suspend_handler (const ACE_Handle_Set &handles); /// Suspend all the in the Select_Reactor. - virtual int suspend_handlers (void); + virtual int suspend_handlers (); /// Resume a temporarily suspend Event_Handler associated with /// @a eh. @@ -318,7 +318,7 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl virtual int resume_handler (const ACE_Handle_Set &handles); /// Resume all the in the Select_Reactor. - virtual int resume_handlers (void); + virtual int resume_handlers (); /** * Return true if we any event associations were made by the reactor @@ -326,7 +326,7 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl * Select_Reactor does not do any event associations, this function * always return false. */ - virtual bool uses_event_associations (void); + virtual bool uses_event_associations (); // = Timer management. /** @@ -437,10 +437,10 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl * dispatch the ACE_Event_Handlers that are passed in via the * notify pipe before breaking out of its recv loop. */ - virtual int max_notify_iterations (void); + virtual int max_notify_iterations (); /// Get the existing restart value. - virtual bool restart (void); + virtual bool restart (); /// Set a new value for restart and return the original value. virtual bool restart (bool r); @@ -451,7 +451,7 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl /// Get position that the main ACE_Select_Reactor thread is requeued in the /// list of waiters during a callback. - virtual int requeue_position (void); + virtual int requeue_position (); // = Low-level wait_set mask manipulation methods. /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the @a eh and @@ -478,7 +478,7 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl int ops); /// Wake up all threads in waiting in the event loop - virtual void wakeup_all_threads (void); + virtual void wakeup_all_threads (); // = Only the owner thread can perform a . @@ -514,7 +514,7 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl ACE_Event_Handler ** = 0); /// Returns true if we've been successfully initialized, else false. - virtual bool initialized (void); + virtual bool initialized (); /// Returns the current size of the Reactor's internal descriptor /// table. @@ -527,7 +527,7 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl * deadlock efficiently when ACE_Event_Handlers are used in * multiple threads. */ - virtual ACE_Lock &lock (void); + virtual ACE_Lock &lock (); /// Dump the state of an object. virtual void dump () const; @@ -594,10 +594,10 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl virtual int any_ready_i (ACE_Select_Reactor_Handle_Set &handle_set); /// Take corrective action when errors occur. - virtual int handle_error (void); + virtual int handle_error (); /// Make sure the handles are all valid. - virtual int check_handles (void); + virtual int check_handles (); /// Wait for events to occur. virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &, @@ -667,7 +667,7 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl /// Enqueue ourselves into the list of waiting threads at the /// appropriate point specified by . - virtual void renew (void); + virtual void renew (); /// Synchronization token for the MT_SAFE ACE_Select_Reactor. ACE_SELECT_REACTOR_TOKEN token_; @@ -676,7 +676,7 @@ class ACE_Select_Reactor_T : public ACE_Select_Reactor_Impl ACE_Lock_Adapter lock_adapter_; /// Release the token lock when a Win32 structured exception occurs. - int release_token (void); + int release_token (); /// Stops the VC++ compiler from bitching about exceptions and destructors int handle_events_i (ACE_Time_Value *max_wait_time = 0); @@ -696,13 +696,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Select_Reactor_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Select_Reactor_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Select_Reactor_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_SELECT_REACTOR_T_H */ diff --git a/ACE/ace/Select_Reactor_T.inl b/ACE/ace/Select_Reactor_T.inl index c71bc0a7caa61..83e26170b5ef9 100644 --- a/ACE/ace/Select_Reactor_T.inl +++ b/ACE/ace/Select_Reactor_T.inl @@ -112,7 +112,7 @@ ACE_Select_Reactor_T::remove_handler (int signum, template ACE_INLINE bool -ACE_Select_Reactor_T::uses_event_associations (void) +ACE_Select_Reactor_T::uses_event_associations () { // Since the Select_Reactor does not do any event associations, this // function always return false. @@ -177,14 +177,14 @@ ACE_Select_Reactor_T::cancel_wakeup (ACE_HANDLE handle } template ACE_INLINE ACE_Lock & -ACE_Select_Reactor_T::lock (void) +ACE_Select_Reactor_T::lock () { ACE_TRACE ("ACE_Select_Reactor_T::lock"); return this->lock_adapter_; } template ACE_INLINE void -ACE_Select_Reactor_T::wakeup_all_threads (void) +ACE_Select_Reactor_T::wakeup_all_threads () { // Send a notification, but don't block if there's no one to receive // it. @@ -204,7 +204,7 @@ ACE_Select_Reactor_T::alertable_handle_events (ACE_Tim } template ACE_INLINE int -ACE_Select_Reactor_T::deactivated (void) +ACE_Select_Reactor_T::deactivated () { return this->deactivated_; } diff --git a/ACE/ace/Semaphore.h b/ACE/ace/Semaphore.h index fc46aac8a6473..a0c6f964dd669 100644 --- a/ACE/ace/Semaphore.h +++ b/ACE/ace/Semaphore.h @@ -60,13 +60,6 @@ class ACE_Export ACE_Semaphore * is assumed to be in "absolute" rather than "relative" time. The * value of @a tv is updated upon return to show the actual * (absolute) acquisition time. - * - * @note Solaris threads do not support timed semaphores. - * Therefore, if you're running on Solaris you might want to - * consider using the ACE POSIX pthreads implementation instead, - * which can be enabled by compiling ACE with - * -DACE_HAS_PTHREADS, rather than -DACE_HAS_STHREADS or - * -DACE_HAS_POSIX_SEM. */ int acquire (ACE_Time_Value &tv); @@ -78,13 +71,7 @@ class ACE_Export ACE_Semaphore * <*tv> is assumed to be in "absolute" rather than "relative" time. * The value of <*tv> is updated upon return to show the actual * (absolute) acquisition time. - * - * @note Solaris threads do not support timed semaphores. - * Therefore, if you're running on Solaris you might want to - * consider using the ACE POSIX pthreads implementation instead, - * which can be enabled by compiling ACE with - * -DACE_HAS_PTHREADS, rather than -DACE_HAS_STHREADS or - * -DACE_HAS_POSIX_SEM. */ + */ int acquire (ACE_Time_Value *tv); /** diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp index f88ef610fe4dc..9e2ca555af487 100644 --- a/ACE/ace/Service_Config.cpp +++ b/ACE/ace/Service_Config.cpp @@ -428,7 +428,6 @@ ACE_Service_Config::current () { void* temp = ACE_Service_Config::singleton()->threadkey_.get (); if (temp == 0) { - // The most likely reason is that the current thread was spawned // by some native primitive, like pthreads or Windows API - not // from ACE. This is perfectly legal for callers who are not, or @@ -453,7 +452,6 @@ ACE_Service_Config::current (ACE_Service_Gestalt* newcurrent) } - #if (ACE_USES_CLASSIC_SVC_CONF == 0) ACE_Service_Type * ACE_Service_Config::create_service_type (const ACE_TCHAR *n, @@ -507,7 +505,6 @@ ACE_Service_Config::create_service_type_impl (const ACE_TCHAR *name, break; } return stp; - } diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index d77fc25362573..a3a785bad42e2 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -542,16 +542,6 @@ class ACE_Export ACE_Service_Config /// from the ACE_Reactor, and unlinking it if necessary. static int remove (const ACE_TCHAR svc_name[]); -#if defined (ACE_HAS_WINCE) && defined (ACE_USES_WCHAR) - // We must provide these function to bridge the Svc_Conf parser - // with ACE. - static int initialize (const ACE_Service_Type *, ACE_ANTI_TCHAR []); - static int initialize (const char svc_name[], ACE_ANTI_TCHAR parameters[]); - static int resume (const ACE_ANTI_TCHAR svc_name[]); - static int suspend (const ACE_ANTI_TCHAR svc_name[]); - static int remove (const ACE_ANTI_TCHAR svc_name[]); -#endif /* ACE_HAS_WINCE */ - /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl index 4f187015bcca1..eeb2911af6f62 100644 --- a/ACE/ace/Service_Config.inl +++ b/ACE/ace/Service_Config.inl @@ -166,40 +166,4 @@ ACE_Service_Config::process_directive (const ACE_Static_Svc_Descriptor &ssd, return ACE_Service_Config::current ()->process_directive (ssd, force_replace); } - -#if defined (ACE_HAS_WINCE) && defined (ACE_USES_WCHAR) -// We must provide these function to bridge Svc_Conf parser with ACE. - -ACE_INLINE int -ACE_Service_Config::initialize (const ACE_Service_Type *sp, ACE_ANTI_TCHAR parameters[]) -{ - return ACE_Service_Config::initialize (sp, ACE_TEXT_ANTI_TO_TCHAR (parameters)); -} - -ACE_INLINE int -ACE_Service_Config::initialize (const ACE_ANTI_TCHAR svc_name[], ACE_ANTI_TCHAR parameters[]) -{ - return ACE_Service_Config::initialize (ACE_TEXT_ANTI_TO_TCHAR (svc_name), - ACE_TEXT_ANTI_TO_TCHAR (parameters)); -} - -ACE_INLINE int -ACE_Service_Config::resume (const ACE_ANTI_TCHAR svc_name[]) -{ - return ACE_Service_Config::resume (ACE_TEXT_ANTI_TO_TCHAR (svc_name)); -} - -ACE_INLINE int -ACE_Service_Config::suspend (const ACE_ANTI_TCHAR svc_name[]) -{ - return ACE_Service_Config::suspend (ACE_TEXT_ANTI_TO_TCHAR (svc_name)); -} - -ACE_INLINE int -ACE_Service_Config::remove (const ACE_ANTI_TCHAR svc_name[]) -{ - return ACE_Service_Config::remove (ACE_TEXT_ANTI_TO_TCHAR (svc_name)); -} -#endif /* ACE_HAS_WINCE && !ACE_USES_WCHAR */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index 37c8313b398ba..bc82751959c3a 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -123,7 +123,6 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard () } - // ---------------------------------------- ACE_Service_Gestalt::Processed_Static_Svc:: @@ -174,7 +173,6 @@ ACE_Service_Gestalt::intrusive_remove_ref (ACE_Service_Gestalt* g) ACE_Service_Gestalt::~ACE_Service_Gestalt () { - if (this->svc_repo_is_owned_) delete this->repo_; @@ -290,11 +288,9 @@ ACE_Service_Gestalt::load_static_svcs () return -1; } return 0; - } /* load_static_svcs () */ - /// Find a static service descriptor by name int ACE_Service_Gestalt::find_static_svc_descriptor (const ACE_TCHAR* name, @@ -341,7 +337,6 @@ ACE_Service_Gestalt::find_processed_static_svc (const ACE_TCHAR* name) } - /// @brief Captures a list of the direcives processed (explicitely) for this /// Gestalt so that services can be replicated in other repositories /// upon their first initialization. @@ -352,7 +347,6 @@ void ACE_Service_Gestalt::add_processed_static_svc (const ACE_Static_Svc_Descriptor *assd) { - /// When process_directive(Static_Svc_Descriptor&) is called, it /// associates a service object with the Gestalt and makes the /// resource (a Service Object) local to the repository. This is but @@ -611,7 +605,6 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr, } return this->initialize_i (sr, parameters); - } /// Dynamically link the shared object file and retrieve a pointer to @@ -826,14 +819,8 @@ ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll) ACE_TEXT("ACE_Service_Config::get_xml_svc_conf")), 0); - void * foo = - xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object")); - -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int const temp_p = reinterpret_cast (foo); -#else + void * foo = xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object")); intptr_t const temp_p = reinterpret_cast (foo); -#endif ACE_XML_Svc_Conf::Factory factory = reinterpret_cast (temp_p); @@ -984,7 +971,6 @@ ACE_Service_Gestalt::init_svc_conf_file_queue () #endif return 0; - } /* init_svc_conf_file_queue () */ @@ -1087,7 +1073,6 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], ACE_OS::fclose(fp); else add_default = false; - } } @@ -1171,7 +1156,6 @@ ACE_Service_Gestalt::process_commandline_directives () } return result; - } /* process_commandline_directives () */ @@ -1249,7 +1233,6 @@ ACE_Service_Gestalt::parse_args_i (int argc, } /* parse_args_i () */ - // Process service configuration directives from the files queued for // processing int @@ -1277,7 +1260,6 @@ ACE_Service_Gestalt::process_directives (bool ) } return failed; - } /* process_directives () */ // Tidy up and perform last rites on a terminating ACE_Service_Gestalt. diff --git a/ACE/ace/Service_Manager.h b/ACE/ace/Service_Manager.h index 45c527484baa7..51161d5746b5a 100644 --- a/ACE/ace/Service_Manager.h +++ b/ACE/ace/Service_Manager.h @@ -51,10 +51,10 @@ class ACE_Export ACE_Service_Manager : public ACE_Service_Object { public: /// Constructor. - ACE_Service_Manager (void); + ACE_Service_Manager (); /// Destructor. - virtual ~ACE_Service_Manager (void); + virtual ~ACE_Service_Manager (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -64,11 +64,11 @@ class ACE_Export ACE_Service_Manager : public ACE_Service_Object /// Trigger a reconfiguration of the Service Configurator by /// re-reading its local file. - virtual int reconfigure_services (void); + virtual int reconfigure_services (); /// Determine all the services offered by this daemon and return the /// information back to the client. - virtual int list_services (void); + virtual int list_services (); // = Dynamic linking hooks. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -76,8 +76,8 @@ class ACE_Export ACE_Service_Manager : public ACE_Service_Object virtual int fini (); // = Scheduling hooks. - virtual int suspend (void); - virtual int resume (void); + virtual int suspend (); + virtual int resume (); /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Service_Object.cpp b/ACE/ace/Service_Object.cpp index c7429cfb075ca..79060626410e0 100644 --- a/ACE/ace/Service_Object.cpp +++ b/ACE/ace/Service_Object.cpp @@ -14,9 +14,6 @@ #include "ace/DLL.h" #include "ace/ACE.h" #include "ace/Log_Category.h" -#if defined (ACE_OPENVMS) -# include "ace/Lib_Find.h" -#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -177,13 +174,4 @@ ACE_Service_Type::name (const ACE_TCHAR *n) this->name_ = ACE::strnew (n); } -#if defined (ACE_OPENVMS) -ACE_Dynamic_Svc_Registrar::ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_name, - void* svc_allocator) -{ - // register service allocator function by full name in ACE singleton registry - ACE::ldregister (alloc_name, svc_allocator); -} -#endif - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Service_Object.h b/ACE/ace/Service_Object.h index 4f123319c2e80..287391e52021a 100644 --- a/ACE/ace/Service_Object.h +++ b/ACE/ace/Service_Object.h @@ -180,20 +180,6 @@ class ACE_Export ACE_Service_Object_Ptr ACE_Service_Object *service_object_; }; -#if defined (ACE_OPENVMS) -/** - * @class ACE_Dynamic_Svc_Registrar - * - * @brief Used to register Service allocator function by its full name. - */ -class ACE_Dynamic_Svc_Registrar -{ -public: - ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_name, - void* svc_allocator); -}; -#endif - ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/ACE/ace/Service_Repository.h b/ACE/ace/Service_Repository.h index 4ed680a955c37..ecf6f24f1a932 100644 --- a/ACE/ace/Service_Repository.h +++ b/ACE/ace/Service_Repository.h @@ -138,7 +138,6 @@ class ACE_Export ACE_Service_Repository ACE_ALLOC_HOOK_DECLARE; protected: - friend class ACE_Service_Type_Dynamic_Guard; /// Remove an existing service record. It requires @a sr != 0, which diff --git a/ACE/ace/Shared_Memory.h b/ACE/ace/Shared_Memory.h index 4b10a004d474f..6e1e1ea544f65 100644 --- a/ACE/ace/Shared_Memory.h +++ b/ACE/ace/Shared_Memory.h @@ -37,11 +37,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Shared_Memory { public: - virtual ~ACE_Shared_Memory (void); + virtual ~ACE_Shared_Memory (); // = Note that all the following methods are pure virtual. - virtual int close (void) = 0; - virtual int remove (void) = 0; + virtual int close () = 0; + virtual int remove () = 0; virtual void *malloc (size_t = 0) = 0; virtual int free (void *p) = 0; virtual size_t get_segment_size () const = 0; diff --git a/ACE/ace/Shared_Memory_MM.h b/ACE/ace/Shared_Memory_MM.h index b3dc8f72fd6cd..77f9b12db9f89 100644 --- a/ACE/ace/Shared_Memory_MM.h +++ b/ACE/ace/Shared_Memory_MM.h @@ -76,10 +76,10 @@ class ACE_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory const ACE_TCHAR *filename () const; /// Close down the shared memory segment. - virtual int close (void); + virtual int close (); /// Remove the shared memory segment and the underlying file. - virtual int remove (void); + virtual int remove (); // = Allocation and deallocation methods. /// Create a new chuck of memory containing @a size bytes. diff --git a/ACE/ace/Shared_Memory_SV.h b/ACE/ace/Shared_Memory_SV.h index 4e8adcf8cfb00..4b5f09ca357ff 100644 --- a/ACE/ace/Shared_Memory_SV.h +++ b/ACE/ace/Shared_Memory_SV.h @@ -40,7 +40,7 @@ class ACE_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory ACE_OPEN = 0 }; - ACE_Shared_Memory_SV (void); + ACE_Shared_Memory_SV (); ACE_Shared_Memory_SV (key_t id, size_t length, int create = ACE_Shared_Memory_SV::ACE_OPEN, @@ -56,10 +56,10 @@ class ACE_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory int flags = 0); /// Close down the shared memory segment. - virtual int close (void); + virtual int close (); /// Remove the underlying shared memory segment. - virtual int remove (void); + virtual int remove (); // = Allocation and deallocation methods. /// Create a new chuck of memory containing @a size bytes. diff --git a/ACE/ace/Singleton.h b/ACE/ace/Singleton.h index 41a954dc22a17..c8c7f7de56dad 100644 --- a/ACE/ace/Singleton.h +++ b/ACE/ace/Singleton.h @@ -324,13 +324,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Singleton.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Singleton.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Singleton.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_SINGLETON_H */ diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 04ce825ce6b2a..37e8ea1a3391a 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -7,11 +7,6 @@ #include "ace/OS_Memory.h" #include "ace/OS_NS_stdio.h" #include "ace/ACE.h" - -#if defined (sparc) -# include "ace/OS_NS_fcntl.h" -#endif // sparc - #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_socket.h" @@ -22,9 +17,6 @@ #if defined (ACE_HAS_IPV6) # include "ace/Guard_T.h" # include "ace/Recursive_Thread_Mutex.h" -# if defined (_AIX) -# include /**/ -# endif /* _AIX */ #endif /* ACE_HAS_IPV6 */ #if defined (ACE_HAS_GETIFADDRS) @@ -38,15 +30,6 @@ const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_IN const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT; #endif /* ACE_VXWORKS <= 0x670 && __RTP__ && ACE_HAS_IPV6 */ -#if defined (ACE_HAS_WINCE) -#include /**/ -# if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && (_WIN32_WCE < 0x600) && defined (ACE_HAS_IPV6) -# include /**/ -const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; -const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; -# endif -#endif // ACE_HAS_WINCE - #if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) # include "ace/OS_NS_stdio.h" #endif @@ -58,18 +41,6 @@ const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; # if defined (SIOCGLIFCONF) # define SIOCGIFCONF_CMD SIOCGLIFCONF -# if defined (__hpux) -# define IFREQ if_laddrreq -# define IFCONF if_laddrconf -# define IFC_REQ iflc_req -# define IFC_LEN iflc_len -# define IFC_BUF iflc_buf -# define IFR_ADDR iflr_addr -# define IFR_NAME iflr_name -# define IFR_FLAGS iflr_flags -# undef SETFAMILY -# define SA_FAMILY sa_family -# else # define IFREQ lifreq # define IFCONF lifconf # define IFC_REQ lifc_req @@ -82,7 +53,6 @@ const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; # define IFC_FAMILY lifc_family # define IFC_FLAGS lifc_flags # define SA_FAMILY ss_family -# endif # else # define SIOCGIFCONF_CMD SIOCGIFCONF # define IFREQ ifreq @@ -111,7 +81,6 @@ namespace // Does this box have ipv6 turned on? int ace_ipv6_enabled = -1; - } #else /* ACE_HAS_IPV6 */ # define SIOCGIFCONF_CMD SIOCGIFCONF @@ -228,7 +197,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, sizeof ip_addr.sin_addr); } -#if !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) +#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0; n--, ifr++) #else @@ -241,7 +210,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, ifr = (struct ifreq *) ((caddr_t) &ifr->ifr_addr + ifr->ifr_addr.sa_len)) : (nbytes -= sizeof (struct ifreq), ifr++))) -#endif /* !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) */ +#endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) */ { struct sockaddr_in if_addr; @@ -469,105 +438,7 @@ static int get_ip_interfaces_win32 (size_t &count, ACE_INET_Addr *&addrs) { -# if defined (ACE_HAS_WINCE) && defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - // moved the ACE_HAS_WINCE impl ahaid of ACE_HAS_WINSOCK2 because - // WINCE in fact has winsock2, but doesn't properly support the - // WSAIoctl for obtaining IPv6 address info. - PIP_ADAPTER_ADDRESSES AdapterAddresses = 0; - ULONG OutBufferLength = 0; - ULONG RetVal = 0; - unsigned char *octet_buffer = 0; - - RetVal = - GetAdaptersAddresses(AF_UNSPEC, - 0, - 0, - AdapterAddresses, - &OutBufferLength); - - if (RetVal != ERROR_BUFFER_OVERFLOW) - { - return -1; - } - - ACE_NEW_RETURN (octet_buffer, unsigned char[OutBufferLength],-1); - AdapterAddresses = (IP_ADAPTER_ADDRESSES *)octet_buffer; - - RetVal = - GetAdaptersAddresses(AF_UNSPEC, - 0, - 0, - AdapterAddresses, - &OutBufferLength); - - if (RetVal != NO_ERROR) - { - delete [] octet_buffer; - return -1; - } - - // If successful, output some information from the data we received - PIP_ADAPTER_ADDRESSES AdapterList = AdapterAddresses; - while (AdapterList) - { - if (AdapterList->OperStatus == IfOperStatusUp) - { - if (AdapterList->IfIndex != 0) - ++count; - if (AdapterList->Ipv6IfIndex != 0) - ++count; - } - AdapterList = AdapterList->Next; - } - - AdapterList = AdapterAddresses; - - ACE_NEW_RETURN (addrs, ACE_INET_Addr[count],-1); - count = 0; - for (AdapterList = AdapterAddresses; - AdapterList != 0; - AdapterList = AdapterList->Next) - { - if (AdapterList->OperStatus != IfOperStatusUp) - continue; - - IP_ADAPTER_UNICAST_ADDRESS *uni = 0; - if (AdapterList->IfIndex != 0) - for (uni = AdapterList->FirstUnicastAddress; - uni != 0; - uni = uni->Next) - { - SOCKET_ADDRESS *sa_addr = &uni->Address; - if (sa_addr->lpSockaddr->sa_family == AF_INET) - { - sockaddr_in *sin = (sockaddr_in*)sa_addr->lpSockaddr; - addrs[count].set(sin,sa_addr->iSockaddrLength); - ++count; - break; - } - } - if (AdapterList->Ipv6IfIndex != 0) - { - for (uni = AdapterList->FirstUnicastAddress; - uni != 0; - uni = uni->Next) - { - SOCKET_ADDRESS *sa_addr = &uni->Address; - if (sa_addr->lpSockaddr->sa_family == AF_INET6) - { - sockaddr_in *sin = (sockaddr_in*)sa_addr->lpSockaddr; - addrs[count].set(sin,sa_addr->iSockaddrLength); - ++count; - break; - } - } - } - } - - delete [] octet_buffer; - return 0; - -# elif defined (ACE_HAS_PHARLAP) +# if defined (ACE_HAS_PHARLAP) // PharLap ETS has its own kernel routines to rummage through the device // configs and extract the interface info, but only for Pharlap RT. # if !defined (ACE_HAS_PHARLAP_RT) @@ -767,7 +638,7 @@ get_ip_interfaces_win32 (size_t &count, return 0; -# endif /* ACE_HAS_WINCE */ +# endif /* ACE_HAS_PHARLAP */ } #elif defined (ACE_HAS_GETIFADDRS) @@ -846,258 +717,7 @@ get_ip_interfaces_getifaddrs (size_t &count, return 0; } -#elif defined (__hpux) -static int -get_ip_interfaces_hpux (size_t &count, - ACE_INET_Addr *&addrs) -{ - size_t num_ifs = 0; - size_t num_ifs_found = 0; - - // Call specific routine as necessary. - ACE_HANDLE handle = ACE_OS::socket (PF_INET, SOCK_DGRAM, 0); - ACE_HANDLE handle_ipv6 = ACE_INVALID_HANDLE; - - if (handle == ACE_INVALID_HANDLE) - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces:open")), - -1); - - int result = 0; - int tmp_how_many = 0; - - result = ACE_OS::ioctl (handle, - SIOCGIFNUM, - (caddr_t) &tmp_how_many); - if (result != -1) - num_ifs = (size_t)tmp_how_many; - -# if defined (ACE_HAS_IPV6) - tmp_how_many = 0; - handle_ipv6 = ACE_OS::socket (PF_INET6, SOCK_DGRAM, 0); - result = ACE_OS::ioctl (handle_ipv6, - SIOCGLIFNUM, - (caddr_t) &tmp_how_many); - if (result != -1) - num_ifs += (size_t)tmp_how_many; -# endif - - if (num_ifs == 0) - { - ACE_OS::close (handle); - ACE_OS::close (handle_ipv6); - return -1; - } - - // ioctl likes to have an extra IFREQ structure to mark the end of - // what it returned, so increase the num_ifs by one. - ++num_ifs; - - //HPUX requires two passes, First for IPv4, then for IPv6 - - struct ifreq *ifs = 0; - ACE_NEW_RETURN (ifs, - struct ifreq[num_ifs], - -1); - ACE_OS::memset (ifs, 0, num_ifs * sizeof (struct ifreq)); - - ACE_Auto_Array_Ptr p_ifs (ifs); - - if (p_ifs.get() == 0) - { - ACE_OS::close (handle); - ACE_OS::close (handle_ipv6); - errno = ENOMEM; - return -1; - } - - struct ifconf ifcfg; - ACE_OS::memset (&ifcfg, 0, sizeof (struct ifconf)); - - ifcfg.ifc_req = p_ifs.get (); - ifcfg.ifc_len = num_ifs * sizeof (struct ifreq); - - if (ACE_OS::ioctl (handle, - SIOCGIFCONF, - (char *) &ifcfg) == -1) - { - ACE_OS::close (handle); - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces:") - ACE_TEXT ("ioctl - SIOCGIFCONF failed")), - -1); - } - - ACE_OS::close (handle); - - // Now create and initialize output array. - - ACE_NEW_RETURN (addrs, - ACE_INET_Addr[num_ifs], - -1); // caller must free - - struct ifreq *pcur = p_ifs.get (); - num_ifs_found = ifcfg.ifc_len / sizeof (struct ifreq); // get the number of returned ifs - - for (size_t i = 0; - i < num_ifs_found; - i++) - { - struct sockaddr_in *addr = - reinterpret_cast (&pcur->ifr_addr); - if (addr->sin_addr.s_addr != 0) - { - addrs[count].set ((u_short) 0, - addr->sin_addr.s_addr, - 0); - ++count; - } - ++pcur; - } - -# if defined (ACE_HAS_IPV6) - - if (handle_ipv6 != ACE_INVALID_HANDLE) - { - struct if_laddrreq *lifs = 0; - ACE_NEW_RETURN (lifs, - struct if_laddrreq[num_ifs], - -1); - ACE_OS::memset (lifs, 0, num_ifs * sizeof (struct if_laddrreq)); - - ACE_Auto_Array_Ptr p_lifs (lifs); - - if (p_lifs.get() == 0) - { - ACE_OS::close (handle); - ACE_OS::close (handle_ipv6); - errno = ENOMEM; - return -1; - } - - struct if_laddrconf lifcfg; - ACE_OS::memset (&lifcfg, 0, sizeof (struct if_laddrconf)); - - lifcfg.iflc_req = p_lifs.get (); - lifcfg.iflc_len = num_ifs * sizeof (struct if_laddrreq); - - if (ACE_OS::ioctl (handle_ipv6, - SIOCGLIFCONF, - (char *) &lifcfg) == -1) - { - ACE_OS::close (handle); - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces:") - ACE_TEXT ("ioctl - SIOCGLIFCONF failed")), - -1); - } - - ACE_OS::close (handle_ipv6); - - struct if_laddrreq *plcur = p_lifs.get (); - num_ifs_found = lifcfg.iflc_len / sizeof (struct if_laddrreq); - - for (size_t i = 0; - i < num_ifs_found; - i++) - { - struct sockaddr_in *addr = - reinterpret_cast (&plcur->iflr_addr); - if (!IN6_IS_ADDR_UNSPECIFIED(&reinterpret_cast(addr)->sin6_addr)) - { - addrs[count].set(addr, sizeof(struct sockaddr_in6)); - ++count; - } - ++plcur; - } - } -# endif /* ACE_HAS_IPV6 */ - return 0; -} -#elif defined (_AIX) -static int -get_ip_interfaces_aix (size_t &count, - ACE_INET_Addr *&addrs) -{ - ACE_HANDLE handle = ACE::get_handle(); - size_t num_ifs = 0; - struct ifconf ifc; - - if (handle == ACE_INVALID_HANDLE) - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces_aix:")), - -1); - - if (ACE_OS::ioctl (handle, - SIOCGSIZIFCONF, - (caddr_t)&ifc.ifc_len) == -1) - { - ACE_OS::close (handle); - ACELIB_ERROR_RETURN((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get ifconf size")), - -1); - } - - ACE_NEW_RETURN (ifc.ifc_buf,char [ifc.ifc_len], -1); - - ACE_Auto_Array_Ptr safe_buf (ifc.ifc_buf); - ACE_OS::memset (safe_buf.get(), 0, ifc.ifc_len); - - if (ACE_OS::ioctl(handle, SIOCGIFCONF, (caddr_t)&ifc) == -1) - { - ACE_OS::close (handle); - ACELIB_ERROR_RETURN((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get ifconf")), - -1); - } - - ACE_OS::close (handle); - - char *buf_start = safe_buf.get(); - char *buf_end = buf_start + ifc.ifc_len; - - num_ifs = 0; - for (char *ptr = buf_start; ptr < buf_end; ) - { - struct ifreq *req = reinterpret_cast(ptr); - ptr += IFNAMSIZ; - ptr += req->ifr_addr.sa_len; - if (req->ifr_addr.sa_family == AF_INET -# if defined (ACE_HAS_IPV6) - || req->ifr_addr.sa_family == AF_INET6 -# endif - ) - ++num_ifs; - } - ACE_NEW_RETURN (addrs,ACE_INET_Addr[num_ifs], -1); - - for (char * ptr = buf_start; ptr < buf_end; ) - { - struct ifreq *req = reinterpret_cast(ptr); - // skip the interface name - ptr += IFNAMSIZ; - if (req->ifr_addr.sa_family == AF_INET -# if defined (ACE_HAS_IPV6) - || req->ifr_addr.sa_family == AF_INET6 -# endif - ) - { - sockaddr_in *addr = (sockaddr_in*)&req->ifr_addr; - addrs[count++].set(addr, addr->sin_len); - } - ptr += req->ifr_addr.sa_len; - } - - return 0; -} - -#endif // ACE_WIN32 || ACE_HAS_GETIFADDRS || __hpux || _AIX +#endif // ACE_WIN32 || ACE_HAS_GETIFADDRS // return an array of all configured IP interfaces on this host, count @@ -1116,11 +736,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) return get_ip_interfaces_win32 (count, addrs); #elif defined (ACE_HAS_GETIFADDRS) return get_ip_interfaces_getifaddrs (count, addrs); -#elif defined (__hpux) - return get_ip_interfaces_hpux (count, addrs); -#elif defined (_AIX) - return get_ip_interfaces_aix (count, addrs); -#elif (defined (__unix) || defined (__unix__) || defined (ACE_OPENVMS) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS)) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING) +#elif (defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING) // COMMON (SVR4 and BSD) UNIX CODE // Call specific routine as necessary. @@ -1232,7 +848,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) } } -#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) +#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) ++pcur; #else if (pcur->ifr_addr.sa_len <= sizeof (struct sockaddr)) @@ -1244,7 +860,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) pcur = (struct ifreq *) (pcur->ifr_addr.sa_len + (caddr_t) &pcur->ifr_addr); } -#endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) */ +#endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) */ } # if defined (ACE_HAS_IPV6) && !defined (ACE_LACKS_FSCANF) @@ -1289,7 +905,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) ++count; } ACE_OS::freeaddrinfo (res0); - } ACE_OS::fclose (fp); } @@ -1311,7 +926,7 @@ int ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many) { #if defined (SIOCGIFNUM) -# if defined (SIOCGLIFNUM) && !defined (ACE_LACKS_STRUCT_LIFNUM) +# if defined (SIOCGLIFNUM) int cmd = SIOCGLIFNUM; struct lifnum if_num = {AF_UNSPEC,0,0}; # else @@ -1324,16 +939,16 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many) ACE_TEXT ("ACE::count_interfaces:") ACE_TEXT ("ioctl - SIOCGLIFNUM failed")), -1); -# if defined (SIOCGLIFNUM) && !defined (ACE_LACKS_STRUCT_LIFNUM) +# if defined (SIOCGLIFNUM) how_many = if_num.lifn_count; # else how_many = if_num; # endif /* SIOCGLIFNUM */ return 0; -#elif (defined (__unix) || defined (__unix__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING) +#elif (defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING) // Note: DEC CXX doesn't define "unix". BSD compatible OS: HP UX, - // AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of + // SunOS 4.x perform some ioctls to retrieve ifconf list of // ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan // algorithm @@ -1397,7 +1012,7 @@ return 0; break; ++if_count; -# if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) +# if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) ++p_ifs; # else if (p_ifs->ifr_addr.sa_len <= sizeof (struct sockaddr)) @@ -1409,7 +1024,7 @@ return 0; p_ifs = (struct ifreq *) (p_ifs->ifr_addr.sa_len + (caddr_t) &p_ifs->ifr_addr); } -# endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) */ +# endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) */ } #if defined (ACE_HAS_ALLOC_HOOKS) @@ -1442,24 +1057,17 @@ return 0; } // Routine to return a handle from which ioctl() requests can be made. - ACE_HANDLE ACE::get_handle () { - // Solaris 2.x ACE_HANDLE handle = ACE_INVALID_HANDLE; -#if defined (sparc) - handle = ACE_OS::open ("/dev/udp", O_RDONLY); -#elif defined (__unix) || defined (__unix__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS) - // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX, - // AIX, SunOS 4.x - +#if defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) + // Note: DEC CXX doesn't define "unix" BSD compatible OS: SunOS 4.x handle = ACE_OS::socket (PF_INET, SOCK_DGRAM, 0); -#endif /* sparc */ +#endif /* __unux */ return handle; } - #if defined (ACE_HAS_IPV6) static int ip_check (int &ipvn_enabled, int pf) @@ -1471,7 +1079,6 @@ ip_check (int &ipvn_enabled, int pf) if (ipvn_enabled == -1) { - #if defined (ACE_WIN32) static bool recursing = false; if (recursing) return 1; diff --git a/ACE/ace/Stack_Trace.cpp b/ACE/ace/Stack_Trace.cpp index 3cf26a354fd6a..52e994cf47176 100644 --- a/ACE/ace/Stack_Trace.cpp +++ b/ACE/ace/Stack_Trace.cpp @@ -10,9 +10,6 @@ * and is adapted from examples shown in relevant documentation * and repeated elsewhere, e.g., * http://www.linuxselfhelp.com/gnu/glibc/html_chapter/libc_33.html - * - the Solaris stack generation is adapted from a 1995 post on - * comp.unix.solaris by Bart Smaalders, - * http://groups.google.com/group/comp.unix.solaris/browse_thread/thread/8b9f3de8be288f1c/31550f93a48231d5?lnk=gst&q=how+to+get+stack+trace+on+solaris+group:comp.unix.solaris#31550f93a48231d5 * - VxWorks kernel-mode stack tracing is adapted from a code example * in the VxWorks FAQ at http://www.xs4all.nl/~borkhuis/vxworks/vxw_pt5.html * although the undocumented functions it uses are also mentioned in @@ -302,157 +299,6 @@ ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset, pc = prevPc; } } - -#elif defined(sun) -/* - * walks up call stack, printing library:routine+offset for each routine - */ - -# include -# include -# include -# include -# include -# define ACE_STACK_TRACE_BIAS 0 - -# if defined(sparc) || defined(__sparc) -# define ACE_STACK_TRACE_FLUSHWIN() asm("ta 3"); -# define ACE_STACK_TRACE_FRAME_PTR_INDEX 1 -# define ACE_STACK_TRACE_SKIP_FRAMES 0 -# if defined(__sparcv9) -# undef ACE_STACK_TRACE_BIAS -# define ACE_STACK_TRACE_BIAS 2047 -# endif -# endif - -# if defined(i386) || defined(__i386) -# define ACE_STACK_TRACE_FLUSHWIN() -# define ACE_STACK_TRACE_FRAME_PTR_INDEX 3 -# define ACE_STACK_TRACE_SKIP_FRAMES 0 -# endif - -# if defined(__amd64) || defined(__x86_64) -# define ACE_STACK_TRACE_FLUSHWIN() -# define ACE_STACK_TRACE_FRAME_PTR_INDEX 5 -# define ACE_STACK_TRACE_SKIP_FRAMES 0 -# endif - -# if defined(ppc) || defined(__ppc) -# define ACE_STACK_TRACE_FLUSHWIN() -# define ACE_STACK_TRACE_FRAME_PTR_INDEX 0 -# define ACE_STACK_TRACE_SKIP_FRAMES 2 -# endif - -static frame* -cs_frame_adjust(frame* sp) -{ - unsigned char* sp_byte = (unsigned char*)sp; - sp_byte += ACE_STACK_TRACE_BIAS; - return (frame*) sp_byte; -} - -/* - this function walks up call stack, calling user-supplied - function once for each stack frame, passing the pc and the user-supplied - usrarg as the argument. - */ - -static int -cs_operate(int (*func)(void *, void *), void * usrarg, - size_t starting_frame, size_t num_frames_arg) -{ - ACE_STACK_TRACE_FLUSHWIN(); - - jmp_buf env; - setjmp(env); - frame* sp = cs_frame_adjust((frame*) env[ACE_STACK_TRACE_FRAME_PTR_INDEX]); - - // make a copy of num_frames_arg to eliminate the following warning on some - // solaris platforms: - // Stack_Trace.cpp:318: warning: argument `size_t num_frames' might be clobbered by `longjmp' or `vfork' - size_t num_frames = num_frames_arg; - - // I would like to use ACE_MAX below rather than ?:, but - // I get linker relocation errors such as the following when - // I use it: - // ld: fatal: relocation error: file: .shobj/Stack_Trace.o section: - // .rela.debug_line symbol: : relocation against a discarded symbol, - // symbol is part of discarded section: - // .text%const __type_0&ace_max(const __type_0&,const __type_0&) - // - const size_t starting_skip = starting_frame - 1; -#if ACE_STACK_TRACE_SKIP_FRAMES == 0 - size_t skip_frames = starting_skip; -#else - size_t skip_frames = - ACE_STACK_TRACE_SKIP_FRAMES > starting_skip ? - ACE_STACK_TRACE_SKIP_FRAMES : starting_skip; -#endif /* ACE_STACK_TRACE_SKIP_FRAMES == 0 */ - size_t i; - for (i = 0; i < skip_frames && sp; ++i) - { - sp = cs_frame_adjust((frame*) sp->fr_savfp); - } - - i = 0; - - while ( sp - && sp->fr_savpc - && ++i - && --num_frames - && (*func)((void*)sp->fr_savpc, usrarg)) - { - sp = cs_frame_adjust((frame*) sp->fr_savfp); - } - - return(i); -} - -static int -add_frame_to_buf (void* pc, void* usrarg) -{ - char* buf = (char*)usrarg; - Dl_info info; - const char* func = "??"; - const char* lib = "??"; - - if(dladdr(pc, & info) != 0) - { - lib = (const char *) info.dli_fname; - func = (const char *) info.dli_sname; - } - - (void) ACE_OS::snprintf(buf, - ACE_Stack_Trace::SYMBUFSIZ, - "%s%s:%s+0x%x\n", - buf, - lib, - func, - //@@ Should the arithmetic on the following - //line be done with two void* ptrs? The result - //would be ptrdiff_t, and what is the correct - //sprintf() conversion character for that? - (size_t)pc - (size_t)info.dli_saddr); - - return(1); -} - -void -ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset, - size_t num_frames) -{ - const size_t MAX_FRAMES = 128; - const ssize_t INITIAL_FRAME = 3; - - if (num_frames == 0) - num_frames = MAX_FRAMES; - - size_t starting_frame = - determine_starting_frame (INITIAL_FRAME, starting_frame_offset); - - cs_operate (&add_frame_to_buf, &this->buf_[0], starting_frame, num_frames); -} - #elif defined(ACE_WIN64) && (_WIN32_WINNT <= _WIN32_WINNT_WIN2K) # if defined(_MSC_VER) # define STRING2(X) #X @@ -470,8 +316,7 @@ ACE_Stack_Trace::generate_trace (ssize_t, size_t) "ACE is built with _WIN32_WINNT set to 0x501 or above>"); } -#elif defined(ACE_WIN32) && !defined(ACE_HAS_WINCE) && !defined (__MINGW32__) \ - && !defined(__BORLANDC__) +#elif defined(ACE_WIN32) && !defined (__MINGW32__) && !defined(__BORLANDC__) # include # include diff --git a/ACE/ace/Stack_Trace.h b/ACE/ace/Stack_Trace.h index 14cdcc0126b44..476319e22cc1b 100644 --- a/ACE/ace/Stack_Trace.h +++ b/ACE/ace/Stack_Trace.h @@ -52,8 +52,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * - Any platform using glibc as its runtime library, or where ACE_HAS_EXECINFO_H is defined * (this covers Linux and Mac) and gcc version >= 3.3. * - VxWorks, both kernel and RTP - * - Solaris - * - Windows 32 and 64 bit (Visual C++, excluding WinCE/mobile) + * - Windows 32 and 64 bit (Visual C++) * * @note Since stack trace buffer size has limitation(@c ACE_STACK_TRACE_SYMBUFSIZ), you will not * get a complete stack trace if @c ACE_STACK_TRACE_SYMBUFSIZ value is less than actual stack diff --git a/ACE/ace/Stats.h b/ACE/ace/Stats.h index 17ac7127138d7..5aaacb4e3563f 100644 --- a/ACE/ace/Stats.h +++ b/ACE/ace/Stats.h @@ -172,7 +172,7 @@ class ACE_Export ACE_Stats ) const; /// Initialize internal state. - void reset (void); + void reset (); /// Utility division function, for ACE_UINT64 dividend. static void quotient (const ACE_UINT64 dividend, diff --git a/ACE/ace/Stats.inl b/ACE/ace/Stats.inl index f4b85dea15ebe..cd698cb5b788f 100644 --- a/ACE/ace/Stats.inl +++ b/ACE/ace/Stats.inl @@ -63,7 +63,7 @@ ACE_Stats_Value::dump () const } ACE_INLINE -ACE_Stats::ACE_Stats (void) +ACE_Stats::ACE_Stats () { reset (); } diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp index 4afcd1746831b..3ae02a406eb89 100644 --- a/ACE/ace/Strategies_T.cpp +++ b/ACE/ace/Strategies_T.cpp @@ -16,9 +16,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_Errno.h" #include "ace/Svc_Handler.h" -#if defined (ACE_OPENVMS) -# include "ace/Lib_Find.h" -#endif #if !defined (__ACE_INLINE__) #include "ace/Strategies_T.inl" @@ -118,15 +115,8 @@ ACE_DLL_Strategy::make_svc_handler (SVC_HANDLER *&sh) ACE_SHLIB_HANDLE handle = ACE_OS::dlopen (this->dll_name_); // Extract the factory function. -#if defined (ACE_OPENVMS) SVC_HANDLER *(*factory)(void) = - (SVC_HANDLER *(*)(void)) ACE::ldsymbol (handle, - this->factory_function_); -#else - SVC_HANDLER *(*factory)(void) = - (SVC_HANDLER *(*)(void)) ACE_OS::dlsym (handle, - this->factory_function_); -#endif + (SVC_HANDLER *(*)(void)) ACE_OS::dlsym (handle, this->factory_function_); // Call the factory function to obtain the new SVC_Handler (should // use RTTI here when it becomes available...) @@ -865,7 +855,6 @@ ACE_Cached_Connect_Strategy::connect_s found); if (result != 0) return result; - } // If it is a new connection, activate it. @@ -932,7 +921,6 @@ ACE_Cached_Connect_Strategy::connect_s if (result != 0) return result; - } // If it is a new connection, activate it. diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h index 9e46fd5f22836..4b7b7f0051027 100644 --- a/ACE/ace/Strategies_T.h +++ b/ACE/ace/Strategies_T.h @@ -173,7 +173,6 @@ template class ACE_DLL_Strategy : public ACE_Creation_Strategy { public: - // Useful STL-style traits. typedef ACE_Creation_Strategy base_type; @@ -243,7 +242,6 @@ template class ACE_Concurrency_Strategy { public: - // Useful STL-style traits. typedef typename SVC_HANDLER::addr_type addr_type; typedef SVC_HANDLER handler_type; @@ -271,7 +269,6 @@ class ACE_Concurrency_Strategy ACE_ALLOC_HOOK_DECLARE; protected: - /// Flags that are parsed to set options for the connected /// SVC_HANDLER. int flags_; @@ -291,7 +288,6 @@ template class ACE_Reactive_Strategy : public ACE_Concurrency_Strategy { public: - // Useful STL-style traits. typedef ACE_Concurrency_Strategy base_type; @@ -351,7 +347,6 @@ template class ACE_Thread_Strategy : public ACE_Concurrency_Strategy { public: - // Useful STL-style traits. typedef ACE_Concurrency_Strategy base_type; @@ -418,7 +413,6 @@ template class ACE_Process_Strategy : public ACE_Concurrency_Strategy { public: - // Useful STL-style traits. typedef ACE_Concurrency_Strategy base_type; @@ -674,7 +668,6 @@ class ACE_Schedule_All_Reactive_Strategy virtual void dump () const; protected: - /// Reactor ACE_Reactor *reactor_; }; @@ -711,7 +704,6 @@ class ACE_Schedule_All_Threaded_Strategy virtual void dump () const; protected: - /// Thread Manager ACE_Thread_Manager *thr_mgr_; }; @@ -731,7 +723,6 @@ template class ACE_NOOP_Creation_Strategy : public ACE_Creation_Strategy { public: - // Useful STL-style traits. typedef ACE_Creation_Strategy base_type; @@ -755,7 +746,6 @@ class ACE_NOOP_Concurrency_Strategy : public ACE_Concurrency_Strategy { public: - // Useful STL-style traits. typedef ACE_Concurrency_Strategy base_type; @@ -812,7 +802,6 @@ class ACE_Cached_Connect_Strategy public ACE_Connect_Strategy { public: - // Useful STL-style traits. typedef ACE_Creation_Strategy creation_strategy_type; @@ -940,7 +929,6 @@ class ACE_Cached_Connect_Strategy virtual ACE_Concurrency_Strategy *concurrency_strategy () const; protected: - /// Creates a new connection. virtual int new_connection (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, @@ -1044,13 +1032,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Strategies_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Strategies_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp index 31bb58aff0c11..d799bc3bc4da3 100644 --- a/ACE/ace/Stream.cpp +++ b/ACE/ace/Stream.cpp @@ -540,7 +540,7 @@ ACE_Stream::link (ACE_Stream int -ACE_Stream::unlink_i (void) +ACE_Stream::unlink_i () { ACE_TRACE ("ACE_Stream::unlink_i"); @@ -571,7 +571,6 @@ ACE_Stream::unlink_i (void) other_tail = other_tail->next (); other_tail->writer ()->next (this->linked_us_->stream_tail_->writer ()); - } // Make sure the other side is also aware that it's been unlinked! @@ -585,7 +584,7 @@ ACE_Stream::unlink_i (void) } template int -ACE_Stream::unlink (void) +ACE_Stream::unlink () { ACE_TRACE ("ACE_Stream::unlink"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -613,7 +612,7 @@ ACE_Stream::ACE_Stream (void * a, } template -ACE_Stream::~ACE_Stream (void) +ACE_Stream::~ACE_Stream () { ACE_TRACE ("ACE_Stream::~ACE_Stream"); diff --git a/ACE/ace/Stream.h b/ACE/ace/Stream.h index 35fb3645d4c63..09e2f0f333592 100644 --- a/ACE/ace/Stream.h +++ b/ACE/ace/Stream.h @@ -154,7 +154,7 @@ class ACE_Stream void *args); /// Synchronize with the final close of the stream. - virtual int wait (void); + virtual int wait (); /// Dump the state of an object. virtual void dump () const; @@ -190,7 +190,7 @@ class ACE_Stream private: /// Actually perform the unlinking of two Streams (must be called /// with locks held). - int unlink_i (void); + int unlink_i (); /// Actually perform the linking of two Streams (must be called with /// locks held). @@ -224,7 +224,7 @@ class ACE_Stream_Iterator /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); private: /// Next ACE_Module that we haven't yet seen. @@ -237,13 +237,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Stream.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Stream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Stream.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Stream.inl b/ACE/ace/Stream.inl index 325e1f01820af..191b21923f2d2 100644 --- a/ACE/ace/Stream.inl +++ b/ACE/ace/Stream.inl @@ -2,21 +2,21 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_INLINE ACE_Module * -ACE_Stream::head (void) +ACE_Stream::head () { ACE_TRACE ("ACE_Stream::head"); return this->stream_head_; } template ACE_INLINE ACE_Module * -ACE_Stream::tail (void) +ACE_Stream::tail () { ACE_TRACE ("ACE_Stream::tail"); return this->stream_tail_; } template ACE_INLINE int -ACE_Stream::wait (void) +ACE_Stream::wait () { ACE_TRACE ("ACE_Stream::wait"); return this->final_close_.wait (); @@ -38,7 +38,7 @@ ACE_Stream_Iterator::done () const } template int -ACE_Stream_Iterator::advance (void) +ACE_Stream_Iterator::advance () { ACE_TRACE ("ACE_Stream_Iterator::advance"); this->next_ = this->next_->next (); diff --git a/ACE/ace/Stream_Modules.h b/ACE/ace/Stream_Modules.h index e3b12d8e06c0c..f3812e0fa8672 100644 --- a/ACE/ace/Stream_Modules.h +++ b/ACE/ace/Stream_Modules.h @@ -152,13 +152,7 @@ class ACE_Thru_Task : public ACE_Task ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Stream_Modules.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Stream_Modules.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_STREAM_MODULES */ diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h index 8a0ca6d57e800..6231151de7062 100644 --- a/ACE/ace/String_Base.h +++ b/ACE/ace/String_Base.h @@ -876,13 +876,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/String_Base.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/String_Base.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("String_Base.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/String_Base_Const.cpp b/ACE/ace/String_Base_Const.cpp index 12169d66a39dc..b16349b7edfe3 100644 --- a/ACE/ace/String_Base_Const.cpp +++ b/ACE/ace/String_Base_Const.cpp @@ -4,15 +4,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_String_Base_Const::size_type const ACE_String_Base_Const::npos = -#if defined (AIX) //&& (defined (__xlC__) || defined (__IBMCPP__)) - // Under some mixed shared/static linking conditions, this constant - // will not be initialized at run-time if the - // std::numeric_limits<>::max() trait is used on AIX/XLC++. - // Workaround that problem by making it easier for the compiler to - // realize it can set the constant at compile-time. - static_cast (-1); -#else ACE_Numeric_Limits::max (); -#endif /* AIX */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Svc_Conf.h b/ACE/ace/Svc_Conf.h index 7c47a5e5a7e6d..4dc2ed13b8d9a 100644 --- a/ACE/ace/Svc_Conf.h +++ b/ACE/ace/Svc_Conf.h @@ -35,7 +35,7 @@ int ace_yyparse (); #endif #else /* ! YYPARSE_PARAM */ #if defined __STDC__ || defined __cplusplus -int ace_yyparse (void); +int ace_yyparse (); #else int ace_yyparse (); #endif diff --git a/ACE/ace/Svc_Conf_Lexer.cpp b/ACE/ace/Svc_Conf_Lexer.cpp index 321897c584e55..8406c152ef721 100644 --- a/ACE/ace/Svc_Conf_Lexer.cpp +++ b/ACE/ace/Svc_Conf_Lexer.cpp @@ -119,7 +119,6 @@ ace_yylex (YYSTYPE *ace_yylval, void *YYLEX_PARAM) -1)); return ACE_Svc_Conf_Lexer::yylex (ace_yylval, ACE_SVC_CONF_PARAM); - } void diff --git a/ACE/ace/Svc_Conf_Param.h b/ACE/ace/Svc_Conf_Param.h index 4b03076bb5593..18c285a929045 100644 --- a/ACE/ace/Svc_Conf_Param.h +++ b/ACE/ace/Svc_Conf_Param.h @@ -52,7 +52,6 @@ extern void ace_yy_delete_buffer (ace_yy_buffer_state *buffer); class ACE_Svc_Conf_Param { public: - enum SVC_CONF_PARAM_TYPE { /// The lexer will scan a file containing one or more directives. @@ -86,13 +85,12 @@ class ACE_Svc_Conf_Param source.directive = directive; } - ~ACE_Svc_Conf_Param (void) + ~ACE_Svc_Conf_Param () { ace_yy_delete_buffer (this->buffer); } public: - union { /// FILE stream from which directives will be scanned and parsed. @@ -100,7 +98,6 @@ class ACE_Svc_Conf_Param /// String containing directive that will be scanned and parsed. const ACE_TCHAR *directive; - } source; /// Discriminant use to determine which union member to use. diff --git a/ACE/ace/Svc_Conf_Token_Table.h b/ACE/ace/Svc_Conf_Token_Table.h index 78df46db92ed6..7aadffd3ba409 100644 --- a/ACE/ace/Svc_Conf_Token_Table.h +++ b/ACE/ace/Svc_Conf_Token_Table.h @@ -73,7 +73,6 @@ - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; # define ace_yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp index 3ca0d39ae8077..a95c7f2d1fd8e 100644 --- a/ACE/ace/Svc_Conf_y.cpp +++ b/ACE/ace/Svc_Conf_y.cpp @@ -59,7 +59,6 @@ #define YYLSP_NEEDED 0 - /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -100,7 +99,6 @@ - /* Copy the first part of user declarations. */ @@ -173,7 +171,6 @@ typedef int YYSTYPE; #endif - /* Copy the second part of user declarations. */ @@ -884,7 +881,6 @@ int ace_yydebug; #endif - #if YYERROR_VERBOSE # ifndef ace_yystrlen @@ -1121,7 +1117,6 @@ ace_yydestruct (ace_yymsg, ace_yytype, ace_yyvaluep) switch (ace_yytype) { - default: break; } @@ -1138,7 +1133,7 @@ int ace_yyparse (); #endif #else /* ! YYPARSE_PARAM */ #if defined __STDC__ || defined __cplusplus -int ace_yyparse (void); +int ace_yyparse (); #else int ace_yyparse (); #endif @@ -1148,7 +1143,6 @@ int ace_yyparse (); - /*----------. | ace_yyparse. | `----------*/ @@ -1167,7 +1161,7 @@ ace_yyparse (YYPARSE_PARAM) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) int -ace_yyparse (void) +ace_yyparse () #else int ace_yyparse () @@ -1217,7 +1211,6 @@ int ace_yynerrs; YYSTYPE *ace_yyvsp; - #define YYPOPSTACK(N) (ace_yyvsp -= (N), ace_yyssp -= (N)) YYSIZE_T ace_yystacksize = YYINITDEPTH; @@ -1771,7 +1764,6 @@ int ace_yynerrs; } - if (ace_yyerrstatus == 3) { /* If just tried and failed to reuse look-ahead token after an @@ -1914,7 +1906,6 @@ int ace_yynerrs; - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Prints the error string to standard output. Cleans up the error diff --git a/ACE/ace/Svc_Handler.cpp b/ACE/ace/Svc_Handler.cpp index 9d5234f2cc552..0c6a147c824aa 100644 --- a/ACE/ace/Svc_Handler.cpp +++ b/ACE/ace/Svc_Handler.cpp @@ -56,7 +56,7 @@ ACE_Svc_Handler::operator new (size_t n) template void * ACE_Svc_Handler::operator new (size_t n, - const std::nothrow_t&) throw() + const std::nothrow_t&) noexcept { ACE_TRACE ("ACE_Svc_Handler::operator new(nothrow)"); @@ -83,7 +83,7 @@ ACE_Svc_Handler::operator new (size_t n, template void ACE_Svc_Handler::operator delete (void *p, - const std::nothrow_t&) throw() + const std::nothrow_t&) noexcept { ACE_TRACE("ACE_Svc_Handler::operator delete(nothrow)"); ::delete [] static_cast (p); diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h index f4db11ea9a52f..176ab2ba3280c 100644 --- a/ACE/ace/Svc_Handler.h +++ b/ACE/ace/Svc_Handler.h @@ -174,8 +174,8 @@ class ACE_Svc_Handler : public ACE_Task /// is allocated dynamically, which allows it to clean /// itself up correctly whether or not it's allocated statically or /// dynamically. - void *operator new (size_t n, const std::nothrow_t&) throw(); - void operator delete (void *p, const std::nothrow_t&) throw (); + void *operator new (size_t n, const std::nothrow_t&) noexcept; + void operator delete (void *p, const std::nothrow_t&) noexcept; /// This operator permits "placement new" on a per-object basis. void * operator new (size_t n, void *p); @@ -212,7 +212,6 @@ class ACE_Svc_Handler : public ACE_Task void dump () const; public: - // = The following methods are not suppose to be public. // Because friendship is *not* inherited in C++, these methods have @@ -338,13 +337,7 @@ class ACE_Buffered_Svc_Handler : public ACE_Svc_Handlerso_opt_req.opt.maxlen = sizeof (opthdr) + sizeof (long); - ACE_NEW (this->so_opt_req.opt.buf, - char[this->so_opt_req.opt.maxlen]); - - this->so_opt_ret.opt.maxlen = sizeof (opthdr) + sizeof (long); - ACE_NEW (this->so_opt_ret.opt.buf, - char[this->so_opt_ret.opt.maxlen]); - - if (this->so_opt_ret.opt.buf == 0) - { - delete [] this->so_opt_req.opt.buf; - this->so_opt_req.opt.buf = 0; - } -#endif /* ACE_HAS_SVR4_TLI */ } ACE_HANDLE @@ -62,18 +43,9 @@ ACE_TLI::open (const char device[], int oflag, struct t_info *info) return this->get_handle (); } -ACE_TLI::~ACE_TLI (void) +ACE_TLI::~ACE_TLI () { ACE_TRACE ("ACE_TLI::~ACE_TLI"); -#if defined (ACE_HAS_SVR4_TLI) - if (this->so_opt_req.opt.buf) - { - delete [] this->so_opt_req.opt.buf; - delete [] this->so_opt_ret.opt.buf; - this->so_opt_req.opt.buf = 0; - this->so_opt_ret.opt.buf = 0; - } -#endif /* ACE_HAS_SVR4_TLI */ } ACE_TLI::ACE_TLI (const char device[], int oflag, struct t_info *info) @@ -101,7 +73,7 @@ ACE_TLI::get_local_addr (ACE_Addr &sa) const } int -ACE_TLI::close (void) +ACE_TLI::close () { ACE_TRACE ("ACE_TLI::close"); int result = 0; // Geisler: result must be int @@ -147,39 +119,13 @@ ACE_TLI::set_option (int level, int option, void *optval, int optlen) opthdr->len = req.opt.len; // We only request one option at a time. ACE_OS::memcpy (&opthdr[1], optval, optlen); return ACE_OS::t_optmgmt (this->get_handle (), &req, &ret); - -#elif defined (ACE_HAS_SVR4_TLI) - struct opthdr *opthdr = 0; /* See for info on this format */ - - this->so_opt_req.flags = T_NEGOTIATE; - this->so_opt_req.opt.len = sizeof *opthdr + OPTLEN (optlen); - - if (this->so_opt_req.opt.len > this->so_opt_req.opt.maxlen) - { -# if !defined (ACE_HAS_SET_T_ERRNO) - t_errno = TBUFOVFLW; -# else - set_t_errno (TBUFOVFLW); -# endif /* ACE_HAS_SET_T_ERRNO */ - return -1; - } - - opthdr = reinterpret_cast (this->so_opt_req.opt.buf); - opthdr->level = level; - opthdr->name = option; - opthdr->len = OPTLEN (optlen); - ACE_OS::memcpy (OPTVAL (opthdr), optval, optlen); - - return ACE_OS::t_optmgmt (this->get_handle (), - &this->so_opt_req, - &this->so_opt_ret); #else ACE_UNUSED_ARG (level); ACE_UNUSED_ARG (option); ACE_UNUSED_ARG (optval); ACE_UNUSED_ARG (optlen); return -1; -#endif /* ACE_HAS_XTI, else ACE_HAS_SVR4_TLI */ +#endif /* ACE_HAS_XTI */ } int @@ -226,41 +172,13 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen) return 0; } } - -#elif defined (ACE_HAS_SVR4_TLI) - struct opthdr *opthdr = 0; /* See for details on this format */ - - this->so_opt_req.flags = T_CHECK; - this->so_opt_ret.opt.len = sizeof *opthdr + OPTLEN (optlen); - - if (this->so_opt_ret.opt.len > this->so_opt_ret.opt.maxlen) - { -#if !defined (ACE_HAS_SET_T_ERRNO) - t_errno = TBUFOVFLW; -#else - set_t_errno (TBUFOVFLW); -#endif /* ACE_HAS_SET_T_ERRNO */ - return -1; - } - - opthdr = (struct opthdr *) this->so_opt_req.opt.buf; - opthdr->level = level; - opthdr->name = option; - opthdr->len = OPTLEN (optlen); - if (ACE_OS::t_optmgmt (this->get_handle (), &this->so_opt_req, &this->so_opt_ret) == -1) - return -1; - else - { - ACE_OS::memcpy (optval, OPTVAL (opthdr), optlen); - return 0; - } #else ACE_UNUSED_ARG (level); ACE_UNUSED_ARG (option); ACE_UNUSED_ARG (optval); ACE_UNUSED_ARG (optlen); return -1; -#endif /* ACE_HAS_SVR4_TLI */ +#endif /* ACE_HAS_XTI */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/TLI.h b/ACE/ace/TLI.h index bfa0e19584c89..006b3a95a5156 100644 --- a/ACE/ace/TLI.h +++ b/ACE/ace/TLI.h @@ -93,13 +93,6 @@ class ACE_Export ACE_TLI : public ACE_IPC_SAP /// Initialize a TLI endpoint. ACE_TLI (const char device[], int oflag = O_RDWR, struct t_info *info = 0); - -private: -#if defined (ACE_HAS_SVR4_TLI) - // XTI/TLI option management. - struct t_optmgmt so_opt_req; - struct t_optmgmt so_opt_ret; -#endif /* ACE_HAS_SVR4_TLI */ }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/TLI_Acceptor.cpp b/ACE/ace/TLI_Acceptor.cpp index d46865728b62d..1075346b0d4b3 100644 --- a/ACE/ace/TLI_Acceptor.cpp +++ b/ACE/ace/TLI_Acceptor.cpp @@ -24,7 +24,7 @@ class ACE_TLI_Request_Queue ACE_TLI_Request_Queue (); ACE_HANDLE open (ACE_HANDLE fd, int size); - int close (void); + int close (); int enqueue (const char device[], bool restart, int rwflag); int dequeue (ACE_TLI_Request *&ptr); @@ -88,7 +88,7 @@ ACE_TLI_Request_Queue::free (ACE_TLI_Request *node) // Remove a node from the free list stack. ACE_TLI_Request * -ACE_TLI_Request_Queue::alloc (void) +ACE_TLI_Request_Queue::alloc () { ACE_TRACE ("ACE_TLI_Request_Queue::alloc"); ACE_TLI_Request *temp = this->free_list_; @@ -106,7 +106,7 @@ ACE_TLI_Acceptor::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_TLI_Acceptor::ACE_TLI_Acceptor (void) +ACE_TLI_Acceptor::ACE_TLI_Acceptor () : queue_ (0) { ACE_TRACE ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"); @@ -168,7 +168,7 @@ open_new_endpoint (ACE_HANDLE listen_handle, // Close down the acceptor and release resources. int -ACE_TLI_Request_Queue::close (void) +ACE_TLI_Request_Queue::close () { ACE_TRACE ("ACE_TLI_Request_Queue::close"); int res = 0; @@ -219,7 +219,7 @@ ACE_TLI_Request_Queue::open (ACE_HANDLE f, int sz) return 0; } -ACE_TLI_Request_Queue::ACE_TLI_Request_Queue (void) +ACE_TLI_Request_Queue::ACE_TLI_Request_Queue () : size_ (0), current_count_ (0), base_ (0), @@ -402,7 +402,7 @@ ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap, } int -ACE_TLI_Acceptor::close (void) +ACE_TLI_Acceptor::close () { ACE_TRACE ("ACE_TLI_Acceptor::close"); if (this->device_ != 0) diff --git a/ACE/ace/TLI_Connector.cpp b/ACE/ace/TLI_Connector.cpp index 60fb793a9bcf3..5a8fe11bd0cbe 100644 --- a/ACE/ace/TLI_Connector.cpp +++ b/ACE/ace/TLI_Connector.cpp @@ -23,7 +23,7 @@ ACE_TLI_Connector::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_TLI_Connector::ACE_TLI_Connector (void) +ACE_TLI_Connector::ACE_TLI_Connector () { ACE_TRACE ("ACE_TLI_Connector::ACE_TLI_Connector"); } @@ -221,7 +221,7 @@ ACE_TLI_Connector::complete (ACE_TLI_Stream &new_stream, { if (remote_sap != 0) { -#if defined (ACE_HAS_XTI) || defined (ACE_HAS_SVR4_TLI) +#if defined (ACE_HAS_XTI) struct netbuf name; name.maxlen = remote_sap->get_size (); @@ -230,9 +230,9 @@ ACE_TLI_Connector::complete (ACE_TLI_Stream &new_stream, if (ACE_OS::t_getname (new_stream.get_handle (), &name, REMOTENAME) == -1) -#else /* SunOS4 */ +#else /* ACE_HAS_XTI */ if (0) -#endif /* ACE_HAS_XTI || ACE_HAS_SVR4_TLI */ +#endif /* ACE_HAS_XTI */ { new_stream.close (); return -1; diff --git a/ACE/ace/TLI_Connector.h b/ACE/ace/TLI_Connector.h index 3b2a99e09a348..4ad528ce2f89e 100644 --- a/ACE/ace/TLI_Connector.h +++ b/ACE/ace/TLI_Connector.h @@ -33,7 +33,7 @@ class ACE_Export ACE_TLI_Connector { public: /// Default constructor. - ACE_TLI_Connector (void); + ACE_TLI_Connector (); /** * Actively connect and produce a if things go well. diff --git a/ACE/ace/TLI_Stream.cpp b/ACE/ace/TLI_Stream.cpp index 34e5ab2ae807f..9acc4a0a1fef6 100644 --- a/ACE/ace/TLI_Stream.cpp +++ b/ACE/ace/TLI_Stream.cpp @@ -23,7 +23,7 @@ ACE_TLI_Stream::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_TLI_Stream::ACE_TLI_Stream (void) +ACE_TLI_Stream::ACE_TLI_Stream () : rwflag_ (0) { ACE_TRACE ("ACE_TLI_Stream::ACE_TLI_Stream"); @@ -47,7 +47,7 @@ ACE_TLI_Stream::get_remote_addr (ACE_Addr &sa) const // Send a release and then await the release from the other side. int -ACE_TLI_Stream::active_close (void) +ACE_TLI_Stream::active_close () { ACE_TRACE ("ACE_TLI_Stream::active_close"); char buf; @@ -72,7 +72,7 @@ ACE_TLI_Stream::active_close (void) // release to the other side. int -ACE_TLI_Stream::passive_close (void) +ACE_TLI_Stream::passive_close () { ACE_TRACE ("ACE_TLI_Stream::passive_close"); @@ -85,7 +85,7 @@ ACE_TLI_Stream::passive_close (void) } int -ACE_TLI_Stream::close (void) +ACE_TLI_Stream::close () { ACE_TRACE ("ACE_TLI_Stream::close"); diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp index 724094bb23aaf..4811e28289e63 100644 --- a/ACE/ace/TP_Reactor.cpp +++ b/ACE/ace/TP_Reactor.cpp @@ -366,7 +366,6 @@ int ACE_TP_Reactor::handle_socket_events (int &event_count, ACE_TP_Token_Guard &guard) { - // We got the lock, lets handle some I/O events. ACE_EH_Dispatch_Info dispatch_info; diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h index 3bf1e09a5c61f..24e0f3209c97f 100644 --- a/ACE/ace/TP_Reactor.h +++ b/ACE/ace/TP_Reactor.h @@ -47,7 +47,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_EH_Dispatch_Info { public: - ACE_EH_Dispatch_Info (void); + ACE_EH_Dispatch_Info (); void set (ACE_HANDLE handle, ACE_Event_Handler *event_handler, @@ -87,20 +87,19 @@ class ACE_EH_Dispatch_Info class ACE_TP_Token_Guard { public: - /// Constructor that will grab the token for us ACE_TP_Token_Guard (ACE_Select_Reactor_Token &token); /// Destructor. This will release the token if it hasnt been /// released till this point - ~ACE_TP_Token_Guard (void); + ~ACE_TP_Token_Guard (); /// Release the token .. - void release_token (void); + void release_token (); /// Returns whether the thread that created this object ownes the /// token or not. - bool is_owner (void); + bool is_owner (); /// A helper method that grabs the token for us, after which the /// thread that owns that can do some actual work. @@ -122,7 +121,6 @@ class ACE_TP_Token_Guard ACE_TP_Token_Guard &operator= (ACE_TP_Token_Guard &&) = delete; private: - /// The Select Reactor token. ACE_Select_Reactor_Token &token_; @@ -172,7 +170,6 @@ class ACE_TP_Token_Guard class ACE_Export ACE_TP_Reactor : public ACE_Select_Reactor { public: - /// Initialize ACE_TP_Reactor with the default size. ACE_TP_Reactor (ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, @@ -219,7 +216,7 @@ class ACE_Export ACE_TP_Reactor : public ACE_Select_Reactor /// its own ie. can it pass on the control of handle resumption to /// the application. The TP reactor has can allow applications to /// resume handles. So return a positive value. - virtual int resumable_handler (void); + virtual int resumable_handler (); /// Called from handle events static void no_op_sleep_hook (void *); @@ -282,10 +279,9 @@ class ACE_Export ACE_TP_Reactor : public ACE_Select_Reactor ACE_Event_Handler *eh, ACE_EH_PTMF callback); private: - /// Get the handle of the notify pipe from the ready set if there is /// an event in the notify pipe. - ACE_HANDLE get_notify_handle (void); + ACE_HANDLE get_notify_handle (); /// Get socket event dispatch information. int get_socket_event_info (ACE_EH_Dispatch_Info &info); diff --git a/ACE/ace/TP_Reactor.inl b/ACE/ace/TP_Reactor.inl index 1660925ee3c97..8dae8f01f768f 100644 --- a/ACE/ace/TP_Reactor.inl +++ b/ACE/ace/TP_Reactor.inl @@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /************************************************************************/ ACE_INLINE -ACE_EH_Dispatch_Info::ACE_EH_Dispatch_Info (void) : +ACE_EH_Dispatch_Info::ACE_EH_Dispatch_Info () : handle_ (ACE_INVALID_HANDLE), event_handler_ (0), mask_ (ACE_Event_Handler::NULL_MASK), @@ -58,7 +58,7 @@ ACE_TP_Token_Guard::ACE_TP_Token_Guard (ACE_Select_Reactor_Token &token) } ACE_INLINE -ACE_TP_Token_Guard::~ACE_TP_Token_Guard (void) +ACE_TP_Token_Guard::~ACE_TP_Token_Guard () { if (this->owner_) { @@ -68,7 +68,7 @@ ACE_TP_Token_Guard::~ACE_TP_Token_Guard (void) } ACE_INLINE void -ACE_TP_Token_Guard::release_token (void) +ACE_TP_Token_Guard::release_token () { if (this->owner_) { @@ -80,7 +80,7 @@ ACE_TP_Token_Guard::release_token (void) } ACE_INLINE bool -ACE_TP_Token_Guard::is_owner (void) +ACE_TP_Token_Guard::is_owner () { return this->owner_; } diff --git a/ACE/ace/TSS_Adapter.h b/ACE/ace/TSS_Adapter.h index f5dbc99fd0f82..b1a35bc48ef52 100644 --- a/ACE/ace/TSS_Adapter.h +++ b/ACE/ace/TSS_Adapter.h @@ -44,7 +44,6 @@ class ACE_Export ACE_TSS_Adapter ACE_ALLOC_HOOK_DECLARE; //private: - /// The real TS object. void * const ts_obj_; diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp index 9d3444c079341..c483d468db34c 100644 --- a/ACE/ace/TSS_T.cpp +++ b/ACE/ace/TSS_T.cpp @@ -156,15 +156,10 @@ ACE_TSS::ACE_TSS (TYPE *ts_obj) // Save/restore errno. ACE_Errno_Guard error (errno); // What should we do if this call fails?! -#if defined (ACE_HAS_WINCE) - ::MessageBox (0, - ACE_TEXT ("ACE_Thread::keycreate() failed!"), - ACE_TEXT ("ACE_TSS::ACE_TSS"), - MB_OK); -#elif !defined (ACE_LACKS_VA_FUNCTIONS) +#if !defined (ACE_LACKS_VA_FUNCTIONS) ACE_OS::fprintf (stderr, "ACE_Thread::keycreate() failed!"); -#endif /* ACE_HAS_WINCE */ +#endif /* !ACE_LACKS_VA_FUNCTIONS */ return; } diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h index a0f8ee3245104..af13d17b733ce 100644 --- a/ACE/ace/TSS_T.h +++ b/ACE/ace/TSS_T.h @@ -252,13 +252,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/TSS_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/TSS_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("TSS_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TSS_T_H */ diff --git a/ACE/ace/TSS_T.inl b/ACE/ace/TSS_T.inl index 69fb08e28c940..73fda8a79ccaa 100644 --- a/ACE/ace/TSS_T.inl +++ b/ACE/ace/TSS_T.inl @@ -13,7 +13,7 @@ ACE_TSS::ACE_TSS (TYPE *type) } template ACE_INLINE int -ACE_TSS::ts_init (void) +ACE_TSS::ts_init () { return 0; } diff --git a/ACE/ace/TTY_IO.cpp b/ACE/ace/TTY_IO.cpp index e18f5e6d10710..f94aa9e98c53d 100644 --- a/ACE/ace/TTY_IO.cpp +++ b/ACE/ace/TTY_IO.cpp @@ -724,11 +724,4 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const #endif /* ACE_HAS_TERMIOS || ACE_HAS_TERMIO */ } -#if defined (ACE_NEEDS_DEV_IO_CONVERSION) -ACE_TTY_IO::operator ACE_DEV_IO &() -{ - return static_cast(*this); -} -#endif /* ACE_NEEDS_DEV_IO_CONVERSION */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/TTY_IO.h b/ACE/ace/TTY_IO.h index 323e310f78cf9..45ea6601b2d37 100644 --- a/ACE/ace/TTY_IO.h +++ b/ACE/ace/TTY_IO.h @@ -104,11 +104,6 @@ class ACE_Export ACE_TTY_IO : public ACE_DEV_IO /** Interface for reading/writing serial device parameters. */ int control (Control_Mode cmd, Serial_Params *arg) const; - -#if defined (ACE_NEEDS_DEV_IO_CONVERSION) - /** This is necessary to pass ACE_TTY_IO as parameter to DEV_Connector. */ - operator ACE_DEV_IO &(); -#endif /* ACE_NEEDS_DEV_IO_CONVERSION */ }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Task_Ex_T.cpp b/ACE/ace/Task_Ex_T.cpp index 8f48df6775c90..f770aff028f58 100644 --- a/ACE/ace/Task_Ex_T.cpp +++ b/ACE/ace/Task_Ex_T.cpp @@ -69,7 +69,7 @@ ACE_Task_Ex::ACE_Task_Ex (ACE_Thre } template -ACE_Task_Ex::~ACE_Task_Ex (void) +ACE_Task_Ex::~ACE_Task_Ex () { ACE_TRACE ("ACE_Task_Ex::~ACE_Task_Ex"); if (this->delete_msg_queue_) @@ -81,7 +81,7 @@ ACE_Task_Ex::~ACE_Task_Ex (void) } template ACE_Task * -ACE_Task_Ex::sibling (void) +ACE_Task_Ex::sibling () { ACE_TRACE ("ACE_Task_Ex::sibling"); /// @todo FIXME Need to impl ACE_Moudle to support ACE_Task as well. diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h index 905090dee5c43..744bbff9122da 100644 --- a/ACE/ace/Task_Ex_T.h +++ b/ACE/ace/Task_Ex_T.h @@ -75,10 +75,10 @@ class ACE_Task_Ex : public ACE_Task_Base, MESSAGE_QUEUE_EX *mq = 0); /// Destructor. - virtual ~ACE_Task_Ex (void); + virtual ~ACE_Task_Ex (); /// Gets the message queue associated with this task. - MESSAGE_QUEUE_EX *msg_queue (void); + MESSAGE_QUEUE_EX *msg_queue (); /// Sets the message queue associated with this task. void msg_queue (MESSAGE_QUEUE_EX *); @@ -131,13 +131,13 @@ class ACE_Task_Ex : public ACE_Task_Base, // = Pointers to next ACE_Task_Base (if ACE is part of an ACE_Stream). /// Get next Task pointer. - ACE_Task *next (void); + ACE_Task *next (); /// Set next Task pointer. void next (ACE_Task *); /// Alwasy return 0. @todo FIXME - ACE_Task *sibling (void); + ACE_Task *sibling (); /// Return the Task's Module if there is one, else returns 0. ACE_Module *module () const; @@ -180,13 +180,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Task_Ex_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Task_Ex_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Task_Ex_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TASK_EX_H */ diff --git a/ACE/ace/Task_Ex_T.inl b/ACE/ace/Task_Ex_T.inl index a5132305649bf..0571d5df8b096 100644 --- a/ACE/ace/Task_Ex_T.inl +++ b/ACE/ace/Task_Ex_T.inl @@ -56,7 +56,7 @@ ACE_Task_Ex::msg_queue (ACE_Message } template ACE_Message_Queue_Ex * -ACE_Task_Ex::msg_queue (void) +ACE_Task_Ex::msg_queue () { ACE_TRACE ("ACE_Task_Ex::msg_queue"); return this->msg_queue_; @@ -72,7 +72,7 @@ ACE_Task_Ex::reply (ACE_MESSAGE_TYP } template ACE_INLINE ACE_Task * -ACE_Task_Ex::next (void) +ACE_Task_Ex::next () { ACE_TRACE ("ACE_Task_Ex::next"); return this->next_; diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h index 013fba49c356d..701b96b88e606 100644 --- a/ACE/ace/Task_T.h +++ b/ACE/ace/Task_T.h @@ -183,13 +183,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Task_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Task_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Task_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TASK_T_H */ diff --git a/ACE/ace/Test_and_Set.h b/ACE/ace/Test_and_Set.h index 69a32502bbe64..c174ca3d4dae9 100644 --- a/ACE/ace/Test_and_Set.h +++ b/ACE/ace/Test_and_Set.h @@ -57,13 +57,7 @@ class ACE_Test_and_Set : public ACE_Event_Handler ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Test_and_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Test_and_Set.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TEST_AND_SET_H */ diff --git a/ACE/ace/Thread.h b/ACE/ace/Thread.h index 67a190dcc4164..6e79266bb1cce 100644 --- a/ACE/ace/Thread.h +++ b/ACE/ace/Thread.h @@ -40,7 +40,7 @@ struct cancel_state * @brief Provides a wrapper for threads. * * This class provides a common interface that is mapped onto - * POSIX Pthreads, Solaris threads, Win32 threads, VxWorks + * POSIX Pthreads, Win32 threads, VxWorks * threads, or pSoS threads. Note, however, that it is * generally a better idea to use the ACE_Thread_Manager * programming API rather than the API since the @@ -152,7 +152,6 @@ class ACE_Export ACE_Thread * If @a thread_id is 0, join() waits for any * undetached thread in the process to terminate * on platforms that support this capability - * (for example, Solaris). * @param departed points to a location that is set to the ID of the * terminated thread if join() returns successfully. * If @a departed is 0, it is ignored. diff --git a/ACE/ace/Thread_Adapter.cpp b/ACE/ace/Thread_Adapter.cpp index ec43c7bc2d992..d72d0d2d010fa 100644 --- a/ACE/ace/Thread_Adapter.cpp +++ b/ACE/ace/Thread_Adapter.cpp @@ -112,22 +112,6 @@ ACE_Thread_Adapter::invoke_i () // not to access anywhere below this point. delete this; -#if defined (ACE_NEEDS_LWP_PRIO_SET) - // On SunOS, the LWP priority needs to be set in order to get - // preemption when running in the RT class. This is the ACE way to - // do that . . . - ACE_hthread_t thr_handle; - ACE_OS::thr_self (thr_handle); - int prio; - - // thr_getprio () on the current thread should never fail. - ACE_OS::thr_getprio (thr_handle, prio); - - // ACE_OS::thr_setprio () has the special logic to set the LWP priority, - // if running in the RT class. - ACE_OS::thr_setprio (prio); - -#endif /* ACE_NEEDS_LWP_PRIO_SET */ if (cancel_flags != 0) { // If both flags are set, ignore this. diff --git a/ACE/ace/Thread_Exit.h b/ACE/ace/Thread_Exit.h index daebbb4fe3922..0f6459c37a46b 100644 --- a/ACE/ace/Thread_Exit.h +++ b/ACE/ace/Thread_Exit.h @@ -101,7 +101,6 @@ class ACE_Export ACE_Thread_Exit_Maybe private: /// Holds the underlying instance. ACE_Thread_Exit *instance_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Thread_Hook.h b/ACE/ace/Thread_Hook.h index dcb6d396eab09..0d342a3f43a2e 100644 --- a/ACE/ace/Thread_Hook.h +++ b/ACE/ace/Thread_Hook.h @@ -33,10 +33,10 @@ class ACE_Export ACE_Thread_Hook { public: /// Default constructor - ACE_Thread_Hook (void); + ACE_Thread_Hook (); /// Destructor. - virtual ~ACE_Thread_Hook (void); + virtual ~ACE_Thread_Hook (); /** * This method can be overridden in a subclass to customize this @@ -54,7 +54,7 @@ class ACE_Export ACE_Thread_Hook static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *hook); /// Returns the current system thread hook. - static ACE_Thread_Hook *thread_hook (void); + static ACE_Thread_Hook *thread_hook (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp index 6b58fa5693e9f..7347fbd1f10b8 100644 --- a/ACE/ace/Thread_Manager.cpp +++ b/ACE/ace/Thread_Manager.cpp @@ -653,8 +653,6 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, #if defined (ACE_HAS_WTHREADS) // Have to duplicate handle if client asks for it. - // @@ How are thread handles implemented on AIX? Do they - // also need to be duplicated? if (t_handle != 0) # if defined (ACE_LACKS_DUPLICATEHANDLE) *t_handle = thr_handle; diff --git a/ACE/ace/Thread_Manager.h b/ACE/ace/Thread_Manager.h index 228b27711eb8d..f57405f1fc486 100644 --- a/ACE/ace/Thread_Manager.h +++ b/ACE/ace/Thread_Manager.h @@ -164,7 +164,6 @@ class ACE_Export ACE_At_Thread_Exit_Func : public ACE_At_Thread_Exit */ class ACE_Export ACE_Thread_Descriptor_Base : public ACE_OS_Thread_Descriptor { - friend class ACE_Thread_Manager; friend class ACE_Double_Linked_List; friend class ACE_Double_Linked_List_Iterator_Base; @@ -203,7 +202,7 @@ class ACE_Export ACE_Thread_Descriptor_Base : public ACE_OS_Thread_Descriptor /// Unique thread ID. ACE_thread_t thr_id_; - /// Unique handle to thread (used by Win32 and AIX). + /// Unique handle to thread (used by Win32). ACE_hthread_t thr_handle_; /// Group ID. @@ -241,7 +240,7 @@ class ACE_Export ACE_Thread_Descriptor : public ACE_Thread_Descriptor_Base /// Unique thread id. ACE_thread_t self () const; - /// Unique handle to thread (used by Win32 and AIX). + /// Unique handle to thread (used by Win32). void self (ACE_hthread_t &); /// Dump the state of an object. @@ -782,7 +781,6 @@ class ACE_Export ACE_Thread_Manager * does not support these functions. */ //@{ - /// Suspend all threads int suspend_all (); diff --git a/ACE/ace/Thread_Manager.inl b/ACE/ace/Thread_Manager.inl index c6c93f270ee51..386e7f677117e 100644 --- a/ACE/ace/Thread_Manager.inl +++ b/ACE/ace/Thread_Manager.inl @@ -162,7 +162,7 @@ ACE_INLINE ACE_Thread_Descriptor * ACE_Thread_Descriptor::get_next () const { ACE_TRACE ("ACE_Thread_Descriptor::get_next"); - return static_cast (this->next_); + return static_cast (this->next_); } // Reset this thread descriptor diff --git a/ACE/ace/Thread_Mutex.h b/ACE/ace/Thread_Mutex.h index 3793c5654ed9c..54292b630c204 100644 --- a/ACE/ace/Thread_Mutex.h +++ b/ACE/ace/Thread_Mutex.h @@ -38,7 +38,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * in the same process. It maps to s on NT * and with set to on UNIX. * ACE_Thread_Mutex is recursive on some platforms (like - * Win32). However, on most platforms (like Solaris) it is not + * Win32). However, on most platforms it is not * recursive. To be totally safe and portable, developers * should use ACE_Recursive_Thread_Mutex when they need a * recursive mutex. diff --git a/ACE/ace/Time_Policy_T.h b/ACE/ace/Time_Policy_T.h index 85d0dde6aeca2..de54653af13fb 100644 --- a/ACE/ace/Time_Policy_T.h +++ b/ACE/ace/Time_Policy_T.h @@ -62,13 +62,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Time_Policy_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Time_Policy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Time_Policy_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* ACE_TIME_POLICY_T_H */ diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index 292c5a5d31028..05502cba19ac2 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -48,7 +48,7 @@ ACE_Time_Value::operator ++ (int) ACE_Time_Value & ACE_Time_Value::operator ++ () { - // ACE_OS_TRACE ("ACE_Time_Value::operator ++ (void)"); + // ACE_OS_TRACE ("ACE_Time_Value::operator ++ ()"); this->usec (this->usec () + 1); this->normalize (); return *this; @@ -68,7 +68,7 @@ ACE_Time_Value::operator -- (int) ACE_Time_Value & ACE_Time_Value::operator -- () { - // ACE_OS_TRACE ("ACE_Time_Value::operator -- (void)"); + // ACE_OS_TRACE ("ACE_Time_Value::operator -- ()"); this->usec (this->usec () - 1); this->normalize (); return *this; diff --git a/ACE/ace/Time_Value_T.h b/ACE/ace/Time_Value_T.h index c6f9a55b87a00..32b32df3d41fd 100644 --- a/ACE/ace/Time_Value_T.h +++ b/ACE/ace/Time_Value_T.h @@ -178,13 +178,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Time_Value_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Time_Value_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Time_Value_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIME_VALUE_T_H */ diff --git a/ACE/ace/Timeprobe_T.cpp b/ACE/ace/Timeprobe_T.cpp index a88eb00bba47a..a89375d753af0 100644 --- a/ACE/ace/Timeprobe_T.cpp +++ b/ACE/ace/Timeprobe_T.cpp @@ -33,7 +33,6 @@ ACE_Timeprobe_Ex::ACE_Timeprobe_Ex (u_long size) this->max_size_); //FUZZ: enable check_for_lack_ACE_OS this->timeprobes_ = temp; - } template @@ -56,7 +55,6 @@ ACE_Timeprobe_Ex (ALLOCATOR *allocator, this->max_size_); //FUZZ: enable check_for_lack_ACE_OS this->timeprobes_ = temp; - } template @@ -72,7 +70,7 @@ ACE_Timeprobe_Ex::ACE_Timeprobe_Ex (const ACE_Timeprobe_Ex< } template -ACE_Timeprobe_Ex::~ACE_Timeprobe_Ex (void) +ACE_Timeprobe_Ex::~ACE_Timeprobe_Ex () { ACE_DES_ARRAY_FREE ((ACE_timeprobe_t *) (this->timeprobes_), this->max_size_, @@ -129,7 +127,7 @@ ACE_Timeprobe_Ex::timeprobe (const char *event) } template void -ACE_Timeprobe_Ex::reset (void) +ACE_Timeprobe_Ex::reset () { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); @@ -174,37 +172,37 @@ ACE_Timeprobe_Ex::increase_size (u_long size) } template ACE_Unbounded_Set & -ACE_Timeprobe_Ex::event_descriptions (void) +ACE_Timeprobe_Ex::event_descriptions () { return this->event_descriptions_; } template ACE_Unbounded_Set & -ACE_Timeprobe_Ex::sorted_event_descriptions (void) +ACE_Timeprobe_Ex::sorted_event_descriptions () { return this->sorted_event_descriptions_; } template ACE_timeprobe_t * -ACE_Timeprobe_Ex::timeprobes (void) +ACE_Timeprobe_Ex::timeprobes () { return this->timeprobes_; } template ACE_LOCK & -ACE_Timeprobe_Ex::lock (void) +ACE_Timeprobe_Ex::lock () { return this->lock_; } template u_long -ACE_Timeprobe_Ex::max_size (void) +ACE_Timeprobe_Ex::max_size () { return this->max_size_; } template u_long -ACE_Timeprobe_Ex::current_size (void) +ACE_Timeprobe_Ex::current_size () { return this->current_size_; } @@ -225,7 +223,7 @@ ACE_Timeprobe_Ex::event_descriptions (const char **descript } template void -ACE_Timeprobe_Ex::print_times (void) +ACE_Timeprobe_Ex::print_times () { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); @@ -311,7 +309,7 @@ ACE_Timeprobe_Ex::print_times (void) } template void -ACE_Timeprobe_Ex::print_absolute_times (void) +ACE_Timeprobe_Ex::print_absolute_times () { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); @@ -377,7 +375,7 @@ ACE_Timeprobe_Ex::find_description_i (u_long i) } template void -ACE_Timeprobe_Ex::sort_event_descriptions_i (void) +ACE_Timeprobe_Ex::sort_event_descriptions_i () { size_t total_elements = this->event_descriptions_.size (); @@ -400,7 +398,7 @@ ACE_Timeprobe_Ex::sort_event_descriptions_i (void) } template ALLOCATOR * -ACE_Timeprobe_Ex::allocator (void) +ACE_Timeprobe_Ex::allocator () { return allocator_ ? allocator_ : ACE_Singleton::instance (); } @@ -415,7 +413,7 @@ ACE_Function_Timeprobe::ACE_Function_Timeprobe (Timeprobe &timeprobe, } template -ACE_Function_Timeprobe::~ACE_Function_Timeprobe (void) +ACE_Function_Timeprobe::~ACE_Function_Timeprobe () { this->timeprobe_.timeprobe (this->event_ + 1); } diff --git a/ACE/ace/Timeprobe_T.h b/ACE/ace/Timeprobe_T.h index 0512060af6faa..883c9e19e0dcf 100644 --- a/ACE/ace/Timeprobe_T.h +++ b/ACE/ace/Timeprobe_T.h @@ -59,7 +59,6 @@ template class ACE_Timeprobe_Ex { public: - /// Self typedef ACE_Timeprobe_Ex SELF; @@ -81,7 +80,7 @@ class ACE_Timeprobe_Ex ACE_Timeprobe_Ex (ALLOCATOR *allocator, u_long size = ACE_DEFAULT_TIMEPROBE_TABLE_SIZE); /// Destructor. - ~ACE_Timeprobe_Ex (void); + ~ACE_Timeprobe_Ex (); /// Record a time. @a event is used to describe this time probe. void timeprobe (u_long event); @@ -94,13 +93,13 @@ class ACE_Timeprobe_Ex u_long minimum_id); /// Print the time probes. - void print_times (void); + void print_times (); /// Print the time probes. - void print_absolute_times (void); + void print_absolute_times (); /// Reset the slots. All old time probes will be lost. - void reset (void); + void reset (); void increase_size (u_long size); @@ -110,34 +109,33 @@ class ACE_Timeprobe_Ex // = (Somewhat private) Accessors /// Event Descriptions - ACE_Unbounded_Set &event_descriptions (void); + ACE_Unbounded_Set &event_descriptions (); /// Sorted Event Descriptions. - ACE_Unbounded_Set &sorted_event_descriptions (void); + ACE_Unbounded_Set &sorted_event_descriptions (); /// Find description of event @a i const char *find_description_i (u_long i); /// Sort event descriptions - void sort_event_descriptions_i (void); + void sort_event_descriptions_i (); /// Time probe slots - ACE_timeprobe_t *timeprobes (void); + ACE_timeprobe_t *timeprobes (); /// Synchronization variable. - ACE_LOCK &lock (void); + ACE_LOCK &lock (); /// Max size of timestamp table - u_long max_size (void); + u_long max_size (); /// Current size of timestamp table - u_long current_size (void); + u_long current_size (); protected: - /// Obtain an allocator pointer. If there is no allocator stored in /// the instance, the singleton allocator in the current process is used. - ALLOCATOR * allocator (void); + ALLOCATOR * allocator (); /// Event Descriptions EVENT_DESCRIPTIONS event_descriptions_; @@ -193,7 +191,7 @@ class ACE_Function_Timeprobe ACE_Function_Timeprobe (Timeprobe &timeprobe, u_long event); /// Destructor. - ~ACE_Function_Timeprobe (void); + ~ACE_Function_Timeprobe (); protected: /// Reference to timeprobe. @@ -205,13 +203,7 @@ class ACE_Function_Timeprobe ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timeprobe_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timeprobe_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_COMPILE_TIMEPROBES */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Timer_Hash_T.cpp b/ACE/ace/Timer_Hash_T.cpp index b04a034c977d6..15e29a7ac932b 100644 --- a/ACE/ace/Timer_Hash_T.cpp +++ b/ACE/ace/Timer_Hash_T.cpp @@ -18,7 +18,7 @@ class Hash_Token { public: // This constructor is required by ACE_Locked_Free_List::alloc. - Hash_Token (void) : + Hash_Token () : act_ (0), pos_ (0), orig_id_ (0), @@ -26,7 +26,7 @@ class Hash_Token { } - Hash_Token *get_next (void) + Hash_Token *get_next () { return this->next_; } @@ -59,7 +59,7 @@ class Hash_Token // Default constructor template -ACE_Timer_Hash_Upcall::ACE_Timer_Hash_Upcall (void) +ACE_Timer_Hash_Upcall::ACE_Timer_Hash_Upcall () : timer_hash_ (0) { // Nothing @@ -191,7 +191,7 @@ ACE_Timer_Hash_Iterator_T::~ACE_Ti // Positions the iterator at the first node in the timing hash table template void -ACE_Timer_Hash_Iterator_T::first (void) +ACE_Timer_Hash_Iterator_T::first () { for (this->position_ = 0; this->position_ < this->timer_hash_.table_size_; @@ -214,7 +214,7 @@ ACE_Timer_Hash_Iterator_T::first ( // bucket template void -ACE_Timer_Hash_Iterator_T::next (void) +ACE_Timer_Hash_Iterator_T::next () { if (this->isdone ()) return; @@ -254,7 +254,7 @@ ACE_Timer_Hash_Iterator_T::isdone template ACE_Timer_Node_T * -ACE_Timer_Hash_Iterator_T::item (void) +ACE_Timer_Hash_Iterator_T::item () { if (this->isdone ()) return 0; @@ -264,7 +264,7 @@ ACE_Timer_Hash_Iterator_T::item (v template ACE_Timer_Queue_Iterator_T & -ACE_Timer_Hash_T::iter (void) +ACE_Timer_Hash_T::iter () { this->iterator_->first (); return *this->iterator_; @@ -346,7 +346,7 @@ ACE_Timer_Hash_T::ACE_Timer_Hash_T // Remove all remaining items in the Queue. template -ACE_Timer_Hash_T::~ACE_Timer_Hash_T (void) +ACE_Timer_Hash_T::~ACE_Timer_Hash_T () { ACE_TRACE ("ACE_Timer_Hash_T::~ACE_Timer_Hash_T"); ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_)); @@ -365,7 +365,7 @@ ACE_Timer_Hash_T::~ACE_Timer_Hash_ } template int -ACE_Timer_Hash_T::close (void) +ACE_Timer_Hash_T::close () { ACE_TRACE ("ACE_Timer_Hash_T::close"); ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); @@ -709,7 +709,7 @@ ACE_Timer_Hash_T::cancel (const TY // Removes the earliest node and finds the new earliest position template ACE_Timer_Node_T * -ACE_Timer_Hash_T::remove_first (void) +ACE_Timer_Hash_T::remove_first () { if (this->is_empty ()) return 0; @@ -727,7 +727,7 @@ ACE_Timer_Hash_T::remove_first (vo // Finds a new earliest position template void -ACE_Timer_Hash_T::find_new_earliest (void) +ACE_Timer_Hash_T::find_new_earliest () { for (size_t i = 0; i < this->table_size_; ++i) if (!this->table_[i]->is_empty ()) @@ -740,7 +740,7 @@ ACE_Timer_Hash_T::find_new_earlies // Returns the earliest node without removing it template ACE_Timer_Node_T * -ACE_Timer_Hash_T::get_first (void) +ACE_Timer_Hash_T::get_first () { ACE_TRACE ("ACE_Timer_Hash_T::get_first"); diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h index fa0a7337ef0a5..2bbe5fff07832 100644 --- a/ACE/ace/Timer_Hash_T.h +++ b/ACE/ace/Timer_Hash_T.h @@ -276,7 +276,6 @@ class ACE_Timer_Hash_T : public ACE_Timer_Queue_T *); private: - /** * Schedule @a type that will expire at @a future_time, * which is specified in absolute time. If it expires then @a act is @@ -338,13 +337,7 @@ class ACE_Timer_Hash_T : public ACE_Timer_Queue_T @@ -21,14 +20,14 @@ ACE_Timer_List_Iterator_T::ACE_Timer_List_ } template -ACE_Timer_List_Iterator_T::~ACE_Timer_List_Iterator_T (void) +ACE_Timer_List_Iterator_T::~ACE_Timer_List_Iterator_T () { } // Positions the iterator at the node right after the dummy node template void -ACE_Timer_List_Iterator_T::first (void) +ACE_Timer_List_Iterator_T::first () { this->current_node_ = this->list_.get_first(); } @@ -36,7 +35,7 @@ ACE_Timer_List_Iterator_T::first (void) // Positions the iterator at the next node in the Timer Queue template void -ACE_Timer_List_Iterator_T::next (void) +ACE_Timer_List_Iterator_T::next () { // Make sure that if we are at the end, we don't wrap around if (! this->isdone()) @@ -56,7 +55,7 @@ ACE_Timer_List_Iterator_T::isdone () const // Returns the node at or 0 if we are at the end template ACE_Timer_Node_T * -ACE_Timer_List_Iterator_T::item (void) +ACE_Timer_List_Iterator_T::item () { if (! this->isdone()) return this->current_node_; @@ -69,7 +68,7 @@ ACE_Timer_List_Iterator_T::item (void) // Return our instance of the iterator template ACE_Timer_Queue_Iterator_T & -ACE_Timer_List_T::iter (void) +ACE_Timer_List_T::iter () { this->iterator_->first (); return *this->iterator_; @@ -120,7 +119,7 @@ ACE_Timer_List_T::earliest_time () const // Remove all remaining items in the list. template -ACE_Timer_List_T::~ACE_Timer_List_T (void) +ACE_Timer_List_T::~ACE_Timer_List_T () { ACE_TRACE ("ACE_Timer_List_T::~ACE_Timer_List_T"); ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_)); @@ -134,7 +133,7 @@ ACE_Timer_List_T::~ACE_Timer_List_T (void) } template int -ACE_Timer_List_T::close (void) +ACE_Timer_List_T::close () { ACE_TRACE ("ACE_Timer_List_T::close"); ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); @@ -397,7 +396,7 @@ ACE_Timer_List_T::cancel_i (ACE_Timer_Node // Reads the first node on the list and returns it. template ACE_Timer_Node_T * -ACE_Timer_List_T::get_first (void) +ACE_Timer_List_T::get_first () { ACE_TRACE ("ACE_Timer_List_T::get_first"); return this->get_first_i(); @@ -417,7 +416,7 @@ ACE_Timer_List_T::get_first_i () const // Removes the first node on the list and returns it. template ACE_Timer_Node_T * -ACE_Timer_List_T::remove_first (void) +ACE_Timer_List_T::remove_first () { ACE_TRACE ("ACE_Timer_List_T::remove_first"); ACE_Timer_Node_T* first = this->get_first(); diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h index ecac32eeafa89..18a05c4fe0192 100644 --- a/ACE/ace/Timer_List_T.h +++ b/ACE/ace/Timer_List_T.h @@ -40,19 +40,19 @@ class ACE_Timer_List_Iterator_T ACE_Timer_List_Iterator_T (List& lst); /// Destructor. - virtual ~ACE_Timer_List_Iterator_T (void); + virtual ~ACE_Timer_List_Iterator_T (); /// Positions the iterator at the earliest node in the Timer Queue - virtual void first (void); + virtual void first (); /// Positions the iterator at the next node in the Timer Queue - virtual void next (void); + virtual void next (); /// Returns true when there are no more nodes in the sequence virtual bool isdone () const; /// Returns the node at the current position in the sequence - virtual ACE_Timer_Node_T *item (void); + virtual ACE_Timer_Node_T *item (); protected: /// Pointer to the ACE_Timer_List that we are iterating over. @@ -104,7 +104,7 @@ class ACE_Timer_List_T : public ACE_Timer_Queue_T& iter (void); + virtual ACE_Timer_Queue_Iterator_T& iter (); /// Removes the earliest node from the queue and returns it - virtual ACE_Timer_Node_T* remove_first (void); + virtual ACE_Timer_Node_T* remove_first (); /// Dump the state of an object. virtual void dump () const; @@ -163,7 +163,7 @@ class ACE_Timer_List_T : public ACE_Timer_Queue_T *); /// Reads the earliest node from the queue and returns it. - virtual ACE_Timer_Node_T* get_first (void); + virtual ACE_Timer_Node_T* get_first (); private: /** @@ -215,13 +215,7 @@ class ACE_Timer_List_T : public ACE_Timer_Queue_T &) = delete; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_List_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_LIST_T_H */ diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp index d440e4ca2bcb6..f6c3857ca7e97 100644 --- a/ACE/ace/Timer_Queue_Adapters.cpp +++ b/ACE/ace/Timer_Queue_Adapters.cpp @@ -23,7 +23,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template TQ & -ACE_Async_Timer_Queue_Adapter::timer_queue (void) +ACE_Async_Timer_Queue_Adapter::timer_queue () { return this->timer_queue_; } @@ -40,7 +40,7 @@ ACE_Async_Timer_Queue_Adapter::cancel (long timer_id, } template int -ACE_Async_Timer_Queue_Adapter::expire (void) +ACE_Async_Timer_Queue_Adapter::expire () { // Block designated signals. ACE_Sig_Guard sg (&this->mask_); @@ -50,7 +50,7 @@ ACE_Async_Timer_Queue_Adapter::expire (void) } template int -ACE_Async_Timer_Queue_Adapter::schedule_ualarm (void) +ACE_Async_Timer_Queue_Adapter::schedule_ualarm () { ACE_Time_Value tv = this->timer_queue_.earliest_time () - this->timer_queue_.gettimeofday (); @@ -170,7 +170,7 @@ ACE_Thread_Timer_Queue_Adapter::ACE_Thread_Timer_Queue_Adapter (ACE_Th } template -ACE_Thread_Timer_Queue_Adapter::~ACE_Thread_Timer_Queue_Adapter (void) +ACE_Thread_Timer_Queue_Adapter::~ACE_Thread_Timer_Queue_Adapter () { if (this->delete_timer_queue_) { @@ -186,7 +186,7 @@ ACE_Thread_Timer_Queue_Adapter::~ACE_Thread_Timer_Queue_Adapter (void) } template ACE_SYNCH_RECURSIVE_MUTEX & -ACE_Thread_Timer_Queue_Adapter::mutex (void) +ACE_Thread_Timer_Queue_Adapter::mutex () { return this->mutex_; } @@ -217,7 +217,7 @@ ACE_Thread_Timer_Queue_Adapter::cancel (long timer_id, } template void -ACE_Thread_Timer_Queue_Adapter::deactivate (void) +ACE_Thread_Timer_Queue_Adapter::deactivate () { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_); @@ -226,18 +226,13 @@ ACE_Thread_Timer_Queue_Adapter::deactivate (void) } template int -ACE_Thread_Timer_Queue_Adapter::svc (void) +ACE_Thread_Timer_Queue_Adapter::svc () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_, -1); this->thr_id_ = ACE_Thread::self (); // Thread cancellation point, if ACE supports it. - // - // Note: This call generates a warning under Solaris because the header - // file /usr/include/pthread.h redefines the routine argument. This - // is a bug in the Solaris header files and has nothing to do with - // ACE. # if !defined (ACE_LACKS_PTHREAD_CANCEL) ACE_PTHREAD_CLEANUP_PUSH (&this->condition_.mutex ().get_nesting_mutex ()); # endif /* ACE_LACKS_PTHREAD_CANCEL */ @@ -347,7 +342,7 @@ ACE_Thread_Timer_Queue_Adapter::enqueue_command (ACE_Command_Base *cmd // handler context. template int -ACE_Thread_Timer_Queue_Adapter::dispatch_commands (void) +ACE_Thread_Timer_Queue_Adapter::dispatch_commands () { // Serialize access to the command queue. ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->command_mutex_, -1); diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h index 90104b4a27d2a..6e731a1caf9ca 100644 --- a/ACE/ace/Timer_Queue_Adapters.h +++ b/ACE/ace/Timer_Queue_Adapters.h @@ -79,14 +79,14 @@ class ACE_Async_Timer_Queue_Adapter : public ACE_Event_Handler /// Dispatch all timers with expiry time at or before the current time. /// Returns the number of timers expired. - int expire (void); + int expire (); /// Return a reference to the underlying timer queue. - TQ &timer_queue (void); + TQ &timer_queue (); private: /// Perform the logic to compute the new ualarm(2) setting. - virtual int schedule_ualarm (void); + virtual int schedule_ualarm (); /// Called back by @c SIGALRM handler. virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); @@ -138,7 +138,7 @@ class ACE_Thread_Timer_Queue_Adapter : public ACE_Task_Base TQ* timer_queue = 0); /// Destructor. - virtual ~ACE_Thread_Timer_Queue_Adapter (void); + virtual ~ACE_Thread_Timer_Queue_Adapter (); /// Schedule the timer according to the semantics of the ; wakes /// up the dispatching thread. @@ -155,10 +155,10 @@ class ACE_Thread_Timer_Queue_Adapter : public ACE_Task_Base virtual int svc (); /// Inform the dispatching thread that it should terminate. - virtual void deactivate (void); + virtual void deactivate (); /// Access the locking mechanism, useful for iteration. - ACE_SYNCH_RECURSIVE_MUTEX &mutex (void); + ACE_SYNCH_RECURSIVE_MUTEX &mutex (); /// Set a user-specified timer queue. int timer_queue (TQ *tq); @@ -201,11 +201,10 @@ class ACE_Thread_Timer_Queue_Adapter : public ACE_Task_Base # endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */ private: - # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) /// Dispatches all command objects enqueued in the most /// recent event handler context. - int dispatch_commands (void); + int dispatch_commands (); /// Queue of commands for deferred execution. ACE_Unbounded_Queue command_queue_; @@ -252,13 +251,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Timer_Queue_Adapters.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) # include "ace/Timer_Queue_Adapters.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation ("Timer_Queue_Adapters.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_ADAPTERS_H */ diff --git a/ACE/ace/Timer_Queue_Iterator.h b/ACE/ace/Timer_Queue_Iterator.h index ebb30d5dddfb8..d550397791bc3 100644 --- a/ACE/ace/Timer_Queue_Iterator.h +++ b/ACE/ace/Timer_Queue_Iterator.h @@ -187,13 +187,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Timer_Queue_Iterator.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Queue_Iterator.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Queue_Iterator.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_ITERATOR_H */ diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp index 94600bb580005..52ed9ad9c8086 100644 --- a/ACE/ace/Timer_Queue_T.cpp +++ b/ACE/ace/Timer_Queue_T.cpp @@ -21,8 +21,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// This fudge factor can be overriden for timers that need it, such as on -// Solaris, by defining the ACE_TIMER_SKEW symbol in the appropriate config +// This fudge factor can be overriden for timers that need it +// by defining the ACE_TIMER_SKEW symbol in the appropriate config // header. #if !defined (ACE_TIMER_SKEW) # define ACE_TIMER_SKEW 0 @@ -286,7 +286,6 @@ ACE_Timer_Queue_T::expire (const ACE_Time_ this->postinvoke (info, cur_time, upcall_act); ++number_of_timers_expired; - } ACE_UNUSED_ARG (result); diff --git a/ACE/ace/Timer_Queue_T.h b/ACE/ace/Timer_Queue_T.h index 703625afe4293..060285cdf19b8 100644 --- a/ACE/ace/Timer_Queue_T.h +++ b/ACE/ace/Timer_Queue_T.h @@ -237,13 +237,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Timer_Queue_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Queue_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_T_H */ diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp index 5347b6570fd07..d283481324b18 100644 --- a/ACE/ace/Timer_Wheel_T.cpp +++ b/ACE/ace/Timer_Wheel_T.cpp @@ -164,7 +164,7 @@ ACE_Timer_Wheel_T::open_i /// Destructor just cleans up its memory template -ACE_Timer_Wheel_T::~ACE_Timer_Wheel_T (void) +ACE_Timer_Wheel_T::~ACE_Timer_Wheel_T () { ACE_TRACE ("ACE_Timer_Wheel_T::~ACE_Timer_Wheel_T"); @@ -182,7 +182,7 @@ ACE_Timer_Wheel_T::~ACE_Timer_Wheel_T (voi } template int -ACE_Timer_Wheel_T::close (void) +ACE_Timer_Wheel_T::close () { ACE_TRACE ("ACE_Timer_Wheel_T::close"); @@ -300,7 +300,6 @@ ACE_Timer_Wheel_T::calculate_spoke template long ACE_Timer_Wheel_T::generate_timer_id (u_int spoke) { - int cnt_bits = sizeof (long) * 8 - this->spoke_bits_; long max_cnt = ((long)1 << cnt_bits) - 1; if (spoke == this->spoke_count_) @@ -708,7 +707,7 @@ ACE_Timer_Wheel_T::dump () const * @return The earliest timer node. */ template ACE_Timer_Node_T * -ACE_Timer_Wheel_T::remove_first (void) +ACE_Timer_Wheel_T::remove_first () { ACE_TRACE ("ACE_Timer_Wheel_T::remove_first"); return remove_first_expired (ACE_Time_Value::max_time); @@ -745,7 +744,7 @@ ACE_Timer_Wheel_T::remove_first_expired (c */ template ACE_Timer_Node_T* -ACE_Timer_Wheel_T::get_first (void) +ACE_Timer_Wheel_T::get_first () { ACE_TRACE ("ACE_Timer_Wheel_T::get_first"); return this->get_first_i (); @@ -768,7 +767,7 @@ ACE_Timer_Wheel_T::get_first_i () const */ template ACE_Timer_Queue_Iterator_T & -ACE_Timer_Wheel_T::iter (void) +ACE_Timer_Wheel_T::iter () { this->iterator_->first (); return *this->iterator_; @@ -859,7 +858,7 @@ ACE_Timer_Wheel_Iterator_T::ACE_Timer_Wheel_I * Destructor, at this level does nothing. */ template -ACE_Timer_Wheel_Iterator_T::~ACE_Timer_Wheel_Iterator_T (void) +ACE_Timer_Wheel_Iterator_T::~ACE_Timer_Wheel_Iterator_T () { } @@ -873,7 +872,7 @@ ACE_Timer_Wheel_Iterator_T::~ACE_Timer_Wheel_ * current_node_ would be 0. */ template void -ACE_Timer_Wheel_Iterator_T::first (void) +ACE_Timer_Wheel_Iterator_T::first () { this->goto_next(0); } @@ -883,7 +882,7 @@ ACE_Timer_Wheel_Iterator_T::first (void) * Positions the iterator at the next node. */ template void -ACE_Timer_Wheel_Iterator_T::next (void) +ACE_Timer_Wheel_Iterator_T::next () { if (this->isdone()) return; @@ -932,7 +931,7 @@ ACE_Timer_Wheel_Iterator_T::isdone () cons * is empty */ template ACE_Timer_Node_T * -ACE_Timer_Wheel_Iterator_T::item (void) +ACE_Timer_Wheel_Iterator_T::item () { return this->current_node_; } diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h index ccedf514bb6be..8d16b81400b80 100644 --- a/ACE/ace/Timer_Wheel_T.h +++ b/ACE/ace/Timer_Wheel_T.h @@ -144,12 +144,12 @@ class ACE_Timer_Wheel_T /** * Destroy timer queue. Cancels all timers. */ - virtual int close (void); + virtual int close (); /// Run the for all timers whose values are <= /// . Also accounts for . Returns /// the number of timers canceled. - virtual int expire (void); + virtual int expire (); // Run the for all timers whose values are <= @a current_time. // This does not account for . Returns the number of @@ -213,13 +213,7 @@ class ACE_Timer_Wheel_T ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Wheel_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Wheel_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_WHEEL_T_H */ diff --git a/ACE/ace/TkReactor/TkReactor.cpp b/ACE/ace/TkReactor/TkReactor.cpp index 13c5904ccda24..3baaa71806150 100644 --- a/ACE/ace/TkReactor/TkReactor.cpp +++ b/ACE/ace/TkReactor/TkReactor.cpp @@ -32,7 +32,7 @@ ACE_TkReactor::ACE_TkReactor (size_t size, #endif /* ACE_MT_SAFE */ } -ACE_TkReactor::~ACE_TkReactor (void) +ACE_TkReactor::~ACE_TkReactor () { // Delete the remaining items in the linked list. @@ -65,7 +65,6 @@ ACE_TkReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s nfound = TkWaitForMultipleEvents (width, handle_set, max_wait_time); - } while (nfound == -1 && this->handle_error () > 0); if (nfound > 0) @@ -342,7 +341,7 @@ ACE_TkReactor::remove_handler_i (const ACE_Handle_Set &handles, // first timeout in the Reactor's Timer_Queue. void -ACE_TkReactor::reset_timeout (void) +ACE_TkReactor::reset_timeout () { if (this->timeout_) ::Tk_DeleteTimerHandler (this->timeout_); diff --git a/ACE/ace/TkReactor/TkReactor.h b/ACE/ace/TkReactor/TkReactor.h index 5632ba67a734c..489c7a9ce080c 100644 --- a/ACE/ace/TkReactor/TkReactor.h +++ b/ACE/ace/TkReactor/TkReactor.h @@ -63,7 +63,7 @@ class ACE_TkReactor_Export ACE_TkReactor : public ACE_Select_Reactor bool restart = false, ACE_Sig_Handler * = 0); - virtual ~ACE_TkReactor (void); + virtual ~ACE_TkReactor (); // = Timer operations. virtual long schedule_timer (ACE_Event_Handler *event_handler, @@ -116,7 +116,7 @@ class ACE_TkReactor_Export ACE_TkReactor : public ACE_Select_Reactor private: /// This method ensures there's a Tk timeout for the first timeout in /// the Reactor's Timer_Queue. - void reset_timeout (void); + void reset_timeout (); // = Integrate with the X callback function mechanism. static void TimerCallbackProc (ClientData cd); diff --git a/ACE/ace/Token.h b/ACE/ace/Token.h index 3191db3bb0694..4c3bcc80b5a8a 100644 --- a/ACE/ace/Token.h +++ b/ACE/ace/Token.h @@ -27,7 +27,7 @@ #include "ace/Thread_Mutex.h" -#if (defined (ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)) || defined (ACE_HAS_VXTHREADS) +#if defined (ACE_WIN32) || defined (ACE_HAS_VXTHREADS) // If platforms support semaphores with timed wait, then we use semaphores instead of c.v. # define ACE_TOKEN_USES_SEMAPHORE #endif /* ACE_WIN32 || ACE_HAS_VXTHREADS */ @@ -56,8 +56,8 @@ class ACE_Time_Value; * multiple times, however, it must call an * equal number of times before the token is actually released. * Threads that are blocked awaiting the token are serviced in - * strict FIFO/LIFO order as other threads release the token (Solaris - * and Pthread mutexes don't strictly enforce an acquisition + * strict FIFO/LIFO order as other threads release the token + * (Pthread mutexes don't strictly enforce an acquisition * order). There are two lists within the class. Write * acquires always have higher priority over read acquires. Which * means, if you use both write/read operations, care must be @@ -89,12 +89,12 @@ class ACE_Export ACE_Token ACE_Token (const ACE_TCHAR *name = 0, void * = 0); /// Destructor - virtual ~ACE_Token (void); + virtual ~ACE_Token (); // = Strategies /// Retrieve the current queueing strategy. - int queueing_strategy (void); + int queueing_strategy (); /// Set the queueing strategy. void queueing_strategy (int queueing_strategy); @@ -131,7 +131,7 @@ class ACE_Export ACE_Token * behavior before goes to sleep. By default, this is a * no-op... */ - virtual void sleep_hook (void); + virtual void sleep_hook (); /** * An optimized method that efficiently reacquires the token if no @@ -156,20 +156,20 @@ class ACE_Export ACE_Token /// Become interface-compliant with other lock mechanisms (implements /// a non-blocking ). - int tryacquire (void); + int tryacquire (); /// Shuts down the ACE_Token instance. - int remove (void); + int remove (); /// Relinquish the token. If there are any waiters then the next one /// in line gets it. - int release (void); + int release (); /// Behaves like acquire() but at a lower priority. It should probably /// be called acquire_yield() since the semantics aren't really /// what's commonly expected for readers/writer locks. See the class /// documentation above for more details. - int acquire_read (void); + int acquire_read (); /// Behaves like acquire() but at a lower priority. It should probably /// be called acquire_yield() since the semantics aren't really @@ -180,7 +180,7 @@ class ACE_Export ACE_Token ACE_Time_Value *timeout = 0); /// Calls acquire(). - int acquire_write (void); + int acquire_write (); /// Calls acquire(). int acquire_write (void (*sleep_hook)(void *), @@ -188,22 +188,22 @@ class ACE_Export ACE_Token ACE_Time_Value *timeout = 0); /// Lower priority try_acquire(). - int tryacquire_read (void); + int tryacquire_read (); /// Just calls . - int tryacquire_write (void); + int tryacquire_write (); /// Assumes the caller has acquired the token and returns 0. - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); // = Accessor methods. /// Return the number of threads that are currently waiting to get /// the token. - int waiters (void); + int waiters (); /// Return the id of the current thread that owns the token. - ACE_thread_t current_owner (void); + ACE_thread_t current_owner (); /// Dump the state of an object. void dump () const; @@ -228,7 +228,7 @@ class ACE_Export ACE_Token int wait (ACE_Time_Value *timeout, ACE_Thread_Mutex &lock); /// Notify (unblock) the entry. - int signal (void); + int signal (); /// Pointer to next waiter. ACE_Token_Queue_Entry *next_; @@ -258,7 +258,7 @@ class ACE_Export ACE_Token struct ACE_Token_Queue { /// Constructor - ACE_Token_Queue (void); + ACE_Token_Queue (); /// Remove a waiter from the queue. void remove_entry (ACE_Token_Queue_Entry *); @@ -281,7 +281,7 @@ class ACE_Export ACE_Token ACE_Token_Op_Type op_type); /// Wake next in line for ownership. - void wakeup_next_waiter (void); + void wakeup_next_waiter (); /// A queue of writer threads. ACE_Token_Queue writers_; @@ -321,12 +321,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Token { public: - int queueing_strategy (void) { ACE_NOTSUP_RETURN (-1); } + int queueing_strategy () { ACE_NOTSUP_RETURN (-1); } void queueing_strategy (int /*queueing_strategy*/) { } int acquire (ACE_Time_Value * = 0) { ACE_NOTSUP_RETURN (-1); } - int tryacquire (void) { ACE_NOTSUP_RETURN (-1); } - int remove (void) { ACE_NOTSUP_RETURN (-1); } - int release (void) { ACE_NOTSUP_RETURN (-1); } + int tryacquire () { ACE_NOTSUP_RETURN (-1); } + int remove () { ACE_NOTSUP_RETURN (-1); } + int release () { ACE_NOTSUP_RETURN (-1); } }; ACE_END_VERSIONED_NAMESPACE_DECL @@ -346,7 +346,7 @@ class ACE_Export ACE_Noop_Token : public ACE_Null_Mutex }; /// Get queueing strategy. - int queueing_strategy (void); + int queueing_strategy (); /// Set queueing strategy. void queueing_strategy (int queueing_strategy); diff --git a/ACE/ace/Token.inl b/ACE/ace/Token.inl index ed7a6883dcef0..340ed7cecc918 100644 --- a/ACE/ace/Token.inl +++ b/ACE/ace/Token.inl @@ -9,7 +9,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_Token::queueing_strategy (void) +ACE_Token::queueing_strategy () { return this->queueing_strategy_; } @@ -21,7 +21,7 @@ ACE_Token::queueing_strategy (int queueing_strategy) } ACE_INLINE int -ACE_Token::remove (void) +ACE_Token::remove () { ACE_TRACE ("ACE_Token::remove"); // Don't have an implementation for this yet... @@ -29,7 +29,7 @@ ACE_Token::remove (void) } ACE_INLINE int -ACE_Token::tryacquire (void) +ACE_Token::tryacquire () { ACE_TRACE ("ACE_Token::tryacquire"); return this->shared_acquire @@ -37,7 +37,7 @@ ACE_Token::tryacquire (void) } ACE_INLINE int -ACE_Token::waiters (void) +ACE_Token::waiters () { ACE_TRACE ("ACE_Token::waiters"); ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1); @@ -47,7 +47,7 @@ ACE_Token::waiters (void) } ACE_INLINE ACE_thread_t -ACE_Token::current_owner (void) +ACE_Token::current_owner () { ACE_TRACE ("ACE_Token::current_owner"); ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, this->owner_); @@ -56,7 +56,7 @@ ACE_Token::current_owner (void) } ACE_INLINE int -ACE_Token::acquire_read (void) +ACE_Token::acquire_read () { ACE_TRACE ("ACE_Token::acquire_read"); return this->shared_acquire @@ -64,7 +64,7 @@ ACE_Token::acquire_read (void) } ACE_INLINE int -ACE_Token::acquire_write (void) +ACE_Token::acquire_write () { ACE_TRACE ("ACE_Token::acquire_write"); return this->shared_acquire @@ -72,7 +72,7 @@ ACE_Token::acquire_write (void) } ACE_INLINE int -ACE_Token::tryacquire_read (void) +ACE_Token::tryacquire_read () { ACE_TRACE ("ACE_Token::tryacquire_read"); return this->shared_acquire @@ -89,7 +89,7 @@ ACE_Token::acquire_read (void (*sleep_hook_func)(void *), } ACE_INLINE int -ACE_Token::tryacquire_write (void) +ACE_Token::tryacquire_write () { ACE_TRACE ("ACE_Token::tryacquire_write"); return this->shared_acquire @@ -97,7 +97,7 @@ ACE_Token::tryacquire_write (void) } ACE_INLINE int -ACE_Token::tryacquire_write_upgrade (void) +ACE_Token::tryacquire_write_upgrade () { ACE_TRACE ("ACE_Token::tryacquire_write_upgrade"); return 0; @@ -129,7 +129,7 @@ ACE_Token::ACE_Token_Queue_Entry::wait (ACE_Time_Value *timeout, ACE_Thread_Mute } ACE_INLINE int -ACE_Token::ACE_Token_Queue_Entry::signal (void) +ACE_Token::ACE_Token_Queue_Entry::signal () { return #if defined (ACE_TOKEN_USES_SEMAPHORE) @@ -148,7 +148,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_Noop_Token::queueing_strategy (void) +ACE_Noop_Token::queueing_strategy () { return -1; } diff --git a/ACE/ace/Token_Collection.cpp b/ACE/ace/Token_Collection.cpp index 031c8ab66efc8..7ab8347dd012e 100644 --- a/ACE/ace/Token_Collection.cpp +++ b/ACE/ace/Token_Collection.cpp @@ -236,7 +236,7 @@ ACE_Token_Collection::release (const ACE_TCHAR *token_name, return temp->release (options); } -ACE_Token_Collection::~ACE_Token_Collection (void) +ACE_Token_Collection::~ACE_Token_Collection () { ACE_TRACE ("ACE_Token_Collection::~ACE_Token_Collection"); COLLECTION::ITERATOR iterator (collection_); diff --git a/ACE/ace/Token_Collection.h b/ACE/ace/Token_Collection.h index 3323aad003164..86bd8f77db846 100644 --- a/ACE/ace/Token_Collection.h +++ b/ACE/ace/Token_Collection.h @@ -183,7 +183,7 @@ class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy ACE_Synch_Options &options = ACE_Synch_Options::defaults); - ~ACE_Token_Collection (void); + ~ACE_Token_Collection (); /// Dump the state of the class. void dump () const; @@ -193,7 +193,6 @@ class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy virtual const ACE_TCHAR *name () const; protected: - typedef ACE_Token_Name TOKEN_NAME; /// COLLECTION maintains a mapping from token names to ACE_Tokens* diff --git a/ACE/ace/Token_Invariants.cpp b/ACE/ace/Token_Invariants.cpp index 9d2f1a48c91f7..7360a94a7db0c 100644 --- a/ACE/ace/Token_Invariants.cpp +++ b/ACE/ace/Token_Invariants.cpp @@ -10,7 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Token_Invariant_Manager *ACE_Token_Invariant_Manager::instance_ = 0; ACE_Token_Invariant_Manager * -ACE_Token_Invariant_Manager::instance (void) +ACE_Token_Invariant_Manager::instance () { ACE_TRACE ("ACE_Token_Invariant_Manager::instance"); @@ -202,7 +202,7 @@ ACE_Token_Invariant_Manager::get_rwlock (const ACE_TCHAR *token_name, } -ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager (void) +ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager () { ACE_TRACE ("ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager"); @@ -258,7 +258,7 @@ ACE_Mutex_Invariants::dump () const // ************************************************** int -ACE_RWLock_Invariants::writer_acquired (void) +ACE_RWLock_Invariants::writer_acquired () { if (readers_ > 0) { @@ -275,7 +275,7 @@ ACE_RWLock_Invariants::writer_acquired (void) } int -ACE_RWLock_Invariants::reader_acquired (void) +ACE_RWLock_Invariants::reader_acquired () { if (writers_ > 0) { @@ -290,7 +290,7 @@ ACE_RWLock_Invariants::reader_acquired (void) } void -ACE_RWLock_Invariants::releasing (void) +ACE_RWLock_Invariants::releasing () { if (writers_ == 1) writers_ = 0; diff --git a/ACE/ace/Token_Invariants.h b/ACE/ace/Token_Invariants.h index 209fb1c32a985..f5ec3f5e3ece4 100644 --- a/ACE/ace/Token_Invariants.h +++ b/ACE/ace/Token_Invariants.h @@ -126,9 +126,8 @@ class ACE_Export ACE_RWLock_Invariants class ACE_Export ACE_Token_Invariant_Manager : public ACE_Cleanup { public: - /// Singleton access point. - static ACE_Token_Invariant_Manager *instance (void); + static ACE_Token_Invariant_Manager *instance (); // = Polymorphic methods. Just pass in the proxy and the method // figures out the type of the token. @@ -167,10 +166,10 @@ class ACE_Export ACE_Token_Invariant_Manager : public ACE_Cleanup // = The following two method should be in the protected part of the // class. Bugs with certain compilers preclude this. /// Prevent non-singleton construction. - ACE_Token_Invariant_Manager (void); + ACE_Token_Invariant_Manager (); /// Destruction. - virtual ~ACE_Token_Invariant_Manager (void); + virtual ~ACE_Token_Invariant_Manager (); protected: /// Return or create. diff --git a/ACE/ace/Token_Manager.cpp b/ACE/ace/Token_Manager.cpp index 32ec131f4ffd0..052a900db0ea8 100644 --- a/ACE/ace/Token_Manager.cpp +++ b/ACE/ace/Token_Manager.cpp @@ -37,7 +37,7 @@ ACE_Token_Manager::~ACE_Token_Manager () } ACE_Token_Manager * -ACE_Token_Manager::instance (void) +ACE_Token_Manager::instance () { ACE_TRACE ("ACE_Token_Manager::instance"); diff --git a/ACE/ace/Token_Manager.h b/ACE/ace/Token_Manager.h index 39d57366f8e1c..c2c597e7c6536 100644 --- a/ACE/ace/Token_Manager.h +++ b/ACE/ace/Token_Manager.h @@ -43,18 +43,17 @@ class ACE_Mutex_Token; */ class ACE_Export ACE_Token_Manager : public ACE_Cleanup { - // To add a new type of token (e.g. semaphore), do the following // steps: 1. Create a new derivation of ACE_Token. This class // defines the semantics of the new Token. 2. Create a // derivation of ACE_Token_Manager. You will only need to // redefine make_mutex. public: - ACE_Token_Manager (void); - virtual ~ACE_Token_Manager (void); + ACE_Token_Manager (); + virtual ~ACE_Token_Manager (); /// Get the pointer to token manager singleton. - static ACE_Token_Manager *instance (void); + static ACE_Token_Manager *instance (); /// Set the pointer to token manager singleton. void instance (ACE_Token_Manager *); @@ -90,7 +89,7 @@ class ACE_Export ACE_Token_Manager : public ACE_Cleanup * This is necessary since safe_acquire is implemented in terms of * the Token queues. */ - ACE_TOKEN_CONST::MUTEX &mutex (void); + ACE_TOKEN_CONST::MUTEX &mutex (); /// Dump the state of the class. void dump () const; diff --git a/ACE/ace/Token_Manager.inl b/ACE/ace/Token_Manager.inl index 0bbbfc67d6791..bcebc62a57c7c 100644 --- a/ACE/ace/Token_Manager.inl +++ b/ACE/ace/Token_Manager.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_TOKEN_CONST::MUTEX & -ACE_Token_Manager::mutex (void) +ACE_Token_Manager::mutex () { ACE_TRACE ("ACE_Token_Manager::mutex"); return lock_; diff --git a/ACE/ace/Token_Request_Reply.cpp b/ACE/ace/Token_Request_Reply.cpp index b584ad3b4d111..741260e66b7af 100644 --- a/ACE/ace/Token_Request_Reply.cpp +++ b/ACE/ace/Token_Request_Reply.cpp @@ -42,7 +42,7 @@ ACE_Token_Request::encode (void *&buf) // so that it can be used by the server. int -ACE_Token_Request::decode (void) +ACE_Token_Request::decode () { this->token_name_ = this->transfer_.data_; @@ -131,7 +131,7 @@ ACE_Token_Request::dump () const // Create a ACE_Token_Reply message. -ACE_Token_Reply::ACE_Token_Reply (void) // Type of reply. +ACE_Token_Reply::ACE_Token_Reply () // Type of reply. { this->arg (0); this->errnum (0); @@ -152,7 +152,7 @@ ACE_Token_Reply::encode (void *&buf) // so that it can be used by the client. int -ACE_Token_Reply::decode (void) +ACE_Token_Reply::decode () { return 0; } diff --git a/ACE/ace/Tokenizer_T.cpp b/ACE/ace/Tokenizer_T.cpp index 5be90545efac2..8df674e3455f3 100644 --- a/ACE/ace/Tokenizer_T.cpp +++ b/ACE/ace/Tokenizer_T.cpp @@ -113,7 +113,7 @@ ACE_Tokenizer_T::is_preserve_designator (ACE_CHAR_T start, template ACE_CHAR_T * -ACE_Tokenizer_T::next (void) +ACE_Tokenizer_T::next () { // Check if the previous pass was the last one in the buffer. if (index_ == -1) diff --git a/ACE/ace/Tokenizer_T.h b/ACE/ace/Tokenizer_T.h index 6860048733608..a9ade225b021e 100644 --- a/ACE/ace/Tokenizer_T.h +++ b/ACE/ace/Tokenizer_T.h @@ -140,7 +140,7 @@ class ACE_Tokenizer_T int preserve_designators (ACE_CHAR_T start, ACE_CHAR_T stop, int strip=1); /// Returns the next token. - ACE_CHAR_T *next (void); + ACE_CHAR_T *next (); enum { MAX_DELIMITERS=16, @@ -226,13 +226,7 @@ typedef ACE_Tokenizer_T ACE_Tokenizer; ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Tokenizer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Tokenizer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Typed_SV_Message.h b/ACE/ace/Typed_SV_Message.h index 503f1ceefb0a4..a901e1de01c86 100644 --- a/ACE/ace/Typed_SV_Message.h +++ b/ACE/ace/Typed_SV_Message.h @@ -39,7 +39,7 @@ class ACE_Typed_SV_Message long type = 0, int length = sizeof (T), int max_size = sizeof (T)); - ~ACE_Typed_SV_Message (void); + ~ACE_Typed_SV_Message (); /// Get the type of the message. long type () const; @@ -60,7 +60,7 @@ class ACE_Typed_SV_Message void max_size (int m); /// Get a pointer to the data in the message. - T &data (void); + T &data (); /// Set a pointer to the data in the message. void data (const T &data); @@ -91,13 +91,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Typed_SV_Message.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Typed_SV_Message.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Typed_SV_Message.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Typed_SV_Message.inl b/ACE/ace/Typed_SV_Message.inl index e9eef31b73761..1397d37d72d96 100644 --- a/ACE/ace/Typed_SV_Message.inl +++ b/ACE/ace/Typed_SV_Message.inl @@ -29,7 +29,7 @@ ACE_Typed_SV_Message::ACE_Typed_SV_Message (const T &d, } template ACE_INLINE -ACE_Typed_SV_Message::~ACE_Typed_SV_Message (void) +ACE_Typed_SV_Message::~ACE_Typed_SV_Message () { ACE_TRACE ("ACE_Typed_SV_Message::~ACE_Typed_SV_Message"); } @@ -77,7 +77,7 @@ ACE_Typed_SV_Message::max_size (int m) } template T & -ACE_Typed_SV_Message::data (void) +ACE_Typed_SV_Message::data () { ACE_TRACE ("ACE_Typed_SV_Message::data"); return this->data_; diff --git a/ACE/ace/Typed_SV_Message_Queue.cpp b/ACE/ace/Typed_SV_Message_Queue.cpp index 09c213dfd72f2..4c22a82f1bedb 100644 --- a/ACE/ace/Typed_SV_Message_Queue.cpp +++ b/ACE/ace/Typed_SV_Message_Queue.cpp @@ -27,7 +27,7 @@ ACE_Typed_SV_Message_Queue::dump () const } template -ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue (void) +ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue () { ACE_TRACE ("ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue"); } @@ -44,7 +44,7 @@ ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue (key_t external_id, } template -ACE_Typed_SV_Message_Queue::~ACE_Typed_SV_Message_Queue (void) +ACE_Typed_SV_Message_Queue::~ACE_Typed_SV_Message_Queue () { ACE_TRACE ("ACE_Typed_SV_Message_Queue::~ACE_Typed_SV_Message_Queue"); } diff --git a/ACE/ace/Typed_SV_Message_Queue.h b/ACE/ace/Typed_SV_Message_Queue.h index 3fdb92bd7eff8..7e9fe558bf66f 100644 --- a/ACE/ace/Typed_SV_Message_Queue.h +++ b/ACE/ace/Typed_SV_Message_Queue.h @@ -38,16 +38,16 @@ class ACE_Typed_SV_Message_Queue ACE_NOWAIT = IPC_NOWAIT }; - ACE_Typed_SV_Message_Queue (void); + ACE_Typed_SV_Message_Queue (); ACE_Typed_SV_Message_Queue (key_t external_id, int create = ACE_OPEN, int perms = ACE_DEFAULT_FILE_PERMS); int open (key_t external_id, int create = ACE_OPEN, int perms = ACE_DEFAULT_FILE_PERMS); - int close (void); - int remove (void); - ~ACE_Typed_SV_Message_Queue (void); + int close (); + int remove (); + ~ACE_Typed_SV_Message_Queue (); /// Send method. int send (const ACE_Typed_SV_Message &mb, int mflags = 0); @@ -77,13 +77,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Typed_SV_Message_Queue.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Typed_SV_Message_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Typed_SV_Message_Queue.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TYPED_MESSAGE_QUEUE_H */ diff --git a/ACE/ace/Typed_SV_Message_Queue.inl b/ACE/ace/Typed_SV_Message_Queue.inl index 0814ecf64dbb0..5e0d671aa97f6 100644 --- a/ACE/ace/Typed_SV_Message_Queue.inl +++ b/ACE/ace/Typed_SV_Message_Queue.inl @@ -15,7 +15,7 @@ ACE_Typed_SV_Message_Queue::open (key_t external_id, // What does it mean to close a message queue?! template ACE_INLINE int -ACE_Typed_SV_Message_Queue::close (void) +ACE_Typed_SV_Message_Queue::close () { ACE_TRACE ("ACE_Typed_SV_Message_Queue::close"); return 1; @@ -52,7 +52,7 @@ ACE_Typed_SV_Message_Queue::send (const ACE_Typed_SV_Message &mb, } template ACE_INLINE int -ACE_Typed_SV_Message_Queue::remove (void) +ACE_Typed_SV_Message_Queue::remove () { ACE_TRACE ("ACE_Typed_SV_Message_Queue::remove"); diff --git a/ACE/ace/UPIPE_Acceptor.inl b/ACE/ace/UPIPE_Acceptor.inl index 37af88b4ad4f8..29ebd89285f33 100644 --- a/ACE/ace/UPIPE_Acceptor.inl +++ b/ACE/ace/UPIPE_Acceptor.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_UPIPE_Acceptor::remove (void) +ACE_UPIPE_Acceptor::remove () { ACE_TRACE ("ACE_UPIPE_Acceptor::remove"); return this->ACE_SPIPE_Acceptor::remove (); diff --git a/ACE/ace/UPIPE_Connector.h b/ACE/ace/UPIPE_Connector.h index 85f744468aa24..8af830978147d 100644 --- a/ACE/ace/UPIPE_Connector.h +++ b/ACE/ace/UPIPE_Connector.h @@ -33,7 +33,7 @@ class ACE_Export ACE_UPIPE_Connector { public: /// Default constructor. - ACE_UPIPE_Connector (void); + ACE_UPIPE_Connector (); /** * Actively connect and produce a @a new_stream if things go well. diff --git a/ACE/ace/UPIPE_Stream.h b/ACE/ace/UPIPE_Stream.h index 44c9f2df1dcb1..5e911ca1cd4a8 100644 --- a/ACE/ace/UPIPE_Stream.h +++ b/ACE/ace/UPIPE_Stream.h @@ -41,12 +41,12 @@ class ACE_Export ACE_UPIPE_Stream : public ACE_SPIPE typedef ACE_Stream MT_Stream; - ACE_UPIPE_Stream (void); + ACE_UPIPE_Stream (); - virtual ~ACE_UPIPE_Stream (void); + virtual ~ACE_UPIPE_Stream (); /// Shut down the UPIPE and release resources. - int close (void); + int close (); /// Return the underlying I/O handle. ACE_HANDLE get_handle () const; diff --git a/ACE/ace/UTF16_Encoding_Converter.cpp b/ACE/ace/UTF16_Encoding_Converter.cpp index b1455d3b5f9e2..3934167a9de83 100644 --- a/ACE/ace/UTF16_Encoding_Converter.cpp +++ b/ACE/ace/UTF16_Encoding_Converter.cpp @@ -79,7 +79,7 @@ ACE_UTF16_Encoding_Converter::ACE_UTF16_Encoding_Converter (bool swap) { } -ACE_UTF16_Encoding_Converter::~ACE_UTF16_Encoding_Converter (void) +ACE_UTF16_Encoding_Converter::~ACE_UTF16_Encoding_Converter () { } @@ -323,37 +323,37 @@ ACE_UTF16_Encoding_Converter::encoded (const ACE_Byte* source, } ACE_UINT32 -ACE_UTF16_Encoding_Converter::get_UNI_SUR_HIGH_START (void) +ACE_UTF16_Encoding_Converter::get_UNI_SUR_HIGH_START () { return UNI_SUR_HIGH_START; } ACE_UINT32 -ACE_UTF16_Encoding_Converter::get_UNI_SUR_LOW_END (void) +ACE_UTF16_Encoding_Converter::get_UNI_SUR_LOW_END () { return UNI_SUR_LOW_END; } ACE_UINT32 -ACE_UTF16_Encoding_Converter::get_UNI_REPLACEMENT_CHAR (void) +ACE_UTF16_Encoding_Converter::get_UNI_REPLACEMENT_CHAR () { return UNI_REPLACEMENT_CHAR; } const ACE_Byte* -ACE_UTF16_Encoding_Converter::get_first_byte_mark (void) +ACE_UTF16_Encoding_Converter::get_first_byte_mark () { return firstByteMark; } const ACE_Byte* -ACE_UTF16_Encoding_Converter::get_trailing_bytes_for_utf8 (void) +ACE_UTF16_Encoding_Converter::get_trailing_bytes_for_utf8 () { return trailingBytesForUTF8; } const ACE_UINT32* -ACE_UTF16_Encoding_Converter::get_offsets_from_utf8 (void) +ACE_UTF16_Encoding_Converter::get_offsets_from_utf8 () { return offsetsFromUTF8; } diff --git a/ACE/ace/UTF16_Encoding_Converter.h b/ACE/ace/UTF16_Encoding_Converter.h index 0097b7bb8d2f5..36826cd1f2f1c 100644 --- a/ACE/ace/UTF16_Encoding_Converter.h +++ b/ACE/ace/UTF16_Encoding_Converter.h @@ -32,7 +32,7 @@ class ACE_UTF16_Encoding_Converter: public ACE_Encoding_Converter ACE_UTF16_Encoding_Converter (bool swap = false); /// This is a do nothing destructor. - virtual ~ACE_UTF16_Encoding_Converter (void); + virtual ~ACE_UTF16_Encoding_Converter (); /// Convert the source from UTF-16 to UTF-8 and store it in the /// provided target buffer. @@ -61,12 +61,12 @@ class ACE_UTF16_Encoding_Converter: public ACE_Encoding_Converter bool is_legal_utf8 (const ACE_Byte* source, size_t length) const; - static ACE_UINT32 get_UNI_SUR_HIGH_START (void); - static ACE_UINT32 get_UNI_SUR_LOW_END (void); - static ACE_UINT32 get_UNI_REPLACEMENT_CHAR (void); - static const ACE_Byte* get_first_byte_mark (void); - static const ACE_Byte* get_trailing_bytes_for_utf8 (void); - static const ACE_UINT32* get_offsets_from_utf8 (void); + static ACE_UINT32 get_UNI_SUR_HIGH_START (); + static ACE_UINT32 get_UNI_SUR_LOW_END (); + static ACE_UINT32 get_UNI_REPLACEMENT_CHAR (); + static const ACE_Byte* get_first_byte_mark (); + static const ACE_Byte* get_trailing_bytes_for_utf8 (); + static const ACE_UINT32* get_offsets_from_utf8 (); bool swap_; }; diff --git a/ACE/ace/UTF32_Encoding_Converter.cpp b/ACE/ace/UTF32_Encoding_Converter.cpp index 22bd9fac0004d..9312fbe4acb23 100644 --- a/ACE/ace/UTF32_Encoding_Converter.cpp +++ b/ACE/ace/UTF32_Encoding_Converter.cpp @@ -34,7 +34,7 @@ ACE_UTF32_Encoding_Converter::ACE_UTF32_Encoding_Converter (bool swap) { } -ACE_UTF32_Encoding_Converter::~ACE_UTF32_Encoding_Converter (void) +ACE_UTF32_Encoding_Converter::~ACE_UTF32_Encoding_Converter () { } diff --git a/ACE/ace/UTF32_Encoding_Converter.h b/ACE/ace/UTF32_Encoding_Converter.h index ab7b9d14e9ff4..22b20cc68c628 100644 --- a/ACE/ace/UTF32_Encoding_Converter.h +++ b/ACE/ace/UTF32_Encoding_Converter.h @@ -32,7 +32,7 @@ class ACE_UTF32_Encoding_Converter: public ACE_UTF16_Encoding_Converter ACE_UTF32_Encoding_Converter (bool swap = false); /// This is a do nothing destructor. - virtual ~ACE_UTF32_Encoding_Converter (void); + virtual ~ACE_UTF32_Encoding_Converter (); /// Convert the source from UTF-32 to UTF-8 and store it in the /// provided target buffer. diff --git a/ACE/ace/UTF8_Encoding_Converter.cpp b/ACE/ace/UTF8_Encoding_Converter.cpp index a618ba403177d..f515f3f1bfd75 100644 --- a/ACE/ace/UTF8_Encoding_Converter.cpp +++ b/ACE/ace/UTF8_Encoding_Converter.cpp @@ -8,7 +8,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_UTF8_Encoding_Converter::ACE_UTF8_Encoding_Converter (void) +ACE_UTF8_Encoding_Converter::ACE_UTF8_Encoding_Converter () : native_ (0) { // Choose a converter for the ASCII or UTF-8 string to a wide character @@ -25,7 +25,7 @@ ACE_UTF8_Encoding_Converter::ACE_UTF8_Encoding_Converter (void) } } -ACE_UTF8_Encoding_Converter::~ACE_UTF8_Encoding_Converter (void) +ACE_UTF8_Encoding_Converter::~ACE_UTF8_Encoding_Converter () { delete native_; } diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h index 33f5018fcdab0..664e25259ee33 100644 --- a/ACE/ace/UUID.h +++ b/ACE/ace/UUID.h @@ -199,7 +199,6 @@ namespace ACE_Utils class ACE_Export UUID_Generator { public: - enum {ACE_UUID_CLOCK_SEQ_MASK = 0x3FFF}; /// Default constructor. diff --git a/ACE/ace/Unbounded_Queue.cpp b/ACE/ace/Unbounded_Queue.cpp index e12fd39327f15..7060135f22f8a 100644 --- a/ACE/ace/Unbounded_Queue.cpp +++ b/ACE/ace/Unbounded_Queue.cpp @@ -25,7 +25,7 @@ ACE_Unbounded_Queue::ACE_Unbounded_Queue (ACE_Allocator *alloc) cur_size_ (0), allocator_ (alloc) { - // ACE_TRACE ("ACE_Unbounded_Queue::ACE_Unbounded_Queue (void)"); + // ACE_TRACE ("ACE_Unbounded_Queue::ACE_Unbounded_Queue ()"); if (this->allocator_ == 0) this->allocator_ = ACE_Allocator::instance (); @@ -145,7 +145,7 @@ ACE_Unbounded_Queue::delete_nodes () template ACE_Unbounded_Queue::~ACE_Unbounded_Queue () { - // ACE_TRACE ("ACE_Unbounded_Queue::~ACE_Unbounded_Queue (void)"); + // ACE_TRACE ("ACE_Unbounded_Queue::~ACE_Unbounded_Queue ()"); this->delete_nodes (); ACE_DES_FREE_TEMPLATE (head_, diff --git a/ACE/ace/Unbounded_Queue.h b/ACE/ace/Unbounded_Queue.h index f0773b44ccc4b..6d20557c0b5aa 100644 --- a/ACE/ace/Unbounded_Queue.h +++ b/ACE/ace/Unbounded_Queue.h @@ -279,13 +279,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Unbounded_Queue.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Unbounded_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Unbounded_Queue.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_QUEUE_H */ diff --git a/ACE/ace/Unbounded_Set.h b/ACE/ace/Unbounded_Set.h index 2fc19a24a3e59..79fd80c76104d 100644 --- a/ACE/ace/Unbounded_Set.h +++ b/ACE/ace/Unbounded_Set.h @@ -86,13 +86,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Unbounded_Set.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Unbounded_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Unbounded_Set.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_SET_H */ diff --git a/ACE/ace/Unbounded_Set_Ex.cpp b/ACE/ace/Unbounded_Set_Ex.cpp index 7e6ddafdc4a5e..e70e6e1f5496a 100644 --- a/ACE/ace/Unbounded_Set_Ex.cpp +++ b/ACE/ace/Unbounded_Set_Ex.cpp @@ -355,7 +355,7 @@ ACE_Unbounded_Set_Ex_Iterator::operator++ (int) template ACE_Unbounded_Set_Ex_Iterator& ACE_Unbounded_Set_Ex_Iterator::operator++ () { - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::operator++ (void)"); + // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator::operator++ ()"); // prefix operator @@ -462,7 +462,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator::operator++ (int) template ACE_Unbounded_Set_Ex_Const_Iterator& ACE_Unbounded_Set_Ex_Const_Iterator::operator++ () { - // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::operator++ (void)"); + // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator::operator++ ()"); // prefix operator diff --git a/ACE/ace/Unbounded_Set_Ex.h b/ACE/ace/Unbounded_Set_Ex.h index 6b289c0a415cf..e30a8e1a3ba7a 100644 --- a/ACE/ace/Unbounded_Set_Ex.h +++ b/ACE/ace/Unbounded_Set_Ex.h @@ -356,13 +356,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Unbounded_Set_Ex.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Unbounded_Set_Ex.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Unbounded_Set_Ex.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_SET_H */ diff --git a/ACE/ace/Value_Ptr.h b/ACE/ace/Value_Ptr.h index 2f558b98c159a..220184be26386 100644 --- a/ACE/ace/Value_Ptr.h +++ b/ACE/ace/Value_Ptr.h @@ -129,7 +129,6 @@ namespace ACE /// Object owned by this @c Value_Ptr. T * p_; }; - } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h index e4cf710602e84..1674d2856d0ab 100644 --- a/ACE/ace/Vector_T.h +++ b/ACE/ace/Vector_T.h @@ -157,7 +157,7 @@ class ACE_Vector : public ACE_Array * This function dumps the content of the vector. TO BE MOVED out * of this class. It needs to be implemented as a global template * function that accepts a const ACE_Vector<T>, in order to - * make instances of this class compile on Linux, AIX. G++ and xlC + * make instances of this class compile on Linux. G++ and xlC * have template instantiation algoriths, which are different from * the one in Visual C++. The algorithms try to instantiate ALL * methods declared in the template class, regardless of whether the @@ -199,7 +199,6 @@ class ACE_Vector : public ACE_Array ///} protected: - /** * Dynamic size (length) of the vector. */ @@ -261,13 +260,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Vector_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Vector_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Vector_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index 627111d5027e2..1f8a71d8fb85d 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -4,7 +4,7 @@ #define ACE_MAJOR_VERSION 7 #define ACE_MINOR_VERSION 0 -#define ACE_MICRO_VERSION 8 -#define ACE_VERSION "7.0.8" -#define ACE_VERSION_CODE 0x70008 +#define ACE_MICRO_VERSION 11 +#define ACE_VERSION "7.0.11" +#define ACE_VERSION_CODE 0x7000b #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 c08b0e744de35..f5cd8859ebb58 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -60,7 +60,7 @@ ACE_WFMO_Reactor_Handler_Repository::open (size_t size) return 0; } -ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository (void) +ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository () { // Free up dynamically allocated space delete [] this->current_handles_; @@ -577,7 +577,7 @@ ACE_WFMO_Reactor_Handler_Repository::resume_handler_i (ACE_HANDLE handle, } void -ACE_WFMO_Reactor_Handler_Repository::unbind_all (void) +ACE_WFMO_Reactor_Handler_Repository::unbind_all () { { ACE_GUARD (ACE_Process_Mutex, ace_mon, this->wfmo_reactor_.lock_); @@ -666,7 +666,7 @@ ACE_WFMO_Reactor_Handler_Repository::bind_i (bool io_entry, } int -ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void) +ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos () { // Go through the entire valid array and check for all handles that // have been schedule for deletion @@ -778,7 +778,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void) } int -ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void) +ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos () { // Go through the array if (this->handles_to_be_deleted_ > 0 || this->handles_to_be_resumed_ > 0) @@ -886,7 +886,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void) } int -ACE_WFMO_Reactor_Handler_Repository::make_changes_in_to_be_added_infos (void) +ACE_WFMO_Reactor_Handler_Repository::make_changes_in_to_be_added_infos () { // Go through the arrays for (size_t i = 0; i < this->handles_to_be_added_; ++i) @@ -1295,7 +1295,7 @@ ACE_WFMO_Reactor::timer_queue (ACE_Timer_Queue *tq) } int -ACE_WFMO_Reactor::close (void) +ACE_WFMO_Reactor::close () { // This GUARD is necessary since we are updating shared state. ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); @@ -1343,7 +1343,7 @@ ACE_WFMO_Reactor::close (void) return 0; } -ACE_WFMO_Reactor::~ACE_WFMO_Reactor (void) +ACE_WFMO_Reactor::~ACE_WFMO_Reactor () { // Assumption: No threads are left in the Reactor when this method // is called (i.e., active_threads_ == 0) @@ -1484,7 +1484,6 @@ ACE_WFMO_Reactor::mask_ops_i (ACE_HANDLE io_handle, } - int ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_handle, ACE_Reactor_Mask new_masks, @@ -1759,48 +1758,7 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, // will not be able to dispatch it // We need to wait for both the and event. - // If not on WinCE, use WaitForMultipleObjects() to wait for both atomically. - // On WinCE, the waitAll arg to WFMO must be false, so wait for the - // ok_to_wait_ event first (since that's likely to take the longest) then - // grab the lock and recheck the ok_to_wait_ event. When we can get them - // both, or there's an error/timeout, return. -#if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (alertable); - ACE_Time_Value timeout; - if (max_wait_time != 0) - { - timeout = ACE_OS::gettimeofday (); - timeout += *max_wait_time; - } - while (1) - { - int status; - if (max_wait_time == 0) - status = this->ok_to_wait_.wait (); - else - status = this->ok_to_wait_.wait (&timeout); - if (status == -1) - return -1; - // The event is signaled, so it's ok to wait; grab the lock and - // recheck the event. If something has changed, restart the wait. - if (max_wait_time == 0) - status = this->lock_.acquire (); - else - { - status = this->lock_.acquire (timeout); - } - if (status == -1) - return -1; - - // Have the lock_, now re-check the event. If it's not signaled, - // another thread changed something so go back and wait again. - if (this->ok_to_wait_.wait (&ACE_Time_Value::zero, 0) == 0) - break; - this->lock_.release (); - } - return 1; - -#else + // Use WaitForMultipleObjects() to wait for both atomically. int timeout = max_wait_time == 0 ? INFINITE : max_wait_time->msec (); DWORD result = 0; while (1) @@ -1844,7 +1802,6 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, // It is ok to enter ::WaitForMultipleObjects return 1; -#endif /* ACE_HAS_WINCE */ } DWORD @@ -1855,7 +1812,7 @@ ACE_WFMO_Reactor::wait_for_multiple_events (int timeout, // If is enabled allow asynchronous completion of // ReadFile and WriteFile operations. -#if defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_PHARLAP) // PharLap doesn't do async I/O and doesn't implement // WaitForMultipleObjectsEx, so use WaitForMultipleObjects. ACE_UNUSED_ARG (alertable); @@ -1921,16 +1878,11 @@ ACE_WFMO_Reactor::dispatch (DWORD wait_status) case WAIT_FAILED: // Failure. ACE_OS::set_errno_to_last_error (); return -1; - case WAIT_TIMEOUT: // Timeout. errno = ETIME; return handlers_dispatched; - -#ifndef ACE_HAS_WINCE case WAIT_IO_COMPLETION: // APC. return handlers_dispatched; -#endif // ACE_HAS_WINCE - default: // Dispatch. // We'll let dispatch worry about abandoned mutes. handlers_dispatched += this->dispatch_handles (wait_status); @@ -2265,7 +2217,7 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler, int -ACE_WFMO_Reactor::update_state (void) +ACE_WFMO_Reactor::update_state () { // This GUARD is necessary since we are updating shared state. ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1); @@ -2367,7 +2319,7 @@ ACE_WFMO_Reactor_Notify::is_dispatchable (ACE_Notification_Buffer & /*buffer*/) } ACE_HANDLE -ACE_WFMO_Reactor_Notify::notify_handle (void) +ACE_WFMO_Reactor_Notify::notify_handle () { return ACE_INVALID_HANDLE; } @@ -2386,7 +2338,7 @@ ACE_WFMO_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &) } int -ACE_WFMO_Reactor_Notify::close (void) +ACE_WFMO_Reactor_Notify::close () { return -1; } @@ -2573,7 +2525,7 @@ ACE_WFMO_Reactor_Notify::max_notify_iterations (int iterations) } int -ACE_WFMO_Reactor_Notify::max_notify_iterations (void) +ACE_WFMO_Reactor_Notify::max_notify_iterations () { ACE_TRACE ("ACE_WFMO_Reactor_Notify::max_notify_iterations"); return this->max_notify_iterations_; @@ -2703,7 +2655,7 @@ ACE_WFMO_Reactor::max_notify_iterations (int iterations) } int -ACE_WFMO_Reactor::max_notify_iterations (void) +ACE_WFMO_Reactor::max_notify_iterations () { ACE_TRACE ("ACE_WFMO_Reactor::max_notify_iterations"); ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1); @@ -2723,7 +2675,7 @@ ACE_WFMO_Reactor::purge_pending_notifications (ACE_Event_Handler *eh, } int -ACE_WFMO_Reactor::resumable_handler (void) +ACE_WFMO_Reactor::resumable_handler () { ACE_TRACE ("ACE_WFMO_Reactor::resumable_handler"); return 0; diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h index 92eed922bb948..05ebf813b9fa5 100644 --- a/ACE/ace/WFMO_Reactor.h +++ b/ACE/ace/WFMO_Reactor.h @@ -154,10 +154,10 @@ class ACE_Export ACE_WFMO_Reactor_Handler_Repository ACE_Reactor_Mask close_masks_; /// Constructor used for initializing the structure - Common_Info (void); + Common_Info (); /// Reset the state of the structure - void reset (void); + void reset (); /// Set the structure to these new values void set (bool io_entry, @@ -297,13 +297,13 @@ class ACE_Export ACE_WFMO_Reactor_Handler_Repository ACE_WFMO_Reactor_Handler_Repository (ACE_WFMO_Reactor &wfmo_reactor); /// Destructor. - virtual ~ACE_WFMO_Reactor_Handler_Repository (void); + virtual ~ACE_WFMO_Reactor_Handler_Repository (); /// Initialize the repository of the appropriate @a size. int open (size_t size); /// Close down the handler repository. - int close (void); + int close (); // = Search structure operations. @@ -326,7 +326,7 @@ class ACE_Export ACE_WFMO_Reactor_Handler_Repository bool &changes_required); /// Remove all bindings of tuples. - void unbind_all (void); + void unbind_all (); // = Sanity checking. @@ -346,10 +346,10 @@ class ACE_Export ACE_WFMO_Reactor_Handler_Repository Current_Info *current_info () const; /// Check if changes to the handle set are required. - virtual bool changes_required (void); + virtual bool changes_required (); /// Make changes to the handle set - virtual int make_changes (void); + virtual int make_changes (); /// Check to see if @a slot has been scheduled for deletion int scheduled_for_deletion (size_t slot) const; @@ -383,14 +383,14 @@ class ACE_Export ACE_WFMO_Reactor_Handler_Repository bool &changes_required); /// Deletions and suspensions in current_info_ - int make_changes_in_current_infos (void); + int make_changes_in_current_infos (); /// Deletions and resumptions in current_suspended_info_ - int make_changes_in_suspension_infos (void); + int make_changes_in_suspension_infos (); /// Deletions in to_be_added_info_, or transfers to current_info_ or /// current_suspended_info_ from to_be_added_info_ - int make_changes_in_to_be_added_infos (void); + int make_changes_in_to_be_added_infos (); /// Removes the ACE_Event_Handler at @a slot from the table. int remove_handler_i (size_t slot, @@ -469,7 +469,6 @@ class ACE_Export ACE_WFMO_Reactor_Handler_Repository /// Number of records to be deleted size_t handles_to_be_deleted_; - }; /** @@ -499,7 +498,7 @@ class ACE_Export ACE_WFMO_Reactor_Notify : public ACE_Reactor_Notify int disable_notify = 0); /// No-op. - virtual int close (void); + virtual int close (); /** * Special trick to unblock when updates @@ -524,7 +523,7 @@ class ACE_Export ACE_WFMO_Reactor_Notify : public ACE_Reactor_Notify /// Returns the ACE_HANDLE of the notify pipe on which the reactor /// is listening for notifications so that other threads can unblock /// the - virtual ACE_HANDLE notify_handle (void); + virtual ACE_HANDLE notify_handle (); /// Handle one of the notify call on the . This could be /// because of a thread trying to unblock the @@ -559,7 +558,7 @@ class ACE_Export ACE_WFMO_Reactor_Notify : public ACE_Reactor_Notify * notify queue before breaking out of its * ACE_Message_Queue::dequeue() loop. */ - int max_notify_iterations (void); + int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -707,10 +706,10 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl virtual ACE_Timer_Queue *timer_queue () const; /// Close down the ACE_WFMO_Reactor and release all of its resources. - virtual int close (void); + virtual int close (); /// Close down the ACE_WFMO_Reactor and release all of its resources. - virtual ~ACE_WFMO_Reactor (void); + virtual ~ACE_WFMO_Reactor (); // = Event loop drivers. @@ -767,7 +766,7 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl * actively handling events. If it returns non-zero, and * return -1 immediately. */ - virtual int deactivated (void); + virtual int deactivated (); /** * Control whether the Reactor will handle any more incoming events or not. @@ -910,7 +909,7 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl virtual int suspend_handler (const ACE_Handle_Set &handles); /// Suspend all handles temporarily. - virtual int suspend_handlers (void); + virtual int suspend_handlers (); /// Resume @a event_handler. Use to /// get the handle. @@ -923,13 +922,13 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl virtual int resume_handler (const ACE_Handle_Set &handles); /// Resume all . - virtual int resume_handlers (void); + virtual int resume_handlers (); /// Does the reactor allow the application to resume the handle on /// its own ie. can it pass on the control of handle resumption to /// the application. A positive value indicates that the handlers /// are application resumable. A value of 0 indicates otherwise. - virtual int resumable_handler (void); + virtual int resumable_handler (); /** * Return true if we any event associations were made by the reactor @@ -937,7 +936,7 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl * WFMO_Reactor does use event associations, this function always * return true. */ - virtual bool uses_event_associations (void); + virtual bool uses_event_associations (); // Timer management. @@ -1059,7 +1058,7 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl * notify queue before breaking out of its * loop. */ - virtual int max_notify_iterations (void); + virtual int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -1096,18 +1095,18 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl /// Returns true if WFMO_Reactor has been successfully initialized, else /// false. - virtual bool initialized (void); + virtual bool initialized (); /// Returns the current size of the WFMO_Reactor's internal /// descriptor table. virtual size_t size () const; /// Returns a reference to the WFMO_Reactor's internal lock. - virtual ACE_Lock &lock (void); + virtual ACE_Lock &lock (); /// Wake up all threads in WaitForMultipleObjects so that they can /// reconsult the handle set - virtual void wakeup_all_threads (void); + virtual void wakeup_all_threads (); /** * Transfers ownership of the WFMO_Reactor to the @a new_owner. The @@ -1120,7 +1119,7 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl virtual int owner (ACE_thread_t *owner); /// Get the existing restart value. - virtual bool restart (void); + virtual bool restart (); /// Set a new value for restart and return the original value. virtual bool restart (bool r); @@ -1129,7 +1128,7 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl virtual void requeue_position (int); /// Not implemented - virtual int requeue_position (void); + virtual int requeue_position (); // = Low-level wait_set mask manipulation methods. @@ -1186,7 +1185,7 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl int operation); /// Return the ID of the "owner" thread. Does not do any locking. - virtual ACE_thread_t owner_i (void); + virtual ACE_thread_t owner_i (); /// Wait up to @a max_wait_time until it's ok to enter /// WaitForMultipleObjects. Returns 1 (and holding lock_) if ok to wait; @@ -1203,7 +1202,7 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl /// Expire timers. Only the owner thread does useful stuff in this /// function. - virtual int expire_timers (void); + virtual int expire_timers (); /// Dispatches the timers and I/O handlers. virtual int dispatch (DWORD wait_status); @@ -1235,7 +1234,7 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl ACE_HANDLE event_handle); /// Dispatches window messages. Noop for WFMO_Reactor. - virtual int dispatch_window_messages (void); + virtual int dispatch_window_messages (); virtual ACE_Reactor_Mask upcall (ACE_Event_Handler *event_handler, ACE_HANDLE io_handle, @@ -1245,13 +1244,13 @@ class ACE_Export ACE_WFMO_Reactor : public ACE_Reactor_Impl virtual int calculate_timeout (ACE_Time_Value *time); /// Update the state of the handler repository - virtual int update_state (void); + virtual int update_state (); /// Check to see if we have a new owner - virtual int new_owner (void); + virtual int new_owner (); /// Set owner to new owner - virtual int change_owner (void); + virtual int change_owner (); /// Handle signals without requiring global/static variables. ACE_Sig_Handler *signal_handler_; diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl index 5d1993b77a222..6a78f29437ac0 100644 --- a/ACE/ace/WFMO_Reactor.inl +++ b/ACE/ace/WFMO_Reactor.inl @@ -23,7 +23,7 @@ ACE_Wakeup_All_Threads_Handler::handle_signal (int /* signum */, siginfo_t * /* /************************************************************/ ACE_INLINE -ACE_WFMO_Reactor_Handler_Repository::Common_Info::Common_Info (void) +ACE_WFMO_Reactor_Handler_Repository::Common_Info::Common_Info () : io_entry_ (false), event_handler_ (0), io_handle_ (ACE_INVALID_HANDLE), @@ -35,7 +35,7 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::Common_Info (void) } ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Common_Info::reset (void) +ACE_WFMO_Reactor_Handler_Repository::Common_Info::reset () { this->event_handler_ = 0; this->io_entry_ = false; @@ -113,7 +113,7 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump () const /************************************************************/ ACE_INLINE -ACE_WFMO_Reactor_Handler_Repository::Current_Info::Current_Info (void) +ACE_WFMO_Reactor_Handler_Repository::Current_Info::Current_Info () : suspend_entry_ (false) { } @@ -147,7 +147,7 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::set (Common_Info &common_info } ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Current_Info::reset (void) +ACE_WFMO_Reactor_Handler_Repository::Current_Info::reset () { this->suspend_entry_ = false; Common_Info::reset (); @@ -180,7 +180,7 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump (ACE_HANDLE event_handle /************************************************************/ ACE_INLINE -ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::To_Be_Added_Info (void) +ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::To_Be_Added_Info () : event_handle_ (ACE_INVALID_HANDLE), suspend_entry_ (false) { @@ -219,7 +219,7 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::set (ACE_HANDLE event_han } ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::reset (void) +ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::reset () { this->event_handle_ = ACE_INVALID_HANDLE; this->suspend_entry_ = false; @@ -251,14 +251,14 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump () const /************************************************************/ ACE_INLINE -ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::Suspended_Info (void) +ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::Suspended_Info () : event_handle_ (ACE_INVALID_HANDLE), resume_entry_ (false) { } ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::reset (void) +ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::reset () { this->event_handle_ = ACE_INVALID_HANDLE; this->resume_entry_ = false; @@ -322,7 +322,7 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump () const /************************************************************/ ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::close (void) +ACE_WFMO_Reactor_Handler_Repository::close () { // Let all the handlers know that the is closing down this->unbind_all (); @@ -388,7 +388,7 @@ ACE_WFMO_Reactor_Handler_Repository::invalid_handle (ACE_HANDLE handle) const } ACE_INLINE bool -ACE_WFMO_Reactor_Handler_Repository::changes_required (void) +ACE_WFMO_Reactor_Handler_Repository::changes_required () { // Check if handles have be scheduled for additions or removal return this->handles_to_be_added_ > 0 @@ -398,7 +398,7 @@ ACE_WFMO_Reactor_Handler_Repository::changes_required (void) } ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::make_changes (void) +ACE_WFMO_Reactor_Handler_Repository::make_changes () { // This method must ONLY be called by the // change_state_thread_>. We therefore assume that @@ -721,7 +721,7 @@ ACE_WFMO_Reactor::suspend_handler (const ACE_Handle_Set &handles) } ACE_INLINE int -ACE_WFMO_Reactor::suspend_handlers (void) +ACE_WFMO_Reactor::suspend_handlers () { bool error = false; int result = 0; @@ -816,7 +816,7 @@ ACE_WFMO_Reactor::resume_handler (const ACE_Handle_Set &handles) } ACE_INLINE int -ACE_WFMO_Reactor::resume_handlers (void) +ACE_WFMO_Reactor::resume_handlers () { bool error = false; int result = 0; @@ -863,7 +863,7 @@ ACE_WFMO_Reactor::resume_handlers (void) } ACE_INLINE bool -ACE_WFMO_Reactor::uses_event_associations (void) +ACE_WFMO_Reactor::uses_event_associations () { // Since the WFMO_Reactor does use event associations, this function // always return 1. @@ -895,7 +895,7 @@ ACE_WFMO_Reactor::alertable_handle_events (ACE_Time_Value *how_long) } ACE_INLINE int -ACE_WFMO_Reactor::deactivated (void) +ACE_WFMO_Reactor::deactivated () { return this->deactivated_; } @@ -916,7 +916,7 @@ ACE_WFMO_Reactor::owner (ACE_thread_t *t) } ACE_INLINE ACE_thread_t -ACE_WFMO_Reactor::owner_i (void) +ACE_WFMO_Reactor::owner_i () { return this->owner_; } @@ -938,13 +938,13 @@ ACE_WFMO_Reactor::owner (ACE_thread_t new_owner, ACE_thread_t *old_owner) } ACE_INLINE int -ACE_WFMO_Reactor::new_owner (void) +ACE_WFMO_Reactor::new_owner () { return this->new_owner_ != ACE_thread_t (0); } ACE_INLINE int -ACE_WFMO_Reactor::change_owner (void) +ACE_WFMO_Reactor::change_owner () { this->owner_ = this->new_owner_; this->new_owner_ = ACE_thread_t (0); @@ -968,13 +968,13 @@ ACE_WFMO_Reactor::safe_dispatch (DWORD wait_status) } ACE_INLINE int -ACE_WFMO_Reactor::dispatch_window_messages (void) +ACE_WFMO_Reactor::dispatch_window_messages () { return 0; } ACE_INLINE void -ACE_WFMO_Reactor::wakeup_all_threads (void) +ACE_WFMO_Reactor::wakeup_all_threads () { this->wakeup_all_threads_.signal (); } @@ -1095,14 +1095,14 @@ ACE_WFMO_Reactor::requeue_position (int) } ACE_INLINE int -ACE_WFMO_Reactor::requeue_position (void) +ACE_WFMO_Reactor::requeue_position () { // Don't have an implementation for this yet... ACE_NOTSUP_RETURN (-1); } ACE_INLINE bool -ACE_WFMO_Reactor::restart (void) +ACE_WFMO_Reactor::restart () { return false; } @@ -1155,13 +1155,13 @@ ACE_WFMO_Reactor::handler (ACE_HANDLE handle, } ACE_INLINE bool -ACE_WFMO_Reactor::initialized (void) +ACE_WFMO_Reactor::initialized () { return this->open_for_business_; } ACE_INLINE ACE_Lock & -ACE_WFMO_Reactor::lock (void) +ACE_WFMO_Reactor::lock () { return this->lock_adapter_; } @@ -1174,19 +1174,19 @@ ACE_WFMO_Reactor::size () const } #else ACE_INLINE bool -ACE_WFMO_Reactor_Handler_Repository::changes_required (void) +ACE_WFMO_Reactor_Handler_Repository::changes_required () { return false; } ACE_INLINE int -ACE_WFMO_Reactor_Handler_Repository::make_changes (void) +ACE_WFMO_Reactor_Handler_Repository::make_changes () { return 0; } ACE_INLINE -ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository (void) +ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository () { } diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp index 9866721da19f3..d445397f90e2b 100644 --- a/ACE/ace/WIN32_Asynch_IO.cpp +++ b/ACE/ace/WIN32_Asynch_IO.cpp @@ -103,7 +103,7 @@ ACE_WIN32_Asynch_Result::set_error (u_long errcode) this->error_ = errcode; } -ACE_WIN32_Asynch_Result::~ACE_WIN32_Asynch_Result (void) +ACE_WIN32_Asynch_Result::~ACE_WIN32_Asynch_Result () { } @@ -166,7 +166,7 @@ ACE_WIN32_Asynch_Operation::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Operation::cancel (void) +ACE_WIN32_Asynch_Operation::cancel () { #if defined (ACE_HAS_CANCEL_IO) // All I/O operations that are canceled will complete with the error @@ -203,7 +203,7 @@ ACE_WIN32_Asynch_Operation::ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win3 { } -ACE_WIN32_Asynch_Operation::~ACE_WIN32_Asynch_Operation (void) +ACE_WIN32_Asynch_Operation::~ACE_WIN32_Asynch_Operation () { } @@ -294,7 +294,7 @@ ACE_WIN32_Asynch_Read_Stream_Result::complete (size_t bytes_transferred, handler->handle_read_stream (result); } -ACE_WIN32_Asynch_Read_Stream_Result::~ACE_WIN32_Asynch_Read_Stream_Result (void) +ACE_WIN32_Asynch_Read_Stream_Result::~ACE_WIN32_Asynch_Read_Stream_Result () { } @@ -562,7 +562,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, #endif /* ACE_HAS_WINSOCK2 && ACE_HAS_WINSOCK2 != 0 */ } -ACE_WIN32_Asynch_Read_Stream::~ACE_WIN32_Asynch_Read_Stream (void) +ACE_WIN32_Asynch_Read_Stream::~ACE_WIN32_Asynch_Read_Stream () { } @@ -632,7 +632,7 @@ ACE_WIN32_Asynch_Read_Stream::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Read_Stream::cancel (void) +ACE_WIN32_Asynch_Read_Stream::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -723,7 +723,7 @@ ACE_WIN32_Asynch_Write_Stream_Result::complete (size_t bytes_transferred, handler->handle_write_stream (result); } -ACE_WIN32_Asynch_Write_Stream_Result::~ACE_WIN32_Asynch_Write_Stream_Result (void) +ACE_WIN32_Asynch_Write_Stream_Result::~ACE_WIN32_Asynch_Write_Stream_Result () { } @@ -1039,7 +1039,7 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, #endif /* ACE_HAS_WINSOCK2 && ACE_HAS_WINSOCK2 != 0 */ } -ACE_WIN32_Asynch_Write_Stream::~ACE_WIN32_Asynch_Write_Stream (void) +ACE_WIN32_Asynch_Write_Stream::~ACE_WIN32_Asynch_Write_Stream () { } @@ -1060,7 +1060,7 @@ ACE_WIN32_Asynch_Write_Stream::open (const ACE_Handler::Proxy_Ptr &handler_proxy } int -ACE_WIN32_Asynch_Write_Stream::cancel (void) +ACE_WIN32_Asynch_Write_Stream::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -1147,7 +1147,7 @@ ACE_WIN32_Asynch_Read_File_Result::complete (size_t bytes_transferred, handler->handle_read_file (result); } -ACE_WIN32_Asynch_Read_File_Result::~ACE_WIN32_Asynch_Read_File_Result (void) +ACE_WIN32_Asynch_Read_File_Result::~ACE_WIN32_Asynch_Read_File_Result () { } @@ -1413,7 +1413,7 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, } -ACE_WIN32_Asynch_Read_File::~ACE_WIN32_Asynch_Read_File (void) +ACE_WIN32_Asynch_Read_File::~ACE_WIN32_Asynch_Read_File () { } @@ -1462,7 +1462,7 @@ ACE_WIN32_Asynch_Read_File::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Read_File::cancel (void) +ACE_WIN32_Asynch_Read_File::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -1550,7 +1550,7 @@ ACE_WIN32_Asynch_Write_File_Result::complete (size_t bytes_transferred, handler->handle_write_file (result); } -ACE_WIN32_Asynch_Write_File_Result::~ACE_WIN32_Asynch_Write_File_Result (void) +ACE_WIN32_Asynch_Write_File_Result::~ACE_WIN32_Asynch_Write_File_Result () { } @@ -1858,7 +1858,7 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, } -ACE_WIN32_Asynch_Write_File::~ACE_WIN32_Asynch_Write_File (void) +ACE_WIN32_Asynch_Write_File::~ACE_WIN32_Asynch_Write_File () { } @@ -1909,7 +1909,7 @@ ACE_WIN32_Asynch_Write_File::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Write_File::cancel (void) +ACE_WIN32_Asynch_Write_File::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -2000,7 +2000,7 @@ ACE_WIN32_Asynch_Accept_Result::complete (size_t bytes_transferred, handler->handle_accept (result); } -ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result (void) +ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result () { } @@ -2205,7 +2205,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, #endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */ } -ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept (void) +ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept () { } @@ -2226,7 +2226,7 @@ ACE_WIN32_Asynch_Accept::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Accept::cancel (void) +ACE_WIN32_Asynch_Accept::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -2288,7 +2288,7 @@ ACE_WIN32_Asynch_Connect_Result::complete (size_t bytes_transferred, handler->handle_connect (result); } -ACE_WIN32_Asynch_Connect_Result::~ACE_WIN32_Asynch_Connect_Result (void) +ACE_WIN32_Asynch_Connect_Result::~ACE_WIN32_Asynch_Connect_Result () { } @@ -2371,7 +2371,7 @@ ACE_WIN32_Asynch_Connect::ACE_WIN32_Asynch_Connect (ACE_WIN32_Proactor * win32_p { } -ACE_WIN32_Asynch_Connect::~ACE_WIN32_Asynch_Connect (void) +ACE_WIN32_Asynch_Connect::~ACE_WIN32_Asynch_Connect () { this->close (); this->reactor (0); // to avoid purge_pending_notifications @@ -2386,7 +2386,6 @@ ACE_WIN32_Asynch_Connect::proactor () const ACE_HANDLE ACE_WIN32_Asynch_Connect::get_handle () const { - ACE_ASSERT (0); return ACE_INVALID_HANDLE; } @@ -2678,7 +2677,7 @@ ACE_WIN32_Asynch_Connect::cancel_uncompleted (bool flg_notify, } int -ACE_WIN32_Asynch_Connect::cancel (void) +ACE_WIN32_Asynch_Connect::cancel () { ACE_TRACE ("ACE_WIN32_Asynch_Connect::cancel"); @@ -2707,7 +2706,7 @@ ACE_WIN32_Asynch_Connect::cancel (void) } int -ACE_WIN32_Asynch_Connect::close (void) +ACE_WIN32_Asynch_Connect::close () { ACE_TRACE ("ACE_WIN32_Asynch_Connect::close"); @@ -2912,7 +2911,7 @@ ACE_WIN32_Asynch_Transmit_File_Result::complete (size_t bytes_transferred, handler->handle_transmit_file (result); } -ACE_WIN32_Asynch_Transmit_File_Result::~ACE_WIN32_Asynch_Transmit_File_Result (void) +ACE_WIN32_Asynch_Transmit_File_Result::~ACE_WIN32_Asynch_Transmit_File_Result () { } @@ -3087,7 +3086,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_WINSOCK2 */ } -ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File (void) +ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File () { } @@ -3108,7 +3107,7 @@ ACE_WIN32_Asynch_Transmit_File::open (const ACE_Handler::Proxy_Ptr &handler_prox } int -ACE_WIN32_Asynch_Transmit_File::cancel (void) +ACE_WIN32_Asynch_Transmit_File::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -3301,14 +3300,14 @@ ACE_WIN32_Asynch_Read_Dgram_Result::complete (size_t bytes_transferred, handler->handle_read_dgram (result); } -ACE_WIN32_Asynch_Read_Dgram_Result::~ACE_WIN32_Asynch_Read_Dgram_Result (void) +ACE_WIN32_Asynch_Read_Dgram_Result::~ACE_WIN32_Asynch_Read_Dgram_Result () { delete this->remote_address_; } //*************************************************************************** -ACE_WIN32_Asynch_Read_Dgram::~ACE_WIN32_Asynch_Read_Dgram (void) +ACE_WIN32_Asynch_Read_Dgram::~ACE_WIN32_Asynch_Read_Dgram () { } @@ -3461,7 +3460,7 @@ ACE_WIN32_Asynch_Read_Dgram::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Read_Dgram::cancel (void) +ACE_WIN32_Asynch_Read_Dgram::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -3633,14 +3632,14 @@ ACE_WIN32_Asynch_Write_Dgram_Result::complete (size_t bytes_transferred, handler->handle_write_dgram (result); } -ACE_WIN32_Asynch_Write_Dgram_Result::~ACE_WIN32_Asynch_Write_Dgram_Result (void) +ACE_WIN32_Asynch_Write_Dgram_Result::~ACE_WIN32_Asynch_Write_Dgram_Result () { } //*********************************************** -ACE_WIN32_Asynch_Write_Dgram::~ACE_WIN32_Asynch_Write_Dgram (void) +ACE_WIN32_Asynch_Write_Dgram::~ACE_WIN32_Asynch_Write_Dgram () { } @@ -3786,7 +3785,7 @@ ACE_WIN32_Asynch_Write_Dgram::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Write_Dgram::cancel (void) +ACE_WIN32_Asynch_Write_Dgram::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } diff --git a/ACE/ace/WIN32_Asynch_IO.h b/ACE/ace/WIN32_Asynch_IO.h index 42d91ee4ca589..b9607e06f4dec 100644 --- a/ACE/ace/WIN32_Asynch_IO.h +++ b/ACE/ace/WIN32_Asynch_IO.h @@ -105,7 +105,7 @@ class ACE_Export ACE_WIN32_Asynch_Result : public virtual ACE_Asynch_Result_Impl int post_completion (ACE_Proactor_Impl *proactor); /// Destructor. - virtual ~ACE_WIN32_Asynch_Result (void); + virtual ~ACE_WIN32_Asynch_Result (); /// Simulate error value to use in the post_completion() void set_error (u_long errcode); @@ -167,7 +167,7 @@ class ACE_Export ACE_WIN32_Asynch_Operation : public virtual ACE_Asynch_Operatio * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); // = Access methods. @@ -179,7 +179,7 @@ class ACE_Export ACE_WIN32_Asynch_Operation : public virtual ACE_Asynch_Operatio ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win32_proactor); /// Destructor. - virtual ~ACE_WIN32_Asynch_Operation (void); + virtual ~ACE_WIN32_Asynch_Operation (); /// Win32 Proactor. ACE_WIN32_Proactor *win32_proactor_; @@ -284,7 +284,7 @@ class ACE_Export ACE_WIN32_Asynch_Read_Stream_Result : public virtual ACE_Asynch u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Stream_Result (void); + virtual ~ACE_WIN32_Asynch_Read_Stream_Result (); /// Bytes requested when the asynchronous read was initiated. size_t bytes_to_read_; @@ -314,7 +314,6 @@ class ACE_Export ACE_WIN32_Asynch_Read_Stream_Result : public virtual ACE_Asynch class ACE_Export ACE_WIN32_Asynch_Read_Stream : public virtual ACE_Asynch_Read_Stream_Impl, public ACE_WIN32_Asynch_Operation { - public: /// Constructor. ACE_WIN32_Asynch_Read_Stream (ACE_WIN32_Proactor *win32_proactor); @@ -338,7 +337,7 @@ class ACE_Export ACE_WIN32_Asynch_Read_Stream : public virtual ACE_Asynch_Read_S int signal_number = 0); /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Stream (void); + virtual ~ACE_WIN32_Asynch_Read_Stream (); // Methods belong to ACE_WIN32_Asynch_Operation base class. These // methods are defined here to avoid VC++ warnings. They route the @@ -360,7 +359,7 @@ class ACE_Export ACE_WIN32_Asynch_Read_Stream : public virtual ACE_Asynch_Read_S * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -461,7 +460,7 @@ class ACE_Export ACE_WIN32_Asynch_Write_Stream_Result : public virtual ACE_Async u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Stream_Result (void); + virtual ~ACE_WIN32_Asynch_Write_Stream_Result (); /// The number of bytes which were requested at the start of the /// asynchronous write. @@ -515,7 +514,7 @@ class ACE_Export ACE_WIN32_Asynch_Write_Stream : public virtual ACE_Asynch_Write int signal_number = 0); /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Stream (void); + virtual ~ACE_WIN32_Asynch_Write_Stream (); // = Methods belonging to base class. @@ -538,7 +537,7 @@ class ACE_Export ACE_WIN32_Asynch_Write_Stream : public virtual ACE_Asynch_Write * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -639,7 +638,7 @@ class ACE_Export ACE_WIN32_Asynch_Read_File_Result : public virtual ACE_Asynch_R u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_File_Result (void); + virtual ~ACE_WIN32_Asynch_Read_File_Result (); }; /** @@ -660,7 +659,6 @@ class ACE_Export ACE_WIN32_Asynch_Read_File_Result : public virtual ACE_Asynch_R class ACE_Export ACE_WIN32_Asynch_Read_File : public virtual ACE_Asynch_Read_File_Impl, public ACE_WIN32_Asynch_Read_Stream { - public: /// Constructor. ACE_WIN32_Asynch_Read_File (ACE_WIN32_Proactor *win32_proactor); @@ -695,7 +693,7 @@ class ACE_Export ACE_WIN32_Asynch_Read_File : public virtual ACE_Asynch_Read_Fil /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_File (void); + virtual ~ACE_WIN32_Asynch_Read_File (); // = Methods belong to ACE_WIN32_Asynch_Operation base class. These // methods are defined here to avoid VC++ warnings. They route the @@ -717,7 +715,7 @@ class ACE_Export ACE_WIN32_Asynch_Read_File : public virtual ACE_Asynch_Read_Fil * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -850,7 +848,7 @@ class ACE_Export ACE_WIN32_Asynch_Write_File_Result : public virtual ACE_Asynch_ u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_File_Result (void); + virtual ~ACE_WIN32_Asynch_Write_File_Result (); }; /** @@ -901,7 +899,7 @@ class ACE_Export ACE_WIN32_Asynch_Write_File : public virtual ACE_Asynch_Write_F int signal_number = 0); /// Destrcutor. - virtual ~ACE_WIN32_Asynch_Write_File (void); + virtual ~ACE_WIN32_Asynch_Write_File (); // = Methods belong to ACE_WIN32_Asynch_Operation base class. These // methods are defined here to avoid VC++ warnings. They route the @@ -923,7 +921,7 @@ class ACE_Export ACE_WIN32_Asynch_Write_File : public virtual ACE_Asynch_Write_F * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -1045,7 +1043,7 @@ class ACE_Export ACE_WIN32_Asynch_Accept_Result : public virtual ACE_Asynch_Acce u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Accept_Result (void); + virtual ~ACE_WIN32_Asynch_Accept_Result (); /// Bytes requested when the asynchronous read was initiated. size_t bytes_to_read_; @@ -1099,7 +1097,7 @@ class ACE_Export ACE_WIN32_Asynch_Accept : public virtual ACE_Asynch_Accept_Impl int addr_family = AF_INET); /// Destructor. - ~ACE_WIN32_Asynch_Accept (void); + ~ACE_WIN32_Asynch_Accept (); // Methods belong to ACE_WIN32_Asynch_Operation base class. These // methods are defined here to avoid VC++ warnings. They route the @@ -1121,7 +1119,7 @@ class ACE_Export ACE_WIN32_Asynch_Accept : public virtual ACE_Asynch_Accept_Impl * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -1147,7 +1145,6 @@ class ACE_Export ACE_WIN32_Asynch_Connect_Result : public virtual ACE_Asynch_Con friend class ACE_WIN32_Proactor; public: - /// I/O handle for the connection. ACE_HANDLE connect_handle () const; @@ -1209,7 +1206,7 @@ class ACE_Export ACE_WIN32_Asynch_Connect_Result : public virtual ACE_Asynch_Con u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Connect_Result (void); + virtual ~ACE_WIN32_Asynch_Connect_Result (); /// Set the I/O handle for the new connection. void connect_handle (ACE_HANDLE handle); @@ -1227,12 +1224,11 @@ class ACE_Export ACE_WIN32_Asynch_Connect : public ACE_Event_Handler { public: - /// Constructor. ACE_WIN32_Asynch_Connect (ACE_WIN32_Proactor * win32_proactor); /// Destructor. - virtual ~ACE_WIN32_Asynch_Connect (void); + virtual ~ACE_WIN32_Asynch_Connect (); /** * This open belongs to ACE_WIN32_Asynch_Operation. We forward @@ -1265,13 +1261,13 @@ class ACE_Export ACE_WIN32_Asynch_Connect : * Cancel all pending pseudo-asynchronus requests * Behavior as usual AIO request */ - int cancel (void); + int cancel (); /** * Close performs cancellation of all pending requests * and close the connect handle */ - int close (void); + int close (); /// Virtual from ACE_Event_Handler ACE_HANDLE get_handle () const; @@ -1439,7 +1435,7 @@ class ACE_Export ACE_WIN32_Asynch_Transmit_File_Result : public virtual ACE_Asyn u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Transmit_File_Result (void); + virtual ~ACE_WIN32_Asynch_Transmit_File_Result (); /// Network I/O handle. ACE_HANDLE socket_; @@ -1511,7 +1507,7 @@ class ACE_Export ACE_WIN32_Asynch_Transmit_File : public virtual ACE_Asynch_Tran int signal_number = 0); /// Destructor. - ~ACE_WIN32_Asynch_Transmit_File (void); + ~ACE_WIN32_Asynch_Transmit_File (); // Methods belong to ACE_WIN32_Asynch_Operation base class. These // methods are defined here to avoid VC++ warnings. They route the @@ -1533,7 +1529,7 @@ class ACE_Export ACE_WIN32_Asynch_Transmit_File : public virtual ACE_Asynch_Tran * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -1635,7 +1631,7 @@ class ACE_Export ACE_WIN32_Asynch_Read_Dgram_Result : public virtual ACE_Asynch_ u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Dgram_Result (void); + virtual ~ACE_WIN32_Asynch_Read_Dgram_Result (); /// Bytes requested when the asynchronous read was initiated. size_t bytes_to_read_; @@ -1675,7 +1671,7 @@ class ACE_Export ACE_WIN32_Asynch_Read_Dgram : public virtual ACE_Asynch_Read_Dg ACE_WIN32_Asynch_Read_Dgram (ACE_WIN32_Proactor *win32_proactor); /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Dgram (void); + virtual ~ACE_WIN32_Asynch_Read_Dgram (); /** This starts off an asynchronous read. Upto * total_size()> will be read and stored in the @@ -1722,14 +1718,14 @@ class ACE_Export ACE_WIN32_Asynch_Read_Dgram : public virtual ACE_Asynch_Read_Dg * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; protected: /// Do-nothing constructor. - ACE_WIN32_Asynch_Read_Dgram (void); + ACE_WIN32_Asynch_Read_Dgram (); }; /** @@ -1822,7 +1818,7 @@ class ACE_Export ACE_WIN32_Asynch_Write_Dgram_Result : public virtual ACE_Asynch u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Dgram_Result (void); + virtual ~ACE_WIN32_Asynch_Write_Dgram_Result (); /// The number of bytes which were requested at the start of the /// asynchronous write. @@ -1858,7 +1854,7 @@ class ACE_Export ACE_WIN32_Asynch_Write_Dgram : public virtual ACE_Asynch_Write_ ACE_WIN32_Asynch_Write_Dgram (ACE_WIN32_Proactor *win32_proactor); /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Dgram (void); + virtual ~ACE_WIN32_Asynch_Write_Dgram (); /** This starts off an asynchronous send. Upto * total_length()> will be sent. @a message_block's @@ -1906,14 +1902,14 @@ class ACE_Export ACE_WIN32_Asynch_Write_Dgram : public virtual ACE_Asynch_Write_ * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; protected: /// Do-nothing constructor. - ACE_WIN32_Asynch_Write_Dgram (void); + ACE_WIN32_Asynch_Write_Dgram (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp index d23e5d3033d24..f697edf8f6bcd 100644 --- a/ACE/ace/WIN32_Proactor.cpp +++ b/ACE/ace/WIN32_Proactor.cpp @@ -21,7 +21,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_WIN32_Wakeup_Completion : public ACE_WIN32_Asynch_Result { - public: /// Constructor. ACE_WIN32_Wakeup_Completion (ACE_Handler::Proxy_Ptr &handler_proxy, @@ -31,7 +30,7 @@ class ACE_WIN32_Wakeup_Completion : public ACE_WIN32_Asynch_Result int signal_number = ACE_SIGRTMIN); /// Destructor. - virtual ~ACE_WIN32_Wakeup_Completion (void); + virtual ~ACE_WIN32_Wakeup_Completion (); /// This method calls the 's method. virtual void complete (size_t bytes_transferred = 0, @@ -60,7 +59,7 @@ ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads, this->get_asynch_pseudo_task ().start (); } -ACE_WIN32_Proactor::~ACE_WIN32_Proactor (void) +ACE_WIN32_Proactor::~ACE_WIN32_Proactor () { this->get_asynch_pseudo_task ().stop (); @@ -74,7 +73,7 @@ ACE_WIN32_Proactor::get_asynch_pseudo_task () } int -ACE_WIN32_Proactor::close (void) +ACE_WIN32_Proactor::close () { // Close the completion port if (this->completion_port_ != 0) @@ -143,7 +142,7 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle, } ACE_Asynch_Read_Stream_Impl * -ACE_WIN32_Proactor::create_asynch_read_stream (void) +ACE_WIN32_Proactor::create_asynch_read_stream () { ACE_Asynch_Read_Stream_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -153,7 +152,7 @@ ACE_WIN32_Proactor::create_asynch_read_stream (void) } ACE_Asynch_Write_Stream_Impl * -ACE_WIN32_Proactor::create_asynch_write_stream (void) +ACE_WIN32_Proactor::create_asynch_write_stream () { ACE_Asynch_Write_Stream_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -163,7 +162,7 @@ ACE_WIN32_Proactor::create_asynch_write_stream (void) } ACE_Asynch_Read_Dgram_Impl * -ACE_WIN32_Proactor::create_asynch_read_dgram (void) +ACE_WIN32_Proactor::create_asynch_read_dgram () { ACE_Asynch_Read_Dgram_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -173,7 +172,7 @@ ACE_WIN32_Proactor::create_asynch_read_dgram (void) } ACE_Asynch_Write_Dgram_Impl * -ACE_WIN32_Proactor::create_asynch_write_dgram (void) +ACE_WIN32_Proactor::create_asynch_write_dgram () { ACE_Asynch_Write_Dgram_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -183,7 +182,7 @@ ACE_WIN32_Proactor::create_asynch_write_dgram (void) } ACE_Asynch_Read_File_Impl * -ACE_WIN32_Proactor::create_asynch_read_file (void) +ACE_WIN32_Proactor::create_asynch_read_file () { ACE_Asynch_Read_File_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -193,7 +192,7 @@ ACE_WIN32_Proactor::create_asynch_read_file (void) } ACE_Asynch_Write_File_Impl * -ACE_WIN32_Proactor::create_asynch_write_file (void) +ACE_WIN32_Proactor::create_asynch_write_file () { ACE_Asynch_Write_File_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -203,7 +202,7 @@ ACE_WIN32_Proactor::create_asynch_write_file (void) } ACE_Asynch_Accept_Impl * -ACE_WIN32_Proactor::create_asynch_accept (void) +ACE_WIN32_Proactor::create_asynch_accept () { ACE_Asynch_Accept_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -213,7 +212,7 @@ ACE_WIN32_Proactor::create_asynch_accept (void) } ACE_Asynch_Connect_Impl * -ACE_WIN32_Proactor::create_asynch_connect (void) +ACE_WIN32_Proactor::create_asynch_connect () { ACE_Asynch_Connect_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -223,7 +222,7 @@ ACE_WIN32_Proactor::create_asynch_connect (void) } ACE_Asynch_Transmit_File_Impl * -ACE_WIN32_Proactor::create_asynch_transmit_file (void) +ACE_WIN32_Proactor::create_asynch_transmit_file () { ACE_Asynch_Transmit_File_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -550,7 +549,7 @@ ACE_WIN32_Proactor::handle_events (ACE_Time_Value &wait_time) } int -ACE_WIN32_Proactor::handle_events (void) +ACE_WIN32_Proactor::handle_events () { return this->handle_events (ACE_INFINITE); } @@ -722,7 +721,7 @@ ACE_WIN32_Proactor::post_wakeup_completions (int how_many) } int -ACE_WIN32_Proactor::wake_up_dispatch_threads (void) +ACE_WIN32_Proactor::wake_up_dispatch_threads () { return 0; } @@ -782,7 +781,7 @@ ACE_WIN32_Wakeup_Completion::ACE_WIN32_Wakeup_Completion { } -ACE_WIN32_Wakeup_Completion::~ACE_WIN32_Wakeup_Completion (void) +ACE_WIN32_Wakeup_Completion::~ACE_WIN32_Wakeup_Completion () { } diff --git a/ACE/ace/XML_Svc_Conf.cpp b/ACE/ace/XML_Svc_Conf.cpp index a3b082473305a..3c044406957a7 100644 --- a/ACE/ace/XML_Svc_Conf.cpp +++ b/ACE/ace/XML_Svc_Conf.cpp @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_XML_Svc_Conf::~ACE_XML_Svc_Conf (void) +ACE_XML_Svc_Conf::~ACE_XML_Svc_Conf () { } diff --git a/ACE/ace/XML_Svc_Conf.h b/ACE/ace/XML_Svc_Conf.h index a45fa662aae64..9befd8aa06c71 100644 --- a/ACE/ace/XML_Svc_Conf.h +++ b/ACE/ace/XML_Svc_Conf.h @@ -37,15 +37,15 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * ACE applications can link to dynamically using the ACE_DLL class. * This DLL should include an operation as follow: * - * extern "C" ACE_XML_Svc_Conf_Parser * _ACEXML_create_XML_Svc_Conf_Object (void); + * extern "C" ACE_XML_Svc_Conf_Parser * _ACEXML_create_XML_Svc_Conf_Object (); */ class ACE_Export ACE_XML_Svc_Conf { public: - typedef ACE_XML_Svc_Conf *(*Factory)(void); + typedef ACE_XML_Svc_Conf *(*Factory)(); - virtual ~ACE_XML_Svc_Conf (void) = 0; + virtual ~ACE_XML_Svc_Conf () = 0; virtual int parse_file (const ACE_TCHAR file[]) = 0; diff --git a/ACE/ace/XML_Utils/XML_Schema_Resolver.h b/ACE/ace/XML_Utils/XML_Schema_Resolver.h index d073425c98af2..8587494f5f9f0 100644 --- a/ACE/ace/XML_Utils/XML_Schema_Resolver.h +++ b/ACE/ace/XML_Utils/XML_Schema_Resolver.h @@ -48,7 +48,7 @@ namespace XML virtual InputSource * resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId); - Resolver &get_resolver (void); + Resolver &get_resolver (); private: XML_Schema_Resolver (XML_Schema_Resolver &); diff --git a/ACE/ace/XML_Utils/XercesString.cpp b/ACE/ace/XML_Utils/XercesString.cpp index 5a85dfb43c4cf..002368b091d46 100644 --- a/ACE/ace/XML_Utils/XercesString.cpp +++ b/ACE/ace/XML_Utils/XercesString.cpp @@ -23,7 +23,6 @@ namespace XML XStr::XStr (XMLCh *wstr) : _wstr(wstr) { - } XStr::XStr (const XMLCh* wstr) @@ -127,7 +126,7 @@ namespace XML return _wstr[i]; } - XMLCh * XStr::release (void) + XMLCh * XStr::release () { XMLCh* tmp = _wstr; this->_wstr = 0; @@ -135,7 +134,7 @@ namespace XML } void - XStr::reset (void) + XStr::reset () { if (_wstr) XMLString::release(&_wstr); diff --git a/ACE/ace/XML_Utils/XercesString.h b/ACE/ace/XML_Utils/XercesString.h index 1915832d503c2..48bed5715c08d 100644 --- a/ACE/ace/XML_Utils/XercesString.h +++ b/ACE/ace/XML_Utils/XercesString.h @@ -57,12 +57,11 @@ namespace XML operator const XMLCh* () const { return _wstr; }; - XMLCh * release (void); + XMLCh * release (); /// Release the held string and free its memory. - void reset (void); + void reset (); private: - XMLCh* _wstr; // Internal representation }; diff --git a/ACE/ace/XTI_ATM_Mcast.cpp b/ACE/ace/XTI_ATM_Mcast.cpp index 4e1b848a1024f..329b0a30f6f18 100644 --- a/ACE/ace/XTI_ATM_Mcast.cpp +++ b/ACE/ace/XTI_ATM_Mcast.cpp @@ -18,7 +18,7 @@ ACE_XTI_ATM_Mcast::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (void) +ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast () { ACE_TRACE ("ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast"); } diff --git a/ACE/ace/XTI_ATM_Mcast.h b/ACE/ace/XTI_ATM_Mcast.h index b62ba08e67d27..91cfa938d8814 100644 --- a/ACE/ace/XTI_ATM_Mcast.h +++ b/ACE/ace/XTI_ATM_Mcast.h @@ -36,7 +36,7 @@ class ACE_Export ACE_XTI_ATM_Mcast : public ACE_TLI_Connector { public: /// Default constructor. - ACE_XTI_ATM_Mcast (void); + ACE_XTI_ATM_Mcast (); /** * Actively connect and produce a @a new_stream if things go well. diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor/XtReactor.cpp index 945562c3dac72..3be9604388262 100644 --- a/ACE/ace/XtReactor/XtReactor.cpp +++ b/ACE/ace/XtReactor/XtReactor.cpp @@ -34,7 +34,7 @@ ACE_XtReactor::ACE_XtReactor (XtAppContext context, #endif /* ACE_MT_SAFE */ } -ACE_XtReactor::~ACE_XtReactor (void) +ACE_XtReactor::~ACE_XtReactor () { // Delete the remaining items in the linked list. @@ -67,7 +67,6 @@ ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s nfound = XtWaitForMultipleEvents (width, handle_set, max_wait_time); - } while (nfound == -1 && this->handle_error () > 0); if (nfound > 0) @@ -367,7 +366,7 @@ ACE_XtReactor::compute_Xt_condition(ACE_HANDLE handle) // first timeout in the Reactor's Timer_Queue. void -ACE_XtReactor::reset_timeout (void) +ACE_XtReactor::reset_timeout () { // Make sure we have a valid context ACE_ASSERT (this->context_ != 0); diff --git a/ACE/ace/XtReactor/XtReactor.h b/ACE/ace/XtReactor/XtReactor.h index af8ea2f9156dd..8e5d4bc3e3697 100644 --- a/ACE/ace/XtReactor/XtReactor.h +++ b/ACE/ace/XtReactor/XtReactor.h @@ -59,7 +59,7 @@ class ACE_XtReactor_Export ACE_XtReactor : public ACE_Select_Reactor size_t size = DEFAULT_SIZE, bool restart = false, ACE_Sig_Handler * = 0); - virtual ~ACE_XtReactor (void); + virtual ~ACE_XtReactor (); XtAppContext context () const; void context (XtAppContext); @@ -126,7 +126,7 @@ class ACE_XtReactor_Export ACE_XtReactor : public ACE_Select_Reactor private: /// This method ensures there's an Xt timeout for the first timeout /// in the Reactor's Timer_Queue. - void reset_timeout (void); + void reset_timeout (); // = Integrate with the X callback function mechanism. static void TimerCallbackProc (XtPointer closure, XtIntervalId *id); diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 59d06539cc8c2..97e8b5fec648e 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -24,7 +24,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, ATM_QoS.cpp ATM_Stream.cpp Atomic_Op.cpp - Atomic_Op_Sparc.c Barrier.cpp Base_Thread_Adapter.cpp Based_Pointer_Repository.cpp @@ -206,7 +205,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Recursive_Thread_Mutex.cpp Recyclable.cpp Registry.cpp - Rtems_init.c RW_Mutex.cpp RW_Process_Mutex.cpp RW_Thread_Mutex.cpp @@ -245,7 +243,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Stack_Trace.cpp Stats.cpp String_Base_Const.cpp - SUN_Proactor.cpp SV_Message.cpp SV_Message_Queue.cpp SV_Semaphore_Complex.cpp @@ -402,7 +399,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, ACE_export.h Bound_Ptr.h - CE_Screen_Output.h Codeset_Symbols.h CORBA_macros.h Codeset_Symbols.h diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index 6fc36f53dafd2..acb98a071afef 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -150,7 +150,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Reactor_Timer_Interface.cpp Read_Buffer.cpp Recursive_Thread_Mutex.cpp - Rtems_init.c RW_Mutex.cpp RW_Thread_Mutex.cpp Sched_Params.cpp @@ -360,7 +359,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Version.h ace_wchar.h checked_iterator.h - config-WinCE.h config-all.h config-lite.h config-win32-borland.h diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h index 832e43ea8db88..4488e9d20ecf0 100644 --- a/ACE/ace/ace_wchar.h +++ b/ACE/ace/ace_wchar.h @@ -35,11 +35,6 @@ # include /**/ # include /**/ # endif -# elif defined (ACE_OPENVMS) -# include /**/ -# include /**/ -# elif defined (ACE_HAS_WINCE) -# include /**/ # else # include /**/ # include /**/ @@ -91,6 +86,11 @@ typedef char ACE_ANTI_TCHAR; # define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () # define ACE_TEXT_WCHAR_TO_TCHAR(STRING) STRING # define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () +# if !defined (ACE_WIN32) +# define ACE_TEXT_PRIs ACE_TEXT("ls") +# else +# define ACE_TEXT_PRIs ACE_TEXT("s") +# endif #else /* ACE_USES_WCHAR */ typedef char ACE_TCHAR; typedef wchar_t ACE_ANTI_TCHAR; @@ -100,6 +100,7 @@ typedef wchar_t ACE_ANTI_TCHAR; # define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING # define ACE_TEXT_WCHAR_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () # define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () +# define ACE_TEXT_PRIs ACE_TEXT("s") #endif /* ACE_USES_WCHAR */ // The OS_String module defines some wide-char functions that are not @@ -202,9 +203,9 @@ class ACE_Ascii_To_Wide #endif /* ACE_HAS_ICONV */ /// Disallow these operation. - ACE_Ascii_To_Wide (); - ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &); - ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &); + ACE_Ascii_To_Wide () = delete; + ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &) = delete; + ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/ace_wchar.inl b/ACE/ace/ace_wchar.inl index 752c177f680a6..b390b32fc1f33 100644 --- a/ACE/ace/ace_wchar.inl +++ b/ACE/ace/ace_wchar.inl @@ -116,8 +116,8 @@ inline wchar_t * ACE_Ascii_To_Wide::convert (const char *str) { // Short circuit null pointer case - if (str == 0) - return 0; + if (!str) + return nullptr; # if defined (ACE_WIN32) UINT const cp = GetACP (); // Codepage diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h deleted file mode 100644 index 4435d96575c0b..0000000000000 --- a/ACE/ace/config-WinCE.h +++ /dev/null @@ -1,216 +0,0 @@ -// Note: For WinCE build, simply use: #include "ace/config-win32.h" -// It is same as config.h for Windows NT/2k so that you can -// share same files and directories for both WinCE and NT/2k -// builds, unless you add additional definition(s) for each -// specific build or change the output directory. - -#ifndef ACE_CONFIG_WINCE_H -#define ACE_CONFIG_WINCE_H - -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -# error Use config-win32.h in config.h instead of this header -#endif // ACE_CONFIG_WIN32_H - -#if !defined (_WIN32_WCE) -# error Define _WIN32_WCE to version (i.e. 500 = 5.0) -#endif // _WIN32_WCE - -#if (_WIN32_WCE < 500) -# error ACE requires Windows CE 5.0 and later. -#endif // _WIN32_WCE - -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_WINCE 1 -#endif - -// We need these libraries to build: -#if defined (_MSC_VER) -# pragma comment(lib,"corelibc.lib") -# pragma comment(linker, "/nodefaultlib:oldnames.lib") -#endif - -// Only DLL version is supported on CE. -//#if defined (ACE_HAS_DLL) -//# undef ACE_HAS_DLL -//#endif // ACE_HAS_DLL -//#define ACE_HAS_DLL 1 - -// Need to define LD search path explicitly on CE because -// CE doesn't have environment variables and we can't get -// the information using getenv. -#define ACE_DEFAULT_LD_SEARCH_PATH ACE_TEXT (".\\;\\windows") - -#define ACE_LACKS_ABORT -#define ACE_LACKS_FCNTL_H -#define ACE_LACKS_SYS_TYPES_H -#define ACE_LACKS_GETCWD -#define ACE_LACKS_ASCTIME -#define ACE_LACKS_ASCTIME_R -#define ACE_LACKS_GMTIME -#define ACE_LACKS_GMTIME_R -#define ACE_LACKS_LOCALTIME -#define ACE_LACKS_STRTOK_R -#define ACE_LACKS_PERROR -#define ACE_LACKS_STRFTIME -#define ACE_LACKS_WIN32_SETFILEPOINTEREX -#define ACE_LACKS_WIN32_SERVICES -#define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS -#define ACE_LACKS_GETPROCESSTIMES -#define ACE_LACKS_PDH_H -#define ACE_LACKS_PDHMSG_H -#define ACE_LACKS_TIME -#define ACE_LACKS_TZSET -#define ACE_LACKS_RAISE -#define ACE_LACKS_BSEARCH - -#define ACE_LACKS_MSG_WFMO -#define ACE_LACKS_UMASK -#define ACE_HAS_TYPES_H -#define ACE_LACKS_DEV_T - -#define ACE_ISCTYPE_EQUIVALENT ::_isctype - -// WinCE only supports the UNICODE API -#if !defined (ACE_USES_WCHAR) -# define ACE_USES_WCHAR -#endif /* ACE_USES_WCHAR */ - -#if (_WIN32_WCE < 0x600) -# define ACE_USES_WINCE_SEMA_SIMULATION -# define ACE_LACKS_ERRNO_H -# define ACE_LACKS_DUP -# define ACE_LACKS_GETSYSTEMTIMEASFILETIME -#endif /* (_WIN32_WCE < 0x600) */ - -#define ACE_LACKS_REGNOTIFYCHANGEKEYVALUE - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1 - -#if ! defined(ACE_DEFAULT_THREAD_KEYS) -# define ACE_DEFAULT_THREAD_KEYS TLS_MINIMUM_AVAILABLE -#endif // ! defined(ACE_DEFAULT_THREAD_KEYS) - -// FILE stuff isn't always defined in CE -#if !defined (_FILE_DEFINED) - typedef void FILE; -# define _FILE_DEFINED -#endif /* !_FILE_DEFINED */ - -// This was defined in previous versions of CE, but not 2.11 -#define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION - -#define ACE_MAIN WINAPI WinMain - -// SH3 cross-compiler can't handle inline functions correctly -// (along with other bugs.) -#if defined (SH3) -# define ACE_LACKS_INLINE_FUNCTIONS -#endif // SH3 && _DEBUG - -#ifndef ACE_DEFAULT_SERVER_HOST -# define ACE_DEFAULT_SERVER_HOST ACE_TEXT("localhost") -#endif // ACE_DEFAULT_SERVER_HOST - -// @@ Need to remap every function that uses any of these flags to -// Win32 API. These are for ANSI styled function and are not -// available on WinCE. - -#define _O_RDONLY 0x0000 // open for reading only -#define _O_WRONLY 0x0001 // open for writing only -#define _O_RDWR 0x0002 // open for reading and writing -#define _O_APPEND 0x0008 // writes done at eof - -#define _O_CREAT 0x0100 // create and open file -#define _O_TRUNC 0x0200 // open and truncate -#define _O_EXCL 0x0400 // open only if file doesn't already exist - -// O_TEXT files have sequences translated to on read()'s, -// and sequences translated to on write()'s -#define _O_TEXT 0x4000 // file mode is text (translated) -#define _O_BINARY 0x8000 // file mode is binary (untranslated) - -// Temporary file bit - file is deleted when last handle is closed -#define _O_TEMPORARY 0x0040 // temporary file bit - -// Non-ANSI names -#define O_RDONLY _O_RDONLY -#define O_WRONLY _O_WRONLY -#define O_RDWR _O_RDWR -#define O_APPEND _O_APPEND -#define O_CREAT _O_CREAT -#define O_TRUNC _O_TRUNC -#define O_EXCL _O_EXCL -#define O_TEXT _O_TEXT -#define O_BINARY _O_BINARY -#define O_TEMPORARY _O_TEMPORARY - -// @@ NSIG value. This is definitely not correct. -#define NSIG 23 - -#if !defined (FILE_MAP_COPY) -#define FILE_MAP_COPY 0 -#endif - -#define ACE_HAS_INTERLOCKED_EXCHANGEADD -#define ACE_LACKS_ACCESS -#define ACE_LACKS__WACCESS -#define ACE_HAS_ACCESS_EMULATION -#define ACE_LACKS_EXEC -#define ACE_LACKS_MKTEMP -#define ACE_LACKS_ISATTY -#define ACE_LACKS_STRERROR -#define ACE_LACKS_SYSTEM -#define ACE_LACKS_PIPE - -#define ACE_LACKS_CHDIR -#define ACE_LACKS_GETENV -#define ACE_LACKS_SETENV -#define ACE_LACKS_UNSETENV -#define ACE_LACKS_PUTENV -#define ACE_LACKS_GETENVSTRINGS -#define ACE_LACKS_STRENVDUP -#define ACE_LACKS_REALPATH -#define ACE_LACKS_SWAB -#define ACE_LACKS_TEMPNAM - -#if defined (_WIN32_WCE_EMULATION) -// @@ For some reason, qsort isn't defined correctly (_stdcall vs _cdecl) -// under emulation. So for right now, exclude it. -# define ACE_LACKS_QSORT -#endif // _WIN32_WCE_EMULATION - -#if !defined (BUFSIZ) -# define BUFSIZ 1024 -#endif - -#define ACE_HAS_WINCE_BROKEN_ERRNO - -#define ACE_HAS_STRDUP_EMULATION - -#if !defined (MAXSYMLINKS) -# define MAXSYMLINKS 0 -#endif - -// WinCE can't do fixed addresses for memory-mapped files. -#if defined (ACE_DEFAULT_BASE_ADDR) -# undef ACE_DEFAULT_BASE_ADDR -#endif -#define ACE_DEFAULT_BASE_ADDR 0 - -#if (_WIN32_WCE < 0x600) -# define ACE_HAS_TSS_EMULATION -#endif // WinCE version < 6.0 - -// CE doesn't support FILE_SHARE_DELETE like regular windows -#if !defined (ACE_DEFAULT_FILE_PERMS) -# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE) -#endif - -#define ACE_LACKS_SIGNAL_H -#define ACE_LACKS_SYS_STAT_H - -#include /**/ "ace/post.h" - -#endif // ACE_CONFIG_WINCE_H diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h deleted file mode 100644 index e8f610274b63c..0000000000000 --- a/ACE/ace/config-aix-5.x.h +++ /dev/null @@ -1,320 +0,0 @@ -// -// Config file for AIX 5.1 and higher. - -#ifndef ACE_CONFIG_AIX_5_X_H -#define ACE_CONFIG_AIX_5_X_H - -// This define is needed for building with Visual Age C++ 5 in incremental -// mode. In the batch mode build, platform_aix_ibm.GNU sets it. The incremental -// mode compiler won't be supported after ACE 5.3, so this will also go away -// in that timeframe, so don't worry about future AIX versions. -#if !defined (ACE_AIX_VERS) -# define ACE_AIX_VERS 501 -#endif - -// AIX 5.1 has AIO, but it doesn't have the same API as other POSIX -// systems, and the semantics of operations are a bit different. Will take -// some real work to get this going. -// AIX 5.2, however, has the POSIX API implemented. However, the libc functions -// to implement it aren't exported by default. You need to use smit to enable -// them. So, leave AIO disabled unless the user explicitly enables it. -// config-aix-4.x.h will set ACE_HAS_AIO_CALLS if config-posix.h senses the -// feature-test macros, so set up _ACE_DISABLE_AIO_CALLS_ if the user didn't -// set it. Then check for it after including config-aix-4.x.h and remove -// ACE_HAS_AIO_CALLS if so. -#if !defined (ACE_HAS_AIO_CALLS) -# define _ACE_DISABLE_AIO_CALLS_ -#endif - -// Both IBM and g++ compilers set _THREAD_SAFE if compiler is asked to compile -// threaded code (xlC_r, as opposed to xlC; and g++ -pthread) -#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0) -# if defined (ACE_HAS_THREADS) -# undef ACE_HAS_THREADS -# endif -# if defined (_THREAD_SAFE) -# define ACE_HAS_THREADS 1 -// # else -// # define ACE_HAS_THREADS 0 -# endif /* _THREAD_SAFE */ -#endif /* !ACE_MT_SAFE || (ACE_MT_SAFE != 0) */ - -#if defined (__IBMCPP__) - // AIX xlC, IBM C/C++ compiler - //******************************************************************** - // - - // Compiler does this with a builtin - it's not in libc. - // Although ACE does have alloca() on this compiler/platform combination, - // it is disabled by default since it can be dangerous. Uncomment the - // following line if you ACE to use it. - //# define ACE_HAS_ALLOCA - - // Compiler supports the ssize_t typedef. -# define ACE_HAS_SSIZE_T - - // Keep an eye on this as the compiler and standards converge... -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_PRAGMA_ONCE - -# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS - // When using -qtempinc, we don't need to see template implementation - // source (though we do need a pragma to find the correct source file). - // However, without -qtempinc (either -qnotempinc or -qtemplateregistry) - // we do need to see the source. -# if defined (__TEMPINC__) -# if !defined ACE_TEMPLATES_REQUIRE_PRAGMA -# define ACE_TEMPLATES_REQUIRE_PRAGMA -# endif -# else -# if !defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# define ACE_TEMPLATES_REQUIRE_SOURCE -# endif -# endif /* __TEMPINC__ */ - -# undef WIFEXITED -# undef WEXITSTATUS - -# define ACE_HAS_CUSTOM_EXPORT_MACROS -# define ACE_Proper_Export_Flag -# define ACE_Proper_Import_Flag - // There's no explicit import/export per-se, but to be sure that declared - // template code is exported, explicitly instantiate the class. -# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class SINGLETON_TYPE < CLASS, LOCK >; -# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE < CLASS, LOCK >; - -#elif defined (__GNUG__) - -# include "ace/config-g++-common.h" - -# define ACE_HAS_SSIZE_T - -# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0 - // ACE_MT_SAFE is #defined below, for all compilers. -# if !defined (_REENTRANT) -# define _REENTRANT -# endif /* _REENTRANT */ -# endif /* !ACE_MT_SAFE */ - -#else /* ! __IBMCPP__ && ! __GNUG__ */ -# ifdef __cplusplus /* Let it slide for C compilers. */ -# error unsupported compiler in ace/config-aix-5.x.h -# endif /* __cplusplus */ -#endif /* ! __xlC__ && ! __GNUG__ */ - -// Compiling for AIX. -#ifndef AIX -# define AIX -#endif /* AIX */ - -// Pick up all the detectable settings. -#include "ace/config-posix.h" - -// Regardless of what config-posix.h may indicate, AIX 5.3 is the first -// to support sem_timedwait(). Prior to that, use the emulation. -#if defined (ACE_HAS_POSIX_SEM_TIMEOUT) && \ - (defined (ACE_AIX_VERS) && (ACE_AIX_VERS < 503)) -# undef ACE_HAS_POSIX_SEM_TIMEOUT -#endif /* ACE_HAS_POSIX_SEM_TIMEOUT && ACE_AIX_VERS < 503 */ - -#if defined (ACE_DLL_SUFFIX) -# undef ACE_DLL_SUFFIX -#endif -#define ACE_DLL_SUFFIX ACE_TEXT (".so") - -#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) - -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -#define ACE_HAS_SOCKLEN_T -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG - -// AIX has AIO, but the functions don't match those of other AIO-enabled -// platforms. If this is to work, it'll require some significant work, -// maybe moving the OS-abstraction stuff to an OS_AIO or some such thing. -//# define ACE_HAS_AIO_CALLS - -#define ACE_HAS_AIX_HI_RES_TIMER - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// OS has readdir and friends. -#define ACE_HAS_DIRENT - -// OS supports the getrusage() system call -#define ACE_HAS_GETRUSAGE - -#define ACE_HAS_GPERF - -#define ACE_HAS_H_ERRNO - -#define ACE_LACKS_STDINT_H -#define ACE_LACKS_SYS_SYSCTL_H - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_ICMP_SUPPORT 1 -#define ACE_HAS_IP_MULTICAST - -// Lacks perfect filtering, must bind group address. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - -#define ACE_HAS_MSG - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -#define ACE_HAS_POSIX_TIME -// ... but needs to include another header for it on 4.2+ -# define ACE_HAS_BROKEN_POSIX_TIME -// ... and needs another typedef -#define ACE_LACKS_TIMESPEC_T -#define ACE_HAS_SELECT_H - -#define ACE_HAS_REENTRANT_FUNCTIONS - -#define ACE_HAS_SIOCGIFCONF - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SIGINFO_T -#define ACE_LACKS_SIGINFO_H -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SOCKADDR_IN_SIN_LEN -#define ACE_HAS_STRBUF_T - -// Compiler supports stropts.h -#define ACE_HAS_STREAMS -// #define ACE_HAS_STREAM_PIPES - -// AIX bzero() -#define ACE_HAS_STRINGS - -#define ACE_HAS_STRUCT_NETDB_DATA - -// Dynamic linking is in good shape on newer OS/patch levels. If you have -// trouble with the dynamic linking parts of ACE, and can't patch your OS -// up to latest levels, comment this out. -#define ACE_HAS_SVR4_DYNAMIC_LINKING -// This is tightly related to dynamic linking... -#define ACE_HAS_AUTOMATIC_INIT_FINI - -#define ACE_HAS_SVR4_GETTIMEOFDAY - -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_TIMOD_H -#define ACE_HAS_XTI -#define ACE_HAS_BROKEN_T_ERROR -#define ACE_TLI_TCP_DEVICE "/dev/xti/tcp" - -#define ACE_HAS_UALARM - -#define ACE_HAS_UCONTEXT_T - -#define ACE_HAS_CTYPE_T - -// Platform has XPG4 wide character type and functions. However, the size -// of wchar_t changes for 32- vs. 64-bit builds (unsigned short vs. unsigned -// int, respectively). -#define ACE_HAS_XPG4_MULTIBYTE_CHAR -#ifdef __64BIT__ -# define ACE_SIZEOF_WCHAR 4 -#else -# define ACE_SIZEOF_WCHAR 2 -#endif /* __64BIT__ */ - -#define ACE_LACKS_NETINET_TCP_H - -// AIX uses LIBPATH to search for libraries -#define ACE_LD_SEARCH_PATH ACE_TEXT ("LIBPATH") - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -//************************************************************** -// -// Threads related definitions. -// -// The threads on AIX are generally POSIX P1003.1c (ACE_HAS_PTHREADS). -// However, there is also a kernel thread ID (tid_t) that is used in -// ACE_Log_Msg (printing the thread ID). The tid_t is not the same as -// pthread_t, and can't derive one from the other - thread_self() gets -// the tid_t (kernel thread ID) if called from a thread. -// Thanks very much to Chris Lahey for straightening this out. - -#if defined (ACE_HAS_THREADS) -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif - -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_UNIX98_EXT -# define ACE_HAS_PTHREAD_CONTINUE_NP -# define ACE_HAS_PTHREAD_SUSPEND_NP -# define ACE_HAS_RECURSIVE_MUTEXES -# define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -# define ACE_HAS_SIGTHREADMASK -# define ACE_HAS_THREAD_SPECIFIC_STORAGE - -# define ACE_LACKS_THREAD_PROCESS_SCOPING -#else -# undef ACE_HAS_THREADS -#endif /* ACE_HAS_THREADS != 0 */ - -#define ACE_MALLOC_ALIGN 8 - -#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) && !defined(_UNIX95) -# define ACE_HAS_3_PARAM_WCSTOK -#endif /* (_XOPEN_SOURCE -0) >= 500 && !_UNIX95 */ - -#if defined (_ACE_DISABLE_AIO_CALLS_) -# if defined (ACE_HAS_AIO_CALLS) -# undef ACE_HAS_AIO_CALLS -# endif -# undef _ACE_DISABLE_AIO_CALLS_ -#endif - -// AIX's /usr/include/unistd.h sets _POSIX_SEMAPHORE to indicate the system -// supplies such a facility, but the headers don't enable it unless -// _XOPEN_SOURCE >= 500. So disable semaphores here if _XOPEN_SOURCE isn't -// up to snuff. -#if defined (ACE_HAS_POSIX_SEM) && \ - (!defined (_XOPEN_SOURCE) || (_XOPEN_SOURCE-0 < 500)) -# undef ACE_HAS_POSIX_SEM -#endif - -// I think this is correct, but needs to be verified... -Steve Huston -#define ACE_HAS_SIGTIMEDWAIT - -// AIX 5.1 has netinet/tcp.h -#undef ACE_LACKS_NETINET_TCP_H - -#define ACE_HAS_SCANDIR -#define ACE_SCANDIR_CMP_USES_VOIDPTR -#define ACE_SCANDIR_SEL_LACKS_CONST -#define ACE_HAS_SIGSUSPEND -#define ACE_HAS_TIMEZONE /* Call tzset() to set timezone */ -#define ACE_LACKS_ISCTYPE -#define ACE_HAS_STRSIGNAL -#define ACE_NEEDS_STRSIGNAL_RANGE_CHECK -#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN - - -#if defined (ACE_AIX_VERS) && (ACE_AIX_VERS < 503) -# define ACE_LACKS_UNSETENV -# define ACE_LACKS_LOG2 -# define ACE_LACKS_PTHREAD_ATTR_SETSTACK -#endif /* ACE_AIX_VERS < 503 */ - -#define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld" -#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" - -#endif /* ACE_CONFIG_AIX_5_X_H */ diff --git a/ACE/ace/config-aix-7.h b/ACE/ace/config-aix-7.h deleted file mode 100644 index 3864490ce4006..0000000000000 --- a/ACE/ace/config-aix-7.h +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file config-aix-7.h - * - * This is the config file for AIX 7 and higher. - * - * @author Steve Huston - */ -//============================================================================= - -#ifndef ACE_CONFIG_AIX_7_H -#define ACE_CONFIG_AIX_7_H - -// Diffs from prior AIX versions are related to scandir() arguments. -#include "ace/config-aix-5.x.h" - -#ifdef ACE_SCANDIR_CMP_USES_VOIDPTR -# undef ACE_SCANDIR_CMP_USES_VOIDPTR -#endif /* ACE_SCANDIR_CMP_USES_VOIDPTR */ - -#ifdef ACE_SCANDIR_SEL_LACKS_CONST -# undef ACE_SCANDIR_SEL_LACKS_CONST -#endif /* ACE_SCANDIR_SEL_LACKS_CONST */ - -#endif /* ACE_CONFIG_AIX_7_H */ diff --git a/ACE/ace/config-all.h b/ACE/ace/config-all.h index 53925b24e029f..102923c1941cb 100644 --- a/ACE/ace/config-all.h +++ b/ACE/ace/config-all.h @@ -70,6 +70,10 @@ # include "ace/Trace.h" #endif /* ACE_OS_NTRACE */ +#if !defined (ACE_TEMPLATES_REQUIRE_SOURCE) +# define ACE_TEMPLATES_REQUIRE_SOURCE +#endif + #if !defined (ACE_HAS_MONITOR_FRAMEWORK) # define ACE_HAS_MONITOR_FRAMEWORK 1 #endif diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h index 29569a216fefb..18544fcd08d00 100644 --- a/ACE/ace/config-cygwin32.h +++ b/ACE/ace/config-cygwin32.h @@ -84,7 +84,6 @@ #define ACE_HAS_VOIDPTR_MMAP #define ACE_HAS_POLL #define ACE_HAS_SOCKADDR_MSG_NAME 1 -#define ACE_LACKS_PRI_T 1 // Compiler/platform supports alloca(). // Although ACE does have alloca() on this compiler/platform combination, it is diff --git a/ACE/ace/config-face-safety.h b/ACE/ace/config-face-safety.h index b06fed1e5b058..4ea753672306e 100644 --- a/ACE/ace/config-face-safety.h +++ b/ACE/ace/config-face-safety.h @@ -216,8 +216,8 @@ #ifdef ACE_FACE_SAFETY_EXTENDED -# if defined ACE_WIN32 || defined ACE_HAS_WINCE -# error "FACE Safety profile not compatible with win32 or winCE" +# if defined ACE_WIN32 +# error "FACE Safety profile not compatible with win32" # endif # ifndef ACE_EMULATE_POSIX_DEVCTL diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index a6b51e705ad32..9ab8924500766 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -14,8 +14,6 @@ #define ACE_CC_MINOR_VERSION __GNUC_MINOR__ #define ACE_CC_BETA_VERSION (0) -#define ACE_TEMPLATES_REQUIRE_SOURCE - #if __cplusplus >= 202002L # define ACE_HAS_CPP20 #endif diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h deleted file mode 100644 index f3802570a645d..0000000000000 --- a/ACE/ace/config-hpux-11.00.h +++ /dev/null @@ -1,381 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for HP -// platforms running HP-UX 11.00 using aC++ or gcc (2.95 and up). - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#define ACE_LACKS_STDINT_H -#define ACE_LACKS_SYS_SELECT_H - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#else - -// aC++... - -// Precompiler needs extra flags to ignore "invalid #pragma directive" -# define ACE_CC_PREPROCESSOR_ARGS "-E +W 67" - -// Platform lacks streambuf "linebuffered ()". -# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 - -// Compiler's template mechanism must see source code (i.e., .C files). -# define ACE_TEMPLATES_REQUIRE_SOURCE - -// Compiler doesn't handle 'signed char' correctly (used in ace/IOStream.h) -# define ACE_LACKS_SIGNED_CHAR - -#endif /* __GNUG__, HP */ - -//********************************************************************* -// -// From here down is the compiler-INdependent OS settings. -// -//********************************************************************* - -// Compiling for HPUX. -#if !defined (HPUX) -#define HPUX -#endif /* HPUX */ -#define HPUX_11 - -#ifndef _HPUX_SOURCE -#define _HPUX_SOURCE -#endif - -#include /**/ - -// HP-UX is a POSIX-compliant system - see what's available. -#include "ace/config-posix.h" - -// config-posix.h sets up ACE_HAS_AIO_CALLS if the headers define the -// proper things. In HP-UX 11's case, the AIOCB Proactor works the best -// overall. If the user hasn't overridden it, select AIOCB. -#if defined (ACE_HAS_AIO_CALLS) -# if !defined (ACE_POSIX_AIOCB_PROACTOR) && !defined (ACE_POSIX_SIG_PROACTOR) -# define ACE_POSIX_AIOCB_PROACTOR -# endif /* !ACE_HAS_POSIX_AIOCB_PROACTOR && !ACE_POSIX_SIG_PROACTOR */ -#endif /* ACE_HAS_AIO_CALLS */ - -//////////////////////////////////////////////////////////////////////////// -// General OS information - see README for more details on what they mean -// -/////////////////////////////////////////////////////////////////////////// - -// HP/UX needs to have these addresses in a special range. -// If this is on a 64-bit model, the default is to use 64-bit addressing. -// It can also be set so that the mapped region is shareable with 32-bit -// programs. To enable the 32/64 sharing, comment out the first definition -// of ACE_DEFAULT_BASE_ADDR and uncomment the two lines after it. -#if defined (__LP64__) -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000001100000000) -//# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -//# define ACE_OS_EXTRA_MMAP_FLAGS MAP_ADDR32 - -# define ACE_DEFAULT_BASE_ADDRL (0x0000001100000000) -//# define ACE_DEFAULT_BASE_ADDRL (0x80000000) -#else -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -#endif /* __LP64__ */ - -// Preprocessor needs some help with data types -#if defined (__LP64__) -# define ACE_SIZEOF_LONG 8 -#else -# define ACE_SIZEOF_LONG 4 -#endif - -// Platform can do async I/O (aio_*) (set up in config-posix.h) -// ... but seems to require this in order to keep from hanging. Needs some -// investigation, maybe with HP. John Mulhern determined this value -// empirically. YMMV. If it does vary, set it up in your own config.h which -// then includes the ACE-supplied config. -#if !defined (ACE_INFINITE) -# define ACE_INFINITE 10000000 -#endif - -/* Compiler/platform correctly calls init()/fini() for shared libraries. */ -#define ACE_HAS_AUTOMATIC_INIT_FINI 1 - -// Manually tweak the malloc control block paddings to properly align -// things. -#define ACE_MALLOC_PADDING 16 -#define ACE_MALLOC_ALIGN 8 -#define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS 3 - -// Compiler/platform contains the file. -#define ACE_HAS_SYS_SYSCALL_H - -#define ACE_HAS_SYS_PSTAT_H - -// But doesn't have a prototype for syscall() -#define ACE_LACKS_SYSCALL - -// Platform supports POSIX.1b clock_gettime () -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CLOCK_SETTIME - -#define ACE_LACKS_CLOCK_MONOTONIC - -#define ACE_LACKS_PTHREAD_SCOPE_PROCESS - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has Dirent iterator functions. -#define ACE_HAS_DIRENT - -#define ACE_HAS_VSWPRINTF - -// Platform supports getpagesize() call -#define ACE_HAS_GETPAGESIZE -// But we define this just to be safe -#define ACE_PAGE_SIZE 4096 - -// Can run gperf on this platform (needed for TAO) -# define ACE_HAS_GPERF - -// Optimize ACE_Handle_Set for select(). -# define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST -// At least for 11iv2, lacks perfect filtering. -#if (HPUX_VERS >= 1123) && !defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING) -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif - -/* Platform defines MAP_FAILED as a long constant. */ -#define ACE_HAS_LONG_MAP_FAILED 1 - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Platform's select() has non-const timeval argument -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Platform supports the POSIX struct timespec type -#define ACE_HAS_POSIX_TIME - -/* Platform has pread() and pwrite() support. */ -#define ACE_HAS_P_READ_WRITE 1 - -/* Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX) */ -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1 - -// Platform supports reentrant functions (all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS -// ctime_r and asctime_r conform to POSIX.1c (2 param version) -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -// Platform offers scandir(), and requires no adjustments for its API. -#define ACE_HAS_SCANDIR - -// HP-UX 11 has reentrant netdb functions. The catch is that the old -// functions (gethostbyname, etc.) are thread-safe and the _r versions are -// obsolescent. So, define things so the _r versions are not used. -// OS_NS_netdb.inl ensures no funny lock games are played in the -// ACE_NETDBCALL_RETURN macro. -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */ -#define ACE_LACKS_PRI_T 1 - -// Platform has shm_open -#define ACE_HAS_SHM_OPEN - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -/* Compiler requires extern "C" functions for signals. */ -#define ACE_HAS_SIG_C_FUNC 1 - -// Platform's sigaction() function takes const sigaction* as 2nd parameter. -#define ACE_HAS_SIGACTION_CONSTP2 - -#define ACE_HAS_SSIZE_T - -// Platform supports SVR4 extended signals -#define ACE_HAS_SIGINFO_T - -/* Define to 1 if platform has sigsuspend(). */ -#define ACE_HAS_SIGSUSPEND 1 - -// Platform doesn't detect a signal out of range unless it's way out of range. -#define ACE_HAS_SIGISMEMBER_BUG - -/* Platform provides socklen_t type, such as Linux with glibc2. */ -#define ACE_HAS_SOCKLEN_T 1 - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -#define ACE_HAS_UALARM - -// Platform supports ucontext_t (which is used in the extended signal API). -#define ACE_HAS_UCONTEXT_T - -// Platform/compiler supports void * as second parameter to gettimeofday(). -#define ACE_HAS_VOIDPTR_GETTIMEOFDAY - -/* Platform requires void * for mmap(). */ -#define ACE_HAS_VOIDPTR_MMAP 1 - -/* OS/compiler uses void * arg 4 setsockopt() rather than const char * */ -#define ACE_HAS_VOIDPTR_SOCKOPT 1 - -// Platform supports SVR4 dynamic linking semantics. -// When used, this requires -ldl on the ACE library link line. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform supports the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -/* Define to 1 if platform has the declaration of getrusage(). */ -#define ACE_HAS_GETRUSAGE_PROTOTYPE 1 - -// Platform has the sigwait function in a header file -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIGTIMEDWAIT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// accept() is thread-safe -#define ACE_HAS_THREAD_SAFE_ACCEPT - -// Platform lacks a typedef for timespec_t, but has struct timespec -#define ACE_LACKS_TIMESPEC_T - -// dlopen() takes a char* instead of const char* -#define ACE_HAS_CHARPTR_DL - -// lacks setegid and seteuid -#define ACE_LACKS_SETEGID -#define ACE_LACKS_SETEUID - -#define ACE_LACKS_SUSECONDS_T -#define ACE_LACKS_SYS_SYSCTL_H - -#if !(defined(__STDC_EXT__) || defined(_INCLUDE_LONGLONG) || defined(_INCLUDE_STDC__SOURCE_199901)) -# define ACE_LACKS_STRTOLL -# define ACE_LACKS_WCSTOLL -# define ACE_LACKS_STRTOULL -# define ACE_LACKS_WCSTOULL -#endif - -#define ACE_LACKS_ISWASCII - -#define ACE_LACKS_SETENV -#define ACE_LACKS_UNSETENV - -// Shared library name/path components -#if defined (__ia64) -# define ACE_DLL_SUFFIX ACE_TEXT (".so") -#else -# define ACE_DLL_SUFFIX ACE_TEXT (".sl") -#endif /* __ia64 */ -#if defined (__LP64__) -# define ACE_LD_SEARCH_PATH ACE_TEXT ("LD_LIBRARY_PATH") -#else -# define ACE_LD_SEARCH_PATH ACE_TEXT ("SHLIB_PATH") -#endif /* __LP64__ */ - -#if defined (_INCLUDE__STDC_A1_SOURCE) -# define ACE_HAS_3_PARAM_WCSTOK -#endif - -#define ACE_LACKS_STRUCT_LIFNUM - -////////////////////////////////////////////////////////////////////////// -// STREAMS information -// -////////////////////////////////////////////////////////////////////////// - -// Platform supports STREAMS -#define ACE_HAS_STREAMS -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T -// But the putmsg signature doesn't have it as const... -// Well, it really does, but it depends on preprocessor defines. -#define ACE_LACKS_CONST_STRBUF_PTR -/* Platform supports TLI timod STREAMS module */ -#define ACE_HAS_TIMOD_H 1 - -// Platform supports STREAM pipes -// This is possible, but not by default - need to rebuild the kernel to -// get them enabled - see pipe(2) and "STREAMS/UX for the HP 9000" -// #define ACE_HAS_STREAM_PIPES - -///////////////////////////////////////////////////////////////////////// -// TLI/XTI information -// -//////////////////////////////////////////////////////////////////////// - -// Platform supports XTI (includes TLI). -#define ACE_HAS_XTI -// HP-UX 11 conforms to the XPG4 spec, which ACE calls broken for the -// errmsg not being const... -#define ACE_HAS_BROKEN_T_ERROR -// The definitions of TCP_NODELAY and TCP_MAXSEG conflict between -// sys/xti.h and netinet/tcp.h. -#define ACE_HAS_CONFLICTING_XTI_MACROS -/* Platform provides header */ -#define ACE_HAS_SYS_XTI_H 1 - -///////////////////////////////////////////////////////////////////////// -// Threads information. -// -// Use of threads is controlled by the 'threads' argument to make. See -// include/makeinclude/platform_hpux_aCC.GNU for details. If it's not set, -// the default is to enable it, since kernel threads are always available -// on HP-UX 11, as opposed to 10.x where it was optional software. -// -//////////////////////////////////////////////////////////////////////// - -#if defined (ACE_HAS_THREADS) -# if (ACE_HAS_THREADS == 0) -# undef ACE_HAS_THREADS -# endif /* ACE_HAS_THREADS == 0 */ -#else -# define ACE_HAS_THREADS -#endif /* ACE_HAS_THREADS */ - -#if defined (ACE_HAS_THREADS) - -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif - -// HP-UX doesn't define _POSIX_THREADS since it doesn't implement all -// features (lacks thread priority inheritance and protection), so -// config-posix.h doesn't get this one... -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_UNIX98_EXT -# define ACE_HAS_PTHREAD_CONTINUE -# define ACE_HAS_PTHREAD_RESUME_NP -# define ACE_HAS_PTHREAD_SUSPEND -# define ACE_HAS_RECURSIVE_MUTEXES -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -# define ACE_LACKS_PTHREAD_ATTR_SETSTACK -# define ACE_LACKS_CONDATTR_SETCLOCK -#endif /* ACE_HAS_THREADS */ - -#define ACE_HAS_POSIX_SEM - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// gethostbyaddr does not handle IPv6-mapped-IPv4 addresses -#define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-hurd.h b/ACE/ace/config-hurd.h index ef78e596b3746..95517b69d8631 100644 --- a/ACE/ace/config-hurd.h +++ b/ACE/ace/config-hurd.h @@ -59,7 +59,6 @@ #endif /* __GLIBC__ */ #define ACE_HAS_LSEEK64 -//#define ACE_LACKS_LSEEK64_PROTOTYPE #define ACE_HAS_P_READ_WRITE // Use ACE's alternate cuserid() implementation since the use of the diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h index ce825d2beede8..65a21df7f52eb 100644 --- a/ACE/ace/config-icc-common.h +++ b/ACE/ace/config-icc-common.h @@ -57,8 +57,6 @@ # define ACE_HAS_INTEL_ASSEMBLY #endif -#define ACE_TEMPLATES_REQUIRE_SOURCE - #if (__INTEL_COMPILER >= 910) # define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS #endif diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h index 3628279d01e69..92495ed7cd365 100644 --- a/ACE/ace/config-integritySCA.h +++ b/ACE/ace/config-integritySCA.h @@ -24,7 +24,6 @@ #define ACE_LACKS_GETEGID #define ACE_LACKS_GETGID -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 #define TAO_USE_SEQUENCE_TEMPLATES #define _REENTRANT #define ACE_MT_SAFE 1 diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h index bc13d8b428d49..db57811bcfe1c 100644 --- a/ACE/ace/config-kfreebsd.h +++ b/ACE/ace/config-kfreebsd.h @@ -177,8 +177,7 @@ /* Mutexes are inherently recursive (e.g., Win32) */ /* #undef ACE_HAS_RECURSIVE_MUTEXES */ -/* Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX) */ +/* Platform will recurse infinitely on thread exits from TSS cleanup routines */ #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1 /* Platform supports reentrant functions (i.e., all the POSIX *_r functions). @@ -360,9 +359,6 @@ /* Compiler complains about use of obsolete "pragma once" */ #define ACE_LACKS_PRAGMA_ONCE 1 -/* Define to 1 if the system lacks the type 'pri_t'. */ -#define ACE_LACKS_PRI_T 1 - /* Define to 1 if platform lacks pthread_thr_sigsetmask(). */ #define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 1d3eba2f27ef2..1f2234d0b64ab 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -57,8 +57,6 @@ # include "ace/config-icc-common.h" #elif defined (__GNUG__) # include "ace/config-g++-common.h" -#elif defined (__SUNCC_PRO) || defined (__SUNPRO_CC) -# include "ace/config-suncc-common.h" #elif defined (__PGI) // Portable group compiler # define ACE_LACKS_SWAB @@ -71,7 +69,7 @@ * (TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.{h,c}) that may indirectly * include this */ -#else /* ! __GNUG__ && !__DECCXX && !__INTEL_COMPILER && && !__PGI */ +#else /* ! __GNUG__ && !__INTEL_COMPILER && && !__PGI */ # ifdef __cplusplus /* Let it slide for C compilers. */ # error unsupported compiler in ace/config-linux.h # endif /* __cplusplus */ diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index 29ac3d130a584..87d168f25047a 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -54,7 +54,7 @@ extern "C" # if defined (ACE_HAS_SIG_C_FUNC) extern "C" { # endif /* ACE_HAS_SIG_C_FUNC */ -typedef void (*ACE_CLEANUP_FUNC)(void *object, void *param) /* throw () */; +typedef void (*ACE_CLEANUP_FUNC)(void *object, void *param) /* noexcept */; # if defined (ACE_HAS_SIG_C_FUNC) } # endif /* ACE_HAS_SIG_C_FUNC */ @@ -91,57 +91,6 @@ typedef ACE_OS_Thread_Descriptor *(*ACE_THR_DESC_LOG_MSG_HOOK) (); ACE_END_VERSIONED_NAMESPACE_DECL -/** - * @deprecated ACE_DECLARE_STL_REVERSE_ITERATORS is a crutch to be - * used until all C++ compiler supported by ACE support - * the standard reverse_iterator adapters. - * @internal ACE_DECLARE_STL_REVERSE_ITERATORS is not meant for use - * outside of ACE. - */ -// STL reverse_iterator declaration generator -// Make sure you include in the file you're using this -// generator, and that the following traits are available: -// -// iterator -// const_iterator -// value_type -// reference -// pointer -// const_reference -// const_pointer -// difference_type -// -// Once all C++ compilers support the standard reverse_iterator -// adapters, we can drop this generator macro or at least drop the -// MSVC++ or Sun Studio preprocessor conditional blocks. -#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \ - && !defined (_STLPORT_VERSION) - // If we're not using the stlport4 C++ library (which has standard - // iterators), we need to ensure this is included in order to test - // the _RWSTD_NO_CLASS_PARTIAL_SPEC feature test macro below. -# include -#endif /* __SUNPRO_CC <= 0x5110 */ -#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \ - && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) -# define ACE_DECLARE_STL_REVERSE_ITERATORS \ - typedef std::reverse_iterator reverse_iterator; \ - typedef std::reverse_iterator const_reverse_iterator; -#else -# define ACE_DECLARE_STL_REVERSE_ITERATORS \ - typedef std::reverse_iterator reverse_iterator; \ - typedef std::reverse_iterator const_reverse_iterator; -#endif /* _MSC_VER && _WIN64 */ - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_LITE_H */ diff --git a/ACE/ace/config-macosx-jaguar.h b/ACE/ace/config-macosx-jaguar.h index 76a0df0c9dd7e..fb8dfd775b989 100644 --- a/ACE/ace/config-macosx-jaguar.h +++ b/ACE/ace/config-macosx-jaguar.h @@ -25,8 +25,6 @@ #define ACE_HAS_GPERF #define ACE_HAS_POSIX_SEM -//#define ACE_HAS_SVR4_TLI - #define ACE_LACKS_STROPTS_H #define ACE_LACKS_WCHAR_H diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h index d4ce6f4161932..2eb6c3c68fddd 100644 --- a/ACE/ace/config-macosx-panther.h +++ b/ACE/ace/config-macosx-panther.h @@ -26,8 +26,6 @@ #define ACE_HAS_GPERF #define ACE_HAS_POSIX_SEM -//#define ACE_HAS_SVR4_TLI - #define ACE_LACKS_STROPTS_H #define ACE_LACKS_WCHAR_H diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 35f7dae962e53..144e0283d98b0 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -84,7 +84,7 @@ // Perfect Multicast filtering refers to RFC 3376, where a socket is only // delivered dgrams for groups joined even if it didn't bind the group // address. We turn this option off by default, although most OS's -// except for Windows and Solaris probably lack perfect filtering. +// except for Windows probably lack perfect filtering. // ========================================================================= # if !defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING) @@ -101,14 +101,13 @@ # if !defined (ACE_HAS_PROCESS_SPAWN) # if !defined (ACE_LACKS_FORK) || \ - (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) || \ - defined (ACE_WINCE) || defined (ACE_OPENVMS) + (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) # define ACE_HAS_PROCESS_SPAWN 1 # endif # endif /* ACE_HAS_PROCESS_SPAWN */ # if !defined (ACE_HAS_DYNAMIC_LINKING) -# if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || defined (ACE_WIN32) || defined (ACE_VXWORKS) || defined (__hpux) +# if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || defined (ACE_WIN32) || defined (ACE_VXWORKS) # define ACE_HAS_DYNAMIC_LINKING 1 # endif # endif /* ACE_HAS_DYNAMIC_LINKING */ @@ -234,17 +233,6 @@ # define ACE_sap_any_cast(TYPE) reinterpret_cast (const_cast (ACE_Addr::sap_any)) -# if !defined (ACE_CAST_CONST) - // Sun CC 4.2, for example, requires const in reinterpret casts of - // data members in const member functions. But, other compilers - // complain about the useless const. This keeps everyone happy. -# if defined (__SUNPRO_CC) -# define ACE_CAST_CONST const -# else /* ! __SUNPRO_CC */ -# define ACE_CAST_CONST -# endif /* ! __SUNPRO_CC */ -# endif /* ! ACE_CAST_CONST */ - // ============================================================================ // Compiler Silencing macros // @@ -255,7 +243,7 @@ #if !defined (ACE_UNUSED_ARG) # if defined (__GNUC__) || defined (__BORLANDC__) # define ACE_UNUSED_ARG(a) (void) (a) -# elif defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) +# elif defined (ghs) || defined (__rational__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) // Some compilers complain about "statement with no effect" with (a). // This eliminates the warnings, and no code is generated for the null // conditional statement. @note that may only be true if -O is enabled, @@ -266,7 +254,7 @@ # endif /* ghs ..... */ #endif /* !ACE_UNUSED_ARG */ -#if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || (defined (__HP_aCC) && (__HP_aCC < 39000 || __HP_aCC >= 60500)) || defined (__IAR_SYSTEMS_ICC__) +#if defined (_MSC_VER) || defined (ghs) || defined(__BORLANDC__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__IAR_SYSTEMS_ICC__) # define ACE_NOTREACHED(a) #else /* ghs || ..... */ # define ACE_NOTREACHED(a) a @@ -293,12 +281,12 @@ # define ACE_ALLOC_HOOK_DECLARE \ void *operator new (size_t bytes); \ void *operator new (size_t bytes, void *ptr); \ - void *operator new (size_t bytes, const std::nothrow_t &) throw (); \ + void *operator new (size_t bytes, const std::nothrow_t &) noexcept; \ void operator delete (void *ptr); \ void operator delete (void *ptr, const std::nothrow_t &); \ void *operator new[] (size_t size); \ void operator delete[] (void *ptr); \ - void *operator new[] (size_t size, const std::nothrow_t &) throw (); \ + void *operator new[] (size_t size, const std::nothrow_t &) noexcept; \ void operator delete[] (void *ptr, const std::nothrow_t &) # define ACE_GENERIC_ALLOCS(MAKE_PREFIX, CLASS) \ @@ -311,7 +299,7 @@ } \ MAKE_PREFIX (void *, CLASS)::operator new (size_t, void *ptr) { return ptr; }\ MAKE_PREFIX (void *, CLASS)::operator new (size_t bytes, \ - const std::nothrow_t &) throw () \ + const std::nothrow_t &) noexcept \ { return ACE_Allocator::instance ()->malloc (bytes); } \ MAKE_PREFIX (void, CLASS)::operator delete (void *ptr) \ { if (ptr) ACE_Allocator::instance ()->free (ptr); } \ @@ -328,7 +316,7 @@ MAKE_PREFIX (void, CLASS)::operator delete[] (void *ptr) \ { if (ptr) ACE_Allocator::instance ()->free (ptr); } \ MAKE_PREFIX (void *, CLASS)::operator new[] (size_t size, \ - const std::nothrow_t &) throw ()\ + const std::nothrow_t &) noexcept\ { return ACE_Allocator::instance ()->malloc (size); } \ MAKE_PREFIX (void, CLASS)::operator delete[] (void *ptr, \ const std::nothrow_t &) \ @@ -607,7 +595,7 @@ typedef ACE_THR_FUNC_RETURN (*ACE_THR_C_FUNC)(void *); // Add this macro you one of your cpp file in your dll. X should // be either ACE_DLL_UNLOAD_POLICY_DEFAULT or ACE_DLL_UNLOAD_POLICY_LAZY. #define ACE_DLL_UNLOAD_POLICY(CLS,X) \ -extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \ +extern "C" u_long CLS##_Export _get_dll_unload_policy () \ { return X;} // ============================================================================ diff --git a/ACE/ace/config-mqx.h b/ACE/ace/config-mqx.h index b27de27966672..028b9c367af24 100644 --- a/ACE/ace/config-mqx.h +++ b/ACE/ace/config-mqx.h @@ -55,7 +55,6 @@ extern "C" { #define ACE_RENAME_EQUIVALENT MQX_Filesystem::inst().rename #define ACE_MQX -#define ACE_TEMPLATES_REQUIRE_SOURCE #define ACE_PAGE_SIZE 4096 #define ACE_SOCKET_LEN uint16_t #define ACE_SOCKOPT_LEN socklen_t diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h index 85c0da476d9b4..5caba73a4a463 100644 --- a/ACE/ace/config-netbsd.h +++ b/ACE/ace/config-netbsd.h @@ -94,7 +94,6 @@ #define ACE_LACKS_MUTEXATTR_PSHARED 1 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1 #define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#define ACE_LACKS_PRI_T 1 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 #define ACE_LACKS_PTHREAD_YIELD 1 #define ACE_LACKS_RWLOCKATTR_PSHARED 1 diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h deleted file mode 100644 index 5417d250a2588..0000000000000 --- a/ACE/ace/config-openvms.h +++ /dev/null @@ -1,182 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for OpenVMS 7.3-2 - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H - -#ifdef __cplusplus -#pragma message disable CODCAUUNR -#pragma message disable CODEUNREACHABLE -//#pragma message disable DOLLARID -//#pragma message disable NOSIMPINT -//#pragma message disable NOSTDLONGLONG -#pragma message disable NARROWPTR -//#pragma message disable LONGEXTERN -#pragma message disable UNSCOMZER -#endif - -// Use a signed int to match POSIX -#define __SIGNED_INT_TIME_T - -#define ACE_OPENVMS __VMS_VER - -#define ACE_DLL_SUFFIX ACE_TEXT("") - -#define ACE_HAS_DUMP 1 - -// need this includes to ensure proper sequence of definitions so that -// f.i. HP C/C++ does not '#define ' memcpy, memmove etc. -#include -#include -#include -#undef memset -#undef memcpy -#undef memmove - -#if defined(__ia64__) - // on OpenVMS IA64 we need this get the singleton exported since we build - // ACE/TAO with the NOTEMPLATES export option which prohibits exporting - // of any template symbols unless explicitly exported - #define ACE_HAS_CUSTOM_EXPORT_MACROS - #define ACE_Proper_Export_Flag - #define ACE_Proper_Import_Flag - #define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T - #define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE; -#else - #define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION -#endif - -#define ACE_DEFAULT_BASE_ADDR ((char*)(0x30000000)) - -#define ACE_MAX_UDP_PACKET_SIZE 65535 - -/* missing system headers */ -#define ACE_LACKS_STDINT_H 1 -#define ACE_LACKS_SYS_IPC_H 1 -#define ACE_LACKS_SYS_SEM_H 1 -#define ACE_LACKS_SEMAPHORE_H 1 -#define ACE_LACKS_SYS_SELECT_H 1 -#define ACE_LACKS_TERMIOS_H 1 -#define ACE_LACKS_SYS_SHM_H 1 -#define ACE_LACKS_SYS_MSG_H 1 -#define ACE_LACKS_REGEX_H 1 -#define ACE_LACKS_SEARCH_H 1 -#define ACE_LACKS_SCHED_H 1 -#define ACE_LACKS_SYS_SYSCTL_H 1 -#define ACE_LACKS_SYS_PARAM_H 1 -#define ACE_LACKS_SIGINFO_H 1 -#define ACE_LACKS_UCONTEXT_H 1 - -/* missing rtl functions */ -#define ACE_LACKS_SETPGID 1 -#define ACE_LACKS_SETREUID 1 -#define ACE_LACKS_SETREGID 1 -#define ACE_LACKS_FORK 1 -#define ACE_LACKS_GETPGID 1 -#define ACE_LACKS_SETSID 1 -#define ACE_LACKS_FCNTL 1 -#define ACE_LACKS_SETEGID 1 -#define ACE_LACKS_SETEUID 1 - -#define ACE_LACKS_REALPATH 1 - -#define ACE_LACKS_SYMLINKS 1 - -#define ACE_HAS_P_READ_WRITE -#define ACE_HAS_CHARPTR_DL 1 -#define ACE_HAS_CLOCK_GETTIME 1 -#define ACE_HAS_CLOCK_SETTIME 1 -#define ACE_HAS_VOIDPTR_GETTIMEOFDAY 1 -#define ACE_HAS_DIRENT 1 -#define ACE_HAS_GETPAGESIZE 1 -#define ACE_HAS_MSG -#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1 -#define ACE_HAS_3_PARAM_WCSTOK 1 -#define ACE_HAS_SIGSUSPEND 1 -#define ACE_HAS_SIGWAIT 1 -#define ACE_HAS_SIGTIMEDWAIT 1 - -#define ACE_HAS_SIG_C_FUNC 1 -#define ACE_HAS_SIGISMEMBER_BUG -#define ACE_HAS_STRNLEN 1 -#define ACE_HAS_STREAMS 1 -#define ACE_HAS_UALARM 1 -#define ACE_HAS_VOIDPTR_MMAP 1 -#define ACE_HAS_VOIDPTR_SOCKOPT 1 -#define ACE_LACKS_LSTAT 1 -#define ACE_LACKS_MADVISE 1 -#define ACE_LACKS_MKFIFO 1 -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1 -#define ACE_LACKS_READLINK 1 -#define ACE_LACKS_RLIMIT 1 -#define ACE_LACKS_RLIMIT_PROTOTYPE 1 -#define ACE_LACKS_SETSCHED -#define ACE_LACKS_SYSCALL 1 -#define ACE_LACKS_WCSTOULL 1 -#define ACE_LACKS_WCSTOLL - -/* (missing) standard data types */ -#define ACE_LACKS_CONST_TIMESPEC_PTR 1 -#define ACE_LACKS_SUSECONDS_T 1 -#define ACE_HAS_IDTYPE_T 1 -#define ACE_HAS_SIGINFO_T 1 -#define ACE_HAS_XPG4_MULTIBYTE_CHAR 1 -#define ACE_HAS_SIZET_SOCKET_LEN 1 -#define ACE_HAS_SSIZE_T 1 -#define ACE_LACKS_PRI_T 1 -#define ACE_LACKS_SEMBUF_T 1 -#define ACE_LACKS_STRRECVFD 1 -#define ACE_LACKS_T_ERRNO 1 - -/* POSIX threads compatibilities */ -#define ACE_LACKS_RWLOCK_T 1 -#define ACE_LACKS_PTHREAD_KILL 1 -#define ACE_LACKS_THREAD_PROCESS_SCOPING 1 - -#define ACE_HAS_PTHREADS 1 -#define ACE_HAS_PTHREAD_PROCESS_ENUM 1 -#define ACE_LACKS_UNNAMED_SEMAPHORE 1 -#define ACE_MT_SAFE 1 -#define ACE_HAS_THREADS 1 -#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1 -#define ACE_HAS_THR_C_DEST 1 -#define ACE_HAS_THR_C_FUNC 1 -#define ACE_LACKS_PTHREAD_SIGMASK 1 -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 -#define ACE_NEEDS_HUGE_THREAD_STACKSIZE (64U*1024) -#define ACE_HAS_PTHREAD_SETCONCURRENCY 1 -#define ACE_HAS_PTHREAD_GETCONCURRENCY 1 -#define ACE_HAS_PTHREAD_SCHEDPARAM 1 - -/* language/platform conformance */ -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#define ACE_HAS_AUTOMATIC_INIT_FINI 1 -#define ACE_LACKS_UNIX_SIGNALS 1 - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 -#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 - -#define ACE_HAS_GPERF 1 -#define ACE_HAS_IP_MULTICAST 1 -#define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#define ACE_HAS_POSIX_NONBLOCK 1 -#define ACE_HAS_POSIX_TIME 1 -#define ACE_HAS_BROKEN_POSIX_TIME 1 -#define ACE_HAS_SVR4_DYNAMIC_LINKING 1 - -#define ACE_LACKS_NAMED_POSIX_SEM 1 -#define ACE_LACKS_SYSV_SHMEM 1 -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS 1 -#define ACE_LACKS_UNIX_SYSLOG 1 -#define ACE_LACKS_ALPHASORT 1 -#define ACE_LACKS_ISCTYPE -#define ACE_LACKS_ISBLANK - -#define ACE_LACKS_SETENV -#define ACE_LACKS_UNSETENV - -#define ACE_HAS_SOCK_BUF_SIZE_MAX -#define ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE 65535 - -#endif diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h deleted file mode 100644 index e74a3faa46301..0000000000000 --- a/ACE/ace/config-rtems.h +++ /dev/null @@ -1,155 +0,0 @@ -/* -*- C -*- */ -/* The following configuration file is designed to work for RTEMS - platforms using GNU C. -*/ - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Needed to make some prototypes visible. -// #if ! defined (_GNU_SOURCE) -// #define _GNU_SOURCE -// #endif /* ! _GNU_SOURCE */ - -// First the machine specific part -// There are no known port specific issues with the RTEMS port of ACE. -// XXX Pentium and PowerPC have high res timer support in ACE. - -// Then the compiler specific parts -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#else /* ! __GNUG__ */ -# ifdef __cplusplus /* Let it slide for C compilers. */ -# error unsupported compiler in ace/config-rtems.h -# endif /* __cplusplus */ -#endif /* ! __GNUG__ */ - -#include "ace/config-posix.h" - -// Completely common part :-) - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#define ACE_LACKS_ALPHASORT -#define ACE_LACKS_REGEX_H -#define ACE_LACKS_STROPTS_H -#define ACE_LACKS_DLFCN_H -#define ACE_LACKS_SIGINFO_H -#define ACE_LACKS_SYS_IPC_H -#define ACE_LACKS_SYS_SEM_H -#define ACE_LACKS_STRINGS_H -#define ACE_LACKS_SYS_SHM_H -#define ACE_LACKS_SETEGID -#define ACE_LACKS_SETEUID -#define ACE_LACKS_POLL_H -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_LACKS_STRCASECMP -#define ACE_LACKS_MKSTEMP -#define ACE_LACKS_STRDUP -#define ACE_LACKS_STRTOK_R -#define ACE_LACKS_REALPATH -#define ACE_LACKS_TEMPNAM -#define ACE_LACKS_TZSET - -// Temporarily, enabling this results in compile errors with -// rtems 4.6.6. -#define ACE_LACKS_WCHAR_H - -#if !defined (ACE_MT_SAFE) -#define ACE_MT_SAFE 1 -#endif - -#if ACE_MT_SAFE -# define ACE_HAS_THREADS -# define ACE_HAS_PTHREADS -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -# define ACE_HAS_PTHREAD_SCHEDPARAM -# define ACE_LACKS_THREAD_PROCESS_SCOPING -#else -# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#endif - -#define ACE_HAS_ALT_CUSERID -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CLOCK_SETTIME -#define ACE_HAS_DIRENT -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_MSG -#define ACE_HAS_MT_SAFE_MKTIME -#define ACE_HAS_NONCONST_READV -#define ACE_HAS_GETPAGESIZE -#define ACE_HAS_POSIX_SEM -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_HAS_SIGACTION_CONSTP2 -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGSUSPEND -#define ACE_HAS_SSIZE_T -#define ACE_HAS_VOIDPTR_GETTIMEOFDAY -#define ACE_HAS_SYS_FILIO_H -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY -#define ACE_LACKS_EXEC -#define ACE_LACKS_FILELOCKS -#define ACE_LACKS_FORK -#define ACE_LACKS_GETPGID -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_READLINK -#define ACE_LACKS_READV -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_RLIMIT_PROTOTYPE -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SBRK -#define ACE_LACKS_SEMBUF_T -#define ACE_LACKS_SETREUID -#define ACE_LACKS_SETREUID_PROTOTYPE -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREGID_PROTOTYPE -#define ACE_LACKS_STRPTIME -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SI_ADDR -#define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_SYS_MSG_H -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_UCONTEXT_H -#define ACE_HAS_NONCONST_WRITEV -#define ACE_LACKS_WRITEV -#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 -#define ACE_NEEDS_SCHED_H -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_TERMIOS - -// rtems 4.7 or higher -#if (__RTEMS_MAJOR__ > 4) || (__RTEMS_MAJOR__ == 4 && __RTEMS_MINOR__ > 6) -# define ACE_HAS_UALARM -#else -# define ACE_HAS_NOTSUP_SC_PAGESIZE -# define ACE_LACKS_SUSECONDS_T -# define ACE_LACKS_INTPTR_T -# undef ACE_HAS_SHM_OPEN -# undef ACE_HAS_AIO_CALLS -#endif - -// __RTEMS_REVISION__ could also be used but this is broken according -// to the rtems people - -#if !defined (_POSIX_REALTIME_SIGNALS) -# define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#endif - -#if defined (ACE_LACKS_NETWORKING) -# include "ace/config-posix-nonetworking.h" -#endif - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h index 908aef297c988..75fafb245d4c7 100644 --- a/ACE/ace/config-suncc-common.h +++ b/ACE/ace/config-suncc-common.h @@ -38,7 +38,5 @@ # define ACE_LACKS_PRAGMA_ONCE #endif /* ! ACE_LACKS_PRAGMA_ONCE */ -#define ACE_TEMPLATES_REQUIRE_SOURCE - #include /**/ "ace/post.h" #endif /* ACE_SUNCC_COMMON_H */ diff --git a/ACE/ace/config-sunos5.10.h b/ACE/ace/config-sunos5.10.h deleted file mode 100644 index 94d8771533264..0000000000000 --- a/ACE/ace/config-sunos5.10.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.10 -// (Solaris 10) platforms using the SunC++ 5.x (Sun Studio 8-10), or g++ -// compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.9 config, then add any SunOS 5.10 updates below. -#include "ace/config-sunos5.9.h" - -// Solaris 10 can do sem_timedwait() (see ACE_OS::sema_wait). -#define ACE_HAS_POSIX_SEM_TIMEOUT - -#define ACE_HAS_SCANDIR - -// Solaris 10 offers a useable alphasort() unlike previous Solaris versions. -#if defined (ACE_LACKS_ALPHASORT) -# undef ACE_LACKS_ALPHASORT -#endif - -#undef ACE_LACKS_GETADDRINFO -#undef ACE_LACKS_GETNAMEINFO - -// Solaris 10 offers a useable log2() unlike previous Solaris versions. -#if defined (ACE_LACKS_LOG2) -# undef ACE_LACKS_LOG2 -#endif - -// Solaris 10 offers a useable isblank() unlike previous Solaris versions. -#if defined (ACE_LACKS_ISBLANK) -# undef ACE_LACKS_ISBLANK -#endif - -// Solaris 10 delivers pthread_attr_setstack -#if defined (ACE_LACKS_PTHREAD_ATTR_SETSTACK) -# undef ACE_LACKS_PTHREAD_ATTR_SETSTACK -#endif - -// Solaris 10 introduced printf() modifiers for [s]size_t types. -#undef ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII -#define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%zd" -#undef ACE_SIZE_T_FORMAT_SPECIFIER_ASCII -#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%zu" - -// Solaris 10 offers wcstoll() and wcstoull() -#if defined (ACE_LACKS_WCSTOLL) -# undef ACE_LACKS_WCSTOLL -#endif /* ACE_LACKS_WCSTOLL */ -#if defined (ACE_LACKS_WCSTOULL) -# undef ACE_LACKS_WCSTOULL -#endif /* ACE_LACKS_WCSTOULL */ - -#if defined (ACE_HAS_SCTP) && defined (ACE_HAS_LKSCTP) -# define ACE_HAS_VOID_PTR_SCTP_GETLADDRS -# define ACE_HAS_VOID_PTR_SCTP_GETPADDRS -#endif - -#define ACE_HAS_SOLARIS_ATOMIC_LIB - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.11.h b/ACE/ace/config-sunos5.11.h deleted file mode 100644 index 07f8b679f3b2b..0000000000000 --- a/ACE/ace/config-sunos5.11.h +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.11 -// (Solaris 11) platforms using the SunC++ 5.x (Sun Studio 10-12), or g++ -// compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.10 config, then add any SunOS 5.11 updates below. -#include "ace/config-sunos5.10.h" - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.4-g++.h b/ACE/ace/config-sunos5.4-g++.h deleted file mode 100644 index 74be0d5114709..0000000000000 --- a/ACE/ace/config-sunos5.4-g++.h +++ /dev/null @@ -1,164 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.4 -// platforms using the GNU g++ compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#include "ace/config-g++-common.h" - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Sun has the wrong prototype for sendmsg. -#define ACE_HAS_NONCONST_SENDMSG - -// Platform supports system configuration information. -#define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSV_SYSINFO - -// Platform supports the POSIX regular expression library -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYS_SYSCALL_H - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform supports SunOS high resolution timers. -#define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Platform lacks pthread_sigaction -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -#define ACE_HAS_STRSIGNAL - -/* Turn off the following defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# if !defined (_REENTRANT) -# define _REENTRANT -# endif /* _REENTRANT */ -#endif /* !ACE_MT_SAFE */ - -// Platform supports Solaris threads. -#define ACE_HAS_STHREADS - -// Platform supports threads. -#define ACE_HAS_THREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* end threading defines */ - -#define ACE_HAS_PRIOCNTL -#define ACE_NEEDS_LWP_PRIO_SET - -// Platform supports TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports TLI. -#define ACE_HAS_TLI - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 -#define ACE_HAS_IDTYPE_T -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.4-sunc++-4.x.h b/ACE/ace/config-sunos5.4-sunc++-4.x.h deleted file mode 100644 index 4bcec509c335c..0000000000000 --- a/ACE/ace/config-sunos5.4-sunc++-4.x.h +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.4 -// platforms using the SunC++ 4.0.x compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Sun has the wrong prototype for sendmsg. -#define ACE_HAS_NONCONST_SENDMSG - -// Platform supports system configuration information. -#define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSV_SYSINFO - -// Platform supports the POSIX regular expression library. -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYS_SYSCALL_H - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform supports SunOS high resolution timers. -#define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_SVR4_SIGNAL_T - -// Platform lacks pthread_sigaction -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -#define ACE_HAS_STRSIGNAL - -/* Turn off the following defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -// Platform supports Solaris threads. -#define ACE_HAS_STHREADS - -// Platform supports threads. -#define ACE_HAS_THREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* end threading defines */ - -#define ACE_HAS_PRIOCNTL -#define ACE_NEEDS_LWP_PRIO_SET - -// Reactor detects deadlock -// #define ACE_REACTOR_HAS_DEADLOCK_DETECTION - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_SIGNED_CHAR - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -#define ACE_NEEDS_DEV_IO_CONVERSION - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 -#define ACE_HAS_IDTYPE_T - -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h deleted file mode 100644 index 7fc73ca2e75aa..0000000000000 --- a/ACE/ace/config-sunos5.5.h +++ /dev/null @@ -1,336 +0,0 @@ -/* -*- C++ -*- */ -// This configuration file is designed to work for SunOS 5.5 platforms -// using the following compilers: -// * Sun C++ 4.2 and later (including 5.x), patched as noted below -// * g++ -// * Green Hills 1.8.8 and later - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#define ACE_LACKS_STDINT_H - -// alphasort() is present on earlier Solaris versions but is marked as not for -// use on non-BSD systems and not supported for use in applications that use -// system libraries or with multiple threads. So it's mostly useless. -#define ACE_LACKS_ALPHASORT - -// Solaris doesn't support log2() -#define ACE_LACKS_LOG2 - -// SunOS 5.5 does not provide getloadavg() -#define ACE_LACKS_GETLOADAVG - -// Before we do anything, we should include to -// ensure that things are set up properly. -#include - -// Sun has the posix defines so let this file sort out what Sun delivers -#include "ace/config-posix.h" - -// Compiler version-specific settings: -#if defined (__SUNPRO_CC) -# if (__SUNPRO_CC < 0x410) - // The following might not be necessary, but I can't tell: my build - // with Sun C++ 4.0.1 never completes. -# define ACE_NEEDS_DEV_IO_CONVERSION -# elif (__SUNPRO_CC >= 0x420) -# if (__SUNPRO_CC >= 0x500) - // If -compat=4 is turned on, the old 4.2 settings for iostreams are used, - // but the newer, explicit instantiation is used (above) -# if (__SUNPRO_CC_COMPAT >= 5) -# define ACE_HAS_THR_C_DEST -# endif /* __SUNPRO_CC_COMPAT >= 5 */ -# endif /* __SUNPRO_CC >= 0x500 */ -# endif /* __SUNPRO_CC >= 0x420 */ - -# define ACE_CAST_CONST const -# define ACE_HAS_HI_RES_TIMER -# define ACE_HAS_SIG_C_FUNC /* Sun CC 5.0 needs this, 4.2 doesn't mind. */ -# define ACE_HAS_XPG4_MULTIBYTE_CHAR -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_SIGNED_CHAR - - /* If you want to disable threading with Sun CC, remove -mt - from your CFLAGS, e.g., using make threads=0. */ - - -// Take advantage of Sun Studio 8 (Sun C++ 5.5) or better symbol -// visibility to generate improved shared library binaries. -# if (__SUNPRO_CC > 0x540) - -# if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0 -# undef ACE_HAS_CUSTOM_EXPORT_MACROS -# else -# ifndef ACE_HAS_CUSTOM_EXPORT_MACROS -# define ACE_HAS_CUSTOM_EXPORT_MACROS -# endif /* !ACE_HAS_CUSTOM_EXPORT_MACROS */ -# define ACE_Proper_Export_Flag __symbolic -# define ACE_Proper_Import_Flag __global - -# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T -# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE ; - -// # define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T -// # define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE; - -# endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ -# endif /* __SUNPRO_CC > 0x540 (> Sun C++ 5.4) */ - -#elif defined (__GNUG__) -# include "ace/config-g++-common.h" - -# define ACE_HAS_HI_RES_TIMER -# define ACE_HAS_XPG4_MULTIBYTE_CHAR - -# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0 - // ACE_MT_SAFE is #defined below, for all compilers. -# if !defined (_REENTRANT) - /* If you want to disable threading, comment out the following - line. Or, add -DACE_MT_SAFE=0 to your CFLAGS, e.g., using - make threads=0. */ -# define _REENTRANT -# endif /* _REENTRANT */ -# endif /* !ACE_MT_SAFE */ - -#else /* ! __SUNPRO_CC && ! __GNUG__ */ -# ifdef __cplusplus /* Let it slide for C compilers. */ -# error unsupported compiler in ace/config-sunos5.5.h -# endif /* __cplusplus */ -#endif /* ! __SUNPRO_CC && ! __GNUG__ */ - -#if !defined (__ACE_INLINE__) -// @note If you have link problems with undefined inline template -// functions with Sun C++, be sure that the #define of __ACE_INLINE__ -// below is not commented out. -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Platform supports the POSIX regular expression library. -// @note Please comment out the ACE_HAS_REGEX #define if you -// have link problems with g++ or egcs on SunOS 5.5. -#define ACE_HAS_REGEX - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// select()'s timeval arg is not declared as const and may be modified -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#define ACE_HAS_UALARM -#define ACE_LACKS_UALARM_PROTOTYPE - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Platform supports system configuration information. -#define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSV_SYSINFO - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the file. -#define ACE_HAS_SYS_SYSCALL_H - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// This setting was determined by running the autoconf tests. If it doesn't -// work uniformly, will need some tweaking, possibly based on other -// XPG feature-test macros. -#define ACE_HAS_CONST_CHAR_SWAB - -// Compiler/platform supports alloca() -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform has -#define ACE_HAS_ALLOCA_H - -// Platform contains . -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// ACE_HAS_CLOCK_GETTIME requires linking with -lposix4. -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CLOCK_SETTIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T -#define ACE_HAS_GETRUSAGE - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -#define ACE_HAS_STRSIGNAL - -// SunOS 5.5.x does not support mkstemp -#define ACE_LACKS_MKSTEMP -#define ACE_LACKS_SYS_SYSCTL_H - -#if !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)) -# define ACE_HAS_CHARPTR_SHMDT -#endif - -#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 1) -#if defined (_REENTRANT) || \ - (defined (_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L)) || \ - defined (_POSIX_PTHREAD_SEMANTICS) - // Compile using multi-thread libraries. -# define ACE_HAS_THREADS - -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif /* ACE_MT_SAFE */ - - // Platform supports POSIX pthreads *and* Solaris threads, by - // default! If you only want to use POSIX pthreads, add - // -D_POSIX_PTHREAD_SEMANTICS to your CFLAGS. Or, #define it right - // here. See the Intro (3) man page for information on - // -D_POSIX_PTHREAD_SEMANTICS. -# if defined (_POSIX_PTHREAD_SEMANTICS) -# define ACE_LACKS_RWLOCK_T -# else -# define ACE_HAS_STHREADS -# endif /* ! _POSIX_PTHREAD_SEMANTICS */ - -# define ACE_HAS_PTHREADS - // . . . but only supports SCHED_OTHER scheduling policy -# define ACE_HAS_ONLY_SCHED_OTHER -# define ACE_HAS_SIGWAIT -# define ACE_HAS_SIGTIMEDWAIT -# define ACE_HAS_SIGSUSPEND -# define ACE_LACKS_PTHREAD_ATTR_SETSTACK - - // Compiler/platform has thread-specific storage -# define ACE_HAS_THREAD_SPECIFIC_STORAGE - - // Platform supports reentrant functions (i.e., all the POSIX *_r functions). -# define ACE_HAS_REENTRANT_FUNCTIONS - -# define ACE_NEEDS_LWP_PRIO_SET -# define ACE_HAS_THR_YIELD -# define ACE_LACKS_PTHREAD_YIELD -#endif /* _REENTRANT || _POSIX_C_SOURCE >= 199506L || \ - _POSIX_PTHREAD_SEMANTICS */ -#endif /* !ACE_MT_SAFE || ACE_MT_SAFE == 1 */ - -#define ACE_HAS_PRIOCNTL - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform has broken t_error() prototype. -#define ACE_HAS_BROKEN_T_ERROR - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -#define ACE_HAS_GETPAGESIZE 1 - -#define ACE_HAS_IDTYPE_T - -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT - -#define ACE_LACKS_ISCTYPE -#define ACE_LACKS_ISBLANK - -#if defined (__SUNPRO_CC) -# define ACE_CC_NAME ACE_TEXT ("SunPro C++") -# define ACE_CC_MAJOR_VERSION (__SUNPRO_CC >> 8) -# define ACE_CC_MINOR_VERSION (__SUNPRO_CC & 0x00ff) -# define ACE_CC_BETA_VERSION (0) -#endif /* __SUNPRO_CC */ - -#if defined (i386) && (_FILE_OFFSET_BITS==32) -# define ACE_HAS_X86_STAT_MACROS -#endif /* i386 && _FILE_OFFSET_BITS==32 */ - -#define ACE_MALLOC_ALIGN ((size_t)8) -#define ACE_LACKS_SETREUID_PROTOTYPE -#define ACE_LACKS_SETREGID_PROTOTYPE - -// Solaris does indeed implement the inet_aton() function, but it is -// found in `libresolv.*'. It doesn't seem worth it to link another -// library just for that function. Just use the emulation in ACE that -// has been used for years. -#define ACE_LACKS_INET_ATON - -// Solaris doesn't have wcstoull -#define ACE_LACKS_WCSTOLL -#define ACE_LACKS_WCSTOULL - -#if defined (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) -#undef ACE_HAS_PROC_FS -#undef ACE_HAS_PRUSAGE_T -#endif /* (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) */ - -// Sum of the iov_len values can't be larger then SSIZE_MAX -#define ACE_HAS_SOCK_BUF_SIZE_MAX - -#define ACE_LACKS_SETENV -#define ACE_LACKS_UNSETENV - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h deleted file mode 100644 index 2e2ef3b9d03f3..0000000000000 --- a/ACE/ace/config-sunos5.6.h +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.6 -// platforms using the SunC++ 4.x or g++ compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.5 config file, then add SunOS 5.6 updates below. - -#include "ace/config-sunos5.5.h" - -#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE > 2) || \ - defined (__EXTENSIONS__) -// The asctime_r/ctime_r parameters change at POSIX.1c-1995 -# if (defined (_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199506L) -# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -# endif /* POSIX_C_SOURCE >= 199506L */ -# define ACE_HAS_SIGWAIT -// Hack 'cuz _POSIX_C_SOURCE > 2 and -DEXTENSIONS hides this. -# define ACE_LACKS_MADVISE_PROTOTYPE -#endif /* _POSIX_C_SOURCE > 2 || __EXTENSIONS__ */ - -// Support for the SunC++ 5.2 compiler. -// Do not undefine for compat mode < 5 -#if defined (__SUNPRO_CC) && __SUNPRO_CC > 0x510 -#if defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT >= 5) -#ifdef ACE_LACKS_ACE_IOSTREAM -#undef ACE_LACKS_ACE_IOSTREAM -#endif /* ACE_LACKS_ACE_IOSTREAM */ -#endif /* defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT >= 5) */ - -#ifndef ACE_LACKS_UNBUFFERED_STREAMBUF -#define ACE_LACKS_UNBUFFERED_STREAMBUF 1 -#endif /* ACE_LACKS_UNBUFFERED_STREAMBUF */ -#ifndef ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -// Forte 7 seems to botch this one... -#ifndef ACE_HAS_THR_C_DEST -#define ACE_HAS_THR_C_DEST 1 -#endif /* ACE_HAS_THR_C_DEST */ -#ifndef ACE_HAS_THR_C_FUNC -#define ACE_HAS_THR_C_FUNC 1 -#endif /* ACE_HAS_THR_C_FUNC */ -#ifndef ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 -#endif /* ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES */ -#ifndef ACE_HAS_SIG_C_FUNC -#define ACE_HAS_SIG_C_FUNC 1 -#endif /* ACE_HAS_SIG_C_FUNC */ -#ifndef ACE_LACKS_IOSTREAM_FX -#define ACE_LACKS_IOSTREAM_FX 1 -#endif /* ACE_LACKS_IOSTREAM_FX */ -#ifndef ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -#endif /* ACE_LACKS_LINEBUFFERED_STREAMBUF */ - -#endif /* defined (__SUNPRO_CC) && __SUNPRO_CC > 0x510 */ - -// SunOS 5.6 and above support mkstemp -#undef ACE_LACKS_MKSTEMP - -// SunOS 5.6 has AIO calls. -#if !defined (ACE_HAS_AIO_CALLS) -#define ACE_HAS_AIO_CALLS -#endif /* ACE_HAS_AIO_CALLS */ - -#if !defined (ACE_HAS_POSIX_REALTIME_SIGNALS) -#define ACE_HAS_POSIX_REALTIME_SIGNALS -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ - -#if !defined (ACE_HAS_POSIX_MESSAGE_PASSING) -#define ACE_HAS_POSIX_MESSAGE_PASSING -#endif /* ACE_HAS_POSIX_MESSAGE_PASSING */ - -#if !defined (ACE_HAS_POSIX_SEM) -#define ACE_HAS_POSIX_SEM -#endif /* ACE_HAS_POSIX_SEM */ - -// Sunos 5.6's aio_* with RT signals is broken. -#if !defined (ACE_POSIX_AIOCB_PROACTOR) -#define ACE_POSIX_AIOCB_PROACTOR -#endif /* ACE_POSIX_AIOCB_PROACTOR */ - -// SunOS 5.6 introduced shm_open, but need to turn on POSIX.1b or higher -// to pick it up. -#if defined (_POSIX_C_SOURCE) && (_POSIX_C_SOURCE > 2) -# define ACE_HAS_SHM_OPEN -#else -# undef ACE_HAS_SHM_OPEN -#endif /* _POSIX_C_SOURCE > 2 */ - -// The struct msghdr is conditional on SunOS 5.6 based on _XPG4_2 -#if defined(_XPG4_2) -# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#endif /* _XPG4_2 */ - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.7.h b/ACE/ace/config-sunos5.7.h deleted file mode 100644 index d21859e5d1996..0000000000000 --- a/ACE/ace/config-sunos5.7.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.7 -// (Solaris 7) platforms using the SunC++ 4.x, 5.x, or g++ compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.6 config file, then add SunOS 5.7 updates below. - -#include "ace/config-sunos5.6.h" - -// This may be true for earlier Solaris versions, but I can only verify -// it for Solaris 7 and later. -#define ACE_HAS_VFWPRINTF -#if defined (ACE_HAS_SHM_OPEN) -# define ACE_SHM_OPEN_REQUIRES_ONE_SLASH -#endif - -// Sun began distributing with SunOS 5.7 -#define ACE_HAS_SYS_LOADAVG_H - -// SunOS 5.7 has getloadavg() -#undef ACE_LACKS_GETLOADAVG - -#if defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x530) - // Wide character methods are in std:: when using SunCC 5.3 -# define ACE_WCHAR_IN_STD_NAMESPACE -#endif - -// SunOS 5.7 supports SCHED_FIFO and SCHED_RR, as well as SCHED_OTHER. -#undef ACE_HAS_ONLY_SCHED_OTHER - -// SunOS 5.7 gets this right . . . -#undef ACE_HAS_BROKEN_T_ERROR - -// And doesn't need to set LWP priorities, as shown by -// performance-tests/Misc/preempt. -#undef ACE_NEEDS_LWP_PRIO_SET - -// SunOS 5.7 can support Real-Time Signals and POSIX4 AIO operations -// are supported. - -#if !defined (ACE_HAS_AIO_CALLS) -#define ACE_HAS_AIO_CALLS -#endif /* !ACE_HAS_AIO_CALLS */ - -// SunOS 5.7 has socklen_t -#define ACE_HAS_SOCKLEN_T - -#if defined (__sparcv9) -#if !defined (_LP64) -# define _LP64 -#endif /* _LP64 */ -#define ACE_SIZEOF_LONG 8 /* Needed to circumvent compiler bug #4294969 */ -#endif /* __sparcv9 */ - -#if (defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4)) /* XPG4 or XPG4v2 */ -// 2 parameter wcstok() -#else /* XPG4 or XPG4v2 */ -# define ACE_HAS_3_PARAM_WCSTOK -#endif - -// Solaris 7 started to support /dev/poll -#define ACE_HAS_DEV_POLL - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.8.h b/ACE/ace/config-sunos5.8.h deleted file mode 100644 index b78ee27a18723..0000000000000 --- a/ACE/ace/config-sunos5.8.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.8 -// (Solaris 8) platforms using the SunC++ 4.x, 5.x, 6.x, or g++ compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.7 config, then add any SunOS 5.8 updates below. -#include "ace/config-sunos5.7.h" - -#undef ACE_WCHAR_IN_STD_NAMESPACE - -// This may be true for versions prior to Solaris 8 as well, but I don't -// have any to try it on. -#if !defined (ACE_HAS_TIMEZONE) -# define ACE_HAS_TIMEZONE -#endif - -// The range of thread priorities for 5.8 differs from 5.7 in the -// minimum priority for the SCHED_OTHER policy (i.e., -// ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) -20 - -# if defined (_POSIX_PTHREAD_SEMANTICS) -# ifdef ACE_LACKS_RWLOCK_T -# undef ACE_LACKS_RWLOCK_T -# endif /* ACE_LACKS_RWLOCK_T */ -# endif /* _POSIX_PTHREAD_SEMANTICS */ - -// This is no longer the case for Sun 5.9 onwards -# undef ACE_HAS_X86_STAT_MACROS - -// gethostbyaddr does not handle IPv6-mapped-IPv4 addresses -#define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.9.h b/ACE/ace/config-sunos5.9.h deleted file mode 100644 index 53cb350fbd4a9..0000000000000 --- a/ACE/ace/config-sunos5.9.h +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.9 -// (Solaris 9) platforms using the SunC++ 5.x (Forte 6 and 7), or g++ -// compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.8 config, then add any SunOS 5.9 updates below. -#include "ace/config-sunos5.8.h" - -#define ACE_HAS_SENDFILE 1 -#define ACE_LACKS_GETADDRINFO -#define ACE_LACKS_GETNAMEINFO -#define ACE_LACKS_THR_CONCURRENCY_FUNCS - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-vxworks.h b/ACE/ace/config-vxworks.h index e9b35930a2798..2239184cc6f15 100644 --- a/ACE/ace/config-vxworks.h +++ b/ACE/ace/config-vxworks.h @@ -6,6 +6,10 @@ #define ACE_CONFIG_VXWORKS_H #include /**/ "ace/pre.h" +#if !defined(ACE_VXWORKS_RELEASE) +# define ACE_VXWORKS_RELEASE ACE_VXWORKS +#endif + // If ACE_VXWORKS is not defined try to figure out the VxWorks version #if !defined (ACE_VXWORKS) # include "vxWorks.h" @@ -53,7 +57,13 @@ #elif (ACE_VXWORKS == 0x690) # include "ace/config-vxworks6.9.h" #elif (ACE_VXWORKS == 0x700) -# include "ace/config-vxworks7.0.h" +# if (ACE_VXWORKS_RELEASE == 0x2103) +# include "ace/config-vxworks21.03.h" +# elif (ACE_VXWORKS_RELEASE >= 0x2203) +# include "ace/config-vxworks22.03.h" +# else +# include "ace/config-vxworks7.0.h" +# endif #else # error Unknown or unsupported VxWorks version #endif diff --git a/ACE/ace/config-vxworks21.03.h b/ACE/ace/config-vxworks21.03.h new file mode 100644 index 0000000000000..5d5f8489bea01 --- /dev/null +++ b/ACE/ace/config-vxworks21.03.h @@ -0,0 +1,71 @@ +/* -*- C++ -*- */ +// The following configuration file is designed to work for VxWorks +// 21.03 platforms using one of these compilers: +// 1) The llvm compiler that is shipped with VxWorks 21.03 + +#ifndef ACE_CONFIG_VXWORKS_21_03_H +#define ACE_CONFIG_VXWORKS_21_03_H +#include /**/ "ace/pre.h" + +#include "ace/config-vxworks7.0.h" + +#if defined (__RTP__) +# include "semLibCommon.h" +# define ACE_LACKS_IF_NAMEINDEX +# define ACE_LACKS_FGETWC +#else +# undef ACE_MKDIR_LACKS_MODE +# define ACE_LACKS_GETPID +#endif + +#undef ACE_SIZEOF_WCHAR +#define ACE_SIZEOF_WCHAR 4 + +#define ACE_HAS_SOCKLEN_T + +#undef ACE_LACKS_GETSERVBYNAME +#undef ACE_LACKS_GETPROTOBYNAME +#undef ACE_LACKS_GETPROTOBYNUMBER +#undef ACE_LACKS_GETIPNODEBYADDR +#undef ACE_LACKS_LSTAT +#undef ACE_LACKS_MKFIFO +#undef ACE_LACKS_MKSTEMP +#undef ACE_LACKS_READLINK +#undef ACE_LACKS_REALPATH +#undef ACE_LACKS_PIPE +#undef ACE_LACKS_UMASK +#undef ACE_LACKS_TEMPNAM +#undef ACE_HAS_SIGTIMEDWAIT +#undef ACE_HAS_SIGSUSPEND +#undef ACE_HAS_GETIFADDRS + +#undef ACE_LACKS_SETEGID +#undef ACE_LACKS_SETUID +#undef ACE_LACKS_SETEUID +#undef ACE_LACKS_GETEUID +#undef ACE_LACKS_GETUID +#undef ACE_LACKS_GETEGID +#undef ACE_LACKS_GETGID +#undef ACE_LACKS_SETGID + +#undef ACE_LACKS_SYS_UIO_H +#undef ACE_LACKS_TERMIOS_H +#undef ACE_LACKS_FCNTL +#undef ACE_HAS_CHARPTR_SOCKOPT + +#undef ACE_LACKS_INTPTR_T +#undef ACE_LACKS_INTTYPES_H +#undef ACE_LACKS_STDINT_H +#undef ACE_LACKS_SYS_TIME_H +#undef ACE_LACKS_SYS_SELECT_H +#undef ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R +#undef ACE_LACKS_SEARCH_H + +#undef ACE_LACKS_TZSET +#undef ACE_LACKS_ISWCTYPE +#undef ACE_LACKS_ISBLANK + +#undef ACE_LACKS_RAND_R + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_VXWORKS_21_03_H */ diff --git a/ACE/ace/config-vxworks22.03.h b/ACE/ace/config-vxworks22.03.h index 3e4ca4c77f53c..3b1bfed81b668 100644 --- a/ACE/ace/config-vxworks22.03.h +++ b/ACE/ace/config-vxworks22.03.h @@ -7,58 +7,7 @@ #define ACE_CONFIG_VXWORKS_22_03_H #include /**/ "ace/pre.h" -#include "ace/config-vxworks.h" - -#if !defined (__RTP__) -# undef ACE_MKDIR_LACKS_MODE -# define ACE_LACKS_GETPID -#endif - -#define ACE_HAS_SOCKLEN_T - -#undef ACE_LACKS_GETSERVBYNAME -#undef ACE_LACKS_GETPROTOBYNAME -#undef ACE_LACKS_GETPROTOBYNUMBER -#undef ACE_LACKS_GETIPNODEBYADDR -#undef ACE_LACKS_LSTAT -#undef ACE_LACKS_MKFIFO -#undef ACE_LACKS_MKSTEMP -#undef ACE_LACKS_READLINK -#undef ACE_LACKS_REALPATH -#undef ACE_LACKS_PIPE -#undef ACE_LACKS_UMASK -#undef ACE_LACKS_TEMPNAM -#undef ACE_HAS_SIGTIMEDWAIT -#undef ACE_HAS_SIGSUSPEND -#undef ACE_HAS_GETIFADDRS - -#undef ACE_LACKS_SETEGID -#undef ACE_LACKS_SETUID -#undef ACE_LACKS_SETEUID -#undef ACE_LACKS_GETEUID -#undef ACE_LACKS_GETUID -#undef ACE_LACKS_GETEGID -#undef ACE_LACKS_GETGID -#undef ACE_LACKS_SETGID - -#undef ACE_LACKS_SYS_UIO_H -#undef ACE_LACKS_TERMIOS_H -#undef ACE_LACKS_FCNTL -#undef ACE_HAS_CHARPTR_SOCKOPT - -#undef ACE_LACKS_INTPTR_T -#undef ACE_LACKS_INTTYPES_H -#undef ACE_LACKS_STDINT_H -#undef ACE_LACKS_SYS_TIME_H -#undef ACE_LACKS_SYS_SELECT_H -#undef ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R -#undef ACE_LACKS_SEARCH_H - -#undef ACE_LACKS_TZSET -#undef ACE_LACKS_ISWCTYPE -#undef ACE_LACKS_ISBLANK - -#undef ACE_LACKS_RAND_R +#include "ace/config-vxworks21.03.h" #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_22_03_H */ diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h index 430923a9c7e6d..91983c3f2d609 100644 --- a/ACE/ace/config-vxworks6.4.h +++ b/ACE/ace/config-vxworks6.4.h @@ -42,9 +42,6 @@ # define _C99 # endif # endif - -#elif defined (__DCC__) -# define ACE_TEMPLATES_REQUIRE_SOURCE #else /* ! __GNUG__ && !__DCC__ */ # ifdef __cplusplus /* Let it slide for C compilers. */ # error unsupported compiler on VxWorks diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 92e66ef49f3ad..1ffc9968e9873 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -17,18 +17,20 @@ #define ACE_IMPORT_SINGLETON_DECLARATION(T) template class __declspec (dllimport) T #define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllimport) SINGLETON_TYPE ; -// Default to no inlining -#if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ 0 -#endif /* __ACE_INLINE__ */ +// In later versions of C++Builder we will prefer inline functions by +// default. The debug configuration of ACE is built with functions +// out-of-line, so when linking your application against a debug ACE +// build, you can choose to use the out-of-line functions by adding +// ACE_NO_INLINE=1 to your project settings. +# if !defined (__ACE_INLINE__) +# define __ACE_INLINE__ 1 +# endif /* __ACE_INLINE__ */ #define ACE_CC_NAME ACE_TEXT ("Embarcadero C++ Builder") #define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100) #define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) #define ACE_CC_BETA_VERSION (0) -#define ACE_CC_PREPROCESSOR_ARGS "-Xdriver -E -q -o%s" - #if !defined (WIN32) # if defined (__WIN32__) || defined (_WIN32) # define WIN32 1 @@ -48,10 +50,12 @@ # define ACE_HAS_BCC32 #endif +#define ACE_CC_PREPROCESSOR_ARGS "--precompile -q -o%s" + #if defined (ACE_HAS_BCC64) # define ACE_CC_PREPROCESSOR "BCC64.EXE" #else -# define ACE_CC_PREPROCESSOR "BCC32C.EXE" +# define ACE_CC_PREPROCESSOR "BCC32X.EXE" #endif # include "ace/config-win32-common.h" @@ -110,7 +114,6 @@ #define ACE_HAS_USER_MODE_MASKS 1 #define ACE_LACKS_ACE_IOSTREAM 1 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 #if defined (ACE_HAS_BCC32) # define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu" # define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index a22eb51989a4b..f22fbb0f063b6 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -8,13 +8,6 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -// Windows Mobile (CE) stuff is primarily further restrictions to what's -// in the rest of this file. Also, it defined ACE_HAS_WINCE, which is used -// in this file. -#if defined (_WIN32_WCE) -# include "ace/config-WinCE.h" -#endif /* _WIN32_WCE */ - #if defined(__MINGW32__) // When using the --std=c++0x option with MinGW the compiler omits defining // the following required macros (at least with the GCC 4.6.2 version) @@ -31,7 +24,7 @@ #endif // Complain if WIN32 is not already defined. -#if !defined (WIN32) && !defined (ACE_HAS_WINCE) +#if !defined (WIN32) # error Please define WIN32 in your project settings. #endif @@ -106,8 +99,6 @@ # define ACE_MT_SAFE 1 #endif -// On winCE these classes do not exist. If they are -// introduced in the future, no changes need to be made #if defined (ABOVE_NORMAL_PRIORITY_CLASS) && \ defined (BELOW_NORMAL_PRIORITY_CLASS) && \ defined (HIGH_PRIORITY_CLASS) && \ @@ -210,18 +201,14 @@ # define ACE_IOV_MAX 64 #endif /* ACE_IOV_MAX */ -#if !defined (ACE_HAS_WINCE) // Platform supports pread() and pwrite() -# define ACE_HAS_WTOF -#endif /* ! ACE_HAS_WINCE */ +#define ACE_HAS_WTOF #define ACE_HAS_P_READ_WRITE -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_DIRECT_H -# define ACE_HAS_PROCESS_H -# define ACE_HAS_IO_H -#endif /* ! ACE_HAS_WINCE */ +#define ACE_HAS_DIRECT_H +#define ACE_HAS_PROCESS_H +#define ACE_HAS_IO_H #define ACE_DEFAULT_THREAD_PRIORITY 0 @@ -417,8 +404,6 @@ # include /**/ /* He is doing MFC */ // Windows.h will be included via afxwin.h->afx.h->afx_ver_.h->afxv_w32.h // #define _INC_WINDOWS // Prevent winsock.h from including windows.h -#elif defined (ACE_HAS_WINCE) -# include /**/ #endif #if !defined (_INC_WINDOWS) /* Already include windows.h ? */ @@ -448,68 +433,22 @@ # if !defined (_WINSOCK2API_) // will also include windows.h, if not present # include /**/ -// WinCE 4 doesn't define the Exxx values without the WSA prefix, so do that -// here. This is all lifted from the #if 0'd out part of winsock2.h. -# if defined (_WIN32_WCE) && (_WIN32_WCE < 0x600) -# define EWOULDBLOCK WSAEWOULDBLOCK -# define EINPROGRESS WSAEINPROGRESS -# define EALREADY WSAEALREADY -# define ENOTSOCK WSAENOTSOCK -# define EDESTADDRREQ WSAEDESTADDRREQ -# define EMSGSIZE WSAEMSGSIZE -# define EPROTOTYPE WSAEPROTOTYPE -# define ENOPROTOOPT WSAENOPROTOOPT -# define EPROTONOSUPPORT WSAEPROTONOSUPPORT -# define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT -# define EOPNOTSUPP WSAEOPNOTSUPP -# define EPFNOSUPPORT WSAEPFNOSUPPORT -# define EAFNOSUPPORT WSAEAFNOSUPPORT -# define EADDRINUSE WSAEADDRINUSE -# define EADDRNOTAVAIL WSAEADDRNOTAVAIL -# define ENETDOWN WSAENETDOWN -# define ENETUNREACH WSAENETUNREACH -# define ENETRESET WSAENETRESET -# define ECONNABORTED WSAECONNABORTED -# define ECONNRESET WSAECONNRESET -# define ENOBUFS WSAENOBUFS -# define EISCONN WSAEISCONN -# define ENOTCONN WSAENOTCONN -# define ESHUTDOWN WSAESHUTDOWN -# define ETOOMANYREFS WSAETOOMANYREFS -# define ETIMEDOUT WSAETIMEDOUT -# define ECONNREFUSED WSAECONNREFUSED -# define ELOOP WSAELOOP -# define ENAMETOOLONG WSAENAMETOOLONG -# define EHOSTDOWN WSAEHOSTDOWN -# define EHOSTUNREACH WSAEHOSTUNREACH -# define ENOTEMPTY WSAENOTEMPTY -# define EPROCLIM WSAEPROCLIM -# define EUSERS WSAEUSERS -# define EDQUOT WSAEDQUOT -# define ESTALE WSAESTALE -# define EREMOTE WSAEREMOTE -# endif /* (_WIN32_WCE) && (_WIN32_WCE < 0x600) */ # endif /* _WINSOCK2API */ # if defined (ACE_HAS_FORE_ATM_WS2) # include /**/ # endif /*ACE_HAS_FORE_ATM_WS2 */ -// CE doesn't have Microsoft Winsock 2 extensions -# if !defined _MSWSOCK_ && !defined (ACE_HAS_WINCE) +# if !defined _MSWSOCK_ # include /**/ # endif /* _MSWSOCK_ */ # if defined (_MSC_VER) -# if defined (ACE_HAS_WINCE) -# pragma comment(lib, "ws2.lib") -# else -# pragma comment(lib, "ws2_32.lib") -# pragma comment(lib, "mswsock.lib") -# if defined (ACE_HAS_IPV6) -# pragma comment(lib, "iphlpapi.lib") -# endif -# endif /* ACE_HAS_WINCE */ +# pragma comment(lib, "ws2_32.lib") +# pragma comment(lib, "mswsock.lib") +# if defined (ACE_HAS_IPV6) +# pragma comment(lib, "iphlpapi.lib") +# endif # endif /* _MSC_VER */ # define ACE_WSOCK_VERSION 2, 0 @@ -521,7 +460,7 @@ // PharLap ETS has its own winsock lib, so don't grab the one // supplied with the OS. -# if defined (_MSC_VER) && !defined (_WIN32_WCE) && !defined (ACE_HAS_PHARLAP) +# if defined (_MSC_VER) && !defined (ACE_HAS_PHARLAP) # pragma comment(lib, "wsock32.lib") # endif /* _MSC_VER */ @@ -549,11 +488,9 @@ # define ACE_HAS_IP_MULTICAST #endif /* ACE_HAS_WINSOCK2 */ -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_INTERLOCKED_EXCHANGEADD -#endif +#define ACE_HAS_INTERLOCKED_EXCHANGEADD -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_HAS_PHARLAP) # if _WIN32_WINNT >= 0x400 # define ACE_HAS_SIGNAL_OBJECT_AND_WAIT @@ -563,7 +500,7 @@ # define ACE_HAS_CANCEL_IO # define ACE_HAS_WIN32_OVERLAPPED_IO # define ACE_HAS_WIN32_NAMED_PIPES -#endif /* !defined (ACE_HAS_WINCE) && !ACE_HAS_PHARLAP */ +#endif /* !ACE_HAS_PHARLAP */ #if !defined (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION) # define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH @@ -596,9 +533,6 @@ #define ACE_HAS_NONCONST_SWAB #define ACE_HAS_INT_SWAB -// gethostbyaddr does not handle IPv6-mapped-IPv4 addresses -#define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED - #if defined (ACE_WIN64) // Data must be aligned on 8-byte boundaries, at a minimum. # define ACE_MALLOC_ALIGN 8 @@ -610,23 +544,17 @@ # define ACE_DISABLES_THREAD_LIBRARY_CALLS 0 #endif /* ACE_DISABLES_THREAD_LIBRARY_CALLS */ -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_HAS_PHARLAP) # define ACE_HAS_LOG_MSG_NT_EVENT_LOG -#endif /* !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */ +#endif /* !ACE_HAS_PHARLAP */ -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_LLSEEK -#endif /* !ACE_HAS_WINCE */ +#define ACE_HAS_LLSEEK // Needed for obtaining the MAC address -// I dont believe this will work under CE, notice the -// check for ACE_HAS_WINCE. -# if !defined (ACE_HAS_WINCE) -# include -# if defined (_MSC_VER) -# pragma comment(lib, "netapi32.lib") // needed for obtaing MACaddress -# endif -# endif /* !ACE_HAS_WINCE */ +#include +#if defined (_MSC_VER) +# pragma comment(lib, "netapi32.lib") // needed for obtaing MACaddress +#endif #if !defined (WINVER) # define WINVER 0x0400 // pretend it's at least WinNT 4.0 diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index 866c45f6dd2e0..18fea9a9a5e22 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -37,33 +37,19 @@ #define ACE_STRCASECMP_EQUIVALENT ::_stricmp #define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp #define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#if defined (ACE_HAS_WINCE) -# define ACE_FILENO_EQUIVALENT ::_fileno -#else -# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) -#endif +#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) -// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. -# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) -# define ACE_HAS_SIG_ATOMIC_T -# endif /* !Win CE 6.0 or less */ +#define ACE_HAS_SIG_ATOMIC_T #define ACE_LACKS_STRPTIME -// Evaluate this with a WinCE build; maybe things have improved since VC8. -//#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_INTRIN_H -# define ACE_HAS_INTRINSIC_INTERLOCKED -//#endif +#define ACE_HAS_INTRIN_H +#define ACE_HAS_INTRINSIC_INTERLOCKED -#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) -# define ACE_HAS_INTRINSIC_BYTESWAP -#endif +#define ACE_HAS_INTRINSIC_BYTESWAP #define ACE_LACKS_STRRECVFD -#define ACE_TEMPLATES_REQUIRE_SOURCE - // Platform provides ACE_TLI function prototypes. // For Win32, this is not really true, but saves a lot of hassle! #define ACE_HAS_TLI_PROTOTYPES @@ -85,17 +71,10 @@ // 'class1' : inherits 'class2::member' via dominance #pragma warning(disable:4250) -// CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT. -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT) +#if !defined (ACE_HAS_TR24731_2005_CRT) # define ACE_HAS_TR24731_2005_CRT #endif -// On CE w/o MFC config-WinCE.h needs to declare a placement new. This -// triggers a warning that there's no placement delete, which can be ignored. -#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC) -# pragma warning(disable:4291) -#endif - // A template can not be exported. Only an instantiation may be exported. #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index c1cdeb85277f9..1e1b063d420fd 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -30,12 +30,7 @@ #define ACE_LACKS_NATIVE_WCHAR_T #endif -// Win Mobile still does thread exits differently than PC Windows. -#if defined (_WIN32_WCE) -# define ACE_ENDTHREADEX(STATUS) ExitThread ((DWORD) STATUS) -#else # define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) -#endif /* _WIN32_WCE */ //FUZZ: disable check_for_msc_ver #if (_MSC_VER >= 1930) @@ -54,13 +49,13 @@ #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) // must have _MT defined to include multithreading // features from win32 headers -# if !defined(_MT) && !defined (ACE_HAS_WINCE) +# if !defined(_MT) // *** DO NOT *** defeat this error message by defining _MT yourself. // On MSVC, this is changed by selecting the Multithreaded // DLL or Debug Multithreaded DLL in the Project Settings // under C++ Code Generation. # error You must link against multi-threaded libraries when using ACE (check your project settings) -# endif /* !_MT && !ACE_HAS_WINCE */ +# endif /* !_MT */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ #include diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index be467aa2b2455..eeb640e76e8d8 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -30,12 +30,6 @@ # if defined (ACE_HAS_NET_IF_DL_H) # include /**/ # endif /* ACE_HAS_NET_IF_DL_H */ -# if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. - Thanks to Torsten Kopper for this patch.*/ -# undef IOR -# endif /* HPUX && IOR */ #endif /* !ACE_LACKS_NET_IF_H */ #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) diff --git a/ACE/ace/os_include/os_dlfcn.h b/ACE/ace/os_include/os_dlfcn.h index d13d5ca5ce721..76b75cc082d91 100644 --- a/ACE/ace/os_include/os_dlfcn.h +++ b/ACE/ace/os_include/os_dlfcn.h @@ -26,10 +26,6 @@ # include /**/ #endif /* !ACE_LACKS_DLFCN_H */ -#if defined (__hpux) -# include /**/ -#endif /* __hpux */ - #if defined (ACE_VXWORKS) && !defined (__RTP__) # include /**/ /* for module load */ # include /**/ /* for module unload */ @@ -66,15 +62,7 @@ extern "C" # if !defined (ACE_DEFAULT_SHLIB_MODE) # define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY | RTLD_GLOBAL # endif -#elif defined (__hpux) - typedef shl_t ACE_SHLIB_HANDLE; -# if !defined (ACE_SHLIB_INVALID_HANDLE) -# define ACE_SHLIB_INVALID_HANDLE 0 -# endif /* ACE_SHLIB_INVALID_HANDLE */ -# if !defined (ACE_DEFAULT_SHLIB_MODE) -# define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED | DYNAMIC_PATH -# endif /* ACE_DEFAULT_SHLIB_MODE */ -#else /* !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING && !__hpux */ +#else /* !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING */ typedef void *ACE_SHLIB_HANDLE; # if !defined (ACE_SHLIB_INVALID_HANDLE) # define ACE_SHLIB_INVALID_HANDLE 0 diff --git a/ACE/ace/os_include/os_errno.h b/ACE/ace/os_include/os_errno.h index d132d73882cd6..dac78b9bf8f92 100644 --- a/ACE/ace/os_include/os_errno.h +++ b/ACE/ace/os_include/os_errno.h @@ -22,9 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (ACE_LACKS_ERRNO_H) -# include /**/ -#endif /* !ACE_LACKS_ERRNO_H */ +#include /**/ #if defined (ACE_VXWORKS) // Needed for VxWorks to pickup errnoSet() @@ -285,7 +283,7 @@ extern "C" void herror (const char *str); #endif /* ACE_HAS_H_ERRNO */ -#if defined (ACE_LACKS_ERRNO_H) || defined (ACE_DEFINE_MISSING_ERRNOS) +#if defined (ACE_DEFINE_MISSING_ERRNOS) # if !defined (EPERM) # define EPERM 1 # endif /* EPERM */ diff --git a/ACE/ace/os_include/os_kstat.h b/ACE/ace/os_include/os_kstat.h deleted file mode 100644 index 957b608bd88b5..0000000000000 --- a/ACE/ace/os_include/os_kstat.h +++ /dev/null @@ -1,31 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file os_kstat.h - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef ACE_OS_INCLUDE_OS_KSTAT_H -#define ACE_OS_INCLUDE_OS_KSTAT_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_KSTAT) -# define ACE_HAS_KSTAT_H -#endif /* ACE_HAS_KSTAT */ - -#if defined (ACE_HAS_KSTAT_H) -# include -#endif /* ACE_HAS_KSTAT_H */ - -#include /**/ "ace/post.h" -#endif /* ACE_OS_INCLUDE_OS_KSTAT_H */ diff --git a/ACE/ace/os_include/os_netdb.h b/ACE/ace/os_include/os_netdb.h index 320e8f191b4e8..de509b4cbc7fb 100644 --- a/ACE/ace/os_include/os_netdb.h +++ b/ACE/ace/os_include/os_netdb.h @@ -36,6 +36,20 @@ extern "C" # include /**/ #endif /* !ACE_LACKS_NETDB_H */ +#if defined (ACE_VXWORKS) +# include /**/ +# if (ACE_VXWORKS < 0x700) || defined (GETHOSTBYNAME_REENTRANT) +// With VxWorks 7 hostLib.h defines GETHOSTBYNAME_REENTRANT when gethostbyname() +// is reentrant +# define ACE_VXWORKS_HAS_GETHOSTBYNAME_REENTRANT +# endif +# if (ACE_VXWORKS < 0x700) || defined (GETHOSTBYADDR_REENTRANT) +// With VxWorks 7 hostLib.h defines GETHOSTBYADDR_REENTRANT when gethostbyaddr() +// is reentrant +# define ACE_VXWORKS_HAS_GETHOSTBYADDR_REENTRANT +# endif +#endif /* ACE_VXWORKS */ + #if defined (ACE_LACKS_HOSTENT) struct hostent { char *h_name; /* official name of host */ diff --git a/ACE/ace/os_include/os_pthread.h b/ACE/ace/os_include/os_pthread.h index 50c483ba9d7f8..a789d117314e7 100644 --- a/ACE/ace/os_include/os_pthread.h +++ b/ACE/ace/os_include/os_pthread.h @@ -22,22 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_PRIOCNTL) - // Need to #include thread.h before #defining THR_BOUND, etc., - // when building without threads on SunOS 5.x. -# if defined (sun) -# include /**/ -# endif /* sun */ - - // Need to #include these before #defining USYNC_PROCESS on SunOS 5.x. -# include /**/ -# include /**/ -#endif /* ACE_HAS_PRIOCNTL */ - #include "ace/os_include/sys/os_types.h" #include "ace/os_include/os_stdint.h" -// This needs to go here *first* to avoid problems with AIX. # if defined (ACE_HAS_PTHREADS) # define ACE_DONT_INCLUDE_ACE_SIGNAL_H # include "ace/os_include/os_signal.h" @@ -70,17 +57,7 @@ # if defined (_POSIX_PRIORITY_SCHEDULING) # define ACE_PROC_PRI_FIFO_MIN (sched_get_priority_min(SCHED_FIFO)) # define ACE_PROC_PRI_RR_MIN (sched_get_priority_min(SCHED_RR)) -# if defined (HPUX) - // HP-UX's other is the SCHED_HPUX class, which uses historical - // values that have reverse semantics from POSIX (low value is - // more important priority). To use these in pthreads calls, - // the values need to be converted. The other scheduling classes - // don't need this special treatment. -# define ACE_PROC_PRI_OTHER_MIN \ - (sched_get_priority_min(SCHED_OTHER)) -# else -# define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER)) -# endif /* HPUX */ +# define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER)) # else /* UNICOS is missing a sched_get_priority_min() implementation */ # define ACE_PROC_PRI_FIFO_MIN 0 # define ACE_PROC_PRI_RR_MIN 0 @@ -90,12 +67,7 @@ # if defined (_POSIX_PRIORITY_SCHEDULING) # define ACE_PROC_PRI_FIFO_MAX (sched_get_priority_max(SCHED_FIFO)) # define ACE_PROC_PRI_RR_MAX (sched_get_priority_max(SCHED_RR)) -# if defined (HPUX) -# define ACE_PROC_PRI_OTHER_MAX \ - (sched_get_priority_max(SCHED_OTHER)) -# else -# define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER)) -# endif /* HPUX */ +# define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER)) # else # define ACE_PROC_PRI_FIFO_MAX 59 # define ACE_PROC_PRI_RR_MAX 59 @@ -132,49 +104,6 @@ # if !defined (ACE_THR_PRI_OTHER_MAX) # define ACE_THR_PRI_OTHER_MAX (long) PRI_OTHER_MAX # endif /* !ACE_THR_PRI_OTHER_MAX */ -# elif defined (AIX) - // AIX's priority range is 1 (low) to 127 (high). There aren't - // any preprocessor macros I can find. PRIORITY_MIN is for - // process priorities, as far as I can see, and does not apply - // to thread priority. The 1 to 127 range is from the - // pthread_attr_setschedparam man page (Steve Huston, 18-May-2001). -# if !defined (ACE_THR_PRI_FIFO_MIN) -# define ACE_THR_PRI_FIFO_MIN (long) 1 -# endif /* !ACE_THR_PRI_FIFO_MIN */ -# if !defined (ACE_THR_PRI_FIFO_MAX) -# define ACE_THR_PRI_FIFO_MAX (long) 127 -# endif /* !ACE_THR_PRI_FIFO_MAX */ -# if !defined (ACE_THR_PRI_RR_MIN) -# define ACE_THR_PRI_RR_MIN (long) 1 -# endif /* !ACE_THR_PRI_RR_MIN */ -# if !defined (ACE_THR_PRI_RR_MAX) -# define ACE_THR_PRI_RR_MAX (long) 127 -# endif /* !ACE_THR_PRI_RR_MAX */ -# if !defined (ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) 1 -# endif /* !ACE_THR_PRI_OTHER_MIN */ -# if !defined (ACE_THR_PRI_OTHER_MAX) -# define ACE_THR_PRI_OTHER_MAX (long) 127 -# endif /* !ACE_THR_PRI_OTHER_MAX */ -# elif defined (sun) -# if !defined (ACE_THR_PRI_FIFO_MIN) -# define ACE_THR_PRI_FIFO_MIN (long) 0 -# endif /* !ACE_THR_PRI_FIFO_MIN */ -# if !defined (ACE_THR_PRI_FIFO_MAX) -# define ACE_THR_PRI_FIFO_MAX (long) 59 -# endif /* !ACE_THR_PRI_FIFO_MAX */ -# if !defined (ACE_THR_PRI_RR_MIN) -# define ACE_THR_PRI_RR_MIN (long) 0 -# endif /* !ACE_THR_PRI_RR_MIN */ -# if !defined (ACE_THR_PRI_RR_MAX) -# define ACE_THR_PRI_RR_MAX (long) 59 -# endif /* !ACE_THR_PRI_RR_MAX */ -# if !defined (ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) 0 -# endif /* !ACE_THR_PRI_OTHER_MIN */ -# if !defined (ACE_THR_PRI_OTHER_MAX) -# define ACE_THR_PRI_OTHER_MAX (long) 127 -# endif /* !ACE_THR_PRI_OTHER_MAX */ # else # if !defined (ACE_THR_PRI_FIFO_MIN) # define ACE_THR_PRI_FIFO_MIN (long) ACE_PROC_PRI_FIFO_MIN @@ -258,14 +187,12 @@ # endif /* PTHREAD_MUTEXTYPE_FAST */ # endif /* PTHREAD_PROCESS_SHARED */ -# if !defined (ACE_HAS_STHREADS) -# if !defined (USYNC_THREAD) -# define USYNC_THREAD PTHREAD_PROCESS_PRIVATE -# endif /* ! USYNC_THREAD */ -# if !defined (USYNC_PROCESS) -# define USYNC_PROCESS PTHREAD_PROCESS_SHARED -# endif /* ! USYNC_PROCESS */ -# endif /* ACE_HAS_STHREADS */ +# if !defined (USYNC_THREAD) +# define USYNC_THREAD PTHREAD_PROCESS_PRIVATE +# endif /* ! USYNC_THREAD */ +# if !defined (USYNC_PROCESS) +# define USYNC_PROCESS PTHREAD_PROCESS_SHARED +# endif /* ! USYNC_PROCESS */ /* MM-Graz: prevent warnings */ # undef THR_BOUND @@ -292,7 +219,7 @@ # define THR_EXPLICIT_SCHED 0x00800000 # define THR_SCHED_IO 0x01000000 -# if !defined (ACE_HAS_STHREADS) && !defined (ACE_MQX) +# if !defined (ACE_MQX) # if !defined (ACE_HAS_POSIX_SEM) && !defined (ACE_USES_FIFO_SEM) // This needs to be moved out of here. @@ -322,8 +249,6 @@ class ACE_Export ACE_sema_t # endif /* !ACE_HAS_POSIX_SEM */ # if defined (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) - // If we are on Solaris we can just reuse the existing - // implementations of these synchronization types. # if !defined (ACE_LACKS_RWLOCK_T) && !defined (ACE_HAS_PTHREADS_UNIX98_EXT) # include /**/ typedef rwlock_t ACE_rwlock_t; @@ -335,7 +260,7 @@ class ACE_Export ACE_sema_t # if !defined (ACE_HAS_POSIX_SEM) typedef sema_t ACE_sema_t; # endif /* !ACE_HAS_POSIX_SEM */ -# endif /* !ACE_HAS_STHREADS */ +# endif /* !ACE_MQX */ # if defined (ACE_HAS_PTHREADS_UNIX98_EXT) && !defined (ACE_LACKS_RWLOCK_T) typedef pthread_rwlock_t ACE_rwlock_t; @@ -362,26 +287,6 @@ class ACE_Export ACE_sema_t # endif /* _XOPEN_SOURCE && _XOPEN_SOURCE < 600 */ # endif /* ACE_LINUX && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) */ - -#elif defined (ACE_HAS_STHREADS) -# if !defined (ACE_THR_PRI_FIFO_MIN) -# define ACE_THR_PRI_FIFO_MIN (long) 0 -# endif /* !ACE_THR_PRI_FIFO_MIN */ -# if !defined (ACE_THR_PRI_FIFO_MAX) -# define ACE_THR_PRI_FIFO_MAX (long) 59 -# endif /* !ACE_THR_PRI_FIFO_MAX */ -# if !defined (ACE_THR_PRI_RR_MIN) -# define ACE_THR_PRI_RR_MIN (long) 0 -# endif /* !ACE_THR_PRI_RR_MIN */ -# if !defined (ACE_THR_PRI_RR_MAX) -# define ACE_THR_PRI_RR_MAX (long) 59 -# endif /* !ACE_THR_PRI_RR_MAX */ -# if !defined (ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) 0 -# endif /* !ACE_THR_PRI_OTHER_MIN */ -# if !defined (ACE_THR_PRI_OTHER_MAX) -# define ACE_THR_PRI_OTHER_MAX (long) 127 -# endif /* !ACE_THR_PRI_OTHER_MAX */ #endif /* ACE_HAS_PTHREADS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h index e98ef20687580..679a1944aabb9 100644 --- a/ACE/ace/os_include/os_signal.h +++ b/ACE/ace/os_include/os_signal.h @@ -24,11 +24,9 @@ #include "ace/os_include/sys/os_types.h" -#if !defined (ACE_LACKS_SIGNAL_H) - extern "C" { +extern "C" { # include /**/ - } -#endif /* !ACE_LACKS_SIGNAL_H */ +} #if defined (ACE_HAS_SIGINFO_T) # if !defined (ACE_LACKS_SIGINFO_H) @@ -137,7 +135,7 @@ extern "C" #if defined (ACE_VXWORKS) # define ACE_NSIG (_NSIGS + 1) -#elif defined (__Lynx__) || defined (ACE_HAS_RTEMS) +#elif defined (__Lynx__) # define ACE_NSIG (NSIG + 1) #else // All other platforms set NSIG to one greater than the @@ -145,10 +143,6 @@ extern "C" # define ACE_NSIG NSIG #endif /* ACE_VXWORKS */ -#if defined (ACE_HAS_WINCE) - typedef void (__cdecl * __sighandler_t)(int); -#endif - #if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) // Prototypes for both signal() and struct sigaction are consistent.. using ACE_SignalHandler = void (*)(int); @@ -156,16 +150,13 @@ extern "C" #elif defined (ACE_HAS_SVR4_SIGNAL_T) // SVR4 Signals are inconsistent (e.g., see struct sigaction).. using ACE_SignalHandler = void (*)(int); - using ACE_SignalHandlerV = void (*)(void); + using ACE_SignalHandlerV = void (*)(); #elif defined (ACE_WIN32) using ACE_SignalHandler = void (__cdecl *)(int); using ACE_SignalHandlerV = void (__cdecl *)(int); #elif defined (INTEGRITY) using ACE_SignalHandler = void (*)(); using ACE_SignalHandlerV = void (*)(int); -#elif defined (ACE_HAS_RTEMS) - using ACE_SignalHandler = void (*)(); - using ACE_SignalHandlerV = void (*)(); #else /* This is necessary for some older broken version of cfront */ # if defined (SIG_PF) # define ACE_SignalHandler SIG_PF diff --git a/ACE/ace/os_include/os_stropts.h b/ACE/ace/os_include/os_stropts.h index 4ed4c4b44daec..7b641bee9da4b 100644 --- a/ACE/ace/os_include/os_stropts.h +++ b/ACE/ace/os_include/os_stropts.h @@ -24,12 +24,6 @@ #include "ace/os_include/os_unistd.h" -#if defined (ACE_HAS_TIMOD_H) -# include /**/ -#elif defined (ACE_HAS_OSF_TIMOD_H) -# include /**/ -#endif /* ACE_HAS_TIMOD_H */ - #if !defined (ACE_LACKS_SYS_IOCTL_H) # include /**/ #endif /* !ACE_LACKS_SYS_IOCTL_H */ @@ -42,28 +36,10 @@ # include /**/ #endif /* ACE_HAS_SOCKIO_H */ -// This is sorta counter intuitive, but this is how it was done in OS.h -// @todo: fix this... dhinton -#if defined (ACE_HAS_STREAMS) -# if defined (AIX) -# if !defined (_XOPEN_EXTENDED_SOURCE) -# define _XOPEN_EXTENDED_SOURCE -# endif /* !_XOPEN_EXTENDED_SOURCE */ -# endif /* AIX */ -#endif /* ACE_HAS_STREAMS */ - #if !defined (ACE_LACKS_STROPTS_H) # include /**/ #endif /* !ACE_LACKS_STROPTS_H */ -// This is sorta counter intuitive, but this is how it was done in OS.h -// @todo: fix this... dhinton -#if defined (ACE_HAS_STREAMS) -# if defined (AIX) -# undef _XOPEN_EXTENDED_SOURCE -# endif /* AIX */ -#endif /* ACE_HAS_STREAMS */ - #if defined (ACE_VXWORKS) // for ioctl() # include /**/ diff --git a/ACE/ace/os_include/os_termios.h b/ACE/ace/os_include/os_termios.h index 59392d902147f..d16476497ae31 100644 --- a/ACE/ace/os_include/os_termios.h +++ b/ACE/ace/os_include/os_termios.h @@ -26,9 +26,5 @@ # include /**/ #endif /* !ACE_LACKS_TERMIOS_H */ -#if defined (HPUX) -# include /**/ -#endif /* HPUX */ - #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_TERMIOS_H */ diff --git a/ACE/ace/os_include/os_time.h b/ACE/ace/os_include/os_time.h index 5970afb2d65b8..eb716ff27ecf2 100644 --- a/ACE/ace/os_include/os_time.h +++ b/ACE/ace/os_include/os_time.h @@ -25,11 +25,8 @@ // @todo should we include anything from signal.h? #include "ace/os_include/sys/os_types.h" -// To get the proper select() signature, this is required for HP-UX, and -// maybe other platforms that offer both int and fdset forms of select(). -// For HP-UX, sys/time.h must be included before time.h, or -// _XOPEN_SOURCE_EXTENDED must be defined. It's not nice to require -// the preprocessor macro, so we force our select() preference this way. +// To get the proper select() signature, this is required for maybe other platforms +// that offer both int and fdset forms of select(). #if !defined (ACE_LACKS_SYS_TIME_H) # include /**/ #endif /* !ACE_LACKS_SYS_TIME_H */ @@ -56,13 +53,6 @@ typedef struct timespec /// Nanoseconds long tv_nsec; } timespec_t; -# elif defined (ACE_HAS_BROKEN_POSIX_TIME) -# if defined (ACE_OPENVMS) -# include /**/ -# else -// OSF/1 defines struct timespec in - Tom Marrs -# include /**/ -# endif # endif /* !ACE_HAS_POSIX_TIME */ # if defined(ACE_LACKS_TIMESPEC_T) @@ -82,8 +72,7 @@ extern "C" // straightening them out. #if defined (ACE_HAS_PTHREADS) /* POSIX.1c threads (pthreads) */ // ... and 2-parameter asctime_r and ctime_r -# if !defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) && \ - !defined (ACE_HAS_STHREADS) && !defined (ACE_VXWORKS) +# if !defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) && !defined (ACE_VXWORKS) # define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R # endif #endif /* ACE_HAS_PTHREADS */ diff --git a/ACE/ace/os_include/os_unistd.h b/ACE/ace/os_include/os_unistd.h index db6275d002651..14d1621d3ba9b 100644 --- a/ACE/ace/os_include/os_unistd.h +++ b/ACE/ace/os_include/os_unistd.h @@ -33,10 +33,6 @@ # include /**/ #endif /* ACE_HAS_IO_H */ -#if defined (ACE_HAS_SYS_SYSTEMINFO_H) -# include /**/ -#endif /* ACE_HAS_SYS_SYSTEMINFO_H */ - #if !defined (ACE_LACKS_UNISTD_H) # include /**/ #endif /* !ACE_LACKS_UNISTD_H */ @@ -72,15 +68,9 @@ extern "C" #if defined (ACE_WIN32) // The following are #defines and #includes that are specific to // WIN32. -# if defined (ACE_HAS_WINCE) -# define ACE_STDIN _fileno (stdin) -# define ACE_STDOUT _fileno (stdout) -# define ACE_STDERR _fileno (stderr) -# else # define ACE_STDIN GetStdHandle (STD_INPUT_HANDLE) # define ACE_STDOUT GetStdHandle (STD_OUTPUT_HANDLE) # define ACE_STDERR GetStdHandle (STD_ERROR_HANDLE) -# endif // ACE_HAS_WINCE // The following are #defines and #includes that are specific to UNIX. #else /* !ACE_WIN32 */ # if defined (STDIN_FILENO) @@ -100,20 +90,6 @@ extern "C" # endif #endif /* ACE_WIN32 */ -#if (!defined (_BSD_SOURCE) && \ - !defined (_XOPEN_SOURCE) && !defined (_XOPEN_SOURCE_EXTENDED)) \ - || (defined (_XOPEN_SOURCE) && defined (__GNUC__)) - -# if defined (ACE_LACKS_SETREUID_PROTOTYPE) - extern int setreuid (uid_t ruid, uid_t euid); -# endif /* ACE_LACKS_SETREUID_PROTOTYPE */ - -# if defined (ACE_LACKS_SETREGID_PROTOTYPE) - extern int setregid (gid_t rgid, gid_t egid); -# endif /* ACE_LACKS_SETREGID_PROTOTYPE */ -#endif /* !_BSD_SOURCE && !_XOPEN_SOURCE && !_XOPEN_SOURCE_EXTENDED - || _XOPEN_SOURCE && __GNUC__ */ - // for use by access() # if !defined (R_OK) # define R_OK 04 /* Test for Read permission. */ @@ -136,27 +112,12 @@ extern "C" # define F_OK 0 /* Test for existence of File. */ # endif /* F_OK */ -#if defined (ACE_LACKS_UALARM_PROTOTYPE) - u_int ualarm (u_int usecs, u_int interval); -#endif /* ACE_LACKS_UALARM_PROTOTYPE */ - #if defined (ACE_LACKS_GETPGID_PROTOTYPE) && \ !defined (_XOPEN_SOURCE) && !defined (_XOPEN_SOURCE_EXTENDED) pid_t getpgid (pid_t pid); #endif /* ACE_LACKS_GETPGID_PROTOTYPE && !_XOPEN_SOURCE && !_XOPEN_SOURCE_EXTENDED */ -#if !defined (_LARGEFILE64_SOURCE) -# if defined (ACE_LACKS_LSEEK64_PROTOTYPE) && \ - defined (ACE_LACKS_LLSEEK_PROTOTYPE) -# error Define either ACE_LACKS_LSEEK64_PROTOTYPE or ACE_LACKS_LLSEEK_PROTOTYPE, not both! -# elif defined (ACE_LACKS_LSEEK64_PROTOTYPE) - ACE_LOFF_T lseek64 (int fd, ACE_LOFF_T offset, int whence); -# elif defined (ACE_LACKS_LLSEEK_PROTOTYPE) - ACE_LOFF_T llseek (int fd, ACE_LOFF_T offset, int whence); -# endif -#endif /* _LARGEFILE64_SOURCE */ - #if defined (__BORLANDC__) # define _isatty isatty #endif /* __BORLANDC__ */ diff --git a/ACE/ace/os_include/sys/os_mman.h b/ACE/ace/os_include/sys/os_mman.h index 2f98bf4b79893..6671ffd1c86eb 100644 --- a/ACE/ace/os_include/sys/os_mman.h +++ b/ACE/ace/os_include/sys/os_mman.h @@ -81,9 +81,6 @@ PAGE_NOCACHE */ # if !defined (MAP_FAILED) # define MAP_FAILED ((void *) -1) -# elif defined (ACE_HAS_LONG_MAP_FAILED) -# undef MAP_FAILED -# define MAP_FAILED ((void *) -1L) # endif /* !MAP_FAILED */ #if !defined (PROT_RDWR) @@ -100,10 +97,6 @@ PAGE_NOCACHE */ # define MS_SYNC 0x0 # endif /* !MS_SYNC */ -#if !defined (ACE_LACKS_MADVISE) && defined (ACE_LACKS_MADVISE_PROTOTYPE) - extern "C" int madvise(caddr_t, size_t, int); -#endif /* !ACE_LACKS_MADVISE && ACE_LACKS_MADVISE_PROTOTYPE */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/ace/os_include/sys/os_resource.h b/ACE/ace/os_include/sys/os_resource.h index 437e2d6e49df5..a014351617a6c 100644 --- a/ACE/ace/os_include/sys/os_resource.h +++ b/ACE/ace/os_include/sys/os_resource.h @@ -29,10 +29,6 @@ # include /**/ #endif /* !ACE_LACKS_SYS_RESOURCE_H */ -#if defined (ACE_HAS_SYS_SYSTEMINFO_H) -# include /**/ -#endif /* ACE_HAS_SYS_SYSTEMINFO_H */ - #if defined (ACE_HAS_SYS_SYSCALL_H) # include /**/ #endif /* ACE_HAS_SYS_SYSCALL_H */ @@ -59,14 +55,7 @@ extern "C" }; #endif /* ACE_WIN32 */ -#if defined (ACE_LACKS_RLIMIT_PROTOTYPE) - int getrlimit (int resource, struct rlimit *rlp); - int setrlimit (int resource, const struct rlimit *rlp); -#endif /* ACE_LACKS_RLIMIT_PROTOTYPE */ - -#if defined (ACE_HAS_PRUSAGE_T) - typedef prusage_t ACE_Rusage; -#elif defined (ACE_HAS_GETRUSAGE) +#if defined (ACE_HAS_GETRUSAGE) typedef rusage ACE_Rusage; #else typedef int ACE_Rusage; diff --git a/ACE/ace/os_include/sys/os_socket.h b/ACE/ace/os_include/sys/os_socket.h index 8c8ce66f9ab3e..e3bd900fe157a 100644 --- a/ACE/ace/os_include/sys/os_socket.h +++ b/ACE/ace/os_include/sys/os_socket.h @@ -255,36 +255,14 @@ extern "C" # define ACE_PROTOCOL_FAMILY_INET PF_INET #endif /* ACE_HAS_IPV6 */ -#if !defined (ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE) #define ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE SSIZE_MAX -#endif /* ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE */ #if !defined (ACE_SOCKET_LEN) #if defined (ACE_HAS_SOCKLEN_T) -# if defined (__hpux) - /* - ** HP-UX supplies the socklen_t type unless some feature set less than - ** _XOPEN_SOURCE_EXTENDED is specifically requested. However, it only - ** actually uses the socklen_t type in supplied socket functions if - ** _XOPEN_SOURCE_EXTENDED is specifically requested. So, for example, - ** the compile options ACE usually uses (includes -mt) cause _HPUX_SOURCE - ** to be set, which sets _INCLUDE_XOPEN_SOURCE_EXTENDED (causing socklen_t - ** to be defined) but _not_ _XOPEN_SOURCE_EXTENDED (causing socket functions - ** to use int, not socklen_t). React to this situation here... - */ -# if defined (_XOPEN_SOURCE_EXTENDED) typedef socklen_t ACE_SOCKET_LEN; -# else -typedef int ACE_SOCKET_LEN; -# endif /* _XOPEN_SOURCE_EXTENDED */ -# else -typedef socklen_t ACE_SOCKET_LEN; -# endif /* __hpux */ -#elif defined (ACE_HAS_SIZET_SOCKET_LEN) -typedef size_t ACE_SOCKET_LEN; #else typedef int ACE_SOCKET_LEN; -#endif /* ACE_HAS_SIZET_SOCKET_LEN */ +#endif /* ACE_HAS_SOCKLEN_T */ #endif /* ACE_SOCKET_LEN */ #if defined (ACE_HAS_NETLINK) diff --git a/ACE/ace/os_include/sys/os_stat.h b/ACE/ace/os_include/sys/os_stat.h index d179d5f95c04a..7e6db7b9cae51 100644 --- a/ACE/ace/os_include/sys/os_stat.h +++ b/ACE/ace/os_include/sys/os_stat.h @@ -82,12 +82,9 @@ extern "C" # if !defined (S_IXOTH) # define S_IXOTH 00001 # endif /* S_IXOTH */ - -// WinCE's S_IFLNK is defined with the other bits, below. -#if !defined (S_IFLNK) && !defined (ACE_HAS_WINCE) -#define S_IFLNK 0200000 -#endif /* S_IFLNK && !ACE_HAS_WINCE */ - +# if !defined (S_IFLNK) +# define S_IFLNK 0200000 +# endif /* S_IFLNK */ #endif /* ACE_LACKS_MODE_MASKS */ // Some systems (VxWorks) don't define S_ISLNK @@ -104,55 +101,6 @@ extern "C" # define S_ISDIR(mode) ((mode&S_IFMT) == S_IFDIR) #endif -#if defined (ACE_HAS_WINCE) - -// Translate the WinCE bits into names expected by our callers. -// The dwFileAttributes parameter doesn't have protection info, so -// S_IFMT is the whole thing. Since there are no symbolic links, S_IFLNK is 0. -# define S_IFMT 0xFFFF -# define S_IFDIR FILE_ATTRIBUTE_DIRECTORY -# define S_IFREG FILE_ATTRIBUTE_NORMAL -# define S_IFLNK 0 -# define S_IFCHR 0 - -# if !defined (__MINGW32__) - // Since CE does not have _stat by default as NT/2000 does, the 'stat' - // struct defined here will be used. Also note that CE file system - // struct is only for the CE 3.0 or later. - // Refer to the WCHAR.H from Visual C++ and WIBASE.H from eVC 3.0. - struct stat - { - /// always 0 on Windows platforms - dev_t st_dev; - - /// always 0 on Windows platforms - dev_t st_rdev; - - /// file attribute - mode_t st_mode; - - /// number of hard links - nlink_t st_nlink; - - /// time of last access - time_t st_atime; - - /// time of last data modification - time_t st_mtime; - - /// time of creation - time_t st_ctime; - - /// file size, in bytes - ACE_OFF_T st_size; - - // Following members do not have direct conversion in Window platforms. - //u_long st_blksize; // optimal blocksize for I/O - //u_long st_flags; // user defined flags for file - }; - #endif -#endif /* ACE_HAS_WINCE */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h index 822c8a93d97db..b179c7051ad73 100644 --- a/ACE/ace/os_include/sys/os_types.h +++ b/ACE/ace/os_include/sys/os_types.h @@ -28,10 +28,6 @@ # include /**/ #endif /* !ACE_LACKS_SYS_TYPES_H */ -#if defined (ACE_HAS_TYPES_H) -# include /**/ -#endif /* ACE_HAS_TYPES_H */ - # if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \ (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0) using std::time_t; @@ -49,14 +45,6 @@ typedef double ACE_timer_t; typedef int clockid_t; #endif /* ACE_LACKS_CLOCKID_T */ -#if defined (ACE_LACKS_DEV_T) - typedef unsigned int dev_t; -#endif /* ACE_LACKS_DEV_T */ - -#if defined (ACE_HAS_WINCE) - typedef long off_t; -#endif - #if defined(ACE_WIN32) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS==64) typedef __int64 ACE_OFF_T; #else @@ -65,18 +53,13 @@ typedef double ACE_timer_t; #if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8 typedef off_t ACE_LOFF_T; -#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || \ - (defined (ACE_OPENVMS) && defined (_LARGEFILE)) +#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) typedef off_t ACE_LOFF_T; -#elif defined (AIX) || defined (HPUX) || defined (__QNX__) +#elif defined (__QNX__) typedef off64_t ACE_LOFF_T; -#elif defined (__sun) - typedef offset_t ACE_LOFF_T; #elif defined (WIN32) typedef __int64 ACE_LOFF_T; -#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x700)) || \ - defined (ACE_LYNXOS_MAJOR) || \ - (defined (ACE_OPENVMS) && !defined (_LARGEFILE)) +#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x700)) || defined (ACE_LYNXOS_MAJOR) typedef long long ACE_LOFF_T; #else typedef loff_t ACE_LOFF_T; diff --git a/ACE/ace/os_include/sys/os_uio.h b/ACE/ace/os_include/sys/os_uio.h index 39343824b2de5..9a30b7398d294 100644 --- a/ACE/ace/os_include/sys/os_uio.h +++ b/ACE/ace/os_include/sys/os_uio.h @@ -47,7 +47,7 @@ extern "C" // WSABUF is a Winsock2-only type. # if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - operator WSABUF &(void) { return *((WSABUF *) this); } + operator WSABUF &() { return *((WSABUF *) this); } # endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */ }; #endif /* ACE_LACKS_IOVEC */ diff --git a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp index 4f9ac9bfc526d..3aa485921c329 100644 --- a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp +++ b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp @@ -638,7 +638,7 @@ Thr_Consumer_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *) // from the use of threads, compared with the Reactive solution. int -Thr_Consumer_Handler::svc (void) +Thr_Consumer_Handler::svc () { for (in_thread_ = 1;;) { @@ -748,7 +748,7 @@ Thr_Supplier_Handler::open (void *) // existing code!). int -Thr_Supplier_Handler::svc (void) +Thr_Supplier_Handler::svc () { for (in_thread_ = 1;;) { diff --git a/ACE/apps/Gateway/Gateway/Config_Files.h b/ACE/apps/Gateway/Gateway/Config_Files.h index d6204ff21deef..6bcddec6f05a6 100644 --- a/ACE/apps/Gateway/Gateway/Config_Files.h +++ b/ACE/apps/Gateway/Gateway/Config_Files.h @@ -64,7 +64,6 @@ class Connection_Config_File_Parser : public File_Parser /// Read in a entry. virtual FPRT::Return_Type read_entry (Connection_Config_Info &entry, int &line_number); - }; /** diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler.cpp b/ACE/apps/Gateway/Gateway/Connection_Handler.cpp index b2bcecbe9a259..f6995bae89389 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler.cpp +++ b/ACE/apps/Gateway/Gateway/Connection_Handler.cpp @@ -42,7 +42,7 @@ Connection_Handler::total_bytes (size_t bytes) this->total_bytes_ += bytes; } -Connection_Handler::Connection_Handler (void) +Connection_Handler::Connection_Handler () { } @@ -95,7 +95,7 @@ Connection_Handler::timeout (long to) // re-calculation). long -Connection_Handler::timeout (void) +Connection_Handler::timeout () { long old_timeout = this->timeout_; this->timeout_ *= 2; diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler.h b/ACE/apps/Gateway/Gateway/Connection_Handler.h index baf4a8f46f0b9..6fb8a9ae14a46 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler.h +++ b/ACE/apps/Gateway/Gateway/Connection_Handler.h @@ -40,7 +40,7 @@ class Connection_Handler : public ACE_Svc_Handler { public: /// Default constructor (needed to make happy). - Connection_Handler (void); + Connection_Handler (); /// Real constructor. Connection_Handler (const Connection_Config_Info &); @@ -77,7 +77,7 @@ class Connection_Handler : public ACE_Svc_Handler // = Set/get the current retry timeout delay. void timeout (long); - long timeout (void); + long timeout (); // = Set/get the maximum retry timeout delay. void max_timeout (long); diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp index d140392fbd3c5..a69dc559baeaf 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp +++ b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.cpp @@ -1,7 +1,7 @@ #include "Connection_Handler_Connector.h" #include "ace/os_include/os_netdb.h" -Connection_Handler_Connector::Connection_Handler_Connector (void) +Connection_Handler_Connector::Connection_Handler_Connector () { } diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h index 26e3283c7770f..02d458e3f86f0 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h +++ b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h @@ -31,12 +31,11 @@ class Connection_Handler_Connector : public ACE_Connector { public: - Connection_Handler_Connector (void); + Connection_Handler_Connector (); // Initiate (or reinitiate) a connection on the Connection_Handler. int initiate_connection (Connection_Handler *, ACE_Synch_Options & = ACE_Synch_Options::synch); - }; #endif /* _IO_HANDLER_CONNECTOR */ diff --git a/ACE/apps/Gateway/Gateway/Event.h b/ACE/apps/Gateway/Gateway/Event.h index 9d7c652dbda43..895cd441fd6c5 100644 --- a/ACE/apps/Gateway/Gateway/Event.h +++ b/ACE/apps/Gateway/Gateway/Event.h @@ -132,7 +132,7 @@ class Event_Header { } - void decode (void) + void decode () { this->len_ = ntohl (this->len_); this->connection_id_ = ntohl (this->connection_id_); @@ -141,7 +141,7 @@ class Event_Header } // Decode from network byte order to host byte order. - void encode (void) + void encode () { this->len_ = htonl (this->len_); this->connection_id_ = htonl (this->connection_id_); @@ -194,7 +194,7 @@ class Event class Subscription { public: - void decode (void) + void decode () { this->connection_id_ = ntohl (this->connection_id_); @@ -205,7 +205,7 @@ class Subscription } // Decode from network byte order to host byte order. - void encode (void) + void encode () { this->connection_id_ = htonl (this->connection_id_); diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.cpp b/ACE/apps/Gateway/Gateway/Event_Channel.cpp index 45bece8d553eb..97ea7f95ddf3c 100644 --- a/ACE/apps/Gateway/Gateway/Event_Channel.cpp +++ b/ACE/apps/Gateway/Gateway/Event_Channel.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_sys_select.h" #include "ace/Signal.h" -Event_Channel::~Event_Channel (void) +Event_Channel::~Event_Channel () { } @@ -13,7 +13,7 @@ Event_Channel::~Event_Channel (void) # pragma warning (push) # pragma warning (disable:4355) /* Use of 'this' in initializer list */ # endif -Event_Channel::Event_Channel (void) +Event_Channel::Event_Channel () : supplier_acceptor_ (*this, 'S'), consumer_acceptor_ (*this, 'C') { @@ -23,7 +23,7 @@ Event_Channel::Event_Channel (void) #endif int -Event_Channel::compute_performance_statistics (void) +Event_Channel::compute_performance_statistics () { ACE_DEBUG ((LM_DEBUG, "(%t) doing the performance timeout here...\n")); CONNECTION_MAP_ITERATOR cmi (this->connection_map_); @@ -158,7 +158,6 @@ Event_Channel::subscription_event (ACE_Message_Block *data) "(%t) consumers_[%d] = %d\n", i, subscription->consumers_[i])); - } void @@ -341,7 +340,7 @@ Event_Channel::cancel_connection_connection (Connection_Handler *connection_hand // Initiate active connections with the Consumer and Supplier Peers. void -Event_Channel::initiate_connector (void) +Event_Channel::initiate_connector () { if (Options::instance ()->enabled (Options::CONSUMER_CONNECTOR | Options::SUPPLIER_CONNECTOR)) @@ -367,7 +366,7 @@ Event_Channel::initiate_connector (void) // to accept. int -Event_Channel::initiate_acceptors (void) +Event_Channel::initiate_acceptors () { if (Options::instance ()->enabled (Options::CONSUMER_ACCEPTOR)) { diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.h b/ACE/apps/Gateway/Gateway/Event_Channel.h index 2f4bfcc2a4d0f..e25d12bfd22e5 100644 --- a/ACE/apps/Gateway/Gateway/Event_Channel.h +++ b/ACE/apps/Gateway/Gateway/Event_Channel.h @@ -33,8 +33,8 @@ typedef ACE_Null_Mutex MAP_MUTEX; class ACE_Svc_Export Event_Channel : public ACE_Event_Handler { public: - Event_Channel (void); - ~Event_Channel (void); + Event_Channel (); + ~Event_Channel (); /// Open the channel. virtual int open (void * = 0); @@ -78,11 +78,11 @@ class ACE_Svc_Export Event_Channel : public ACE_Event_Handler ACE_Time_Value * = 0); /// Actively initiate connections to the Peers. - void initiate_connector (void); + void initiate_connector (); /// Passively initiate the s for Consumer and /// Suppliers. - int initiate_acceptors (void); + int initiate_acceptors (); private: /// Parse the command-line arguments. @@ -98,7 +98,7 @@ class ACE_Svc_Export Event_Channel : public ACE_Event_Handler void subscription_event (ACE_Message_Block *data); /// Perform timer-based performance profiling. - int compute_performance_statistics (void); + int compute_performance_statistics (); /// Periodically callback to perform timer-based performance /// profiling. diff --git a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp index 56c60f9b1c610..3b3e4710fbc73 100644 --- a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp +++ b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp @@ -53,7 +53,7 @@ Event_Forwarding_Discriminator_Iterator::next (Consumer_Dispatch_Set *&cds) } int -Event_Forwarding_Discriminator_Iterator::advance (void) +Event_Forwarding_Discriminator_Iterator::advance () { return this->map_iter_.advance (); } diff --git a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h index d4a5fe9dcad6c..f8f497f32301e 100644 --- a/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h +++ b/ACE/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h @@ -57,7 +57,7 @@ class Event_Forwarding_Discriminator_Iterator public: Event_Forwarding_Discriminator_Iterator (Event_Forwarding_Discriminator &mm); int next (Consumer_Dispatch_Set *&); - int advance (void); + int advance (); private: /// Map we are iterating over. diff --git a/ACE/apps/Gateway/Gateway/File_Parser.cpp b/ACE/apps/Gateway/Gateway/File_Parser.cpp index d301b408efca5..9145d20e03e52 100644 --- a/ACE/apps/Gateway/Gateway/File_Parser.cpp +++ b/ACE/apps/Gateway/Gateway/File_Parser.cpp @@ -13,7 +13,7 @@ typedef FPRT::Return_Type FP_RETURN_TYPE; // File_Parser stuff. template -File_Parser::~File_Parser (void) +File_Parser::~File_Parser () { } @@ -28,7 +28,7 @@ File_Parser::open (const ACE_TCHAR filename[]) } template int -File_Parser::close (void) +File_Parser::close () { return ACE_OS::fclose (this->infile_); } @@ -140,7 +140,7 @@ File_Parser::comments (char ch) } template int -File_Parser::skipline (void) +File_Parser::skipline () { // Skip the remainder of the line. diff --git a/ACE/apps/Gateway/Gateway/File_Parser.h b/ACE/apps/Gateway/Gateway/File_Parser.h index 141d051e05502..1e2fdae4990b6 100644 --- a/ACE/apps/Gateway/Gateway/File_Parser.h +++ b/ACE/apps/Gateway/Gateway/File_Parser.h @@ -47,13 +47,12 @@ template class File_Parser { public: - /// Destructor. - virtual ~File_Parser (void); + virtual ~File_Parser (); // = Open and Close the file specified int open (const ACE_TCHAR filename[]); - int close (void); + int close (); virtual FPRT::Return_Type read_entry (ENTRY &entry, int &line_number) = 0; @@ -83,18 +82,12 @@ class File_Parser /// Skips to the remainder of a line, e.g., when we find a comment /// character. - int skipline (void); + int skipline (); /// Pointer to the file we're reading. FILE *infile_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "File_Parser.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("File_Parser.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _FILE_PARSER */ diff --git a/ACE/apps/Gateway/Gateway/Gateway.cpp b/ACE/apps/Gateway/Gateway/Gateway.cpp index a711cd4d7a871..e1275482a6dfe 100644 --- a/ACE/apps/Gateway/Gateway/Gateway.cpp +++ b/ACE/apps/Gateway/Gateway/Gateway.cpp @@ -29,10 +29,10 @@ class ACE_Svc_Export Gateway : public ACE_Service_Object // = Configuration methods. // Parse the proxy configuration file. - int parse_connection_config_file (void); + int parse_connection_config_file (); // Parse the consumer configuration file. - int parse_consumer_config_file (void); + int parse_consumer_config_file (); // = Lifecycle management methods. // Shut down the Gateway when input comes in from the controlling @@ -135,7 +135,7 @@ Gateway::init (int argc, ACE_TCHAR *argv[]) // This method is automatically called when the Gateway is shutdown. int -Gateway::fini (void) +Gateway::fini () { // Remove the handler that receive events on stdin. Otherwise, we // will crash on shutdown. @@ -170,7 +170,7 @@ Gateway::info (ACE_TCHAR **strp, size_t length) const // Parse and build the proxy table. int -Gateway::parse_connection_config_file (void) +Gateway::parse_connection_config_file () { // File that contains the proxy configuration information. Connection_Config_File_Parser connection_file; @@ -256,7 +256,7 @@ Gateway::parse_connection_config_file (void) } int -Gateway::parse_consumer_config_file (void) +Gateway::parse_consumer_config_file () { // File that contains the consumer event forwarding information. Consumer_Config_File_Parser consumer_file; diff --git a/ACE/apps/Gateway/Gateway/Options.cpp b/ACE/apps/Gateway/Gateway/Options.cpp index cccc5a3a37b01..d844e0549e815 100644 --- a/ACE/apps/Gateway/Gateway/Options.cpp +++ b/ACE/apps/Gateway/Gateway/Options.cpp @@ -9,13 +9,12 @@ #include "ace/os_include/os_fcntl.h" - // Static initialization. Options *Options::instance_ = 0; // Let's have a usage prompt. void -Options::print_usage (void) +Options::print_usage () { ACE_DEBUG ((LM_INFO, "gatewayd [-a {C|S}:acceptor-port] [-c {C|S}:connector-port]" @@ -37,7 +36,7 @@ Options::print_usage (void) )); } Options * -Options::instance (void) +Options::instance () { if (Options::instance_ == 0) ACE_NEW_RETURN (Options::instance_, Options, 0); @@ -45,7 +44,7 @@ Options::instance (void) return Options::instance_; } -Options::Options (void) +Options::Options () : locking_strategy_ (0), performance_window_ (0), blocking_semantics_ (ACE_NONBLOCK), @@ -70,7 +69,7 @@ Options::enabled (int option) const return ACE_BIT_ENABLED (this->options_, option); } -Options::~Options (void) +Options::~Options () { delete this->locking_strategy_; } @@ -94,7 +93,7 @@ Options::performance_window () const } CONNECTION_ID & -Options::connection_id (void) +Options::connection_id () { return this->connection_id_; } diff --git a/ACE/apps/Gateway/Gateway/Options.h b/ACE/apps/Gateway/Gateway/Options.h index 5ba13c7a5e8ba..a6b2aef20fe07 100644 --- a/ACE/apps/Gateway/Gateway/Options.h +++ b/ACE/apps/Gateway/Gateway/Options.h @@ -49,10 +49,10 @@ class ACE_Svc_Export Options }; /// Return Singleton. - static Options *instance (void); + static Options *instance (); /// Termination. - ~Options (void); + ~Options (); /// Parse the arguments and set the options. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -62,7 +62,7 @@ class ACE_Svc_Export Options * = Accessor methods. * Determine if an option is enabled. */ - void print_usage(void); + void print_usage(); int enabled (int option) const; /** @@ -125,7 +125,7 @@ class ACE_Svc_Export Options long max_queue_size () const; /// Returns a reference to the next available connection id; - CONNECTION_ID &connection_id (void); + CONNECTION_ID &connection_id (); private: enum @@ -138,7 +138,7 @@ class ACE_Svc_Export Options }; /// Initialization. - Options (void); + Options (); /// Options Singleton instance. static Options *instance_; diff --git a/ACE/apps/Gateway/Peer/Options.cpp b/ACE/apps/Gateway/Peer/Options.cpp index 2a849effa2eb3..8874d671051dd 100644 --- a/ACE/apps/Gateway/Peer/Options.cpp +++ b/ACE/apps/Gateway/Peer/Options.cpp @@ -12,14 +12,14 @@ Options *Options::instance_ = 0; void -Options::print_usage_and_die (void) +Options::print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%n [-a {C|S}:acceptor-port] [-c {C|S}:connector-port] [-C connection-id] [-h gateway-host] [-q max-queue-size] [-t timeout] [-v]\n"))); ACE_OS::exit (1); } -Options::Options (void) +Options::Options () : options_ (0), supplier_acceptor_port_ (DEFAULT_PEER_SUPPLIER_PORT), consumer_acceptor_port_ (DEFAULT_PEER_CONSUMER_PORT), @@ -39,7 +39,7 @@ Options::Options (void) } Options * -Options::instance (void) +Options::instance () { if (Options::instance_ == 0) ACE_NEW_RETURN (Options::instance_, Options, 0); @@ -54,7 +54,7 @@ Options::timeout () const } CONNECTION_ID & -Options::connection_id (void) +Options::connection_id () { return this->connection_id_; } diff --git a/ACE/apps/Gateway/Peer/Options.h b/ACE/apps/Gateway/Peer/Options.h index 0d9613f023410..987a69c75b410 100644 --- a/ACE/apps/Gateway/Peer/Options.h +++ b/ACE/apps/Gateway/Peer/Options.h @@ -34,7 +34,7 @@ class ACE_Svc_Export Options }; /// Return Singleton. - static Options *instance (void); + static Options *instance (); /// Parse the arguments and set the options. void parse_args (int argc, ACE_TCHAR *argv[]); @@ -76,7 +76,7 @@ class ACE_Svc_Export Options long max_queue_size () const; /// Returns a reference to the connection id. - CONNECTION_ID &connection_id (void); + CONNECTION_ID &connection_id (); private: enum @@ -91,10 +91,10 @@ class ACE_Svc_Export Options }; /// Ensure Singleton. - Options (void); + Options (); /// Explain usage and exit. - void print_usage_and_die (void); + void print_usage_and_die (); /// Singleton. static Options *instance_; diff --git a/ACE/apps/Gateway/Peer/Peer.cpp b/ACE/apps/Gateway/Peer/Peer.cpp index 56542dca89e14..d40348c792fb8 100644 --- a/ACE/apps/Gateway/Peer/Peer.cpp +++ b/ACE/apps/Gateway/Peer/Peer.cpp @@ -6,7 +6,7 @@ #include "ace/Signal.h" #include "Peer.h" -Peer_Handler::Peer_Handler (void) +Peer_Handler::Peer_Handler () : connection_id_ (-1), // Maybe it's better than 0. msg_frag_ (0), total_bytes_ (0) @@ -106,7 +106,7 @@ Peer_Handler::transmit (ACE_Message_Block *mb, // Read events from stdin and send them to the gatewayd. int -Peer_Handler::transmit_stdin (void) +Peer_Handler::transmit_stdin () { // If return value is -1, then first_time_ must be reset to 1. int result = 0; @@ -482,7 +482,7 @@ Peer_Handler::handle_input (ACE_HANDLE sd) // Action that receives our connection id from the Gateway. int -Peer_Handler::await_connection_id (void) +Peer_Handler::await_connection_id () { ssize_t n = this->peer ().recv (&this->connection_id_, sizeof this->connection_id_); @@ -543,7 +543,7 @@ Peer_Handler::await_connection_id (void) } int -Peer_Handler::subscribe (void) +Peer_Handler::subscribe () { ACE_Message_Block *mb = 0; @@ -562,7 +562,7 @@ Peer_Handler::subscribe (void) // Action that receives events from the Gateway. int -Peer_Handler::await_events (void) +Peer_Handler::await_events () { ACE_Message_Block *mb = 0; @@ -619,7 +619,7 @@ Peer_Handler::handle_timeout (const ACE_Time_Value &, return this->handle_close (); } -Peer_Handler::~Peer_Handler (void) +Peer_Handler::~Peer_Handler () { // Shut down the handler. this->handle_close (); @@ -692,13 +692,13 @@ Peer_Acceptor::start (u_short port) return 0; } -Peer_Acceptor::Peer_Acceptor (void) +Peer_Acceptor::Peer_Acceptor () : peer_handler_ (0) { } int -Peer_Acceptor::close (void) +Peer_Acceptor::close () { // Will trigger a delete. if (this->peer_handler_ != 0) @@ -822,7 +822,7 @@ Peer_Factory::info (ACE_TCHAR **strp, size_t length) const // the peer. int -Peer_Factory::fini (void) +Peer_Factory::fini () { this->consumer_acceptor_.close (); this->supplier_acceptor_.close (); diff --git a/ACE/apps/Gateway/Peer/Peer.h b/ACE/apps/Gateway/Peer/Peer.h index 2cc6c0da1b1c6..7d849384c8a13 100644 --- a/ACE/apps/Gateway/Peer/Peer.h +++ b/ACE/apps/Gateway/Peer/Peer.h @@ -72,10 +72,10 @@ class ACE_Svc_Export Peer_Handler : public ACE_Svc_Handler. @@ -118,21 +118,21 @@ class ACE_Svc_Export Peer_Handler : public ACE_Svc_Handler. int start (u_short); /// Terminate the . - int close (void); + int close (); /// Factory method that creates a just once. virtual int make_svc_handler (Peer_Handler *&); diff --git a/ACE/apps/JAWS/clients/Blobby/Blob.cpp b/ACE/apps/JAWS/clients/Blobby/Blob.cpp index 0b33cf9bc6805..cfb40893908b8 100644 --- a/ACE/apps/JAWS/clients/Blobby/Blob.cpp +++ b/ACE/apps/JAWS/clients/Blobby/Blob.cpp @@ -2,11 +2,11 @@ #include "Blob_Handler.h" #include "ace/OS_NS_string.h" -ACE_Blob::ACE_Blob (void) +ACE_Blob::ACE_Blob () { } -ACE_Blob::~ACE_Blob (void) +ACE_Blob::~ACE_Blob () { this->close (); } @@ -26,7 +26,6 @@ ACE_Blob::open (const ACE_TCHAR *filename, const ACE_TCHAR *hostname , u_short p int ACE_Blob::read (ACE_Message_Block *mb, size_t length, size_t offset) { - // Create a Blob Reader ACE_Blob_Reader blob_reader (mb, length, offset, filename_); ACE_Blob_Handler *brp = &blob_reader; @@ -36,7 +35,6 @@ ACE_Blob::read (ACE_Message_Block *mb, size_t length, size_t offset) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Blob::read():Connector error"), -1); return blob_reader.byte_count (); - } // write to connection length bytes from offset, into Message block @@ -44,7 +42,6 @@ ACE_Blob::read (ACE_Message_Block *mb, size_t length, size_t offset) int ACE_Blob::write (ACE_Message_Block *mb, size_t length, size_t offset) { - // Create a Blob Writer ACE_Blob_Writer blob_writer (mb, length, offset, filename_); ACE_Blob_Handler *bwp = &blob_writer; @@ -59,15 +56,13 @@ ACE_Blob::write (ACE_Message_Block *mb, size_t length, size_t offset) // close down the blob int -ACE_Blob::close (void) +ACE_Blob::close () { - if (filename_) { ACE_OS::free ((void *) filename_); filename_ = 0; } return 0; - } diff --git a/ACE/apps/JAWS/clients/Blobby/Blob.h b/ACE/apps/JAWS/clients/Blobby/Blob.h index 6682be7b06d86..2d27add07b2e0 100644 --- a/ACE/apps/JAWS/clients/Blobby/Blob.h +++ b/ACE/apps/JAWS/clients/Blobby/Blob.h @@ -42,8 +42,8 @@ class ACE_Blob { public: - ACE_Blob (void); - ~ACE_Blob (void); + ACE_Blob (); + ~ACE_Blob (); /// initializes the class with the given filename, hostname and port. /// it should be called with the filename, before any read/write calls @@ -81,7 +81,6 @@ class ACE_Blob /// The connector endpoint to initiate the client connection ACE_Connector connector_; - }; #endif /* ACE_BLOB_H */ diff --git a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp index 4d6e617024c9b..bc2bfc507da34 100644 --- a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp +++ b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp @@ -4,7 +4,7 @@ #include "ace/OS_NS_strings.h" // Empty constructor for compliance with new Connector behavior. -ACE_Blob_Handler::ACE_Blob_Handler (void) +ACE_Blob_Handler::ACE_Blob_Handler () { } @@ -21,7 +21,7 @@ ACE_Blob_Handler::ACE_Blob_Handler (ACE_Message_Block * mb, { } -ACE_Blob_Handler::~ACE_Blob_Handler (void) +ACE_Blob_Handler::~ACE_Blob_Handler () { if (filename_) { @@ -40,7 +40,6 @@ ACE_Blob_Handler::open (void *) if (this->receive_reply () != 0) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Blob_Handler::open():receive_reply failed"), -1); return 0; - } // No-op @@ -54,14 +53,14 @@ ACE_Blob_Handler::close (u_long flags) // Always overridden by the derived classes int -ACE_Blob_Handler::send_request (void) +ACE_Blob_Handler::send_request () { return -1; } // Always overridden by the derived classes int -ACE_Blob_Handler::receive_reply (void) +ACE_Blob_Handler::receive_reply () { return -1; } @@ -69,7 +68,7 @@ ACE_Blob_Handler::receive_reply (void) // used to retrieve the number of bytes read/written by the // last operation on the Blob int -ACE_Blob_Handler::byte_count (void) +ACE_Blob_Handler::byte_count () { return bytecount_; } @@ -90,7 +89,7 @@ ACE_Blob_Reader::ACE_Blob_Reader (ACE_Message_Block * mb, // Send the HTTP request int -ACE_Blob_Reader::send_request (void) +ACE_Blob_Reader::send_request () { char mesg [MAX_HEADER_SIZE]; @@ -116,7 +115,7 @@ ACE_Blob_Reader::send_request (void) // Recieve the HTTP Reply int -ACE_Blob_Reader::receive_reply (void) +ACE_Blob_Reader::receive_reply () { ssize_t len; char buf [MAX_HEADER_SIZE + 1]; @@ -257,7 +256,7 @@ ACE_Blob_Writer::ACE_Blob_Writer (ACE_Message_Block * mb, } int -ACE_Blob_Writer::send_request (void) +ACE_Blob_Writer::send_request () { // Check for sanity -- check if we have any data to send. if (offset_+ length_ > mb_->length ()) @@ -303,7 +302,7 @@ ACE_Blob_Writer::send_request (void) } int -ACE_Blob_Writer::receive_reply (void) +ACE_Blob_Writer::receive_reply () { // Allocate a buffer big enough to hold the header char buf[MAX_HEADER_SIZE]; diff --git a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.h b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.h index 7e5730935af04..9d3d5114702c4 100644 --- a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.h +++ b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.h @@ -41,7 +41,7 @@ class ACE_Blob_Handler : public ACE_Svc_Handler virtual int open (void * = 0); @@ -58,11 +58,11 @@ class ACE_Blob_Handler : public ACE_Svc_Handler id_; delete this->offer_; @@ -35,6 +35,6 @@ ACE_URL_Record::operator!= (const ACE_URL_Record &rhs) const } ACE_INLINE -ACE_URL_Local_Locator::~ACE_URL_Local_Locator (void) +ACE_URL_Local_Locator::~ACE_URL_Local_Locator () { } diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp index 3c236ecab5906..263688be3cf49 100644 --- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp +++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp @@ -86,7 +86,7 @@ ACE_URL_Locator_Request::modify_offer (const ACE_WString &offer_id, LEN += sizeof (ACE_UINT32); size_t -ACE_URL_Locator_Request::encode (void) +ACE_URL_Locator_Request::encode () { ACE_TRACE ("ACE_URL_Locator_Request::encode"); @@ -192,7 +192,7 @@ ACE_URL_Locator_Request::decode (void *buffer) size_t -ACE_URL_Locator_Request::size (void) +ACE_URL_Locator_Request::size () { ACE_TRACE ("ACE_URL_Locator_Request::size"); @@ -313,7 +313,7 @@ ACE_URL_Locator_Reply::describe_reply (int result, } size_t -ACE_URL_Locator_Reply::encode (void) +ACE_URL_Locator_Reply::encode () { ACE_TRACE ("ACE_URL_Locator_Reply::encode"); @@ -398,7 +398,7 @@ ACE_URL_Locator_Reply::decode (void *buffer) } size_t -ACE_URL_Locator_Reply::size (void) +ACE_URL_Locator_Reply::size () { ACE_TRACE ("ACE_URL_Locator_Reply:size"); diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h index 56057315af2b5..4653f3cc74e70 100644 --- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h +++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h @@ -28,10 +28,10 @@ class ACE_Svc_Export ACE_URL_Locator_Request { public: /// Default ctor. - ACE_URL_Locator_Request (void); + ACE_URL_Locator_Request (); /// Default dtor. - ~ACE_URL_Locator_Request (void); + ~ACE_URL_Locator_Request (); /** * Query the locator for HTTP with designate properties (none, some, @@ -66,7 +66,7 @@ class ACE_Svc_Export ACE_URL_Locator_Request /// Encode request for network communication. If succeed, /// returns the size of the buffer, otherwise, return 0. - size_t encode (void); + size_t encode (); /** * Restore from network data. Returns size of the buffer @@ -94,7 +94,7 @@ class ACE_Svc_Export ACE_URL_Locator_Request protected: /// Return the size of the buffer required to encode /// this request. - size_t size (void); + size_t size (); enum { VALID_SEQ1 = 0x1, @@ -147,10 +147,10 @@ class ACE_Svc_Export ACE_URL_Locator_Reply { public: /// Default ctor. - ACE_URL_Locator_Reply (void); + ACE_URL_Locator_Reply (); /// Default dtor. - ~ACE_URL_Locator_Reply (void); + ~ACE_URL_Locator_Reply (); /// Setup a reply message for EXPORT, WITHDRAW, or MODIFY operations. int status_reply (u_int op, int result); @@ -165,7 +165,7 @@ class ACE_Svc_Export ACE_URL_Locator_Reply /// Encode request for network communication. If succeed, /// returns the size of the buffer, otherwise, return 0. - size_t encode (void); + size_t encode (); /** * Restore from network data. Returns size of the buffer @@ -189,7 +189,7 @@ class ACE_Svc_Export ACE_URL_Locator_Reply protected: /// Return the size of the buffer required to encode /// this request. - size_t size (void); + size_t size (); enum { VALID_OFFER = 0x1, diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl index 8047feb7efde1..812c1b3715834 100644 --- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl +++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl @@ -3,7 +3,7 @@ #include "URL_Locator.h" ACE_INLINE -ACE_URL_Locator_Request::ACE_URL_Locator_Request (void) +ACE_URL_Locator_Request::ACE_URL_Locator_Request () : code_(ACE_URL_Locator::INVALID_OPERATION), seq1_ (0), seq2_ (0), @@ -13,7 +13,7 @@ ACE_URL_Locator_Request::ACE_URL_Locator_Request (void) } ACE_INLINE -ACE_URL_Locator_Request::~ACE_URL_Locator_Request (void) +ACE_URL_Locator_Request::~ACE_URL_Locator_Request () { delete this->seq1_; delete this->seq2_; @@ -82,7 +82,7 @@ ACE_URL_Locator_Request::buffer () const } ACE_INLINE -ACE_URL_Locator_Reply::ACE_URL_Locator_Reply (void) +ACE_URL_Locator_Reply::ACE_URL_Locator_Reply () : code_ (ACE_URL_Locator::INVALID_OPERATION), offer_ (0), offers_ (0), @@ -91,7 +91,7 @@ ACE_URL_Locator_Reply::ACE_URL_Locator_Reply (void) } ACE_INLINE -ACE_URL_Locator_Reply::~ACE_URL_Locator_Reply (void) +ACE_URL_Locator_Reply::~ACE_URL_Locator_Reply () { delete this->offer_; delete this->offers_; diff --git a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp index 19df1267a8c65..62cf3c41be85f 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp +++ b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp @@ -35,5 +35,4 @@ size_t ace_array_decode (void *buf, T &x) } - #endif /* ACE_URL_ARRAY_HELPER_C */ diff --git a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h index 4574932655401..18fdd582dab53 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h +++ b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h @@ -24,12 +24,6 @@ size_t ace_array_encode (void *buf, const T &x); template size_t ace_array_decode (void *buf, T &x); -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "URL_Array_Helper.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("URL_Array_Helper.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_URL_ARRAY_HELPER_H */ diff --git a/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp b/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp index 920322402b024..e06c5203217b4 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp +++ b/ACE/apps/JAWS/clients/Caching/URL_Locator.cpp @@ -35,12 +35,12 @@ ACE_URL_Locator::err_name[] = "unknown error" }; -ACE_URL_Locator::~ACE_URL_Locator (void) +ACE_URL_Locator::~ACE_URL_Locator () { } const char * -ACE_URL_Locator::error_status (void) +ACE_URL_Locator::error_status () { return "Not implemented yet."; } diff --git a/ACE/apps/JAWS/clients/Caching/URL_Locator.h b/ACE/apps/JAWS/clients/Caching/URL_Locator.h index f705d367fff67..34d51e195414d 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Locator.h +++ b/ACE/apps/JAWS/clients/Caching/URL_Locator.h @@ -73,7 +73,7 @@ class ACE_Svc_Export ACE_URL_Locator static const char * const err_name[]; /// Default destructor. - virtual ~ACE_URL_Locator (void) = 0; + virtual ~ACE_URL_Locator () = 0; /** * Query the locator for HTTP with designate properties (none, some, @@ -105,7 +105,7 @@ class ACE_Svc_Export ACE_URL_Locator const ACE_URL_Property_Seq *modify = 0) = 0; /// Provide a human readable error status. - virtual const char *error_status (void); + virtual const char *error_status (); }; #endif /* ACE_WEB_LOCATOR_H */ diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.h b/ACE/apps/JAWS/clients/Caching/URL_Properties.h index e3de23cf53fea..ad4ec19e919ab 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Properties.h +++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.h @@ -74,7 +74,7 @@ class ACE_Svc_Export ACE_URL_Property ACE_URL_Property (const ACE_URL_Property &p); /// Destructor. - ~ACE_URL_Property (void); + ~ACE_URL_Property (); /// Assignment operator. ACE_URL_Property &operator= (const ACE_URL_Property &rhs); @@ -86,7 +86,7 @@ class ACE_Svc_Export ACE_URL_Property bool operator!= (const ACE_URL_Property &rhs) const; // = Query property name. - ACE_WString &name_rep (void); + ACE_WString &name_rep (); const ACE_WString &name () const; // = Set property name. @@ -94,7 +94,7 @@ class ACE_Svc_Export ACE_URL_Property void name (const char *n); // = Query property value. - ACE_WString &value_rep (void); + ACE_WString &value_rep (); const ACE_WString &value () const; // = Set property value. @@ -146,7 +146,7 @@ class ACE_Svc_Export ACE_URL_Offer ACE_URL_Offer (const ACE_URL_Offer &o); /// Default destructor. - ~ACE_URL_Offer (void); + ~ACE_URL_Offer (); /// Assignment operator. ACE_URL_Offer &operator= (const ACE_URL_Offer &rhs); @@ -158,7 +158,7 @@ class ACE_Svc_Export ACE_URL_Offer bool operator!= (const ACE_URL_Offer &rhs) const; // = Get URL string. - ACE_WString &url_rep (void); + ACE_WString &url_rep (); const ACE_WString &url () const; // = Set URL. @@ -166,7 +166,7 @@ class ACE_Svc_Export ACE_URL_Offer void url (const ACE_UINT16 *url); /// Get properties of this offer. - ACE_URL_Property_Seq &url_properties (void); + ACE_URL_Property_Seq &url_properties (); /// Set properties of this offer. This operation virtually get a /// copy of the passed in prop. diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.inl b/ACE/apps/JAWS/clients/Caching/URL_Properties.inl index 711ac9823bcb6..793cc432dd9ee 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Properties.inl +++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.inl @@ -28,7 +28,7 @@ ACE_URL_Property::ACE_URL_Property (const ACE_URL_Property &p) } ACE_INLINE -ACE_URL_Property::~ACE_URL_Property (void) +ACE_URL_Property::~ACE_URL_Property () { } @@ -60,7 +60,7 @@ ACE_URL_Property::operator!= (const ACE_URL_Property &rhs) const } ACE_INLINE ACE_WString & -ACE_URL_Property::name_rep (void) +ACE_URL_Property::name_rep () { return this->name_; } @@ -84,7 +84,7 @@ ACE_URL_Property::name (const ACE_UINT16 *n) } ACE_INLINE ACE_WString & -ACE_URL_Property::value_rep (void) +ACE_URL_Property::value_rep () { return this->value_; } @@ -131,7 +131,7 @@ ACE_URL_Offer::ACE_URL_Offer (const ACE_URL_Offer &o) } ACE_INLINE -ACE_URL_Offer::~ACE_URL_Offer (void) +ACE_URL_Offer::~ACE_URL_Offer () { } @@ -164,7 +164,7 @@ ACE_URL_Offer::operator!= (const ACE_URL_Offer &rhs) const } ACE_INLINE ACE_WString & -ACE_URL_Offer::url_rep (void) +ACE_URL_Offer::url_rep () { return this->url_; } @@ -188,7 +188,7 @@ ACE_URL_Offer::url (const char *url) } ACE_INLINE ACE_URL_Property_Seq & -ACE_URL_Offer::url_properties (void) +ACE_URL_Offer::url_properties () { return this->prop_; } diff --git a/ACE/apps/JAWS/clients/Caching/http_handler.cpp b/ACE/apps/JAWS/clients/Caching/http_handler.cpp index fef8203a6ac2f..8f50f8340678f 100644 --- a/ACE/apps/JAWS/clients/Caching/http_handler.cpp +++ b/ACE/apps/JAWS/clients/Caching/http_handler.cpp @@ -13,7 +13,7 @@ #include "ace/Filecache.h" #include "http_handler.h" -HTTP_Handler::HTTP_Handler (void) +HTTP_Handler::HTTP_Handler () { } @@ -62,7 +62,7 @@ HTTP_Handler::open (void *) } int -HTTP_Handler::svc (void) +HTTP_Handler::svc () { static char buf[BUFSIZ]; int count = 0; diff --git a/ACE/apps/JAWS/clients/Caching/http_handler.h b/ACE/apps/JAWS/clients/Caching/http_handler.h index 1878ae1353728..574e2a228314a 100644 --- a/ACE/apps/JAWS/clients/Caching/http_handler.h +++ b/ACE/apps/JAWS/clients/Caching/http_handler.h @@ -30,7 +30,7 @@ class HTTP_Handler : public ACE_Svc_Handler { public: - HTTP_Handler (void); + HTTP_Handler (); HTTP_Handler (const char * path); /// Open hook. diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/bench.h b/ACE/apps/JAWS/clients/WebSTONE/src/bench.h index cc196ef09ac88..66af7d576480a 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/bench.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/bench.h @@ -208,7 +208,6 @@ typedef struct page_list { }page_list_t; - /* shared variables */ extern THREAD FILE *debugfile; extern int debug; @@ -230,7 +229,7 @@ extern void rqstat_times(rqst_stats_t *rs, rqst_timer_t *rt); void errexit(const char *, ...); extern int returnerr(const char *, ...); extern int d_printf(const char *, ...); -extern char *neterrstr(void); +extern char *neterrstr(); /* routines in get.c */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/get.c b/ACE/apps/JAWS/clients/WebSTONE/src/get.c index 87fc678a7afb2..d800e5678b769 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/get.c +++ b/ACE/apps/JAWS/clients/WebSTONE/src/get.c @@ -27,9 +27,6 @@ #include #include #include -#ifdef SUNOS -#include -#endif #include #ifdef WIN32 diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h index 6cfdbd6c2c603..321169048002f 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h @@ -20,12 +20,10 @@ */ - #ifndef CINFO_H #define CINFO_H - /* ------------------------------ Constants ------------------------------- */ @@ -91,13 +89,13 @@ typedef struct { * cinfo_merge. */ -void cinfo_init(void); +void cinfo_init(); /* * cinfo_terminate frees the database for shutdown. */ -void cinfo_terminate(void); +void cinfo_terminate(); /* * cinfo_merge merges the contents of the given filename with the current diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h index 1c0494c14a202..aeb93a43ffac0 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h @@ -100,7 +100,7 @@ void daemon_run(int det, void (*child_callback)(Session *), daemon_s *d); * the calling thread and not all of them. */ -pid_t child_fork(void); +pid_t child_fork(); /* diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h index 8fe585f9e009a..2cd21b46ca659 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h @@ -83,7 +83,6 @@ #define ERRORS_TO_SYSLOG -1 - /* ------------------------------ Prototypes ------------------------------ */ @@ -111,9 +110,9 @@ char *ereport_init(char *err_fn, char *email, struct passwd *pw); /* * log_terminate closes the error and common log file descriptors. */ -void ereport_terminate(void); +void ereport_terminate(); /* For restarts */ -SYS_FILE ereport_getfd(void); +SYS_FILE ereport_getfd(); #endif diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h index 5146d18add191..a90e680b49366 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h @@ -53,7 +53,3 @@ BOOL CALLBACK ErrorDialogProc( - - - - diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h index a7ec3d97321ba..742bed60d2ee7 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h @@ -132,7 +132,7 @@ int system_fread(SYS_FILE fd, char *buf, int sz); * This call stops core dumps in a portable way. Returns -1 on error. */ -int system_nocoredumps(void); +int system_nocoredumps(); #if defined(FILE_STDIO) diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h index 4eb09688d4cd0..f0bd5156d570b 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h @@ -11,7 +11,6 @@ /* ------------------------------------------------------------------------ */ - /* Prototypes for SSL I/O functions */ extern int SSL_Close(int); extern int SSL_Socket(int, int, int); diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h index 349018ba04806..5ad8155b7f368 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h @@ -58,7 +58,6 @@ extern int net_enabledns; - /* ------------------------------ Data types ------------------------------ */ @@ -142,7 +141,7 @@ int net_write(SYS_NETFD sd, char *buf, int sz); #ifdef DAEMON_NEEDS_SEMAPHORE int net_semaccept_init(int port); int net_semaccept(int s, struct sockaddr *addr, int *addrlen); -void net_semaccept_terminate(void); +void net_semaccept_terminate(); #endif diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h index e0672366a2ad0..b557847ad5870 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h @@ -25,7 +25,7 @@ * Returns 1 on error, 0 on AOK. */ -int node_init(void); +int node_init(); /* * Check the expiration date against The Now. @@ -33,13 +33,13 @@ int node_init(void); * Returns 1 on error, 0 on AOK. */ -int node_check(void); +int node_check(); /* * So how we doin, license * * Returns 1 on error, 0 on AOK */ -int node_status(void); +int node_status(); #endif diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h index 4531a34e966af..3e4472ea1f4d1 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h @@ -33,7 +33,6 @@ /* ------------------------------ Structures ------------------------------ */ - #define SESSION_HASHSIZE 5 diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h index 94ea72c8667ce..50ec8eb052843 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h @@ -50,7 +50,6 @@ #include /* strlen */ - /* --------------------------- Public routines ---------------------------- */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h index 31bf570c21fd8..fbdf805a2cf65 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h @@ -72,26 +72,6 @@ #define ZERO(ptr,len) memset(ptr,0,len) -#elif defined(SOLARIS) - -#define FILE_UNIX -#undef FILE_STDIO -#define DAEMON_UNIX_MOBRULE -#define DAEMON_NEEDS_SEMAPHORE -#define NET_SOCKETS -#define FILE_UNIX_MMAP -#define FILE_MMAP_FLAGS MAP_PRIVATE -#undef BSD_SIGNALS -#define BSD_RLIMIT -#define NEED_CRYPT_H -#define AUTH_DBM -/* The Solaris routines return ENOSPC when too many semaphores are SEM_UNDO. */ -#define SEM_FLOCK -#define DLL_CAPABLE -#define DLL_DLOPEN - -#define ZERO(ptr,len) memset(ptr,0,len) - #elif defined(SUNOS4) #define BSD_SIGNALS @@ -132,44 +112,6 @@ #define DLL_CAPABLE #define DLL_DLOPEN -#elif defined(AIX) - -#define FILE_UNIX -#undef FILE_STDIO -#undef DAEMON_UNIX_FORK -#undef DAEMON_UNIX_POOL -#define DAEMON_UNIX_MOBRULE -#define DAEMON_NEEDS_SEMAPHORE -#define NET_SOCKETS -#define FILE_UNIX_MMAP -#define FILE_MMAP_FLAGS MAP_PRIVATE -#undef BSD_SIGNALS -#define BSD_RLIMIT -#undef NEED_CRYPT_H -#define AUTH_DBM -#define SEM_FLOCK -#define ZERO(ptr,len) memset(ptr,0,len) -#define DLL_CAPABLE -#define DLL_DLOPEN - -#elif defined(HPUX) - -#define FILE_UNIX -#undef FILE_STDIO -#define DAEMON_UNIX_MOBRULE -#define DAEMON_NEEDS_SEMAPHORE -#define NET_SOCKETS -#define FILE_UNIX_MMAP -#define FILE_MMAP_FLAGS MAP_PRIVATE -#undef BSD_SIGNALS -#undef BSD_RLIMIT -#undef NEED_CRYPT_H -#define AUTH_DBM -#define SEM_FLOCK -#define ZERO(ptr,len) memset(ptr,0,len) -#define DLL_CAPABLE -#define DLL_HPSHL - #else /* Windows NT */ #include diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h index f359b8b9a6472..c7593a0296b63 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h @@ -109,7 +109,7 @@ void systhread_init(char *name); * between threads, and then use setdata to associate a value with this * key for each thread. */ -int systhread_newkey(void); +int systhread_newkey(); /* * Get data that has been previously associated with key in this thread. diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h index 17972cb518a93..2ff89e81128cb 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h @@ -97,7 +97,7 @@ char *util_env_find(char **env, char *name); * You are free to realloc or free this string. */ -char *util_hostname(void); +char *util_hostname(); /* diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h index 79a8b84dbbc73..d42d7b20dd768 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h @@ -59,7 +59,6 @@ #endif - /* ------------------------------- Globals -------------------------------- */ @@ -141,7 +140,7 @@ char *conf_init(char *cfn); * conf_terminate frees any data the conf routines may be holding. */ -void conf_terminate(void); +void conf_terminate(); /* diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h index 7bce6c285baf3..a24df4ea4d05b 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h @@ -78,7 +78,7 @@ struct FuncStruct { * func_init will only read from the static arrays defined in func.c. */ -void func_init(void); +void func_init(); /* * func_find returns a pointer to the function named name, or NULL if none diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h index 25d01a1692740..9c776eaaa9aa6 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h @@ -84,7 +84,6 @@ int servact_handle_processed(Session *sn, Request *rq); char *servact_translate_uri(char *uri, Session *sn); - #ifdef MCC_PROXY /* ----------------------- proxy specific prototypes ---------------------- */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h index 41719e7703855..a000b6ce56637 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h @@ -36,7 +36,6 @@ - /* ------------------------------ Constants ------------------------------- */ @@ -48,7 +47,6 @@ /* ------------------------------ Structures ------------------------------ */ - /* * Hierarchy of httpd_object * @@ -105,7 +103,6 @@ typedef struct { - /* ------------------------------ Prototypes ------------------------------ */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h index 6022433e27d5a..8d75b1ffb3e11 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h @@ -38,7 +38,6 @@ #include "frame/object.h" - /* ------------------------------ Constants ------------------------------- */ @@ -106,7 +105,7 @@ httpd_objset *objset_scan_buffer(filebuf *buf, char *errstr, httpd_objset *os); * objset_create creates a new object set and returns a pointer to it. */ -httpd_objset *objset_create(void); +httpd_objset *objset_create(); /* * objset_free will free an object set and any associated objects. diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h index e198ce22df81b..af27a8764dc7f 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h @@ -30,7 +30,6 @@ #include - /* ------------------------------ Constants ------------------------------- */ @@ -55,7 +54,6 @@ #define REQ_EXIT -3 - /* ------------------------------ Structures ------------------------------ */ @@ -97,7 +95,7 @@ typedef struct { * request_create creates a new request structure. */ -Request *request_create(void); +Request *request_create(); /* * request_free destroys a request structure. diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h b/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h index 4749c2e79492c..09d13504754cd 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h @@ -68,7 +68,6 @@ typedef unsigned short ushort; #define MAXPATHLEN 512 - #else /* not WIN32 */ #define NETREAD(sock, buf, len) read(sock, buf, len) #define NETWRITE(sock, buf, len) write(sock, buf, len) @@ -102,7 +101,7 @@ typedef int SOCKET; #ifdef WIN32 int getopt(int argc, char ** argv, char *opts); -int getpid(void); +int getpid(); int gettimeofday(struct timeval *curTimeP); int random_number(int max); SOCKET rexec(const char **hostname, NETPORT port, char *username, char *password, diff --git a/ACE/apps/JAWS/server/HTTP_Config.cpp b/ACE/apps/JAWS/server/HTTP_Config.cpp index d923142d100ef..b8670491283a8 100644 --- a/ACE/apps/JAWS/server/HTTP_Config.cpp +++ b/ACE/apps/JAWS/server/HTTP_Config.cpp @@ -8,7 +8,7 @@ HTTP_Config_Info *HTTP_Config::instance_ = 0; HTTP_Config_Info * -HTTP_Config::instance (void) +HTTP_Config::instance () { if (HTTP_Config::instance_ == 0) { @@ -24,7 +24,7 @@ HTTP_Config::instance (void) return HTTP_Config::instance_; } -HTTP_Config_Info::HTTP_Config_Info (void) +HTTP_Config_Info::HTTP_Config_Info () : document_root_ (0), cgi_path_ (0), user_dir_ (0), @@ -33,7 +33,7 @@ HTTP_Config_Info::HTTP_Config_Info (void) { } -HTTP_Config_Info::~HTTP_Config_Info (void) +HTTP_Config_Info::~HTTP_Config_Info () { } diff --git a/ACE/apps/JAWS/server/HTTP_Config.h b/ACE/apps/JAWS/server/HTTP_Config.h index 6a68919c52d94..84c8afbcad7e2 100644 --- a/ACE/apps/JAWS/server/HTTP_Config.h +++ b/ACE/apps/JAWS/server/HTTP_Config.h @@ -25,7 +25,7 @@ class HTTP_Config { public: /// Access the Singleton. - static HTTP_Config_Info *instance (void); + static HTTP_Config_Info *instance (); private: /// Store the Singleton. @@ -41,8 +41,8 @@ class HTTP_Config_Info { friend class HTTP_Config; public: - HTTP_Config_Info (void); - ~HTTP_Config_Info (void); + HTTP_Config_Info (); + ~HTTP_Config_Info (); // Accessors to the information diff --git a/ACE/apps/JAWS/server/HTTP_Handler.cpp b/ACE/apps/JAWS/server/HTTP_Handler.cpp index 3b7f935c92113..cc4ccfad34987 100644 --- a/ACE/apps/JAWS/server/HTTP_Handler.cpp +++ b/ACE/apps/JAWS/server/HTTP_Handler.cpp @@ -20,7 +20,7 @@ HTTP_Handler::HTTP_Handler (JAWS_IO &io, this->io_.handler (this); } -HTTP_Handler::~HTTP_Handler (void) +HTTP_Handler::~HTTP_Handler () { this->request_data_->release (); this->request_data_ = 0; @@ -91,7 +91,7 @@ HTTP_Handler::read_complete (ACE_Message_Block &message_block) } void -HTTP_Handler::receive_file_complete (void) +HTTP_Handler::receive_file_complete () { ACE_DEBUG ((LM_DEBUG, " (%t) %s received successfully\n", request_.uri ())); @@ -143,19 +143,19 @@ HTTP_Handler::receive_file_error (int result) } void -HTTP_Handler::confirmation_message_complete (void) +HTTP_Handler::confirmation_message_complete () { this->done (); } void -HTTP_Handler::error_message_complete (void) +HTTP_Handler::error_message_complete () { this->done (); } void -HTTP_Handler::transmit_file_complete (void) +HTTP_Handler::transmit_file_complete () { ACE_DEBUG ((LM_DEBUG, " (%t) %s transmitted successfully\n", request_.uri ())); @@ -193,14 +193,14 @@ HTTP_Handler::transmit_file_error (int result) } void -HTTP_Handler::read_error (void) +HTTP_Handler::read_error () { ACE_DEBUG ((LM_DEBUG, " (%t) error in reading request\n")); this->done (); } void -HTTP_Handler::write_error (void) +HTTP_Handler::write_error () { ACE_DEBUG ((LM_DEBUG, " (%t) %s error in writing response\n", request_.uri ())); @@ -209,7 +209,7 @@ HTTP_Handler::write_error (void) } void -HTTP_Handler::timeout (void) +HTTP_Handler::timeout () { ACE_DEBUG ((LM_DEBUG, " (%t) %s error in reading request\n", request_.uri ())); @@ -220,7 +220,7 @@ HTTP_Handler::timeout (void) } void -HTTP_Handler::request_too_long (void) +HTTP_Handler::request_too_long () { ACE_DEBUG ((LM_DEBUG, " (%t) request too long\n")); this->response_. @@ -229,17 +229,17 @@ HTTP_Handler::request_too_long (void) } void -HTTP_Handler::done (void) +HTTP_Handler::done () { this->factory_.destroy_http_handler (*this, this->io_); } -HTTP_Handler_Factory::~HTTP_Handler_Factory (void) +HTTP_Handler_Factory::~HTTP_Handler_Factory () { } HTTP_Handler * -Synch_HTTP_Handler_Factory::create_http_handler (void) +Synch_HTTP_Handler_Factory::create_http_handler () { JAWS_Synch_IO *io; ACE_NEW_RETURN (io, JAWS_Synch_IO, 0); @@ -260,7 +260,7 @@ Synch_HTTP_Handler_Factory::destroy_http_handler (HTTP_Handler &handler, //-------------SYNCH IO no Cache HTTP_Handler * -No_Cache_Synch_HTTP_Handler_Factory::create_http_handler (void) +No_Cache_Synch_HTTP_Handler_Factory::create_http_handler () { JAWS_Synch_IO_No_Cache *io = 0; ACE_NEW_RETURN (io, JAWS_Synch_IO_No_Cache, 0); @@ -303,7 +303,7 @@ Asynch_HTTP_Handler_Factory::destroy_http_handler (HTTP_Handler &handler, } HTTP_Handler * -Asynch_HTTP_Handler_Factory::create_http_handler (void) +Asynch_HTTP_Handler_Factory::create_http_handler () { return 0; } diff --git a/ACE/apps/JAWS/server/HTTP_Handler.h b/ACE/apps/JAWS/server/HTTP_Handler.h index 4b132f9e77092..cc0226fe81af3 100644 --- a/ACE/apps/JAWS/server/HTTP_Handler.h +++ b/ACE/apps/JAWS/server/HTTP_Handler.h @@ -67,20 +67,20 @@ class HTTP_Handler : protected JAWS_IO_Handler HTTP_Handler_Factory &factory); /// Destructor - virtual ~HTTP_Handler (void); + virtual ~HTTP_Handler (); /// This method is called by the framework when there is a timeout. - virtual void timeout (void); + virtual void timeout (); /** * This is the termination state of the handler. After successful or * unsuccessful completions, the handler will end up in this state * (method). */ - virtual void done (void); + virtual void done (); /// Request too long. - virtual void request_too_long (void); + virtual void request_too_long (); /// Reference to the creating factory. HTTP_Handler_Factory &factory_; @@ -89,14 +89,14 @@ class HTTP_Handler : protected JAWS_IO_Handler // = Completion methods inherited from . virtual void read_complete (ACE_Message_Block &data); - virtual void read_error (void); - virtual void transmit_file_complete (void); + virtual void read_error (); + virtual void transmit_file_complete (); virtual void transmit_file_error (int result); - virtual void receive_file_complete (void); + virtual void receive_file_complete (); virtual void receive_file_error (int result); - virtual void write_error (void); - virtual void confirmation_message_complete (void); - virtual void error_message_complete (void); + virtual void write_error (); + virtual void confirmation_message_complete (); + virtual void error_message_complete (); public: enum @@ -132,10 +132,10 @@ class HTTP_Handler_Factory { public: /// Destructor - virtual ~HTTP_Handler_Factory (void); + virtual ~HTTP_Handler_Factory (); /// This creates a new HTTP_Handler - virtual HTTP_Handler *create_http_handler (void) = 0; + virtual HTTP_Handler *create_http_handler () = 0; /** * The HTTP handler will call this method from HTTP_Handler::done to @@ -156,7 +156,7 @@ class Synch_HTTP_Handler_Factory : public HTTP_Handler_Factory { public: /// This creates a new HTTP_Handler - HTTP_Handler *create_http_handler (void); + HTTP_Handler *create_http_handler (); /** * The HTTP handler will call this method from HTTP_Handler::done to @@ -179,7 +179,7 @@ class No_Cache_Synch_HTTP_Handler_Factory : public HTTP_Handler_Factory { public: /// This creates a new HTTP_Handler - HTTP_Handler *create_http_handler (void); + HTTP_Handler *create_http_handler (); /** * The HTTP handler will call this method from HTTP_Handler::done to @@ -226,7 +226,7 @@ class Asynch_HTTP_Handler_Factory : public HTTP_Handler_Factory, public ACE_Serv * handlers. New handlers can only be created by the framework when * new client connections arrive. */ - HTTP_Handler *create_http_handler (void); + HTTP_Handler *create_http_handler (); }; #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ #endif /* HTTP_HANDLER_H */ diff --git a/ACE/apps/JAWS/server/HTTP_Helpers.cpp b/ACE/apps/JAWS/server/HTTP_Helpers.cpp index e952c85bf5f0e..a9f778dda3929 100644 --- a/ACE/apps/JAWS/server/HTTP_Helpers.cpp +++ b/ACE/apps/JAWS/server/HTTP_Helpers.cpp @@ -97,7 +97,6 @@ HTTP_Helper::HTTP_mktime (const char *httpdate) // mktime is a Standard C function. { - #if !defined (ACE_HAS_REENTRANT_LIBC) ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, HTTP_Helper::mutex_, -1)); #endif /* NOT ACE_HAS_REENTRANT_LIBC */ @@ -107,7 +106,7 @@ HTTP_Helper::HTTP_mktime (const char *httpdate) } const char * -HTTP_Helper::HTTP_date (void) +HTTP_Helper::HTTP_date () { if (HTTP_Helper::date_string_ == 0) { @@ -379,7 +378,7 @@ HTTP_Helper::fixyear (int year) } const char ** -HTTP_Status_Code::instance (void) +HTTP_Status_Code::instance () { if (HTTP_Status_Code::instance_ == 0) { diff --git a/ACE/apps/JAWS/server/HTTP_Helpers.h b/ACE/apps/JAWS/server/HTTP_Helpers.h index 0f22d53ddeec6..bb8e0ad6a89f8 100644 --- a/ACE/apps/JAWS/server/HTTP_Helpers.h +++ b/ACE/apps/JAWS/server/HTTP_Helpers.h @@ -26,12 +26,11 @@ class HTTP_Helper { public: - // Convert and HTTP-date into a time_t static time_t HTTP_mktime (const char *httpdate); // Create today's date - static const char *HTTP_date (void); + static const char *HTTP_date (); static const char *HTTP_date (char *s); // Month conversions (ascii <--> numeric) @@ -45,7 +44,6 @@ class HTTP_Helper static char *HTTP_encode_base64 (char *data); private: - static int fixyear (int year); private: @@ -70,7 +68,7 @@ class HTTP_Status_Code { public: /// Singleton access point. - static const char **instance (void); + static const char **instance (); enum STATUS_CODE { diff --git a/ACE/apps/JAWS/server/HTTP_Request.cpp b/ACE/apps/JAWS/server/HTTP_Request.cpp index 9c789bdd46308..457e0b8b0a500 100644 --- a/ACE/apps/JAWS/server/HTTP_Request.cpp +++ b/ACE/apps/JAWS/server/HTTP_Request.cpp @@ -36,7 +36,7 @@ HTTP_Request::static_method_strings_[HTTP_Request::NUM_METHOD_STRINGS] = // For reasons of efficiency, this class expects buffer to be // null-terminated, and buflen does NOT include the \0. -HTTP_Request::HTTP_Request (void) +HTTP_Request::HTTP_Request () : got_request_line_ (0), method_ (0), uri_ (0), @@ -50,14 +50,13 @@ HTTP_Request::HTTP_Request (void) header_strings_ (HTTP_Request::static_header_strings_), method_strings_ (HTTP_Request::static_method_strings_) { - for (size_t i = 0; i < HTTP_Request::NUM_HEADER_STRINGS; i++) this->headers_.recognize (this->header_strings_[i]); } -HTTP_Request::~HTTP_Request (void) +HTTP_Request::~HTTP_Request () { ACE_OS::free (this->method_); ACE_OS::free (this->uri_); @@ -275,19 +274,19 @@ HTTP_Request::header_values (int index) const } char * -HTTP_Request::data (void) +HTTP_Request::data () { return data_; } int -HTTP_Request::data_length (void) +HTTP_Request::data_length () { return datalen_; } int -HTTP_Request::content_length (void) +HTTP_Request::content_length () { if (this->content_length_ == -1) { @@ -299,19 +298,19 @@ HTTP_Request::content_length (void) } int -HTTP_Request::status (void) +HTTP_Request::status () { return this->status_; } const char * -HTTP_Request::status_string (void) +HTTP_Request::status_string () { return HTTP_Status_Code::instance ()[this->status_]; } void -HTTP_Request::dump (void) +HTTP_Request::dump () { ACE_DEBUG ((LM_DEBUG, "%s command.\n" "filename is %s," diff --git a/ACE/apps/JAWS/server/HTTP_Request.h b/ACE/apps/JAWS/server/HTTP_Request.h index e027f4953b069..d3bc789e23744 100644 --- a/ACE/apps/JAWS/server/HTTP_Request.h +++ b/ACE/apps/JAWS/server/HTTP_Request.h @@ -33,10 +33,10 @@ class HTTP_Request { public: /// Default construction. - HTTP_Request (void); + HTTP_Request (); /// Destructor. - ~HTTP_Request (void); + ~HTTP_Request (); /// parse an incoming request int parse_request (ACE_Message_Block &mb); @@ -93,22 +93,22 @@ class HTTP_Request const char *header_values (int index) const; /// The buffer into which request data is read - char *data (void); + char *data (); /// The length of the request data - int data_length (void); + int data_length (); /// The length of incoming content if any - int content_length (void); + int content_length (); /// Current status of the incoming request - int status (void); + int status (); /// A string describing the state of the incoming request - const char *status_string (void); + const char *status_string (); /// Dump the state of the request. - void dump (void); + void dump (); enum { diff --git a/ACE/apps/JAWS/server/HTTP_Response.cpp b/ACE/apps/JAWS/server/HTTP_Response.cpp index a08806f2f042c..65924b31cd9c9 100644 --- a/ACE/apps/JAWS/server/HTTP_Response.cpp +++ b/ACE/apps/JAWS/server/HTTP_Response.cpp @@ -27,7 +27,7 @@ HTTP_Response::HTTP_Response (HTTP_Request &request, JAWS_IO &io) { } -HTTP_Response::~HTTP_Response (void) +HTTP_Response::~HTTP_Response () { #if defined (ACE_JAWS_BASELINE) if (this->HTTP_HEADER != EMPTY_HEADER) @@ -43,7 +43,7 @@ HTTP_Response::process_request(HTTP_Response &response) } void -HTTP_Response::process_request (void) +HTTP_Response::process_request () { ACE_DEBUG ((LM_DEBUG, " (%t) processing request: %s\n", this->request_.status_string ())); @@ -141,7 +141,7 @@ HTTP_Response::error_response (int status_code, const char *log_message) } void -HTTP_Response::normal_response (void) +HTTP_Response::normal_response () { const char *hv = 0;; @@ -221,7 +221,7 @@ HTTP_Response::normal_response (void) void -HTTP_Response::cgi_response (void) +HTTP_Response::cgi_response () { ACE_Process_Options cgi_options; @@ -313,7 +313,7 @@ HTTP_Response::cgi_response (void) } void -HTTP_Response::build_headers (void) +HTTP_Response::build_headers () { // At this point, we should really determine the type of request // this is, and build the appropriate header. diff --git a/ACE/apps/JAWS/server/HTTP_Response.h b/ACE/apps/JAWS/server/HTTP_Response.h index 82848cf290a90..f6e4c3807d266 100644 --- a/ACE/apps/JAWS/server/HTTP_Response.h +++ b/ACE/apps/JAWS/server/HTTP_Response.h @@ -31,10 +31,10 @@ class HTTP_Response HTTP_Response (JAWS_IO &io, HTTP_Request &request); HTTP_Response (HTTP_Request &request, JAWS_IO &io); - ~HTTP_Response (void); + ~HTTP_Response (); /// This is called by the handler to initiate a response. - void process_request (void); + void process_request (); /// This returns an error response for cases where there is a problem /// with the request, logging the log_message. @@ -42,20 +42,18 @@ class HTTP_Response const char *log_message); private: - /// Called by process_request when the request is a normal request. - void normal_response (void); + void normal_response (); /// Called by process_request when the request is a cgi request. - void cgi_response (void); + void cgi_response (); private: - /// static version of process_request, just in case. static void process_request (HTTP_Response &response); /// creates the appropriate header information for responses. - void build_headers (void); + void build_headers (); private: /// The IO and Request objects associated with this re diff --git a/ACE/apps/JAWS/server/HTTP_Server.cpp b/ACE/apps/JAWS/server/HTTP_Server.cpp index f5964316738bb..9894cab64bfdc 100644 --- a/ACE/apps/JAWS/server/HTTP_Server.cpp +++ b/ACE/apps/JAWS/server/HTTP_Server.cpp @@ -174,7 +174,7 @@ HTTP_Server::init (int argc, ACE_TCHAR *argv[]) } int -HTTP_Server::fini (void) +HTTP_Server::fini () { this->tm_.close (); return 0; @@ -211,7 +211,7 @@ Synch_Thread_Pool_Task::Synch_Thread_Pool_Task (HTTP_Acceptor &acceptor, } int -Synch_Thread_Pool_Task::svc (void) +Synch_Thread_Pool_Task::svc () { // Creates a factory of HTTP_Handlers binding to synchronous I/O strategy //Synch_HTTP_Handler_Factory factory; @@ -329,7 +329,7 @@ Thread_Per_Request_Task::open (void *) } int -Thread_Per_Request_Task::svc (void) +Thread_Per_Request_Task::svc () { ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (HTTP_Handler::MAX_REQUEST_SIZE + 1), @@ -367,7 +367,7 @@ Thread_Per_Request_Task::close (u_long) // ACT. int -HTTP_Server::asynch_thread_pool (void) +HTTP_Server::asynch_thread_pool () { // This only works on Win32 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) @@ -409,7 +409,7 @@ Asynch_Thread_Pool_Task::Asynch_Thread_Pool_Task (ACE_Proactor &proactor, } int -Asynch_Thread_Pool_Task::svc (void) +Asynch_Thread_Pool_Task::svc () { for (;;) if (this->proactor_.handle_events () == -1) diff --git a/ACE/apps/JAWS/server/HTTP_Server.h b/ACE/apps/JAWS/server/HTTP_Server.h index 9ee7bfb241a47..ae212c2bef6ce 100644 --- a/ACE/apps/JAWS/server/HTTP_Server.h +++ b/ACE/apps/JAWS/server/HTTP_Server.h @@ -63,7 +63,7 @@ class ACE_Svc_Export HTTP_Server : public ACE_Service_Object virtual int thread_per_request (HTTP_Handler_Factory &factory); /// Asynch Thread Pool implementation - virtual int asynch_thread_pool (void); + virtual int asynch_thread_pool (); /// Synch Thread Pool implementation virtual int synch_thread_pool (HTTP_Handler_Factory &factory); diff --git a/ACE/apps/JAWS/server/JAWS_Concurrency.cpp b/ACE/apps/JAWS/server/JAWS_Concurrency.cpp index a248dc61873cf..eda9d75f8cdc9 100644 --- a/ACE/apps/JAWS/server/JAWS_Concurrency.cpp +++ b/ACE/apps/JAWS/server/JAWS_Concurrency.cpp @@ -1,6 +1,6 @@ #include "JAWS_Concurrency.h" -JAWS_Concurrency_Base::JAWS_Concurrency_Base (void) +JAWS_Concurrency_Base::JAWS_Concurrency_Base () { } @@ -11,7 +11,7 @@ JAWS_Concurrency_Base::put (ACE_Message_Block *mb, ACE_Time_Value *tv) } int -JAWS_Concurrency_Base::svc (void) +JAWS_Concurrency_Base::svc () { int result = 0; @@ -33,11 +33,11 @@ JAWS_Concurrency_Base::svc (void) return 0; } -JAWS_Dispatch_Policy::JAWS_Dispatch_Policy (void) +JAWS_Dispatch_Policy::JAWS_Dispatch_Policy () { } -JAWS_Dispatch_Policy::~JAWS_Dispatch_Policy (void) +JAWS_Dispatch_Policy::~JAWS_Dispatch_Policy () { } diff --git a/ACE/apps/JAWS/server/JAWS_Concurrency.h b/ACE/apps/JAWS/server/JAWS_Concurrency.h index 08c9d88a20fb4..c895bf1e8be7a 100644 --- a/ACE/apps/JAWS/server/JAWS_Concurrency.h +++ b/ACE/apps/JAWS/server/JAWS_Concurrency.h @@ -22,7 +22,7 @@ class JAWS_Concurrency_Base : public ACE_Task { public: - JAWS_Concurrency_Base (void); + JAWS_Concurrency_Base (); virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); virtual int svc (); }; @@ -36,8 +36,8 @@ class JAWS_Dispatch_Policy // model should be. (For now, we always return the same model.) { public: - JAWS_Dispatch_Policy (void); - virtual ~JAWS_Dispatch_Policy (void); + JAWS_Dispatch_Policy (); + virtual ~JAWS_Dispatch_Policy (); virtual JAWS_Concurrency_Base * update (void *state = 0) = 0; }; diff --git a/ACE/apps/JAWS/server/JAWS_IO.cpp b/ACE/apps/JAWS/server/JAWS_IO.cpp index 72acf14c092f9..a71289ebdde85 100644 --- a/ACE/apps/JAWS/server/JAWS_IO.cpp +++ b/ACE/apps/JAWS/server/JAWS_IO.cpp @@ -14,12 +14,12 @@ #include "ace/Auto_Ptr.h" #include "ace/Basic_Types.h" -JAWS_IO::JAWS_IO (void) +JAWS_IO::JAWS_IO () : handler_ (0) { } -JAWS_IO::~JAWS_IO (void) +JAWS_IO::~JAWS_IO () { } @@ -29,16 +29,16 @@ JAWS_IO::handler (JAWS_IO_Handler *handler) this->handler_ = handler; } -JAWS_IO_Handler::~JAWS_IO_Handler (void) +JAWS_IO_Handler::~JAWS_IO_Handler () { } -JAWS_Synch_IO::JAWS_Synch_IO (void) +JAWS_Synch_IO::JAWS_Synch_IO () : handle_ (ACE_INVALID_HANDLE) { } -JAWS_Synch_IO::~JAWS_Synch_IO (void) +JAWS_Synch_IO::~JAWS_Synch_IO () { ACE_OS::closesocket (this->handle_); } @@ -190,11 +190,11 @@ JAWS_Synch_IO::send_message (const char *buffer, // This only works on Win32 #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) -JAWS_Asynch_IO::JAWS_Asynch_IO (void) +JAWS_Asynch_IO::JAWS_Asynch_IO () { } -JAWS_Asynch_IO::~JAWS_Asynch_IO (void) +JAWS_Asynch_IO::~JAWS_Asynch_IO () { ACE_OS::closesocket (this->handle_); } @@ -418,12 +418,12 @@ JAWS_Asynch_IO::handle_write_stream (const ACE_Asynch_Write_Stream::Result &resu //-------------------Adding SYNCH IO no Caching -JAWS_Synch_IO_No_Cache::JAWS_Synch_IO_No_Cache (void) +JAWS_Synch_IO_No_Cache::JAWS_Synch_IO_No_Cache () : handle_ (ACE_INVALID_HANDLE) { } -JAWS_Synch_IO_No_Cache::~JAWS_Synch_IO_No_Cache (void) +JAWS_Synch_IO_No_Cache::~JAWS_Synch_IO_No_Cache () { ACE_OS::closesocket (this->handle_); } diff --git a/ACE/apps/JAWS/server/JAWS_IO.h b/ACE/apps/JAWS/server/JAWS_IO.h index b0010b73a6780..1619dcdc2c799 100644 --- a/ACE/apps/JAWS/server/JAWS_IO.h +++ b/ACE/apps/JAWS/server/JAWS_IO.h @@ -40,8 +40,8 @@ class JAWS_IO_Handler; class JAWS_IO { public: - JAWS_IO (void); - virtual ~JAWS_IO (void); + JAWS_IO (); + virtual ~JAWS_IO (); void handler (JAWS_IO_Handler *handler); virtual void handle (ACE_HANDLE h) = 0; @@ -84,9 +84,8 @@ class JAWS_IO class JAWS_IO_Handler { public: - /// Destructor. - virtual ~JAWS_IO_Handler (void); + virtual ~JAWS_IO_Handler (); /// This method is called by the IO class when new client data shows /// up. @@ -94,11 +93,11 @@ class JAWS_IO_Handler /// This method is called by the IO class when there was an error in /// reading new data from the client. - virtual void read_error (void) = 0; + virtual void read_error () = 0; /// This method is called by the IO class when the requested file has /// been successfully transmitted to the client. - virtual void transmit_file_complete (void) = 0; + virtual void transmit_file_complete () = 0; /// This method is called by the IO class when there was an error in /// transmitting the requested file to the client. @@ -106,7 +105,7 @@ class JAWS_IO_Handler /// This method is called by the IO class when the requested file has /// been successfully received from the client. - virtual void receive_file_complete (void) = 0; + virtual void receive_file_complete () = 0; /// This method is called by the IO class when there was an error in /// receiving the requested file from the client. @@ -114,16 +113,15 @@ class JAWS_IO_Handler /// This method is called by the IO class when there was an error in /// writing data to the client. - virtual void write_error (void) = 0; + virtual void write_error () = 0; /// This method is called by the IO class when the confirmation /// message has been delivered to the client. - virtual void confirmation_message_complete (void) = 0; + virtual void confirmation_message_complete () = 0; /// This method is called by the IO class when the error message has /// been delivered to the client. - virtual void error_message_complete (void) = 0; - + virtual void error_message_complete () = 0; }; /** @@ -134,9 +132,9 @@ class JAWS_IO_Handler class JAWS_Synch_IO : public JAWS_IO { public: - JAWS_Synch_IO (void); + JAWS_Synch_IO (); - ~JAWS_Synch_IO (void); + ~JAWS_Synch_IO (); virtual void handle (ACE_HANDLE h); virtual ACE_HANDLE handle () const; @@ -178,9 +176,9 @@ class JAWS_Synch_IO : public JAWS_IO class JAWS_Asynch_IO : public JAWS_IO, public ACE_Handler { public: - JAWS_Asynch_IO (void); + JAWS_Asynch_IO (); - ~JAWS_Asynch_IO (void); + ~JAWS_Asynch_IO (); virtual void handle (ACE_HANDLE h) { ACE_Handler::handle (h); }; virtual ACE_HANDLE handle () const { return ACE_Handler::handle (); }; @@ -250,9 +248,9 @@ class JAWS_Asynch_IO : public JAWS_IO, public ACE_Handler class JAWS_Synch_IO_No_Cache : public JAWS_IO { public: - JAWS_Synch_IO_No_Cache (void); + JAWS_Synch_IO_No_Cache (); - ~JAWS_Synch_IO_No_Cache (void); + ~JAWS_Synch_IO_No_Cache (); virtual void handle (ACE_HANDLE h); virtual ACE_HANDLE handle () const; diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline.cpp b/ACE/apps/JAWS/server/JAWS_Pipeline.cpp index 88b81037d2b28..7f947037257ce 100644 --- a/ACE/apps/JAWS/server/JAWS_Pipeline.cpp +++ b/ACE/apps/JAWS/server/JAWS_Pipeline.cpp @@ -1,6 +1,6 @@ #include "JAWS_Pipeline.h" -JAWS_Pipeline::JAWS_Pipeline (void) +JAWS_Pipeline::JAWS_Pipeline () { } diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline.h b/ACE/apps/JAWS/server/JAWS_Pipeline.h index a4e64971a02ee..c8609bcac46be 100644 --- a/ACE/apps/JAWS/server/JAWS_Pipeline.h +++ b/ACE/apps/JAWS/server/JAWS_Pipeline.h @@ -22,7 +22,7 @@ class JAWS_Pipeline : public JAWS_Pipeline_Task // Methods that are common to pipeline components { public: - JAWS_Pipeline (void); + JAWS_Pipeline (); // ACE_Task hooks virtual int open (void * = 0); diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp index e3a1a38d33b28..bd10c10f90a85 100644 --- a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp +++ b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.cpp @@ -4,7 +4,7 @@ #include "JAWS_Pipeline_Handler.h" template -JAWS_Pipeline_Handler::JAWS_Pipeline_Handler (void) +JAWS_Pipeline_Handler::JAWS_Pipeline_Handler () { } diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h index 255c966ea2ece..c8f8712f59416 100644 --- a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h +++ b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h @@ -10,7 +10,7 @@ class JAWS_Pipeline_Handler : public JAWS_Pipeline_Task // Methods that are common to pipeline components { public: - JAWS_Pipeline_Handler (void); + JAWS_Pipeline_Handler (); // ACE_Task hooks virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); @@ -20,8 +20,6 @@ class JAWS_Pipeline_Handler : public JAWS_Pipeline_Task // Callback hook for specialized data processing }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS_Pipeline_Handler.cpp" -#endif #endif /* !defined (JAWS_PIPELINE_HANDLER_H) */ diff --git a/ACE/apps/JAWS/server/Parse_Headers.cpp b/ACE/apps/JAWS/server/Parse_Headers.cpp index d53a9078db6f6..614369df50c79 100644 --- a/ACE/apps/JAWS/server/Parse_Headers.cpp +++ b/ACE/apps/JAWS/server/Parse_Headers.cpp @@ -8,11 +8,11 @@ // Implementation of class Headers -Headers::Headers (void) : done_(0) +Headers::Headers () : done_(0) { } -Headers::~Headers (void) +Headers::~Headers () { } @@ -162,22 +162,22 @@ Headers::end_of_line (char *&line, int &offset) const // Implementation of class Headers_Map -Headers_Map::Headers_Map (void) +Headers_Map::Headers_Map () : num_headers_(0) { } -Headers_Map::~Headers_Map (void) +Headers_Map::~Headers_Map () { } -Headers_Map_Item::Headers_Map_Item (void) +Headers_Map_Item::Headers_Map_Item () : header_(0), value_(0) { } -Headers_Map_Item::~Headers_Map_Item (void) +Headers_Map_Item::~Headers_Map_Item () { ACE_OS::free ((void *) this->header_); ACE_OS::free ((void *) this->value_); diff --git a/ACE/apps/JAWS/server/Parse_Headers.h b/ACE/apps/JAWS/server/Parse_Headers.h index 43c33a5a51c0c..d44ad3b78d4b0 100644 --- a/ACE/apps/JAWS/server/Parse_Headers.h +++ b/ACE/apps/JAWS/server/Parse_Headers.h @@ -24,8 +24,8 @@ friend class Headers_Map; friend class Headers; private: - Headers_Map_Item (void); - ~Headers_Map_Item (void); + Headers_Map_Item (); + ~Headers_Map_Item (); // operator const char * () const; Headers_Map_Item &operator= (char *); @@ -50,8 +50,8 @@ friend class Headers; class Headers_Map { public: - Headers_Map (void); - ~Headers_Map (void); + Headers_Map (); + ~Headers_Map (); Headers_Map_Item &operator[] (const char *const header); const Headers_Map_Item &operator[] (const char *const header) const; @@ -87,8 +87,8 @@ class Headers_Map class Headers { public: - Headers (void); - ~Headers (void); + Headers (); + ~Headers (); void recognize (const char *const header); diff --git a/ACE/apps/JAWS/stress_testing/benchd.cpp b/ACE/apps/JAWS/stress_testing/benchd.cpp index 86da05dad4205..d0b8fc575a79a 100644 --- a/ACE/apps/JAWS/stress_testing/benchd.cpp +++ b/ACE/apps/JAWS/stress_testing/benchd.cpp @@ -35,7 +35,7 @@ class Handle_Events : public ACE_Event_Handler const char *ip_addr, const char *interface_, ACE_Reactor &reactor); - ~Handle_Events (void); + ~Handle_Events (); virtual int handle_input (ACE_HANDLE); virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); @@ -101,7 +101,7 @@ Handle_Events::handle_close (ACE_HANDLE h, ACE_Reactor_Mask) return 0; } -Handle_Events::~Handle_Events (void) +Handle_Events::~Handle_Events () { // ACE_OS::exit on error (bogus)... diff --git a/ACE/apps/JAWS/stress_testing/connection.cpp b/ACE/apps/JAWS/stress_testing/connection.cpp index 9c3b157ba2887..dd96f3d306818 100644 --- a/ACE/apps/JAWS/stress_testing/connection.cpp +++ b/ACE/apps/JAWS/stress_testing/connection.cpp @@ -84,13 +84,13 @@ int connection::read_n(void *buffer, size_t maxlen, unsigned int timeout_seconds return 1; } -int connection::close(void) { +int connection::close() { stream_.close_reader(); stream_.close_writer(); stream_.close(); return 0; } -connection::~connection(void) { +connection::~connection() { this->close(); } diff --git a/ACE/apps/JAWS/stress_testing/connection.h b/ACE/apps/JAWS/stress_testing/connection.h index faa10f7a53f50..f9aa8286b0a18 100644 --- a/ACE/apps/JAWS/stress_testing/connection.h +++ b/ACE/apps/JAWS/stress_testing/connection.h @@ -3,15 +3,14 @@ #ifndef _D_connection #define _D_connection class connection { - public: int connect(char *hostname_opt_port, int tcp_nodelay, int sockbufsiz); int read(void *buffer, size_t maxlen, unsigned int timeout_seconds = 60); int write(const void *buffer, size_t maxlen, unsigned int timeout_seconds = 60); int write_n(const void *buffer, size_t len, unsigned int timeout_seconds = 60); int read_n(void *buffer, size_t maxlen, unsigned int timeout_seconds = 60); - int close(void); - ~connection(void); + int close(); + ~connection(); private: ACE_SOCK_Stream stream_; diff --git a/ACE/apps/JAWS/stress_testing/cp.cpp b/ACE/apps/JAWS/stress_testing/cp.cpp index f1a5d068ce14a..d78e95ce47697 100644 --- a/ACE/apps/JAWS/stress_testing/cp.cpp +++ b/ACE/apps/JAWS/stress_testing/cp.cpp @@ -1,7 +1,5 @@ #include "cp.h" Client_Parameters::Client_Parameters(int i) { - id = i; - } diff --git a/ACE/apps/JAWS/stress_testing/global.h b/ACE/apps/JAWS/stress_testing/global.h index ae7977c392988..b8ec270029551 100644 --- a/ACE/apps/JAWS/stress_testing/global.h +++ b/ACE/apps/JAWS/stress_testing/global.h @@ -24,6 +24,3 @@ - - - diff --git a/ACE/apps/JAWS/stress_testing/http.h b/ACE/apps/JAWS/stress_testing/http.h index 0ea53bf8c1db3..f80da219dc1ec 100644 --- a/ACE/apps/JAWS/stress_testing/http.h +++ b/ACE/apps/JAWS/stress_testing/http.h @@ -8,7 +8,7 @@ #define ENCODING_TAB "./encoding.tab" #define CONTENT_TAB "./content.tab" -int demime(void); +int demime(); int decode(char *encoding); int view(char *content); diff --git a/ACE/apps/JAWS/stress_testing/http_tester.cpp b/ACE/apps/JAWS/stress_testing/http_tester.cpp index da5f08a741c69..dc41907a37ef9 100644 --- a/ACE/apps/JAWS/stress_testing/http_tester.cpp +++ b/ACE/apps/JAWS/stress_testing/http_tester.cpp @@ -62,7 +62,6 @@ client_thread(void *data) } int driver(char *id, int total_num, float requests_sec, char *url1, float p1, char *url2, float p2, char *url3, float p3, int tcp_nodelay, int sockbufsiz) { - // construct the client parameters packet Client_Parameters::tcp_nodelay = tcp_nodelay; diff --git a/ACE/apps/JAWS/stress_testing/stats.cpp b/ACE/apps/JAWS/stress_testing/stats.cpp index b2b29f5b8f46b..beb1c0014abd6 100644 --- a/ACE/apps/JAWS/stress_testing/stats.cpp +++ b/ACE/apps/JAWS/stress_testing/stats.cpp @@ -16,7 +16,6 @@ void Stats::log(int id, float throughput, float latency) { // Unused for now. void Stats::print(char *message) { - ACE_UNUSED_ARG (message); // char time_buf[64]; @@ -34,7 +33,6 @@ void Stats::print(char *message) { int comp(const void *a, const void *b) { - Init_Fini_t *A = (Init_Fini_t *)a; Init_Fini_t *B = (Init_Fini_t *)b; @@ -67,18 +65,14 @@ void Stats::output() { void Stats::i_have_started(int id) { - init_fini_[2*id].type = THREAD_START; init_fini_[2*id].timestamp = ACE_OS::gettimeofday(); - } void Stats::i_am_done(int id) { - init_fini_[(2*id)+1].type = THREAD_END; init_fini_[(2*id)+1].timestamp = ACE_OS::gettimeofday(); - } diff --git a/ACE/apps/JAWS/stress_testing/util.cpp b/ACE/apps/JAWS/stress_testing/util.cpp index 0de9231957bd8..f94aab5c8a93b 100644 --- a/ACE/apps/JAWS/stress_testing/util.cpp +++ b/ACE/apps/JAWS/stress_testing/util.cpp @@ -1,7 +1,6 @@ #include "util.h" URL::URL(char *input_buf) { - char *buffer = new char[BUFSIZ]; ACE_OS::strcpy(buffer,input_buf); @@ -30,23 +29,22 @@ URL::URL(char *input_buf) { } } -char *URL::get_protocol(void) { +char *URL::get_protocol() { return protocol_; } -char *URL::get_hostname(void) { +char *URL::get_hostname() { return hostname_; } -char *URL::get_filename(void) { +char *URL::get_filename() { return filename_; } - -void cleanup(void) { +void cleanup() { ACE_OS::unlink(TEMPORARY_FILE_NAME); ACE_OS::unlink(INCOMING_FILE_NAME); } diff --git a/ACE/apps/JAWS/stress_testing/util.h b/ACE/apps/JAWS/stress_testing/util.h index ea5b29da10464..f8de0a4ac1672 100644 --- a/ACE/apps/JAWS/stress_testing/util.h +++ b/ACE/apps/JAWS/stress_testing/util.h @@ -3,9 +3,7 @@ #ifndef _D_URL #define _D_URL class URL { - public: - URL(char *buffer); char *get_protocol(); @@ -18,7 +16,7 @@ class URL { char *filename_; }; -void cleanup(void); +void cleanup(); void sigint(int); int copier(connection in); @@ -29,4 +27,3 @@ int copier(connection in); - diff --git a/ACE/apps/JAWS2/HTTPU/http_base.cpp b/ACE/apps/JAWS2/HTTPU/http_base.cpp index 847ab4bf3579a..7af172025ad06 100644 --- a/ACE/apps/JAWS2/HTTPU/http_base.cpp +++ b/ACE/apps/JAWS2/HTTPU/http_base.cpp @@ -161,13 +161,13 @@ HTTP_Base::receive_payload (ACE_Message_Block &mb, long length) } const char * -HTTP_Base::payload (void) +HTTP_Base::payload () { return this->payload_.rd_ptr (); } unsigned long -HTTP_Base::payload_size (void) +HTTP_Base::payload_size () { return this->payload_.length (); } @@ -307,7 +307,7 @@ HTTP_Base::extract_line (ACE_Message_Block &mb) } void -HTTP_Base::dump (void) +HTTP_Base::dump () { ACE_DEBUG ((LM_DEBUG, "%s\n", this->line ())); this->info_.dump (); diff --git a/ACE/apps/JAWS2/HTTPU/http_base.h b/ACE/apps/JAWS2/HTTPU/http_base.h index e028885a38269..2959185dad9e3 100644 --- a/ACE/apps/JAWS2/HTTPU/http_base.h +++ b/ACE/apps/JAWS2/HTTPU/http_base.h @@ -15,9 +15,8 @@ class HTTPU_Export HTTP_Base : public HTTP_SCode_Base { public: - - HTTP_Base (void); - virtual ~HTTP_Base (void); + HTTP_Base (); + virtual ~HTTP_Base (); virtual int receive (ACE_Message_Block &mb); virtual int deliver (ACE_Message_Block &mb); @@ -25,27 +24,26 @@ class HTTPU_Export HTTP_Base : public HTTP_SCode_Base virtual int receive_payload (ACE_Message_Block &mb); virtual int receive_payload (ACE_Message_Block &mb, long length); - const char * payload (void); - unsigned long payload_size (void); + const char * payload (); + unsigned long payload_size (); int status () const; const char *line () const; - HTTP_Headers *http_headers (void); - JAWS_Headers *headers (void); + HTTP_Headers *http_headers (); + JAWS_Headers *headers (); int build_headers (JAWS_Headers *new_headers); // takes a set of new headers that will replace existing headers or // be added to the header list if there is no corresponding one to replace. - void dump (void); + void dump (); protected: - - virtual void parse_line (void) = 0; + virtual void parse_line () = 0; // Hook into the receive function to do specialized parsing of initial line. // Sets the status_ variable. - virtual int espouse_line (void) = 0; + virtual int espouse_line () = 0; // Hook into the deliver function to do specialized initial line creation. // Returns 0 for success and -1 for failure. @@ -61,7 +59,6 @@ class HTTPU_Export HTTP_Base : public HTTP_SCode_Base // Return 1 if line successfully parsed. protected: - int status_; char *line_; int deliver_state_; @@ -70,7 +67,6 @@ class HTTPU_Export HTTP_Base : public HTTP_SCode_Base JAWS_Header_Table_Iterator iter_; ACE_Message_Block *mb_; ACE_Message_Block payload_; - }; diff --git a/ACE/apps/JAWS2/HTTPU/http_base.inl b/ACE/apps/JAWS2/HTTPU/http_base.inl index 805705bc89f4e..5dca42915d2dd 100644 --- a/ACE/apps/JAWS2/HTTPU/http_base.inl +++ b/ACE/apps/JAWS2/HTTPU/http_base.inl @@ -5,7 +5,7 @@ #endif /* ACE_HAS_INLINED_OSCALLS */ ACE_INLINE -HTTP_Base::HTTP_Base (void) +HTTP_Base::HTTP_Base () : status_ (200), line_ (0), deliver_state_ (0), @@ -16,7 +16,7 @@ HTTP_Base::HTTP_Base (void) } ACE_INLINE -HTTP_Base::~HTTP_Base (void) +HTTP_Base::~HTTP_Base () { if (this->line_) ACE_OS::free (this->line_); @@ -39,13 +39,13 @@ HTTP_Base::line () const } ACE_INLINE HTTP_Headers * -HTTP_Base::http_headers (void) +HTTP_Base::http_headers () { return &(this->info_); } ACE_INLINE JAWS_Headers * -HTTP_Base::headers (void) +HTTP_Base::headers () { return this->info_.table (); } diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.cpp b/ACE/apps/JAWS2/HTTPU/http_headers.cpp index 6540b3208dcd3..9ab14ed4d17f2 100644 --- a/ACE/apps/JAWS2/HTTPU/http_headers.cpp +++ b/ACE/apps/JAWS2/HTTPU/http_headers.cpp @@ -83,7 +83,7 @@ HTTP_Hdr_Node HTTP_HCodes::APPLET (""); const int &HTTP_HCodes::NUM_HEADER_STRINGS = HTTP_Header_Nodes_Singleton::instance ()->num_header_strings_; -HTTP_Header_Nodes::HTTP_Header_Nodes (void) +HTTP_Header_Nodes::HTTP_Header_Nodes () : num_header_strings_ (0) { } @@ -100,12 +100,12 @@ HTTP_Hdr_Node::HTTP_Hdr_Node (const char *token, const char *format) header_nodes->num_header_strings_++; } -HTTP_HCodes::HTTP_HCodes (void) +HTTP_HCodes::HTTP_HCodes () : header_nodes_ (HTTP_Header_Nodes_Singleton::instance ()) { } -HTTP_Headers::HTTP_Headers (void) +HTTP_Headers::HTTP_Headers () { } @@ -141,7 +141,7 @@ HTTP_Headers::value_next (int index) } void -HTTP_Headers::value_reset (void) +HTTP_Headers::value_reset () { this->table ()->iter ().first (); } diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h index 3a48b23848d13..999a9c606a660 100644 --- a/ACE/apps/JAWS2/HTTPU/http_headers.h +++ b/ACE/apps/JAWS2/HTTPU/http_headers.h @@ -51,7 +51,7 @@ class HTTPU_Export HTTP_Header_Nodes : public ACE_RB_Tree class HTTPU_Export HTTP_HCodes { public: - HTTP_HCodes (void); + HTTP_HCodes (); enum { REPLACE_HEADER = 1, // Remove any existing header that matches first @@ -133,11 +133,9 @@ class HTTPU_Export HTTP_HCodes static const int &NUM_HEADER_STRINGS; protected: - const HTTP_Hdr_Node &hcode (int type) const; protected: - HTTP_Header_Nodes *header_nodes_; }; @@ -150,7 +148,7 @@ class HTTPU_Export HTTP_Headers : public JAWS_Header_Info, public HTTP_HCodes void value_reset (); public: - HTTP_Headers (void); + HTTP_Headers (); const char *header_token (int name) const; const char *header_strings (int name) const; diff --git a/ACE/apps/JAWS2/HTTPU/http_request.cpp b/ACE/apps/JAWS2/HTTPU/http_request.cpp index a91632d2fcf25..f24689aa8766d 100644 --- a/ACE/apps/JAWS2/HTTPU/http_request.cpp +++ b/ACE/apps/JAWS2/HTTPU/http_request.cpp @@ -2,7 +2,7 @@ #include "HTTPU/parse_http_request.h" void -HTTP_Request::parse_line (void) +HTTP_Request::parse_line () { this->status_ = STATUS_OK; @@ -24,7 +24,7 @@ HTTP_Request::parse_line (void) } int -HTTP_Request::espouse_line (void) +HTTP_Request::espouse_line () { int count; @@ -71,7 +71,7 @@ HTTP_Request::espouse_line (void) } void -HTTP_Request::dump (void) +HTTP_Request::dump () { ACE_DEBUG ((LM_DEBUG, "===== BEGIN entera_HTTP_Request::dump =====\n")); HTTP_Base::dump (); diff --git a/ACE/apps/JAWS2/HTTPU/http_request.h b/ACE/apps/JAWS2/HTTPU/http_request.h index 64a9e6ee49319..ba9a705834d07 100644 --- a/ACE/apps/JAWS2/HTTPU/http_request.h +++ b/ACE/apps/JAWS2/HTTPU/http_request.h @@ -20,24 +20,23 @@ class HTTPU_Export HTTP_Request : public HTTP_Base { public: - HTTP_Request (void); - virtual ~HTTP_Request (void); + HTTP_Request (); + virtual ~HTTP_Request (); - Parse_HTTP_Request *request_line (void); + Parse_HTTP_Request *request_line (); // Returns the parsed request line. const Parse_HTTP_Request *request_line () const; // Returns the parsed request line. - HTTP_Parse_URL *url (void); + HTTP_Parse_URL *url (); // Returns the parsed url. - void dump (void); + void dump (); protected: - - virtual void parse_line (void); - virtual int espouse_line (void); + virtual void parse_line (); + virtual int espouse_line (); virtual void set_status (int); private: diff --git a/ACE/apps/JAWS2/HTTPU/http_request.inl b/ACE/apps/JAWS2/HTTPU/http_request.inl index 706d98b6f7bf5..5e4f3f43479b1 100644 --- a/ACE/apps/JAWS2/HTTPU/http_request.inl +++ b/ACE/apps/JAWS2/HTTPU/http_request.inl @@ -5,17 +5,17 @@ #endif /* ACE_HAS_INLINED_OSCALLS */ ACE_INLINE -HTTP_Request::HTTP_Request (void) +HTTP_Request::HTTP_Request () { } ACE_INLINE -HTTP_Request::~HTTP_Request (void) +HTTP_Request::~HTTP_Request () { } ACE_INLINE Parse_HTTP_Request * -HTTP_Request::request_line (void) +HTTP_Request::request_line () { return &(this->request_); } @@ -27,7 +27,7 @@ HTTP_Request::request_line () const } ACE_INLINE HTTP_Parse_URL * -HTTP_Request::url (void) +HTTP_Request::url () { return &(this->url_); } diff --git a/ACE/apps/JAWS2/HTTPU/http_response.cpp b/ACE/apps/JAWS2/HTTPU/http_response.cpp index 5599ff2861357..3cf450c0b9b73 100644 --- a/ACE/apps/JAWS2/HTTPU/http_response.cpp +++ b/ACE/apps/JAWS2/HTTPU/http_response.cpp @@ -1,7 +1,7 @@ #include "HTTPU/http_response.h" void -HTTP_Response::parse_line (void) +HTTP_Response::parse_line () { this->response_.init (this->line ()); if (this->response_.error () != Parse_HTTP_Response::HTTPU_OK) @@ -9,7 +9,7 @@ HTTP_Response::parse_line (void) } int -HTTP_Response::espouse_line (void) +HTTP_Response::espouse_line () { int count; int status; @@ -35,7 +35,7 @@ HTTP_Response::espouse_line (void) } void -HTTP_Response::dump (void) +HTTP_Response::dump () { ACE_DEBUG ((LM_DEBUG, "===== BEGIN entera_HTTP_Response::dump =====\n")); HTTP_Base::dump (); diff --git a/ACE/apps/JAWS2/HTTPU/http_response.h b/ACE/apps/JAWS2/HTTPU/http_response.h index abb28aa66c4d3..c88ed68460358 100644 --- a/ACE/apps/JAWS2/HTTPU/http_response.h +++ b/ACE/apps/JAWS2/HTTPU/http_response.h @@ -20,18 +20,17 @@ class HTTPU_Export HTTP_Response : public HTTP_Base { public: - HTTP_Response (void); - ~HTTP_Response (void); + HTTP_Response (); + ~HTTP_Response (); - Parse_HTTP_Response *response_line (void); + Parse_HTTP_Response *response_line (); // Returns the parsed response line. - void dump (void); + void dump (); protected: - - virtual void parse_line (void); - virtual int espouse_line (void); + virtual void parse_line (); + virtual int espouse_line (); private: Parse_HTTP_Response response_; diff --git a/ACE/apps/JAWS2/HTTPU/http_response.inl b/ACE/apps/JAWS2/HTTPU/http_response.inl index cd493002646c2..65fff68267a54 100644 --- a/ACE/apps/JAWS2/HTTPU/http_response.inl +++ b/ACE/apps/JAWS2/HTTPU/http_response.inl @@ -5,17 +5,17 @@ #endif /* ACE_HAS_INLINED_OSCALLS */ ACE_INLINE -HTTP_Response::HTTP_Response (void) +HTTP_Response::HTTP_Response () { } ACE_INLINE -HTTP_Response::~HTTP_Response (void) +HTTP_Response::~HTTP_Response () { } ACE_INLINE Parse_HTTP_Response * -HTTP_Response::response_line (void) +HTTP_Response::response_line () { return &(this->response_); } diff --git a/ACE/apps/JAWS2/HTTPU/http_status.cpp b/ACE/apps/JAWS2/HTTPU/http_status.cpp index b9103f24eb618..35fb95d6d49e8 100644 --- a/ACE/apps/JAWS2/HTTPU/http_status.cpp +++ b/ACE/apps/JAWS2/HTTPU/http_status.cpp @@ -53,19 +53,19 @@ HTTP_SCode::operator[] (int i) const } HTTP_SCode * -HTTP_SCode::instance (void) +HTTP_SCode::instance () { return HTTP_SCode_Singleton::instance (); } void -HTTP_SCode::dump (void) +HTTP_SCode::dump () { for (int i = 0; i < SC_TABLE_SIZE; i++) ACE_DEBUG ((LM_DEBUG, "%s\n", this->table_[i])); } -HTTP_SCode::HTTP_SCode (void) +HTTP_SCode::HTTP_SCode () { int i; for (i = 0; i < SC_TABLE_SIZE; i++) @@ -75,7 +75,7 @@ HTTP_SCode::HTTP_SCode (void) } } -HTTP_SCode::~HTTP_SCode (void) +HTTP_SCode::~HTTP_SCode () { } diff --git a/ACE/apps/JAWS2/HTTPU/http_status.h b/ACE/apps/JAWS2/HTTPU/http_status.h index 312ff36d2d099..bba7be512a402 100644 --- a/ACE/apps/JAWS2/HTTPU/http_status.h +++ b/ACE/apps/JAWS2/HTTPU/http_status.h @@ -70,16 +70,14 @@ class HTTPU_Export HTTP_SCode : public HTTP_SCode_Base friend class ACE_Singleton; protected: - - HTTP_SCode (void); - ~HTTP_SCode (void); + HTTP_SCode (); + ~HTTP_SCode (); public: - const char * operator[] (int) const; // Return the reason string corresponding to a status code number. - static HTTP_SCode *instance (void); + static HTTP_SCode *instance (); // Return reference to the singleton. enum @@ -87,7 +85,7 @@ class HTTPU_Export HTTP_SCode : public HTTP_SCode_Base SC_TABLE_SIZE = MAX_STATUS_CODE - MIN_STATUS_CODE + 1 }; - void dump (void); + void dump (); private: static const char *table_[SC_TABLE_SIZE]; diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp b/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp index e5407b4c566a3..cd1eb9ec8f4db 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp +++ b/ACE/apps/JAWS2/HTTPU/parse_http_request.cpp @@ -13,7 +13,7 @@ Parse_HTTP_Request::Parse_HTTP_Request (const char *request) this->init (request); } -Parse_HTTP_Request::~Parse_HTTP_Request (void) +Parse_HTTP_Request::~Parse_HTTP_Request () { if (this->request_) ACE_OS::free (this->request_); @@ -23,7 +23,7 @@ Parse_HTTP_Request::~Parse_HTTP_Request (void) } void -Parse_HTTP_Request::dump (void) +Parse_HTTP_Request::dump () { ACE_DEBUG ((LM_DEBUG, "%s %s %s\n", this->method_str (), this->url (), this->version ())); diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_request.h b/ACE/apps/JAWS2/HTTPU/parse_http_request.h index 5943cbc6fdbd1..a56b0f64e94fc 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_http_request.h +++ b/ACE/apps/JAWS2/HTTPU/parse_http_request.h @@ -13,7 +13,7 @@ class HTTPU_Export Parse_HTTP_Request : public HTTP_HCodes { public: Parse_HTTP_Request (const char *request = 0); - ~Parse_HTTP_Request (void); + ~Parse_HTTP_Request (); void init (const char *request); @@ -32,10 +32,9 @@ class HTTPU_Export Parse_HTTP_Request : public HTTP_HCodes int error () const; // 0 -> ok - void dump (void); + void dump (); private: - HTTP_Hdr_Node *method_; int major_version_; int minor_version_; @@ -43,7 +42,6 @@ class HTTPU_Export Parse_HTTP_Request : public HTTP_HCodes char *url_; char *request_; int error_; - }; #if defined (ACE_HAS_INLINED_OSCALLS) diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp b/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp index c0959a9daaeac..9950503f65934 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp +++ b/ACE/apps/JAWS2/HTTPU/parse_http_response.cpp @@ -15,7 +15,7 @@ Parse_HTTP_Response::Parse_HTTP_Response (const char *response) this->init (response); } -Parse_HTTP_Response::~Parse_HTTP_Response (void) +Parse_HTTP_Response::~Parse_HTTP_Response () { if (this->response_) ACE_OS::free (this->response_); diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_response.h b/ACE/apps/JAWS2/HTTPU/parse_http_response.h index eefd0473e4779..5a85453dc52b1 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_http_response.h +++ b/ACE/apps/JAWS2/HTTPU/parse_http_response.h @@ -13,7 +13,7 @@ class HTTPU_Export Parse_HTTP_Response { public: Parse_HTTP_Response (const char *response = 0); - ~Parse_HTTP_Response (void); + ~Parse_HTTP_Response (); void init (const char *response); @@ -31,7 +31,6 @@ class HTTPU_Export Parse_HTTP_Response // 0 -> ok private: - int code_; char *code_str_; int major_version_; @@ -39,7 +38,6 @@ class HTTPU_Export Parse_HTTP_Response char *version_; char *response_; int error_; - }; #if defined (ACE_HAS_INLINED_OSCALLS) diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.cpp b/ACE/apps/JAWS2/HTTPU/parse_url.cpp index fa712e6a583c4..602ded44f821d 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_url.cpp +++ b/ACE/apps/JAWS2/HTTPU/parse_url.cpp @@ -17,7 +17,7 @@ HTTP_Parse_URL::HTTP_Parse_URL (const char *url) this->init (url); } -HTTP_Parse_URL::~HTTP_Parse_URL (void) +HTTP_Parse_URL::~HTTP_Parse_URL () { if (this->url_) ACE_OS::free (this->url_); @@ -63,7 +63,7 @@ HTTP_Parse_URL::init( const char *url ) void -HTTP_Parse_URL::parse_url (void) +HTTP_Parse_URL::parse_url () { char *p = this->url_; @@ -242,7 +242,7 @@ HTTP_Parse_URL::parse_host (char *&p) } void -HTTP_Parse_URL::set_port_from_scheme (void) +HTTP_Parse_URL::set_port_from_scheme () { if (ACE_OS::strcmp (this->scheme_, "ftp") == 0) { diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.h b/ACE/apps/JAWS2/HTTPU/parse_url.h index 05eed0ae8b57d..f058441738956 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_url.h +++ b/ACE/apps/JAWS2/HTTPU/parse_url.h @@ -16,7 +16,7 @@ class HTTPU_Export HTTP_Parse_URL public: HTTP_Parse_URL (const char *url = 0); - ~HTTP_Parse_URL (void); + ~HTTP_Parse_URL (); void init (const char *url); @@ -36,13 +36,13 @@ class HTTPU_Export HTTP_Parse_URL int is_cgi () const; private: - void parse_url (void); + void parse_url (); void parse_scheme (char *&p); void parse_host (char *&p); void parse_url_path (char *&p); void is_cgi (const char *path); - void set_port_from_scheme (void); + void set_port_from_scheme (); private: char *url_; diff --git a/ACE/apps/JAWS2/HTTP_10.cpp b/ACE/apps/JAWS2/HTTP_10.cpp index e3d7e08a06b56..632fbfc7d08b5 100644 --- a/ACE/apps/JAWS2/HTTP_10.cpp +++ b/ACE/apps/JAWS2/HTTP_10.cpp @@ -3,7 +3,6 @@ #include "JAWS/JAWS.h" - char * JAWS_HTTP_10_Helper::HTTP_decode_string (char *path) { diff --git a/ACE/apps/JAWS2/HTTP_10.h b/ACE/apps/JAWS2/HTTP_10.h index ecd6996d6f2c2..bd2b61ea65e9e 100644 --- a/ACE/apps/JAWS2/HTTP_10.h +++ b/ACE/apps/JAWS2/HTTP_10.h @@ -18,8 +18,8 @@ class JAWS_HTTP_10_Request; class JAWS_HTTP_10_Read_Task : public JAWS_Pipeline_Handler { public: - JAWS_HTTP_10_Read_Task (void); - virtual ~JAWS_HTTP_10_Read_Task (void); + JAWS_HTTP_10_Read_Task (); + virtual ~JAWS_HTTP_10_Read_Task (); virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv); @@ -31,11 +31,10 @@ class JAWS_HTTP_10_Read_Task : public JAWS_Pipeline_Handler class JAWS_HTTP_10_Parse_Task : public JAWS_Pipeline_Handler { public: - JAWS_HTTP_10_Parse_Task (void); - virtual ~JAWS_HTTP_10_Parse_Task (void); + JAWS_HTTP_10_Parse_Task (); + virtual ~JAWS_HTTP_10_Parse_Task (); virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv); - }; // Write the response @@ -43,8 +42,8 @@ class JAWS_HTTP_10_Parse_Task : public JAWS_Pipeline_Handler class JAWS_HTTP_10_Write_Task : public JAWS_Pipeline_Handler { public: - JAWS_HTTP_10_Write_Task (void); - virtual ~JAWS_HTTP_10_Write_Task (void); + JAWS_HTTP_10_Write_Task (); + virtual ~JAWS_HTTP_10_Write_Task (); virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv); @@ -57,10 +56,8 @@ class JAWS_HTTP_10_Helper // Static functions to enhance the lives of HTTP programmers everywhere. { public: - static char *HTTP_decode_string (char *path); // Decode '%' escape codes in a URI - }; #endif /* !defined (JAWS_HTTP_10_H) */ diff --git a/ACE/apps/JAWS2/HTTP_10_Parse.cpp b/ACE/apps/JAWS2/HTTP_10_Parse.cpp index 5e137cf6d4b97..fe04efc0c512d 100644 --- a/ACE/apps/JAWS2/HTTP_10_Parse.cpp +++ b/ACE/apps/JAWS2/HTTP_10_Parse.cpp @@ -8,14 +8,13 @@ #include "HTTP_10_Request.h" - // --------------- PARSE TASK ---------------------- -JAWS_HTTP_10_Parse_Task::JAWS_HTTP_10_Parse_Task (void) +JAWS_HTTP_10_Parse_Task::JAWS_HTTP_10_Parse_Task () { } -JAWS_HTTP_10_Parse_Task::~JAWS_HTTP_10_Parse_Task (void) +JAWS_HTTP_10_Parse_Task::~JAWS_HTTP_10_Parse_Task () { } diff --git a/ACE/apps/JAWS2/HTTP_10_Read.cpp b/ACE/apps/JAWS2/HTTP_10_Read.cpp index b5fd077a2478e..26a8dce820df9 100644 --- a/ACE/apps/JAWS2/HTTP_10_Read.cpp +++ b/ACE/apps/JAWS2/HTTP_10_Read.cpp @@ -6,14 +6,13 @@ #include "JAWS/Policy.h" - // --------------- READ TASK ---------------------- -JAWS_HTTP_10_Read_Task::JAWS_HTTP_10_Read_Task (void) +JAWS_HTTP_10_Read_Task::JAWS_HTTP_10_Read_Task () { } -JAWS_HTTP_10_Read_Task::~JAWS_HTTP_10_Read_Task (void) +JAWS_HTTP_10_Read_Task::~JAWS_HTTP_10_Read_Task () { } diff --git a/ACE/apps/JAWS2/HTTP_10_Request.cpp b/ACE/apps/JAWS2/HTTP_10_Request.cpp index d72e08c58a8bd..66a40a8b0f0d7 100644 --- a/ACE/apps/JAWS2/HTTP_10_Request.cpp +++ b/ACE/apps/JAWS2/HTTP_10_Request.cpp @@ -3,15 +3,14 @@ #include "ace/OS_NS_pwd.h" - static int dummy; -JAWS_HTTP_10_Request::JAWS_HTTP_10_Request (void) +JAWS_HTTP_10_Request::JAWS_HTTP_10_Request () : path_ (0) { } -JAWS_HTTP_10_Request::~JAWS_HTTP_10_Request (void) +JAWS_HTTP_10_Request::~JAWS_HTTP_10_Request () { ACE_OS::free (this->path_); this->path_ = 0; diff --git a/ACE/apps/JAWS2/HTTP_10_Request.h b/ACE/apps/JAWS2/HTTP_10_Request.h index db54acefafc16..f5757aa8cc5a3 100644 --- a/ACE/apps/JAWS2/HTTP_10_Request.h +++ b/ACE/apps/JAWS2/HTTP_10_Request.h @@ -8,9 +8,8 @@ class JAWS_HTTP_10_Request : public HTTP_Request, public HTTP_HCodes { public: - - JAWS_HTTP_10_Request (void); - ~JAWS_HTTP_10_Request (void); + JAWS_HTTP_10_Request (); + ~JAWS_HTTP_10_Request (); int type () const; const char * method () const; @@ -22,7 +21,6 @@ class JAWS_HTTP_10_Request : public HTTP_Request, public HTTP_HCodes void set_status (int); private: - char *path_; }; diff --git a/ACE/apps/JAWS2/HTTP_10_Write.cpp b/ACE/apps/JAWS2/HTTP_10_Write.cpp index 97ded62a99c71..a0ff4f9631c7c 100644 --- a/ACE/apps/JAWS2/HTTP_10_Write.cpp +++ b/ACE/apps/JAWS2/HTTP_10_Write.cpp @@ -8,14 +8,13 @@ #include "HTTP_10_Request.h" - // --------------- WRITE TASK ---------------------- -JAWS_HTTP_10_Write_Task::JAWS_HTTP_10_Write_Task (void) +JAWS_HTTP_10_Write_Task::JAWS_HTTP_10_Write_Task () { } -JAWS_HTTP_10_Write_Task::~JAWS_HTTP_10_Write_Task (void) +JAWS_HTTP_10_Write_Task::~JAWS_HTTP_10_Write_Task () { } diff --git a/ACE/apps/JAWS2/HTTP_Policy.cpp b/ACE/apps/JAWS2/HTTP_Policy.cpp index 8c8fd56f9cba3..921c738ac85e2 100644 --- a/ACE/apps/JAWS2/HTTP_Policy.cpp +++ b/ACE/apps/JAWS2/HTTP_Policy.cpp @@ -1,7 +1,6 @@ #include "HTTP_Policy.h" - HTTP_Policy::HTTP_Policy (JAWS_Concurrency_Base *concurrency) : concurrency_ (concurrency) { diff --git a/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp b/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp index 193c3ab50595c..9db941b949688 100644 --- a/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp +++ b/ACE/apps/JAWS2/JAWS/Assoc_Array.cpp @@ -35,7 +35,7 @@ JAWS_Assoc_Array::JAWS_Assoc_Array (int maxsize) } template -JAWS_Assoc_Array::~JAWS_Assoc_Array (void) +JAWS_Assoc_Array::~JAWS_Assoc_Array () { this->clear (); @@ -120,7 +120,7 @@ JAWS_Assoc_Array::remove (const KEY &k) } template void -JAWS_Assoc_Array::clear (void) +JAWS_Assoc_Array::clear () { for (int i = 0; i < this->maxsize_; i++) { @@ -164,24 +164,24 @@ JAWS_Assoc_Array_Iterator (const JAWS_Assoc_Array &aa) } template -JAWS_Assoc_Array_Iterator::~JAWS_Assoc_Array_Iterator (void) +JAWS_Assoc_Array_Iterator::~JAWS_Assoc_Array_Iterator () { } template KEY * -JAWS_Assoc_Array_Iterator::key (void) +JAWS_Assoc_Array_Iterator::key () { return this->aa_.k_array_[this->i_]; } template DATA * -JAWS_Assoc_Array_Iterator::data (void) +JAWS_Assoc_Array_Iterator::data () { return this->aa_.d_array_[this->i_]; } template int -JAWS_Assoc_Array_Iterator::first (void) +JAWS_Assoc_Array_Iterator::first () { this->i_ = 0; for (this->j_ = 0; this->j_ < this->aa_.maxsize_; this->j_++) @@ -193,7 +193,7 @@ JAWS_Assoc_Array_Iterator::first (void) } template int -JAWS_Assoc_Array_Iterator::last (void) +JAWS_Assoc_Array_Iterator::last () { this->j_ = this->aa_.maxsize_; for (this->i_ = this->aa_.maxsize_; this->i_ > 0; this->i_--) @@ -206,7 +206,7 @@ JAWS_Assoc_Array_Iterator::last (void) } template int -JAWS_Assoc_Array_Iterator::next (void) +JAWS_Assoc_Array_Iterator::next () { if (this->j_ < this->aa_.maxsize_) { @@ -222,7 +222,7 @@ JAWS_Assoc_Array_Iterator::next (void) } template int -JAWS_Assoc_Array_Iterator::previous (void) +JAWS_Assoc_Array_Iterator::previous () { if (this->i_ > 0) { @@ -242,7 +242,7 @@ JAWS_Assoc_Array_Iterator::previous (void) } template int -JAWS_Assoc_Array_Iterator::is_done (void) +JAWS_Assoc_Array_Iterator::is_done () { return (this->j_ == this->aa_.maxsize_); } diff --git a/ACE/apps/JAWS2/JAWS/Assoc_Array.h b/ACE/apps/JAWS2/JAWS/Assoc_Array.h index 811f75ae4d559..1890efb101835 100644 --- a/ACE/apps/JAWS2/JAWS/Assoc_Array.h +++ b/ACE/apps/JAWS2/JAWS/Assoc_Array.h @@ -7,12 +7,11 @@ template class JAWS_Assoc_Array_Iterator; template class JAWS_Assoc_Array { - friend class JAWS_Assoc_Array_Iterator; public: JAWS_Assoc_Array (int maxsize = 1024); - ~JAWS_Assoc_Array (void); + ~JAWS_Assoc_Array (); int index (const KEY &k); // Returns the index into the array associated with key k @@ -40,11 +39,10 @@ friend class JAWS_Assoc_Array_Iterator; // and successfully destroyed it, 0 if it did not find the // item, or -1 if an error occurred. - void clear (void); + void clear (); // Destroys all keys and associated data. protected: - int find_i (const KEY &k); // If k points to an associated data item, then this function // returns the index into the arrays that hold it. Otherwise, it @@ -61,28 +59,25 @@ template class JAWS_Assoc_Array_Iterator { public: - JAWS_Assoc_Array_Iterator (const JAWS_Assoc_Array &aa); - ~JAWS_Assoc_Array_Iterator (void); + ~JAWS_Assoc_Array_Iterator (); - KEY * key (void); - DATA * data (void); + KEY * key (); + DATA * data (); - int first (void); - int last (void); - int next (void); - int previous (void); - int is_done (void); + int first (); + int last (); + int next (); + int previous (); + int is_done (); private: - // declare private and do not define: explicitly // prevent assignment and copy construction of iterators JAWS_Assoc_Array_Iterator (const JAWS_Assoc_Array_Iterator &); void operator= (const JAWS_Assoc_Array_Iterator &); private: - const JAWS_Assoc_Array &aa_; int i_; @@ -90,11 +85,8 @@ class JAWS_Assoc_Array_Iterator int j_; // The next item to be pointed to by iterator. - }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Assoc_Array.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* !defined (JAWS_ASSOC_ARRAY_H) */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp index a5349ab5bf158..662f15cbd3f3c 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp @@ -75,7 +75,7 @@ JAWS_Cache_Hash::JAWS_Cache_Hash (ACE_Allocator *alloc } template -JAWS_Cache_Hash::~JAWS_Cache_Hash (void) +JAWS_Cache_Hash::~JAWS_Cache_Hash () { if (this->hashtable_) { @@ -83,7 +83,6 @@ JAWS_Cache_Hash::~JAWS_Cache_Hash (void) { if (this->hashtable_[i]) { - ACE_DES_FREE_TEMPLATE3(this->hashtable_[i], this->allocator_->free, JAWS_Hash_Bucket_Manager, @@ -94,7 +93,6 @@ JAWS_Cache_Hash::~JAWS_Cache_Hash (void) - this->hashtable_[i] = 0; } } @@ -231,5 +229,4 @@ JAWS_Cache_Hash::size () const - #endif /* JAWS_CACHEHASH_T_CPP */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h index 501f20e1700e0..c8272072fdce1 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h @@ -12,7 +12,6 @@ template class JAWS_Cache_Hash { public: - typedef JAWS_Hash_Bucket_Manager CACHE_BUCKET_MANAGER; @@ -21,7 +20,7 @@ class JAWS_Cache_Hash // number important? I am trying to maximize scattering when using // mod on the hashed value. This might be bogus though. - virtual ~JAWS_Cache_Hash (void); + virtual ~JAWS_Cache_Hash (); int find (const EXT_ID &ext_id) const; int find (const EXT_ID &ext_id, JAWS_Cache_Object *&int_id) const; @@ -36,23 +35,18 @@ class JAWS_Cache_Hash size_t size () const; protected: - virtual unsigned long hash (const EXT_ID &ext_id) const; bool isprime (size_t number) const; int new_cachebucket (size_t idx); private: - ACE_Allocator *allocator_; size_t size_; ACE_SYNCH_MUTEX lock_; CACHE_BUCKET_MANAGER **hashtable_; - }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_Hash_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_CACHE_HASH_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp index 1aa8ce79a4207..ad44fcc0d335e 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp @@ -31,7 +31,7 @@ JAWS_Cache_Heap::JAWS_Cache_Heap (ACE_Allocator *alloc, } template -JAWS_Cache_Heap::~JAWS_Cache_Heap (void) +JAWS_Cache_Heap::~JAWS_Cache_Heap () { if (this->heap_ != 0) { @@ -149,7 +149,7 @@ JAWS_Cache_Heap::insert (const EXT_ID &ext_id, } template void -JAWS_Cache_Heap::remove_i (void) +JAWS_Cache_Heap::remove_i () { /* ASSERT: this->size_ > 0 */ this->size_--; @@ -279,7 +279,7 @@ JAWS_Cache_Heap_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id) } template unsigned int -JAWS_Cache_Heap_Item::priority (void) +JAWS_Cache_Heap_Item::priority () { return this->int_id_->priority (); } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h index 7e80bbeb84e8c..d89f5195055e8 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h @@ -19,7 +19,6 @@ class JAWS_Cache_Heap // standalone data structure. { public: - typedef JAWS_Cache_Manager Cache_Manager; typedef JAWS_Cache_Heap_Item Cache_Heap_Item; @@ -27,7 +26,7 @@ class JAWS_Cache_Heap // maxsize is the total number of objects the in memory cache is // willing to manage - ~JAWS_Cache_Heap (void); + ~JAWS_Cache_Heap (); int is_empty () const; int is_full () const; @@ -52,50 +51,41 @@ class JAWS_Cache_Heap // treat item as a Cache_Heap_Item, and alter its heap position protected: - void insert_i (Cache_Heap_Item *item); // insert item into heap. void remove_i (size_t pos); // remove the element residing at pos, but do not delete it. - void remove_i (void); + void remove_i (); // remove the element residing at the top of heap, but do not delete it. private: - ACE_Allocator *allocator_; size_t maxsize_; size_t size_; Cache_Heap_Item **heap_; - }; template class JAWS_Cache_Heap_Item { - friend class JAWS_Cache_Heap; public: - JAWS_Cache_Heap_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id); - unsigned int priority (void); + unsigned int priority (); private: - EXT_ID ext_id_; JAWS_Cache_Object *int_id_; size_t heap_idx_; - }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_Heap_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CACHE_HEAP_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp index 492152f6936ca..cfa66fa8ed55a 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp @@ -18,7 +18,7 @@ JAWS_Cache_List::JAWS_Cache_List (ACE_Allocator *alloc, } template -JAWS_Cache_List::~JAWS_Cache_List (void) +JAWS_Cache_List::~JAWS_Cache_List () { while (this->head_ != 0) this->remove (this->head_); @@ -94,7 +94,7 @@ JAWS_Cache_List::insert (const EXT_ID &ext_id, } template void -JAWS_Cache_List::remove_i (void) +JAWS_Cache_List::remove_i () { /* ASSERT: this->size_ > 0 */ this->size_--; @@ -206,7 +206,7 @@ JAWS_Cache_List_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id) } template unsigned int -JAWS_Cache_List_Item::priority (void) +JAWS_Cache_List_Item::priority () { return this->int_id_->priority (); } diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.h b/ACE/apps/JAWS2/JAWS/Cache_List_T.h index d249db04cbfd3..4be52d0767b99 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_List_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.h @@ -22,7 +22,6 @@ class JAWS_Cache_List // trying to simplify all the heap operations to be O(1). { public: - typedef JAWS_Cache_Manager Cache_Manager; typedef JAWS_Cache_List_Item Cache_List_Item; @@ -30,7 +29,7 @@ class JAWS_Cache_List // maxsize is the total number of objects the in memory cache is // willing to manage - ~JAWS_Cache_List (void); + ~JAWS_Cache_List (); int is_empty () const; int is_full () const; @@ -55,18 +54,16 @@ class JAWS_Cache_List // treat item as a Cache_List_Item, and alter its heap position protected: - void insert_i (Cache_List_Item *item); // insert item into heap. void remove_i (Cache_List_Item *item); // remove the element residing at pos, but do not delete it. - void remove_i (void); + void remove_i (); // remove the element residing at the top of heap, but do not delete it. private: - ACE_Allocator *allocator_; size_t maxsize_; @@ -76,25 +73,21 @@ class JAWS_Cache_List Cache_List_Item *head_; Cache_List_Item *tail_; - }; template class JAWS_Cache_List_Item { - friend class JAWS_Cache_List; public: - typedef JAWS_Cache_List Cache_List; JAWS_Cache_List_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id); - unsigned int priority (void); + unsigned int priority (); private: - EXT_ID ext_id_; JAWS_Cache_Object *int_id_; @@ -102,8 +95,6 @@ class JAWS_Cache_List_Item JAWS_Cache_List_Item *prev_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CACHE_LIST_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp index 6c27bc4cc6cde..fd17e3dd77cc9 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp @@ -27,7 +27,7 @@ JAWS_String_Equal_Functor::operator int () const return this->i_ == 0; } -JAWS_Strdup_String::JAWS_Strdup_String (void) +JAWS_Strdup_String::JAWS_Strdup_String () : c_ (0), s_ (0) { @@ -48,7 +48,7 @@ JAWS_Strdup_String::JAWS_Strdup_String (const JAWS_Strdup_String &s) ++*(this->c_); } -JAWS_Strdup_String::~JAWS_Strdup_String (void) +JAWS_Strdup_String::~JAWS_Strdup_String () { if (this->c_ && --*(this->c_) == 0) { diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.h b/ACE/apps/JAWS2/JAWS/Cache_Manager.h index 5705521a6c949..a545e989acb55 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.h @@ -29,21 +29,18 @@ class JAWS_String_Equal_Functor class JAWS_Strdup_String { public: - - JAWS_Strdup_String (void); + JAWS_Strdup_String (); JAWS_Strdup_String (const char *s); JAWS_Strdup_String (const JAWS_Strdup_String &s); - ~JAWS_Strdup_String (void); + ~JAWS_Strdup_String (); operator const char * () const; void operator = (const char *s); void operator = (const JAWS_Strdup_String &s); private: - int *c_; char *s_; - }; typedef JAWS_Cache_Managerhash_ = 0; this->hashsize_ = 0; } @@ -150,7 +149,6 @@ ::open (ACE_Allocator *alloc, KEY, HASH_FUNC, EQ_FUNC); - this->hash_ = 0; this->hashsize_ = 0; @@ -162,38 +160,34 @@ ::open (ACE_Allocator *alloc, } template -JAWS_Cache_Manager::~JAWS_Cache_Manager (void) +JAWS_Cache_Manager::~JAWS_Cache_Manager () { this->close (); } template int -JAWS_Cache_Manager::close (void) +JAWS_Cache_Manager::close () { while (this->waterlevel_ > 0) this->FLUSH_i (); if (this->hash_) { - ACE_DES_FREE_TEMPLATE3(this->hash_, this->allocator_->free, JAWS_Cache_Hash, KEY, HASH_FUNC, EQ_FUNC); - this->hash_ = 0; } if (this->heap_) { - ACE_DES_FREE_TEMPLATE4(this->heap_, this->allocator_->free, JAWS_Cache_List, KEY, FACTORY, HASH_FUNC, EQ_FUNC); - this->heap_ = 0; } @@ -302,7 +296,7 @@ ::FLUSH_i (const KEY &key) template int JAWS_Cache_Manager -::FLUSH_i (void) +::FLUSH_i () { KEY temp_key; JAWS_Cache_Object *temp_object; @@ -475,7 +469,7 @@ ::DROP (JAWS_Cache_Object *&obj) template int JAWS_Cache_Manager -::FLUSH (void) +::FLUSH () { ACE_WRITE_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, g, this->lock_, -1); @@ -513,7 +507,7 @@ ::JAWS_Cache_Proxy (const KEY &key, DATA *data, size_t size, } template -JAWS_Cache_Proxy::~JAWS_Cache_Proxy (void) +JAWS_Cache_Proxy::~JAWS_Cache_Proxy () { DATA *data = this->data (); this->manager_->DROP (this->object_); diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h index 22dcbbd4d20fc..36f00c3c27342 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h @@ -16,13 +16,11 @@ class JAWS_Cache_List; template class JAWS_Cache_Manager { - friend class JAWS_Cache_Hash; friend class JAWS_Cache_Heap; friend class JAWS_Cache_List; public: - typedef ACE_Singleton Object_Factory; typedef JAWS_Cache_Hash Cache_Hash; typedef JAWS_Cache_List Cache_Heap; @@ -73,9 +71,9 @@ class JAWS_Cache_Manager // counts ); - ~JAWS_Cache_Manager (void); + ~JAWS_Cache_Manager (); - int close (void); + int close (); // Search Methods @@ -98,11 +96,10 @@ class JAWS_Cache_Manager // Decrement reference count on cached object, perhaps delete. // Returns 0 if only decremented, 1 if deleted, -1 if error. - int FLUSH (void); + int FLUSH (); // Removes lowest priority object from cache. protected: - int GET_i (const KEY &key, JAWS_Cache_Object *&object); // Retrieve the object associated with key from cache. Return 0 on // success, -1 on failure. @@ -112,7 +109,7 @@ class JAWS_Cache_Manager // Inserts or replaces object associated with key into cache. // Return 0 on success, -1 on failure. - int FLUSH_i (void); + int FLUSH_i (); // Removes lowest priority object from cache. int FLUSH_i (const KEY &key); @@ -122,7 +119,6 @@ class JAWS_Cache_Manager // Decrement reference count on cached object, perhaps delete. private: - ACE_Allocator *allocator_; JAWS_Cache_Object_Factory *factory_; @@ -140,7 +136,6 @@ class JAWS_Cache_Manager Cache_Heap *heap_; ACE_SYNCH_RW_MUTEX lock_; - }; @@ -158,7 +153,7 @@ class JAWS_Cache_Proxy JAWS_Cache_Proxy (const KEY &, DATA *, size_t, Cache_Manager * = 0); // Corresponds to a U/PUT - virtual ~JAWS_Cache_Proxy (void); + virtual ~JAWS_Cache_Proxy (); DATA *data () const; operator DATA * () const; @@ -170,8 +165,6 @@ class JAWS_Cache_Proxy Cache_Manager *manager_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CACHE_MANAGER_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp index b024434f12195..b850dbf723027 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp @@ -50,14 +50,14 @@ JAWS_Cache_Object::count () const } int -JAWS_Cache_Object::acquire (void) +JAWS_Cache_Object::acquire () { this->new_last_access_ = ACE_OS::time ((time_t *)0); return this->acquire_i (); } int -JAWS_Cache_Object::release (void) +JAWS_Cache_Object::release () { this->last_access_ = this->new_last_access_; return this->release_i (); @@ -101,12 +101,12 @@ JAWS_Referenced_Cache_Object (const void *data, size_t size) { } -JAWS_Referenced_Cache_Object::~JAWS_Referenced_Cache_Object (void) +JAWS_Referenced_Cache_Object::~JAWS_Referenced_Cache_Object () { } ACE_Lock & -JAWS_Referenced_Cache_Object::lock (void) +JAWS_Referenced_Cache_Object::lock () { return this->lock_adapter_; } @@ -121,13 +121,13 @@ JAWS_Referenced_Cache_Object::count_i () const } int -JAWS_Referenced_Cache_Object::acquire_i (void) +JAWS_Referenced_Cache_Object::acquire_i () { return this->count_.acquire_read (); } int -JAWS_Referenced_Cache_Object::release_i (void) +JAWS_Referenced_Cache_Object::release_i () { return this->count_.release (); } @@ -146,7 +146,6 @@ JAWS_Referenced_Cache_Object::priority_i () const } - JAWS_Counted_Cache_Object:: JAWS_Counted_Cache_Object (const void *data, size_t size) : JAWS_Cache_Object (data, size), @@ -156,12 +155,12 @@ JAWS_Counted_Cache_Object (const void *data, size_t size) { } -JAWS_Counted_Cache_Object::~JAWS_Counted_Cache_Object (void) +JAWS_Counted_Cache_Object::~JAWS_Counted_Cache_Object () { } ACE_Lock & -JAWS_Counted_Cache_Object::lock (void) +JAWS_Counted_Cache_Object::lock () { return this->lock_adapter_; } @@ -175,7 +174,7 @@ JAWS_Counted_Cache_Object::count_i () const } int -JAWS_Counted_Cache_Object::acquire_i (void) +JAWS_Counted_Cache_Object::acquire_i () { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, 0); @@ -184,7 +183,7 @@ JAWS_Counted_Cache_Object::acquire_i (void) } int -JAWS_Counted_Cache_Object::release_i (void) +JAWS_Counted_Cache_Object::release_i () { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, 0); @@ -206,7 +205,7 @@ JAWS_Cache_Object_Factory::JAWS_Cache_Object_Factory (ACE_Allocator *alloc) this->allocator_ = ACE_Allocator::instance (); } -JAWS_Cache_Object_Factory::~JAWS_Cache_Object_Factory (void) +JAWS_Cache_Object_Factory::~JAWS_Cache_Object_Factory () { } @@ -228,7 +227,7 @@ ::JAWS_Referenced_Cache_Object_Factory (ACE_Allocator *alloc) } JAWS_Referenced_Cache_Object_Factory -::~JAWS_Referenced_Cache_Object_Factory (void) +::~JAWS_Referenced_Cache_Object_Factory () { } @@ -260,7 +259,7 @@ ::JAWS_Counted_Cache_Object_Factory (ACE_Allocator *alloc) } JAWS_Counted_Cache_Object_Factory -::~JAWS_Counted_Cache_Object_Factory (void) +::~JAWS_Counted_Cache_Object_Factory () { } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.h b/ACE/apps/JAWS2/JAWS/Cache_Object.h index 3c92bdbb0bff9..fa6120ee15920 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Object.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Object.h @@ -21,7 +21,7 @@ class JAWS_Cache_Object { public: JAWS_Cache_Object (const void *, size_t); - virtual ~JAWS_Cache_Object (void); + virtual ~JAWS_Cache_Object (); void *internal () const; void internal (void *); @@ -30,8 +30,8 @@ class JAWS_Cache_Object size_t size () const; unsigned int count () const; - int acquire (void); - int release (void); + int acquire (); + int release (); time_t last_access () const; time_t first_access () const; @@ -43,17 +43,15 @@ class JAWS_Cache_Object void *heap_item () const; void heap_item (void *item); - virtual ACE_Lock & lock (void) = 0; + virtual ACE_Lock & lock () = 0; protected: - virtual unsigned int count_i () const = 0; - virtual int acquire_i (void) = 0; - virtual int release_i (void) = 0; + virtual int acquire_i () = 0; + virtual int release_i () = 0; virtual unsigned int priority_i () const = 0; private: - void *internal_; const void *data_; size_t size_; @@ -63,61 +61,53 @@ class JAWS_Cache_Object time_t new_last_access_; void *heap_item_; - }; class JAWS_Referenced_Cache_Object : public JAWS_Cache_Object { public: JAWS_Referenced_Cache_Object (const void *, size_t); - virtual ~JAWS_Referenced_Cache_Object (void); + virtual ~JAWS_Referenced_Cache_Object (); - virtual ACE_Lock & lock (void); + virtual ACE_Lock & lock (); protected: - virtual unsigned int count_i () const; - virtual int acquire_i (void); - virtual int release_i (void); + virtual int acquire_i (); + virtual int release_i (); virtual unsigned int priority_i () const; private: - mutable ACE_SYNCH_RW_MUTEX count_; mutable ACE_Lock_Adapter lock_adapter_; - }; class JAWS_Counted_Cache_Object : public JAWS_Cache_Object { public: JAWS_Counted_Cache_Object (const void *, size_t); - virtual ~JAWS_Counted_Cache_Object (void); + virtual ~JAWS_Counted_Cache_Object (); - virtual ACE_Lock & lock (void); + virtual ACE_Lock & lock (); protected: - virtual unsigned int count_i () const; - virtual int acquire_i (void); - virtual int release_i (void); + virtual int acquire_i (); + virtual int release_i (); virtual unsigned int priority_i () const; private: - unsigned int count_; unsigned int new_count_; mutable ACE_SYNCH_MUTEX lock_; mutable ACE_Lock_Adapter lock_adapter_; - }; class JAWS_Cache_Object_Factory { public: - JAWS_Cache_Object_Factory (ACE_Allocator *alloc = 0); - virtual ~JAWS_Cache_Object_Factory (void); + virtual ~JAWS_Cache_Object_Factory (); int open (ACE_Allocator *alloc = 0); @@ -125,31 +115,27 @@ class JAWS_Cache_Object_Factory virtual void destroy (JAWS_Cache_Object *) = 0; protected: - ACE_Allocator *allocator_; - }; class JAWS_Referenced_Cache_Object_Factory : public JAWS_Cache_Object_Factory { public: JAWS_Referenced_Cache_Object_Factory (ACE_Allocator *alloc = 0); - virtual ~JAWS_Referenced_Cache_Object_Factory (void); + virtual ~JAWS_Referenced_Cache_Object_Factory (); virtual JAWS_Cache_Object * create (const void *, size_t); virtual void destroy (JAWS_Cache_Object *); - }; class JAWS_Counted_Cache_Object_Factory : public JAWS_Cache_Object_Factory { public: JAWS_Counted_Cache_Object_Factory (ACE_Allocator *alloc = 0); - virtual ~JAWS_Counted_Cache_Object_Factory (void); + virtual ~JAWS_Counted_Cache_Object_Factory (); virtual JAWS_Cache_Object * create (const void *, size_t); virtual void destroy (JAWS_Cache_Object *); - }; #endif /* JAWS_CACHE_OBJECT_H */ diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.cpp b/ACE/apps/JAWS2/JAWS/Concurrency.cpp index 6f41bfde36361..bfebb34802a84 100644 --- a/ACE/apps/JAWS2/JAWS/Concurrency.cpp +++ b/ACE/apps/JAWS2/JAWS/Concurrency.cpp @@ -8,8 +8,7 @@ #include "JAWS/Reaper.h" - -JAWS_Concurrency_Base::JAWS_Concurrency_Base (void) +JAWS_Concurrency_Base::JAWS_Concurrency_Base () : ACE_Task (new ACE_Thread_Manager), mb_acquired_ (0), mb_ (0), @@ -17,14 +16,14 @@ JAWS_Concurrency_Base::JAWS_Concurrency_Base (void) { } -JAWS_Concurrency_Base::~JAWS_Concurrency_Base (void) +JAWS_Concurrency_Base::~JAWS_Concurrency_Base () { delete this->thr_mgr_; delete this->reaper_; } ACE_Message_Block * -JAWS_Concurrency_Base::singleton_mb (void) +JAWS_Concurrency_Base::singleton_mb () { if (this->mb_acquired_ == 0) { @@ -55,7 +54,7 @@ JAWS_Concurrency_Base::put (ACE_Message_Block *mb, ACE_Time_Value *tv) } int -JAWS_Concurrency_Base::svc (void) +JAWS_Concurrency_Base::svc () { JAWS_TRACE ("JAWS_Concurrency_Base::svc"); @@ -202,12 +201,12 @@ JAWS_Concurrency_Base::svc_hook (JAWS_Data_Block *ts_db) } int -JAWS_Concurrency_Base::activate_hook (void) +JAWS_Concurrency_Base::activate_hook () { return 0; } -JAWS_Dispatcher::JAWS_Dispatcher (void) +JAWS_Dispatcher::JAWS_Dispatcher () : policy_(0) { } @@ -219,7 +218,7 @@ JAWS_Dispatcher::dispatch (ACE_Message_Block *mb) } JAWS_Dispatch_Policy * -JAWS_Dispatcher::policy (void) +JAWS_Dispatcher::policy () { return this->policy_; } @@ -296,7 +295,7 @@ JAWS_Thread_Per_Task::svc_loop (JAWS_Data_Block *db) } int -JAWS_Thread_Per_Task::activate_hook (void) +JAWS_Thread_Per_Task::activate_hook () { const int force_active = 1; const int nthreads = 1; diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.h b/ACE/apps/JAWS2/JAWS/Concurrency.h index 00d290d0e1608..18c4571d2eaf9 100644 --- a/ACE/apps/JAWS2/JAWS/Concurrency.h +++ b/ACE/apps/JAWS2/JAWS/Concurrency.h @@ -29,8 +29,8 @@ class JAWS_Export JAWS_Concurrency_Base : public ACE_Task { public: - JAWS_Concurrency_Base (void); - ~JAWS_Concurrency_Base (void); + JAWS_Concurrency_Base (); + ~JAWS_Concurrency_Base (); virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); virtual int svc (); @@ -42,10 +42,10 @@ class JAWS_Export JAWS_Concurrency_Base : public ACE_Task virtual int svc_hook (JAWS_Data_Block *db); // does the work of following the pipeline tasks - virtual int activate_hook (void); + virtual int activate_hook (); // callback for IO_Handler when accept completes - virtual ACE_Message_Block *singleton_mb (void); + virtual ACE_Message_Block *singleton_mb (); protected: int mb_acquired_; @@ -64,10 +64,10 @@ class JAWS_Export JAWS_Dispatcher // IO can find a thread to take care of it. { public: - JAWS_Dispatcher (void); + JAWS_Dispatcher (); int dispatch (ACE_Message_Block *mb); - JAWS_Dispatch_Policy *policy (void); + JAWS_Dispatch_Policy *policy (); JAWS_Dispatch_Policy *policy (JAWS_Dispatch_Policy *p); private: @@ -110,7 +110,7 @@ class JAWS_Export JAWS_Thread_Per_Task : public JAWS_Concurrency_Base virtual int svc_loop (JAWS_Data_Block *db); // a single iteration - virtual int activate_hook (void); + virtual int activate_hook (); // callback for IO_Handler when accept completes private: diff --git a/ACE/apps/JAWS2/JAWS/Data_Block.cpp b/ACE/apps/JAWS2/JAWS/Data_Block.cpp index 7c46296241a03..a0142a386fca8 100644 --- a/ACE/apps/JAWS2/JAWS/Data_Block.cpp +++ b/ACE/apps/JAWS2/JAWS/Data_Block.cpp @@ -2,8 +2,7 @@ #include "JAWS/Policy.h" - -JAWS_Data_Block::JAWS_Data_Block (void) +JAWS_Data_Block::JAWS_Data_Block () : ACE_Message_Block (JAWS_DATA_BLOCK_SIZE), io_handler_ (0), policy_ (0), @@ -21,30 +20,30 @@ JAWS_Data_Block::JAWS_Data_Block (JAWS_Data_Block &db) { } -JAWS_Data_Block::~JAWS_Data_Block (void) +JAWS_Data_Block::~JAWS_Data_Block () { } JAWS_Pipeline_Handler * -JAWS_Data_Block::task (void) +JAWS_Data_Block::task () { return this->task_; } JAWS_IO_Handler * -JAWS_Data_Block::io_handler (void) +JAWS_Data_Block::io_handler () { return this->io_handler_; } JAWS_Dispatch_Policy * -JAWS_Data_Block::policy (void) +JAWS_Data_Block::policy () { return this->policy_; } void * -JAWS_Data_Block::payload (void) +JAWS_Data_Block::payload () { return this->payload_; } diff --git a/ACE/apps/JAWS2/JAWS/Data_Block.h b/ACE/apps/JAWS2/JAWS/Data_Block.h index 4beb61cdb4c2c..e0408b6a8bcc1 100644 --- a/ACE/apps/JAWS2/JAWS/Data_Block.h +++ b/ACE/apps/JAWS2/JAWS/Data_Block.h @@ -21,14 +21,14 @@ class JAWS_Export JAWS_Data_Block : public ACE_Message_Block // Defines the communication unit between pipeline components { public: - JAWS_Data_Block (void); + JAWS_Data_Block (); JAWS_Data_Block (JAWS_Data_Block &db); - ~JAWS_Data_Block (void); + ~JAWS_Data_Block (); - JAWS_Pipeline_Handler *task (void); - JAWS_IO_Handler *io_handler (void); - JAWS_Dispatch_Policy *policy (void); - void *payload (void); + JAWS_Pipeline_Handler *task (); + JAWS_IO_Handler *io_handler (); + JAWS_Dispatch_Policy *policy (); + void *payload (); void task (JAWS_Pipeline_Handler *taskp); void io_handler (JAWS_IO_Handler *handlerp); diff --git a/ACE/apps/JAWS2/JAWS/FILE.cpp b/ACE/apps/JAWS2/JAWS/FILE.cpp index 2667ed4f2f6f4..41ce5dfb3d6d9 100644 --- a/ACE/apps/JAWS2/JAWS/FILE.cpp +++ b/ACE/apps/JAWS2/JAWS/FILE.cpp @@ -3,12 +3,12 @@ #include "JAWS/FILE.h" -JAWS_FILE::JAWS_FILE (void) +JAWS_FILE::JAWS_FILE () : map_ (0) { } -JAWS_FILE::~JAWS_FILE (void) +JAWS_FILE::~JAWS_FILE () { delete this->map_; this->map_ = 0; @@ -60,7 +60,6 @@ JAWS_FILE::mem_map (int length, } return this->map_; - } diff --git a/ACE/apps/JAWS2/JAWS/FILE.h b/ACE/apps/JAWS2/JAWS/FILE.h index b06b3e7ef2c93..803572cc497da 100644 --- a/ACE/apps/JAWS2/JAWS/FILE.h +++ b/ACE/apps/JAWS2/JAWS/FILE.h @@ -15,10 +15,9 @@ class JAWS_Export JAWS_FILE : public ACE_FILE_IO // Like ACE_FILE_IO, but support for ACE_Mem_Map; { public: + JAWS_FILE (); - JAWS_FILE (void); - - ~JAWS_FILE (void); + ~JAWS_FILE (); ACE_Mem_Map *mem_map (int length = -1, int prot = PROT_RDWR, @@ -36,10 +35,8 @@ class JAWS_Export JAWS_FILE : public ACE_FILE_IO ACE_Mem_Map *map () const; private: - ACE_SYNCH_MUTEX lock_; ACE_Mem_Map *map_; - }; #endif /* JAWS_FILE_H */ diff --git a/ACE/apps/JAWS2/JAWS/Filecache.cpp b/ACE/apps/JAWS2/JAWS/Filecache.cpp index 652a169b062bc..5f6ebf01a7cc3 100644 --- a/ACE/apps/JAWS2/JAWS/Filecache.cpp +++ b/ACE/apps/JAWS2/JAWS/Filecache.cpp @@ -73,19 +73,19 @@ JAWS_Cached_FILE::JAWS_Cached_FILE (const char *const &filename, { } -JAWS_Cached_FILE::~JAWS_Cached_FILE (void) +JAWS_Cached_FILE::~JAWS_Cached_FILE () { this->file_.close (); } ACE_FILE_IO * -JAWS_Cached_FILE::file (void) +JAWS_Cached_FILE::file () { return &(this->file_); } ACE_Mem_Map * -JAWS_Cached_FILE::mmap (void) +JAWS_Cached_FILE::mmap () { return (this->data () == 0 ? 0 : this->data ()->mem_map ()); } diff --git a/ACE/apps/JAWS2/JAWS/Filecache.h b/ACE/apps/JAWS2/JAWS/Filecache.h index 03a5e2c3789ed..40840a00a2db6 100644 --- a/ACE/apps/JAWS2/JAWS/Filecache.h +++ b/ACE/apps/JAWS2/JAWS/Filecache.h @@ -12,18 +12,14 @@ class JAWS_Export JAWS_Referenced_Filecache_Factory : public JAWS_Referenced_Cache_Object_Factory { public: - virtual void destroy (JAWS_Cache_Object *); - }; class JAWS_Export JAWS_Counted_Filecache_Factory : public JAWS_Counted_Cache_Object_Factory { public: - virtual void destroy (JAWS_Cache_Object *); - }; typedef JAWS_Cache_Manager *next, } template -JAWS_Hash_Bucket_Item::~JAWS_Hash_Bucket_Item (void) +JAWS_Hash_Bucket_Item::~JAWS_Hash_Bucket_Item () { this->next_ = 0; this->prev_ = 0; @@ -53,7 +53,7 @@ JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc) template JAWS_Hash_Bucket_DLCStack:: -~JAWS_Hash_Bucket_DLCStack (void) +~JAWS_Hash_Bucket_DLCStack () { this->reset (); } @@ -99,7 +99,7 @@ push (const EXT_ID &ext_id, const INT_ID &int_id) } template JAWS_HASH_BUCKET_ITEM * -JAWS_Hash_Bucket_DLCStack::pop (void) +JAWS_Hash_Bucket_DLCStack::pop () { JAWS_HASH_BUCKET_ITEM *item = 0; @@ -124,7 +124,7 @@ JAWS_Hash_Bucket_DLCStack::pop (void) } template void -JAWS_Hash_Bucket_DLCStack::reset (void) +JAWS_Hash_Bucket_DLCStack::reset () { JAWS_HASH_BUCKET_ITEM *item = 0; @@ -186,7 +186,7 @@ JAWS_Hash_Bucket_DLCStack_Iterator (const JAWS_HASH_BUCKET_DLCSTACK &dlcstack) } template int -JAWS_Hash_Bucket_DLCStack_Iterator::first (void) +JAWS_Hash_Bucket_DLCStack_Iterator::first () { int result = 0; @@ -202,13 +202,13 @@ JAWS_Hash_Bucket_DLCStack_Iterator::first (void) } template int -JAWS_Hash_Bucket_DLCStack_Iterator::last (void) +JAWS_Hash_Bucket_DLCStack_Iterator::last () { return this->first (); } template int -JAWS_Hash_Bucket_DLCStack_Iterator::advance (void) +JAWS_Hash_Bucket_DLCStack_Iterator::advance () { int result = 1; @@ -229,7 +229,7 @@ JAWS_Hash_Bucket_DLCStack_Iterator::advance (void) } template int -JAWS_Hash_Bucket_DLCStack_Iterator::revert (void) +JAWS_Hash_Bucket_DLCStack_Iterator::revert () { int result = 1; @@ -318,12 +318,12 @@ JAWS_Hash_Bucket_Manager::open (ACE_Allocator *alloc) } template -JAWS_Hash_Bucket_Manager::~JAWS_Hash_Bucket_Manager (void) +JAWS_Hash_Bucket_Manager::~JAWS_Hash_Bucket_Manager () { } template int -JAWS_Hash_Bucket_Manager::close (void) +JAWS_Hash_Bucket_Manager::close () { this->dlcstack_.reset (); return 0; diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h index 16ef1b4520034..7ab972e93bcfb 100644 --- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h +++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h @@ -29,7 +29,7 @@ class JAWS_Hash_Bucket_Item JAWS_Hash_Bucket_Item (JAWS_Hash_Bucket_Item *next = 0, JAWS_Hash_Bucket_Item *prev = 0); - ~JAWS_Hash_Bucket_Item (void); + ~JAWS_Hash_Bucket_Item (); // Destructor. EXT_ID ext_id_; @@ -43,7 +43,6 @@ class JAWS_Hash_Bucket_Item JAWS_Hash_Bucket_Item *prev_; // Pointer to the prev item in the bucket of overflow nodes. - }; @@ -60,9 +59,8 @@ class JAWS_Hash_Bucket_DLCStack friend class JAWS_Hash_Bucket_DLCStack_Iterator; public: - JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc = 0); - ~JAWS_Hash_Bucket_DLCStack (void); + ~JAWS_Hash_Bucket_DLCStack (); int is_empty () const; // Returns 1 if the container is empty, otherwise returns 0. @@ -72,12 +70,12 @@ class JAWS_Hash_Bucket_DLCStack // Adds to the head of the list. // Returns the new item that was inserted. - JAWS_Hash_Bucket_Item *pop (void); + JAWS_Hash_Bucket_Item *pop (); // Removes and returns the first in the list. Returns // internal node's address on success, 0 if the queue was empty. // This method will *not* free the internal node. - void reset (void); + void reset (); // Reset the to be empty. // Notice that since no one is interested in the items within, // This operation will delete all items. @@ -90,10 +88,8 @@ class JAWS_Hash_Bucket_DLCStack ACE_Allocator *allocator_; private: - JAWS_Hash_Bucket_Item *head_; JAWS_Hash_Bucket_Item *tail_; - }; @@ -101,23 +97,22 @@ template class JAWS_Hash_Bucket_DLCStack_Iterator { public: - JAWS_Hash_Bucket_DLCStack_Iterator (const JAWS_HASH_BUCKET_DLCSTACK &dlcstack); - int first (void); + int first (); // Moves to first element in the set, clears done flag. Returns 0 // if empty, 1 otherwise. - int last (void); + int last (); // Moves to last element in the set, clears done flag. Returns 0 if // empty, 1 otherwise. - int advance (void); + int advance (); // Move forward by one element of set. Returns 0 if empty or we end // up being the first element in the set, 1 otherwise. If advance // takes us to the first element, done is set to true. - int revert (void); + int revert (); // Move backward by one element of set. Returns 0 if empty or we // end up being the last element in the set, 1 otherwise. If revert // takes us to the last element, done is set to true. @@ -151,8 +146,8 @@ class JAWS_Hash_Bucket_Manager JAWS_Hash_Bucket_Manager (ACE_Allocator *alloc = 0); int open (ACE_Allocator *alloc = 0); - ~JAWS_Hash_Bucket_Manager (void); - int close (void); + ~JAWS_Hash_Bucket_Manager (); + int close (); int find (const EXT_ID &ext_id) const; int find (const EXT_ID &ext_id, INT_ID &int_id) const; @@ -185,20 +180,14 @@ class JAWS_Hash_Bucket_Manager // if unbind succeeds, -1 otherwise. protected: - JAWS_Hash_Bucket_Item *find_i (const EXT_ID &ext_id) const; // Returns the item associated with ext_id if found in list. // Returns NULL if not found. private: - JAWS_Hash_Bucket_DLCStack dlcstack_; - }; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Hash_Bucket_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_HASH_BUCKET_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Headers.cpp b/ACE/apps/JAWS2/JAWS/Headers.cpp index f536db5b0bf6b..6ffc759b130b0 100644 --- a/ACE/apps/JAWS2/JAWS/Headers.cpp +++ b/ACE/apps/JAWS2/JAWS/Headers.cpp @@ -21,7 +21,7 @@ JAWS_Header_Data::JAWS_Header_Data (const char *name, int type, { } -JAWS_Header_Data::~JAWS_Header_Data (void) +JAWS_Header_Data::~JAWS_Header_Data () { if ( this->header_name_ ) ACE_OS::free ((void *)this->header_name_); @@ -74,17 +74,17 @@ JAWS_Header_Data::header_type (int type) // Header Table -JAWS_Headers::JAWS_Headers (void) +JAWS_Headers::JAWS_Headers () : iter_ (*this) { } -JAWS_Headers::~JAWS_Headers (void) +JAWS_Headers::~JAWS_Headers () { } JAWS_Header_Table_Iterator & -JAWS_Headers::iter (void) +JAWS_Headers::iter () { return this->iter_; } diff --git a/ACE/apps/JAWS2/JAWS/Headers.h b/ACE/apps/JAWS2/JAWS/Headers.h index 889bc2e2a7050..1ecabd49e90c1 100644 --- a/ACE/apps/JAWS2/JAWS/Headers.h +++ b/ACE/apps/JAWS2/JAWS/Headers.h @@ -27,7 +27,7 @@ class JAWS_Export JAWS_Header_Data public: JAWS_Header_Data (const char *name, const char *value = 0, int type = 0); JAWS_Header_Data (const char *name, int type, const char *value = 0); - ~JAWS_Header_Data (void); + ~JAWS_Header_Data (); const char * header_name () const; const char * header_value () const; @@ -49,8 +49,8 @@ typedef ACE_DLList_Iterator JAWS_Header_Table_Iterator; class JAWS_Export JAWS_Headers : public JAWS_Header_Table { public: - JAWS_Headers (void); - ~JAWS_Headers (void); + JAWS_Headers (); + ~JAWS_Headers (); int insert (JAWS_Header_Data *new_data); // insert the new data 0 -> success, -1 -> failure @@ -66,7 +66,7 @@ class JAWS_Export JAWS_Headers : public JAWS_Header_Table void remove_all (const char *const &header_name); // remove all headers from list that match header_name - JAWS_Header_Table_Iterator &iter (void); + JAWS_Header_Table_Iterator &iter (); // returns an iterator to the headers container private: diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp index c44ae37fd0238..e4ee96609eb98 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp +++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp @@ -4,12 +4,11 @@ #include "ace/OS_NS_sys_socket.h" - -JAWS_IO_Acceptor::JAWS_IO_Acceptor (void) +JAWS_IO_Acceptor::JAWS_IO_Acceptor () { } -JAWS_IO_Acceptor::~JAWS_IO_Acceptor (void) +JAWS_IO_Acceptor::~JAWS_IO_Acceptor () { } @@ -26,7 +25,7 @@ JAWS_IO_Acceptor::open (const ACE_HANDLE &) } void -JAWS_IO_Acceptor::close (void) +JAWS_IO_Acceptor::close () { } @@ -44,7 +43,7 @@ JAWS_IO_Acceptor::accept (size_t, const void *) } ACE_HANDLE -JAWS_IO_Acceptor::get_handle (void) +JAWS_IO_Acceptor::get_handle () { return ACE_INVALID_HANDLE; } @@ -87,14 +86,13 @@ JAWS_IO_Synch_Acceptor::accept (size_t, const void *) } ACE_HANDLE -JAWS_IO_Synch_Acceptor::get_handle (void) +JAWS_IO_Synch_Acceptor::get_handle () { return this->acceptor_.get_handle (); } - -JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor (void) +JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor () #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) : acceptor_ (*(new ACE_Asynch_Acceptor)), acceptor_ptr_ (&acceptor_) @@ -102,7 +100,7 @@ JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor (void) { } -JAWS_IO_Asynch_Acceptor::~JAWS_IO_Asynch_Acceptor (void) +JAWS_IO_Asynch_Acceptor::~JAWS_IO_Asynch_Acceptor () { #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) delete this->acceptor_ptr_; @@ -173,7 +171,7 @@ JAWS_IO_Asynch_Acceptor::accept (ACE_SOCK_Stream &, ACE_Addr *, } ACE_HANDLE -JAWS_IO_Asynch_Acceptor::get_handle (void) +JAWS_IO_Asynch_Acceptor::get_handle () { #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) return this->acceptor_.get_handle (); @@ -184,7 +182,7 @@ JAWS_IO_Asynch_Acceptor::get_handle (void) void -JAWS_IO_Asynch_Acceptor::close (void) +JAWS_IO_Asynch_Acceptor::close () { #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) delete this->acceptor_ptr_; diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h index 35a7473ece611..bf92cf3d2d79c 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h +++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h @@ -33,9 +33,8 @@ typedef ACE_LOCK_SOCK_Acceptor JAWS_IO_SOCK_Acceptor; class JAWS_Export JAWS_IO_Acceptor { public: - - JAWS_IO_Acceptor (void); - virtual ~JAWS_IO_Acceptor (void); + JAWS_IO_Acceptor (); + virtual ~JAWS_IO_Acceptor (); virtual int open (const ACE_INET_Addr &address, int backlog = 20); // Initiate a passive mode socket. @@ -53,22 +52,20 @@ class JAWS_Export JAWS_IO_Acceptor virtual int accept (size_t bytes_to_read = 0, const void *act = 0); // This initiates a new asynchronous accept through the AcceptEx call. - virtual ACE_HANDLE get_handle (void); + virtual ACE_HANDLE get_handle (); // Get the listener's handle - virtual void close (void); + virtual void close (); // Close the acceptor. enum { ASYNC = 0, SYNCH = 1 }; // identify if this is being used for asynchronous or synchronous // accept calls - }; class JAWS_Export JAWS_IO_Synch_Acceptor : public JAWS_IO_Acceptor { public: - virtual int open (const ACE_INET_Addr &local_sap, int backlog = 20); // Initiate a passive mode socket. @@ -82,7 +79,7 @@ class JAWS_Export JAWS_IO_Synch_Acceptor : public JAWS_IO_Acceptor int reset_new_handle = 0) const; // Accept the connection - virtual ACE_HANDLE get_handle (void); + virtual ACE_HANDLE get_handle (); // Get the listener's handle private: @@ -96,9 +93,8 @@ class JAWS_Export JAWS_IO_Synch_Acceptor : public JAWS_IO_Acceptor class JAWS_Export JAWS_IO_Asynch_Acceptor : public JAWS_IO_Acceptor { public: - - JAWS_IO_Asynch_Acceptor (void); - virtual ~JAWS_IO_Asynch_Acceptor (void); + JAWS_IO_Asynch_Acceptor (); + virtual ~JAWS_IO_Asynch_Acceptor (); virtual int open (const ACE_INET_Addr &address, int backlog = 20); // Initiate an asynchronous passive connection @@ -109,13 +105,12 @@ class JAWS_Export JAWS_IO_Asynch_Acceptor : public JAWS_IO_Acceptor virtual int accept (size_t bytes_to_read = 0, const void *act = 0); // This initiates a new asynchronous accept through the AcceptEx call. - virtual ACE_HANDLE get_handle (void); + virtual ACE_HANDLE get_handle (); // Get the listener's handle - virtual void close (void); + virtual void close (); private: - virtual int accept (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp index 98eb420d4e731..ba446ad0988b0 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp +++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp @@ -11,16 +11,16 @@ #include "JAWS/Waiter.h" #include "JAWS/Filecache.h" -JAWS_Abstract_IO_Handler::~JAWS_Abstract_IO_Handler (void) +JAWS_Abstract_IO_Handler::~JAWS_Abstract_IO_Handler () { } -JAWS_IO_Handler_Factory::~JAWS_IO_Handler_Factory (void) +JAWS_IO_Handler_Factory::~JAWS_IO_Handler_Factory () { } JAWS_IO_Handler * -JAWS_IO_Handler_Factory::create_io_handler (void) +JAWS_IO_Handler_Factory::create_io_handler () { JAWS_TRACE ("JAWS_IO_Handler_Factory::create"); @@ -50,7 +50,7 @@ JAWS_IO_Handler::JAWS_IO_Handler (JAWS_IO_Handler_Factory *factory) { } -JAWS_IO_Handler::~JAWS_IO_Handler (void) +JAWS_IO_Handler::~JAWS_IO_Handler () { this->mb_ = 0; this->status_ = 0; @@ -76,7 +76,7 @@ JAWS_IO_Handler::accept_complete (ACE_HANDLE handle) } void -JAWS_IO_Handler::accept_error (void) +JAWS_IO_Handler::accept_error () { // callback into pipeline task, notify that the accept has failed this->status_ |= ACCEPT_ERROR; @@ -94,7 +94,7 @@ JAWS_IO_Handler::read_complete (ACE_Message_Block *data) } void -JAWS_IO_Handler::read_error (void) +JAWS_IO_Handler::read_error () { // this->pipeline_->read_error (); this->status_ |= READ_ERROR; @@ -102,7 +102,7 @@ JAWS_IO_Handler::read_error (void) } void -JAWS_IO_Handler::transmit_file_complete (void) +JAWS_IO_Handler::transmit_file_complete () { JAWS_TRACE ("JAWS_IO_Handler::transmit_file_complete"); // this->pipeline_->transmit_file_complete (); @@ -121,7 +121,7 @@ JAWS_IO_Handler::transmit_file_error (int result) } void -JAWS_IO_Handler::receive_file_complete (void) +JAWS_IO_Handler::receive_file_complete () { this->status_ |= RECEIVE_OK; this->status_ &= (RECEIVE_OK+1); @@ -136,7 +136,7 @@ JAWS_IO_Handler::receive_file_error (int result) } void -JAWS_IO_Handler::write_error (void) +JAWS_IO_Handler::write_error () { ACE_DEBUG ((LM_DEBUG, " (%t) error in writing response\n")); @@ -146,21 +146,21 @@ JAWS_IO_Handler::write_error (void) } void -JAWS_IO_Handler::confirmation_message_complete (void) +JAWS_IO_Handler::confirmation_message_complete () { this->status_ |= WRITE_OK; this->status_ &= (WRITE_OK+1); } void -JAWS_IO_Handler::error_message_complete (void) +JAWS_IO_Handler::error_message_complete () { this->status_ |= WRITE_OK; this->status_ &= (WRITE_OK+1); } JAWS_IO_Handler_Factory * -JAWS_IO_Handler::factory (void) +JAWS_IO_Handler::factory () { return this->factory_; } @@ -178,7 +178,7 @@ JAWS_IO_Handler::task (JAWS_Pipeline_Handler *ph) } JAWS_Pipeline_Handler * -JAWS_IO_Handler::task (void) +JAWS_IO_Handler::task () { return this->task_; } @@ -190,52 +190,52 @@ JAWS_IO_Handler::message_block (JAWS_Data_Block *mb) } JAWS_Data_Block * -JAWS_IO_Handler::message_block (void) +JAWS_IO_Handler::message_block () { return this->mb_; } void -JAWS_IO_Handler::done (void) +JAWS_IO_Handler::done () { this->factory ()->destroy_io_handler (this); } int -JAWS_IO_Handler::status (void) +JAWS_IO_Handler::status () { return this->status_; } void -JAWS_IO_Handler::idle (void) +JAWS_IO_Handler::idle () { this->status_ &= (IDLE+1); } void -JAWS_IO_Handler::acquire (void) +JAWS_IO_Handler::acquire () { } void -JAWS_IO_Handler::lock (void) +JAWS_IO_Handler::lock () { } void -JAWS_IO_Handler::release (void) +JAWS_IO_Handler::release () { } #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) -JAWS_Asynch_IO_Handler_Factory::~JAWS_Asynch_IO_Handler_Factory (void) +JAWS_Asynch_IO_Handler_Factory::~JAWS_Asynch_IO_Handler_Factory () { } JAWS_IO_Handler * -JAWS_Asynch_IO_Handler_Factory::create_io_handler (void) +JAWS_Asynch_IO_Handler_Factory::create_io_handler () { JAWS_TRACE ("JAWS_Asynch_IO_Handler_Factory::create"); @@ -268,46 +268,46 @@ JAWS_Asynch_IO_Handler::JAWS_Asynch_IO_Handler (JAWS_Asynch_IO_Handler_Factory * this->status_ = 1; } -JAWS_Asynch_IO_Handler::~JAWS_Asynch_IO_Handler (void) +JAWS_Asynch_IO_Handler::~JAWS_Asynch_IO_Handler () { delete this->handler_; this->handler_ = 0; } ACE_Handler * -JAWS_Asynch_IO_Handler::handler (void) +JAWS_Asynch_IO_Handler::handler () { return this->handler_; } void -JAWS_Asynch_IO_Handler::acquire (void) +JAWS_Asynch_IO_Handler::acquire () { //cerr << "(" << thr_self () << ") acquire handler: " << this << endl; this->count_.acquire_read (); } void -JAWS_Asynch_IO_Handler::lock (void) +JAWS_Asynch_IO_Handler::lock () { //cerr << "(" << thr_self () << ") locking handler: " << this << endl; this->count_.acquire_write (); } void -JAWS_Asynch_IO_Handler::release (void) +JAWS_Asynch_IO_Handler::release () { //cerr << "(" << thr_self () << ") release handler: " << this << endl; this->count_.release (); } -JAWS_Asynch_Handler::JAWS_Asynch_Handler (void) +JAWS_Asynch_Handler::JAWS_Asynch_Handler () : ioh_ (0) { this->proactor (ACE_Proactor::instance ()); } -JAWS_Asynch_Handler::~JAWS_Asynch_Handler (void) +JAWS_Asynch_Handler::~JAWS_Asynch_Handler () { } @@ -361,7 +361,7 @@ JAWS_Asynch_Handler::handle () const #endif void -JAWS_Asynch_Handler::dispatch_handler (void) +JAWS_Asynch_Handler::dispatch_handler () { #if 0 // A future version of ACE will support this. @@ -480,7 +480,6 @@ JAWS_Asynch_Handler::handle_accept (const ACE_Asynch_Accept::Result &result) } else this->handler ()->accept_error (); - } void @@ -490,7 +489,7 @@ JAWS_Asynch_Handler::handler (JAWS_Asynch_IO_Handler *ioh) } JAWS_Asynch_IO_Handler * -JAWS_Asynch_Handler::handler (void) +JAWS_Asynch_Handler::handler () { return this->ioh_; } diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.h b/ACE/apps/JAWS2/JAWS/IO_Handler.h index 9d23baa22052e..6c5be891c2cbb 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Handler.h +++ b/ACE/apps/JAWS2/JAWS/IO_Handler.h @@ -45,13 +45,13 @@ ACE_END_VERSIONED_NAMESPACE_DECL class JAWS_Export JAWS_Abstract_IO_Handler { public: - virtual ~JAWS_Abstract_IO_Handler (void); + virtual ~JAWS_Abstract_IO_Handler (); virtual void task (JAWS_Pipeline_Handler *ph) = 0; - virtual JAWS_Pipeline_Handler *task (void) = 0; + virtual JAWS_Pipeline_Handler *task () = 0; virtual void message_block (JAWS_Data_Block *mb) = 0; - virtual JAWS_Data_Block *message_block (void) = 0; + virtual JAWS_Data_Block *message_block () = 0; /// This method is called by the IO class when new passive connection has /// been established. @@ -59,7 +59,7 @@ class JAWS_Export JAWS_Abstract_IO_Handler /// This method is called by the IO class when new passive connection has /// been established. - virtual void accept_error (void) = 0; + virtual void accept_error () = 0; #if 0 /// This method is called by the IO class when new active connection has @@ -77,11 +77,11 @@ class JAWS_Export JAWS_Abstract_IO_Handler /// This method is called by the IO class when there was an error in /// reading new data from the client. - virtual void read_error (void) = 0; + virtual void read_error () = 0; /// This method is called by the IO class when the requested file has /// been successfully transmitted to the client. - virtual void transmit_file_complete (void) = 0; + virtual void transmit_file_complete () = 0; /// This method is called by the IO class when there was an error in /// transmitting the requested file to the client. @@ -89,7 +89,7 @@ class JAWS_Export JAWS_Abstract_IO_Handler /// This method is called by the IO class when the requested file has /// been successfully received from the client. - virtual void receive_file_complete (void) = 0; + virtual void receive_file_complete () = 0; /// This method is called by the IO class when there was an error in /// receiving the requested file from the client. @@ -97,30 +97,30 @@ class JAWS_Export JAWS_Abstract_IO_Handler /// This method is called by the IO class when there was an error in /// writing data to the client. - virtual void write_error (void) = 0; + virtual void write_error () = 0; /// This method is called by the IO class when the confirmation /// message has been delivered to the client. - virtual void confirmation_message_complete (void) = 0; + virtual void confirmation_message_complete () = 0; /// This method is called by the IO class when the error message has /// been delivered to the client. - virtual void error_message_complete (void) = 0; + virtual void error_message_complete () = 0; /// Returns the factory for this IO handler - virtual JAWS_IO_Handler_Factory *factory (void) = 0; + virtual JAWS_IO_Handler_Factory *factory () = 0; /// Returns the socket handle for this handler virtual ACE_HANDLE handle () const = 0; /// Cleans up the handler. - virtual void done (void) = 0; + virtual void done () = 0; /// Returns the status of the handler - virtual int status (void) = 0; + virtual int status () = 0; /// puts handler in an idle state - virtual void idle (void) = 0; + virtual void idle () = 0; enum { IDLE = 0, IDLE_A = 1, ACCEPT_OK = 2, ACCEPT_OK_A = 3, @@ -134,7 +134,6 @@ class JAWS_Export JAWS_Abstract_IO_Handler RECEIVE_OK = 18, RECEIVE_OK_A = 19, /// The different states of the handler RECEIVE_ERROR = 20, RECEIVE_ERROR_A = 21 }; - }; #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined(ACE_HAS_AIO_CALLS) @@ -145,8 +144,8 @@ class JAWS_Asynch_IO_Handler; class JAWS_Export JAWS_Asynch_Handler : public ACE_Service_Handler { public: - JAWS_Asynch_Handler (void); - virtual ~JAWS_Asynch_Handler (void); + JAWS_Asynch_Handler (); + virtual ~JAWS_Asynch_Handler (); /// This method will be called when an asynchronous read completes on /// a stream. @@ -167,9 +166,9 @@ class JAWS_Export JAWS_Asynch_Handler : public ACE_Service_Handler virtual void handle_accept (const ACE_Asynch_Accept::Result &result); virtual void handler (JAWS_Asynch_IO_Handler *ioh); - virtual JAWS_Asynch_IO_Handler * handler (void); + virtual JAWS_Asynch_IO_Handler * handler (); - virtual void dispatch_handler (void); + virtual void dispatch_handler (); /// Call back entry point for ACE_Asynch_Acceptor virtual void open (ACE_HANDLE h, ACE_Message_Block &mb); @@ -189,38 +188,38 @@ class JAWS_Export JAWS_IO_Handler : public JAWS_Abstract_IO_Handler { public: JAWS_IO_Handler (JAWS_IO_Handler_Factory *factory); - virtual ~JAWS_IO_Handler (void); + virtual ~JAWS_IO_Handler (); // Inherited from JAWS_IO_Handler virtual void accept_complete (ACE_HANDLE handle); - virtual void accept_error (void); + virtual void accept_error (); virtual void read_complete (ACE_Message_Block *data); - virtual void read_error (void); - virtual void transmit_file_complete (void); + virtual void read_error (); + virtual void transmit_file_complete (); virtual void transmit_file_error (int result); - virtual void receive_file_complete (void); + virtual void receive_file_complete (); virtual void receive_file_error (int result); - virtual void write_error (void); - virtual void confirmation_message_complete (void); - virtual void error_message_complete (void); + virtual void write_error (); + virtual void confirmation_message_complete (); + virtual void error_message_complete (); - virtual JAWS_IO_Handler_Factory *factory (void); + virtual JAWS_IO_Handler_Factory *factory (); virtual ACE_HANDLE handle () const; - virtual void done (void); - virtual int status (void); - virtual void idle (void); + virtual void done (); + virtual int status (); + virtual void idle (); - virtual void acquire (void); - virtual void lock (void); - virtual void release (void); + virtual void acquire (); + virtual void lock (); + virtual void release (); virtual void task (JAWS_Pipeline_Handler *ph); - virtual JAWS_Pipeline_Handler *task (void); + virtual JAWS_Pipeline_Handler *task (); virtual void message_block (JAWS_Data_Block *mb); - virtual JAWS_Data_Block *message_block (void); + virtual JAWS_Data_Block *message_block (); protected: /// The state of the handler. @@ -244,10 +243,10 @@ class JAWS_Export JAWS_IO_Handler_Factory { public: /// Destructor - virtual ~JAWS_IO_Handler_Factory (void); + virtual ~JAWS_IO_Handler_Factory (); /// This creates a new JAWS_IO_Handler - virtual JAWS_IO_Handler *create_io_handler (void); + virtual JAWS_IO_Handler *create_io_handler (); /// This deletes a JAWS_IO_Handler virtual void destroy_io_handler (JAWS_IO_Handler *handler); @@ -265,10 +264,10 @@ class JAWS_Export JAWS_Asynch_IO_Handler_Factory : public JAWS_IO_Handler_Factor { public: /// Destructor - virtual ~JAWS_Asynch_IO_Handler_Factory (void); + virtual ~JAWS_Asynch_IO_Handler_Factory (); /// This creates a new JAWS_IO_Handler - virtual JAWS_IO_Handler *create_io_handler (void); + virtual JAWS_IO_Handler *create_io_handler (); /// This deletes a JAWS_IO_Handler virtual void destroy_io_handler (JAWS_IO_Handler *handler); @@ -283,16 +282,15 @@ friend class JAWS_Waiter; // Provide implementations for the common functions. public: explicit JAWS_Asynch_IO_Handler (JAWS_Asynch_IO_Handler_Factory *factory); - virtual ~JAWS_Asynch_IO_Handler (void); + virtual ~JAWS_Asynch_IO_Handler (); - virtual ACE_Handler *handler (void); + virtual ACE_Handler *handler (); - virtual void acquire (void); - virtual void lock (void); - virtual void release (void); + virtual void acquire (); + virtual void lock (); + virtual void release (); protected: - JAWS_Asynch_Handler *handler_; ACE_SYNCH_RW_MUTEX count_; }; diff --git a/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp index 9b8e7c3068f96..0755d676fb066 100644 --- a/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp +++ b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp @@ -19,8 +19,7 @@ // #include "HTTP_Helpers.h" - -JAWS_IO::JAWS_IO (void) +JAWS_IO::JAWS_IO () : handle_ (ACE_INVALID_HANDLE), handler_ (0), inet_addr_ (0), @@ -28,13 +27,13 @@ JAWS_IO::JAWS_IO (void) { } -JAWS_IO::~JAWS_IO (void) +JAWS_IO::~JAWS_IO () { } #if 0 ACE_HANDLE -JAWS_IO::handle (void) +JAWS_IO::handle () { return this->handle_; } @@ -58,12 +57,12 @@ JAWS_IO::acceptor (JAWS_IO_Acceptor *acceptor) } #endif /* 0 */ -JAWS_Synch_IO::JAWS_Synch_IO (void) +JAWS_Synch_IO::JAWS_Synch_IO () { this->acceptor_ = JAWS_IO_Synch_Acceptor_Singleton::instance (); } -JAWS_Synch_IO::~JAWS_Synch_IO (void) +JAWS_Synch_IO::~JAWS_Synch_IO () { if (this->handle_ != ACE_INVALID_HANDLE) ACE_OS::closesocket (this->handle_); @@ -325,11 +324,11 @@ JAWS_Synch_IO::send_message (JAWS_IO_Handler *ioh, // This only works on asynch I/O-capable systems. #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) -JAWS_Asynch_IO::JAWS_Asynch_IO (void) +JAWS_Asynch_IO::JAWS_Asynch_IO () { } -JAWS_Asynch_IO::~JAWS_Asynch_IO (void) +JAWS_Asynch_IO::~JAWS_Asynch_IO () { if (this->handle_ != ACE_INVALID_HANDLE) ACE_OS::closesocket (this->handle_); diff --git a/ACE/apps/JAWS2/JAWS/Jaws_IO.h b/ACE/apps/JAWS2/JAWS/Jaws_IO.h index 9bc060aaa5ce0..4078b2417945a 100644 --- a/ACE/apps/JAWS2/JAWS/Jaws_IO.h +++ b/ACE/apps/JAWS2/JAWS/Jaws_IO.h @@ -45,13 +45,13 @@ class JAWS_IO_Acceptor; class JAWS_Export JAWS_IO { public: - JAWS_IO (void); - virtual ~JAWS_IO (void); + JAWS_IO (); + virtual ~JAWS_IO (); // void acceptor (JAWS_IO_Acceptor *acceptor); // void handler (JAWS_IO_Handler *handler); // void handle (ACE_HANDLE h); - // ACE_HANDLE handle (void); + // ACE_HANDLE handle (); // James, please add documentation here. @@ -113,9 +113,9 @@ class JAWS_Export JAWS_IO class JAWS_Export JAWS_Synch_IO : public JAWS_IO { public: - JAWS_Synch_IO (void); + JAWS_Synch_IO (); - virtual ~JAWS_Synch_IO (void); + virtual ~JAWS_Synch_IO (); virtual void accept (JAWS_IO_Handler *ioh, ACE_Message_Block *mb = 0, @@ -173,9 +173,9 @@ typedef ACE_Singleton class JAWS_Export JAWS_Asynch_IO : public JAWS_IO { public: - JAWS_Asynch_IO (void); + JAWS_Asynch_IO (); - virtual ~JAWS_Asynch_IO (void); + virtual ~JAWS_Asynch_IO (); virtual void accept (JAWS_IO_Handler *ioh, ACE_Message_Block *mb = 0, @@ -226,7 +226,6 @@ class JAWS_Export JAWS_Asynch_IO : public JAWS_IO }; protected: - virtual void send_message (JAWS_IO_Handler *ioh, const char *buffer, unsigned int length, @@ -247,7 +246,6 @@ class JAWS_Export JAWS_Asynch2_IO : public JAWS_Asynch_IO virtual void accept (JAWS_IO_Handler *ioh, ACE_Message_Block *mb = 0, unsigned int size = 0); - }; typedef ACE_Singleton diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp b/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp index 63b004754048b..e1ce02ce1299c 100644 --- a/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp +++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp @@ -254,7 +254,7 @@ JAWS_Parse_Headers::parse_header_value (JAWS_Header_Info *info, } -JAWS_Header_Info::JAWS_Header_Info (void) +JAWS_Header_Info::JAWS_Header_Info () : end_of_headers_ (0), end_of_line_ (1), last_header_data_ (0), @@ -263,7 +263,7 @@ JAWS_Header_Info::JAWS_Header_Info (void) { } -JAWS_Header_Info::~JAWS_Header_Info (void) +JAWS_Header_Info::~JAWS_Header_Info () { JAWS_Header_Table_Iterator iter (this->table_); JAWS_Header_Data *data_ptr; @@ -277,7 +277,7 @@ JAWS_Header_Info::~JAWS_Header_Info (void) } void -JAWS_Header_Info::dump (void) +JAWS_Header_Info::dump () { JAWS_Header_Table_Iterator iter (this->table_); @@ -297,7 +297,7 @@ JAWS_Header_Info::dump (void) } JAWS_Headers * -JAWS_Header_Info::table (void) +JAWS_Header_Info::table () { return &(this->table_); } @@ -321,7 +321,7 @@ JAWS_Header_Info::append_last_header_value (char c) } int -JAWS_Header_Info::append_last_header_value (void) +JAWS_Header_Info::append_last_header_value () { if (this->last_header_data_ == 0 || this->last_header_length_ == 0) return -1; @@ -349,7 +349,7 @@ JAWS_Header_Info::append_last_header_value (const char *begin, const char *end) } void -JAWS_Header_Info::reduce_last_header_value (void) +JAWS_Header_Info::reduce_last_header_value () { if (this->last_header_data_ == 0) return; @@ -394,7 +394,7 @@ JAWS_Header_Info::create_next_header_value (char *ht) } void -JAWS_Header_Info::finish_last_header_value (void) +JAWS_Header_Info::finish_last_header_value () { if (this->last_header_data_ != 0) { @@ -412,7 +412,7 @@ JAWS_Header_Info::finish_last_header_value (void) } char * -JAWS_Header_Info::header_buf (void) +JAWS_Header_Info::header_buf () { return this->header_buf_; } diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.h b/ACE/apps/JAWS2/JAWS/Parse_Headers.h index e2cddf1146018..fc42206345f41 100644 --- a/ACE/apps/JAWS2/JAWS/Parse_Headers.h +++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.h @@ -17,8 +17,8 @@ class JAWS_Export JAWS_Header_Info { public: - JAWS_Header_Info (void); - ~JAWS_Header_Info (void); + JAWS_Header_Info (); + ~JAWS_Header_Info (); int end_of_line () const; void end_of_line (int flag); @@ -30,19 +30,19 @@ class JAWS_Export JAWS_Header_Info const JAWS_Header_Data * last_header_data () const; - char *header_buf (void); + char *header_buf (); void append_last_header_value (char c); - int append_last_header_value (void); + int append_last_header_value (); void append_last_header_value (const char *begin, const char *end); - void reduce_last_header_value (void); + void reduce_last_header_value (); void create_next_header_value (char *ht); // This will insert last_header_data into the table if it is not // null. Then, it will create a new header_data node and populate // it. If ht is null, last_header_data is not inserted. - void finish_last_header_value (void); + void finish_last_header_value (); // This will insert last_header_data into the table if it is not // null. @@ -52,7 +52,7 @@ class JAWS_Export JAWS_Header_Info int status () const; void status (int s); - JAWS_Headers *table (void); + JAWS_Headers *table (); enum STATUS_CODE { @@ -70,7 +70,7 @@ class JAWS_Export JAWS_Header_Info // In Apache, they assume that each header line should not exceed // 8K. Who am I to disagree? - void dump (void); + void dump (); private: int end_of_headers_; @@ -88,7 +88,6 @@ class JAWS_Export JAWS_Header_Info class JAWS_Export JAWS_Parse_Headers { public: - int parse_headers (JAWS_Header_Info *info, ACE_Message_Block &mb); // Return 0 means need more data, and call it again. // Return 1 means all done or error. @@ -111,7 +110,6 @@ class JAWS_Export JAWS_Parse_Headers // Scans from start to end for characters that match skip set. // Returns pointer to first location between start and end of a // character that is *not* in the skip set. - }; typedef ACE_Singleton diff --git a/ACE/apps/JAWS2/JAWS/Pipeline.cpp b/ACE/apps/JAWS2/JAWS/Pipeline.cpp index b6a3dc93c9f03..6522e40fdeb11 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline.cpp +++ b/ACE/apps/JAWS2/JAWS/Pipeline.cpp @@ -1,8 +1,7 @@ #include "JAWS/Pipeline.h" - -JAWS_Pipeline::JAWS_Pipeline (void) +JAWS_Pipeline::JAWS_Pipeline () { } diff --git a/ACE/apps/JAWS2/JAWS/Pipeline.h b/ACE/apps/JAWS2/JAWS/Pipeline.h index d1fc4a7abde6c..a9072aecf58f7 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline.h +++ b/ACE/apps/JAWS2/JAWS/Pipeline.h @@ -27,7 +27,7 @@ class JAWS_Export JAWS_Pipeline : public JAWS_Pipeline_Task // Methods that are common to pipeline components { public: - JAWS_Pipeline (void); + JAWS_Pipeline (); // ACE_Task hooks virtual int open (void * = 0); diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp index c5973bfd6e591..4e75616de89a1 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp @@ -4,14 +4,13 @@ #include "JAWS/Pipeline_Handler_T.h" - template -JAWS_Pipeline_Abstract_Handler::JAWS_Pipeline_Abstract_Handler (void) +JAWS_Pipeline_Abstract_Handler::JAWS_Pipeline_Abstract_Handler () { } template -JAWS_Pipeline_Abstract_Handler::~JAWS_Pipeline_Abstract_Handler (void) +JAWS_Pipeline_Abstract_Handler::~JAWS_Pipeline_Abstract_Handler () { } diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h index 51db1562e0424..eb757eb92f0f2 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h @@ -11,8 +11,8 @@ class JAWS_Pipeline_Abstract_Handler : public JAWS_Pipeline_Task // Methods that are common to pipeline components { public: - JAWS_Pipeline_Abstract_Handler (void); - virtual ~JAWS_Pipeline_Abstract_Handler (void); + JAWS_Pipeline_Abstract_Handler (); + virtual ~JAWS_Pipeline_Abstract_Handler (); // ACE_Task hooks virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); @@ -20,11 +20,8 @@ class JAWS_Pipeline_Abstract_Handler : public JAWS_Pipeline_Task virtual int handle_put (TYPE *data, ACE_Time_Value *tv) = 0; // Callback hook for specialized data processing - }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Pipeline_Handler_T.cpp" -#endif #endif /* !defined (JAWS_PIPELINE_HANDLER_T_H) */ diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp index 3f27630b8b033..44c815ee1e5e1 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp @@ -6,13 +6,12 @@ #include "JAWS/Policy.h" - -JAWS_Pipeline_Handler::JAWS_Pipeline_Handler (void) +JAWS_Pipeline_Handler::JAWS_Pipeline_Handler () : policy_ (0) { } -JAWS_Pipeline_Handler::~JAWS_Pipeline_Handler (void) +JAWS_Pipeline_Handler::~JAWS_Pipeline_Handler () { } @@ -42,7 +41,7 @@ JAWS_Pipeline_Handler::put (ACE_Message_Block *mb, ACE_Time_Value *tv) } JAWS_Dispatch_Policy * -JAWS_Pipeline_Handler::policy (void) +JAWS_Pipeline_Handler::policy () { return this->policy_; } diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h index 87250c98d19f1..f96729314f4b4 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.h @@ -17,12 +17,12 @@ class JAWS_Export JAWS_Pipeline_Handler : public JAWS_Pipeline_Abstract_Handler { public: - JAWS_Pipeline_Handler (void); - virtual ~JAWS_Pipeline_Handler (void); + JAWS_Pipeline_Handler (); + virtual ~JAWS_Pipeline_Handler (); virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv) = 0; - virtual JAWS_Dispatch_Policy * policy (void); + virtual JAWS_Dispatch_Policy * policy (); virtual void policy (JAWS_Dispatch_Policy *); private: diff --git a/ACE/apps/JAWS2/JAWS/Policy.cpp b/ACE/apps/JAWS2/JAWS/Policy.cpp index 207863c729d67..7c350fb7a7ce3 100644 --- a/ACE/apps/JAWS2/JAWS/Policy.cpp +++ b/ACE/apps/JAWS2/JAWS/Policy.cpp @@ -4,16 +4,15 @@ #include "JAWS/IO_Acceptor.h" - -JAWS_Dispatch_Policy::JAWS_Dispatch_Policy (void) +JAWS_Dispatch_Policy::JAWS_Dispatch_Policy () { } -JAWS_Dispatch_Policy::~JAWS_Dispatch_Policy (void) +JAWS_Dispatch_Policy::~JAWS_Dispatch_Policy () { } -JAWS_Default_Dispatch_Policy::JAWS_Default_Dispatch_Policy (void) +JAWS_Default_Dispatch_Policy::JAWS_Default_Dispatch_Policy () : ratio_ (1), concurrency_ (JAWS_Thread_Pool_Singleton::instance ()), ioh_factory_ (JAWS_Synch_IO_Handler_Factory_Singleton::instance ()), @@ -22,36 +21,36 @@ JAWS_Default_Dispatch_Policy::JAWS_Default_Dispatch_Policy (void) { } -JAWS_Default_Dispatch_Policy::~JAWS_Default_Dispatch_Policy (void) +JAWS_Default_Dispatch_Policy::~JAWS_Default_Dispatch_Policy () { } int -JAWS_Default_Dispatch_Policy::ratio (void) +JAWS_Default_Dispatch_Policy::ratio () { return this->ratio_; } JAWS_IO * -JAWS_Default_Dispatch_Policy::io (void) +JAWS_Default_Dispatch_Policy::io () { return this->io_; } JAWS_IO_Handler_Factory * -JAWS_Default_Dispatch_Policy::ioh_factory (void) +JAWS_Default_Dispatch_Policy::ioh_factory () { return this->ioh_factory_; } JAWS_IO_Acceptor * -JAWS_Default_Dispatch_Policy::acceptor (void) +JAWS_Default_Dispatch_Policy::acceptor () { return this->acceptor_; } JAWS_Concurrency_Base * -JAWS_Default_Dispatch_Policy::concurrency (void) +JAWS_Default_Dispatch_Policy::concurrency () { return this->concurrency_; } diff --git a/ACE/apps/JAWS2/JAWS/Policy.h b/ACE/apps/JAWS2/JAWS/Policy.h index 0d4b6f3d6062a..c7c234c8bf738 100644 --- a/ACE/apps/JAWS2/JAWS/Policy.h +++ b/ACE/apps/JAWS2/JAWS/Policy.h @@ -18,14 +18,14 @@ class JAWS_IO_Handler_Factory; class JAWS_Export JAWS_Dispatch_Policy { public: - JAWS_Dispatch_Policy (void); - virtual ~JAWS_Dispatch_Policy (void); + JAWS_Dispatch_Policy (); + virtual ~JAWS_Dispatch_Policy (); - virtual int ratio (void) = 0; - virtual JAWS_IO * io (void) = 0; - virtual JAWS_IO_Handler_Factory *ioh_factory (void) = 0; - virtual JAWS_IO_Acceptor *acceptor (void) = 0; - virtual JAWS_Concurrency_Base * concurrency (void) = 0; + virtual int ratio () = 0; + virtual JAWS_IO * io () = 0; + virtual JAWS_IO_Handler_Factory *ioh_factory () = 0; + virtual JAWS_IO_Acceptor *acceptor () = 0; + virtual JAWS_Concurrency_Base * concurrency () = 0; virtual void ratio (int r) = 0; virtual void io (JAWS_IO *iop) = 0; @@ -37,14 +37,14 @@ class JAWS_Export JAWS_Dispatch_Policy class JAWS_Export JAWS_Default_Dispatch_Policy : public JAWS_Dispatch_Policy { public: - JAWS_Default_Dispatch_Policy (void); - virtual ~JAWS_Default_Dispatch_Policy (void); - - virtual int ratio (void); - virtual JAWS_IO *io (void); - virtual JAWS_IO_Handler_Factory *ioh_factory (void); - virtual JAWS_IO_Acceptor *acceptor (void); - virtual JAWS_Concurrency_Base *concurrency (void); + JAWS_Default_Dispatch_Policy (); + virtual ~JAWS_Default_Dispatch_Policy (); + + virtual int ratio (); + virtual JAWS_IO *io (); + virtual JAWS_IO_Handler_Factory *ioh_factory (); + virtual JAWS_IO_Acceptor *acceptor (); + virtual JAWS_Concurrency_Base *concurrency (); virtual void ratio (int r); virtual void io (JAWS_IO *iop); diff --git a/ACE/apps/JAWS2/JAWS/Reaper.cpp b/ACE/apps/JAWS2/JAWS/Reaper.cpp index 1fe52cb04e709..ca928fea6c517 100644 --- a/ACE/apps/JAWS2/JAWS/Reaper.cpp +++ b/ACE/apps/JAWS2/JAWS/Reaper.cpp @@ -3,14 +3,13 @@ #include "JAWS/IO_Acceptor.h" - JAWS_Reaper::JAWS_Reaper (JAWS_Concurrency_Base *concurrency) : concurrency_ (concurrency), waiting_ (0) { } -JAWS_Reaper::~JAWS_Reaper (void) +JAWS_Reaper::~JAWS_Reaper () { } @@ -32,7 +31,7 @@ JAWS_Reaper::open (void *) } int -JAWS_Reaper::svc (void) +JAWS_Reaper::svc () { ACE_TRACE ("JAWS_Reaper::svc"); int result = this->concurrency_->thr_mgr ()->wait (); diff --git a/ACE/apps/JAWS2/JAWS/Reaper.h b/ACE/apps/JAWS2/JAWS/Reaper.h index 28ec31dc15980..460c736add07c 100644 --- a/ACE/apps/JAWS2/JAWS/Reaper.h +++ b/ACE/apps/JAWS2/JAWS/Reaper.h @@ -30,7 +30,7 @@ class JAWS_Export JAWS_Reaper : public ACE_Task { public: JAWS_Reaper (JAWS_Concurrency_Base *concurrency); - virtual ~JAWS_Reaper (void); + virtual ~JAWS_Reaper (); virtual int open (void * = 0); virtual int svc (); @@ -39,7 +39,6 @@ class JAWS_Export JAWS_Reaper : public ACE_Task JAWS_Concurrency_Base *concurrency_; int waiting_; ACE_SYNCH_MUTEX lock_; - }; #endif /* JAWS_REAPER_H */ diff --git a/ACE/apps/JAWS2/JAWS/Server.cpp b/ACE/apps/JAWS2/JAWS/Server.cpp index e26ba15d3f804..f98e919663915 100644 --- a/ACE/apps/JAWS2/JAWS/Server.cpp +++ b/ACE/apps/JAWS2/JAWS/Server.cpp @@ -15,8 +15,7 @@ #include "JAWS/Pipeline_Tasks.h" - -JAWS_Server::JAWS_Server (void) +JAWS_Server::JAWS_Server () : port_ (5432), concurrency_ (0), dispatch_ (0), diff --git a/ACE/apps/JAWS2/JAWS/Server.h b/ACE/apps/JAWS2/JAWS/Server.h index 336b6c85062c6..afb49027a003c 100644 --- a/ACE/apps/JAWS2/JAWS/Server.h +++ b/ACE/apps/JAWS2/JAWS/Server.h @@ -11,7 +11,7 @@ class JAWS_IO_Handler_Factory; class JAWS_Export JAWS_Server { public: - JAWS_Server (void); + JAWS_Server (); JAWS_Server (int argc, char *argv[]); void init (int argc, char *argv[]); diff --git a/ACE/apps/JAWS2/JAWS/Waiter.cpp b/ACE/apps/JAWS2/JAWS/Waiter.cpp index b35e560b05bad..aaa1f691d775a 100644 --- a/ACE/apps/JAWS2/JAWS/Waiter.cpp +++ b/ACE/apps/JAWS2/JAWS/Waiter.cpp @@ -4,24 +4,23 @@ #include "JAWS/IO_Handler.h" - -JAWS_Waiter::JAWS_Waiter (void) +JAWS_Waiter::JAWS_Waiter () : iter_ (*this) { } -JAWS_Waiter::~JAWS_Waiter (void) +JAWS_Waiter::~JAWS_Waiter () { } JAWS_Waiter_Base_Iterator & -JAWS_Waiter::iter (void) +JAWS_Waiter::iter () { return this->iter_; } int -JAWS_Waiter::index (void) +JAWS_Waiter::index () { #if 0 // A future version of ACE will support this. diff --git a/ACE/apps/JAWS2/JAWS/Waiter.h b/ACE/apps/JAWS2/JAWS/Waiter.h index 613868e7f9e93..b96be4ab30291 100644 --- a/ACE/apps/JAWS2/JAWS/Waiter.h +++ b/ACE/apps/JAWS2/JAWS/Waiter.h @@ -23,13 +23,13 @@ typedef JAWS_Assoc_Array_Iterator class JAWS_Export JAWS_Waiter : public JAWS_Waiter_Base { public: - JAWS_Waiter (void); - ~JAWS_Waiter (void); + JAWS_Waiter (); + ~JAWS_Waiter (); - JAWS_Waiter_Base_Iterator &iter (void); + JAWS_Waiter_Base_Iterator &iter (); // Returns an iterator to the headers container. - int index (void); + int index (); // Returns the index into the table associated with calling thread. JAWS_IO_Handler * wait_for_completion (int i = -1); @@ -39,7 +39,6 @@ class JAWS_Export JAWS_Waiter : public JAWS_Waiter_Base private: JAWS_Waiter_Base_Iterator iter_; - }; typedef ACE_Singleton JAWS_Waiter_Singleton; diff --git a/ACE/apps/JAWS2/main.cpp b/ACE/apps/JAWS2/main.cpp index 2032bdf427cfd..2c6b857b65717 100644 --- a/ACE/apps/JAWS2/main.cpp +++ b/ACE/apps/JAWS2/main.cpp @@ -2,7 +2,6 @@ #include "HTTP_10.h" - #ifdef ACE_HAS_SIG_C_FUNC extern "C" { diff --git a/ACE/apps/JAWS3/bench/rqfiles.cpp b/ACE/apps/JAWS3/bench/rqfiles.cpp index f09c56662b3e0..007efaa745992 100644 --- a/ACE/apps/JAWS3/bench/rqfiles.cpp +++ b/ACE/apps/JAWS3/bench/rqfiles.cpp @@ -16,7 +16,6 @@ class HTTP_Sink_Svc_Handler : public ACE_Svc_Handler { public: - //FUZZ: disable check_for_lack_ACE_OS int open (void *) { @@ -59,7 +58,6 @@ class HTTP_Sink_Svc_Handler ->schedule_wakeup (handle, ACE_Event_Handler::READ_MASK); return 0; } - }; typedef ACE_Connector @@ -70,7 +68,6 @@ class HTTP_Make_Request_Event_Handler : public ACE_Event_Handler { public: - HTTP_Make_Request_Event_Handler (const ACE_Time_Value &request_rate, int number_of_requests = -1, const char *website = 0) @@ -121,7 +118,6 @@ class HTTP_Make_Request_Event_Handler } private: - int number_of_requests_; int number_of_outstanding_requests_; @@ -129,7 +125,6 @@ class HTTP_Make_Request_Event_Handler ACE_INET_Addr addr_; long timer_id_; - }; class Signal_Handler diff --git a/ACE/apps/JAWS3/http/HTTP_Data.h b/ACE/apps/JAWS3/http/HTTP_Data.h index 39dd63b79b74d..ae6a3bb0c778a 100644 --- a/ACE/apps/JAWS3/http/HTTP_Data.h +++ b/ACE/apps/JAWS3/http/HTTP_Data.h @@ -11,19 +11,16 @@ class JAWS_HTTP_Service_Handler; class JAWS_HTTP_Data { public: - JAWS_HTTP_Data (JAWS_HTTP_Service_Handler *sh); - ACE_SOCK_Stream & peer (void); - ACE_Message_Block & mb (void); - ACE_FILE_IO & file_io (void); + ACE_SOCK_Stream & peer (); + ACE_Message_Block & mb (); + ACE_FILE_IO & file_io (); private: - JAWS_HTTP_Service_Handler *sh_; ACE_Message_Block mb_; ACE_FILE_IO file_io_; - }; #endif /* JAWS_HTTP_DATA_H */ diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp b/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp index b548cb52685eb..3c80dd3b67af7 100644 --- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp +++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp @@ -8,7 +8,7 @@ #include "HTTP_States.h" #include "HTTP_Data.h" -JAWS_HTTP_Service_Handler::JAWS_HTTP_Service_Handler (void) +JAWS_HTTP_Service_Handler::JAWS_HTTP_Service_Handler () : JAWS_Protocol_Handler (JAWS_HTTP_Read_Request::instance (), & this->data_) , data_ (this) { diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h index c8df6d3eba145..e456ffd8502e1 100644 --- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h +++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h @@ -26,17 +26,14 @@ class JAWS_HTTP_Service_Handler // there is less programming effort. { public: - - JAWS_HTTP_Service_Handler (void); + JAWS_HTTP_Service_Handler (); int open (void *); int close (unsigned long); private: - JAWS_HTTP_Data data_; - }; @@ -52,9 +49,7 @@ class ACE_Svc_Export JAWS_HTTP_Acceptor // is created. { public: - int init (int argc, ACE_TCHAR *argv[]); - }; ACE_SVC_FACTORY_DECLARE (JAWS_HTTP_Acceptor) diff --git a/ACE/apps/JAWS3/http/HTTP_States.h b/ACE/apps/JAWS3/http/HTTP_States.h index 8d88514116e88..130eaf3b5784d 100644 --- a/ACE/apps/JAWS3/http/HTTP_States.h +++ b/ACE/apps/JAWS3/http/HTTP_States.h @@ -19,7 +19,7 @@ public: \ , void * \ ); \ \ - static JAWS_Protocol_State * instance (void) \ + static JAWS_Protocol_State * instance () \ { \ return ACE_Singleton \ ::instance (); \ diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp index bc00dc656d48a..8b894bae75aba 100644 --- a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp +++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp @@ -118,7 +118,6 @@ JAWS_Asynch_IO::transmit ( ACE_HANDLE handle } - JAWS_EC_AH_Adapter * JAWS_EC_AH_Adapter::make (JAWS_Event_Completer *completer) { diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.h b/ACE/apps/JAWS3/jaws3/Asynch_IO.h index bb55cf58d5a81..1be659522d895 100644 --- a/ACE/apps/JAWS3/jaws3/Asynch_IO.h +++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.h @@ -16,8 +16,7 @@ class JAWS_Asynch_IO; class JAWS_Export JAWS_Asynch_IO : public JAWS_IO_Impl { public: - - static JAWS_Asynch_IO * instance (void) + static JAWS_Asynch_IO * instance () { return ACE_Singleton::instance (); } @@ -64,7 +63,6 @@ class JAWS_Export JAWS_Asynch_IO : public JAWS_IO_Impl , ACE_Message_Block *header = 0 , ACE_Message_Block *trailer = 0 ); - }; #endif /* JAWS_ASYNCH_IO_H */ diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h index 08567ddb5b251..693250730c5a0 100644 --- a/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h +++ b/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h @@ -20,7 +20,6 @@ class JAWS_EC_AH_Adapter : public ACE_Handler // if the given platform supports POSIX or WIN32 asynch IO. { public: - static JAWS_EC_AH_Adapter * make (JAWS_Event_Completer *); void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result); @@ -30,23 +29,19 @@ class JAWS_EC_AH_Adapter : public ACE_Handler void handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result); private: - JAWS_EC_AH_Adapter (JAWS_Event_Completer *completer) : completer_ (completer) { } protected: - JAWS_Event_Result make_io_result ( const ACE_Asynch_Result &result , JAWS_Event_Result::JE_REASON reason_ok , JAWS_Event_Result::JE_REASON reason_fail ); private: - JAWS_Event_Completer *completer_; - }; #endif /* JAWS_ASYNCH_IO_HELPERS_H */ diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp index 7960f2a03681a..bcd714d7a8114 100644 --- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp +++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp @@ -20,7 +20,7 @@ JAWS_Cached_Allocator::set_next_pool (char *pool, char *next_pool) } template void -JAWS_Cached_Allocator::extend_pool (void) +JAWS_Cached_Allocator::extend_pool () { char *new_pool = 0; ACE_NEW (new_pool, char[this->pool_size_ + sizeof (char *)]); @@ -51,7 +51,7 @@ JAWS_Cached_Allocator::JAWS_Cached_Allocator (size_t n_chunks) } template -JAWS_Cached_Allocator::~JAWS_Cached_Allocator (void) +JAWS_Cached_Allocator::~JAWS_Cached_Allocator () { char *curr = this->pool_head_; @@ -92,7 +92,7 @@ JAWS_Cached_Allocator::free (void *ptr) template JAWS_Cached_Allocator * -JAWS_TSS_Cached_Allocator::ts_allocator (void) +JAWS_TSS_Cached_Allocator::ts_allocator () { JAWS_Cached_Allocator *ts_obj = 0; @@ -118,7 +118,7 @@ JAWS_TSS_Cached_Allocator::JAWS_TSS_Cached_Allocator (size_t n_chunks) } template -JAWS_TSS_Cached_Allocator::~JAWS_TSS_Cached_Allocator (void) +JAWS_TSS_Cached_Allocator::~JAWS_TSS_Cached_Allocator () { } diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h index 67082e2bad644..03f7f7959957b 100644 --- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h +++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h @@ -22,10 +22,9 @@ class JAWS_Cached_Allocator : public ACE_New_Allocator // fixed-sized classes. { public: - JAWS_Cached_Allocator (size_t n_chunks = JAWS_DEFAULT_ALLOCATOR_CHUNKS); - ~JAWS_Cached_Allocator (void); + ~JAWS_Cached_Allocator (); void* malloc (size_t); // get a chunk of memory from free store. @@ -34,15 +33,13 @@ class JAWS_Cached_Allocator : public ACE_New_Allocator // return a chunk of memory back to free store. protected: - char * get_next_pool (char *pool); void set_next_pool (char *pool, char *next_pool); - void extend_pool (void); + void extend_pool (); private: - size_t pool_size_; char *pool_head_; @@ -53,11 +50,9 @@ class JAWS_Cached_Allocator : public ACE_New_Allocator ACE_Locked_Free_List, ACE_LOCK> free_list_; // Maintain a cached memory free list. - }; - template class JAWS_TSS_Cached_Allocator : public ACE_New_Allocator // = TITLE @@ -69,10 +64,9 @@ class JAWS_TSS_Cached_Allocator : public ACE_New_Allocator // fixed-sized classes. { public: - JAWS_TSS_Cached_Allocator (size_t n_chunks = JAWS_DEFAULT_ALLOCATOR_CHUNKS); - ~JAWS_TSS_Cached_Allocator (void); + ~JAWS_TSS_Cached_Allocator (); void * malloc (size_t); // get a chunk of memory from free store. @@ -81,25 +75,14 @@ class JAWS_TSS_Cached_Allocator : public ACE_New_Allocator // return a chunk of memory back to free store. protected: - - JAWS_Cached_Allocator * ts_allocator (void); + JAWS_Cached_Allocator * ts_allocator (); private: - size_t n_chunks_; ACE_TSS_TYPE (JAWS_CACHED_ALLOCATOR(T)) ts_allocator_; - }; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "jaws3/Cached_Allocator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cached_Allocator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* JAWS_CACHED_ALLOCATOR_T_H */ diff --git a/ACE/apps/JAWS3/jaws3/Concurrency.cpp b/ACE/apps/JAWS3/jaws3/Concurrency.cpp index de8f19e417d2a..b637c86e406bf 100644 --- a/ACE/apps/JAWS3/jaws3/Concurrency.cpp +++ b/ACE/apps/JAWS3/jaws3/Concurrency.cpp @@ -20,7 +20,7 @@ typedef ACE_Singleton int -JAWS_Concurrency_Impl::svc (void) +JAWS_Concurrency_Impl::svc () { JAWS_Protocol_Handler *ph; @@ -84,7 +84,7 @@ ::getq (JAWS_Protocol_Handler *&ph) void -JAWS_Concurrency_Bridge::shutdown (void) +JAWS_Concurrency_Bridge::shutdown () { ACE_Message_Block *empty_mb = JAWS_Empty_Message_Block::instance (); JAWS_CONCURRENCY_TASK *task; diff --git a/ACE/apps/JAWS3/jaws3/Concurrency.h b/ACE/apps/JAWS3/jaws3/Concurrency.h index 7009bbacc5df3..3b303b6a31295 100644 --- a/ACE/apps/JAWS3/jaws3/Concurrency.h +++ b/ACE/apps/JAWS3/jaws3/Concurrency.h @@ -15,15 +15,13 @@ typedef ACE_Task JAWS_CONCURRENCY_TASK; class JAWS_Export JAWS_Concurrency_Impl : public JAWS_CONCURRENCY_TASK { public: - - virtual ~JAWS_Concurrency_Impl (void) {}; + virtual ~JAWS_Concurrency_Impl () {}; virtual int putq (JAWS_Protocol_Handler *ph) = 0; virtual int getq (JAWS_Protocol_Handler *&ph) = 0; - int svc (void); - + int svc (); }; @@ -35,18 +33,15 @@ template<> class JAWS_Export JAWS_Concurrency_Bridge { public: - JAWS_Concurrency_Bridge (JAWS_Concurrency_Impl *impl = 0); int putq (JAWS_Protocol_Handler *ph); int getq (JAWS_Protocol_Handler *&ph); - void shutdown (void); + void shutdown (); protected: - JAWS_Concurrency_Impl *impl_; - }; @@ -59,12 +54,10 @@ class JAWS_Export JAWS_Concurrency : public JAWS_Concurrency_Bridge { public: - - static JAWS_Concurrency * instance (void) + static JAWS_Concurrency * instance () { return ACE_Singleton::instance (); } - }; diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp b/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp index 3882a4e81581d..11bbaf82a02e0 100644 --- a/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp +++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp @@ -34,7 +34,7 @@ JAWS_Concurrency_Bridge::getq (JAWS_Protocol_Handler *&ph) template void -JAWS_Concurrency_Bridge::shutdown (void) +JAWS_Concurrency_Bridge::shutdown () { ACE_Message_Block *empty_mb = JAWS_Empty_Message_Block::instance (); JAWS_CONCURRENCY_TASK *task; diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.h b/ACE/apps/JAWS3/jaws3/Concurrency_T.h index cbae2ebe0b41d..2313c7374399d 100644 --- a/ACE/apps/JAWS3/jaws3/Concurrency_T.h +++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.h @@ -21,27 +21,17 @@ class JAWS_Concurrency_Bridge // { public: - JAWS_Concurrency_Bridge (CONCURRENCY_IMPL *impl = 0); int putq (JAWS_Protocol_Handler *ph); int getq (JAWS_Protocol_Handler *&ph); - void shutdown (void); + void shutdown (); protected: - CONCURRENCY_IMPL *impl_; - }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "jaws3/Concurrency_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Concurrency_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* JAWS_CONCURRENCY_T_H */ diff --git a/ACE/apps/JAWS3/jaws3/Config_File.cpp b/ACE/apps/JAWS3/jaws3/Config_File.cpp index ff2fa889489e2..9c73c9da1546e 100644 --- a/ACE/apps/JAWS3/jaws3/Config_File.cpp +++ b/ACE/apps/JAWS3/jaws3/Config_File.cpp @@ -17,8 +17,7 @@ class JAWS_strings { public: - - ~JAWS_strings (void) + ~JAWS_strings () { void *p; while (this->queue_.dequeue_head (p) != -1) @@ -50,9 +49,7 @@ class JAWS_strings } private: - ACE_Unbounded_Queue queue_; - }; @@ -62,23 +59,20 @@ class JAWS_strings class JAWS_Config_File_Impl { public: - JAWS_Config_File_Impl (const ACE_TCHAR *config_file); - ~JAWS_Config_File_Impl (void); + ~JAWS_Config_File_Impl (); int find (const ACE_TCHAR *key, const ACE_TCHAR *&value); - void parse_file (void); - void reset (void); - void dump (void); + void parse_file (); + void reset (); + void dump (); enum { JAWS_CONFIG_FILE_SYMBOL_TABLE_SIZE = 211 }; private: - ACE_FILE_Addr faddr_; JAWS_strings *strings_; JAWS_Symbol_Table *symbols_; - }; JAWS_Config_File_Impl::JAWS_Config_File_Impl (const ACE_TCHAR *config_file) @@ -91,7 +85,7 @@ JAWS_Config_File_Impl::JAWS_Config_File_Impl (const ACE_TCHAR *config_file) this->parse_file (); } -JAWS_Config_File_Impl::~JAWS_Config_File_Impl (void) +JAWS_Config_File_Impl::~JAWS_Config_File_Impl () { delete this->symbols_; this->symbols_ = 0; @@ -106,7 +100,7 @@ JAWS_Config_File_Impl::find (const ACE_TCHAR *key, const ACE_TCHAR *&value) } void -JAWS_Config_File_Impl::parse_file (void) +JAWS_Config_File_Impl::parse_file () { ACE_FILE_Connector fconnector; ACE_FILE_IO fio; @@ -248,7 +242,7 @@ JAWS_Config_File_Impl::parse_file (void) } void -JAWS_Config_File_Impl::reset (void) +JAWS_Config_File_Impl::reset () { delete this->symbols_; delete this->strings_; @@ -258,7 +252,7 @@ JAWS_Config_File_Impl::reset (void) } void -JAWS_Config_File_Impl::dump (void) +JAWS_Config_File_Impl::dump () { JAWS_SYMBOL_TABLE_ITERATOR iter (*this->symbols_); JAWS_SYMBOL_TABLE_ENTRY *entry = 0; @@ -289,13 +283,13 @@ JAWS_Config_File::find (const ACE_TCHAR *key, const ACE_TCHAR *&value) } void -JAWS_Config_File::reset (void) +JAWS_Config_File::reset () { this->impl_->reset (); } void -JAWS_Config_File::dump (void) +JAWS_Config_File::dump () { this->impl_->dump (); } diff --git a/ACE/apps/JAWS3/jaws3/Config_File.h b/ACE/apps/JAWS3/jaws3/Config_File.h index cc93f9af134a2..4eca8925e95f0 100644 --- a/ACE/apps/JAWS3/jaws3/Config_File.h +++ b/ACE/apps/JAWS3/jaws3/Config_File.h @@ -41,7 +41,6 @@ class JAWS_Export JAWS_Config_File // No is to exceed 4094 characters. { public: - // = Initialization JAWS_Config_File (const ACE_TCHAR *config_file, @@ -54,18 +53,15 @@ class JAWS_Export JAWS_Config_File // Find the associated with . public: - - void reset (void); + void reset (); // Re-read the configuration file. - void dump (void); + void dump (); // Dump the values of all configuration variables. private: - JAWS_Config_File_Impl *impl_; // Opaque implementation. - }; #endif /* JAWS_CONFIG_FILE_H */ diff --git a/ACE/apps/JAWS3/jaws3/Datagram.h b/ACE/apps/JAWS3/jaws3/Datagram.h index 244c1a35f7938..59e38a309b279 100644 --- a/ACE/apps/JAWS3/jaws3/Datagram.h +++ b/ACE/apps/JAWS3/jaws3/Datagram.h @@ -13,8 +13,7 @@ class JAWS_Export JAWS_Datagram_Impl { public: - - virtual ~JAWS_Datagram_Impl (void) {} + virtual ~JAWS_Datagram_Impl () {} virtual void accept ( const ACE_Addr &local_sap , ACE_SOCK_Dgram &new_dgram @@ -72,17 +71,15 @@ class JAWS_Export JAWS_Datagram_Impl // The address to new_dgram is passed back as the data member of // the JAWS_Event_Result that is returned to the completer. // Use the specified local access point. - }; class JAWS_Export JAWS_Datagram { public: - JAWS_Datagram (JAWS_Datagram_Impl *impl = 0); - static JAWS_Datagram * instance (void) + static JAWS_Datagram * instance () { return ACE_Singleton::instance (); } @@ -129,9 +126,7 @@ class JAWS_Export JAWS_Datagram ); private: - JAWS_Datagram_Impl *impl_; - }; #endif /* JAWS_DATAGRAM_H */ diff --git a/ACE/apps/JAWS3/jaws3/Event_Completer.cpp b/ACE/apps/JAWS3/jaws3/Event_Completer.cpp index f971714d96f29..40a6ba6d473f0 100644 --- a/ACE/apps/JAWS3/jaws3/Event_Completer.cpp +++ b/ACE/apps/JAWS3/jaws3/Event_Completer.cpp @@ -6,7 +6,7 @@ // Default do nothing completers. -JAWS_Event_Completer::~JAWS_Event_Completer (void) +JAWS_Event_Completer::~JAWS_Event_Completer () { } diff --git a/ACE/apps/JAWS3/jaws3/Event_Completer.h b/ACE/apps/JAWS3/jaws3/Event_Completer.h index 26e2e4b9775f2..357fd8fb8c427 100644 --- a/ACE/apps/JAWS3/jaws3/Event_Completer.h +++ b/ACE/apps/JAWS3/jaws3/Event_Completer.h @@ -12,8 +12,7 @@ class JAWS_Export JAWS_Event_Completer // Event completion callback class. { public: - - virtual ~JAWS_Event_Completer (void); + virtual ~JAWS_Event_Completer (); virtual void accept_complete (const JAWS_Event_Result &r, void *act = 0); // The callback entry point when input has been read. @@ -35,7 +34,6 @@ class JAWS_Export JAWS_Event_Completer virtual void default_complete (const JAWS_Event_Result &r, void *act = 0); // The defaul callback entry point when an event completes. - }; #endif /* JAWS_EVENT_COMPLETER_H */ diff --git a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp index adf97124453e4..43ff3acd3e431 100644 --- a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp +++ b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.cpp @@ -19,14 +19,14 @@ JAWS_Event_Dispatcher_Proactor_Event_Loop (void *) void -JAWS_Event_Dispatcher::end_event_loop (void) +JAWS_Event_Dispatcher::end_event_loop () { ACE_Reactor::end_event_loop (); } void -JAWS_Event_Dispatcher::run_event_loop (void) +JAWS_Event_Dispatcher::run_event_loop () { // First, initiate the proactor thread diff --git a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h index d7534dd3c2347..6fb71ce353f1d 100644 --- a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h +++ b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h @@ -41,10 +41,8 @@ class JAWS_Event_Dispatcher; class JAWS_Export JAWS_Event_Dispatcher { public: - - static void end_event_loop (void); - static void run_event_loop (void); - + static void end_event_loop (); + static void run_event_loop (); }; #endif /* JAWS_EVENT_DISPATCHER_H */ diff --git a/ACE/apps/JAWS3/jaws3/Event_Result.h b/ACE/apps/JAWS3/jaws3/Event_Result.h index c2a20d68a29d4..095a557ee3616 100644 --- a/ACE/apps/JAWS3/jaws3/Event_Result.h +++ b/ACE/apps/JAWS3/jaws3/Event_Result.h @@ -12,7 +12,6 @@ class JAWS_Event_Result; class JAWS_Export JAWS_Event_Result { public: - enum JE_STATUS { JE_IDLE , JE_OK @@ -87,7 +86,6 @@ class JAWS_Export JAWS_Event_Result void * data () const { return this->data_; } private: - size_t bytes_; JE_STATUS status_; @@ -96,7 +94,6 @@ class JAWS_Export JAWS_Event_Result int error_number_; void *data_; - }; #endif /* JAWS_EVENT_RESULT_H */ diff --git a/ACE/apps/JAWS3/jaws3/FILE.cpp b/ACE/apps/JAWS3/jaws3/FILE.cpp index 2d27cb76e409d..90a0fd8706b41 100644 --- a/ACE/apps/JAWS3/jaws3/FILE.cpp +++ b/ACE/apps/JAWS3/jaws3/FILE.cpp @@ -10,13 +10,13 @@ #include "jaws3/FILE.h" -JAWS_FILE::JAWS_FILE (void) +JAWS_FILE::JAWS_FILE () : map_ (0) , can_map_ (0) { } -JAWS_FILE::~JAWS_FILE (void) +JAWS_FILE::~JAWS_FILE () { delete this->map_; this->map_ = 0; @@ -74,7 +74,6 @@ JAWS_FILE::mem_map (int length, } return this->map_; - } diff --git a/ACE/apps/JAWS3/jaws3/FILE.h b/ACE/apps/JAWS3/jaws3/FILE.h index e729add3126ea..37c7143ef511a 100644 --- a/ACE/apps/JAWS3/jaws3/FILE.h +++ b/ACE/apps/JAWS3/jaws3/FILE.h @@ -13,10 +13,9 @@ class JAWS_Export JAWS_FILE : public ACE_FILE_IO // Like ACE_FILE_IO, but support for ACE_Mem_Map; { public: + JAWS_FILE (); - JAWS_FILE (void); - - ~JAWS_FILE (void); + ~JAWS_FILE (); ACE_Mem_Map *mem_map (int length = -1, int prot = PROT_RDWR, @@ -36,12 +35,10 @@ class JAWS_Export JAWS_FILE : public ACE_FILE_IO void can_map (int); private: - ACE_SYNCH_MUTEX lock_; ACE_Mem_Map *map_; int can_map_; - }; #endif /* JAWS_FILE_H */ diff --git a/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp b/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp index c9e7e0231cf9a..1e7648bb88458 100644 --- a/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp +++ b/ACE/apps/JAWS3/jaws3/Jaws_IO.cpp @@ -34,7 +34,7 @@ JAWS_IO::JAWS_IO (JAWS_IO_Impl *impl) } } -JAWS_IO::~JAWS_IO (void) +JAWS_IO::~JAWS_IO () { } diff --git a/ACE/apps/JAWS3/jaws3/Jaws_IO.h b/ACE/apps/JAWS3/jaws3/Jaws_IO.h index eb0b8930285dc..f6d41b73d4d5b 100644 --- a/ACE/apps/JAWS3/jaws3/Jaws_IO.h +++ b/ACE/apps/JAWS3/jaws3/Jaws_IO.h @@ -19,8 +19,7 @@ class JAWS_Export JAWS_IO_Impl // Bridge Pattern. { public: - - virtual ~JAWS_IO_Impl (void) {} + virtual ~JAWS_IO_Impl () {} // = Regular IO methods. @@ -68,19 +67,17 @@ class JAWS_Export JAWS_IO_Impl , ACE_Message_Block *header = 0 , ACE_Message_Block *trailer = 0 ) = 0; - }; class JAWS_Export JAWS_IO { public: - JAWS_IO (JAWS_IO_Impl *impl = 0); - ~JAWS_IO (void); + ~JAWS_IO (); - static JAWS_IO * instance (void) + static JAWS_IO * instance () { return ACE_Singleton::instance (); } @@ -130,9 +127,7 @@ class JAWS_Export JAWS_IO private: - JAWS_IO_Impl *impl_; - }; #endif /* JAWS_IO_H */ diff --git a/ACE/apps/JAWS3/jaws3/Options.cpp b/ACE/apps/JAWS3/jaws3/Options.cpp index 572fd06697f62..93b22a9b6e683 100644 --- a/ACE/apps/JAWS3/jaws3/Options.cpp +++ b/ACE/apps/JAWS3/jaws3/Options.cpp @@ -6,7 +6,7 @@ #include "jaws3/Options.h" -JAWS_Options::JAWS_Options (void) +JAWS_Options::JAWS_Options () { this->cf_ = new JAWS_Config_File ("jaws.conf"); } diff --git a/ACE/apps/JAWS3/jaws3/Options.h b/ACE/apps/JAWS3/jaws3/Options.h index 3f9d847475b4b..a8dc9a0ee2f1d 100644 --- a/ACE/apps/JAWS3/jaws3/Options.h +++ b/ACE/apps/JAWS3/jaws3/Options.h @@ -19,20 +19,17 @@ class JAWS_Options; class JAWS_Export JAWS_Options { public: - - JAWS_Options (void); + JAWS_Options (); const char *getenv (const char *key); - static JAWS_Options * instance (void) + static JAWS_Options * instance () { return ACE_Singleton::instance (); } private: - JAWS_Config_File *cf_; - }; #endif /* JAWS_OPTIONS_H */ diff --git a/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp b/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp index e2b715c564142..004f52488a2ea 100644 --- a/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp +++ b/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp @@ -5,7 +5,7 @@ #include "jaws3/Protocol_Handler.h" #include "jaws3/Concurrency.h" -JAWS_Protocol_State::~JAWS_Protocol_State (void) +JAWS_Protocol_State::~JAWS_Protocol_State () { } @@ -21,14 +21,14 @@ JAWS_Protocol_Handler::JAWS_Protocol_Handler ( JAWS_Protocol_State *state } -JAWS_Protocol_Handler::~JAWS_Protocol_Handler (void) +JAWS_Protocol_Handler::~JAWS_Protocol_Handler () { this->mb_.replace_data_block (0); } int -JAWS_Protocol_Handler::service (void) +JAWS_Protocol_Handler::service () { if (this->state_ == 0) return -1; diff --git a/ACE/apps/JAWS3/jaws3/Protocol_Handler.h b/ACE/apps/JAWS3/jaws3/Protocol_Handler.h index 11cc55d0dc392..e4892744fcd7e 100644 --- a/ACE/apps/JAWS3/jaws3/Protocol_Handler.h +++ b/ACE/apps/JAWS3/jaws3/Protocol_Handler.h @@ -9,22 +9,18 @@ class JAWS_Export JAWS_Protocol_State { - friend class JAWS_Protocol_Handler; public: - - virtual ~JAWS_Protocol_State (void); + virtual ~JAWS_Protocol_State (); protected: - virtual int service (JAWS_Event_Completer *, void *data) = 0; virtual JAWS_Protocol_State * transition ( const JAWS_Event_Result & , void *data , void *act ) = 0; - }; class JAWS_Export JAWS_Protocol_Handler @@ -32,29 +28,25 @@ class JAWS_Export JAWS_Protocol_Handler // = TITLE // Abstraction that interacts with concurrency dispatching. { - friend class JAWS_TPOOL_Concurrency; friend class JAWS_TPR_Concurrency; friend class JAWS_THYBRID_Concurrency; public: - JAWS_Protocol_Handler (JAWS_Protocol_State *state = 0, void *data = 0); - virtual int service (void); + virtual int service (); - virtual void dismiss (void) + virtual void dismiss () { delete this; } protected: - - virtual ~JAWS_Protocol_Handler (void); + virtual ~JAWS_Protocol_Handler (); // Try to guarantee this class will be created dynamically. protected: - void event_complete (const JAWS_Event_Result &result, void *act); // The event completion routine that triggers the transition // to the next Protocol State. @@ -65,14 +57,12 @@ class JAWS_Export JAWS_Protocol_Handler } private: - JAWS_Protocol_State *state_; void *data_; ACE_Data_Block db_; ACE_Message_Block mb_; - }; diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp index b7834e18a713d..bc9252a80301a 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp @@ -68,7 +68,6 @@ JAWS_Reactive_IO::recv ( ACE_HANDLE handle , void *act ) { - JAWS_IO_Reactive_Recv *rr; rr = JAWS_IO_Reactive_Recv::make (handle, mb, completer, tv, act); @@ -156,7 +155,7 @@ JAWS_Reactive_IO::transmit ( ACE_HANDLE handle void -JAWS_IO_Reactive_Handler::open (void) +JAWS_IO_Reactive_Handler::open () { int result = ACE_Reactor::instance ()->notify (this); diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO.h b/ACE/apps/JAWS3/jaws3/Reactive_IO.h index d4bf77283bfe9..5ca6c3ed6bd38 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO.h +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.h @@ -16,8 +16,7 @@ class JAWS_Reactive_IO; class JAWS_Export JAWS_Reactive_IO : public JAWS_IO_Impl { public: - - static JAWS_Reactive_IO * instance (void) + static JAWS_Reactive_IO * instance () { return ACE_Singleton::instance (); } @@ -64,7 +63,6 @@ class JAWS_Export JAWS_Reactive_IO : public JAWS_IO_Impl , ACE_Message_Block *header = 0 , ACE_Message_Block *trailer = 0 ); - }; #endif /* JAWS_REACTIVE_IO_H */ diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h index 780737ec32b4e..08258f888df39 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h @@ -16,14 +16,12 @@ class JAWS_Reactive_IO; class JAWS_IO_Reactive_Handler : public ACE_Event_Handler { - friend class JAWS_IO_Reactive_Send; friend class JAWS_IO_Reactive_Recv; friend class JAWS_IO_Reactive_Transmit; public: - - virtual void open (void); + virtual void open (); int handle_timeout (const ACE_Time_Value &, const void *); @@ -36,11 +34,9 @@ class JAWS_IO_Reactive_Handler : public ACE_Event_Handler void set_handle (ACE_HANDLE handle) { this->handle_ = handle; } protected: - virtual void close (int result); private: - JAWS_IO_Reactive_Handler ( ACE_HANDLE handle , JAWS_Event_Completer *completer , const ACE_Time_Value &tv @@ -63,14 +59,13 @@ class JAWS_IO_Reactive_Handler : public ACE_Event_Handler public: // needed for destructor due to "aCC: HP ANSI C++ B3910B A.03.39" compiler bug - ~JAWS_IO_Reactive_Handler (void) + ~JAWS_IO_Reactive_Handler () { if (this->timer_id_ != -1) ACE_Reactor::instance ()->cancel_timer (this->timer_id_); } private: - JAWS_Event_Result io_result_; size_t bytes_; @@ -83,17 +78,14 @@ class JAWS_IO_Reactive_Handler : public ACE_Event_Handler long timer_id_; int was_active_; - }; class JAWS_IO_Reactive_Send : public JAWS_IO_Reactive_Handler { - friend class JAWS_Reactive_IO; public: - int handle_output (ACE_HANDLE handle); static JAWS_IO_Reactive_Send * make ( ACE_HANDLE handle @@ -128,7 +120,6 @@ class JAWS_IO_Reactive_Send : public JAWS_IO_Reactive_Handler } private: - JAWS_IO_Reactive_Send ( ACE_HANDLE handle , ACE_Message_Block *mb , JAWS_Event_Completer *completer @@ -142,19 +133,15 @@ class JAWS_IO_Reactive_Send : public JAWS_IO_Reactive_Handler } private: - ACE_Message_Block *mb_; - }; class JAWS_IO_Reactive_Recv : public JAWS_IO_Reactive_Handler { - friend class JAWS_Reactive_IO; public: - int handle_input (ACE_HANDLE handle); static JAWS_IO_Reactive_Recv * make ( ACE_HANDLE handle @@ -189,7 +176,6 @@ class JAWS_IO_Reactive_Recv : public JAWS_IO_Reactive_Handler } private: - JAWS_IO_Reactive_Recv ( ACE_HANDLE handle , ACE_Message_Block *mb , JAWS_Event_Completer *completer @@ -203,19 +189,15 @@ class JAWS_IO_Reactive_Recv : public JAWS_IO_Reactive_Handler } private: - ACE_Message_Block *mb_; - }; class JAWS_IO_Reactive_Transmit : public JAWS_IO_Reactive_Handler { - friend class JAWS_Reactive_IO; public: - int handle_timeout (const ACE_Time_Value &, const void *); int handle_output (ACE_HANDLE handle); @@ -262,7 +244,6 @@ class JAWS_IO_Reactive_Transmit : public JAWS_IO_Reactive_Handler } protected: - void close (int result); int handle_output_header (ACE_HANDLE handle); @@ -274,7 +255,6 @@ class JAWS_IO_Reactive_Transmit : public JAWS_IO_Reactive_Handler int handle_output_mb (ACE_HANDLE handle, ACE_Message_Block *&mb); private: - JAWS_IO_Reactive_Transmit ( ACE_HANDLE handle , ACE_HANDLE source , JAWS_Event_Completer *completer @@ -294,13 +274,11 @@ class JAWS_IO_Reactive_Transmit : public JAWS_IO_Reactive_Handler } private: - ACE_HANDLE source_; ACE_Message_Block source_mb_; ACE_Message_Block *source_buf_; ACE_Message_Block *header_; ACE_Message_Block *trailer_; - }; #endif /* JAWS_REACTIVE_IO_HELPERS_H */ diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.cpp b/ACE/apps/JAWS3/jaws3/Signal_Task.cpp index a379721fb694d..855d39e4f1b38 100644 --- a/ACE/apps/JAWS3/jaws3/Signal_Task.cpp +++ b/ACE/apps/JAWS3/jaws3/Signal_Task.cpp @@ -44,7 +44,6 @@ JAWS_Signal_Task_function (void *) #endif // !defined (ACE_WIN32) default: break; - } } @@ -53,7 +52,7 @@ JAWS_Signal_Task_function (void *) } -JAWS_Signal_Task::JAWS_Signal_Task (void) +JAWS_Signal_Task::JAWS_Signal_Task () { // Set our signal mask. this->sigset_.empty_set (); diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.h b/ACE/apps/JAWS3/jaws3/Signal_Task.h index 242db3f9f8aad..be386dec56a7d 100644 --- a/ACE/apps/JAWS3/jaws3/Signal_Task.h +++ b/ACE/apps/JAWS3/jaws3/Signal_Task.h @@ -11,20 +11,17 @@ class JAWS_Export JAWS_Signal_Task { public: + JAWS_Signal_Task (); - JAWS_Signal_Task (void); - - static JAWS_Signal_Task * instance (void) + static JAWS_Signal_Task * instance () { return ACE_Singleton::instance (); } - ACE_Sig_Set & sigset (void) { return this->sigset_; } + ACE_Sig_Set & sigset () { return this->sigset_; } private: - ACE_Sig_Set sigset_; - }; #endif /* JAWS_SIGNAL_TASK_H */ diff --git a/ACE/apps/JAWS3/jaws3/Symbol_Table.h b/ACE/apps/JAWS3/jaws3/Symbol_Table.h index c19120c5eca03..05b798daa9a59 100644 --- a/ACE/apps/JAWS3/jaws3/Symbol_Table.h +++ b/ACE/apps/JAWS3/jaws3/Symbol_Table.h @@ -41,7 +41,6 @@ class JAWS_Export JAWS_Symbol_Table : public JAWS_SYMBOL_TABLE_BASE public: JAWS_Symbol_Table (size_t size = 211); // Hash table should be a prime. - }; #endif /* JAWS_SYMBOL_TABLE_H */ diff --git a/ACE/apps/JAWS3/jaws3/Synch_IO.h b/ACE/apps/JAWS3/jaws3/Synch_IO.h index d4d56063605c5..d549b60ece56a 100644 --- a/ACE/apps/JAWS3/jaws3/Synch_IO.h +++ b/ACE/apps/JAWS3/jaws3/Synch_IO.h @@ -9,8 +9,7 @@ class JAWS_Export JAWS_Synch_IO : public JAWS_IO_Impl { public: - - static JAWS_Synch_IO * instance (void) + static JAWS_Synch_IO * instance () { return ACE_Singleton::instance (); } @@ -57,7 +56,6 @@ class JAWS_Export JAWS_Synch_IO : public JAWS_IO_Impl , ACE_Message_Block *header = 0 , ACE_Message_Block *trailer = 0 ); - }; #endif /* JAWS_SYNCH_IO_H */ diff --git a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp index 76bdfd8c47b54..13290d06ca957 100644 --- a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp +++ b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp @@ -11,7 +11,7 @@ #include "jaws3/Options.h" -JAWS_THYBRID_Concurrency::JAWS_THYBRID_Concurrency (void) +JAWS_THYBRID_Concurrency::JAWS_THYBRID_Concurrency () : getting_ (0) , min_number_of_threads_ (1) , max_number_of_threads_ (-1) diff --git a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h index 0600e9ca28737..ff7a2b0d67686 100644 --- a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h +++ b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h @@ -9,27 +9,24 @@ class JAWS_Export JAWS_THYBRID_Concurrency : public JAWS_Concurrency_Impl { public: - - JAWS_THYBRID_Concurrency (void); + JAWS_THYBRID_Concurrency (); int putq (JAWS_Protocol_Handler *ph); int getq (JAWS_Protocol_Handler *&ph); - static JAWS_THYBRID_Concurrency * instance (void) + static JAWS_THYBRID_Concurrency * instance () { return ACE_Singleton ::instance (); } private: - ACE_Atomic_Op getting_; int min_number_of_threads_; int max_number_of_threads_; int shutdown_task_; int error_; - }; #endif /* JAWS_THYBRID_CONCURRENCY_H */ diff --git a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp index 9a9d0ce104bcf..1e78ef73a7580 100644 --- a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp +++ b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp @@ -9,7 +9,7 @@ #include "jaws3/Protocol_Handler.h" #include "jaws3/Options.h" -JAWS_TPOOL_Concurrency::JAWS_TPOOL_Concurrency (void) +JAWS_TPOOL_Concurrency::JAWS_TPOOL_Concurrency () : number_of_threads_ (5) , shutdown_task_ (0) , error_ (0) diff --git a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h index 2a614b2fb0dfb..06af9e1b5b3aa 100644 --- a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h +++ b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h @@ -7,24 +7,21 @@ class JAWS_Export JAWS_TPOOL_Concurrency : public JAWS_Concurrency_Impl { public: - - JAWS_TPOOL_Concurrency (void); + JAWS_TPOOL_Concurrency (); int putq (JAWS_Protocol_Handler *ph); int getq (JAWS_Protocol_Handler *&ph); - static JAWS_TPOOL_Concurrency * instance (void) + static JAWS_TPOOL_Concurrency * instance () { return ACE_Singleton::instance (); } private: - int number_of_threads_; int shutdown_task_; int error_; - }; #endif /* JAWS_TPOOL_CONCURRENCY_H */ diff --git a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp index 15a547c685eda..02af889d86512 100644 --- a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp +++ b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp @@ -10,7 +10,7 @@ #include "jaws3/Options.h" -JAWS_TPR_Concurrency::JAWS_TPR_Concurrency (void) +JAWS_TPR_Concurrency::JAWS_TPR_Concurrency () : getting_ (0) , shutdown_task_ (0) , error_ (0) diff --git a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h index 32d57830192c8..ea83640c795ca 100644 --- a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h +++ b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h @@ -9,25 +9,22 @@ class JAWS_Export JAWS_TPR_Concurrency : public JAWS_Concurrency_Impl { public: - - JAWS_TPR_Concurrency (void); + JAWS_TPR_Concurrency (); int putq (JAWS_Protocol_Handler *ph); int getq (JAWS_Protocol_Handler *&ph); - static JAWS_TPR_Concurrency * instance (void) + static JAWS_TPR_Concurrency * instance () { return ACE_Singleton::instance (); } private: - ACE_Atomic_Op getting_; int min_number_of_threads_; int shutdown_task_; int error_; - }; #endif /* JAWS_TPR_CONCURRENCY_H */ diff --git a/ACE/apps/JAWS3/jaws3/Task_Timer.cpp b/ACE/apps/JAWS3/jaws3/Task_Timer.cpp index 3bd8b01a1128d..a24e8e53e374c 100644 --- a/ACE/apps/JAWS3/jaws3/Task_Timer.cpp +++ b/ACE/apps/JAWS3/jaws3/Task_Timer.cpp @@ -8,7 +8,7 @@ #include "jaws3/Timer_Helpers.h" -JAWS_Task_Timer::JAWS_Task_Timer (void) +JAWS_Task_Timer::JAWS_Task_Timer () { this->timer_queue_.activate (); } diff --git a/ACE/apps/JAWS3/jaws3/Task_Timer.h b/ACE/apps/JAWS3/jaws3/Task_Timer.h index 7353fb4faa429..547b474091574 100644 --- a/ACE/apps/JAWS3/jaws3/Task_Timer.h +++ b/ACE/apps/JAWS3/jaws3/Task_Timer.h @@ -14,10 +14,9 @@ class JAWS_Task_Timer; class JAWS_Export JAWS_Task_Timer : public JAWS_Timer_Impl { public: + JAWS_Task_Timer (); - JAWS_Task_Timer (void); - - static JAWS_Timer_Impl * instance (void) + static JAWS_Timer_Impl * instance () { return ACE_Singleton::instance (); } @@ -46,9 +45,7 @@ class JAWS_Export JAWS_Task_Timer : public JAWS_Timer_Impl // is being used as the timer helper). private: - ACE_Thread_Timer_Queue_Adapter timer_queue_; - }; #endif /* JAWS_TASK_TIMER_H */ diff --git a/ACE/apps/JAWS3/jaws3/Timer.h b/ACE/apps/JAWS3/jaws3/Timer.h index 9f00ed5a75db6..31c2affdc0442 100644 --- a/ACE/apps/JAWS3/jaws3/Timer.h +++ b/ACE/apps/JAWS3/jaws3/Timer.h @@ -18,8 +18,7 @@ class JAWS_Export JAWS_Timer_Impl // RHS of the Bridge pattern. { public: - - virtual ~JAWS_Timer_Impl (void) {} + virtual ~JAWS_Timer_Impl () {} virtual void schedule_timer ( long *timer_id , const ACE_Time_Value &delta @@ -44,7 +43,6 @@ class JAWS_Export JAWS_Timer_Impl virtual void cancel_timer (long timer_id) = 0; // Cancel a timer. - }; @@ -54,10 +52,9 @@ class JAWS_Export JAWS_Timer // Bridge pattern. { public: - JAWS_Timer (JAWS_Timer_Impl *impl = 0); - static JAWS_Timer * instance (void) + static JAWS_Timer * instance () { return ACE_Singleton::instance (); } @@ -83,9 +80,7 @@ class JAWS_Export JAWS_Timer void cancel_timer (long timer_id); private: - JAWS_Timer_Impl *impl_; - }; diff --git a/ACE/apps/JAWS3/jaws3/Timer_Helpers.h b/ACE/apps/JAWS3/jaws3/Timer_Helpers.h index 3429dedbbabb8..5a346716afb49 100644 --- a/ACE/apps/JAWS3/jaws3/Timer_Helpers.h +++ b/ACE/apps/JAWS3/jaws3/Timer_Helpers.h @@ -12,7 +12,6 @@ class JAWS_Timer_EH : public ACE_Event_Handler { public: - JAWS_Timer_EH ( JAWS_Event_Completer *completer , void *act = 0 , int interval = 0 @@ -31,12 +30,10 @@ class JAWS_Timer_EH : public ACE_Event_Handler // Called directly when timer is canceled. private: - JAWS_Event_Completer *completer_; void *act_; const int interval_; int expired_; - }; #endif /* JAWS_TIMER_HELPERS_H */ diff --git a/ACE/apps/JAWS3/small/SS_Data.cpp b/ACE/apps/JAWS3/small/SS_Data.cpp index 36f183e90eb95..05eb9989680fa 100644 --- a/ACE/apps/JAWS3/small/SS_Data.cpp +++ b/ACE/apps/JAWS3/small/SS_Data.cpp @@ -8,19 +8,19 @@ TeraSS_Data::TeraSS_Data (TeraSS_Service_Handler *sh) } ACE_SOCK_Stream & -TeraSS_Data::peer (void) +TeraSS_Data::peer () { return this->sh_->peer (); } ACE_Message_Block & -TeraSS_Data::mb (void) +TeraSS_Data::mb () { return this->mb_; } ACE_FILE_IO & -TeraSS_Data::file_io (void) +TeraSS_Data::file_io () { return this->file_io_; } diff --git a/ACE/apps/JAWS3/small/SS_Data.h b/ACE/apps/JAWS3/small/SS_Data.h index 84edf31467664..8c98856c11e13 100644 --- a/ACE/apps/JAWS3/small/SS_Data.h +++ b/ACE/apps/JAWS3/small/SS_Data.h @@ -11,19 +11,16 @@ class TeraSS_Service_Handler; class TeraSS_Data { public: - TeraSS_Data (TeraSS_Service_Handler *sh); - ACE_SOCK_Stream & peer (void); - ACE_Message_Block & mb (void); - ACE_FILE_IO & file_io (void); + ACE_SOCK_Stream & peer (); + ACE_Message_Block & mb (); + ACE_FILE_IO & file_io (); private: - ACE_Message_Block mb_; TeraSS_Service_Handler *sh_; ACE_FILE_IO file_io_; - }; #endif /* TERA_SS_DATA_H */ diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.cpp b/ACE/apps/JAWS3/small/SS_Service_Handler.cpp index 1b2b9d133bbff..ae3a2b7d395b3 100644 --- a/ACE/apps/JAWS3/small/SS_Service_Handler.cpp +++ b/ACE/apps/JAWS3/small/SS_Service_Handler.cpp @@ -8,7 +8,7 @@ #include "SS_State_READ.h" #include "SS_Data.h" -TeraSS_Service_Handler::TeraSS_Service_Handler (void) +TeraSS_Service_Handler::TeraSS_Service_Handler () : JAWS_Protocol_Handler (TeraSS_State_READ::instance (), & this->data_) , data_ (this) { diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.h b/ACE/apps/JAWS3/small/SS_Service_Handler.h index a7e49ba2d8dfb..2a53337d52e3d 100644 --- a/ACE/apps/JAWS3/small/SS_Service_Handler.h +++ b/ACE/apps/JAWS3/small/SS_Service_Handler.h @@ -27,17 +27,14 @@ class TeraSS_Service_Handler // there is less programming effort. { public: - - TeraSS_Service_Handler (void); + TeraSS_Service_Handler (); int open (void *); int close (unsigned long); private: - TeraSS_Data data_; - }; class ACE_Svc_Export TeraSS_Acceptor @@ -52,9 +49,7 @@ class ACE_Svc_Export TeraSS_Acceptor // is created. { public: - int init (int argc, ACE_TCHAR *argv[]); - }; ACE_SVC_FACTORY_DECLARE (TeraSS_Acceptor) diff --git a/ACE/apps/JAWS3/small/SS_State_DONE.h b/ACE/apps/JAWS3/small/SS_State_DONE.h index de73a3e1c5dc7..c4feebc204519 100644 --- a/ACE/apps/JAWS3/small/SS_State_DONE.h +++ b/ACE/apps/JAWS3/small/SS_State_DONE.h @@ -10,7 +10,6 @@ class TeraSS_State_DONE : public JAWS_Protocol_State { public: - int service (JAWS_Event_Completer *, void *data); JAWS_Protocol_State * transition ( const JAWS_Event_Result &result @@ -18,11 +17,10 @@ class TeraSS_State_DONE : public JAWS_Protocol_State , void *act ); - static JAWS_Protocol_State * instance (void) + static JAWS_Protocol_State * instance () { return ACE_Singleton::instance (); } - }; #endif /* TERA_SS_STATE_DONE_H */ diff --git a/ACE/apps/JAWS3/small/SS_State_ERROR.h b/ACE/apps/JAWS3/small/SS_State_ERROR.h index 4fb09f3c7586d..388259914bb3c 100644 --- a/ACE/apps/JAWS3/small/SS_State_ERROR.h +++ b/ACE/apps/JAWS3/small/SS_State_ERROR.h @@ -9,7 +9,6 @@ class TeraSS_State_ERROR : public JAWS_Protocol_State { public: - int service (JAWS_Event_Completer *, void *data); JAWS_Protocol_State * transition ( const JAWS_Event_Result &result @@ -17,11 +16,10 @@ class TeraSS_State_ERROR : public JAWS_Protocol_State , void *act ); - static JAWS_Protocol_State * instance (void) + static JAWS_Protocol_State * instance () { return ACE_Singleton::instance (); } - }; #endif /* TERA_SS_STATE_ERROR_H */ diff --git a/ACE/apps/JAWS3/small/SS_State_PARSE.h b/ACE/apps/JAWS3/small/SS_State_PARSE.h index d4224a3a07837..b20c27b13f0ff 100644 --- a/ACE/apps/JAWS3/small/SS_State_PARSE.h +++ b/ACE/apps/JAWS3/small/SS_State_PARSE.h @@ -9,7 +9,6 @@ class TeraSS_State_PARSE : public JAWS_Protocol_State { public: - int service (JAWS_Event_Completer *, void *data); JAWS_Protocol_State * transition ( const JAWS_Event_Result &result @@ -17,11 +16,10 @@ class TeraSS_State_PARSE : public JAWS_Protocol_State , void *act ); - static JAWS_Protocol_State * instance (void) + static JAWS_Protocol_State * instance () { return ACE_Singleton::instance (); } - }; #endif /* TERA_SS_STATE_PARSE_H */ diff --git a/ACE/apps/JAWS3/small/SS_State_READ.h b/ACE/apps/JAWS3/small/SS_State_READ.h index c6e2fdcf5d00e..0064914eb06ef 100644 --- a/ACE/apps/JAWS3/small/SS_State_READ.h +++ b/ACE/apps/JAWS3/small/SS_State_READ.h @@ -9,7 +9,6 @@ class TeraSS_State_READ : public JAWS_Protocol_State { public: - int service (JAWS_Event_Completer *, void *data); JAWS_Protocol_State * transition ( const JAWS_Event_Result &result @@ -17,11 +16,10 @@ class TeraSS_State_READ : public JAWS_Protocol_State , void *act ); - static JAWS_Protocol_State * instance (void) + static JAWS_Protocol_State * instance () { return ACE_Singleton::instance (); } - }; #endif /* TERA_SS_STATE_READ_H */ diff --git a/ACE/apps/JAWS3/small/SS_State_WRITE.h b/ACE/apps/JAWS3/small/SS_State_WRITE.h index a12c2578ab9b1..55c91f23219fc 100644 --- a/ACE/apps/JAWS3/small/SS_State_WRITE.h +++ b/ACE/apps/JAWS3/small/SS_State_WRITE.h @@ -9,7 +9,6 @@ class TeraSS_State_WRITE : public JAWS_Protocol_State { public: - int service (JAWS_Event_Completer *, void *data); JAWS_Protocol_State * transition ( const JAWS_Event_Result &result @@ -17,11 +16,10 @@ class TeraSS_State_WRITE : public JAWS_Protocol_State , void *act ); - static JAWS_Protocol_State * instance (void) + static JAWS_Protocol_State * instance () { return ACE_Singleton::instance (); } - }; #endif /* TERA_SS_STATE_WRITE_H */ diff --git a/ACE/apps/drwho/BS_Client.cpp b/ACE/apps/drwho/BS_Client.cpp index 67f3a7c009a0a..3c671b591c753 100644 --- a/ACE/apps/drwho/BS_Client.cpp +++ b/ACE/apps/drwho/BS_Client.cpp @@ -5,7 +5,7 @@ #include "ace/Null_Mutex.h" #include "ace/OS_NS_string.h" -BS_Client::BS_Client (void) +BS_Client::BS_Client () { this->count_ = FILE_MANAGER::instance ()->open_file (Options::friend_file); @@ -77,7 +77,7 @@ BS_Client::insert (const char *key_name, int) } Protocol_Record * -BS_Client::get_each_entry (void) +BS_Client::get_each_entry () { for (Protocol_Record *prp = Binary_Search::get_each_entry (); prp != 0; diff --git a/ACE/apps/drwho/BS_Client.h b/ACE/apps/drwho/BS_Client.h index bf01638072c6e..bf7894c94a068 100644 --- a/ACE/apps/drwho/BS_Client.h +++ b/ACE/apps/drwho/BS_Client.h @@ -24,7 +24,7 @@ class BS_Client : public Binary_Search public: // = Initialization. /// Constructor. - BS_Client (void); + BS_Client (); /** * This function is used to merge the from server @@ -42,7 +42,7 @@ class BS_Client : public Binary_Search * we skip over entries that don't have any hosts associated with * them. */ - virtual Protocol_Record *get_each_entry (void); + virtual Protocol_Record *get_each_entry (); }; #endif /* _BS_CLIENT_H */ diff --git a/ACE/apps/drwho/BS_Server.cpp b/ACE/apps/drwho/BS_Server.cpp index f658d018c1de8..b72d20fb46fc9 100644 --- a/ACE/apps/drwho/BS_Server.cpp +++ b/ACE/apps/drwho/BS_Server.cpp @@ -106,7 +106,7 @@ BS_Server::insert (const char *key_name, int max_len) // (because these entries weren't on the server machine. */ Protocol_Record * -BS_Server::get_next_entry (void) +BS_Server::get_next_entry () { for (Protocol_Record *prp = Binary_Search::get_next_entry (); prp != 0; diff --git a/ACE/apps/drwho/BS_Server.h b/ACE/apps/drwho/BS_Server.h index 4ff7b597bc7c6..fefcc6f718e43 100644 --- a/ACE/apps/drwho/BS_Server.h +++ b/ACE/apps/drwho/BS_Server.h @@ -42,7 +42,7 @@ class BS_Server : public Binary_Search * we skip over entries that don't have any hosts associated with * them. */ - virtual Protocol_Record *get_next_entry (void); + virtual Protocol_Record *get_next_entry (); }; #endif /* _BS_SERVER_H */ diff --git a/ACE/apps/drwho/Binary_Search.cpp b/ACE/apps/drwho/Binary_Search.cpp index 9c18195f35f4d..338b3540fbe77 100644 --- a/ACE/apps/drwho/Binary_Search.cpp +++ b/ACE/apps/drwho/Binary_Search.cpp @@ -18,7 +18,7 @@ Binary_Search::name_compare (const void *s1, const void *s2) // interface to include an "initialize" and "next" function! Protocol_Record * -Binary_Search::get_next_entry (void) +Binary_Search::get_next_entry () { // Reset the iterator if we are starting from the beginning. @@ -43,7 +43,7 @@ Binary_Search::get_next_entry (void) // skip over entries that don't have any hosts associated with them. Protocol_Record * -Binary_Search::get_each_entry (void) +Binary_Search::get_each_entry () { // Reset the iterator if we are starting from the beginning. @@ -63,7 +63,7 @@ Binary_Search::get_each_entry (void) return 0; } -Binary_Search::~Binary_Search (void) +Binary_Search::~Binary_Search () { if (Options::get_opt (Options::DEBUGGING)) ACE_DEBUG ((LM_DEBUG, @@ -72,7 +72,7 @@ Binary_Search::~Binary_Search (void) // Used to initialize the values for the iterators... -Binary_Search::Binary_Search (void) +Binary_Search::Binary_Search () : current_ptr_ (0), current_index_ (0) { diff --git a/ACE/apps/drwho/Binary_Search.h b/ACE/apps/drwho/Binary_Search.h index 3036991ffa910..07c1631444ed7 100644 --- a/ACE/apps/drwho/Binary_Search.h +++ b/ACE/apps/drwho/Binary_Search.h @@ -25,10 +25,10 @@ class Binary_Search : public Search_Struct { public: /// Initialize the values for the iterators... - Binary_Search (void); + Binary_Search (); /// Destructor. - virtual ~Binary_Search (void); + virtual ~Binary_Search (); /** * Returns the next friend in the sequence of sorted friends. Note @@ -36,7 +36,7 @@ class Binary_Search : public Search_Struct * iterator interface to include an "initialize" and "next" * function! */ - virtual Protocol_Record *get_next_entry (void); + virtual Protocol_Record *get_next_entry (); /** * An iterator, similar to Binary_Search::get_next_friend, though in @@ -45,7 +45,7 @@ class Binary_Search : public Search_Struct * we skip over entries that don't have any hosts associated with * them. */ - virtual Protocol_Record *get_each_entry (void); + virtual Protocol_Record *get_each_entry (); /** * This function is used to merge the from server diff --git a/ACE/apps/drwho/CM_Client.cpp b/ACE/apps/drwho/CM_Client.cpp index 36e8c9da3b9df..de5551c06cf3d 100644 --- a/ACE/apps/drwho/CM_Client.cpp +++ b/ACE/apps/drwho/CM_Client.cpp @@ -92,7 +92,7 @@ CM_Client::receive (int timeout) } int -CM_Client::send (void) +CM_Client::send () { int packet_length = 0; @@ -126,12 +126,12 @@ CM_Client::send (void) return 1; } -CM_Client::CM_Client (void) +CM_Client::CM_Client () : top_ (0) { } -CM_Client::~CM_Client (void) +CM_Client::~CM_Client () { if (Options::get_opt (Options::DEBUGGING)) ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/apps/drwho/CM_Client.h b/ACE/apps/drwho/CM_Client.h index ecc5652811bf5..690d87ed4af99 100644 --- a/ACE/apps/drwho/CM_Client.h +++ b/ACE/apps/drwho/CM_Client.h @@ -28,16 +28,16 @@ class CM_Client : public Comm_Manager { public: /// Constructor. - CM_Client (void); + CM_Client (); /// Destructor. - virtual ~CM_Client (void); + virtual ~CM_Client (); virtual int mux (char *packet, int &packet_length) = 0; virtual int demux (char *packet, int &packet_length) = 0; virtual int open (short port_number); virtual int receive (int timeout = 0); - virtual int send (void); + virtual int send (); private: fd_set read_fd_; diff --git a/ACE/apps/drwho/CM_Server.cpp b/ACE/apps/drwho/CM_Server.cpp index 8062a305baa21..5844a915378c1 100644 --- a/ACE/apps/drwho/CM_Server.cpp +++ b/ACE/apps/drwho/CM_Server.cpp @@ -69,7 +69,7 @@ CM_Server::receive (int) } int -CM_Server::send (void) +CM_Server::send () { int packet_length = 0; @@ -93,11 +93,11 @@ CM_Server::send (void) return 1; } -CM_Server::CM_Server (void) +CM_Server::CM_Server () { } -CM_Server::~CM_Server (void) +CM_Server::~CM_Server () { if (Options::get_opt (Options::DEBUGGING)) ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/apps/drwho/CM_Server.h b/ACE/apps/drwho/CM_Server.h index c7f4e8fb8ea44..bd0ffae70b7a6 100644 --- a/ACE/apps/drwho/CM_Server.h +++ b/ACE/apps/drwho/CM_Server.h @@ -24,12 +24,12 @@ class CM_Server : public Comm_Manager { public: - CM_Server (void); - virtual ~CM_Server (void); + CM_Server (); + virtual ~CM_Server (); virtual int open (short port_number); virtual int receive (int timeout = 0); - virtual int send (void); + virtual int send (); virtual int mux (char *packet, int &packet_length) = 0; virtual int demux (char *packet, int &packet_length) = 0; }; diff --git a/ACE/apps/drwho/Comm_Manager.cpp b/ACE/apps/drwho/Comm_Manager.cpp index 9527bf8557ead..7538bde5a1d8a 100644 --- a/ACE/apps/drwho/Comm_Manager.cpp +++ b/ACE/apps/drwho/Comm_Manager.cpp @@ -1,5 +1,5 @@ #include "Comm_Manager.h" -Comm_Manager::~Comm_Manager (void) +Comm_Manager::~Comm_Manager () { } diff --git a/ACE/apps/drwho/Comm_Manager.h b/ACE/apps/drwho/Comm_Manager.h index 911f312b22f95..75a7b1a7a3e1a 100644 --- a/ACE/apps/drwho/Comm_Manager.h +++ b/ACE/apps/drwho/Comm_Manager.h @@ -18,8 +18,7 @@ class Comm_Manager { public: - - virtual ~Comm_Manager (void); + virtual ~Comm_Manager (); // = TITLE // Provides a virtual communcations layer for the drwho program. @@ -33,7 +32,7 @@ class Comm_Manager virtual int demux (char *packet, int &packet_length) = 0; virtual int open (short port_number) = 0; virtual int receive (int timeout = 0) = 0; - virtual int send (void) = 0; + virtual int send () = 0; }; #endif /* _COMM_MANAGER_H */ diff --git a/ACE/apps/drwho/Drwho_Node.cpp b/ACE/apps/drwho/Drwho_Node.cpp index 1786b89f13d96..d4720eb695f89 100644 --- a/ACE/apps/drwho/Drwho_Node.cpp +++ b/ACE/apps/drwho/Drwho_Node.cpp @@ -10,7 +10,7 @@ Drwho_Node::Drwho_Node (const char *h_name, Drwho_Node *n) next_ (n) {} -Drwho_Node::Drwho_Node (void) +Drwho_Node::Drwho_Node () : key_name1_ (0), key_name2_ (0), tty_name_ (0), @@ -21,7 +21,7 @@ Drwho_Node::Drwho_Node (void) {} const char * -Drwho_Node::get_login_name (void) +Drwho_Node::get_login_name () { return this->key_name1_; } @@ -34,7 +34,7 @@ Drwho_Node::set_login_name (const char *str) } const char * -Drwho_Node::get_real_name (void) +Drwho_Node::get_real_name () { return this->key_name2_; } @@ -47,7 +47,7 @@ Drwho_Node::set_real_name (const char *str) } const char * -Drwho_Node::get_host_name (void) +Drwho_Node::get_host_name () { return this->key_name1_; } @@ -60,13 +60,13 @@ Drwho_Node::set_host_name (const char *str) } int -Drwho_Node::get_active_count (void) +Drwho_Node::get_active_count () { return this->active_count_; } int -Drwho_Node::get_inactive_count (void) +Drwho_Node::get_inactive_count () { return this->inactive_count_; } @@ -93,7 +93,7 @@ Drwho_Node::set_idle_time (int idle_time) } int -Drwho_Node::get_idle_time (void) +Drwho_Node::get_idle_time () { return this->idle_time_; } diff --git a/ACE/apps/drwho/Drwho_Node.h b/ACE/apps/drwho/Drwho_Node.h index f463cfbc0722a..03263d23fefe5 100644 --- a/ACE/apps/drwho/Drwho_Node.h +++ b/ACE/apps/drwho/Drwho_Node.h @@ -23,19 +23,19 @@ class Drwho_Node { public: Drwho_Node (const char *host, Drwho_Node *next); - Drwho_Node (void); + Drwho_Node (); - int get_active_count (void); - int get_inactive_count (void); + int get_active_count (); + int get_inactive_count (); int set_active_count (int count); int set_inactive_count (int count); int set_idle_time (int idle_time); - int get_idle_time (void); - const char *get_host_name (void); + int get_idle_time (); + const char *get_host_name (); const char *set_host_name (const char *str); - const char *get_login_name (void); + const char *get_login_name (); const char *set_login_name (const char *); - const char *get_real_name (void); + const char *get_real_name (); const char *set_real_name (const char *); const char *key_name1_; diff --git a/ACE/apps/drwho/File_Manager.cpp b/ACE/apps/drwho/File_Manager.cpp index 2edfde45bc99c..2418da2ffc2e5 100644 --- a/ACE/apps/drwho/File_Manager.cpp +++ b/ACE/apps/drwho/File_Manager.cpp @@ -4,7 +4,7 @@ #include "ace/OS_NS_ctype.h" #include "File_Manager.h" -File_Manager::File_Manager (void) +File_Manager::File_Manager () : number_of_friends (0), max_key_length (0), buffer_ptr (0), @@ -69,7 +69,7 @@ File_Manager::get_login_and_real_name (const char *&login_name, const char *&rea // Open up the yp passwd file and slurp all the users in! int -File_Manager::open_passwd_file (void) +File_Manager::open_passwd_file () { char *filename = const_cast ("passwd-XXXXXX"); ACE_HANDLE f = ACE_OS::mkstemp (filename); diff --git a/ACE/apps/drwho/File_Manager.h b/ACE/apps/drwho/File_Manager.h index 2025d454c7b3b..9482608698a43 100644 --- a/ACE/apps/drwho/File_Manager.h +++ b/ACE/apps/drwho/File_Manager.h @@ -31,7 +31,7 @@ class File_Manager { public: /// Constructor. - File_Manager (void); + File_Manager (); int open_file (const char *filename); void get_login_and_real_name (const char *&login_name, @@ -45,7 +45,7 @@ class File_Manager int buffer_size; int open_friends_file (const char *filename); - int open_passwd_file (void); + int open_passwd_file (); ACE_Mem_Map mmap_; }; diff --git a/ACE/apps/drwho/HT_Server.h b/ACE/apps/drwho/HT_Server.h index 0b6ea255b21a8..40fb514a69144 100644 --- a/ACE/apps/drwho/HT_Server.h +++ b/ACE/apps/drwho/HT_Server.h @@ -21,7 +21,6 @@ */ class HT_Server : public Hash_Table { - public: virtual Protocol_Record *insert (const char *key_name, int max_len = MAXUSERIDNAMELEN); diff --git a/ACE/apps/drwho/Hash_Table.cpp b/ACE/apps/drwho/Hash_Table.cpp index b548056acbd8b..a2e666a81df7d 100644 --- a/ACE/apps/drwho/Hash_Table.cpp +++ b/ACE/apps/drwho/Hash_Table.cpp @@ -4,7 +4,7 @@ #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" -Hash_Table::Hash_Table (void) +Hash_Table::Hash_Table () : current_ptr (0), current_index (0), hash_table_size (HASH_TABLE_SIZE) @@ -19,7 +19,7 @@ Hash_Table::Hash_Table (void) // Iterate through the hash table returning one node at a time... Protocol_Record * -Hash_Table::get_next_entry (void) +Hash_Table::get_next_entry () { // Reset the iterator if we are starting from the beginning. @@ -48,14 +48,14 @@ Hash_Table::get_next_entry (void) } Protocol_Record * -Hash_Table::get_each_entry (void) +Hash_Table::get_each_entry () { return this->get_next_entry (); } // Frees up all the dynamic memory in the hash table. -Hash_Table::~Hash_Table (void) +Hash_Table::~Hash_Table () { if (Options::get_opt (Options::DEBUGGING)) ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/apps/drwho/Hash_Table.h b/ACE/apps/drwho/Hash_Table.h index a2fc1cec73095..24a31d65d2975 100644 --- a/ACE/apps/drwho/Hash_Table.h +++ b/ACE/apps/drwho/Hash_Table.h @@ -22,12 +22,12 @@ class Hash_Table : public Search_Struct { public: - Hash_Table (void); - virtual ~Hash_Table (void); + Hash_Table (); + virtual ~Hash_Table (); virtual Protocol_Record *insert (const char *key_name, int max_len = MAXUSERIDNAMELEN) = 0; - virtual Protocol_Record *get_next_entry (void); - virtual Protocol_Record *get_each_entry (void); + virtual Protocol_Record *get_next_entry (); + virtual Protocol_Record *get_each_entry (); protected: enum diff --git a/ACE/apps/drwho/Multicast_Manager.cpp b/ACE/apps/drwho/Multicast_Manager.cpp index fefc4e854ec65..536a99140b5ec 100644 --- a/ACE/apps/drwho/Multicast_Manager.cpp +++ b/ACE/apps/drwho/Multicast_Manager.cpp @@ -20,7 +20,7 @@ const char *Multicast_Manager::host_names[] = }; void -Multicast_Manager::insert_default_hosts (void) +Multicast_Manager::insert_default_hosts () { // Enter the static list of hosts into the dynamic table! @@ -177,7 +177,7 @@ Host_Elem::Host_Elem (const char *h_name, } int -Multicast_Manager::outstanding_hosts_remain (void) +Multicast_Manager::outstanding_hosts_remain () { return Multicast_Manager::received_host_count > 0; } diff --git a/ACE/apps/drwho/Multicast_Manager.h b/ACE/apps/drwho/Multicast_Manager.h index b96b1d2d41fff..59700edda6552 100644 --- a/ACE/apps/drwho/Multicast_Manager.h +++ b/ACE/apps/drwho/Multicast_Manager.h @@ -39,10 +39,10 @@ class Multicast_Manager static void add_host (const char *host_name); static void checkoff_host (in_addr host_addr); static int get_next_host_addr (in_addr &host_addr); - static int outstanding_hosts_remain (void); + static int outstanding_hosts_remain (); static int get_next_non_responding_host (const char *&host_name); static int insert_hosts_from_file (const char *filename); - static void insert_default_hosts (void); + static void insert_default_hosts (); private: static hostent *get_host_entry (const char *host); diff --git a/ACE/apps/drwho/PMC_All.cpp b/ACE/apps/drwho/PMC_All.cpp index 4549b0bd32f07..75ba7710571c4 100644 --- a/ACE/apps/drwho/PMC_All.cpp +++ b/ACE/apps/drwho/PMC_All.cpp @@ -87,13 +87,13 @@ PMC_All::insert_protocol_info (Protocol_Record &protocol_record) } void -PMC_All::process (void) +PMC_All::process () { ACE_DEBUG ((LM_DEBUG, "remote users logged on\n")); PM_Client::process (); } -PMC_All::PMC_All (void) +PMC_All::PMC_All () { } diff --git a/ACE/apps/drwho/PMC_All.h b/ACE/apps/drwho/PMC_All.h index 7a0c9df322168..196f8d3cb688a 100644 --- a/ACE/apps/drwho/PMC_All.h +++ b/ACE/apps/drwho/PMC_All.h @@ -21,15 +21,14 @@ */ class PMC_All : public PM_Client { - protected: virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record); virtual int encode (char *packet, int &total_bytes); virtual int decode (char *packet, int &total_bytes); public: - PMC_All (void); - virtual void process (void); + PMC_All (); + virtual void process (); }; #endif /* _PMC_ALL_H */ diff --git a/ACE/apps/drwho/PMC_Flo.cpp b/ACE/apps/drwho/PMC_Flo.cpp index 549b8156f1c17..ba27fe887aeda 100644 --- a/ACE/apps/drwho/PMC_Flo.cpp +++ b/ACE/apps/drwho/PMC_Flo.cpp @@ -112,13 +112,13 @@ PMC_Flo::insert_protocol_info (Protocol_Record &protocol_record) } void -PMC_Flo::process (void) +PMC_Flo::process () { ACE_DEBUG ((LM_DEBUG, "remote friends logged on\n")); PM_Client::process (); } -PMC_Flo::PMC_Flo (void) +PMC_Flo::PMC_Flo () { } diff --git a/ACE/apps/drwho/PMC_Flo.h b/ACE/apps/drwho/PMC_Flo.h index 2a4097ab18c19..5f422099ffe0d 100644 --- a/ACE/apps/drwho/PMC_Flo.h +++ b/ACE/apps/drwho/PMC_Flo.h @@ -21,10 +21,9 @@ */ class PMC_Flo : public PM_Client { - public: - PMC_Flo (void); - virtual void process (void); + PMC_Flo (); + virtual void process (); protected: virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record); diff --git a/ACE/apps/drwho/PMC_Ruser.cpp b/ACE/apps/drwho/PMC_Ruser.cpp index c5fb1c67eac4c..5e764bfdc349a 100644 --- a/ACE/apps/drwho/PMC_Ruser.cpp +++ b/ACE/apps/drwho/PMC_Ruser.cpp @@ -117,9 +117,9 @@ PMC_Ruser::handle_protocol_entries (const char *cp, } void -PMC_Ruser::process (void) +PMC_Ruser::process () { - const char *(Drwho_Node::*get_name)(void); + const char *(Drwho_Node::*get_name)(); if (Options::get_opt (Options::PRINT_LOGIN_NAME)) get_name = &Drwho_Node::get_login_name; @@ -172,6 +172,6 @@ PMC_Ruser::process (void) } } -PMC_Ruser::PMC_Ruser (void) +PMC_Ruser::PMC_Ruser () { } diff --git a/ACE/apps/drwho/PMC_Ruser.h b/ACE/apps/drwho/PMC_Ruser.h index bf61e0800c38a..3939c4025a4a5 100644 --- a/ACE/apps/drwho/PMC_Ruser.h +++ b/ACE/apps/drwho/PMC_Ruser.h @@ -21,10 +21,9 @@ */ class PMC_Ruser : public PM_Client { - public: - PMC_Ruser (void); - virtual void process (void); + PMC_Ruser (); + virtual void process (); protected: char *handle_protocol_entries (const char *cp, diff --git a/ACE/apps/drwho/PMC_Usr.cpp b/ACE/apps/drwho/PMC_Usr.cpp index 38793b293c0da..5a4a00191a7e8 100644 --- a/ACE/apps/drwho/PMC_Usr.cpp +++ b/ACE/apps/drwho/PMC_Usr.cpp @@ -71,7 +71,7 @@ PMC_Usr::decode (char *packet, int &packet_length) } void -PMC_Usr::process (void) +PMC_Usr::process () { Protocol_Record *prp = this->get_each_friend (); Drwho_Node *np = prp->get_drwho_list (); diff --git a/ACE/apps/drwho/PMC_Usr.h b/ACE/apps/drwho/PMC_Usr.h index 7516fc8db60a3..07bd6dff900a1 100644 --- a/ACE/apps/drwho/PMC_Usr.h +++ b/ACE/apps/drwho/PMC_Usr.h @@ -23,7 +23,7 @@ class PMC_Usr : public PM_Client { public: PMC_Usr (char *usr_name); - virtual void process (void); + virtual void process (); protected: virtual int encode (char *packet, int &total_bytes); diff --git a/ACE/apps/drwho/PMS_All.cpp b/ACE/apps/drwho/PMS_All.cpp index 715af0501afe8..6379074467d74 100644 --- a/ACE/apps/drwho/PMS_All.cpp +++ b/ACE/apps/drwho/PMS_All.cpp @@ -95,6 +95,6 @@ PMS_All::insert_protocol_info (Protocol_Record &protocol_record) return prp; } -PMS_All::PMS_All (void) +PMS_All::PMS_All () { } diff --git a/ACE/apps/drwho/PMS_All.h b/ACE/apps/drwho/PMS_All.h index 1e7fbbfa04b92..dd9ea7b4e316f 100644 --- a/ACE/apps/drwho/PMS_All.h +++ b/ACE/apps/drwho/PMS_All.h @@ -22,7 +22,7 @@ class PMS_All : public PM_Server { public: - PMS_All (void); + PMS_All (); protected: virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record); diff --git a/ACE/apps/drwho/PMS_Flo.cpp b/ACE/apps/drwho/PMS_Flo.cpp index 9d51bf856b956..7c15845f71710 100644 --- a/ACE/apps/drwho/PMS_Flo.cpp +++ b/ACE/apps/drwho/PMS_Flo.cpp @@ -70,6 +70,6 @@ PMS_Flo::decode (char *packet, int &packet_length) return 1; } -PMS_Flo::PMS_Flo (void) +PMS_Flo::PMS_Flo () { } diff --git a/ACE/apps/drwho/PMS_Flo.h b/ACE/apps/drwho/PMS_Flo.h index 43c26821949d4..f538b851f1de9 100644 --- a/ACE/apps/drwho/PMS_Flo.h +++ b/ACE/apps/drwho/PMS_Flo.h @@ -21,9 +21,8 @@ */ class PMS_Flo : public PM_Server { - public: - PMS_Flo (void); + PMS_Flo (); protected: virtual int encode (char *packet, int &total_bytes); diff --git a/ACE/apps/drwho/PMS_Ruser.cpp b/ACE/apps/drwho/PMS_Ruser.cpp index a20b8899e2f9c..e029fda6c9865 100644 --- a/ACE/apps/drwho/PMS_Ruser.cpp +++ b/ACE/apps/drwho/PMS_Ruser.cpp @@ -128,6 +128,6 @@ PMS_Ruser::handle_protocol_entries (char *buf_ptr, return buf_ptr; } -PMS_Ruser::PMS_Ruser (void) +PMS_Ruser::PMS_Ruser () { } diff --git a/ACE/apps/drwho/PMS_Ruser.h b/ACE/apps/drwho/PMS_Ruser.h index 1d25e65cba606..869b640912a4f 100644 --- a/ACE/apps/drwho/PMS_Ruser.h +++ b/ACE/apps/drwho/PMS_Ruser.h @@ -21,9 +21,8 @@ */ class PMS_Ruser : public PM_Server { - public: - PMS_Ruser (void); + PMS_Ruser (); protected: virtual char *handle_protocol_entries (char *bp, Drwho_Node *hp); diff --git a/ACE/apps/drwho/PMS_Usr.cpp b/ACE/apps/drwho/PMS_Usr.cpp index fb9eb0ed3870b..ea8d48c0e57c5 100644 --- a/ACE/apps/drwho/PMS_Usr.cpp +++ b/ACE/apps/drwho/PMS_Usr.cpp @@ -76,6 +76,6 @@ PMS_Usr::decode (char *packet, int &packet_length) return 1; } -PMS_Usr::PMS_Usr (void) +PMS_Usr::PMS_Usr () { } diff --git a/ACE/apps/drwho/PMS_Usr.h b/ACE/apps/drwho/PMS_Usr.h index f0bb069aebd33..66fc4fceb56fb 100644 --- a/ACE/apps/drwho/PMS_Usr.h +++ b/ACE/apps/drwho/PMS_Usr.h @@ -21,9 +21,8 @@ */ class PMS_Usr : public PM_Server { - public: - PMS_Usr (void); + PMS_Usr (); protected: virtual int encode (char *packet, int &total_bytes); diff --git a/ACE/apps/drwho/PM_Client.cpp b/ACE/apps/drwho/PM_Client.cpp index 623ac65f63423..1272a3fcdc455 100644 --- a/ACE/apps/drwho/PM_Client.cpp +++ b/ACE/apps/drwho/PM_Client.cpp @@ -36,9 +36,9 @@ PM_Client::insert_protocol_info (Protocol_Record &protocol_record) // friends info in a nicely formatted manner. void -PM_Client::process (void) +PM_Client::process () { - const char *(Protocol_Record::*get_name)(void); + const char *(Protocol_Record::*get_name)(); if (Options::get_opt (Options::PRINT_LOGIN_NAME)) get_name = &Protocol_Record::get_login; @@ -128,11 +128,11 @@ PM_Client::handle_protocol_entries (const char *cp, return (char *) ACE::strend (cp); } -PM_Client::PM_Client (void) +PM_Client::PM_Client () : max_key_length (0) { } -PM_Client::~PM_Client (void) +PM_Client::~PM_Client () { } diff --git a/ACE/apps/drwho/PM_Client.h b/ACE/apps/drwho/PM_Client.h index 0ccd91504ff5e..af1cf18309eb3 100644 --- a/ACE/apps/drwho/PM_Client.h +++ b/ACE/apps/drwho/PM_Client.h @@ -22,12 +22,12 @@ class PM_Client : public Protocol_Manager { public: - PM_Client (void); - virtual ~PM_Client (void); + PM_Client (); + virtual ~PM_Client (); virtual int encode (char *packet, int &total_bytes) = 0; virtual int decode (char *packet, int &total_bytes) = 0; - virtual void process (void); + virtual void process (); protected: int max_key_length; diff --git a/ACE/apps/drwho/PM_Server.cpp b/ACE/apps/drwho/PM_Server.cpp index 8dd7249fb9915..662735e25ea5a 100644 --- a/ACE/apps/drwho/PM_Server.cpp +++ b/ACE/apps/drwho/PM_Server.cpp @@ -12,7 +12,7 @@ // whether a given LOGIN_NAME is currently idle or not. int -PM_Server::process (void) +PM_Server::process () { RWho_DB_Manager ru; Protocol_Record protocol_record (1); @@ -59,7 +59,6 @@ char * PM_Server::handle_protocol_entries (char *buf_ptr, Drwho_Node *np) { - for (; np != 0; np = np->next_) { ACE_OS::sprintf (buf_ptr, @@ -73,10 +72,10 @@ PM_Server::handle_protocol_entries (char *buf_ptr, return buf_ptr; } -PM_Server::PM_Server (void) +PM_Server::PM_Server () { } -PM_Server::~PM_Server (void) +PM_Server::~PM_Server () { } diff --git a/ACE/apps/drwho/PM_Server.h b/ACE/apps/drwho/PM_Server.h index 913c383ce860b..52ffb63ae1720 100644 --- a/ACE/apps/drwho/PM_Server.h +++ b/ACE/apps/drwho/PM_Server.h @@ -21,14 +21,13 @@ */ class PM_Server : public Protocol_Manager { - public: - PM_Server (void); - virtual ~PM_Server (void); + PM_Server (); + virtual ~PM_Server (); virtual int encode (char *packet, int &total_bytes) = 0; virtual int decode (char *packet, int &total_bytes) = 0; - virtual int process (void); + virtual int process (); protected: virtual char *handle_protocol_entries (char *bp, diff --git a/ACE/apps/drwho/Protocol_Manager.cpp b/ACE/apps/drwho/Protocol_Manager.cpp index 1d9bfc6d72375..b5cfb466f8fad 100644 --- a/ACE/apps/drwho/Protocol_Manager.cpp +++ b/ACE/apps/drwho/Protocol_Manager.cpp @@ -37,12 +37,12 @@ Protocol_Manager::get_drwho_node (char *key_name, Drwho_Node *&head) return head; } -Protocol_Manager::Protocol_Manager (void) +Protocol_Manager::Protocol_Manager () : total_users (0) { } -Protocol_Manager::~Protocol_Manager (void) +Protocol_Manager::~Protocol_Manager () { if (Options::get_opt (Options::DEBUGGING)) ACE_DEBUG ((LM_DEBUG, @@ -52,13 +52,13 @@ Protocol_Manager::~Protocol_Manager (void) // Returns the next friend in the sequence of sorted friends. Protocol_Record * -Protocol_Manager::get_next_friend (void) +Protocol_Manager::get_next_friend () { return this->ss->get_next_entry (); } Protocol_Record * -Protocol_Manager::get_each_friend (void) +Protocol_Manager::get_each_friend () { return this->ss->get_each_entry (); } @@ -66,7 +66,7 @@ Protocol_Manager::get_each_friend (void) // Returns the number of friends. int -Protocol_Manager::friend_count (void) +Protocol_Manager::friend_count () { return this->ss->n_elems (); } @@ -74,7 +74,7 @@ Protocol_Manager::friend_count (void) // Returns total number of users logged in throughout the system. int -Protocol_Manager::get_total_users (void) +Protocol_Manager::get_total_users () { return Protocol_Manager::total_users; } diff --git a/ACE/apps/drwho/Protocol_Manager.h b/ACE/apps/drwho/Protocol_Manager.h index 6dc42c35dd1c0..37978300d4731 100644 --- a/ACE/apps/drwho/Protocol_Manager.h +++ b/ACE/apps/drwho/Protocol_Manager.h @@ -31,8 +31,8 @@ class Protocol_Manager { public: - Protocol_Manager (void); - virtual ~Protocol_Manager (void); + Protocol_Manager (); + virtual ~Protocol_Manager (); virtual int encode (char *packet, int &total_bytes) = 0; virtual int decode (char *packet, int &total_bytes) = 0; @@ -41,14 +41,14 @@ class Protocol_Manager int total_users; Search_Struct *ss; - int friend_count (void); + int friend_count (); Drwho_Node *get_drwho_node (char *host_name, Drwho_Node *&head); - int get_total_users (void); + int get_total_users (); void increment_total_users (int remote_users = 1); - Protocol_Record *get_next_friend (void); - Protocol_Record *get_each_friend (void); + Protocol_Record *get_next_friend (); + Protocol_Record *get_each_friend (); virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record) = 0; }; diff --git a/ACE/apps/drwho/Protocol_Record.cpp b/ACE/apps/drwho/Protocol_Record.cpp index 7190b7bd777be..45c3f7b00e25b 100644 --- a/ACE/apps/drwho/Protocol_Record.cpp +++ b/ACE/apps/drwho/Protocol_Record.cpp @@ -6,7 +6,7 @@ Drwho_Node Protocol_Record::drwho_node_; -Protocol_Record::~Protocol_Record (void) +Protocol_Record::~Protocol_Record () { if (Options::get_opt (Options::DEBUGGING)) ACE_DEBUG ((LM_DEBUG, @@ -21,7 +21,7 @@ Protocol_Record::~Protocol_Record (void) } } -Protocol_Record::Protocol_Record (void) +Protocol_Record::Protocol_Record () : key_name1_ (0), key_name2_ (0), drwho_list_ (0), @@ -50,7 +50,7 @@ Protocol_Record::Protocol_Record (const char *kn1, } const char * -Protocol_Record::get_login (void) +Protocol_Record::get_login () { return this->key_name1_; } @@ -63,13 +63,13 @@ Protocol_Record::set_login (const char *str) } const char * -Protocol_Record::get_real (void) +Protocol_Record::get_real () { return this->key_name2_; } const char * -Protocol_Record::get_host (void) +Protocol_Record::get_host () { return this->key_name1_; } @@ -89,7 +89,7 @@ Protocol_Record::set_real (const char *str) } Drwho_Node * -Protocol_Record::get_drwho_list (void) +Protocol_Record::get_drwho_list () { return this->drwho_list_; } diff --git a/ACE/apps/drwho/Protocol_Record.h b/ACE/apps/drwho/Protocol_Record.h index d54ce4918c0ed..31d20b57256ac 100644 --- a/ACE/apps/drwho/Protocol_Record.h +++ b/ACE/apps/drwho/Protocol_Record.h @@ -21,20 +21,19 @@ */ class Protocol_Record { - public: - Protocol_Record (void); + Protocol_Record (); Protocol_Record (int use_dummy); Protocol_Record (const char *key_name1, Protocol_Record *next = 0); - ~Protocol_Record (void); - const char *get_host (void); + ~Protocol_Record (); + const char *get_host (); const char *set_host (const char *str); - const char *get_login (void); + const char *get_login (); const char *set_login (const char *str); - const char *get_real (void); + const char *get_real (); const char *set_real (const char *str); - Drwho_Node *get_drwho_list (void); + Drwho_Node *get_drwho_list (); static Drwho_Node drwho_node_; const char *key_name1_; diff --git a/ACE/apps/drwho/Rwho_DB_Manager.cpp b/ACE/apps/drwho/Rwho_DB_Manager.cpp index 4910da3f0f74c..d36b1f646beab 100644 --- a/ACE/apps/drwho/Rwho_DB_Manager.cpp +++ b/ACE/apps/drwho/Rwho_DB_Manager.cpp @@ -12,7 +12,7 @@ // files in the directory, which are assumed to be "." and ".." (this // function needs to be changed if this assumption does not hold!) -RWho_DB_Manager::RWho_DB_Manager (void) +RWho_DB_Manager::RWho_DB_Manager () : number_of_users (0), current_user (0), WHOD_HEADER_SIZE (sizeof host_data - sizeof host_data.wd_we), @@ -41,7 +41,7 @@ RWho_DB_Manager::RWho_DB_Manager (void) // The destructor cleans up the RWHOD_DIR handle. -RWho_DB_Manager::~RWho_DB_Manager (void) +RWho_DB_Manager::~RWho_DB_Manager () { if (ACE_OS::chdir (this->original_pathname) < 0) ACE_ERROR ((LM_ERROR, @@ -64,7 +64,7 @@ RWho_DB_Manager::~RWho_DB_Manager (void) // Are there any more hosts? */ int -RWho_DB_Manager::get_next_host (void) +RWho_DB_Manager::get_next_host () { time_t current_time; diff --git a/ACE/apps/drwho/Rwho_DB_Manager.h b/ACE/apps/drwho/Rwho_DB_Manager.h index 840b59f79641f..42e2c8611d7c8 100644 --- a/ACE/apps/drwho/Rwho_DB_Manager.h +++ b/ACE/apps/drwho/Rwho_DB_Manager.h @@ -30,10 +30,9 @@ */ class RWho_DB_Manager { - public: - RWho_DB_Manager (void); - ~RWho_DB_Manager (void); + RWho_DB_Manager (); + ~RWho_DB_Manager (); int get_next_user (Protocol_Record &protocol_record); private: @@ -45,7 +44,7 @@ class RWho_DB_Manager char original_pathname[MAXPATHLEN + 1]; const char *rwho_dir_name; - int get_next_host (void); + int get_next_host (); }; #endif /* _RWHO_DB_MANAGER_H */ diff --git a/ACE/apps/drwho/SL_Client.h b/ACE/apps/drwho/SL_Client.h index 5ab9ac2aee873..53db17ba17bfe 100644 --- a/ACE/apps/drwho/SL_Client.h +++ b/ACE/apps/drwho/SL_Client.h @@ -21,7 +21,6 @@ */ class SL_Client : public Single_Lookup { - public: SL_Client (const char *key_name); virtual Protocol_Record *insert (const char *key_name, diff --git a/ACE/apps/drwho/SL_Server.cpp b/ACE/apps/drwho/SL_Server.cpp index 06fe054eb5bcd..879f9fee5a800 100644 --- a/ACE/apps/drwho/SL_Server.cpp +++ b/ACE/apps/drwho/SL_Server.cpp @@ -8,7 +8,7 @@ SL_Server::SL_Server (const char *usr_name) } Protocol_Record * -SL_Server::get_each_entry (void) +SL_Server::get_each_entry () { Protocol_Record *prp = Single_Lookup::get_each_entry (); return prp->get_drwho_list () == 0 ? 0 : prp; diff --git a/ACE/apps/drwho/SL_Server.h b/ACE/apps/drwho/SL_Server.h index 5adc67d7e991b..c45649c8194fc 100644 --- a/ACE/apps/drwho/SL_Server.h +++ b/ACE/apps/drwho/SL_Server.h @@ -21,12 +21,11 @@ */ class SL_Server : public Single_Lookup { - public: SL_Server (const char *packet); virtual Protocol_Record *insert (const char *key_name, int max_len = MAXUSERIDNAMELEN); - virtual Protocol_Record *get_each_entry (void); + virtual Protocol_Record *get_each_entry (); }; #endif /* _SL_SERVER_H */ diff --git a/ACE/apps/drwho/SML_Client.cpp b/ACE/apps/drwho/SML_Client.cpp index f4d46e59bfe6d..c41305f7e603b 100644 --- a/ACE/apps/drwho/SML_Client.cpp +++ b/ACE/apps/drwho/SML_Client.cpp @@ -14,7 +14,7 @@ SML_Client::receive (int) } int -SML_Client::send (void) +SML_Client::send () { if (this->mux (this->send_packet_, this->packet_length) < 0) return -1; @@ -25,10 +25,10 @@ SML_Client::send (void) return 1; } -SML_Client::SML_Client (void) +SML_Client::SML_Client () { } -SML_Client::~SML_Client (void) +SML_Client::~SML_Client () { } diff --git a/ACE/apps/drwho/SML_Client.h b/ACE/apps/drwho/SML_Client.h index a6eb4fcfdbf0b..85575b0cfd082 100644 --- a/ACE/apps/drwho/SML_Client.h +++ b/ACE/apps/drwho/SML_Client.h @@ -18,10 +18,10 @@ class SML_Client : public SM_Client { public: - SML_Client (void); - virtual ~SML_Client (void); + SML_Client (); + virtual ~SML_Client (); virtual int receive (int timeout = 0); - virtual int send (void); + virtual int send (); private: SML_Server sml_server; diff --git a/ACE/apps/drwho/SML_Server.cpp b/ACE/apps/drwho/SML_Server.cpp index 65dbcd9ef2dbf..87afe72db447c 100644 --- a/ACE/apps/drwho/SML_Server.cpp +++ b/ACE/apps/drwho/SML_Server.cpp @@ -1,9 +1,9 @@ #include "SML_Server.h" -SML_Server::SML_Server (void) +SML_Server::SML_Server () { } -SML_Server::~SML_Server (void) +SML_Server::~SML_Server () { } diff --git a/ACE/apps/drwho/SML_Server.h b/ACE/apps/drwho/SML_Server.h index 54090554d0220..33116238bd757 100644 --- a/ACE/apps/drwho/SML_Server.h +++ b/ACE/apps/drwho/SML_Server.h @@ -17,8 +17,8 @@ class SML_Server : public SM_Server { public: - SML_Server (void); - virtual ~SML_Server (void); + SML_Server (); + virtual ~SML_Server (); }; #endif /* _SML_SERVER_H */ diff --git a/ACE/apps/drwho/SMR_Client.cpp b/ACE/apps/drwho/SMR_Client.cpp index 84852dc64afc4..e861854393a15 100644 --- a/ACE/apps/drwho/SMR_Client.cpp +++ b/ACE/apps/drwho/SMR_Client.cpp @@ -15,6 +15,6 @@ SMR_Client::SMR_Client (short port_number) 1)); } -SMR_Client::~SMR_Client (void) +SMR_Client::~SMR_Client () { } diff --git a/ACE/apps/drwho/SMR_Client.h b/ACE/apps/drwho/SMR_Client.h index 9acf958036a3f..fee2454064b21 100644 --- a/ACE/apps/drwho/SMR_Client.h +++ b/ACE/apps/drwho/SMR_Client.h @@ -18,7 +18,7 @@ class SMR_Client : public SM_Client { public: SMR_Client (short port_number); - virtual ~SMR_Client (void); + virtual ~SMR_Client (); }; #endif /* _SMR_CLIENT_H */ diff --git a/ACE/apps/drwho/SMR_Server.cpp b/ACE/apps/drwho/SMR_Server.cpp index ecec25c1c1096..31f735aa1ed44 100644 --- a/ACE/apps/drwho/SMR_Server.cpp +++ b/ACE/apps/drwho/SMR_Server.cpp @@ -11,6 +11,6 @@ SMR_Server::SMR_Server (short port_number) 1)); } -SMR_Server::~SMR_Server (void) +SMR_Server::~SMR_Server () { } diff --git a/ACE/apps/drwho/SMR_Server.h b/ACE/apps/drwho/SMR_Server.h index d25db5d68b9a9..1ca8887f217be 100644 --- a/ACE/apps/drwho/SMR_Server.h +++ b/ACE/apps/drwho/SMR_Server.h @@ -18,7 +18,7 @@ class SMR_Server : public SM_Server { public: SMR_Server (short port_number); - ~SMR_Server (void); + ~SMR_Server (); }; #endif /* _SMR_SERVER_H */ diff --git a/ACE/apps/drwho/SM_Client.cpp b/ACE/apps/drwho/SM_Client.cpp index 9a7545f5e68b9..17e5635799a23 100644 --- a/ACE/apps/drwho/SM_Client.cpp +++ b/ACE/apps/drwho/SM_Client.cpp @@ -58,16 +58,16 @@ SM_Client::mux (char *packet, int &packet_length) return 1; } -SM_Client::SM_Client (void) +SM_Client::SM_Client () { } -SM_Client::~SM_Client (void) +SM_Client::~SM_Client () { } void -SM_Client::process (void) +SM_Client::process () { this->pm_client->process (); } diff --git a/ACE/apps/drwho/SM_Client.h b/ACE/apps/drwho/SM_Client.h index 436b0a4b3c4cb..6799d062633bb 100644 --- a/ACE/apps/drwho/SM_Client.h +++ b/ACE/apps/drwho/SM_Client.h @@ -19,12 +19,12 @@ class SM_Client : public Select_Manager, public CM_Client { public: - SM_Client (void); - virtual ~SM_Client (void); + SM_Client (); + virtual ~SM_Client (); virtual int mux (char *packet, int &packet_length); virtual int demux (char *packet, int &packet_length); - virtual void process (void); + virtual void process (); private: PM_Client *pm_client; diff --git a/ACE/apps/drwho/SM_Server.cpp b/ACE/apps/drwho/SM_Server.cpp index 5c7271c247426..bcc2a29f33e7e 100644 --- a/ACE/apps/drwho/SM_Server.cpp +++ b/ACE/apps/drwho/SM_Server.cpp @@ -58,10 +58,10 @@ SM_Server::mux (char *packet, return pm_server->encode (packet, packet_length); } -SM_Server::SM_Server (void) +SM_Server::SM_Server () { } -SM_Server::~SM_Server (void) +SM_Server::~SM_Server () { } diff --git a/ACE/apps/drwho/SM_Server.h b/ACE/apps/drwho/SM_Server.h index b729d61e45fd9..5c1ba2de7335d 100644 --- a/ACE/apps/drwho/SM_Server.h +++ b/ACE/apps/drwho/SM_Server.h @@ -19,8 +19,8 @@ class SM_Server : public Select_Manager, public CM_Server { public: - SM_Server (void); - virtual ~SM_Server (void); + SM_Server (); + virtual ~SM_Server (); virtual int mux (char *packet, int &packet_length); virtual int demux (char *packet, int &packet_length); diff --git a/ACE/apps/drwho/Search_Struct.cpp b/ACE/apps/drwho/Search_Struct.cpp index 33491396ee1b1..c9feb78381573 100644 --- a/ACE/apps/drwho/Search_Struct.cpp +++ b/ACE/apps/drwho/Search_Struct.cpp @@ -2,19 +2,19 @@ #include "Search_Struct.h" #include "ace/Log_Msg.h" -Search_Struct::~Search_Struct (void) +Search_Struct::~Search_Struct () { if (Options::get_opt (Options::DEBUGGING)) ACE_DEBUG ((LM_DEBUG, "disposing Search_Struct\n")); } -Search_Struct::Search_Struct (void) +Search_Struct::Search_Struct () : count_ (0) {} int -Search_Struct::n_elems (void) +Search_Struct::n_elems () { return this->count_; } diff --git a/ACE/apps/drwho/Search_Struct.h b/ACE/apps/drwho/Search_Struct.h index ff39c6bcc65d3..1026ed5775dfa 100644 --- a/ACE/apps/drwho/Search_Struct.h +++ b/ACE/apps/drwho/Search_Struct.h @@ -23,14 +23,14 @@ class Search_Struct { public: - Search_Struct (void); - virtual ~Search_Struct (void); - virtual int n_elems (void); + Search_Struct (); + virtual ~Search_Struct (); + virtual int n_elems (); virtual Protocol_Record *insert (const char *key_name, int max_len = MAXUSERIDNAMELEN) = 0; - virtual Protocol_Record *get_next_entry (void) = 0; - virtual Protocol_Record *get_each_entry (void) = 0; + virtual Protocol_Record *get_next_entry () = 0; + virtual Protocol_Record *get_each_entry () = 0; protected: int count_; diff --git a/ACE/apps/drwho/Select_Manager.cpp b/ACE/apps/drwho/Select_Manager.cpp index 6ac3cd75b8f8f..c34e0b51f5409 100644 --- a/ACE/apps/drwho/Select_Manager.cpp +++ b/ACE/apps/drwho/Select_Manager.cpp @@ -1,6 +1,6 @@ #include "Select_Manager.h" -Select_Manager::~Select_Manager (void) +Select_Manager::~Select_Manager () { } diff --git a/ACE/apps/drwho/Select_Manager.h b/ACE/apps/drwho/Select_Manager.h index 124af5d836c31..ba0dc81a6172c 100644 --- a/ACE/apps/drwho/Select_Manager.h +++ b/ACE/apps/drwho/Select_Manager.h @@ -15,7 +15,7 @@ class Select_Manager { public: - virtual ~Select_Manager (void); + virtual ~Select_Manager (); virtual int mux (char *packet, int &packet_length) = 0 ; diff --git a/ACE/apps/drwho/Single_Lookup.cpp b/ACE/apps/drwho/Single_Lookup.cpp index 57c33772bf2d0..a286ab8e226ee 100644 --- a/ACE/apps/drwho/Single_Lookup.cpp +++ b/ACE/apps/drwho/Single_Lookup.cpp @@ -10,7 +10,7 @@ Single_Lookup::Single_Lookup (const char *usr_name) Protocol_Record (ACE::strnew (usr_name))); } -Single_Lookup::~Single_Lookup (void) +Single_Lookup::~Single_Lookup () { if (Options::get_opt (Options::DEBUGGING)) ACE_DEBUG ((LM_DEBUG, @@ -18,13 +18,13 @@ Single_Lookup::~Single_Lookup (void) } Protocol_Record * -Single_Lookup::get_each_entry (void) +Single_Lookup::get_each_entry () { return this->prp_; } Protocol_Record * -Single_Lookup::get_next_entry (void) +Single_Lookup::get_next_entry () { return this->get_each_entry (); } diff --git a/ACE/apps/drwho/Single_Lookup.h b/ACE/apps/drwho/Single_Lookup.h index b5e2d952efd9b..b341328fc6685 100644 --- a/ACE/apps/drwho/Single_Lookup.h +++ b/ACE/apps/drwho/Single_Lookup.h @@ -24,11 +24,11 @@ class Single_Lookup : public Search_Struct { public: Single_Lookup (const char *usr_name); - virtual ~Single_Lookup (void); + virtual ~Single_Lookup (); virtual Protocol_Record *insert (const char *key_name, int max_len = MAXUSERIDNAMELEN) = 0; - virtual Protocol_Record *get_next_entry (void); - virtual Protocol_Record *get_each_entry (void); + virtual Protocol_Record *get_next_entry (); + virtual Protocol_Record *get_each_entry (); protected: Protocol_Record *prp_; diff --git a/ACE/apps/drwho/client.cpp b/ACE/apps/drwho/client.cpp index 3cdc417e64d9f..4f49ff6c1b250 100644 --- a/ACE/apps/drwho/client.cpp +++ b/ACE/apps/drwho/client.cpp @@ -20,7 +20,7 @@ // Factory function. static SM_Client * -make_client (void) +make_client () { SM_Client *client = 0; diff --git a/ACE/apps/drwho/server.cpp b/ACE/apps/drwho/server.cpp index 833ecffd7b889..40d1bea6f8057 100644 --- a/ACE/apps/drwho/server.cpp +++ b/ACE/apps/drwho/server.cpp @@ -23,7 +23,7 @@ #include "ace/OS_NS_sys_socket.h" static char * -time_stamp (void) +time_stamp () { time_t time_now; char *temp; @@ -49,7 +49,7 @@ exit_server (int sig) // Returns TRUE if the program was started by INETD. static int -started_by_inetd (void) +started_by_inetd () { sockaddr_in sin; int size = sizeof sin; @@ -100,7 +100,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) do_drwho (smr_server); else { - for (;;) do_drwho (smr_server); diff --git a/ACE/apps/gperf/src/Bool_Array.cpp b/ACE/apps/gperf/src/Bool_Array.cpp index 6c946c4702dc6..e2f206b134a27 100644 --- a/ACE/apps/gperf/src/Bool_Array.cpp +++ b/ACE/apps/gperf/src/Bool_Array.cpp @@ -29,7 +29,7 @@ // Prints out debugging diagnostics. -Bool_Array::~Bool_Array (void) +Bool_Array::~Bool_Array () { if (option[DEBUGGING]) ACE_DEBUG ((LM_DEBUG, @@ -40,7 +40,7 @@ Bool_Array::~Bool_Array (void) delete [] this->storage_array_; } -Bool_Array::Bool_Array (void) +Bool_Array::Bool_Array () : storage_array_ (0), generation_number_ (0), size_ (0) @@ -82,7 +82,7 @@ Bool_Array::find (u_long slot) } void -Bool_Array::reset (void) +Bool_Array::reset () { if (++generation_number_ == 0) { diff --git a/ACE/apps/gperf/src/Bool_Array.h b/ACE/apps/gperf/src/Bool_Array.h index 3f043390ab7e9..e082b2ed93b8e 100644 --- a/ACE/apps/gperf/src/Bool_Array.h +++ b/ACE/apps/gperf/src/Bool_Array.h @@ -43,19 +43,19 @@ class Bool_Array { public: /// Constructor - Bool_Array (void); + Bool_Array (); /// Initialize the array (requires O(n) time). int open (u_long); /// Destructor. - ~Bool_Array (void); + ~Bool_Array (); /// Locate the @a value in the array (requires O(1) time). int find (u_long value); /// Reinitializes the array (requires O(1) time). - void reset (void); + void reset (); private: /// Initialization of the index space. diff --git a/ACE/apps/gperf/src/Gen_Perf.cpp b/ACE/apps/gperf/src/Gen_Perf.cpp index b28bc2bcd50f8..382e95cf50ca5 100644 --- a/ACE/apps/gperf/src/Gen_Perf.cpp +++ b/ACE/apps/gperf/src/Gen_Perf.cpp @@ -37,7 +37,7 @@ extern const char *version_string; /// of 2), may initialize the associated values array, and determines /// the maximum hash table size. Note: using the random numbers is /// often helpful, though not as deterministic, of course! -Gen_Perf::Gen_Perf (void) +Gen_Perf::Gen_Perf () : max_hash_value (0), fewest_collisions (0), num_done (1), @@ -232,7 +232,7 @@ Gen_Perf::change (List_Node *prior, List_Node *curr) } int -Gen_Perf::open (void) +Gen_Perf::open () { if (this->key_list.read_keys () == -1) return -1; @@ -314,7 +314,7 @@ Gen_Perf::open (void) /// assign hash values from 0 to N-1. Then go ahead with the normal /// logic that is there for perfect hashing. int -Gen_Perf::compute_binary_search (void) +Gen_Perf::compute_binary_search () { // Do a string sort. this->key_list.string_sort (); @@ -333,7 +333,7 @@ Gen_Perf::compute_binary_search (void) } int -Gen_Perf::compute_linear_search (void) +Gen_Perf::compute_linear_search () { // Convert the list of keys to a linear list without // equivalence classes. @@ -352,7 +352,7 @@ Gen_Perf::compute_linear_search (void) } int -Gen_Perf::compute_perfect_hash (void) +Gen_Perf::compute_perfect_hash () { List_Node *curr = 0; @@ -416,7 +416,7 @@ Gen_Perf::compute_perfect_hash (void) /// The alternatives (e.g., back-tracking) are too time-consuming, i.e, /// exponential in the number of keys. int -Gen_Perf::run (void) +Gen_Perf::run () { if (this->open () == -1) return 1; @@ -447,7 +447,7 @@ Gen_Perf::run (void) } /// Prints out some diagnostics upon completion. -Gen_Perf::~Gen_Perf (void) +Gen_Perf::~Gen_Perf () { if (option[DEBUGGING]) { diff --git a/ACE/apps/gperf/src/Gen_Perf.h b/ACE/apps/gperf/src/Gen_Perf.h index c52e1bb226321..c0ab645592826 100644 --- a/ACE/apps/gperf/src/Gen_Perf.h +++ b/ACE/apps/gperf/src/Gen_Perf.h @@ -37,21 +37,21 @@ class Gen_Perf : private ACE_Copy_Disabled { public: /// Constructor. - Gen_Perf (void); + Gen_Perf (); /// Destructor - ~Gen_Perf (void); + ~Gen_Perf (); /// Attempt to generate a perfect hash function. - int run (void); + int run (); private: - int open (void); + int open (); int change (List_Node *prior, List_Node *curr); int affects_prev (char c, List_Node *curr); - int compute_perfect_hash (void); - int compute_binary_search (void); - int compute_linear_search (void); + int compute_perfect_hash (); + int compute_binary_search (); + int compute_linear_search (); static int hash (List_Node *key_node); static int compute_disjoint_union (char *s1, char *s2, char *s3); static void sort_set (char *union_set, int len); diff --git a/ACE/apps/gperf/src/Hash_Table.cpp b/ACE/apps/gperf/src/Hash_Table.cpp index f074e2b95e91e..87a120d246702 100644 --- a/ACE/apps/gperf/src/Hash_Table.cpp +++ b/ACE/apps/gperf/src/Hash_Table.cpp @@ -45,7 +45,7 @@ Hash_Table::Hash_Table (size_t s) this->size_ * sizeof *this->table_); } -Hash_Table::~Hash_Table (void) +Hash_Table::~Hash_Table () { if (option[DEBUGGING]) { diff --git a/ACE/apps/gperf/src/Hash_Table.h b/ACE/apps/gperf/src/Hash_Table.h index ea4975f160c1a..5c68f0a2d099b 100644 --- a/ACE/apps/gperf/src/Hash_Table.h +++ b/ACE/apps/gperf/src/Hash_Table.h @@ -50,7 +50,7 @@ class Hash_Table : private ACE_Copy_Disabled Hash_Table (size_t s); /// Destructor - ~Hash_Table (void); + ~Hash_Table (); List_Node *find (List_Node *item, int ignore_length); diff --git a/ACE/apps/gperf/src/Iterator.cpp b/ACE/apps/gperf/src/Iterator.cpp index 597971d0d0c29..2bf4be1cedf2f 100644 --- a/ACE/apps/gperf/src/Iterator.cpp +++ b/ACE/apps/gperf/src/Iterator.cpp @@ -43,7 +43,7 @@ Iterator::Iterator (char *s, /// Provide an Iterator, returning the ``next'' value from the list of /// valid values given in the constructor. int -Iterator::operator() (void) +Iterator::operator() () { // Variables to record the Iterator's status when handling ranges, // e.g., 3-12. @@ -75,7 +75,6 @@ Iterator::operator() (void) if (*str == '-') { - for (size = 1, upper_bound = 0; ACE_OS::ace_isdigit (*++str); upper_bound = upper_bound * 10 + *str - '0') diff --git a/ACE/apps/gperf/src/Iterator.h b/ACE/apps/gperf/src/Iterator.h index 2a08dc4956b19..fa1a03b176f42 100644 --- a/ACE/apps/gperf/src/Iterator.h +++ b/ACE/apps/gperf/src/Iterator.h @@ -54,7 +54,7 @@ class Iterator : private ACE_Copy_Disabled int word_end, int bad_val, int key_end); - int operator () (void); + int operator () (); private: /// A pointer to the string provided by the user. diff --git a/ACE/apps/gperf/src/Key_List.cpp b/ACE/apps/gperf/src/Key_List.cpp index 8deb3ee402402..1d02a425acb10 100644 --- a/ACE/apps/gperf/src/Key_List.cpp +++ b/ACE/apps/gperf/src/Key_List.cpp @@ -37,7 +37,6 @@ const char *const Key_List::default_return_type = "char *"; namespace { - char * dup_string (const char *const str) { @@ -58,7 +57,7 @@ int Key_List::field_width = 0; int Key_List::determined_[ACE_STANDARD_CHARACTER_SET_SIZE]; /// Destructor dumps diagnostics during debugging. -Key_List::~Key_List (void) +Key_List::~Key_List () { if (option[DEBUGGING]) this->dump (); @@ -162,7 +161,7 @@ Key_List::special_input (char delimiter) /// Stores any C/C++ source code that must be included verbatim into /// the generated code output. char * -Key_List::save_include_src (void) +Key_List::save_include_src () { int c = getchar (); @@ -182,7 +181,7 @@ Key_List::save_include_src (void) /// table from a user-defined struct, or whether the user is content to /// simply use the default array of keys. char * -Key_List::array_type (void) +Key_List::array_type () { return special_input ('%'); } @@ -190,7 +189,7 @@ Key_List::array_type (void) /// Sets up the Return_Type, the Struct_Tag type and the Array_Type /// based upon various user Options. int -Key_List::output_types (void) +Key_List::output_types () { if (option[TYPE]) { @@ -245,7 +244,7 @@ Key_List::output_types (void) /// ``links,'' i.e., unhashable elements possessing identical key sets /// and lengths. int -Key_List::read_keys (void) +Key_List::read_keys () { this->include_src = this->save_include_src (); if (this->include_src == 0) @@ -462,7 +461,7 @@ Key_List::already_determined (List_Node *ptr) // paper from Jan 1980 JACM for details.... void -Key_List::reorder (void) +Key_List::reorder () { List_Node *ptr = 0; @@ -486,7 +485,6 @@ Key_List::reorder (void) for (; run_ptr; run_ptr = trail_ptr->next) { - if (already_determined (run_ptr)) { trail_ptr->next = run_ptr->next; @@ -505,7 +503,7 @@ Key_List::reorder (void) // item! void -Key_List::output_min_max (void) +Key_List::output_min_max () { List_Node *temp = 0; for (temp = head; temp->next; temp = temp->next) @@ -687,7 +685,6 @@ Key_List::output_switch (int use_keyword_table) // list by increasing hash values. if (temp->next && temp->hash_value == temp->next->hash_value) { - for ( ; temp->next && temp->hash_value == temp->next->hash_value; temp = temp->next) { @@ -773,7 +770,7 @@ Key_List::output_switch (int use_keyword_table) // code in generated function ``in_word_set.'' void -Key_List::output_keylength_table (void) +Key_List::output_keylength_table () { const int max_column = 15; int slot = 0; @@ -792,7 +789,6 @@ Key_List::output_keylength_table (void) for (temp = head; temp; temp = temp->next, slot++) { - if (slot < temp->hash_value) for ( ; slot < temp->hash_value; slot++) ACE_OS::printf ("%3d,%s", 0, ++column % (max_column - 1) ? "" : "\n "); @@ -810,7 +806,7 @@ Key_List::output_keylength_table (void) // function. void -Key_List::output_keyword_table (void) +Key_List::output_keyword_table () { const char *l_brace = *head->rest ? "{" : ""; const char *r_brace = *head->rest ? "}," : ""; @@ -908,7 +904,7 @@ Key_List::output_keyword_table (void) // the proper encoding for each key word int -Key_List::output_binary_search_function (void) +Key_List::output_binary_search_function () { ACE_OS::printf ("%s\n", include_src); @@ -1000,14 +996,13 @@ Key_List::output_binary_search_function (void) ACE_OS::fflush(stdout); return 0; - } // Generates C code for the linear search algorithm that returns // the proper encoding for each key word int -Key_List::output_linear_search_function (void) +Key_List::output_linear_search_function () { ACE_OS::printf ("%s\n", include_src); @@ -1089,13 +1084,12 @@ Key_List::output_linear_search_function (void) ACE_OS::fflush (stdout); return 0; - } // Generates C code for the hash function that returns the proper // encoding for each key word. void -Key_List::output_hash_function (void) +Key_List::output_hash_function () { const int max_column = 10; int count = max_hash_value; @@ -1249,7 +1243,6 @@ Key_List::output_hash_function (void) do { - while (--count > key_pos) ACE_OS::printf (" case %d:\n", count); @@ -1310,7 +1303,7 @@ Key_List::update_lookup_array (int lookup_array[], // smaller, contiguous range of the keyword table. int -Key_List::output_lookup_array (void) +Key_List::output_lookup_array () { if (total_duplicates > 0) { @@ -1490,7 +1483,7 @@ Key_List::output_lookup_array (void) // Generates C code to perform the keyword lookup. void -Key_List::output_lookup_function (void) +Key_List::output_lookup_function () { if (!option[OPTIMIZE]) ACE_OS::printf (" if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)\n {\n"); @@ -1578,7 +1571,7 @@ Key_List::output_lookup_function (void) // Output the table and the functions that map upper case into lower case! void -Key_List::output_strcasecmp (void) +Key_List::output_strcasecmp () { ACE_OS::printf ("%s", "/* This array is designed for mapping upper and lower case letter\n" @@ -1641,7 +1634,7 @@ Key_List::output_strcasecmp (void) // based upon the user's Options. int -Key_List::output (void) +Key_List::output () { if (option[BINARYSEARCH]) // Generate code binary search. @@ -1801,7 +1794,7 @@ Key_List::output (void) // Sorts the keys by hash value. void -Key_List::sort (void) +Key_List::sort () { // By default, we sort via hashing. hash_sort = 1; @@ -1812,9 +1805,8 @@ Key_List::sort (void) // Sorts the keys by normal strcmp. void -Key_List::string_sort (void) +Key_List::string_sort () { - // Flatten the equivalence class list to a linear list. List_Node *ptr; @@ -1865,7 +1857,7 @@ Key_List::string_sort (void) // Dumps the key list to stderr stream. void -Key_List::dump (void) +Key_List::dump () { ACE_DEBUG ((LM_DEBUG, "\nDumping key list information:\ntotal non-static linked keywords = %d" @@ -1922,7 +1914,7 @@ Key_List::dump (void) // Simple-minded constructor action here... -Key_List::Key_List (void) +Key_List::Key_List () : head (0), total_duplicates (0), array_type_ (dup_string (Key_List::default_array_type)), @@ -1939,7 +1931,7 @@ Key_List::Key_List (void) // Returns the length of entire key list. int -Key_List::keyword_list_length (void) +Key_List::keyword_list_length () { return list_len; } @@ -1947,7 +1939,7 @@ Key_List::keyword_list_length (void) // Returns length of longest key read. int -Key_List::max_key_length (void) +Key_List::max_key_length () { return max_key_len; } diff --git a/ACE/apps/gperf/src/Key_List.h b/ACE/apps/gperf/src/Key_List.h index 03260bcae4ccb..62a104868126e 100644 --- a/ACE/apps/gperf/src/Key_List.h +++ b/ACE/apps/gperf/src/Key_List.h @@ -59,15 +59,15 @@ class Duplicate_Entry : private ACE_Copy_Disabled class Key_List : private ACE_Copy_Disabled { public: - Key_List (void); - ~Key_List (void); - int keyword_list_length (void); - int max_key_length (void); - void reorder (void); - void sort (void); - void string_sort (void); - int read_keys (void); - int output (void); + Key_List (); + ~Key_List (); + int keyword_list_length (); + int max_key_length (); + void reorder (); + void sort (); + void string_sort (); + int read_keys (); + int output (); /// Points to the head of the linked list. List_Node *head; @@ -89,20 +89,20 @@ class Key_List : private ACE_Copy_Disabled // @@ All of the following methods should be factored out and // replaced by the use of the Strategy/Bridge pattern so that we can // easily add new languages. - void output_min_max (void); + void output_min_max (); void output_switch (int use_keyword_table = 0); - void output_keyword_table (void); - void output_keylength_table (void); - void output_hash_function (void); - void output_lookup_function (void); - int output_binary_search_function(void); - int output_linear_search_function (void); - int output_lookup_array (void); - void output_strcasecmp (void); - int output_types (void); - void dump (void); - char *array_type (void); - char *save_include_src (void); + void output_keyword_table (); + void output_keylength_table (); + void output_hash_function (); + void output_lookup_function (); + int output_binary_search_function(); + int output_linear_search_function (); + int output_lookup_array (); + void output_strcasecmp (); + int output_types (); + void dump (); + char *array_type (); + char *save_include_src (); char *special_input (char delimiter); List_Node *merge (List_Node *list1, List_Node *list2); List_Node *merge_sort (List_Node *head); diff --git a/ACE/apps/gperf/src/List_Node.cpp b/ACE/apps/gperf/src/List_Node.cpp index 6cc5d741dfa6c..d0cb3787f1865 100644 --- a/ACE/apps/gperf/src/List_Node.cpp +++ b/ACE/apps/gperf/src/List_Node.cpp @@ -121,7 +121,7 @@ List_Node::List_Node (char *k, int len) sort (keysig, ACE_Utils::truncate_cast (ptr - keysig)); } -List_Node::~List_Node (void) +List_Node::~List_Node () { delete [] this->key; delete [] this->keysig; diff --git a/ACE/apps/gperf/src/List_Node.h b/ACE/apps/gperf/src/List_Node.h index 30638894308d1..172f690864eca 100644 --- a/ACE/apps/gperf/src/List_Node.h +++ b/ACE/apps/gperf/src/List_Node.h @@ -44,7 +44,7 @@ class List_Node : private ACE_Copy_Disabled List_Node (char *key, int len); /// Destructor. - ~List_Node (void); + ~List_Node (); static void sort (char *base, int len); diff --git a/ACE/apps/gperf/src/Options.cpp b/ACE/apps/gperf/src/Options.cpp index 68a1c51846f57..1e650698e3a58 100644 --- a/ACE/apps/gperf/src/Options.cpp +++ b/ACE/apps/gperf/src/Options.cpp @@ -81,7 +81,7 @@ char Options::key_positions_[MAX_KEY_POS]; /// Prints program usage to standard error stream. void -Options::usage (void) +Options::usage () { ACE_ERROR ((LM_ERROR, "Usage: %n [-abBcCdDef[num]gGhHiIjJ" @@ -92,7 +92,7 @@ Options::usage (void) /// Output command-line Options. void -Options::print_options (void) +Options::print_options () { ACE_OS::printf ("/* Command-line: "); @@ -132,7 +132,7 @@ Options::key_sort (char *base, int len) // Sets the default Options. -Options::Options (void) +Options::Options () { key_positions_[0] = WORD_START; key_positions_[1] = WORD_END; @@ -151,7 +151,7 @@ Options::Options (void) } /// Dumps option status when debug is set. -Options::~Options (void) +Options::~Options () { if (ACE_BIT_ENABLED (option_word_, DEBUGGING)) { @@ -730,14 +730,14 @@ Options::operator != (enum Option_Type opt) /// Initializes the key Iterator. void -Options::reset (void) +Options::reset () { key_pos_ = 0; } /// Returns current key_position and advanced index. int -Options::get (void) +Options::get () { return key_positions_[key_pos_++]; } @@ -751,14 +751,14 @@ Options::asso_max (int r) /// Returns the size of the table size. int -Options::asso_max (void) +Options::asso_max () { return size_; } /// Returns total distinct key positions. u_int -Options::max_keysig_size (void) +Options::max_keysig_size () { return total_keysig_size_; } @@ -772,70 +772,70 @@ Options::keysig_size (u_int a_size) /// Returns the jump value. int -Options::jump (void) +Options::jump () { return jump_; } /// Returns the generated function name. const char * -Options::function_name (void) +Options::function_name () { return function_name_.c_str (); } /// Returns the fill default const char * -Options::fill_default (void) +Options::fill_default () { return fill_default_.c_str (); } /// Returns the keyword key name. const char * -Options::key_name (void) +Options::key_name () { return key_name_.c_str (); } /// Returns the hash function name. const char * -Options::hash_name (void) +Options::hash_name () { return hash_name_.c_str (); } /// Returns the generated class name. const char * -Options::class_name (void) +Options::class_name () { return class_name_.c_str (); } /// Returns the initial associated character value. int -Options::initial_value (void) +Options::initial_value () { return initial_asso_value_; } /// Returns the iterations value. int -Options::iterations (void) +Options::iterations () { return iterations_; } /// Returns the string used to delimit keywords from other attributes. const char * -Options::delimiter (void) +Options::delimiter () { return delimiters_.c_str (); } /// Gets the total number of switch statements to generate. int -Options::total_switches (void) +Options::total_switches () { return total_switches_; } diff --git a/ACE/apps/gperf/src/Options.h b/ACE/apps/gperf/src/Options.h index 4aa84edfd1d1c..1bfac29b593b1 100644 --- a/ACE/apps/gperf/src/Options.h +++ b/ACE/apps/gperf/src/Options.h @@ -100,29 +100,29 @@ enum class Options : private ACE_Copy_Disabled { public: - Options (void); - ~Options (void); + Options (); + ~Options (); int operator[] (Option_Type option); int parse_args (int argc, ACE_TCHAR *argv[]); void operator= (enum Option_Type); bool operator!= (enum Option_Type); - static void print_options (void); + static void print_options (); static void asso_max (int r); - static int asso_max (void); - static void reset (void); - static int get (void); - static int iterations (void); - static u_int max_keysig_size (void); + static int asso_max (); + static void reset (); + static int get (); + static int iterations (); + static u_int max_keysig_size (); static void keysig_size (u_int); - static int jump (void); - static int initial_value (void); - static int total_switches (void); - static const char *function_name (void); - static const char *fill_default (void); - static const char *key_name (void); - static const char *class_name (void); - static const char *hash_name (void); - static const char *delimiter (void); + static int jump (); + static int initial_value (); + static int total_switches (); + static const char *function_name (); + static const char *fill_default (); + static const char *key_name (); + static const char *class_name (); + static const char *hash_name (); + static const char *delimiter (); private: /// Holds the user-specified Options. @@ -180,7 +180,7 @@ class Options : private ACE_Copy_Disabled static int key_sort (char *base, int len); /// Prints proper program usage. - static void usage (void); + static void usage (); }; /// Global option coordinator for the entire program. diff --git a/ACE/apps/gperf/src/Version.cpp b/ACE/apps/gperf/src/Version.cpp index dcc911c171b60..05cdd217bbe38 100644 --- a/ACE/apps/gperf/src/Version.cpp +++ b/ACE/apps/gperf/src/Version.cpp @@ -26,5 +26,4 @@ #include "ace/ACE.h" - const char *version_string = "2.8 (ACE version)"; diff --git a/ACE/apps/soreduce/Library.cpp b/ACE/apps/soreduce/Library.cpp index 26a42421dcd94..f6142e0e46af3 100644 --- a/ACE/apps/soreduce/Library.cpp +++ b/ACE/apps/soreduce/Library.cpp @@ -222,7 +222,6 @@ Library::has_modules () const } extern "C" { - static int selector (const dirent *d) { diff --git a/ACE/apps/soreduce/Library.h b/ACE/apps/soreduce/Library.h index 0c6f0ab0e3b57..b5263c637c6ed 100644 --- a/ACE/apps/soreduce/Library.h +++ b/ACE/apps/soreduce/Library.h @@ -80,7 +80,6 @@ class MPC_TAO_Dep_Lib : public MPC_TAO_Lib class Library { public: - Library (const ACE_TCHAR *name = 0 ); /// Constructor is responsible for loading all of the modules related to the /// library diff --git a/ACE/apps/soreduce/SO_Group.cpp b/ACE/apps/soreduce/SO_Group.cpp index 5bd30c4ae8c7b..532c12b1eac3a 100644 --- a/ACE/apps/soreduce/SO_Group.cpp +++ b/ACE/apps/soreduce/SO_Group.cpp @@ -20,7 +20,7 @@ SO_Group::SO_Group () libs_ = new Library*[max_libs_]; } -SO_Group::~SO_Group (void) +SO_Group::~SO_Group () { for (int i = 0; i < num_libs_; delete libs_[i++]) { @@ -165,7 +165,7 @@ SO_Group::add_executable (const char * path) } void -SO_Group::analize (void) +SO_Group::analize () { for (int passcount = 0; undefs_.modified (); ++passcount) { @@ -182,7 +182,7 @@ SO_Group::analize (void) } void -SO_Group::write_results (void) +SO_Group::write_results () { for (int i = 0; i < num_libs_; libs_[i++]->write_export_list (1)) { @@ -191,7 +191,7 @@ SO_Group::write_results (void) } void -SO_Group::load_modules (void) +SO_Group::load_modules () { for (int i = 0; i < num_libs_; libs_[i++]->load_modules ()) { @@ -200,7 +200,7 @@ SO_Group::load_modules (void) } void -SO_Group::list_libs (void) +SO_Group::list_libs () { ACE_DEBUG ((LM_DEBUG, "Libs subject to analysis:\n")); @@ -217,5 +217,3 @@ SO_Group::list_libs (void) - - diff --git a/ACE/apps/soreduce/Signature.h b/ACE/apps/soreduce/Signature.h index f2be8aaae1f40..2abe20fdcc134 100644 --- a/ACE/apps/soreduce/Signature.h +++ b/ACE/apps/soreduce/Signature.h @@ -22,7 +22,6 @@ class Signature { public: - enum Kind { text_, undef_ diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp index 93f6c356cfbfc..d6235f2b6b566 100644 --- a/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp +++ b/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp @@ -72,15 +72,15 @@ class Test {} ~Test (); - HANDLE handle (void) { return this->thr_handle_; } - int run (void); + HANDLE handle () { return this->thr_handle_; } + int run (); const char *start (const char *name); bool status (int *exit_status); - int wait (void); - void kill (void); + int wait (); + void kill (); // Clean up remnants of a test run. - void cleanup (void); + void cleanup (); private: HMODULE dll_handle_; @@ -102,13 +102,13 @@ class Peer // Run the Peer's session; intended to be called from a new thread devoted // to this peer's session. - int svc (void); + int svc (); private: Peer () {}; // Process command input from socket. - int command (void); + int command (); // Send a reply string to the peer. int reply (const char *msg); @@ -124,7 +124,7 @@ class Peer // socket handle over which this object receives control commands from the // host test driver. int -Peer::svc (void) +Peer::svc () { // Read commands until EOF (peer closed) or protocol error while (0 == this->command ()) @@ -135,7 +135,7 @@ Peer::svc (void) } int -Peer::command (void) +Peer::command () { // The protocol exchanges with the peer are execpted to be lock-step // request-reply command lines, so we can make assumptions about a complete @@ -328,7 +328,7 @@ Test::~Test () } int -Test::run (void) +Test::run () { this->running_ = true; try @@ -431,7 +431,7 @@ Test::status (int *exit_status) } int -Test::wait (void) +Test::wait () { WaitForSingleObject (this->thr_handle_, INFINITE); if (!this->running_) @@ -440,7 +440,7 @@ Test::wait (void) } void -Test::kill (void) +Test::kill () { TerminateThread (this->thr_handle_, -1); this->cleanup (); @@ -450,7 +450,7 @@ Test::kill (void) // Clean up remnants of a test run. void -Test::cleanup (void) +Test::cleanup () { if (this->dll_handle_ != NULL) { @@ -607,7 +607,7 @@ format_errmsg (unsigned int errcode, const char *prefix) #define TEST_RUNNER_API __declspec(dllimport) #endif -__declspec(dllexport) int test_entry(void) +__declspec(dllexport) int test_entry() { return 0; } diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp index 1caabf2b2fdb0..49c8923c4c0e8 100644 --- a/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp +++ b/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp @@ -1,5 +1,5 @@ #include -__declspec(dllimport) int test_entry(void); +__declspec(dllimport) int test_entry(); // This is plain Windows code, not ACE. Therefore we disable // the check for ACE_OS diff --git a/ACE/bin/MakeProjectCreator/config/ace_mc.mpb b/ACE/bin/MakeProjectCreator/config/ace_mc.mpb index 7be197f05a03c..1146452ceebec 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_mc.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_mc.mpb @@ -2,7 +2,6 @@ project : ace_etcl_parser { after += Monitor_Control libs += ACE_Monitor_Control - avoids += wince specific (prop:microsoft) { lit_libs += pdh diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb index bc94d32142589..c90509cecf510 100644 --- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb +++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb @@ -18,6 +18,12 @@ project: ipv6, vc_warnings, build_files, test_files, svc_conf_files, ace_unicode specific(prop:windows) { lit_libs += iphlpapi } + verbatim(cmake, top, 1) { + set(ACE_ROOT $ENV{ACE_ROOT}) + if(WIN32) + " link_libraries(iphlpapi)" + endif() + } specific(cdt6) { win32::platform_libs += ws2_32 mswsock netapi32 diff --git a/ACE/bin/MakeProjectCreator/config/inet.mpb b/ACE/bin/MakeProjectCreator/config/inet.mpb index dd5094fe90146..1915c061c30c0 100644 --- a/ACE/bin/MakeProjectCreator/config/inet.mpb +++ b/ACE/bin/MakeProjectCreator/config/inet.mpb @@ -1,6 +1,5 @@ // -*- MPC -*- project : acelib { - avoids += wince avoids += old_stdstream avoids += exclude_inet avoids += ace_for_tao @@ -9,4 +8,4 @@ project : acelib { libs += ACE_INet includes += $(ACE_ROOT)/protocols } - + diff --git a/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb b/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb index a98185375e149..b951e280931ce 100644 --- a/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb +++ b/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb @@ -11,24 +11,44 @@ feature(vc_avoid_crt_secure_warnings) { specific(prop:microsoft) { macros += _CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE } + verbatim(cmake, macros, 1) { + if(MSVC) + " add_compile_definitions(_CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE)" + endif() + } } feature(!vc_scl_secure_warnings) { specific(prop:microsoft) { macros += _SCL_SECURE_NO_WARNINGS } + verbatim(cmake, macros, 1) { + if(MSVC) + " add_compile_definitions(_SCL_SECURE_NO_WARNINGS)" + endif() + } } feature(vc_avoid_this_in_initializer_warnings) { specific(prop:microsoft) { DisableSpecificWarnings += 4355 } + verbatim(cmake, macros, 1) { + if(MSVC) + " add_compile_options(/wd4355)" + endif() + } } feature(vc_avoid_winsock_warnings) { specific(prop:microsoft) { macros += _WINSOCK_DEPRECATED_NO_WARNINGS } + verbatim(cmake, macros, 1) { + if(MSVC) + " add_compile_definitions(_WINSOCK_DEPRECATED_NO_WARNINGS)" + endif() + } } feature(vc_avoid_hides_local_declaration) { diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index ee3a32011b327..f4c97286447d4 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -201,9 +201,6 @@ RCFLAGS = \ endif <%endif%> -# To build multiple targets in the same directory on AIX, it works -# best to have a template directory per project. -# The compiler/linker isn't too smart about instantiating templates... ifdef TEMPINCDIR TEMPINCDIR := $(TEMPINCDIR)/<%project_name%> all: $(TEMPINCDIR) diff --git a/ACE/bin/PerlACE/Run_Test.pm b/ACE/bin/PerlACE/Run_Test.pm index 165a3149be206..fe0bfb74aff49 100644 --- a/ACE/bin/PerlACE/Run_Test.pm +++ b/ACE/bin/PerlACE/Run_Test.pm @@ -251,29 +251,6 @@ sub add_lib_path { sub check_privilege_group { - if ($^O eq 'hpux') { - my($access) = 'RTSCHED'; - my($status) = 0; - my($getprivgrp) = '/bin/getprivgrp'; - - if (-x $getprivgrp) { - if (open(GPG, "$getprivgrp |")) { - while() { - if (index($_, $access) >= 0) { - $status = 1; - } - } - close(GPG); - } - } - - if (!$status) { - print STDERR - "WARNING: You must have $access privileges to run this test.\n", - " Run \"man 1m setprivgrp\" for more information.\n"; - exit(0); - } - } } # waits until it finds a matching regular expression in a file diff --git a/ACE/bin/copy-local-script.sh b/ACE/bin/copy-local-script.sh index 68504686d0444..d2d00615482cb 100755 --- a/ACE/bin/copy-local-script.sh +++ b/ACE/bin/copy-local-script.sh @@ -1,7 +1,7 @@ #!/bin/sh for i in *.gz *.bz2 *.zip *.md5; do - d=`echo $i | sed 's/\.[tz][ai][rp]/-7.0.8&/'` + d=`echo $i | sed 's/\.[tz][ai][rp]/-7.0.12&/'` echo "Copying $i to $d" cp -ip $i $d done diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh index 1f57db8e2a8e8..f309efdc3e088 100755 --- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh +++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh @@ -2,7 +2,7 @@ if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi -if test -z $3; then olddate=2022_07_01; else olddate=$3; fi +if test -z $3; then olddate=2022_12_19; else olddate=$3; fi if test -z $ACE_ROOT; then ACE_ROOT=..; fi if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi # diff --git a/ACE/contrib/FaCE/ACE.ico b/ACE/contrib/FaCE/ACE.ico deleted file mode 100644 index 3efedc9021b02..0000000000000 Binary files a/ACE/contrib/FaCE/ACE.ico and /dev/null differ diff --git a/ACE/contrib/FaCE/ACE_Racer.bmp b/ACE/contrib/FaCE/ACE_Racer.bmp deleted file mode 100644 index a487f63f81c8d..0000000000000 Binary files a/ACE/contrib/FaCE/ACE_Racer.bmp and /dev/null differ diff --git a/ACE/contrib/FaCE/CE_ARGV.cpp b/ACE/contrib/FaCE/CE_ARGV.cpp deleted file mode 100644 index 6e7370c625dea..0000000000000 --- a/ACE/contrib/FaCE/CE_ARGV.cpp +++ /dev/null @@ -1,115 +0,0 @@ -#include "CE_ARGV.h" - -CE_ARGV::CE_ARGV(wchar_t* cmdLine) -: ce_argv_(0) -, ce_argc_(0) -{ - const wchar_t* dummyArgv = L"root"; // dummy for the first argv - const wchar_t* separator = L" "; // blank space is a separator - - int formattedCmdLineLength = wcslen(dummyArgv) + - wcslen(separator) + - 1; // 1 is for the NULL at the end - - if (wcslen(cmdLine) > 0) { - formattedCmdLineLength += wcslen(cmdLine); - formattedCmdLineLength += wcslen(separator); - } - - // formattedCmdLine will have dummyArgv and a separator at the beginning of cmdLine - // and a separator at the end to generalize format and reduce the amount of code - wchar_t* formattedCmdLine = 0; - formattedCmdLine = new wchar_t[formattedCmdLineLength]; - - wcscpy(formattedCmdLine, dummyArgv); - wcscat(formattedCmdLine, separator); - - int max_possible_argc = 1; // start with 1 because of the dummyArgv at the beginning - - if (wcslen(cmdLine) > 0) { - int formattedPos = wcslen(formattedCmdLine); - int cmdLineLength = wcslen(cmdLine); - - // Inside of this for loop, it does same thing as strcat except it - // checks and puts only one single white space between two argv entries. - for (int i = 0; i < cmdLineLength; ++i) { - if (iswspace(cmdLine[i]) != 0) { - ++max_possible_argc; // counting the number of white spaces - } - - formattedCmdLine[formattedPos++] = cmdLine[i]; - - if (iswspace(cmdLine[i]) != 0) { - // make sure there is only one white space between two argv entries. - while ((i < cmdLineLength) && (iswspace(cmdLine[i + 1]) != 0)) { - ++i; - } - } - } - - formattedCmdLine[formattedPos] = 0; - wcscat(formattedCmdLine, separator); // make sure formattedCmdLine ends with a blank - } - - int formattedCmdLength = wcslen(formattedCmdLine); - - bool insideQuotation = false; - int* argv_strlen = 0; - int entry_size = 0; - argv_strlen = new int[max_possible_argc]; - - // determine argc - for (int i = 0; i < formattedCmdLength; ++i) { - if (formattedCmdLine[i] == '\\') { - ++i; // ignore the following character - ++entry_size; - } - else if (formattedCmdLine[i] == '"') { - insideQuotation = !insideQuotation; - } - else if ((!insideQuotation) && (iswspace(formattedCmdLine[i]) != 0)) { - // new argv entry end found - argv_strlen[ce_argc_++] = entry_size; // cache the size of this entry - entry_size = 0; - } - else { - ++entry_size; - } - } - - ce_argv_ = new wchar_t*[ce_argc_ + 1]; - ce_argv_[ce_argc_] = 0; // Last command line entry is a NULL. - - for (int j = 0, cmdLinePos = 0; j < ce_argc_; ++j, ++cmdLinePos) { - int length = argv_strlen[j]; - - ce_argv_[j] = new wchar_t[length + 1]; - ce_argv_[j][length] = 0; // string termination null - - if (iswspace(formattedCmdLine[cmdLinePos]) != 0) { - // This is where prior argv has trailing '"' at the end. - ++cmdLinePos; - } - - for (int n = 0; n < length; ++n, ++cmdLinePos) { - if ((formattedCmdLine[cmdLinePos] == '\\') || (formattedCmdLine[cmdLinePos] == '"')) { - ++cmdLinePos; - } - - ce_argv_[j][n] = formattedCmdLine[cmdLinePos]; - } - } - - delete [] argv_strlen; - delete [] formattedCmdLine; -} - - -CE_ARGV::~CE_ARGV(void) -{ - for (int i = 0; i < ce_argc_; ++i) { - delete [] ce_argv_[i]; - } - - delete [] ce_argv_; -} diff --git a/ACE/contrib/FaCE/CE_ARGV.h b/ACE/contrib/FaCE/CE_ARGV.h deleted file mode 100644 index a8e1567e8b851..0000000000000 --- a/ACE/contrib/FaCE/CE_ARGV.h +++ /dev/null @@ -1,89 +0,0 @@ -// -*- C++ -*- -//============================================================================= -/** - * @file CE_ARGV.h - * - * @author Si Mong Park - */ -//============================================================================= - -#ifndef CE_ARGV_H -#define CE_ARGV_H - -#include -#include - - -/** - * @class CE_ARGV - * - * @brief This class is to hash input parameters, argc and argv, for WinCE platform. - * - * Since WinCE only supports wchar_t as an input from OS, some implementation detail, - * especially for CORBA spec, will not support wchar_t (wchar_t) type parameter. - * Moreover, WinCE's input parameter type is totally different than any other OS; - * all command line parameters will be stored in a single wide-character string with - * each unit parameter divided by blank space, and it does not provide the name of - * executable (generally known as argv[0]). - * This class is to convert CE's command line parameters and simulate as in the same - * manner as other general platforms, adding 'root' as a first argc, which is for the - * name of executable in other OS. - */ -class CE_ARGV -{ -public: - /** - * Ctor accepts CE command line as a parameter. - */ - CE_ARGV(wchar_t* cmdLine); - - /** - * Default Dtor that deletes any memory allocated for the converted string. - */ - ~CE_ARGV(void); - - /** - * Returns the number of command line parameters, same as argc on Unix. - */ - int argc(void); - - /** - * Returns the 'char**' that contains the converted command line parameters. - */ - wchar_t** argv(void); - -private: - /** - * Copy Ctor is not allowed. - */ - CE_ARGV(void); - - /** - * Copy Ctor is not allowed. - */ - CE_ARGV(CE_ARGV&); - - /** - * Pointer of converted command line parameters. - */ - wchar_t** ce_argv_; - - /** - * Integer that is same as argc on other OS's. - */ - int ce_argc_; -}; - - -inline int CE_ARGV::argc() -{ - return ce_argc_; -} - - -inline wchar_t** CE_ARGV::argv() -{ - return ce_argv_; -} - -#endif // CE_ARGV_H diff --git a/ACE/contrib/FaCE/CE_Screen_Output.cpp b/ACE/contrib/FaCE/CE_Screen_Output.cpp deleted file mode 100644 index f0d0caf6b029b..0000000000000 --- a/ACE/contrib/FaCE/CE_Screen_Output.cpp +++ /dev/null @@ -1,164 +0,0 @@ -#include "CE_Screen_Output.h" -#include - -// This utility does not use ACE, and shouldn't. -//FUZZ: disable check_for_lack_ACE_OS - -HWND CE_Screen_Output::handler_ = 0; - - -CE_Screen_Output::CE_Screen_Output() -: pFile_(0) -{ -} - - -CE_Screen_Output::~CE_Screen_Output() -{ - if (pFile_ != 0) { - fclose(pFile_); - } -} - - -void CE_Screen_Output::SetOutputWindow(HWND hEdit) -{ - handler_ = hEdit; -} - - -void CE_Screen_Output::clear() -{ - SetWindowText(handler_, 0); -} - - -CE_Screen_Output& CE_Screen_Output::operator << (wchar_t* output) -{ - int length = GetWindowTextLength(handler_); - SendMessage(handler_, EM_SETSEL, length, length); - SendMessage(handler_, EM_REPLACESEL, 0, (LPARAM)output); - - if (pFile_ != 0) - { - fwprintf(pFile_, L"%s", output); - } - - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (const wchar_t* output) -{ - wchar_t* buffer = _wcsdup(output); - if (buffer != 0) - { - *this << buffer; - delete buffer; - } - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (char* output) -{ - int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, 0, 0); - wchar_t* w_output = new wchar_t[len]; - - MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, w_output, len); - *this << w_output; - - delete w_output; - - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (const char* output) -{ - int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, 0, 0); - wchar_t* w_output = new wchar_t[len]; - - MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, w_output, len); - *this << w_output; - - delete [] w_output; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (char output) -{ - *this << (int)output; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned char output) -{ - *this << (int)output; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned short output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%u", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (int output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%d", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned int output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%du", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (float output) -{ - wchar_t buffer[20]; - swprintf(buffer, L"%f", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (long output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%l", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned long output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%lu", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (FILE* pFile) -{ - pFile_ = pFile; - return *this; -} - -//FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/contrib/FaCE/CE_Screen_Output.h b/ACE/contrib/FaCE/CE_Screen_Output.h deleted file mode 100644 index 63746e21a0c34..0000000000000 --- a/ACE/contrib/FaCE/CE_Screen_Output.h +++ /dev/null @@ -1,96 +0,0 @@ -/** - * @file CE_Screen_Output.h - * - * @author Si Mong Park - */ -//============================================================================= - -#ifndef CE_Screen_Output_h -#define CE_Screen_Output_h - -#include -#include - -const wchar_t endl[] = L"\r\n"; -const wchar_t tab[] = L"\t"; - -/** - * @class CE_Screen_Output - * - * @brief Replacement of text output for Windows CE. - * - * This class allows standard text output to be displayed on - * text window for Windows CE. Generally, all ACE output will - * go through under CE if and only if user uses WindozeCE - * implementation by using main_ce instead of main. - * Also, for the easier debugging purpose, object pointer of - * this class can be gotten from ACE_Log_Msg::msg_callback() - * and then can be used directly by user just like cout stream. - */ -class CE_Screen_Output -{ -public: - /** - * Default Ctor - */ - CE_Screen_Output(); - - /** - * Default Dtor - */ - virtual ~CE_Screen_Output(); - - /** - * Interface to specify active window handle. - */ - void SetOutputWindow(HWND hWnd); - - /** - * Clears text screen. - */ - void clear(); - - /** - * << operator that performs actual print out. - * - * Note: This is the only one operator that performs - * output. All other perators convert the type and - * use this operator underneath. - */ - CE_Screen_Output& operator << (wchar_t*); - CE_Screen_Output& operator << (const wchar_t*); - - CE_Screen_Output& operator << (char* output); - CE_Screen_Output& operator << (const char* output); - - CE_Screen_Output& operator << (char output); - CE_Screen_Output& operator << (unsigned char output); - - CE_Screen_Output& operator << (unsigned short output); - - CE_Screen_Output& operator << (int output); - CE_Screen_Output& operator << (unsigned int output); - - CE_Screen_Output& operator << (float output); - - CE_Screen_Output& operator << (long output); - CE_Screen_Output& operator << (unsigned long output); - - CE_Screen_Output& operator << (FILE* pFile); - -private: - /** - * Copy Ctor - */ - CE_Screen_Output(CE_Screen_Output&); - - static HWND handler_; - - /** - * File pointer that used to save output to file. - * This class does not own the file handler pointer. - */ - FILE* pFile_; -}; - -#endif // CE_Screen_Output_h diff --git a/ACE/contrib/FaCE/FACE.ico b/ACE/contrib/FaCE/FACE.ico deleted file mode 100644 index 8a91925b128fc..0000000000000 Binary files a/ACE/contrib/FaCE/FACE.ico and /dev/null differ diff --git a/ACE/contrib/FaCE/FaCE.cpp b/ACE/contrib/FaCE/FaCE.cpp deleted file mode 100644 index 265e21cbeee83..0000000000000 --- a/ACE/contrib/FaCE/FaCE.cpp +++ /dev/null @@ -1,652 +0,0 @@ -#include "FaCE.h" - -#ifdef NO_ACE - -#include "CE_ARGV.h" - -#else - -#include -#include -#include - -#endif // NO_ACE - -#include -#include -#include - -// This utility does not use ACE, and shouldn't. -//FUZZ: disable check_for_lack_ACE_OS - -const ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt"); - -/** - * This simple and small class manages user-input command line - * parameters and parameter history file. - * - * @author Si Mong Park (spark@ociweb.com) - */ -class ParameterList -{ -public: - /** - * Default Ctor. - */ - ParameterList() : next_(0), param_(0) {}; - - /** - * Dtor: deletes all sub-PameterList objects as well as - * memory block allocated for the param_ by _wcsdup(). - */ - ~ParameterList() { free(param_); delete next_; }; - - /** - * Add a new parameter to the list. - */ - void addParameter(char*); - - /** - * Add a new parameter to the list. - */ - void addParameter(ACE_TCHAR*); - - /** - * Save all parameters stored in the list to the - * file. - * Note that 'outputFile' is only for the internal use - * and user must call this function without any parameter. - */ - void saveParameter(FILE* outputFile = 0); - - /** - * Send out windows message to load/update parameters. - */ - void sendParameterMSG(HWND, UINT); - -private: - /** - * A pointer to the next ParameterList object. - * This attribute is totally hidden from user. - */ - ParameterList* next_; - - /** - * User-specified command line parameter. - * This attribute is totally hidden from user. - */ - ACE_TCHAR* param_; -}; - - -void ParameterList::addParameter(char* newParameter) -{ -#ifdef NO_ACE - int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, newParameter, -1, 0, 0); - wchar_t* w_output = new wchar_t[len]; - - MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, newParameter, -1, w_output, len); - this->addParameter(w_output); - - delete [] w_output; -#else - this->addParameter(ACE_TEXT_CHAR_TO_TCHAR(newParameter)); -#endif // NO_ACE -} - - -void ParameterList::addParameter(ACE_TCHAR* newParameter) -{ - if (this->param_ == 0) { - this->param_ = _wcsdup(newParameter); - this->next_ = new ParameterList(); // create and add a new ParameterList object - } - else { - if (wcscmp(this->param_, newParameter) != 0) { - this->next_->addParameter(newParameter); - } - } -} - - -void ParameterList::saveParameter(FILE* outputFile) -{ - if ( (outputFile == 0) && (this->param_ != 0) ) { - outputFile = _wfopen(g_ParameterFileName, ACE_TEXT("w+")); - } - - if (outputFile != 0) { - if (this->param_ != 0) { - fwprintf(outputFile, ACE_TEXT("%s\n"), this->param_); - this->next_->saveParameter(outputFile); - } - else { - fclose(outputFile); - } - } -} - - -void ParameterList::sendParameterMSG(HWND hDlg, UINT message) -{ - if (param_ != 0) { - SendDlgItemMessage(hDlg, IDC_CMDEDIT, message, 0, (LPARAM)this->param_); - this->next_->sendParameterMSG(hDlg, message); - } -} - - -// Global Variables: -HINSTANCE g_hInst; // The current instance -HWND g_hwndCB; // The command bar handle -HWND hWndEdit; // Read only edit box for output display -FILE* g_OutputFile; // File handler for output save - -ParameterList g_Parameter; // command line parameter list - -ACE_CE_Screen_Output cout; // Replacement of std::cout - -ACE_TCHAR g_CommandLine[MAX_COMMAND_LINE]; // User-specified command line parameter -ACE_TCHAR g_SaveFileName[MAX_LOADSTRING]; // Name of the output file - -static SHACTIVATEINFO s_sai; - -// Forward declarations of functions included in this code module: -ATOM MyRegisterClass (HINSTANCE, ACE_TCHAR*); -BOOL InitInstance (HINSTANCE, int); -LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK About (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK CommandLine (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK SaveFileName (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK FileError (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK FileExist (HWND, UINT, WPARAM, LPARAM); -HWND CreateRpCommandBar(HWND); - - -void InitSetup() -{ - g_OutputFile = 0; - memset(g_CommandLine, 0, MAX_COMMAND_LINE * sizeof(ACE_TCHAR)); - memset(g_SaveFileName, 0, MAX_LOADSTRING * sizeof(ACE_TCHAR)); -} - - -void LoadParameterHistory() -{ - FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_TEXT("r")); - - if (parameterFile != 0) { - while (feof(parameterFile) == 0) { - // Note: Remember that fwprintf takes wide-character format specifier but - // save string as ASCII. Thus, history must be read as ASCII then converted - // to wide-character (Unicode on WinCE). - char singleParameter[MAX_COMMAND_LINE]; - int size = 0; - fread(&singleParameter[size], sizeof(char), 1, parameterFile); - - // WinCE does not have function that reads upto the end of line. - while (singleParameter[size] != '\n') { - fread(&singleParameter[++size], sizeof(char), 1, parameterFile); - } - - if (size > 0) { - singleParameter[size] = 0; // NULL terminator - g_Parameter.addParameter(singleParameter); - } - } - fclose(parameterFile); - } -} - - -// -// FUNCTION: MyRegisterClass() -// -// PURPOSE: Registers the window class. -// -// COMMENTS: -// -// It is important to call this function so that the application -// will get 'well formed' small icons associated with it. -// -ATOM MyRegisterClass(HINSTANCE hInstance, ACE_TCHAR* szWindowClass) -{ - WNDCLASS wc; - - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = (WNDPROC) WndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_FACE)); - wc.hCursor = 0; - wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH); - wc.lpszMenuName = 0; - wc.lpszClassName = szWindowClass; - - return RegisterClass(&wc); -} - -// -// FUNCTION: InitInstance(HANDLE, int) -// -// PURPOSE: Saves instance handle and creates main window -// -// COMMENTS: -// -// In this function, we save the instance handle in a global variable and -// create and display the main program window. -// -BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) -{ - HWND hWnd = 0; - - ACE_TCHAR szTitle[MAX_LOADSTRING]; // The title bar text - ACE_TCHAR szWindowClass[MAX_LOADSTRING]; // The window class name - - g_hInst = hInstance; // Store instance handle in our global variable - // Initialize global strings - LoadString(hInstance, IDC_FACE, szWindowClass, MAX_LOADSTRING); - LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - - //If it is already running, then focus on the window - hWnd = FindWindow(szWindowClass, szTitle); - if (hWnd) - { - // set focus to foremost child window - // The "| 0x01" is used to bring any owned windows to the foreground and - // activate them. - SetForegroundWindow((HWND)((ULONG) hWnd | 0x00000001)); - return 0; - } - - MyRegisterClass(hInstance, szWindowClass); - - RECT rect; - GetClientRect(hWnd, &rect); - - hWnd = CreateWindow(szWindowClass, szTitle, WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hInstance, 0); - - if (!hWnd) - { - int error = 0; - error = GetLastError(); - return FALSE; - } - //When the main window is created using CW_USEDEFAULT the height of the menubar (if one - // is created is not taken into account). So we resize the window after creating it - // if a menubar is present - { - RECT rc; - GetWindowRect(hWnd, &rc); - rc.bottom -= MENU_HEIGHT; - if (g_hwndCB) - MoveWindow(hWnd, rc.left, rc.top, rc.right, rc.bottom, FALSE); - } - - ShowWindow(hWnd, nCmdShow); - UpdateWindow(hWnd); - - return TRUE; -} - -// -// FUNCTION: WndProc(HWND, unsigned, WORD, LONG) -// -// PURPOSE: Processes messages for the main window. -// -// WM_COMMAND - process the application menu -// WM_PAINT - Paint the main window -// WM_DESTROY - post a quit message and return -// -LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - HDC hdc; - int wmId, wmEvent, nCmdHt; - PAINTSTRUCT ps; - RECT textRect; - - switch (message) - { - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDM_HELP_ABOUT: - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ABOUTBOX, hWnd, (DLGPROC)About); - break; - - case IDOK: - SendMessage(hWnd, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), (LPARAM)hWnd); - SendMessage(hWnd, WM_CLOSE, 0, 0); - break; - - case ID_SETTING_RUN: - { -#ifdef NO_ACE - cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl; - CE_ARGV ce_argv(g_CommandLine); - main_i(ce_argv.argc(), ce_argv.argv()); - cout << ACE_TEXT("END") << endl << endl; -#else - cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl; - ACE_ARGV ce_argv(g_CommandLine); - ACE::init(); - ACE_LOG_MSG->msg_callback(&cout); // register call back - ACE_LOG_MSG->set_flags(ACE_Log_Msg::MSG_CALLBACK); // set call back flag - ace_main_i(ce_argv.argc(), ce_argv.argv()); - ACE::fini(); - cout << ACE_TEXT("END") << endl << endl; -#endif // NO_ACE - } - break; - - case ID_SETTING_EXIT: - SendMessage(hWnd, WM_DESTROY, 0, 0); - break; - - case ID_TOOLS_SAVETOFILE: - // create a dialog box to get the file name - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_OUTFILE, hWnd, (DLGPROC)SaveFileName); - break; - - case ID_SETTING_COMMANDLINE: - // create a dialog box to get the command line - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_CMDLINE, hWnd, (DLGPROC)CommandLine); - break; - - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - break; - - case WM_CREATE: - SHMENUBARINFO mbi; - - memset(&mbi, 0, sizeof(SHMENUBARINFO)); - mbi.cbSize = sizeof(SHMENUBARINFO); - mbi.hwndParent = hWnd; - mbi.nToolBarId = IDM_MENU; - mbi.hInstRes = g_hInst; - mbi.nBmpId = 0; - mbi.cBmpImages = 0; - - if (!SHCreateMenuBar(&mbi)) - return 0; - - g_hwndCB = mbi.hwndMB; - - // Initialize the shell activate info structure - memset (&s_sai, 0, sizeof (s_sai)); - s_sai.cbSize = sizeof (s_sai); - - GetClientRect(hWnd, &textRect); - nCmdHt = CommandBar_Height(mbi.hwndMB); - - hWndEdit = CreateWindow(ACE_TEXT("EDIT"), - 0, - WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | WS_VSCROLL | WS_HSCROLL, - 0, - 0, - textRect.right, - textRect.bottom - MENU_HEIGHT, - hWnd, - 0, - g_hInst, - 0); - cout.SetOutputWindow(hWndEdit); - LoadParameterHistory(); - break; - - case WM_PAINT: - RECT rt; - hdc = BeginPaint(hWnd, &ps); - GetClientRect(hWnd, &rt); - EndPaint(hWnd, &ps); - break; - - case WM_ACTIVATE: - // Notify shell of our activate message - SHHandleWMActivate(hWnd, wParam, lParam, &s_sai, FALSE); - break; - - case WM_SETTINGCHANGE: - SHHandleWMSettingChange(hWnd, wParam, lParam, &s_sai); - break; - - case WM_HIBERNATE: // low power - case WM_CLOSE: - case WM_DESTROY: - g_Parameter.saveParameter(); // save parameters to history file - CommandBar_Destroy(g_hwndCB); - PostQuitMessage(0); - break; - - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - return 0; -} - - -HWND CreateRpCommandBar(HWND hwnd) -{ - SHMENUBARINFO mbi; - - memset(&mbi, 0, sizeof(SHMENUBARINFO)); - mbi.cbSize = sizeof(SHMENUBARINFO); - mbi.hwndParent = hwnd; - mbi.nToolBarId = IDM_MENU; - mbi.hInstRes = g_hInst; - mbi.nBmpId = 0; - mbi.cBmpImages = 0; - - if (!SHCreateMenuBar(&mbi)) - return 0; - - return mbi.hwndMB; -} - -// Mesage handler for the About box. -LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM) -{ - SHINITDLGINFO shidi; - - const ACE_TCHAR* copyrightNote = -ACE_TEXT("ACE and TAO are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object") \ -ACE_TEXT("Computing at Washington University, 1993-2002, all rights reserved.") \ -ACE_TEXT("FaCE is copyrighted by Object Computing, Inc., 2002,\n all rights reserved.\n") \ -ACE_TEXT("See License.txt for more information."); - - switch (message) - { - case WM_INITDIALOG: - // Create a Done button and size it. - shidi.dwMask = SHIDIM_FLAGS; - shidi.dwFlags = SHIDIF_DONEBUTTON | SHIDIF_SIPDOWN | SHIDIF_SIZEDLGFULLSCREEN; - shidi.hDlg = hDlg; - SHInitDialog(&shidi); - SetDlgItemText(hDlg, IDC_COPYRIGHT, copyrightNote); - return TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - } - return FALSE; -} - - -LRESULT CALLBACK CommandLine(HWND hDlg, UINT message, WPARAM wParam, LPARAM) -{ - int wmId; - int wmEvent; - - switch (message) - { - case WM_INITDIALOG: - g_Parameter.sendParameterMSG(hDlg, CB_INSERTSTRING); - SetDlgItemText(hDlg, IDC_CMDEDIT, g_CommandLine); // pass existing command line for display - return TRUE; - - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDOK: - // new command line accepted - GetDlgItemText(hDlg, IDC_CMDEDIT, g_CommandLine, MAX_COMMAND_LINE - 1); - EndDialog(hDlg, wmId); - g_Parameter.addParameter(g_CommandLine); - return TRUE; - - case IDCANCEL: - EndDialog(hDlg, wmId); - return TRUE; - - default: - return FALSE; - } - break; - default: - return FALSE; - } - - return FALSE; -} - - -LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM) -{ - int wmId; - int wmEvent; - - ACE_TCHAR tempBuffer[MAX_LOADSTRING]; - ACE_TCHAR fileMode[3] = { 0, '+', 0 }; // mode will either be "a+" or "w+" - FILE* tempFile; - - switch (message) - { - case WM_INITDIALOG: - SetDlgItemText(hDlg, IDC_SAVEFILE, g_SaveFileName); - return TRUE; - - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDOK: - GetDlgItemText(hDlg, IDC_SAVEFILE, tempBuffer, MAX_LOADSTRING - 1); - EndDialog(hDlg, wmId); - - tempFile = _wfopen(tempBuffer, ACE_TEXT("r")); - - if (tempFile != 0) // if file exists - { - fclose(tempFile); // close temp handler - int choice = DialogBox(g_hInst, (const ACE_TCHAR*)IDD_FILEEXIST, hDlg, (DLGPROC)FileExist); - switch (choice) - { - case IDOVERWRITE: // overwrite existing file - fileMode[0] = 'w'; - break; - - case IDC_APPEND: // append to existing file - fileMode[0] = 'a'; - break; - - case IDCANCEL: // cancel operation without changing g_OutputFile - return TRUE; - } - } - else // if file does not exist - { - fileMode[0] = 'w'; - } - - tempFile = _wfopen(tempBuffer, fileMode); - - if (tempFile == 0) - { - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ERRFILE, hDlg, (DLGPROC)FileError); - } - else - { - wcscpy(g_SaveFileName, tempBuffer); - - if (g_OutputFile != 0) - { - fclose(g_OutputFile); // close any open file - } - - g_OutputFile = tempFile; - - cout << g_OutputFile; // update FILE* for the CE_Screen_Output class object. - } - - return TRUE; - - case IDCANCEL: - EndDialog(hDlg, wmId); - return TRUE; - - default: - return FALSE; - } - break; - default: - return FALSE; - } - - return FALSE; -} - - -LRESULT CALLBACK FileError(HWND hDlg, UINT message, WPARAM wParam, LPARAM) -{ - switch (message) - { - case WM_INITDIALOG: - return TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - } - - return FALSE; -} - - -LRESULT CALLBACK FileExist(HWND hDlg, UINT message, WPARAM wParam, LPARAM) -{ - switch (message) - { - case WM_INITDIALOG: - return TRUE; - case WM_COMMAND: - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - default: - return FALSE; - } - - return FALSE; -} - -//FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/contrib/FaCE/FaCE.h b/ACE/contrib/FaCE/FaCE.h deleted file mode 100644 index f8dc293aa1a80..0000000000000 --- a/ACE/contrib/FaCE/FaCE.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- -//============================================================================= -/** - * @file FaCE.h - * - * @author Si Mong Park - */ -//============================================================================= - -#if !defined(AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_) -#define AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#if (_WIN32_WCE <= 211) -#error This project can not be built for H/PC Pro 2.11 or earlier platforms. -#endif - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -////// -// BEGIN FaCE specific preprocessor -#ifdef NO_ACE - -#include -#include "CE_Screen_Output.h" - -#define ACE_TCHAR wchar_t -#define ACE_TEXT(STRING) L##STRING -#define ACE_CE_Screen_Output CE_Screen_Output - -int main_i(int, wchar_t**); - -#else - -#include - -int ace_main_i(int, ACE_TCHAR**); - -#endif // NO_ACE -// END FaCE specific -////// - -#include "resource.h" - -#define MENU_HEIGHT 26 -#define MAX_LOADSTRING 101 -#define MAX_COMMAND_LINE 1001 // Max number of characters + 1 (null at the end) for user-input argv - -extern ACE_CE_Screen_Output cout; // Replacement of std::cout - -#endif // !defined(AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_) diff --git a/ACE/contrib/FaCE/FaCE.mpc b/ACE/contrib/FaCE/FaCE.mpc deleted file mode 100644 index a107075b12dd7..0000000000000 --- a/ACE/contrib/FaCE/FaCE.mpc +++ /dev/null @@ -1,14 +0,0 @@ -// -*- MPC -*- -project: aceexe { - exename = FaCE - // This is just a dummy_label to prevent the example from being compiled - // in MPC builds - requires += dummy_label - requires += wince - lit_libs += aygshell commctrl - - Source_Files { - FaCE.cpp - Main.cpp - } -} diff --git a/ACE/contrib/FaCE/FaCE.rc b/ACE/contrib/FaCE/FaCE.rc deleted file mode 100644 index 1d1b40df81e4b..0000000000000 --- a/ACE/contrib/FaCE/FaCE.rc +++ /dev/null @@ -1,268 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "newres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_FACE ICON DISCARDABLE "FACE.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""newres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Data -// - -IDM_MENU SHMENUBAR MOVEABLE PURE -BEGIN - IDM_MENU, 2, - I_IMAGENONE, ID_SETTING, TBSTATE_ENABLED, - TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_SETTING, 0, 0, - I_IMAGENONE, IDM_MAIN_COMMAND1, TBSTATE_ENABLED, - TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_HELP, 0, 1, -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Menubar -// - -IDM_MENU MENU DISCARDABLE -BEGIN - POPUP "Setting" - BEGIN - MENUITEM "Command Line", ID_SETTING_COMMANDLINE - MENUITEM "Run", ID_SETTING_RUN - MENUITEM SEPARATOR - MENUITEM "Exit", ID_SETTING_EXIT - END - POPUP "Tools" - BEGIN - MENUITEM "About", IDM_HELP_ABOUT - MENUITEM "Save To File", ID_TOOLS_SAVETOFILE - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 148, 161 -STYLE WS_POPUP | WS_CAPTION -EXSTYLE 0x80000000L -CAPTION "About FACE" -FONT 8, "System" -BEGIN - CONTROL 113,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,33,6, - 69,52 - CTEXT "Static",IDC_COPYRIGHT,7,86,128,68 - CONTROL 114,IDC_TAO,"Static",SS_BITMAP,7,61,134,22 -END - -IDD_CMDLINE DIALOG DISCARDABLE 0, 0, 125, 50 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Command Line" -FONT 8, "System" -BEGIN - DEFPUSHBUTTON "OK",IDOK,7,29,50,14 - PUSHBUTTON "Cancel",IDCANCEL,68,29,50,14 - COMBOBOX IDC_CMDEDIT,7,7,111,80,CBS_DROPDOWN | CBS_AUTOHSCROLL | - CBS_OEMCONVERT | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | - WS_TABSTOP -END - -IDD_OUTFILE DIALOG DISCARDABLE 0, 0, 127, 49 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Output File Name" -FONT 8, "System" -BEGIN - DEFPUSHBUTTON "OK",IDOK,7,28,50,14 - PUSHBUTTON "Cancel",IDCANCEL,70,28,50,14 - EDITTEXT IDC_SAVEFILE,7,7,113,14,ES_AUTOHSCROLL -END - -IDD_ERRFILE DIALOG DISCARDABLE 0, 0, 124, 49 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ERROR" -FONT 8, "System" -BEGIN - DEFPUSHBUTTON "OK",IDOK,37,28,50,14 - CTEXT "File Creation Error!",IDC_ERRFILE,13,7,98,17, - SS_CENTERIMAGE -END - -IDD_FILEEXIST DIALOG DISCARDABLE 0, 0, 114, 90 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "File Exists" -FONT 8, "System" -BEGIN - DEFPUSHBUTTON "Overwrite",IDOVERWRITE,32,32,50,14 - PUSHBUTTON "Cancel",IDCANCEL,32,68,50,14 - PUSHBUTTON "Append",IDC_APPEND,32,50,50,14 - CTEXT "File already exists!",IDC_STATIC,7,15,100,11 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDC_FACE ACCELERATORS DISCARDABLE -BEGIN - "A", IDM_HELP_ABOUT, VIRTKEY, CONTROL, NOINVERT - "Q", IDOK, VIRTKEY, CONTROL, NOINVERT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 141 - TOPMARGIN, 6 - BOTTOMMARGIN, 154 - END - - IDD_CMDLINE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 118 - TOPMARGIN, 7 - BOTTOMMARGIN, 43 - END - - IDD_OUTFILE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 120 - TOPMARGIN, 7 - BOTTOMMARGIN, 42 - END - - IDD_ERRFILE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 117 - TOPMARGIN, 7 - BOTTOMMARGIN, 42 - END - - IDD_FILEEXIST, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 107 - TOPMARGIN, 7 - BOTTOMMARGIN, 82 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_ACERACER BITMAP DISCARDABLE "ACE_Racer.bmp" -IDB_TAO BITMAP DISCARDABLE "TAO.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APP_TITLE "FaCE" - IDC_FACE "FaCE" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_HELP "Tools" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_COMMAND1 "Done " -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_CAP_SETTING "Setting" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/ACE/contrib/FaCE/FaCENOACE.mpc b/ACE/contrib/FaCE/FaCENOACE.mpc deleted file mode 100644 index cc91b9a048dd2..0000000000000 --- a/ACE/contrib/FaCE/FaCENOACE.mpc +++ /dev/null @@ -1,14 +0,0 @@ -// -*- MPC -*- -project: vc_warnings { - exename = FaCENOACE - requires += wince - macros += NO_ACE - lit_libs += aygshell commctrl - - Source_Files { - FaCE.cpp - Main.cpp - CE_ARGV.cpp - CE_Screen_Output.cpp - } -} diff --git a/ACE/contrib/FaCE/FaCE_OS.h b/ACE/contrib/FaCE/FaCE_OS.h deleted file mode 100644 index 4043068af522c..0000000000000 --- a/ACE/contrib/FaCE/FaCE_OS.h +++ /dev/null @@ -1,36 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file FaCE_OS.h - * - * @author Si Mong Park - */ -//============================================================================= - -#ifndef FaCE_OS_h -#define FaCE_OS_h - -// This definition is for the "int FaCE_MAIN(int, wchar_t**)" using FaCE. -# define FaCE_MAIN \ -ace_main_i (int, ACE_TCHAR**); \ -extern BOOL InitInstance (HINSTANCE, int); \ -extern void InitSetup(); \ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, ACE_TCHAR* lpCmdLine, int nCmdShow) \ -{ \ - MSG msg; \ - HACCEL hAccelTable; \ - if (!InitInstance (hInstance, nCmdShow)) return FALSE; \ - hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE); \ - InitSetup(); \ - while (GetMessage(&msg, 0, 0, 0)) { \ - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { \ - TranslateMessage(&msg); \ - DispatchMessage(&msg); \ - } \ - } \ - return msg.wParam; \ -} \ -int ace_main_i - -#endif // FaCE_OS_h diff --git a/ACE/contrib/FaCE/License.txt b/ACE/contrib/FaCE/License.txt deleted file mode 100644 index 1c58219c67a76..0000000000000 --- a/ACE/contrib/FaCE/License.txt +++ /dev/null @@ -1,28 +0,0 @@ -== -== Copyright and Licensing Information -== -== - -ACE(tm) and TAO(tm) are copyrighted by Dr. Douglas C. Schmidt and the Center for Distributed -Object Computing ('DOC' group) at Washington University, Copyright (C) 1993 - 2002, all rights -reserved. Since ACE and TAO are open source, free software, you are free to use, modify, and -distribute the ACE and TAO source code and object code produced from the source, as long as -you include this copyright statement along with code built using ACE and TAO. Please refer to -ACE and TAO documentations for detailed copyright and license information on ACE and TAO. - -FaCE is an additional front-end shell package designed for ACE and TAO testing work for Pocket -PC 2002 platform, created and released by Object Computing, Inc. (OCI) and distributed with ACE -and TAO under the same licensing terms. You can modify and change the source of FaCE for your -own use as long as you provide attribution to OCI by including its copyright statement in your -distributions of source and object code. OCI welcomes submissions of improvements to the FaCE -code base. - -FaCE is copyrighted by Object Computing, Inc., St. Louis Missouri, Copyright (C) 2002, -all rights reserved. - - -== -== Warranty Information -== - -FaCE is provided 'as is' without warranties of any kind. diff --git a/ACE/contrib/FaCE/Main.cpp b/ACE/contrib/FaCE/Main.cpp deleted file mode 100644 index dd927c27203ac..0000000000000 --- a/ACE/contrib/FaCE/Main.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// ************************************************ -// ** This file is NOT to be used for framework. ** -// ************************************************ - -// This file defines the entry point for Windows CE, which is defined in OS.h for real applications. - - -#include "FaCE.h" - -extern BOOL InitInstance (HINSTANCE, int); -extern void InitSetup(); - - -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, ACE_TCHAR*, int nCmdShow) -{ - MSG msg; - HACCEL hAccelTable; - if (!InitInstance (hInstance, nCmdShow)) return FALSE; - hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE); - InitSetup(); - while (GetMessage(&msg, 0, 0, 0)) { - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - return msg.wParam; -} - - -#ifdef NO_ACE - -int main_i(int, ACE_TCHAR**) -{ - // this function will be replaced by user's main_ce function - return 0; -} - -#else - -int ace_main_i(int, ACE_TCHAR**) -{ - // this function will be replaced by user's main_ce function - return 0; -} - -#endif // NO_ACE diff --git a/ACE/contrib/FaCE/README b/ACE/contrib/FaCE/README deleted file mode 100644 index f81650500ce7f..0000000000000 --- a/ACE/contrib/FaCE/README +++ /dev/null @@ -1,283 +0,0 @@ -=== -=== FaCE (Front-end for ACE CE) -=== -=== Object Computing, Inc. -=== St. Louis, Missouri -=== Copyright (C) 2002. All rights reserved. -=== -=== V1.01, March 30th, 2002 -=== - -== What's FaCE? - -FaCE is a simple front-end framework for testing and debugging non-Windows -CE applications on the Pocket PC 2002 platform. Originally, FaCE was -developed to test ACE and TAO components internally in Object Computing, Inc. -However, since it has shown dramatic increase of productivity in a lot -shorter amount of time, it has been prepared as a package for all programmers -who want to test and run existing codes (non-WinCE native codes) on Pocket PC -2002 and WinCE 3.0. - -The features of FaCE are: - - 1. command line parameter support - 2. command line history support (never type in same command line again) - 3. output displayed on the windows screen - 4. output to file (with append and overwrite support) - 5. does not use MFC - 6. almost no modification to existing user code - 7. easy to enable and disable after install - -* Default project files only contain Pocket PC 2002 platform configuration. - A new configuration can be added for other WinCE 3.0 platform from eVC. - - -== Package Contents - -Files contained in FaCE package are: - - Main Framework Files for both ACE users and non-ACE users - - ACE_Racer.bmp - - FaCE.h & cpp - - FaCE.ico - - FaCE.rc - - newres.h - - resource.h - - TAO.bmp - - ACE entry point definition file - - FaCE_OS.h - - Additional Framework files for non-ACE users - - CE_ARGV.h & cpp - - CE_Screen_Output.h & cpp - - Files for loading skeleton FaCE from eVC - - FaCE.vcp & vcw : FaCE Project files for ACE users - - FaCENOACE.vcp & vcw : FaCE Project files for non-ACE users - - Main.cpp : almost empty entry point function - - Misc. Files - - ACE.ico : a bonus icon of ACE logo - - License.txt : license and warranty information - - ReadMe.txt : this document - - -== Requirement - - - Microsoft(C) eMbedded Visual Studio/C++ (eVC) 3.0 - - Pocket PC 2002 SDK - - ** For ACE-users only: - - ACE+TAO installed and configured for WinCE build only for ACE-users - - ace and ace_os libraries built for WinCE and loaded on machine - - -== Important Note - -It has been reported that certain Pocket PC 2002 machines with ARM processor -can be totally dead and will not even respond to the hard reset. While the -real cause of this problem is unknown, HP has released a patch for this -problem. We have tested it, and it seems working fine on our machine (HP -Jornada 568), which is our 5th machine that has been running fine for the -longest time. - -As this has been identified by hardware manufacturer and can be fixed as HP -did, Object Computing, Inc. (OCI) or any member of ACE+TAO community cannot -be responsible for this problem. If this problem happens during debugging, -contact your hardware manufacturer for fix or replacement. It has found -that almost all Pocket PC 2002 machines regardless of manufacturers have same -problem. - -Also, Phil Mesnier at OCI has found that virtual function calls under certain -situation can cause a problem that randomly changes parameter and pointer -values over function calls. This is due to the incorrect instructions -generated by eVC for ARM processor. So far, no solution or patch has been -released by compiler vendor, although vendor is aware of this problem. - -Since Pocket PC 2002 is based on WinCE 3.0, ACE+TAO as well as FaCE should -be able to run on any WinCE 3.0 platform by adding a new configuration with -minimal change. - - -== Installation & Setup - -1. Create a subdirectory named 'FaCE' (or anything in your taste) under - your current project directory. - -2. Copy FaCE_OS.h to the ACE_ROOT/ace directory, and add following line at - the end of your ACE_ROOT/ace/config.h file: - - #include "FaCE_OS.h" - -3. Copy main framework files listed above and add them into "your" project - (NOT FaCE.vcw/vcp). For non-ACE users, copy additional framework files - for non-ACE users in addition to the main framework files. - It would be a good idea to create a new folder in your project and put - all FaCE files into it. This way, it will be easy to disable FaCE by - setting the folder excluded from the build on the folder property option. - - ** IMPORTANT! ** - FaCE does NOT use MFC. Thus, if your project is already set for - 'Not using MFC', then do not change the setting. - - * Note: Make sure those files are not shared by multiple executables. - Each project must have its own copy of those files. - It is a good idea to create a separate folder on your project - and put FaCE related files into that folder. In that case, - if you want to disable FaCE and run by using normal 'main', - then you can simply set the whole FaCE folder excluded from - build in the project setting menu. - -4. Change your 'main()' function part similar to the following example. - - #ifdef ACE_HAS_WINCE - #include "FaCE/FaCE.h" // use the name of subdirectory you created - int FaCE_MAIN (int argc, ACE_TCHAR *argv[]) - #else - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // ACE normal entry point - #endif - - Change the directory name for "FaCE/FaCE.h" if necessary. - For non-ACE users, use 'UNDER_CE' instead of 'ACE_HAS_WINCE'. - - == Possible Additional Change - - Above change will be the only change if your program compiles and links - fine under eVC. It does not mean that your program is WinCE-ready but - just means that your program does not include the libraries that are not - supported by WinCE, such as iostream. - - For ACE users, good examples will be the ACE test programs under - $ACE_ROOT/test. - - For non-ACE users, I highly recommend to create a project for WinCE first - if it has not already been done and write your code using wmain. - Try compile and link your program without FaCE to check your program does - not include any libraries not supported by WinCE. FaCE supports text output - by aliasing 'cout' in FaCE.h; however, it is NOT a real iostream but an alias - for CE_Screen_Output class. You may need to use '#ifdef UNDER_CE' for your - iostream includes, if you want to share the code among different platforms. - - Also, it is important to match the parameter types for 'wmain' function. - For WinCE, it MUST be in the format of: - - int FaCE_MAIN (int, wchar_t**) - - and you can leave your original wmain type as it was for non-CE platform - definition. - -5. Go to 'ResourceView' or double-click on the 'FaCE.rc'. Open 'String Table -> - String Table' from the resource browse view, and change the string value (caption) - defined for 'IDS_APP_TITLE' from 'FaCE' to your program name. This will - help identifying multiple FaCE-fied applications when you browse them - through system memory -> running programs in case of crash. - -6. That's it! - -** Optionally, you can personalize the icons defined for FaCE for your own. - To do this easily, load "FaCE.vcw" (requires ACE library) or "FaCENOACE.vcw" - from eVC. Also, FaCENOACE.vcw can be used as 'hello world'-type starting - frame-work for non-WinCE programmers. - -** Non-ACE users may see the warning messages saying, "Could not find the file xxx", - for ace.h, Log_Msg.h, OS.h, and CE_Screen_Output.h. This is due to the eVC's - not-so-perfect precompilation file checking and totally harmless. - -** Later if you don't want to use FaCE anymore, simply restore your original - main function and remove FaCE files from your project (or exclude FaCE files - from build). ACE library does not have to be rebuilt as FaCE_OS.h only - contains macro. - -== Running FaCE - -1. Command line option - -User can specify the command line option for the program by using 'Settings -> -Command Line' from the FaCE menu. FaCE will automatically save all user-entered -command line parameters as a ASCII format file named 'Parameters.txt' in the -root directory of WinCE device/emulator. User can edit and change by opening -this file from any text editor and save as a ASCII text file with DOS standard -CR/LF combo. This will greatly save time especially when you are working on the -Pocket PC machine that does not have keyboard. Remember NOT to convert file -format to Unicode; it must be standard DOS ASCII text file. - -2. Output Saving - -You can save output to file by selecting 'Tools -> Save To File'. By default, -FaCE will not create/save any file. Also, any output received before setting -up this feature will not be saved. - -If the file with specified name exists, FaCE will ask whether you want to -append to the end of file or erase and overwrite. All output files will be -saved in the root directory of the system. - -3. Running Your Program - -'Setting -> Run' will execute your program. Two tags, 'START' and 'END' -indicate the beginning and end of your code. - -For ACE users, any log message sent to ACE message log (ACE_DEBUG, for example) -will be displayed on the screen. Also, if you have setup to save to file, -the same contents will be saved to the file as well. Note that the output will -NOT have ACE internal tags (i.e. Dec 04 14:51:12.000 2001@LM_DEBUG@) because -FaCE uses callback message function, and ACE does not pass those tags along -with the output message. - -For non-ACE users, you can declare your own local copy of CE_Screen_Output -object. For example, you can declare CE_Screen_Output object in your cpp file -like: - - CE_Screen_Output cout; - -and use it like, - - int a = 100; - wchar_t* strTemp = L"Hello, world!"; - cout << L"String : " << strTemp << L"a = " << a << endl; - -Remember, CE_Screen_Output is just a simple text output function and does not -have the full capabilities of iostream, which is not available for WinCE 3.0. - -4. In case of crash - -If you have started your code, but the code crashes, which can be easily -identified by looking for the 'END' tag, then you can use Windows CE's memory -program to kill the process (Start -> Settings -> System tag -> Memory -> -Running Programs tag). If you have changed IDS_APP_TITLE in the resource -viewer, then you will see the name you have specified; otherwise, FaCE will be -listed. You can select the name and stop the process by clicking 'Stop' button. -Sometimes, you may need to reset the machine if you cannot access memory program. - - -== Note - -- This FaCE framework does not use any MFC; it only uses general Win32 - API, thus, your project setting does not have to be changed. - -- FaCE is for the 'legacy' Unix/DOS style console applications that - do not use any Win32 and MFC for Windows OS. Programs that are already - using native Windows/WinCE API's will not need FaCE framework. - -- If you run your application from FaCE (Settings -> Run), 'START' and - 'END' will appear at the beginning and end of output messages from your - application. If you see 'END' lable after execution, you can run your - program again without exit and start up FaCE again. - -- Make sure to terminate FaCE by selecting 'Settings -> Exit'. It will - completely terminate FaCE session; Clicking on the 'X' button - at the top-left corner of the screen will not, just like most WinCE programs. - -- FaCE_MAIN is only for the WinCE port of ACE, ensuring proper windows system - message filtering along with proper registraion so that user can see the - process from memory setting and task switcher applications. - -- ACE and FaCE do not overrides native WinMain. If you are developing for - Windows OS only, your WinMain should be just safe from any overrides. - In this case, of course, you don't need to use FaCE package. - - -== Question or Comment - -If you have question and/or comment specific to the FaCE, please contact -Si Park at spark@ociweb.com or Justin Michel at michel_j@ociweb.com. diff --git a/ACE/contrib/FaCE/TAO.bmp b/ACE/contrib/FaCE/TAO.bmp deleted file mode 100644 index 1492f789509eb..0000000000000 Binary files a/ACE/contrib/FaCE/TAO.bmp and /dev/null differ diff --git a/ACE/contrib/FaCE/newres.h b/ACE/contrib/FaCE/newres.h deleted file mode 100644 index c0fcf13874f3e..0000000000000 --- a/ACE/contrib/FaCE/newres.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef __NEWRES_H__ -#define __NEWRES_H__ - -#if !defined(UNDER_CE) -#define UNDER_CE _WIN32_WCE -#endif - -#if defined(_WIN32_WCE) - #if !defined(WCEOLE_ENABLE_DIALOGEX) - #define DIALOGEX DIALOG DISCARDABLE - #endif - #include - #define SHMENUBAR RCDATA - #if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300) - #include - #define AFXCE_IDR_SCRATCH_SHMENU 28700 - #else - #define I_IMAGENONE (-2) - #define NOMENU 0xFFFF - #define IDS_SHNEW 1 - - #define IDM_SHAREDNEW 10 - #define IDM_SHAREDNEWDEFAULT 11 - #endif // _WIN32_WCE_PSPC - #define AFXCE_IDD_SAVEMODIFIEDDLG 28701 -#endif // _WIN32_WCE - -#ifdef RC_INVOKED -#ifndef _INC_WINDOWS -#define _INC_WINDOWS - #include "winuser.h" // extract from windows header - #include "winver.h" - #include "windows.h" -#endif -#endif - -#ifdef IDC_STATIC -#undef IDC_STATIC -#endif -#define IDC_STATIC (-1) - -#endif //__NEWRES_H__ diff --git a/ACE/contrib/FaCE/resource.h b/ACE/contrib/FaCE/resource.h deleted file mode 100644 index 385039fa6ac77..0000000000000 --- a/ACE/contrib/FaCE/resource.h +++ /dev/null @@ -1,43 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by FaCE.rc -// -#define IDS_APP_TITLE 1 -#define IDC_FACE 3 -#define IDI_FACE 101 -#define IDM_MENU 102 -#define IDD_ABOUTBOX 103 -#define IDS_HELP 104 -#define IDD_CMDLINE 104 -#define IDD_OUTFILE 105 -#define IDD_ERRFILE 107 -#define IDD_FILEEXIST 109 -#define IDB_ACERACER 113 -#define IDB_TAO 114 -#define IDS_COMMAND1 301 -#define IDC_CMDEDIT 1001 -#define IDC_SAVEFILE 1002 -#define IDC_ERRFILE 1003 -#define IDOVERWRITE 1004 -#define IDC_APPEND 1005 -#define IDC_COPYRIGHT 1007 -#define IDC_TAO 1008 -#define IDM_MAIN_COMMAND1 40001 -#define IDM_HELP_ABOUT 40003 -#define ID_SETTING 40004 -#define IDS_CAP_SETTING 40006 -#define ID_SETTING_COMMANDLINE 40007 -#define ID_SETTING_RUN 40008 -#define ID_SETTING_EXIT 40011 -#define ID_TOOLS_SAVETOFILE 40012 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 116 -#define _APS_NEXT_COMMAND_VALUE 40013 -#define _APS_NEXT_CONTROL_VALUE 1009 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/ACE/debian/control b/ACE/debian/control index d411899194dc3..3bbdc4b43e65a 100644 --- a/ACE/debian/control +++ b/ACE/debian/control @@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator * mpc-ace: generates project files for a single target * mwc-ace: generates workspace files for a set of projects -Package: libace-7.0.8 +Package: libace-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -45,7 +45,7 @@ Description: C++ network programming framework Package: libace-dev Architecture: any Section: libdevel -Depends: libace-7.0.8 (= ${binary:Version}), ${misc:Depends} +Depends: libace-7.0.11 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, pkg-config Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework - development files @@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation This package contains the ACE overview documentation, tutorials, examples, and information regarding upstream development. -Package: libace-ssl-7.0.8 +Package: libace-ssl-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -73,12 +73,12 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. -Package: libace-rmcast-7.0.8 +Package: libace-rmcast-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -92,12 +92,12 @@ Description: ACE reliable multicast library Package: libace-rmcast-dev Architecture: any Section: libdevel -Depends: libace-rmcast-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE reliable multicast library - development files This package contains the header files and static library for the ACE reliable multicast library. -Package: libace-tmcast-7.0.8 +Package: libace-tmcast-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -111,12 +111,12 @@ Description: ACE transactional multicast library Package: libace-tmcast-dev Architecture: any Section: libdevel -Depends: libace-tmcast-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE transactional multicast library - development files This package contains the header files and static library for the ACE transactional multicast library. -Package: libace-htbp-7.0.8 +Package: libace-htbp-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library Package: libace-htbp-dev Architecture: any Section: libdevel -Depends: libace-htbp-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE protocol over HTTP tunneling library - development files This package contains the header files and static library for the ACE HTBP library. -Package: libace-inet-7.0.8 +Package: libace-inet-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -146,15 +146,15 @@ Description: ACE Inet protocol library Package: libace-inet-dev Architecture: any Section: libdevel -Depends: libace-inet-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE Inet protocol library - development files This package contains the header files and static library for the ACE Inet protocol library. -Package: libace-inet-ssl-7.0.8 +Package: libace-inet-ssl-7.0.11 Architecture: any Section: libs -Depends: libace-inet-7.0.8, libace-ssl-7.0.8, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-7.0.11, libace-ssl-7.0.11, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library Package: libace-inet-ssl-dev Architecture: any Section: libdevel -Depends: libace-inet-ssl-7.0.8 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-7.0.11 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SSL-enabled Inet protocol library - development files This package contains the header files and static library for the ACE SSL-enabled Inet protocol library. @@ -180,7 +180,7 @@ Description: ACE perfect hash function generator basically the same options and functionality. ace_gperf simply takes advantage of some of the features provided by the ACE library. -Package: libacexml-7.0.8 +Package: libacexml-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -196,12 +196,12 @@ Package: libacexml-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libacexml-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library - development files This package contains the header files and static library for the ACE XML parsing library. -Package: libace-xml-utils-7.0.8 +Package: libace-xml-utils-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -215,12 +215,12 @@ Package: libace-xml-utils-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libace-xml-utils-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev Description: ACE XML utility classes and methods - development files This package contains the header files and static library for the ACE XML Utils library -Package: libkokyu-7.0.8 +Package: libkokyu-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library Package: libkokyu-dev Architecture: any Section: libdevel -Depends: libkokyu-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE scheduling and dispatching library - development files This package contains the header files and static library for the ACE scheduling and dispatching library. -Package: libace-xtreactor-7.0.8 +Package: libace-xtreactor-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. -Package: libace-tkreactor-7.0.8 +Package: libace-tkreactor-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} Description: ACE-GUI reactor integration for Tk - development files This package contains header files and static library for the ACE-Tk reactor integration. -Package: libace-flreactor-7.0.8 +Package: libace-flreactor-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} +Depends: libace-flreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FLTK - development files This package contains header files and static library for the ACE-FLTK reactor integration. -Package: libace-foxreactor-7.0.8 +Package: libace-foxreactor-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX Package: libace-foxreactor-dev Architecture: any Section: libdevel -Depends: libace-foxreactor-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FOX - development files This package contains header files and static library for the ACE-FOX reactor integration. @@ -343,7 +343,7 @@ Description: ACE network service implementations files to link the various ACE network services together, either statically or dynamically, and form complete server programs. -Package: libnetsvcs-7.0.8 +Package: libnetsvcs-7.0.11 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries Package: libnetsvcs-dev Architecture: any Section: libdevel -Depends: libnetsvcs-7.0.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-7.0.11 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE network service implementations - development files ACE network services provide reusable components for common distributed system tasks such as logging, naming, locking, and time diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html index 943b0191022dd..2a39073badc8c 100644 --- a/ACE/docs/ACE-guidelines.html +++ b/ACE/docs/ACE-guidelines.html @@ -243,17 +243,9 @@

    ACE Software Development Guidelines

    #if directive. For example, 
             #if defined (ACE_HAS_THREADS)
-        # if defined (ACE_HAS_STHREADS)
-        #   include /**/ <synch.h>
-        #   include /**/ <thread.h>
-        #   define ACE_SCOPE_PROCESS P_PID
-        #   define ACE_SCOPE_LWP P_LWPID
-        #   define ACE_SCOPE_THREAD (ACE_SCOPE_LWP + 1)
-        # else
-        #   define ACE_SCOPE_PROCESS 0
-        #   define ACE_SCOPE_LWP 1
-        #   define ACE_SCOPE_THREAD 2
-        # endif /* ACE_HAS_STHREADS */
+        #  define ACE_SCOPE_PROCESS 0
+        #  define ACE_SCOPE_LWP 1
+        #  define ACE_SCOPE_THREAD 2
         #endif /* ACE_HAS_THREADS */

    @@ -379,13 +371,7 @@

    ACE Software Development Guidelines

    #include "Foo_T.inl" #endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Foo_T.cpp" - #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - - #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) - #pragma implementation "Foo_T.cpp" - #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* FOO_T_H */

    @@ -809,6 +795,14 @@

    ACE Software Development Guidelines

  • Do not use the Win32 TCHAR macros. The wide character-ness of ACE is separate from UNICODE and _UNICODE. +
  • If you have a printf-like format specifier that + uses %s to format a string, certain WCHAR implementations + require %ls instead. + The macro ACE_TEXT_PRIs contains "s" or "ls" + depending upon the WCHAR implementation, and may be used as + ACE_TEXT("%") ACE_TEXT_PRI_s, where the first argument may also + contain flags and width specifiers. +
  • For TAO, don't use ACE_TCHAR or ACE_TEXT. The CORBA specification defines APIs as using char. So most of the time there is no need to use wide characters. @@ -1188,9 +1182,7 @@

    ACE the code is removed.

  • Be very careful with the code that you put - in a signal handler. On Solaris, the man pages document systems - calls as being Async-Signal-Safe if they can be called from signal - handlers. In general, it's best to just set a flag in a signal + in a signal handler. In general, it's best to just set a flag in a signal handler and take appropriate action elsewhere. It's also best to avoid using signals, especially asynchronous signals.

    @@ -1205,8 +1197,7 @@

    ACE This avoids leaving the temporary file even if the program crashes.

  • Be sure to specify the THR_BOUND thread creation - flag for time-critical threads. This ensures that the thread competes - for resources globally on Solaris. It is harmless on other platforms.

    + flag for time-critical threads. It is harmless on other platforms.

    diff --git a/ACE/docs/ACE-porting.html b/ACE/docs/ACE-porting.html index ead06da4ffe36..233d1434c0386 100644 --- a/ACE/docs/ACE-porting.html +++ b/ACE/docs/ACE-porting.html @@ -79,14 +79,11 @@

    Port the ACE_OS Namespace

    thread APIs:

      -
    • UNIX International (UI) Threads - (ACE_HAS_STHREADS) - Solaris.

      -

    • POSIX Pthreads (ACE_HAS_PTHREADS) -Final standard (also - called draft 10) [MIT, Linux, and Solaris].

      + called draft 10) [MIT, Linux].

    • Win32 Threads (ACE_HAS_WTHREADS) - Windows - NT, Windows '95/98, and Windows CE

      + NT, Windows '95/98

    • VxWorks Tasks (ACE_VXWORKS) - VxWorks

    diff --git a/ACE/docs/CE-status.txt b/ACE/docs/CE-status.txt deleted file mode 100644 index 963549092f8a3..0000000000000 --- a/ACE/docs/CE-status.txt +++ /dev/null @@ -1,50 +0,0 @@ - -/** - -@page wince ACE on Windows CE status - -Last updated Friday 14-November-2008 by Johnny Willemsen - - -@subsection ce_status Status - -As of ACE 5.6, Remedy IT supports ACE and TAO on Windows CE building with -Microsoft Visual Studio 2005 and targeting the Windows Mobile 5 and 6. OCI -supports TAO 1.3 on at least Windows CE 3 with the PocketPC 2002 SDK. Contact -the individual support provider for complete information regarding these -platforms as well as the supported hardware targets. - -@subsection ce_evc eMbedded Visual C++ Projects - -Whereas previous ACE versions had separate ACE and ACE_OS eMbedded Visual C++ -project files, the project and workspace arrangement is now the same as -for other Windows versions. The project and workspace files themselves are -generated using the MakeProjectCreator tool when the ACE kit is prepared. -Both EVC3 and EVC4 use the same project and workspace files. - -Developers working with sources checked out from CVS must generate the -project and workspace files locally using MPC. The autobuild system's -generate_makefile and generate_workspace commands can be used for this. - -@subsection ce_vc8 Visual Studio 2005 Projects - -The ACE release process generates the needed Visual Studio 2005 solution and -project files with "_WinCE" appended to the name (e.g. ACE_WinCE.vcproj) to -distinguish them from both Win32-targeted VC8 projects (ACE_vc8.vcproj) and -Visual Studio 2003 projects (ACE_vc71.vcproj). The files are generated with -the "Pocket PC 2003 SDK (ARMV4)", "Windows Mobile 5.0 Pocket PC SDK -(ARMV4I)", and "Windows Mobile 6 SDK (ARMV4I)" platforms defined. To add -additional platforms, the files must be regenerated using MPC. - -@subsection ce_wchar Unicode/WChar - -ACE on WindowsCE automatically has ACE_HAS_WCHAR and ACE_USES_WCHAR turned -on. Thus ACE_TCHAR and ACE_TEXT() are the wide char versions. - -@subsection ce_tests Running the Test Suite on Windows CE - -The ACE test suite in ACE_wrappers/tests is used on Windows CE as well as -on dekstop Windows. The test suite tools are extended to run remotely -on the device using the telnet server. - -*/ diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index ba2612c4086cf..b9ec2ae919a49 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -90,81 +90,81 @@

    Downloading Freely Available Versions of ACE, TAO, CIAO, and DAnCE

      -
    • Latest ACE+TAO Micro Release. The latest micro release is ACE 7.0.8 and TAO 3.0.8 -(ACE+TAO x.0.8), please use the links below to download it.

      +

    • Latest ACE+TAO Micro Release. The latest micro release is ACE 7.0.11 and TAO 3.0.11 +(ACE+TAO x.0.11), please use the links below to download it.

      - - - - - - - - - - - - - - -
      FilenameDescriptionFullSources only
      ACE+TAO.tar.gz ACE+TAO (tar+gzip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
      ACE+TAO.tar.bz2 ACE+TAO (tar+bzip2 format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
      ACE+TAO.zip ACE+TAO (zip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
      ACE-html.tar.gz Doxygen documentation for ACE+TAO (tar+gzip format)[HTTP] - [FTP] + [HTTP] + [FTP]
      ACE-html.tar.bz2 Doxygen documentation for ACE+TAO (tar+bzip2 format)[HTTP] - [FTP] + [HTTP] + [FTP]
      ACE-html.zip Doxygen documentation for ACE+TAO (zip format)[HTTP] - [FTP] + [HTTP] + [FTP]
      ACE.tar.gz ACE only (tar+gzip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
      ACE.tar.bz2 ACE only (tar+bzip2 format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
      ACE.zip ACE only (zip format)[HTTP] - [FTP] + [HTTP] + [FTP] [HTTP] - [FTP] + [HTTP] + [FTP]
      diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index c3a62a4218707..bff50aa6b5238 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -44,7 +44,7 @@

      Build Czar Duties

      The Build Czar is empowered to set up more builds on his own for his - convenience. This + convenience. This page has a step by step instructions on how to do that.

      @@ -286,7 +286,7 @@

      Recipe for Cutting a Minor Kit

      rm -rf doxygen
      mkdir doxygen
      cd doxygen
      - git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-7_0_7 ACE_TAO
      + git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-7_0_9 ACE_TAO
      cd ACE_TAO
      export ACE_ROOT=$PWD/ACE
      export TAO_ROOT=$PWD/TAO
      @@ -390,7 +390,7 @@

      Recipe for Cutting a Minor Kit

      Make a new pull request to Microsoft vcpkg to update ACE to the new release, see https://github.com/Microsoft/vcpkg/tree/master/ports/ace
    • - Make a new pull request to OpenDDS to update the configure script to use the new release, see https://github.com/objectcomputing/OpenDDS/blob/master/configure + Make a new pull request to OpenDDS to update the configure script to use the new release, see https://github.com/OpenDDS/OpenDDS/blob/master/configure
    • Mail the approved release announcement out to, at minimum the following: diff --git a/ACE/docs/index.html b/ACE/docs/index.html index 929c5856ea826..459d550608487 100644 --- a/ACE/docs/index.html +++ b/ACE/docs/index.html @@ -87,7 +87,6 @@

      Other Stuff

    • ACE+SSL - What is ACE+SSL and how to get it.
    • Symbol versioning - How to do symbol versioning with ACE+TAO. -
    • CE-status.txt - The status of ACE on Windows CE.
    • ACE-monotonic-timer.html - How to use the ACE monotonic timer support.
    • ACEXML - A SAX2-based XML parser ACE uses and provides.
    diff --git a/ACE/docs/wchar.txt b/ACE/docs/wchar.txt index d8b88ad80422e..517b89d56b0f3 100644 --- a/ACE/docs/wchar.txt +++ b/ACE/docs/wchar.txt @@ -35,7 +35,7 @@ Like Regular Support, both char and wchar_t versions of some methods are available, but unlike Regular Support, other methods that have char arguments or return values may have wchar_t arguments or return values. -This has been tested on Windows and Linux, and is the default for Windows CE. +This has been tested on Windows and Linux. @subsection wchar_othermacros Other Important Macros diff --git a/ACE/etc/ace.doxygen b/ACE/etc/ace.doxygen index f37ccce12ee7d..f8b033f54a4c6 100644 --- a/ACE/etc/ace.doxygen +++ b/ACE/etc/ace.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -876,10 +922,21 @@ INPUT = docs \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -941,7 +998,7 @@ EXCLUDE_PATTERNS = config-*.h # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -989,6 +1046,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1030,6 +1092,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1127,10 +1198,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = ACE_ @@ -1209,7 +1281,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1224,6 +1301,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1318,6 +1408,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1522,7 +1619,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1553,6 +1650,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1573,17 +1677,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2174,7 +2267,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = . @@ -2288,15 +2382,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2329,35 +2414,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2371,7 +2471,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2486,6 +2587,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2539,10 +2647,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2580,18 +2688,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 5 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2604,6 +2700,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/ACE/etc/ace_inet.doxygen b/ACE/etc/ace_inet.doxygen index f5c293d88bc17..7d0df6eaeb804 100644 --- a/ACE/etc/ace_inet.doxygen +++ b/ACE/etc/ace_inet.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = protocols/ace/INet # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = . @@ -2260,15 +2354,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2301,35 +2386,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2343,7 +2443,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2458,6 +2559,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2511,10 +2619,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2552,18 +2660,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2576,6 +2672,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/ACE/etc/ace_qos.doxygen b/ACE/etc/ace_qos.doxygen index c6534281c6dba..518ff9cbbf249 100644 --- a/ACE/etc/ace_qos.doxygen +++ b/ACE/etc/ace_qos.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = ace/QoS # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = ACE_ \ @@ -1199,7 +1271,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1214,6 +1291,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1308,6 +1398,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1512,7 +1609,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1543,6 +1640,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1563,17 +1667,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2164,7 +2257,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = . @@ -2262,15 +2356,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2303,35 +2388,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2345,7 +2445,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2460,6 +2561,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2513,10 +2621,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2554,18 +2662,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2578,6 +2674,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/ACE/etc/ace_rmcast.doxygen b/ACE/etc/ace_rmcast.doxygen index 1ba90a6c28859..c21b74d87b910 100644 --- a/ACE/etc/ace_rmcast.doxygen +++ b/ACE/etc/ace_rmcast.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = protocols/ace/RMCast # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = . @@ -2260,15 +2354,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2301,35 +2386,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2343,7 +2443,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2458,6 +2559,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2511,10 +2619,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2552,18 +2660,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2576,6 +2672,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/ACE/etc/ace_ssl.doxygen b/ACE/etc/ace_ssl.doxygen index 5de340401436f..2af4e756b109c 100644 --- a/ACE/etc/ace_ssl.doxygen +++ b/ACE/etc/ace_ssl.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = ace/SSL # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = ACE_SSL_ @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = . @@ -2260,15 +2354,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2301,35 +2386,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2343,7 +2443,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2458,6 +2559,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2511,10 +2619,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2552,18 +2660,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2576,6 +2672,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/ACE/etc/acexml.doxygen b/ACE/etc/acexml.doxygen index 3c6a4b9e9d122..68e99cbbdd5ab 100644 --- a/ACE/etc/acexml.doxygen +++ b/ACE/etc/acexml.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = ACEXML # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -931,7 +988,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -979,6 +1036,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1020,6 +1082,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1117,10 +1188,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = ACEXML_ @@ -1199,7 +1271,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1214,6 +1291,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1308,6 +1398,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1512,7 +1609,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1543,6 +1640,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1563,17 +1667,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2164,7 +2257,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = . @@ -2261,15 +2355,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2302,35 +2387,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2344,7 +2444,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2459,6 +2560,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2512,10 +2620,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2553,18 +2661,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2577,6 +2673,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/ACE/etc/index.html b/ACE/etc/index.html index 870c9efec1e40..8af2badef55ca 100644 --- a/ACE/etc/index.html +++ b/ACE/etc/index.html @@ -30,6 +30,9 @@

    ACE+TAO Documentation

    We do have the documentation for previous releases
      +

    • 7.0.11

      • +

    • 7.0.10

      • +

    • 7.0.9

    • 7.0.8

    • 7.0.7

    • 7.0.6

      • diff --git a/ACE/etc/xlc_dummy.cpp b/ACE/etc/xlc_dummy.cpp deleted file mode 100644 index d8bc164c48eef..0000000000000 --- a/ACE/etc/xlc_dummy.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// -// This file exists only to help with template instantiation when building -// shared libraries on AIX using C Set++. See rules.lib.GNU for usage. - -/* FUZZ: disable check_for_improper_main_declaration */ - -main() {} diff --git a/ACE/examples/APG/Active_Objects/AO.cpp b/ACE/examples/APG/Active_Objects/AO.cpp index 857cb94172587..9600e99560ec3 100644 --- a/ACE/examples/APG/Active_Objects/AO.cpp +++ b/ACE/examples/APG/Active_Objects/AO.cpp @@ -18,7 +18,7 @@ class HA_ControllerAgent status_result_ = 1; } - int status_update (void) + int status_update () { ACE_TRACE ("HA_ControllerAgent::status_update"); ACE_DEBUG ((LM_DEBUG, @@ -30,7 +30,7 @@ class HA_ControllerAgent } private: - int next_result_id (void) + int next_result_id () { ACE_TRACE ("HA_ControllerAgent::next_cmd_id"); return status_result_++; @@ -50,7 +50,7 @@ class StatusUpdate : public ACE_Method_Request ACE_TRACE ("StatusUpdate::StatusUpdate"); } - virtual int call (void) + virtual int call () { ACE_TRACE ("StatusUpdate::call"); @@ -68,7 +68,7 @@ class StatusUpdate : public ACE_Method_Request class ExitMethod : public ACE_Method_Request { public: - virtual int call (void) + virtual int call () { // Cause exit. return -1; @@ -85,7 +85,7 @@ class Scheduler : public ACE_Task_Base this->activate (); } - virtual int svc (void) + virtual int svc () { ACE_TRACE ("Scheduler::svc"); @@ -117,7 +117,7 @@ class HA_ControllerAgentProxy { // This acts as a Proxy to the controller impl object. public: - ACE_Future status_update (void) + ACE_Future status_update () { ACE_TRACE("HA_ControllerAgentProxy::status_update"); ACE_Future result; @@ -131,7 +131,7 @@ class HA_ControllerAgentProxy } //FUZZ: disable check_for_lack_ACE_OS - void exit (void) + void exit () { //FUZZ: enable check_for_lack_ACE_OS ACE_TRACE ("HA_ControllerAgentProxy::exit"); diff --git a/ACE/examples/APG/Active_Objects/AO2.cpp b/ACE/examples/APG/Active_Objects/AO2.cpp index bd73fb10f7e3f..9543f6480d05a 100644 --- a/ACE/examples/APG/Active_Objects/AO2.cpp +++ b/ACE/examples/APG/Active_Objects/AO2.cpp @@ -18,7 +18,7 @@ class HA_ControllerAgent status_result_ = 1; } - int status_update (void) + int status_update () { ACE_TRACE ("HA_ControllerAgent::status_update"); ACE_DEBUG ((LM_DEBUG, @@ -31,7 +31,7 @@ class HA_ControllerAgent } private: - int next_result_id (void) + int next_result_id () { ACE_TRACE ("HA_ControllerAgent::next_cmd_id"); return status_result_++; @@ -50,7 +50,7 @@ class StatusUpdate : public ACE_Method_Request ACE_TRACE ("StatusUpdate::StatusUpdate"); } - virtual int call (void) + virtual int call () { ACE_TRACE ("StatusUpdate::call"); @@ -67,7 +67,7 @@ class StatusUpdate : public ACE_Method_Request class ExitMethod : public ACE_Method_Request { public: - virtual int call (void) + virtual int call () { // Cause exit. return -1; @@ -83,7 +83,7 @@ class Scheduler : public ACE_Task_Base this->activate (); } - virtual int svc (void) + virtual int svc () { ACE_TRACE ("Scheduler::svc"); @@ -114,7 +114,7 @@ class HA_ControllerAgentProxy { // This acts as a Proxy to the controller impl object. public: - ACE_Future status_update (void) + ACE_Future status_update () { ACE_TRACE("HA_ControllerAgentProxy::status_update"); ACE_Future result; @@ -128,7 +128,7 @@ class HA_ControllerAgentProxy } //FUZZ: disable check_for_lack_ACE_OS - void exit (void) + void exit () { //FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/examples/APG/Config/Get_Opt.cpp b/ACE/examples/APG/Config/Get_Opt.cpp index 26dc5dd6fb5cd..1e92a33a8c39d 100644 --- a/ACE/examples/APG/Config/Get_Opt.cpp +++ b/ACE/examples/APG/Config/Get_Opt.cpp @@ -10,7 +10,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - // Example for a long option without a corresponding short option. // Just put some context here so the following compiles and runs. static const ACE_TCHAR options[] = ACE_TEXT (":f:"); diff --git a/ACE/examples/APG/Config/Get_Opt_Long.cpp b/ACE/examples/APG/Config/Get_Opt_Long.cpp index 4f8691497144d..0b5a70b618b05 100644 --- a/ACE/examples/APG/Config/Get_Opt_Long.cpp +++ b/ACE/examples/APG/Config/Get_Opt_Long.cpp @@ -10,7 +10,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - static const ACE_TCHAR options[] = ACE_TEXT (":f:"); ACE_Get_Opt cmd_opts (argc, argv, options, 1, 0, ACE_Get_Opt::PERMUTE_ARGS, 1); diff --git a/ACE/examples/APG/Config/HA_Status.cpp b/ACE/examples/APG/Config/HA_Status.cpp index 0d8579dedcfd8..4f1f8e7f1d033 100644 --- a/ACE/examples/APG/Config/HA_Status.cpp +++ b/ACE/examples/APG/Config/HA_Status.cpp @@ -24,7 +24,6 @@ class HA_Status : public ACE_Service_Object int HA_Status::init (int argc, ACE_TCHAR *argv[]) { - // Do ACE_Get_Opt and get conf file name, read out the sections // and print the names. diff --git a/ACE/examples/APG/Containers/Allocator.cpp b/ACE/examples/APG/Containers/Allocator.cpp index bfa0bf0f5107f..0cb42e3d45d0d 100644 --- a/ACE/examples/APG/Containers/Allocator.cpp +++ b/ACE/examples/APG/Containers/Allocator.cpp @@ -8,7 +8,7 @@ class StackExample public: // Illustrate all the differnet // types of stacks provided by ACE. - int run (void); + int run (); private: // Illustrate the use of an unbounded stack. @@ -16,7 +16,7 @@ class StackExample }; // Listing 1 code/ch05 -int StackExample::run (void) +int StackExample::run () { ACE_TRACE ("StackExample::run"); diff --git a/ACE/examples/APG/Containers/DLList.cpp b/ACE/examples/APG/Containers/DLList.cpp index dc8f25b76387c..0de893dd330d9 100644 --- a/ACE/examples/APG/Containers/DLList.cpp +++ b/ACE/examples/APG/Containers/DLList.cpp @@ -13,14 +13,14 @@ typedef ACE_DLList MyList; class ListTest { public: - int run (void); + int run (); void displayList (MyList & list); // Display all elements. void destroyList (MyList& list); // Destroy all elements. }; // Listing 2 // Listing 3 code/ch05 int -ListTest::run (void) +ListTest::run () { ACE_TRACE ("ListTest::run"); diff --git a/ACE/examples/APG/Containers/DataElement.h b/ACE/examples/APG/Containers/DataElement.h index b6a5712add459..79bfe13ce786a 100644 --- a/ACE/examples/APG/Containers/DataElement.h +++ b/ACE/examples/APG/Containers/DataElement.h @@ -36,7 +36,7 @@ class DataElement void setData (int val) { data_ = val; } - static int numOfActiveObjects (void) { return count_; } + static int numOfActiveObjects () { return count_; } private: int data_; diff --git a/ACE/examples/APG/Containers/Hash_Map.cpp b/ACE/examples/APG/Containers/Hash_Map.cpp index 6fdc461eb4021..8d2596bfa6f43 100644 --- a/ACE/examples/APG/Containers/Hash_Map.cpp +++ b/ACE/examples/APG/Containers/Hash_Map.cpp @@ -19,16 +19,16 @@ class Hash_Map_Example Hash_Map_Example (); // Illustrate the hash map. - int run (void); + int run (); // Use the forward iterator. - void iterate_forward (void); + void iterate_forward (); // Use the reverse iterator. - void iterate_reverse (void); + void iterate_reverse (); // Remove all the elements from the map. - void remove_all (void); + void remove_all (); private: Hash_Map map_; @@ -43,7 +43,7 @@ Hash_Map_Example::Hash_Map_Example() } // Listing 2 -int Hash_Map_Example::run (void) +int Hash_Map_Example::run () { ACE_TRACE ("Hash_Map_Example::run"); @@ -76,7 +76,7 @@ int Hash_Map_Example::run (void) return 0; } -void Hash_Map_Example::iterate_forward (void) +void Hash_Map_Example::iterate_forward () { ACE_TRACE ("Hash_Map_Example::iterate_forward"); @@ -89,7 +89,7 @@ void Hash_Map_Example::iterate_forward (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Hash_Map_Example::iterate_reverse (void) +void Hash_Map_Example::iterate_reverse () { ACE_TRACE ("Hash_Map_Example::iterate_reverse"); @@ -102,7 +102,7 @@ void Hash_Map_Example::iterate_reverse (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Hash_Map_Example::remove_all (void) +void Hash_Map_Example::remove_all () { ACE_TRACE ("Hash_Map_Example::remove_all"); map_.unbind_all (); diff --git a/ACE/examples/APG/Containers/Hash_Map_Hash.cpp b/ACE/examples/APG/Containers/Hash_Map_Hash.cpp index e7471806fc042..d56305e931891 100644 --- a/ACE/examples/APG/Containers/Hash_Map_Hash.cpp +++ b/ACE/examples/APG/Containers/Hash_Map_Hash.cpp @@ -21,22 +21,22 @@ class Hash_Map_Example } // illustrate the hash map - int run (void); + int run (); // use the forward iterate - void iterate_forward (void); + void iterate_forward (); // use the reverse iterator - void iterate_reverse (void); + void iterate_reverse (); // remove all the elements from the map - void remove_all (void); + void remove_all (); private: Hash_Map map_; }; -int Hash_Map_Example::run (void) +int Hash_Map_Example::run () { ACE_TRACE ("Hash_Map_Example::run"); @@ -69,7 +69,7 @@ int Hash_Map_Example::run (void) return 0; } -void Hash_Map_Example::iterate_forward (void) +void Hash_Map_Example::iterate_forward () { ACE_TRACE ("Hash_Map_Example::iterate_forward"); @@ -82,7 +82,7 @@ void Hash_Map_Example::iterate_forward (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Hash_Map_Example::iterate_reverse (void) +void Hash_Map_Example::iterate_reverse () { ACE_TRACE ("Hash_Map_Example::iterate_reverse"); @@ -95,7 +95,7 @@ void Hash_Map_Example::iterate_reverse (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Hash_Map_Example::remove_all (void) +void Hash_Map_Example::remove_all () { ACE_TRACE ("Hash_Map_Example::remove_all"); map_.unbind_all (); diff --git a/ACE/examples/APG/Containers/Map_Manager.cpp b/ACE/examples/APG/Containers/Map_Manager.cpp index 5d24894441590..cc1e71440353f 100644 --- a/ACE/examples/APG/Containers/Map_Manager.cpp +++ b/ACE/examples/APG/Containers/Map_Manager.cpp @@ -8,24 +8,24 @@ class Map_Example { public: // Illustrate the ACE_Map_Manager. - int run (void); + int run (); private: // Iterate in the forward direction. - void iterate_forward (void); + void iterate_forward (); // Iterate in the other direction. - void iterate_reverse (void); + void iterate_reverse (); // Remove all elements from the map. - void remove_all (void); + void remove_all (); private: ACE_Map_Manager map_; }; // Listing 2 code/ch05 -int Map_Example::run (void) +int Map_Example::run () { ACE_TRACE ("Map_Example::run"); @@ -60,7 +60,7 @@ int Map_Example::run (void) } // Listing 2 // Listing 3 code/ch05 -void Map_Example::iterate_forward (void) +void Map_Example::iterate_forward () { ACE_TRACE ("Map_Example::iterate_forward"); @@ -79,7 +79,7 @@ void Map_Example::iterate_forward (void) } -void Map_Example::iterate_reverse (void) +void Map_Example::iterate_reverse () { ACE_TRACE ("Map_Example::iterate_reverse"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse iteration\n"))); @@ -97,7 +97,7 @@ void Map_Example::iterate_reverse (void) } // Listing 3 // Listing 4 code/ch05 -void Map_Example::remove_all (void) +void Map_Example::remove_all () { ACE_TRACE ("Map_Example::remove_all"); diff --git a/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp b/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp index 6bf41ffb9a38f..e28634d5a0d46 100644 --- a/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp +++ b/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp @@ -49,23 +49,23 @@ class Map_Example { public: // Illustrate the ACE_Map_Manager<>. - int run (void); + int run (); private: // Iterate in the forward direction. - void iterate_forward (void); + void iterate_forward (); // Iterate in the other direction. - void iterate_reverse (void); + void iterate_reverse (); // Remove all elements from the map. - void remove_all (void); + void remove_all (); private: ACE_Map_Manager map_; }; -int Map_Example::run (void) +int Map_Example::run () { ACE_TRACE ("Map_Example::run"); @@ -102,7 +102,7 @@ int Map_Example::run (void) return 0; } -void Map_Example::iterate_forward (void) +void Map_Example::iterate_forward () { ACE_TRACE ("Map_Example::iterate_forward"); @@ -117,7 +117,7 @@ void Map_Example::iterate_forward (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Map_Example::iterate_reverse (void) +void Map_Example::iterate_reverse () { ACE_TRACE ("Map_Example::iterate_reverse"); @@ -132,7 +132,7 @@ void Map_Example::iterate_reverse (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Map_Example::remove_all (void) +void Map_Example::remove_all () { ACE_TRACE ("Map_Example::remove_all"); diff --git a/ACE/examples/APG/Containers/Queues.cpp b/ACE/examples/APG/Containers/Queues.cpp index 6a08136ea72e2..a0dfda6274c26 100644 --- a/ACE/examples/APG/Containers/Queues.cpp +++ b/ACE/examples/APG/Containers/Queues.cpp @@ -7,19 +7,19 @@ class QueueExample { public: // Illustrate the various ACE Queues. - int run (void); + int run (); private: // Illustrate the ACE unbounded queue // that has copies of the data elements. - int runStackUnboundedQueue (void); + int runStackUnboundedQueue (); // Illustrate the ACE unbounded queue // with pointers to elements on the heap. - int runHeapUnboundedQueue (void); + int runHeapUnboundedQueue (); }; -int QueueExample::run (void) +int QueueExample::run () { ACE_TRACE ("QueueExample::run"); @@ -45,7 +45,7 @@ int QueueExample::run (void) } // Listing 1 code/ch05 -int QueueExample::runStackUnboundedQueue (void) +int QueueExample::runStackUnboundedQueue () { ACE_TRACE ("QueueExample::runStackUnboundedQueue"); @@ -78,7 +78,7 @@ int QueueExample::runStackUnboundedQueue (void) } // Listing 1 // Listing 2 code/ch05 -int QueueExample::runHeapUnboundedQueue (void) +int QueueExample::runHeapUnboundedQueue () { ACE_TRACE ("QueueExample::runHeapUnboundedQueue"); diff --git a/ACE/examples/APG/Containers/RB_Tree.cpp b/ACE/examples/APG/Containers/RB_Tree.cpp index 1c67c48e26aa3..7f29945193110 100644 --- a/ACE/examples/APG/Containers/RB_Tree.cpp +++ b/ACE/examples/APG/Containers/RB_Tree.cpp @@ -14,24 +14,24 @@ class Tree_Example { public: // Illustrate the tree. - int run (void); + int run (); private: // Use the forward iterator. - void iterate_forward (void); + void iterate_forward (); // Use the reverse iterator. - void iterate_reverse (void); + void iterate_reverse (); // Remove all elements from the tree. - int remove_all (void); + int remove_all (); private: Tree tree_; }; // Listing 1 code/ch05 -int Tree_Example::run (void) +int Tree_Example::run () { ACE_TRACE ("Tree_Example::run"); @@ -71,7 +71,7 @@ int Tree_Example::run (void) return 0; } -void Tree_Example::iterate_forward (void) +void Tree_Example::iterate_forward () { ACE_TRACE ("Tree_Example::iterate_forward"); @@ -85,7 +85,7 @@ void Tree_Example::iterate_forward (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Tree_Example::iterate_reverse (void) +void Tree_Example::iterate_reverse () { ACE_TRACE ("Tree_Example::iterate_reverse"); @@ -100,7 +100,7 @@ void Tree_Example::iterate_reverse (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -int Tree_Example::remove_all (void) +int Tree_Example::remove_all () { ACE_TRACE ("Tree_Example::remove_all"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Removing elements\n"))); diff --git a/ACE/examples/APG/Containers/RB_Tree_Functors.cpp b/ACE/examples/APG/Containers/RB_Tree_Functors.cpp index e82227915a3f2..d1fb62435bab4 100644 --- a/ACE/examples/APG/Containers/RB_Tree_Functors.cpp +++ b/ACE/examples/APG/Containers/RB_Tree_Functors.cpp @@ -18,17 +18,17 @@ class Tree_Example { public: // Illustrate the tree. - int run (void); + int run (); private: // Use the forward iterator. - void iterate_forward (void); + void iterate_forward (); // Use the reverse iterator. - void iterate_reverse (void); + void iterate_reverse (); // Remove all elements from the tree. - int remove_all (void); + int remove_all (); private: Tree tree_; @@ -78,7 +78,7 @@ int Tree_Example::run () return 0; } -void Tree_Example::iterate_forward (void) +void Tree_Example::iterate_forward () { ACE_TRACE ("Tree_Example::iterate_forward"); @@ -91,7 +91,7 @@ void Tree_Example::iterate_forward (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Tree_Example::iterate_reverse (void) +void Tree_Example::iterate_reverse () { ACE_TRACE ("Tree_Example::iterate_reverse"); @@ -104,7 +104,7 @@ void Tree_Example::iterate_reverse (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -int Tree_Example::remove_all (void) +int Tree_Example::remove_all () { ACE_TRACE ("Tree_Example::remove_all"); diff --git a/ACE/examples/APG/Containers/Sets.cpp b/ACE/examples/APG/Containers/Sets.cpp index c4e3436abeddf..771cfb80f59d8 100644 --- a/ACE/examples/APG/Containers/Sets.cpp +++ b/ACE/examples/APG/Containers/Sets.cpp @@ -7,17 +7,17 @@ class SetExample { public: // Illustrate all ACE set types. - int run (void); + int run (); private: // Illustrate the ACE Bounded Sets. - int runBoundedSet (void); + int runBoundedSet (); // Illustrate the ACE Unbounded sets. - int runUnboundedSet (void); + int runUnboundedSet (); }; -int SetExample::run (void) +int SetExample::run () { ACE_TRACE ("SetExample::run"); diff --git a/ACE/examples/APG/Containers/Stacks.cpp b/ACE/examples/APG/Containers/Stacks.cpp index 5e8612f656fad..e1a6b535c2e4c 100644 --- a/ACE/examples/APG/Containers/Stacks.cpp +++ b/ACE/examples/APG/Containers/Stacks.cpp @@ -10,23 +10,23 @@ class StackExample // Illustrate all the differnet // types of stacks provided by ACE. - int run (void); + int run (); private: // Illustrate the use of a bounded stack. - int runBoundedStack (void); + int runBoundedStack (); // Illustrate the use of an unbounded stack. - int runUnboundedStack (void); + int runUnboundedStack (); // Illustrate the use of a compile time fixed stack. - int runFixedStack (void); + int runFixedStack (); private: ACE_Bounded_Stack privateStack_; }; -int StackExample::run (void) +int StackExample::run () { ACE_TRACE ("StackExample::run"); @@ -45,7 +45,7 @@ int StackExample::run (void) return 0; } // Listing 1 code/ch05 -int StackExample::runBoundedStack (void) +int StackExample::runBoundedStack () { ACE_TRACE ("StackExample::runBoundedStack"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using a bounded stack\n"))); @@ -78,7 +78,7 @@ int StackExample::runBoundedStack (void) } // Listing 1 // Listing 2 code/ch05 -int StackExample::runFixedStack (void) +int StackExample::runFixedStack () { ACE_TRACE ("StackExample::runFixedStack"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using a fixed stack\n"))); @@ -102,7 +102,7 @@ int StackExample::runFixedStack (void) return 0; } -int StackExample::runUnboundedStack (void) +int StackExample::runUnboundedStack () { ACE_TRACE ("StackExample::runUnboundedStack"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using an unbounded stack\n"))); diff --git a/ACE/examples/APG/Logging/Change_Mask.cpp b/ACE/examples/APG/Logging/Change_Mask.cpp index 22161ddb191e5..96bbd75dcb1fb 100644 --- a/ACE/examples/APG/Logging/Change_Mask.cpp +++ b/ACE/examples/APG/Logging/Change_Mask.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Howto_Syslog.cpp b/ACE/examples/APG/Logging/Howto_Syslog.cpp index 500cc5b562ccb..333caa4f228e7 100644 --- a/ACE/examples/APG/Logging/Howto_Syslog.cpp +++ b/ACE/examples/APG/Logging/Howto_Syslog.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo (void); +void foo (); // Listing 1 code/ch03 int ACE_TMAIN (int, ACE_TCHAR *argv[]) @@ -18,7 +18,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/LogManager.h b/ACE/examples/APG/Logging/LogManager.h index 523abff55d84d..08695c70c7f8c 100644 --- a/ACE/examples/APG/Logging/LogManager.h +++ b/ACE/examples/APG/Logging/LogManager.h @@ -20,7 +20,7 @@ class LogManager (const ACE_TCHAR *prog_name = ACE_TEXT ("")); void redirectToOStream (ACE_OSTREAM_TYPE *output); void redirectToFile (const char *filename); - void redirectToStderr (void); + void redirectToStderr (); ACE_Log_Msg_Callback * redirectToCallback (ACE_Log_Msg_Callback *callback); @@ -71,7 +71,7 @@ void LogManager::redirectToFile (const char *filename) this->redirectToOStream ((ACE_OSTREAM_TYPE *)log_stream_); } -void LogManager::redirectToStderr (void) +void LogManager::redirectToStderr () { ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM | ACE_Log_Msg::LOGGER); diff --git a/ACE/examples/APG/Logging/Simple1.cpp b/ACE/examples/APG/Logging/Simple1.cpp index cbbb00e7c760b..3c390f2c25b20 100644 --- a/ACE/examples/APG/Logging/Simple1.cpp +++ b/ACE/examples/APG/Logging/Simple1.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -13,7 +13,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Simple2.cpp b/ACE/examples/APG/Logging/Simple2.cpp index 123f65f95acb2..b0d043a98e88d 100644 --- a/ACE/examples/APG/Logging/Simple2.cpp +++ b/ACE/examples/APG/Logging/Simple2.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo(void); +void foo(); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -15,7 +15,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo(void) +void foo() { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Trace.h b/ACE/examples/APG/Logging/Trace.h index f0d31c4a26f4b..58c8827bd7026 100644 --- a/ACE/examples/APG/Logging/Trace.h +++ b/ACE/examples/APG/Logging/Trace.h @@ -41,7 +41,7 @@ class Trace this->line_ = line; } - ~Trace (void) + ~Trace () { ACE_Log_Msg *lm = ACE_LOG_MSG; if (lm->tracing_enabled () diff --git a/ACE/examples/APG/Logging/Trace_Return.cpp b/ACE/examples/APG/Logging/Trace_Return.cpp index 1f2022c0dfe01..f65e88278f520 100644 --- a/ACE/examples/APG/Logging/Trace_Return.cpp +++ b/ACE/examples/APG/Logging/Trace_Return.cpp @@ -1,7 +1,7 @@ #include "Trace.h" // Listing 1 code/ch03 -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -14,7 +14,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) TRACE_RETURN (0); } -void foo (void) +void foo () { TRACE ("foo"); MY_DEBUG (ACE_TEXT ("Howdy Pardner\n")); diff --git a/ACE/examples/APG/Logging/Use_LogManager.cpp b/ACE/examples/APG/Logging/Use_LogManager.cpp index d7b7c3607d91e..c3fcf27292f47 100644 --- a/ACE/examples/APG/Logging/Use_LogManager.cpp +++ b/ACE/examples/APG/Logging/Use_LogManager.cpp @@ -1,7 +1,7 @@ #include "LogManager.h" // Listing 1 code/ch03 -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -15,7 +15,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); LOG_MANAGER->redirectToFile ("output.test"); diff --git a/ACE/examples/APG/Logging/Use_Ostream.cpp b/ACE/examples/APG/Logging/Use_Ostream.cpp index 056de60b2c9ec..8834e497fe120 100644 --- a/ACE/examples/APG/Logging/Use_Ostream.cpp +++ b/ACE/examples/APG/Logging/Use_Ostream.cpp @@ -1,7 +1,7 @@ #include "ace/Log_Msg.h" #include "ace/streams.h" -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -26,7 +26,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Use_Stderr.cpp b/ACE/examples/APG/Logging/Use_Stderr.cpp index 465e9eb08cbca..807313ca18e1b 100644 --- a/ACE/examples/APG/Logging/Use_Stderr.cpp +++ b/ACE/examples/APG/Logging/Use_Stderr.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo (void); +void foo (); // Listing 1 code/ch03 int ACE_TMAIN (int, ACE_TCHAR *argv[]) @@ -28,7 +28,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Use_Syslog.cpp b/ACE/examples/APG/Logging/Use_Syslog.cpp index 173f595c4bbdd..dce9f5d650587 100644 --- a/ACE/examples/APG/Logging/Use_Syslog.cpp +++ b/ACE/examples/APG/Logging/Use_Syslog.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *argv[]) { @@ -22,7 +22,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Wrap_Macros.cpp b/ACE/examples/APG/Logging/Wrap_Macros.cpp index 764a45f7359cf..65b4e03172572 100644 --- a/ACE/examples/APG/Logging/Wrap_Macros.cpp +++ b/ACE/examples/APG/Logging/Wrap_Macros.cpp @@ -1,7 +1,7 @@ #include "Trace.h" // Listing 1 code/ch03 -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -12,7 +12,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); MY_DEBUG (ACE_TEXT ("Howdy Pardner\n")); diff --git a/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp b/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp index ddeb577bbf704..81a61cc2aa424 100644 --- a/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp +++ b/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp @@ -1,6 +1,6 @@ #include "Log_Msg_Alt.h" -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp b/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp index 75608e0fe3ee9..b5d63b3e6f0b5 100644 --- a/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp +++ b/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp @@ -26,7 +26,7 @@ int send_unicast (const ACE_INET_Addr &to) // Listing 1 // Listing 2 code/ch09 -void echo_dgram (void) +void echo_dgram () { ACE_INET_Addr my_addr (static_cast (10102)); ACE_INET_Addr your_addr; @@ -44,7 +44,7 @@ void echo_dgram (void) // Listing 3 code/ch09 #include "ace/SOCK_CODgram.h" // Exclude 3 -static void show_codgram (void) +static void show_codgram () { char buff[BUFSIZ]; size_t buflen = sizeof (buff); diff --git a/ACE/examples/APG/Naming/Graphable_Element.h b/ACE/examples/APG/Naming/Graphable_Element.h index ae2e0c16150c0..505e1e0a11285 100644 --- a/ACE/examples/APG/Naming/Graphable_Element.h +++ b/ACE/examples/APG/Naming/Graphable_Element.h @@ -26,7 +26,7 @@ class Graphable_Element : public Name_Binding return this->when_; } - inline float temp (void) + inline float temp () { return this->temp_; } diff --git a/ACE/examples/APG/Naming/Name_Binding.h b/ACE/examples/APG/Naming/Name_Binding.h index 0c21cde49e31b..069ef1eae2a03 100644 --- a/ACE/examples/APG/Naming/Name_Binding.h +++ b/ACE/examples/APG/Naming/Name_Binding.h @@ -35,16 +35,16 @@ class Name_Binding this->type_ = 0; } - char *name (void) + char *name () { return this->name_; } - char *value (void) + char *value () { return this->value_; } - const char *type (void) + const char *type () { return this->type_; } - int int_value (void) + int int_value () { return ACE_OS::atoi (this->value ()); } private: diff --git a/ACE/examples/APG/Naming/Temperature_Grapher.cpp b/ACE/examples/APG/Naming/Temperature_Grapher.cpp index 36fa5256eab6c..2020981a6126a 100644 --- a/ACE/examples/APG/Naming/Temperature_Grapher.cpp +++ b/ACE/examples/APG/Naming/Temperature_Grapher.cpp @@ -6,7 +6,7 @@ #include "Temperature_Grapher.h" // Listing 1 code/ch21 -void Temperature_Grapher::monitor (void) +void Temperature_Grapher::monitor () { for (;;) { @@ -17,7 +17,7 @@ void Temperature_Grapher::monitor (void) // Listing 1 // Listing 2 code/ch21 -void Temperature_Grapher::update_graph (void) +void Temperature_Grapher::update_graph () { Name_Binding_Ptr lastUpdate (this->naming_context_.fetch ("lastUpdate")); diff --git a/ACE/examples/APG/Naming/Temperature_Monitor.cpp b/ACE/examples/APG/Naming/Temperature_Monitor.cpp index 7b4420bddff79..0dc015cd2df70 100644 --- a/ACE/examples/APG/Naming/Temperature_Monitor.cpp +++ b/ACE/examples/APG/Naming/Temperature_Monitor.cpp @@ -37,7 +37,7 @@ void Temperature_Monitor::record_temperature (float temp) } // Listing 41 code/ch21 -void Temperature_Monitor::record_failure (void) +void Temperature_Monitor::record_failure () { Name_Binding_Ptr lastReset (this->naming_context_.fetch ("lastReset")); @@ -103,7 +103,7 @@ Temperature_Monitor::reset_device (Name_Binding_Ptr &resetCount) // Listing 5 // Listing 2 code/ch21 -void Temperature_Monitor::monitor (void) +void Temperature_Monitor::monitor () { this->thermometer_ = new Thermometer (this->opt_.thermometer_address ()); diff --git a/ACE/examples/APG/Naming/Temperature_Monitor2.cpp b/ACE/examples/APG/Naming/Temperature_Monitor2.cpp index 3978a12839c43..5dc3df0dd1a60 100644 --- a/ACE/examples/APG/Naming/Temperature_Monitor2.cpp +++ b/ACE/examples/APG/Naming/Temperature_Monitor2.cpp @@ -81,7 +81,7 @@ void Temperature_Monitor2::reset_device (Name_Binding_Ptr &resetCount) this->naming_context_.rebind ("resetCount", number_of_resets); } -void Temperature_Monitor2::record_failure (void) +void Temperature_Monitor2::record_failure () { Name_Binding_Ptr lastFailure (this->naming_context_.fetch ("lastFailure")); Name_Binding_Ptr lastReset (this->naming_context_.fetch ("lastReset")); @@ -117,7 +117,7 @@ void Temperature_Monitor2::record_failure (void) this->naming_context_.rebind ("lastFailure", lastFailureTime); } -void Temperature_Monitor2::monitor (void) +void Temperature_Monitor2::monitor () { this->thermometer_ = new Thermometer (this->opt_.thermometer_address ()); diff --git a/ACE/examples/APG/Naming/Temperature_Monitor2.h b/ACE/examples/APG/Naming/Temperature_Monitor2.h index ab4f8b5601b41..3db78c107e454 100644 --- a/ACE/examples/APG/Naming/Temperature_Monitor2.h +++ b/ACE/examples/APG/Naming/Temperature_Monitor2.h @@ -16,12 +16,12 @@ class Temperature_Monitor2 shared_context_(shared_context) { } - void monitor (void); + void monitor (); protected: void record_temperature (float temp); void record_history (float temp); - void record_failure (void); + void record_failure (); void reset_device (Name_Binding_Ptr & resetCount); private: diff --git a/ACE/examples/APG/Naming/Temperature_Monitor_Options.h b/ACE/examples/APG/Naming/Temperature_Monitor_Options.h index 18e84066a406c..9ab5c9fabb831 100644 --- a/ACE/examples/APG/Naming/Temperature_Monitor_Options.h +++ b/ACE/examples/APG/Naming/Temperature_Monitor_Options.h @@ -7,32 +7,32 @@ class Temperature_Monitor_Options Temperature_Monitor_Options (int, ACE_TCHAR *[]) { } - const char *thermometer_address (void) + const char *thermometer_address () { return "serial:// s0/0x3e52"; } - int poll_interval (void) + int poll_interval () { return 10; // every 10 seconds } - int reset_interval (void) + int reset_interval () { return 60; // sixty seconds } - int excessive_resets (void) + int excessive_resets () { return 5; // no response in 5 minutes } - const char *admin_email (void) + const char *admin_email () { return "root@localhost"; } - const char *email_from (void) + const char *email_from () { return "temperature monitor"; } diff --git a/ACE/examples/APG/Naming/Thermometer.h b/ACE/examples/APG/Naming/Thermometer.h index 78073b1eb1d97..2c4c4a0233b8c 100644 --- a/ACE/examples/APG/Naming/Thermometer.h +++ b/ACE/examples/APG/Naming/Thermometer.h @@ -12,7 +12,7 @@ class Thermometer : addr_(addr), threshold_(5) { } - float temperature (void) + float temperature () { int success = ACE_OS::rand () % 10; if (success < this->threshold_) @@ -26,12 +26,12 @@ class Thermometer return (float)itemp; } - const char *address (void) + const char *address () { return this->addr_; } - void reset (void) + void reset () { this->threshold_ = 4; ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Resetting thermometer %C\n"), diff --git a/ACE/examples/APG/Proactor/HA_Proactive_Status.h b/ACE/examples/APG/Proactor/HA_Proactive_Status.h index d09848f3e065f..9626b710b8a5a 100644 --- a/ACE/examples/APG/Proactor/HA_Proactive_Status.h +++ b/ACE/examples/APG/Proactor/HA_Proactive_Status.h @@ -65,7 +65,7 @@ template class ACE_Asynch_Acceptor : public ACE_Handler ... protected: - virtual HANDLER *make_handler (void) + virtual HANDLER *make_handler () { return new HANDLER; } diff --git a/ACE/examples/APG/Processes/Process_Mutex.cpp b/ACE/examples/APG/Processes/Process_Mutex.cpp index b48588301fb95..e8ae41e3e178b 100644 --- a/ACE/examples/APG/Processes/Process_Mutex.cpp +++ b/ACE/examples/APG/Processes/Process_Mutex.cpp @@ -12,7 +12,7 @@ class GResourceUser ACE_TRACE ("GResourceUser::GResourceUser"); } - void run (void) + void run () { ACE_TRACE ("GResourceUser::run"); diff --git a/ACE/examples/APG/Processes/Spawn.cpp b/ACE/examples/APG/Processes/Spawn.cpp index 19d0bc77b8db8..711b10cb5fff1 100644 --- a/ACE/examples/APG/Processes/Spawn.cpp +++ b/ACE/examples/APG/Processes/Spawn.cpp @@ -19,7 +19,7 @@ class Manager : public ACE_Process ACE_OS::strcpy (programName_, program_name); } - int doWork (void) + int doWork () { ACE_TRACE ("Manager::doWork"); @@ -43,7 +43,7 @@ class Manager : public ACE_Process private: // Listing 3 code/ch10 - int dumpRun (void) + int dumpRun () { ACE_TRACE ("Manager::dumpRun"); @@ -132,7 +132,7 @@ class Slave ACE_TRACE ("Slave::Slave"); } - int doWork (void) + int doWork () { ACE_TRACE ("Slave::doWork"); @@ -155,7 +155,7 @@ class Slave } // Listing 4 - void showWho (void) + void showWho () { ACE_TRACE ("Slave::showWho"); #if !defined (ACE_LACKS_PWD_FUNCTIONS) diff --git a/ACE/examples/APG/Reactor/HAStatus.cpp b/ACE/examples/APG/Reactor/HAStatus.cpp index 0242a893b1743..7ea76a5c9a61d 100644 --- a/ACE/examples/APG/Reactor/HAStatus.cpp +++ b/ACE/examples/APG/Reactor/HAStatus.cpp @@ -42,10 +42,10 @@ class ClientAcceptor : public ACE_Event_Handler class ClientService : public ACE_Event_Handler { public: - ACE_SOCK_Stream &peer (void) { return this->sock_; } + ACE_SOCK_Stream &peer () { return this->sock_; } //FUZZ: disable check_for_lack_ACE_OS - int open (void); + int open (); //FUZZ: enable check_for_lack_ACE_OS // Get this handler's I/O handle. @@ -128,7 +128,7 @@ ClientAcceptor::handle_close (ACE_HANDLE, ACE_Reactor_Mask) // Listing 7 code/ch07 int -ClientService::open (void) +ClientService::open () { ACE_TCHAR peer_name[MAXHOSTNAMELEN]; ACE_INET_Addr peer_addr; diff --git a/ACE/examples/APG/Reactor/Reschedule.cpp b/ACE/examples/APG/Reactor/Reschedule.cpp index ab525e4c31d42..807d76e6cb0cf 100644 --- a/ACE/examples/APG/Reactor/Reschedule.cpp +++ b/ACE/examples/APG/Reactor/Reschedule.cpp @@ -19,7 +19,6 @@ class MyTimerHandler : public ACE_Event_Handler ACE_OS::ctime(&epoch))); return 0; } - }; // Listing 1 code/ch07 diff --git a/ACE/examples/APG/Reactor/Timer_Cancel.cpp b/ACE/examples/APG/Reactor/Timer_Cancel.cpp index 2dc784d7ac45f..8928b046f019e 100644 --- a/ACE/examples/APG/Reactor/Timer_Cancel.cpp +++ b/ACE/examples/APG/Reactor/Timer_Cancel.cpp @@ -19,7 +19,6 @@ class MyTimerHandler : public ACE_Event_Handler ACE_OS::ctime(&epoch))); return 0; } - }; #if !defined (ACE_LACKS_UNIX_SIGNALS) diff --git a/ACE/examples/APG/Reactor/Timer_State_Data.cpp b/ACE/examples/APG/Reactor/Timer_State_Data.cpp index d84dfdd5c1894..8cd424fdf2fbc 100644 --- a/ACE/examples/APG/Reactor/Timer_State_Data.cpp +++ b/ACE/examples/APG/Reactor/Timer_State_Data.cpp @@ -25,7 +25,7 @@ class TemperatureSensor return this->location_; } - int querySensor (void) + int querySensor () { // ... return ++this->count_; diff --git a/ACE/examples/APG/Reactor/Timers.cpp b/ACE/examples/APG/Reactor/Timers.cpp index 734069456c16f..f6638bcf6985f 100644 --- a/ACE/examples/APG/Reactor/Timers.cpp +++ b/ACE/examples/APG/Reactor/Timers.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_time.h" #include "ace/OS_NS_signal.h" -typedef void (*timerTask_t)(void); +typedef void (*timerTask_t)(); // Listing 1 code/ch07 pid_t timerTask (int initialDelay, @@ -50,7 +50,7 @@ void foo () } // Listing 2 -void programMainLoop (void) +void programMainLoop () { ACE_OS::sleep (30); } diff --git a/ACE/examples/APG/Shared_Memory/Hash_Map.cpp b/ACE/examples/APG/Shared_Memory/Hash_Map.cpp index 908382c4736ea..d4f7de29e54d1 100644 --- a/ACE/examples/APG/Shared_Memory/Hash_Map.cpp +++ b/ACE/examples/APG/Shared_Memory/Hash_Map.cpp @@ -132,7 +132,7 @@ int addRecords(HASH_MAP *map, ALLOCATOR *shmem_allocator) } // Listing 4 // Listing 5 code/ch17 -int handle_child (void) +int handle_child () { ACE_TRACE ("handle_child"); diff --git a/ACE/examples/APG/Shared_Memory/Malloc.cpp b/ACE/examples/APG/Shared_Memory/Malloc.cpp index 9c7e0073a0424..abad7302c1d7b 100644 --- a/ACE/examples/APG/Shared_Memory/Malloc.cpp +++ b/ACE/examples/APG/Shared_Memory/Malloc.cpp @@ -29,9 +29,9 @@ class Record } ~Record () { g_allocator->free (name_); } - char* name(void) { return name_; } - int id1 (void) { return id1_; } - int id2 (void) { return id2_; } + char* name() { return name_; } + int id1 () { return id1_; } + int id2 () { return id2_; } private: int id1_; diff --git a/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp b/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp index d24b6f8f77059..e9da843f997f1 100644 --- a/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp +++ b/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp @@ -34,9 +34,9 @@ class Record ~Record() { g_allocator->free (name_.addr ()); } - char *name (void) { return name_; } - int id1 (void) { return id1_; } - int id2 (void) { return id2_; } + char *name () { return name_; } + int id1 () { return id1_; } + int id2 () { return id2_; } private: int id1_; @@ -45,7 +45,7 @@ class Record }; // Listing 2 -void showRecords (void) +void showRecords () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("The following records were found:\n"))); @@ -64,7 +64,7 @@ void showRecords (void) } } -int addRecords (void) +int addRecords () { char buf[32]; diff --git a/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp b/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp index 8b3a254bf9e5e..1e0e65418e1eb 100644 --- a/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp +++ b/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp @@ -223,7 +223,7 @@ int handle_parent (ACE_TCHAR *cmdLine) // Listing 2 // Listing 3 code/ch17 -int handle_child (void) +int handle_child () { ALLOCATOR *shmem_allocator = 0; ACE_MMAP_Memory_Pool_Options options diff --git a/ACE/examples/APG/Shared_Memory/Record.h b/ACE/examples/APG/Shared_Memory/Record.h index 5c3605244891a..cdcf0a306133d 100644 --- a/ACE/examples/APG/Shared_Memory/Record.h +++ b/ACE/examples/APG/Shared_Memory/Record.h @@ -28,9 +28,9 @@ class Record ACE_OS::strcpy (recName_, name); this->name_ = recName_; } - char *name (void) { return recName_; } - int id1 (void) { return id1_; } - int id2 (void) { return id2_; } + char *name () { return recName_; } + int id1 () { return id1_; } + int id2 () { return id2_; } private: int id1_; diff --git a/ACE/examples/APG/Signals/SigGuard.cpp b/ACE/examples/APG/Signals/SigGuard.cpp index ea2bc6d3c6e68..dbecbd10d963b 100644 --- a/ACE/examples/APG/Signals/SigGuard.cpp +++ b/ACE/examples/APG/Signals/SigGuard.cpp @@ -16,7 +16,6 @@ class MySignalHandler : public ACE_Event_Handler int ACE_TMAIN (int, ACE_TCHAR *[]) { - MySignalHandler sighandler; ACE_Sig_Handler sh; sh.register_handler (SIGUSR1, &sighandler); diff --git a/ACE/examples/APG/Streams/Answerer.cpp b/ACE/examples/APG/Streams/Answerer.cpp index 87b7b8dd7a59e..79cfb0101bcbd 100644 --- a/ACE/examples/APG/Streams/Answerer.cpp +++ b/ACE/examples/APG/Streams/Answerer.cpp @@ -108,7 +108,7 @@ class RecordIncomingMessage : public BasicTask return 0; } - ACE_FILE_Addr get_incoming_message_queue (void) + ACE_FILE_Addr get_incoming_message_queue () { // Exclude 24 return ACE_FILE_Addr (ACE_TEXT ("/tmp/incoming_message")); diff --git a/ACE/examples/APG/Streams/BasicTask.h b/ACE/examples/APG/Streams/BasicTask.h index 8198f6b8d150b..b172099b0d185 100644 --- a/ACE/examples/APG/Streams/BasicTask.h +++ b/ACE/examples/APG/Streams/BasicTask.h @@ -35,7 +35,7 @@ class BasicTask : public ACE_Task // Listing 101 // Listing 1020 code/ch18 - virtual int svc (void) + virtual int svc () { for (ACE_Message_Block *message = 0; ; ) { @@ -131,7 +131,7 @@ class BasicTask : public ACE_Task // Listing 104 code/ch18 virtual int process (Message *message) = 0; - virtual int desired_threads (void) + virtual int desired_threads () { return 1; } diff --git a/ACE/examples/APG/Streams/CommandModule.cpp b/ACE/examples/APG/Streams/CommandModule.cpp index fc2a642ea1ca8..77164f537af1f 100644 --- a/ACE/examples/APG/Streams/CommandModule.cpp +++ b/ACE/examples/APG/Streams/CommandModule.cpp @@ -10,7 +10,7 @@ CommandModule::CommandModule (const ACE_TCHAR *module_name, // Listing 01 // Listing 02 code/ch18 -ACE_SOCK_Stream &CommandModule::peer (void) +ACE_SOCK_Stream &CommandModule::peer () { ACE_SOCK_Stream *peer = (ACE_SOCK_Stream *)this->arg (); return *peer; diff --git a/ACE/examples/APG/Streams/CommandModule.h b/ACE/examples/APG/Streams/CommandModule.h index 6b6f01a3a0710..217599791d2e1 100644 --- a/ACE/examples/APG/Streams/CommandModule.h +++ b/ACE/examples/APG/Streams/CommandModule.h @@ -18,7 +18,7 @@ class CommandModule : public ACE_Module CommandTask *reader, ACE_SOCK_Stream *peer); - ACE_SOCK_Stream &peer (void); + ACE_SOCK_Stream &peer (); }; // Listing 01 diff --git a/ACE/examples/APG/Streams/CommandTask.cpp b/ACE/examples/APG/Streams/CommandTask.cpp index 858ccadf09008..b7b715925ce1c 100644 --- a/ACE/examples/APG/Streams/CommandTask.cpp +++ b/ACE/examples/APG/Streams/CommandTask.cpp @@ -55,7 +55,7 @@ int CommandTask::close (u_long flags) // Listing 06 code/ch18 // Listing 061 code/ch18 -int CommandTask::svc (void) +int CommandTask::svc () { ACE_Message_Block *message; diff --git a/ACE/examples/APG/Streams/CommandTasks.cpp b/ACE/examples/APG/Streams/CommandTasks.cpp index 8ea4c397c8637..a96ca9541bf9a 100644 --- a/ACE/examples/APG/Streams/CommandTasks.cpp +++ b/ACE/examples/APG/Streams/CommandTasks.cpp @@ -15,7 +15,7 @@ AnswerCallModule::AnswerCallModule (ACE_SOCK_Stream *peer) { } // Listing 011 // Listing 012 code/ch18 -AnswerCallDownstreamTask::AnswerCallDownstreamTask (void) +AnswerCallDownstreamTask::AnswerCallDownstreamTask () : CommandTask(Command::CMD_ANSWER_CALL) { } // Listing 012 @@ -38,7 +38,7 @@ int AnswerCallDownstreamTask::process (Command *command) } // Listing 013 // Listing 014 code/ch18 -AnswerCallUpstreamTask::AnswerCallUpstreamTask (void) +AnswerCallUpstreamTask::AnswerCallUpstreamTask () : CommandTask(Command::CMD_ANSWER_CALL) { } // Listing 014 @@ -62,7 +62,7 @@ RetrieveCallerIdModule::RetrieveCallerIdModule // Listing 021 // Listing 022 code/ch18 RetrieveCallerIdDownstreamTask::RetrieveCallerIdDownstreamTask - (void) + () : CommandTask(Command::CMD_RETRIEVE_CALLER_ID) { } @@ -76,7 +76,7 @@ int RetrieveCallerIdDownstreamTask::process (Command *) // Listing 022 // Listing 023 code/ch18 RetrieveCallerIdUpstreamTask::RetrieveCallerIdUpstreamTask - (void) + () : CommandTask(Command::CMD_RETRIEVE_CALLER_ID) { } @@ -106,7 +106,7 @@ PlayMessageModule::PlayMessageModule (ACE_SOCK_Stream *peer) peer) { } -PlayMessageDownstreamTask::PlayMessageDownstreamTask (void) +PlayMessageDownstreamTask::PlayMessageDownstreamTask () : CommandTask(Command::CMD_PLAY_MESSAGE) { } // Listing 032 code/ch18 @@ -143,7 +143,7 @@ int PlayMessageDownstreamTask::process (Command *command) return Command::RESULT_SUCCESS; } // Listing 032 -PlayMessageUpstreamTask::PlayMessageUpstreamTask (void) +PlayMessageUpstreamTask::PlayMessageUpstreamTask () : CommandTask(Command::CMD_PLAY_MESSAGE) { } @@ -166,7 +166,7 @@ RecordMessageModule::RecordMessageModule (ACE_SOCK_Stream *peer) peer) { } -RecordMessageDownstreamTask::RecordMessageDownstreamTask (void) +RecordMessageDownstreamTask::RecordMessageDownstreamTask () : CommandTask(Command::CMD_RECORD_MESSAGE) { } @@ -175,7 +175,7 @@ int RecordMessageDownstreamTask::process (Command *) return Command::RESULT_SUCCESS; } -RecordMessageUpstreamTask::RecordMessageUpstreamTask (void) +RecordMessageUpstreamTask::RecordMessageUpstreamTask () : CommandTask(Command::CMD_RECORD_MESSAGE) { } // Listing 033 code/ch18 diff --git a/ACE/examples/APG/Streams/Message.h b/ACE/examples/APG/Streams/Message.h index e6962896c857d..61f2a320e3879 100644 --- a/ACE/examples/APG/Streams/Message.h +++ b/ACE/examples/APG/Streams/Message.h @@ -13,7 +13,7 @@ class Message ~Message () { } - RecordingDevice *recorder (void) + RecordingDevice *recorder () { return this->device_; } @@ -28,7 +28,7 @@ class Message this->type_ = type; } - MessageType *type (void) + MessageType *type () { return this->type_; } @@ -38,7 +38,7 @@ class Message this->id_ = id; } - CallerId *caller_id (void) + CallerId *caller_id () { return this->id_; } @@ -54,22 +54,22 @@ class Message this->type_ = type; } - ACE_FILE_Addr &addr (void) + ACE_FILE_Addr &addr () { return this->addr_; } - int is_text (void) + int is_text () { return this->type_->is_text (); } - int is_audio (void) + int is_audio () { return this->type_->is_audio (); } - int is_video (void) + int is_video () { return this->type_->is_video (); } diff --git a/ACE/examples/APG/Streams/MessageInfo.h b/ACE/examples/APG/Streams/MessageInfo.h index b96a3ad67b314..ffc1ea1a25bf6 100644 --- a/ACE/examples/APG/Streams/MessageInfo.h +++ b/ACE/examples/APG/Streams/MessageInfo.h @@ -15,7 +15,7 @@ class CallerId CallerId (ACE_TString id) : id_(id) { } - const ACE_TCHAR * string(void) + const ACE_TCHAR * string() { return this->id_.c_str (); } @@ -59,31 +59,31 @@ class MessageType : codec_(codec), addr_(addr) { } - int get_codec (void) + int get_codec () { return this->codec_; } - ACE_FILE_Addr &get_addr (void) + ACE_FILE_Addr &get_addr () { return this->addr_; } - int is_video (void) + int is_video () { return this->get_codec () > FIRST_VIDEO_CODEC && this->get_codec () < LAST_VIDEO_CODEC; } - int is_audio (void) + int is_audio () { return this->get_codec () > FIRST_AUDIO_CODEC && this->get_codec () < LAST_AUDIO_CODEC ; } - int is_text (void) + int is_text () { return this->get_codec () > FIRST_TEXT_CODEC && diff --git a/ACE/examples/APG/Streams/RecordingDevice.h b/ACE/examples/APG/Streams/RecordingDevice.h index 41a9739d9871c..2ca368f9ee111 100644 --- a/ACE/examples/APG/Streams/RecordingDevice.h +++ b/ACE/examples/APG/Streams/RecordingDevice.h @@ -35,10 +35,10 @@ class RecordingDevice } // Answer the incoming call - virtual int answer_call (void) = 0; + virtual int answer_call () = 0; // Fetch some form of caller identification at the hardware level. - virtual CallerId *retrieve_callerId (void) = 0; + virtual CallerId *retrieve_callerId () = 0; // Fetch the message at the location specified by 'addr' and play // it for the caller. @@ -49,7 +49,7 @@ class RecordingDevice virtual MessageType *record_message (ACE_FILE_Addr &addr) = 0; // Release the RecordingDevice to accept another incoming call - virtual void release (void) + virtual void release () { this->release_semaphore (); } @@ -61,7 +61,7 @@ class RecordingDevice return 0; } - virtual RecordingDevice *wait_for_activity (void) + virtual RecordingDevice *wait_for_activity () { // Block on a semaphore until it says we're ready to do // work. @@ -90,12 +90,12 @@ class RecordingDevice } protected: - void acquire_semaphore (void) + void acquire_semaphore () { this->semaphore_.acquire (); } - void release_semaphore (void) + void release_semaphore () { // Reset the semaphore so that wait_for_activity() will // unblock. diff --git a/ACE/examples/APG/Streams/RecordingDeviceFactory.h b/ACE/examples/APG/Streams/RecordingDeviceFactory.h index f8f4162d8cf33..af0b370572f09 100644 --- a/ACE/examples/APG/Streams/RecordingDeviceFactory.h +++ b/ACE/examples/APG/Streams/RecordingDeviceFactory.h @@ -11,7 +11,6 @@ class RecordingDevice; class RecordingDeviceFactory { public: - // Instantiate the appropriate RecordingDevice implementation static RecordingDevice *instantiate (int argc, ACE_TCHAR *argv[]); }; diff --git a/ACE/examples/APG/Streams/RecordingDevice_Text.cpp b/ACE/examples/APG/Streams/RecordingDevice_Text.cpp index cf6cc0c084cbe..d06d2c131dab4 100644 --- a/ACE/examples/APG/Streams/RecordingDevice_Text.cpp +++ b/ACE/examples/APG/Streams/RecordingDevice_Text.cpp @@ -7,7 +7,7 @@ #include "RecordingDevice_Text.h" #include "Util.h" -TextListenerAcceptor::TextListenerAcceptor (void) +TextListenerAcceptor::TextListenerAcceptor () : ACE_Event_Handler(), RecordingDevice() { } @@ -62,18 +62,18 @@ ACE_Event_Handler *TextListenerAcceptor::get_handler () const return (ACE_Event_Handler *)this; } -RecordingDevice *TextListenerAcceptor::wait_for_activity (void) +RecordingDevice *TextListenerAcceptor::wait_for_activity () { this->RecordingDevice::wait_for_activity (); return new TextListener (this); } -int TextListenerAcceptor::answer_call (void) +int TextListenerAcceptor::answer_call () { return -1; } -CallerId *TextListenerAcceptor::retrieve_callerId (void) +CallerId *TextListenerAcceptor::retrieve_callerId () { return 0; } @@ -108,7 +108,7 @@ const ACE_TCHAR *TextListener::get_name () const } // Listing 02 code/ch18 -int TextListener::answer_call (void) +int TextListener::answer_call () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TextListener::answer_call()\n"))); @@ -129,7 +129,7 @@ int TextListener::answer_call (void) // Listing 02 // Listing 03 code/ch18 -CallerId *TextListener::retrieve_callerId (void) +CallerId *TextListener::retrieve_callerId () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TextListener::retrieve_callerId()\n"))); @@ -188,7 +188,7 @@ MessageType *TextListener::record_message (ACE_FILE_Addr &addr) // Listing 05 // Listing 06 code/ch18 -void TextListener::release (void) +void TextListener::release () { delete this; } diff --git a/ACE/examples/APG/Streams/RecordingDevice_Text.h b/ACE/examples/APG/Streams/RecordingDevice_Text.h index 10dc44df1f628..dcd6e1dc664cb 100644 --- a/ACE/examples/APG/Streams/RecordingDevice_Text.h +++ b/ACE/examples/APG/Streams/RecordingDevice_Text.h @@ -39,11 +39,11 @@ class TextListenerAcceptor : ACE_Event_Handler *get_handler () const; - virtual RecordingDevice *wait_for_activity (void); + virtual RecordingDevice *wait_for_activity (); - virtual int answer_call (void); + virtual int answer_call (); - virtual CallerId *retrieve_callerId (void); + virtual CallerId *retrieve_callerId (); virtual int play_message (ACE_FILE_Addr &addr); @@ -61,15 +61,15 @@ class TextListener : public RecordingDevice virtual const ACE_TCHAR *get_name () const; - int answer_call (void); + int answer_call (); - CallerId *retrieve_callerId (void); + CallerId *retrieve_callerId (); int play_message (ACE_FILE_Addr &addr); MessageType *record_message (ACE_FILE_Addr &addr); - virtual void release (void); + virtual void release (); // Listing 01 // Listing 02 code/ch18 private: diff --git a/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp b/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp index 5e850351bba2c..0cfcf30998231 100644 --- a/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp +++ b/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp @@ -82,7 +82,7 @@ HA_Status::init (int argc, ACE_TCHAR *argv[]) // Listing 2 code/ch19 int -HA_Status::fini (void) +HA_Status::fini () { this->acceptor_.close (); return 0; diff --git a/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp b/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp index 68eb68422d0a3..d82a2989b2f87 100644 --- a/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp +++ b/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp @@ -81,7 +81,7 @@ HA_Status::init (int argc, ACE_TCHAR *argv[]) // Listing 2 code/ch19 int -HA_Status::fini (void) +HA_Status::fini () { this->acceptor_.close (); return 0; diff --git a/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp index 007736eff47e4..b00697cd75477 100644 --- a/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp +++ b/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp @@ -9,7 +9,7 @@ class CanceledTask : public ACE_Task { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Starting thread\n"))); @@ -23,7 +23,7 @@ class CanceledTask : public ACE_Task } } - int set_cancel_mode (void) + int set_cancel_mode () { cancel_state new_state; diff --git a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp index 753f39af91f0f..37129d4466e27 100644 --- a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp +++ b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp @@ -10,8 +10,7 @@ class CanceledTask : public ACE_Task { public: - - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); diff --git a/ACE/examples/APG/ThreadManagement/ExitHandler.cpp b/ACE/examples/APG/ThreadManagement/ExitHandler.cpp index 915edf014fa47..4d62f6dc2be88 100644 --- a/ACE/examples/APG/ThreadManagement/ExitHandler.cpp +++ b/ACE/examples/APG/ThreadManagement/ExitHandler.cpp @@ -5,7 +5,7 @@ class ExitHandler : public ACE_At_Thread_Exit { public: - virtual void apply (void) + virtual void apply () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%t) is exiting\n"))); @@ -20,7 +20,7 @@ class HA_CommandHandler : public ACE_Task_Base HA_CommandHandler(ExitHandler& eh) : eh_(eh) { } - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); diff --git a/ACE/examples/APG/ThreadManagement/Pool.cpp b/ACE/examples/APG/ThreadManagement/Pool.cpp index e90cf64975105..ee4d4556b1e3f 100644 --- a/ACE/examples/APG/ThreadManagement/Pool.cpp +++ b/ACE/examples/APG/ThreadManagement/Pool.cpp @@ -8,7 +8,7 @@ class HA_CommandHandler : public ACE_Task { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); ACE_Message_Block *mb = 0; diff --git a/ACE/examples/APG/ThreadManagement/Priorities.cpp b/ACE/examples/APG/ThreadManagement/Priorities.cpp index fecb466e24faf..4f2c477f1a3bd 100644 --- a/ACE/examples/APG/ThreadManagement/Priorities.cpp +++ b/ACE/examples/APG/ThreadManagement/Priorities.cpp @@ -13,7 +13,7 @@ class HA_CommandHandler : public ACE_Task HA_CommandHandler (const char *name) : name_ (name) { } - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up %C\n"), name_)); diff --git a/ACE/examples/APG/ThreadManagement/Signals.cpp b/ACE/examples/APG/ThreadManagement/Signals.cpp index 80d424a52751d..157274c1e6678 100644 --- a/ACE/examples/APG/ThreadManagement/Signals.cpp +++ b/ACE/examples/APG/ThreadManagement/Signals.cpp @@ -24,7 +24,7 @@ class SignalableTask : public ACE_Task return 0; } - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Starting thread\n"))); diff --git a/ACE/examples/APG/ThreadManagement/Signals2.cpp b/ACE/examples/APG/ThreadManagement/Signals2.cpp index 1a23f38565dde..138abd0112702 100644 --- a/ACE/examples/APG/ThreadManagement/Signals2.cpp +++ b/ACE/examples/APG/ThreadManagement/Signals2.cpp @@ -24,7 +24,7 @@ class SignalableTask : public ACE_Task return 0; } - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Starting thread\n"))); @@ -56,7 +56,7 @@ SignalableTask::process_message (ACE_Message_Block *) } void -SignalableTask::handle_alert (void) +SignalableTask::handle_alert () { return; } diff --git a/ACE/examples/APG/ThreadManagement/Start_Hook.cpp b/ACE/examples/APG/ThreadManagement/Start_Hook.cpp index 49389fcdb701c..805e81435f548 100644 --- a/ACE/examples/APG/ThreadManagement/Start_Hook.cpp +++ b/ACE/examples/APG/ThreadManagement/Start_Hook.cpp @@ -34,7 +34,7 @@ HA_ThreadHook::add_sec_context_thr(ACE_TSS &secCtx) class HA_CommandHandler : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); diff --git a/ACE/examples/APG/ThreadManagement/State.cpp b/ACE/examples/APG/ThreadManagement/State.cpp index add2ca782cac7..52b9845ca13c1 100644 --- a/ACE/examples/APG/ThreadManagement/State.cpp +++ b/ACE/examples/APG/ThreadManagement/State.cpp @@ -3,7 +3,7 @@ class HA_CommandHandler : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n"))); diff --git a/ACE/examples/APG/ThreadPools/Futures.cpp b/ACE/examples/APG/ThreadPools/Futures.cpp index c207c734828b3..16288868fa663 100644 --- a/ACE/examples/APG/ThreadPools/Futures.cpp +++ b/ACE/examples/APG/ThreadPools/Futures.cpp @@ -33,7 +33,7 @@ class CompletionCallBack: public ACE_Future_Observer class LongWork : public ACE_Method_Request { public: - virtual int call (void) + virtual int call () { ACE_TRACE ("LongWork::call"); ACE_DEBUG @@ -49,7 +49,7 @@ class LongWork : public ACE_Method_Request return 0; } - ACE_Future &future (void) + ACE_Future &future () { ACE_TRACE ("LongWork::future"); return result_; @@ -68,7 +68,7 @@ class LongWork : public ACE_Method_Request class Exit : public ACE_Method_Request { public: - virtual int call (void) + virtual int call () { ACE_TRACE ("Exit::call"); return -1; @@ -80,7 +80,7 @@ class Worker; class IManager { public: - virtual ~IManager (void) { } + virtual ~IManager () { } virtual int return_to_work (Worker *worker) = 0; }; @@ -99,7 +99,7 @@ class Worker: public ACE_Task return this->queue_.enqueue (req); } - virtual int svc (void) + virtual int svc () { thread_id_ = ACE_Thread::self (); while (1) @@ -120,7 +120,7 @@ class Worker: public ACE_Task return 0; } - ACE_thread_t thread_id (void); + ACE_thread_t thread_id (); private: IManager *manager_; @@ -129,7 +129,7 @@ class Worker: public ACE_Task }; // Listing 3 -ACE_thread_t Worker::thread_id (void) +ACE_thread_t Worker::thread_id () { return thread_id_; } @@ -152,7 +152,7 @@ class Manager : public ACE_Task_Base, private IManager return this->queue_.enqueue (req); } - int svc (void) + int svc () { ACE_TRACE ("svc"); @@ -184,7 +184,7 @@ class Manager : public ACE_Task_Base, private IManager return 0; } - int shut_down (void); + int shut_down (); virtual int return_to_work (Worker *worker) { @@ -199,7 +199,7 @@ class Manager : public ACE_Task_Base, private IManager } private: - Worker *choose_worker (void) + Worker *choose_worker () { ACE_GUARD_RETURN (ACE_Thread_Mutex, worker_mon, this->workers_lock_, 0) @@ -212,7 +212,7 @@ class Manager : public ACE_Task_Base, private IManager return worker; } - int create_worker_pool (void) + int create_worker_pool () { ACE_GUARD_RETURN (ACE_Thread_Mutex, worker_mon, this->workers_lock_, -1); @@ -227,7 +227,7 @@ class Manager : public ACE_Task_Base, private IManager return 0; } - int done (void) + int done () { return (shutdown_ == 1); } @@ -247,7 +247,7 @@ class Manager : public ACE_Task_Base, private IManager // Listing 4 int -Manager::shut_down (void) +Manager::shut_down () { ACE_TRACE ("Manager::shut_down"); ACE_Unbounded_Queue::ITERATOR iter = this->workers_.begin (); @@ -274,7 +274,6 @@ Manager::shut_down (void) delete req; delete worker; - } while (iter.advance ()); diff --git a/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp b/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp index 8f0e4a821459e..6b740f60bc553 100644 --- a/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp +++ b/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp @@ -19,18 +19,18 @@ class Follower } //FUZZ: disable check_for_lack_ACE_OS - int wait (void) + int wait () { return this->cond_.wait (); } - int signal (void) + int signal () { return this->cond_.signal (); } //FUZZ: enable check_for_lack_ACE_OS - ACE_thread_t owner (void) + ACE_thread_t owner () { return this->owner_; } @@ -51,19 +51,19 @@ class LF_ThreadPool : public ACE_Task virtual int svc (); - void shut_down (void) + void shut_down () { shutdown_ = 1; } private: - int become_leader (void); + int become_leader (); - Follower *make_follower (void); + Follower *make_follower (); - int elect_new_leader (void); + int elect_new_leader (); - int leader_active (void) + int leader_active () { ACE_TRACE ("LF_ThreadPool::leader_active"); return this->current_leader_ != 0; @@ -77,7 +77,7 @@ class LF_ThreadPool : public ACE_Task void process_message (ACE_Message_Block *mb); - int done (void) + int done () { return (shutdown_ == 1); } @@ -93,7 +93,7 @@ class LF_ThreadPool : public ACE_Task // Listing 1 // Listing 2 code/ch16 int -LF_ThreadPool::svc (void) +LF_ThreadPool::svc () { ACE_TRACE ("LF_ThreadPool::svc"); while (!done ()) @@ -121,7 +121,7 @@ LF_ThreadPool::svc (void) // Listing 2 // Listing 3 code/ch16 int -LF_ThreadPool::become_leader (void) +LF_ThreadPool::become_leader () { ACE_TRACE ("LF_ThreadPool::become_leader"); @@ -147,7 +147,7 @@ LF_ThreadPool::become_leader (void) } Follower* -LF_ThreadPool::make_follower (void) +LF_ThreadPool::make_follower () { ACE_TRACE ("LF_ThreadPool::make_follower"); @@ -161,7 +161,7 @@ LF_ThreadPool::make_follower (void) // Listing 3 // Listing 5 code/ch16 int -LF_ThreadPool::elect_new_leader (void) +LF_ThreadPool::elect_new_leader () { ACE_TRACE ("LF_ThreadPool::elect_new_leader"); diff --git a/ACE/examples/APG/ThreadPools/TP_Reactor.cpp b/ACE/examples/APG/ThreadPools/TP_Reactor.cpp index 6386ee129bb9e..edd8441a815e5 100644 --- a/ACE/examples/APG/ThreadPools/TP_Reactor.cpp +++ b/ACE/examples/APG/ThreadPools/TP_Reactor.cpp @@ -111,7 +111,7 @@ reactor_event_hook (ACE_Reactor *) class ServerTP : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Running the event loop\n"))); diff --git a/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp b/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp index b9f980c51aefc..0b87733cde724 100644 --- a/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp +++ b/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp @@ -14,7 +14,7 @@ class Workers : public ACE_Task Workers () { } - virtual int svc (void) + virtual int svc () { while (1) { @@ -63,7 +63,7 @@ class Manager : public ACE_Task ACE_TRACE ("Manager::Manager"); } - int svc (void) + int svc () { ACE_TRACE ("Manager::svc"); @@ -95,13 +95,13 @@ class Manager : public ACE_Task } private: - int done (void); + int done (); int shutdown_; }; // Listing 1 -int Manager::done (void) +int Manager::done () { return (shutdown_ == 1); } diff --git a/ACE/examples/APG/ThreadPools/ThreadPool.cpp b/ACE/examples/APG/ThreadPools/ThreadPool.cpp index d5db44977f0cc..ba3b0d711ec8b 100644 --- a/ACE/examples/APG/ThreadPools/ThreadPool.cpp +++ b/ACE/examples/APG/ThreadPools/ThreadPool.cpp @@ -17,7 +17,7 @@ class Worker; class IManager { public: - virtual ~IManager (void) { } + virtual ~IManager () { } virtual int return_to_work (Worker *worker) = 0; }; @@ -28,7 +28,7 @@ class Worker : public ACE_Task public: Worker (IManager *manager) : manager_(manager) { } - virtual int svc (void) + virtual int svc () { ACE_Thread_ID id; thread_id_ = id; @@ -55,7 +55,7 @@ class Worker : public ACE_Task } // Listing 2 - const ACE_Thread_ID& thread_id (void) + const ACE_Thread_ID& thread_id () { return this->thread_id_; } @@ -93,7 +93,7 @@ class Manager: public ACE_Task, private IManager ACE_TRACE ("Manager::Manager"); } - int svc (void) + int svc () { ACE_TRACE ("Manager::svc"); @@ -134,7 +134,7 @@ class Manager: public ACE_Task, private IManager return 0; } - int shut_down (void); + int shut_down (); const ACE_Thread_ID& thread_id (Worker *worker); @@ -151,7 +151,7 @@ class Manager: public ACE_Task, private IManager } private: - int create_worker_pool (void) + int create_worker_pool () { ACE_GUARD_RETURN (ACE_Thread_Mutex, worker_mon, @@ -168,7 +168,7 @@ class Manager: public ACE_Task, private IManager return 0; } - int done (void); + int done (); private: int shutdown_; @@ -178,13 +178,13 @@ class Manager: public ACE_Task, private IManager }; // Listing 1 -int Manager::done (void) +int Manager::done () { return (shutdown_ == 1); } int -Manager::shut_down (void) +Manager::shut_down () { ACE_TRACE ("Manager::shut_down"); ACE_Unbounded_Queue::ITERATOR iter = diff --git a/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp b/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp index aadbea5068b33..df3eea5c359b1 100644 --- a/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp +++ b/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp @@ -26,7 +26,7 @@ class Producer : public ACE_Task_Base : buf_(buf), in_(in), out_(out) { } - int svc (void) + int svc () { SafeInt itemNo = 0; while (1) @@ -68,7 +68,7 @@ class Consumer : public ACE_Task_Base : buf_(buf), in_(in), out_(out) { } - int svc (void) + int svc () { while (1) { diff --git a/ACE/examples/APG/ThreadSafety/Barrier.cpp b/ACE/examples/APG/ThreadSafety/Barrier.cpp index a6d7b99e13146..2bca398321fa8 100644 --- a/ACE/examples/APG/ThreadSafety/Barrier.cpp +++ b/ACE/examples/APG/ThreadSafety/Barrier.cpp @@ -18,10 +18,10 @@ class HA_CommandHandler : public ACE_Task shutdown_barrier_(shutdown_barrier) { } - void initialize_handler (void); - int handle_command_requests (void); + void initialize_handler (); + int handle_command_requests (); - int svc (void) + int svc () { initialize_handler (); startup_barrier_.wait (); @@ -43,7 +43,7 @@ class HA_CommandHandler : public ACE_Task // Listing 2 void -HA_CommandHandler::initialize_handler (void) +HA_CommandHandler::initialize_handler () { ACE_Time_Value tv (0, ACE_OS::rand () * 100); timespec_t t = (timespec_t)tv; @@ -51,7 +51,7 @@ HA_CommandHandler::initialize_handler (void) } int -HA_CommandHandler::handle_command_requests (void) +HA_CommandHandler::handle_command_requests () { ACE_Time_Value tv (0, ACE_OS::rand () * 100); timespec_t t = (timespec_t)tv; diff --git a/ACE/examples/APG/ThreadSafety/Mutex.cpp b/ACE/examples/APG/ThreadSafety/Mutex.cpp index 026f95dc587e6..937ec61b6b10b 100644 --- a/ACE/examples/APG/ThreadSafety/Mutex.cpp +++ b/ACE/examples/APG/ThreadSafety/Mutex.cpp @@ -13,7 +13,7 @@ class LogMessage { } - virtual int priority (void) + virtual int priority () { return NORMAL; } @@ -21,7 +21,7 @@ class LogMessage class CriticalLogMessage : public LogMessage { - virtual int priority (void) + virtual int priority () { return LogMessage::CRITICAL; } diff --git a/ACE/examples/APG/ThreadSafety/RW_Lock.cpp b/ACE/examples/APG/ThreadSafety/RW_Lock.cpp index 27f667ef674d4..42cd9e629c03a 100644 --- a/ACE/examples/APG/ThreadSafety/RW_Lock.cpp +++ b/ACE/examples/APG/ThreadSafety/RW_Lock.cpp @@ -94,7 +94,7 @@ class Runner : public ACE_Task_Base Runner(HA_DiscoveryAgent &agent) : agent_(agent) { } - virtual int svc (void) + virtual int svc () { ACE_ASSERT(agent_.contains_device(devices[9]) == 1); agent_.remove_device (devices[9]); diff --git a/ACE/examples/APG/ThreadSafety/Semaphore.cpp b/ACE/examples/APG/ThreadSafety/Semaphore.cpp index 00cf7383a89c6..6ab1bc3bf33c5 100644 --- a/ACE/examples/APG/ThreadSafety/Semaphore.cpp +++ b/ACE/examples/APG/ThreadSafety/Semaphore.cpp @@ -15,7 +15,7 @@ class Consumer : public ACE_Task : psema_(psema), csema_(csema), exit_condition_(0) { } - int svc (void) + int svc () { while (!is_closed ()) consume_item (); @@ -47,7 +47,7 @@ class Consumer : public ACE_Task } //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void) + void shutdown () { //FUZZ: enable check_for_lack_ACE_OS exit_condition_ = 1; @@ -55,7 +55,7 @@ class Consumer : public ACE_Task csema_.release (N_THREADS); } - int is_closed (void) + int is_closed () { return exit_condition_; } @@ -77,7 +77,7 @@ class Producer : public ACE_Task_Base : psema_(psema), csema_(csema), consumer_(consumer) { } - int svc (void) + int svc () { for (int i = 0; i <= MAX_PROD; i++) produce_item (i); diff --git a/ACE/examples/APG/ThreadSafety/TSS.cpp b/ACE/examples/APG/ThreadSafety/TSS.cpp index f895871be75fc..71c1590a33a74 100644 --- a/ACE/examples/APG/ThreadSafety/TSS.cpp +++ b/ACE/examples/APG/ThreadSafety/TSS.cpp @@ -24,7 +24,7 @@ ClientContext::set_attribute (const char *name, void *value) class HA_CommandHandler : public ACE_Task { public: - virtual int svc (void) + virtual int svc () { ACE_thread_t tid = this->thr_mgr ()->thr_self (); // Set our identifier in TSS. @@ -36,7 +36,7 @@ class HA_CommandHandler : public ACE_Task return 0; } - int handle_requests (void) + int handle_requests () { ACE_thread_t *tid = (ACE_thread_t*)this->tss_ctx_->get_attribute ("thread_id"); diff --git a/ACE/examples/APG/ThreadSafety/Tokens.cpp b/ACE/examples/APG/ThreadSafety/Tokens.cpp index 2949680303419..93765c89c1c72 100644 --- a/ACE/examples/APG/ThreadSafety/Tokens.cpp +++ b/ACE/examples/APG/ThreadSafety/Tokens.cpp @@ -11,7 +11,6 @@ class Device; class HA_Device_Repository { public: - enum { N_DEVICES = 100 }; HA_Device_Repository () @@ -65,7 +64,7 @@ class HA_CommandHandler : public ACE_Task_Base HA_CommandHandler (HA_Device_Repository &rep) : rep_(rep) { } - int svc (void) + int svc () { for (int i = 0; i < HA_Device_Repository::N_DEVICES; i++) rep_.update_device (i, ""); diff --git a/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp b/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp index baa6e9d6fd4f2..80754f6768534 100644 --- a/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp +++ b/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp @@ -8,7 +8,7 @@ class ThreadOne : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_Local_Mutex mutex1 (ACE_TEXT ("resource1"), 0, // Deadlock detection enabled. @@ -24,7 +24,7 @@ class ThreadOne : public ACE_Task_Base class ThreadTwo : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_Local_Mutex mutex2 (ACE_TEXT ("resource2"), 0, // Deadlock detection enabled. diff --git a/ACE/examples/APG/Threads/Activate.cpp b/ACE/examples/APG/Threads/Activate.cpp index 6f7b8f0c9e721..3b62a6044ad88 100644 --- a/ACE/examples/APG/Threads/Activate.cpp +++ b/ACE/examples/APG/Threads/Activate.cpp @@ -5,7 +5,7 @@ class HA_CommandHandler : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n"))); diff --git a/ACE/examples/APG/Threads/Condition_Variables.cpp b/ACE/examples/APG/Threads/Condition_Variables.cpp index 659cd018d86ec..dea1e77d04e3a 100644 --- a/ACE/examples/APG/Threads/Condition_Variables.cpp +++ b/ACE/examples/APG/Threads/Condition_Variables.cpp @@ -12,13 +12,13 @@ class HA_Device_Repository HA_Device_Repository() : owner_(0) { } - int is_free (void) + int is_free () { return (this->owner_ == 0); } int is_owner (ACE_Task_Base* tb) { return (this->owner_ == tb); } - ACE_Task_Base *get_owner (void) + ACE_Task_Base *get_owner () { return this->owner_; } void set_owner (ACE_Task_Base *owner) @@ -51,7 +51,7 @@ class HA_CommandHandler : public ACE_Task_Base }; // Listing 2 code/ch12 int -HA_CommandHandler::svc (void) +HA_CommandHandler::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n"))); diff --git a/ACE/examples/APG/Threads/Message_Queue.cpp b/ACE/examples/APG/Threads/Message_Queue.cpp index 6e60903303698..9adc32104bd0f 100644 --- a/ACE/examples/APG/Threads/Message_Queue.cpp +++ b/ACE/examples/APG/Threads/Message_Queue.cpp @@ -7,7 +7,7 @@ // Listing 5 code/ch12 int -HA_CommandHandler::svc (void) +HA_CommandHandler::svc () { while(1) { @@ -43,7 +43,7 @@ HA_CommandHandler::svc (void) // Listing 4 code/ch12 ACE_Message_Block * -Message_Receiver::shut_down_message (void) +Message_Receiver::shut_down_message () { ACE_Message_Block *mb = 0; ACE_NEW_RETURN diff --git a/ACE/examples/APG/Threads/Message_Receiver.h b/ACE/examples/APG/Threads/Message_Receiver.h index 92f1ab612561f..395a94d3a6096 100644 --- a/ACE/examples/APG/Threads/Message_Receiver.h +++ b/ACE/examples/APG/Threads/Message_Receiver.h @@ -65,7 +65,7 @@ class Message_Receiver : Message_Receiver (HA_CommandHandler *ch) : handler_(ch) { } - ACE_Message_Block *shut_down_message (void); + ACE_Message_Block *shut_down_message (); virtual int handle_input (ACE_HANDLE fd); diff --git a/ACE/examples/APG/Threads/Mutexes.cpp b/ACE/examples/APG/Threads/Mutexes.cpp index 032dd159dd1a7..29f8c195354a8 100644 --- a/ACE/examples/APG/Threads/Mutexes.cpp +++ b/ACE/examples/APG/Threads/Mutexes.cpp @@ -33,7 +33,7 @@ class HA_CommandHandler : public ACE_Task_Base HA_CommandHandler (HA_Device_Repository& rep) : rep_(rep) { } - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n"))); diff --git a/ACE/examples/APG/Timers/CB.cpp b/ACE/examples/APG/Timers/CB.cpp index 722ea94b5473b..69cd122ee3f80 100644 --- a/ACE/examples/APG/Timers/CB.cpp +++ b/ACE/examples/APG/Timers/CB.cpp @@ -54,7 +54,7 @@ CB::setID (long timerID) } long -CB::getID (void) +CB::getID () { ACE_TRACE ("CB::getID"); return timerID_; diff --git a/ACE/examples/APG/Timers/CB.h b/ACE/examples/APG/Timers/CB.h index 3cbf44983cd6d..d05154a876fb3 100644 --- a/ACE/examples/APG/Timers/CB.h +++ b/ACE/examples/APG/Timers/CB.h @@ -16,7 +16,7 @@ class CB : public ACE_Event_Handler void setID (long timerID); // Get the timer id. - long getID (void); + long getID (); // Handle the timeout. virtual int handle_timeout(const ACE_Time_Value &tv, diff --git a/ACE/examples/APG/Timers/PCB.cpp b/ACE/examples/APG/Timers/PCB.cpp index 542ca97946f23..abd93721818d3 100644 --- a/ACE/examples/APG/Timers/PCB.cpp +++ b/ACE/examples/APG/Timers/PCB.cpp @@ -63,14 +63,14 @@ PCB::getID () const } int -PCB::handleClose (void) +PCB::handleClose () { ACE_TRACE ("PCB::handleClose"); return 0; } int -PCB::handleCancel (void) +PCB::handleCancel () { ACE_TRACE ("PCB::handleCancel"); return 0; diff --git a/ACE/examples/APG/Timers/PCB.h b/ACE/examples/APG/Timers/PCB.h index abe953b30c50a..97e64f69c59a3 100644 --- a/ACE/examples/APG/Timers/PCB.h +++ b/ACE/examples/APG/Timers/PCB.h @@ -15,8 +15,8 @@ class PCB // Handle a timeout event, cancel, and close. virtual int handleEvent (const void *arg); - virtual int handleCancel (void); - virtual int handleClose (void); + virtual int handleCancel (); + virtual int handleClose (); private: long timerID_; diff --git a/ACE/examples/APG/Timers/PTimerDispatcher.cpp b/ACE/examples/APG/Timers/PTimerDispatcher.cpp index 7601e08bbd847..dbb5b6477e3e0 100644 --- a/ACE/examples/APG/Timers/PTimerDispatcher.cpp +++ b/ACE/examples/APG/Timers/PTimerDispatcher.cpp @@ -1,6 +1,6 @@ #include "PTimerDispatcher.h" -void PTimer_Dispatcher::wait_for_event (void) +void PTimer_Dispatcher::wait_for_event () { ACE_TRACE ("PTimer_Dispatcher::wait_for_event"); diff --git a/ACE/examples/APG/Timers/PTimerDispatcher.h b/ACE/examples/APG/Timers/PTimerDispatcher.h index 43047c67a8aa1..12c3ccabe0345 100644 --- a/ACE/examples/APG/Timers/PTimerDispatcher.h +++ b/ACE/examples/APG/Timers/PTimerDispatcher.h @@ -11,7 +11,7 @@ class PCB; class PTimer_Dispatcher { public: - void wait_for_event (void); + void wait_for_event (); long schedule (PCB *cb, void *arg, diff --git a/ACE/examples/APG/Timers/TimerDispatcher.cpp b/ACE/examples/APG/Timers/TimerDispatcher.cpp index a2b47e2bf3977..9ccc18a7b71bd 100644 --- a/ACE/examples/APG/Timers/TimerDispatcher.cpp +++ b/ACE/examples/APG/Timers/TimerDispatcher.cpp @@ -1,6 +1,6 @@ #include "TimerDispatcher.h" // Listing 1 code/ch20 -void Timer_Dispatcher::wait_for_event (void) +void Timer_Dispatcher::wait_for_event () { ACE_TRACE ("Timer_Dispatcher::wait_for_event"); diff --git a/ACE/examples/APG/Timers/TimerDispatcher.h b/ACE/examples/APG/Timers/TimerDispatcher.h index 06ce42a8d8a1c..44df8959af2a7 100644 --- a/ACE/examples/APG/Timers/TimerDispatcher.h +++ b/ACE/examples/APG/Timers/TimerDispatcher.h @@ -11,7 +11,7 @@ class Timer_Dispatcher { public: - void wait_for_event (void); + void wait_for_event (); long schedule (ACE_Event_Handler *cb, void *arg, diff --git a/ACE/examples/ASX/CCM_App/CCM_App.cpp b/ACE/examples/ASX/CCM_App/CCM_App.cpp index 696fa0aa19e43..9c5ebf23b8df7 100644 --- a/ACE/examples/ASX/CCM_App/CCM_App.cpp +++ b/ACE/examples/ASX/CCM_App/CCM_App.cpp @@ -6,7 +6,6 @@ #include "ace/svc_export.h" - typedef ACE_Task MT_Task; typedef ACE_Stream MT_Stream; typedef ACE_Module MT_Module; @@ -21,8 +20,8 @@ class ACE_Svc_Export Test_Task : public MT_Task virtual int init (int, ACE_TCHAR *[]); virtual int fini (); - virtual int suspend (void); - virtual int resume (void); + virtual int suspend (); + virtual int resume (); }; int @@ -44,7 +43,7 @@ Test_Task::close (u_long) } int -Test_Task::suspend (void) +Test_Task::suspend () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("suspending in %s\n"), @@ -53,7 +52,7 @@ Test_Task::suspend (void) } int -Test_Task::resume (void) +Test_Task::resume () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("resuming in %s\n"), @@ -72,7 +71,7 @@ Test_Task::init (int, ACE_TCHAR *[]) } int -Test_Task::fini (void) +Test_Task::fini () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("finalizing %s (%@)\n"), @@ -88,33 +87,33 @@ ACE_SVC_FACTORY_DEFINE (Test_Task) // Dynamically linked functions used to control configuration. -extern "C" ACE_Svc_Export MT_Stream *make_stream (void); -extern "C" ACE_Svc_Export MT_Module *make_da (void); -extern "C" ACE_Svc_Export MT_Module *make_ea (void); -extern "C" ACE_Svc_Export MT_Module *make_mr (void); +extern "C" ACE_Svc_Export MT_Stream *make_stream (); +extern "C" ACE_Svc_Export MT_Module *make_da (); +extern "C" ACE_Svc_Export MT_Module *make_ea (); +extern "C" ACE_Svc_Export MT_Module *make_mr (); MT_Stream * -make_stream (void) +make_stream () { return new MT_Stream; } MT_Module * -make_da (void) +make_da () { return new MT_Module (ACE_TEXT ("Device_Adapter"), new Test_Task, new Test_Task); } MT_Module * -make_ea (void) +make_ea () { return new MT_Module (ACE_TEXT ("Event_Analyzer"), new Test_Task, new Test_Task); } MT_Module * -make_mr (void) +make_mr () { return new MT_Module (ACE_TEXT ("Multicast_Router"), new Test_Task, new Test_Task); diff --git a/ACE/examples/ASX/CCM_App/SC_Client.cpp b/ACE/examples/ASX/CCM_App/SC_Client.cpp index 311de59c89dd9..f38955830ad31 100644 --- a/ACE/examples/ASX/CCM_App/SC_Client.cpp +++ b/ACE/examples/ASX/CCM_App/SC_Client.cpp @@ -1,7 +1,6 @@ #include "ace/ACE.h" - // Pretty simple, eh? ;-) int diff --git a/ACE/examples/ASX/CCM_App/SC_Server.cpp b/ACE/examples/ASX/CCM_App/SC_Server.cpp index 8cfa03453f9f0..5b77547b128c8 100644 --- a/ACE/examples/ASX/CCM_App/SC_Server.cpp +++ b/ACE/examples/ASX/CCM_App/SC_Server.cpp @@ -9,7 +9,6 @@ #include "ace/Sig_Adapter.h" - class Event_Handler : public ACE_Event_Handler { public: diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp index 8a74e8039b4bd..defe6108f7e26 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp @@ -6,7 +6,6 @@ #include "Options.h" - Consumer_Router::Consumer_Router (Peer_Router_Context *prc) : Peer_Router (prc) { @@ -59,7 +58,7 @@ Consumer_Router::close (u_long) // Handle incoming messages in a separate thread. int -Consumer_Router::svc (void) +Consumer_Router::svc () { assert (this->is_writer ()); @@ -125,11 +124,6 @@ Consumer_Router::put (ACE_Message_Block *mb, } // Return information about the . -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%s\t %d/%s %s (%s)\n") -#else -# define FMTSTR ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n") -#endif /* ACE_WIN32 || !ACE_USES_WCHAR */ int Consumer_Router::info (ACE_TCHAR **strp, size_t length) const @@ -142,7 +136,11 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const return -1; ACE_OS::sprintf (buf, - FMTSTR, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %d/%") ACE_TEXT_PRIs + ACE_TEXT (" %") ACE_TEXT_PRIs + ACE_TEXT (" (%") ACE_TEXT_PRIs + ACE_TEXT (")\n"), module_name, addr.get_port_number (), ACE_TEXT ("tcp"), diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp index 33e079ca875d5..862b7a78f20d5 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp @@ -4,7 +4,6 @@ #include "Event_Analyzer.h" - int Event_Analyzer::open (void *) { @@ -60,7 +59,7 @@ Event_Analyzer::init (int, ACE_TCHAR *[]) } int -Event_Analyzer::fini (void) +Event_Analyzer::fini () { // No-op for now. return 0; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp index 76c24753020ff..0aaff77865f16 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp @@ -9,12 +9,11 @@ #include "Options.h" - /* static */ Options *Options::instance_ = 0; Options * -Options::instance (void) +Options::instance () { if (Options::instance_ == 0) Options::instance_ = new Options; @@ -22,7 +21,7 @@ Options::instance (void) return Options::instance_; } -Options::Options (void) +Options::Options () : thr_count_ (4), t_flags_ (0), high_water_mark_ (8 * 1024), @@ -37,11 +36,11 @@ Options::Options (void) { } -Options::~Options (void) +Options::~Options () { } -void Options::print_results (void) +void Options::print_results () { #if !defined (ACE_WIN32) ACE_Profile_Timer::ACE_Elapsed_Time et; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.h b/ACE/examples/ASX/Event_Server/Event_Server/Options.h index de5bc0640930f..d9408f42aa8ca 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Options.h +++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.h @@ -15,65 +15,65 @@ class Options // = TITLE // Option Singleton for Event Server. public: - static Options *instance (void); + static Options *instance (); // Singleton access point. void parse_args (int argc, ACE_TCHAR *argv[]); // Parse the command-line arguments and set the options. // = Timer management. - void stop_timer (void); - void start_timer (void); + void stop_timer (); + void start_timer (); // = Set/get the number of threads. void thr_count (size_t count); - size_t thr_count (void); + size_t thr_count (); // = Set/get the size of the queue. void initial_queue_length (size_t length); - size_t initial_queue_length (void); + size_t initial_queue_length (); // = Set/get the high water mark. void high_water_mark (size_t size); - size_t high_water_mark (void); + size_t high_water_mark (); // = Set/get the high water mark. void low_water_mark (size_t size); - size_t low_water_mark (void); + size_t low_water_mark (); // = Set/get the size of a message. void message_size (size_t size); - size_t message_size (void); + size_t message_size (); // = Set/get the number of iterations. void iterations (size_t n); - size_t iterations (void); + size_t iterations (); // Set/get threading flags. void t_flags (long flag); - long t_flags (void); + long t_flags (); // Set/get supplier port number. void supplier_port (u_short port); - u_short supplier_port (void); + u_short supplier_port (); // Set/get consumer port number. void consumer_port (u_short port); - u_short consumer_port (void); + u_short consumer_port (); // Enabled if we're in debugging mode. - int debug (void); + int debug (); // Enabled if we're in verbose mode. - int verbose (void); + int verbose (); // Print the results to the STDERR. - void print_results (void); + void print_results (); private: // = Ensure we're a Singleton. - Options (void); - ~Options (void); + Options (); + ~Options (); ACE_Profile_Timer itimer_; // Time the process. @@ -113,7 +113,6 @@ class Options static Options *instance_; // Static Singleton. - }; #include "Options.inl" diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.inl b/ACE/examples/ASX/Event_Server/Event_Server/Options.inl index ac5e90a4ab4f7..4ae59b3997705 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Options.inl +++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.inl @@ -12,7 +12,7 @@ Options::supplier_port (u_short port) } inline u_short -Options::supplier_port (void) +Options::supplier_port () { return this->supplier_port_; } @@ -24,19 +24,19 @@ Options::consumer_port (u_short port) } inline u_short -Options::consumer_port (void) +Options::consumer_port () { return this->consumer_port_; } inline void -Options::start_timer (void) +Options::start_timer () { this->itimer_.start (); } inline void -Options::stop_timer (void) +Options::stop_timer () { this->itimer_.stop (); } @@ -48,7 +48,7 @@ Options::thr_count (size_t count) } inline size_t -Options::thr_count (void) +Options::thr_count () { return this->thr_count_; } @@ -60,7 +60,7 @@ Options::initial_queue_length (size_t length) } inline size_t -Options::initial_queue_length (void) +Options::initial_queue_length () { return this->initial_queue_length_; } @@ -72,7 +72,7 @@ Options::high_water_mark (size_t size) } inline size_t -Options::high_water_mark (void) +Options::high_water_mark () { return this->high_water_mark_; } @@ -84,7 +84,7 @@ Options::low_water_mark (size_t size) } inline size_t -Options::low_water_mark (void) +Options::low_water_mark () { return this->low_water_mark_; } @@ -96,7 +96,7 @@ Options::message_size (size_t size) } inline size_t -Options::message_size (void) +Options::message_size () { return this->message_size_; } @@ -108,7 +108,7 @@ Options::iterations (size_t n) } inline size_t -Options::iterations (void) +Options::iterations () { return this->iterations_; } @@ -120,19 +120,19 @@ Options::t_flags (long flag) } inline long -Options::t_flags (void) +Options::t_flags () { return this->t_flags_; } inline int -Options::debug (void) +Options::debug () { return this->debugging_; } inline int -Options::verbose (void) +Options::verbose () { return this->verbosity_; } diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp index 41f00d1bb4c3c..61027fd6943cc 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp @@ -7,7 +7,6 @@ #include "Peer_Router.h" - // Send the to all the peers. Note that in a // "real" application this logic would most likely be more selective, // i.e., it would actually do "routing" based on addressing @@ -68,13 +67,13 @@ Peer_Router_Context::bind_peer (ROUTING_KEY key, } void -Peer_Router_Context::duplicate (void) +Peer_Router_Context::duplicate () { this->reference_count_++; } void -Peer_Router_Context::release (void) +Peer_Router_Context::release () { ACE_ASSERT (this->reference_count_ > 0); this->reference_count_--; @@ -117,7 +116,7 @@ Peer_Router_Context::Peer_Router_Context (u_short port) } } -Peer_Router_Context::~Peer_Router_Context (void) +Peer_Router_Context::~Peer_Router_Context () { // Free up the handle and close down the listening socket. ACE_DEBUG ((LM_DEBUG, @@ -152,7 +151,7 @@ Peer_Router_Context::~Peer_Router_Context (void) } Peer_Router * -Peer_Router_Context::peer_router (void) +Peer_Router_Context::peer_router () { return this->peer_router_; } @@ -377,7 +376,7 @@ Peer_Router::control (ACE_Message_Block *mb) // Supplier_Router level in order to get the right level of control // for input and output. -Peer_Handler::svc (void) +Peer_Handler::svc () { ACE_Message_Block *db, *hb; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h index 1e28194917a1f..f6a18497525ee 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h +++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h @@ -82,13 +82,13 @@ class Peer_Router_Context : public ACE_Acceptor // . // = Set/Get Router Task. - Peer_Router *peer_router (void); + Peer_Router *peer_router (); void peer_router (Peer_Router *); - void release (void); + void release (); // Decrement the reference count and delete when count == 0; - void duplicate (void); + void duplicate (); // Increment the reference count. private: @@ -109,7 +109,7 @@ class Peer_Router_Context : public ACE_Acceptor int reference_count_; // Keep track of when we can delete ourselves. - ~Peer_Router_Context (void); + ~Peer_Router_Context (); // Private to ensure dynamic allocation. friend class Friend_Of_Peer_Router_Context; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp index 81e20cfc3c719..2f9184f12b207 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp @@ -6,11 +6,10 @@ #include "Options.h" - // Handle outgoing messages in a separate thread. int -Supplier_Router::svc (void) +Supplier_Router::svc () { assert (this->is_writer ()); @@ -131,11 +130,6 @@ Supplier_Router::put (ACE_Message_Block *mb, } // Return information about the . -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%s\t %d/%s %s (%s)\n") -#else -# define FMTSTR ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n") -#endif /* ACE_WIN32 || !ACE_USES_WCHAR */ int Supplier_Router::info (ACE_TCHAR **strp, size_t length) const @@ -148,7 +142,11 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const return -1; ACE_OS::sprintf (buf, - FMTSTR, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %d/%") ACE_TEXT_PRIs + ACE_TEXT (" %") ACE_TEXT_PRIs + ACE_TEXT (" (%") ACE_TEXT_PRIs + ACE_TEXT (")\n"), module_name, addr.get_port_number (), ACE_TEXT ("tcp"), diff --git a/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp b/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp index 52c090e6800f4..0480f360987a1 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp @@ -34,10 +34,10 @@ class Event_Server : public ACE_Sig_Adapter // shutdown the cleanly when a SIGINT is // generated. public: - Event_Server (void); + Event_Server (); // Constructor. - int svc (void); + int svc (); // Run the event-loop for the event server. private: @@ -45,13 +45,13 @@ class Event_Server : public ACE_Sig_Adapter // Hook method called back when a user types something into the // STDIN in order to shut down the program. - int configure_stream (void); + int configure_stream (); // Setup the plumbing in the stream. - int set_watermarks (void); + int set_watermarks (); // Set the high and low queue watermarks. - int run_event_loop (void); + int run_event_loop (); // Run the event-loop for the . MT_Stream event_server_; @@ -59,7 +59,7 @@ class Event_Server : public ACE_Sig_Adapter // . }; -Event_Server::Event_Server (void) +Event_Server::Event_Server () : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) // Shutdown the 's event loop when a SIGINT is // received. @@ -106,7 +106,7 @@ Event_Server::handle_input (ACE_HANDLE) } int -Event_Server::configure_stream (void) +Event_Server::configure_stream () { Peer_Router_Context *src; // Create the 's routing context. This contains a @@ -172,7 +172,7 @@ Event_Server::configure_stream (void) } int -Event_Server::set_watermarks (void) +Event_Server::set_watermarks () { // Set the high and low water marks appropriately. The water marks // control how much data can be buffered before the queues are @@ -195,7 +195,7 @@ Event_Server::set_watermarks (void) } int -Event_Server::run_event_loop (void) +Event_Server::run_event_loop () { // Begin the timer. Options::instance ()->start_timer (); @@ -215,7 +215,7 @@ Event_Server::run_event_loop (void) } int -Event_Server::svc (void) +Event_Server::svc () { if (this->configure_stream () == -1) return -1; diff --git a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp index 2e9f25bf59830..a4c4173f5622e 100644 --- a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp +++ b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp @@ -74,7 +74,7 @@ Event_Transceiver::handle_signal (int, siginfo_t *, ucontext_t *) return 0; } -Event_Transceiver::Event_Transceiver (void) +Event_Transceiver::Event_Transceiver () { } @@ -159,7 +159,7 @@ Event_Transceiver::handle_input (ACE_HANDLE handle) } int -Event_Transceiver::transmitter (void) +Event_Transceiver::transmitter () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) entering %s transmitter\n"), @@ -179,7 +179,7 @@ Event_Transceiver::transmitter (void) } int -Event_Transceiver::receiver (void) +Event_Transceiver::receiver () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) entering %s receiver\n"), diff --git a/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp b/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp index be146982be5cc..1024ab549da72 100644 --- a/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp +++ b/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_THREADS) // The producer reads data from the stdin stream, creates a message, diff --git a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp index 95408d3897d83..77c1437ff5485 100644 --- a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp +++ b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp @@ -18,7 +18,6 @@ #include "ace/Truncate.h" - #if defined (ACE_HAS_THREADS) typedef ACE_Stream MT_Stream; @@ -30,7 +29,7 @@ class Common_Task : public MT_Task // Methods that are common to the producer and consumer. { public: - Common_Task (void) {} + Common_Task () {} //FUZZ: disable check_for_lack_ACE_OS // ACE_Task hooks @@ -44,7 +43,7 @@ class Common_Task : public MT_Task class Producer : public Common_Task { public: - Producer (void) {} + Producer () {} // Read data from stdin and pass to consumer. virtual int svc (); @@ -55,7 +54,7 @@ class Consumer : public Common_Task // Define the Consumer interface. { public: - Consumer (void) {} + Consumer () {} virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); @@ -66,7 +65,6 @@ class Consumer : public Common_Task // Receive message from producer and print to stdout. private: - ACE_Time_Value timeout_; }; @@ -76,7 +74,7 @@ class Filter : public MT_Task // line. { public: - Filter (void): count_ (1) {} + Filter (): count_ (1) {} virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); @@ -121,7 +119,7 @@ Common_Task::close (u_long exit_status) // know when to exit. int -Producer::svc (void) +Producer::svc () { // Keep reading stdin, until we reach EOF. @@ -182,7 +180,7 @@ Consumer::put (ACE_Message_Block *mb, ACE_Time_Value *tv) // reading and exit. int -Consumer::svc (void) +Consumer::svc () { int result = 0; diff --git a/ACE/examples/ASX/Message_Queue/priority_buffer.cpp b/ACE/examples/ASX/Message_Queue/priority_buffer.cpp index cb72c5fa5e903..c622d99844b79 100644 --- a/ACE/examples/ASX/Message_Queue/priority_buffer.cpp +++ b/ACE/examples/ASX/Message_Queue/priority_buffer.cpp @@ -11,7 +11,6 @@ #include "ace/Truncate.h" - #if defined (ACE_HAS_THREADS) // Global thread manager. diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp index 153fbd557e483..14f92f9928209 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp @@ -5,7 +5,6 @@ #include "Options.h" - #if defined (ACE_HAS_THREADS) typedef Acceptor_Factory CONSUMER_FACTORY; @@ -66,7 +65,7 @@ Consumer_Router::close (u_long) // Handle incoming messages in a separate thread.. int -Consumer_Router::svc (void) +Consumer_Router::svc () { ACE_Message_Block *mb = 0; @@ -117,13 +116,10 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const if (sa.get_local_addr (addr) == -1) return -1; -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%ls\t %ls/ %ls") -#else -# define FMTSTR ACE_TEXT ("%s\t %s/ %s") -#endif - - ACE_OS::sprintf (buf, FMTSTR, + ACE_OS::sprintf (buf, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %") ACE_TEXT_PRIs + ACE_TEXT ("/ %") ACE_TEXT_PRIs, module_name, ACE_TEXT ("upipe"), ACE_TEXT ("# consumer router\n")); diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp index 53341e28ee349..e6364af591bd0 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp @@ -3,7 +3,6 @@ #include "Event_Analyzer.h" - #if defined (ACE_HAS_THREADS) int @@ -52,7 +51,7 @@ Event_Analyzer::init (int, ACE_TCHAR *[]) } int -Event_Analyzer::fini (void) +Event_Analyzer::fini () { return 0; } diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp index 2c464220d6e66..a12e7ffb415f6 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp @@ -9,10 +9,9 @@ #include "Options.h" - #if defined (ACE_HAS_THREADS) -Options::Options (void) +Options::Options () : thr_count_ (4), t_flags_ (THR_DETACHED), high_water_mark_ (8 * 1024), @@ -29,11 +28,11 @@ Options::Options (void) { } -Options::~Options (void) +Options::~Options () { } -void Options::print_results (void) +void Options::print_results () { ACE_Profile_Timer::ACE_Elapsed_Time et; this->itimer_.elapsed_time (et); diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.h b/ACE/examples/ASX/UPIPE_Event_Server/Options.h index a835bbf93a92f..ac228624f05c4 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Options.h +++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.h @@ -17,50 +17,50 @@ class Options { public: - Options (void); - ~Options (void); + Options (); + ~Options (); void parse_args (int argc, ACE_TCHAR *argv[]); - void stop_timer (void); - void start_timer (void); + void stop_timer (); + void start_timer (); void thr_count (size_t count); - size_t thr_count (void); + size_t thr_count (); void initial_queue_length (size_t length); - size_t initial_queue_length (void); + size_t initial_queue_length (); void high_water_mark (size_t size); - size_t high_water_mark (void); + size_t high_water_mark (); void low_water_mark (size_t size); - size_t low_water_mark (void); + size_t low_water_mark (); void message_size (size_t size); - size_t message_size (void); + size_t message_size (); void iterations (size_t n); - size_t iterations (void); + size_t iterations (); void t_flags (long flag); - long t_flags (void); + long t_flags (); void supplier_port (const ACE_TCHAR *port); - const ACE_TCHAR *supplier_port (void); + const ACE_TCHAR *supplier_port (); void consumer_port (const ACE_TCHAR *port); - const ACE_TCHAR *consumer_port (void); + const ACE_TCHAR *consumer_port (); void supplier_file (const ACE_TCHAR *file); - const ACE_TCHAR *supplier_file (void); + const ACE_TCHAR *supplier_file (); void consumer_file (const ACE_TCHAR *file); - const ACE_TCHAR *consumer_file (void); + const ACE_TCHAR *consumer_file (); - int debug (void); - int verbose (void); + int debug (); + int verbose (); - void print_results (void); + void print_results (); private: ACE_Profile_Timer itimer_; // Time the process. diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.inl b/ACE/examples/ASX/UPIPE_Event_Server/Options.inl index 8d10d96b1864e..8d9e9b5c663e8 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Options.inl +++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.inl @@ -13,7 +13,7 @@ Options::supplier_port (const ACE_TCHAR *port) } inline const ACE_TCHAR * -Options::supplier_port (void) +Options::supplier_port () { return this->supplier_port_; } @@ -25,7 +25,7 @@ Options::supplier_file (const ACE_TCHAR *file) } inline const ACE_TCHAR * -Options::supplier_file (void) +Options::supplier_file () { return this->supplier_file_; } @@ -37,7 +37,7 @@ Options::consumer_file (const ACE_TCHAR *file) } inline const ACE_TCHAR * -Options::consumer_file (void) +Options::consumer_file () { return this->consumer_file_; } @@ -49,19 +49,19 @@ Options::consumer_port (const ACE_TCHAR *port) } inline const ACE_TCHAR * -Options::consumer_port (void) +Options::consumer_port () { return this->consumer_port_; } inline void -Options::start_timer (void) +Options::start_timer () { this->itimer_.start (); } inline void -Options::stop_timer (void) +Options::stop_timer () { this->itimer_.stop (); } @@ -73,7 +73,7 @@ Options::thr_count (size_t count) } inline size_t -Options::thr_count (void) +Options::thr_count () { return this->thr_count_; } @@ -85,7 +85,7 @@ Options::initial_queue_length (size_t length) } inline size_t -Options::initial_queue_length (void) +Options::initial_queue_length () { return this->initial_queue_length_; } @@ -97,7 +97,7 @@ Options::high_water_mark (size_t size) } inline size_t -Options::high_water_mark (void) +Options::high_water_mark () { return this->high_water_mark_; } @@ -109,7 +109,7 @@ Options::low_water_mark (size_t size) } inline size_t -Options::low_water_mark (void) +Options::low_water_mark () { return this->low_water_mark_; } @@ -121,7 +121,7 @@ Options::message_size (size_t size) } inline size_t -Options::message_size (void) +Options::message_size () { return this->message_size_; } @@ -133,7 +133,7 @@ Options::iterations (size_t n) } inline size_t -Options::iterations (void) +Options::iterations () { return this->iterations_; } @@ -145,19 +145,19 @@ Options::t_flags (long flag) } inline long -Options::t_flags (void) +Options::t_flags () { return this->t_flags_; } inline int -Options::debug (void) +Options::debug () { return this->debugging_; } inline int -Options::verbose (void) +Options::verbose () { return this->verbosity_; } diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp index 51daaf8dcd751..4014c96c53dd7 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp @@ -9,7 +9,6 @@ #include "Options.h" - #if defined (ACE_HAS_THREADS) // Define some short-hand macros to deal with long templates @@ -51,7 +50,7 @@ Acceptor_Factory::Acceptor_Factory (Peer_Router *pr) } template Peer_Router * -Acceptor_Factory::router (void) +Acceptor_Factory::router () { return this->pr_; } @@ -63,7 +62,7 @@ Peer_Handler::Peer_Handler (ACE_Thread_Manager *tm) } template int -Peer_Handler::svc (void) +Peer_Handler::svc () { // Just a try !! we're just reading from our ACE_Message_Queue. ACE_Message_Block *db, *hb; @@ -140,7 +139,6 @@ Peer_Handler::open (void *a) template int Peer_Handler::handle_input (ACE_HANDLE h) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) input arrived on sd %d\n"), h)); // ACE_Reactor::instance ()->remove_handler(h, // ACE_Event_Handler::ALL_EVENTS_MASK @@ -205,12 +203,12 @@ Peer_Router::send_peers (ACE_Message_Block *mb) } template -Peer_Router::~Peer_Router (void) +Peer_Router::~Peer_Router () { } template int -Peer_Router::fini (void) +Peer_Router::fini () { delete this->acceptor_; return 0; diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h index adac931146a03..f24577307da5a 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h @@ -29,7 +29,7 @@ class Acceptor_Factory : public ACE_Acceptor { public: Acceptor_Factory (Peer_Router *pr); - Peer_Router *router (void); + Peer_Router *router (); int init (int argc, ACE_TCHAR *argv[]); // Initialize the acceptor when it's linked dynamically. @@ -74,7 +74,7 @@ class Peer_Router : public ACE_Task { public: Peer_Router (ACE_Thread_Manager * = 0); - ~Peer_Router (void); + ~Peer_Router (); typedef Peer_Handler, PEER_KEY> HANDLER; @@ -112,13 +112,7 @@ class Peer_Router : public ACE_Task #define ACE_INLINE #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Peer_Router.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Peer_Router.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_THREADS */ #endif /* _PEER_ROUTER_H */ diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp index f372147bf67e5..24b880893ae90 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp @@ -5,7 +5,6 @@ #include "Supplier_Router.h" - #if defined (ACE_HAS_THREADS) typedef Acceptor_Factory SUPPLIER_FACTORY; @@ -33,7 +32,7 @@ Supplier_Router::Supplier_Router (ACE_Thread_Manager *tm) // Handle incoming messages in a separate thread.. int -Supplier_Router::svc (void) +Supplier_Router::svc () { ACE_ASSERT (this->is_writer ()); @@ -116,13 +115,10 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const if (sa.get_local_addr (addr) == -1) return -1; -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%ls\t %ls/ %ls") -#else -# define FMTSTR ACE_TEXT ("%s\t %s/ %s") -#endif - - ACE_OS::sprintf (buf, FMTSTR, + ACE_OS::sprintf (buf, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %") ACE_TEXT_PRIs + ACE_TEXT ("/ %") ACE_TEXT_PRIs, module_name, ACE_TEXT ("upipe"), ACE_TEXT ("# supplier router\n")); diff --git a/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp b/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp index 06319b23c7e11..4f3d42bbe87ad 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp @@ -27,11 +27,11 @@ typedef ACE_Module MT_Module; class Quit_Handler : public ACE_Sig_Adapter { public: - Quit_Handler (void); + Quit_Handler (); virtual int handle_input (ACE_HANDLE fd); }; -Quit_Handler::Quit_Handler (void) +Quit_Handler::Quit_Handler () : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { // Register to trap input from the user. diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp index 41bea6c84e111..1c19a83e62e06 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp @@ -15,7 +15,6 @@ #include "BPR_Drivers.h" - // Constructor. Input_Device_Wrapper_Base::Input_Device_Wrapper_Base (ACE_Thread_Manager *input_task_mgr) @@ -29,7 +28,7 @@ Input_Device_Wrapper_Base::Input_Device_Wrapper_Base (ACE_Thread_Manager *input_ // Destructor. -Input_Device_Wrapper_Base::~Input_Device_Wrapper_Base (void) +Input_Device_Wrapper_Base::~Input_Device_Wrapper_Base () { } @@ -67,7 +66,7 @@ Input_Device_Wrapper_Base::set_send_count (long count) // if it has already done so, or -1 if there is a problem doing so. int -Input_Device_Wrapper_Base::request_stop (void) +Input_Device_Wrapper_Base::request_stop () { if (is_active_) { @@ -81,7 +80,7 @@ Input_Device_Wrapper_Base::request_stop (void) // This method runs the input device loop in the new thread. int -Input_Device_Wrapper_Base::svc (void) +Input_Device_Wrapper_Base::svc () { ACE_Time_Value timeout; ACE_Message_Block *message; @@ -175,7 +174,7 @@ Input_Device_Wrapper_Base::send_input_message (ACE_Message_Block *amb) } } -Output_Device_Wrapper_Base::~Output_Device_Wrapper_Base (void) +Output_Device_Wrapper_Base::~Output_Device_Wrapper_Base () { } @@ -204,7 +203,7 @@ Bounded_Packet_Relay::Bounded_Packet_Relay (ACE_Thread_Manager *input_task_mgr, // Destructor. -Bounded_Packet_Relay::~Bounded_Packet_Relay (void) +Bounded_Packet_Relay::~Bounded_Packet_Relay () { // Reactivate the queue, and then clear it. queue_.activate (); @@ -220,7 +219,7 @@ Bounded_Packet_Relay::~Bounded_Packet_Relay (void) // Requests output be sent to output device. int -Bounded_Packet_Relay::send_input (void) +Bounded_Packet_Relay::send_input () { // Don't block, return immediately if queue is empty. ACE_Message_Block *item; @@ -393,7 +392,7 @@ Bounded_Packet_Relay::end_transmission (Transmission_Status status) // Requests a report of statistics from the last transmission. int -Bounded_Packet_Relay::report_statistics (void) +Bounded_Packet_Relay::report_statistics () { // Serialize access to start and end transmission calls, // statistics reporting calls. @@ -456,7 +455,7 @@ Bounded_Packet_Relay::receive_input (void * arg) // Get high water mark for relay queue. ACE_UINT32 -Bounded_Packet_Relay::queue_hwm (void) +Bounded_Packet_Relay::queue_hwm () { return queue_lwm_; } @@ -473,7 +472,7 @@ Bounded_Packet_Relay::queue_hwm (ACE_UINT32 hwm) // Get low water mark for relay queue. ACE_UINT32 -Bounded_Packet_Relay::queue_lwm (void) +Bounded_Packet_Relay::queue_lwm () { return queue_lwm_; } @@ -487,11 +486,10 @@ Bounded_Packet_Relay::queue_lwm (ACE_UINT32 lwm) } - // Returns string corresponding to current status. const char * -Bounded_Packet_Relay::status_msg (void) +Bounded_Packet_Relay::status_msg () { const char *status_msg; switch (status_) diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h index 33d96964c3793..09f17d712e1b7 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h @@ -72,10 +72,10 @@ class Bounded_Packet_Relay Output_Device_Wrapper_Base *output_wrapper); /// Destructor. - virtual ~Bounded_Packet_Relay (void); + virtual ~Bounded_Packet_Relay (); /// Requests output be sent to output device. - int send_input (void); + int send_input (); /// Requests a transmission be started. int start_transmission (u_long packet_count, @@ -86,7 +86,7 @@ class Bounded_Packet_Relay int end_transmission (Transmission_Status status); /// Requests a report of statistics from the last transmission. - int report_statistics (void); + int report_statistics (); // = Command accessible entry points. @@ -96,13 +96,13 @@ class Bounded_Packet_Relay // = Accessors and mutators for relay settings /// Get high water mark for relay queue. - ACE_UINT32 queue_hwm (void); + ACE_UINT32 queue_hwm (); /// Set high water mark for relay queue. void queue_hwm (ACE_UINT32 hwm); /// Get low water mark for relay queue. - ACE_UINT32 queue_lwm (void); + ACE_UINT32 queue_lwm (); /// Set low water mark for relay queue. void queue_lwm (ACE_UINT32 lwm); @@ -138,7 +138,7 @@ class Bounded_Packet_Relay // = Transmission Statistics /// Returns string corresponding to current status. - const char *status_msg (void); + const char *status_msg (); /// Number of transmissions sent. u_long transmission_number_; @@ -154,7 +154,6 @@ class Bounded_Packet_Relay /// Ending time of the most recent transmission. ACE_Time_Value transmission_end_; - }; /** @@ -204,7 +203,7 @@ class Input_Device_Wrapper_Base : public ACE_Task_Base * terminate its thread. Should return 1 if it will do so, 0 if it * has already done so, or -1 if there is a problem doing so. */ - int request_stop (void); + int request_stop (); /// This method runs the input device loop in the new thread. virtual int svc (); @@ -216,7 +215,7 @@ class Input_Device_Wrapper_Base : public ACE_Task_Base protected: /// Creates a new message block, carrying data read from the /// underlying input device. - virtual ACE_Message_Block *create_input_message (void) = 0; + virtual ACE_Message_Block *create_input_message () = 0; /** * Sends a newly created message block, carrying data read from the @@ -245,7 +244,6 @@ class Input_Device_Wrapper_Base : public ACE_Task_Base /// Currently remaining count of messages to send before stopping /// (-1 indicates the device should not stop). long current_count_; - }; /** @@ -264,8 +262,7 @@ class Input_Device_Wrapper_Base : public ACE_Task_Base class Output_Device_Wrapper_Base { public: - - virtual ~Output_Device_Wrapper_Base (void); + virtual ~Output_Device_Wrapper_Base (); /// Writes contents of the passed message block out to the underlying /// output device. diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp index b320b20a433f0..f4daee108504e 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp @@ -21,11 +21,10 @@ #include "ace/OS_NS_unistd.h" - // Constructor. template -Bounded_Packet_Relay_Driver::Bounded_Packet_Relay_Driver (void) +Bounded_Packet_Relay_Driver::Bounded_Packet_Relay_Driver () : packet_count_cmd_ (0), arrival_period_cmd_ (0), transmit_period_cmd_ (0), @@ -46,7 +45,7 @@ Bounded_Packet_Relay_Driver::Bounded_Packet_Relay_Driver (void) // Destructor. template -Bounded_Packet_Relay_Driver::~Bounded_Packet_Relay_Driver (void) +Bounded_Packet_Relay_Driver::~Bounded_Packet_Relay_Driver () { // delete all instantiated command objects delete packet_count_cmd_; @@ -187,7 +186,7 @@ Bounded_Packet_Relay_Driver::parse_commands (const char *buf) // Runs the test. template int -Bounded_Packet_Relay_Driver::run (void) +Bounded_Packet_Relay_Driver::run () { this->init (); @@ -203,7 +202,7 @@ Bounded_Packet_Relay_Driver::run (void) // Gets the next request from the user input. template int -Bounded_Packet_Relay_Driver::get_next_request (void) +Bounded_Packet_Relay_Driver::get_next_request () { char buf[BUFSIZ]; @@ -232,7 +231,7 @@ Bounded_Packet_Relay_Driver::read_input (char *buf, size_t bufsiz) // Get count of packets to send in a transmission. template u_long -Bounded_Packet_Relay_Driver::packet_count (void) +Bounded_Packet_Relay_Driver::packet_count () { return packet_count_; } @@ -248,7 +247,7 @@ Bounded_Packet_Relay_Driver::packet_count (u_long pc) // Get rate at which input packets are to arrive. template u_long -Bounded_Packet_Relay_Driver::arrival_period (void) +Bounded_Packet_Relay_Driver::arrival_period () { return arrival_period_; } @@ -264,7 +263,7 @@ Bounded_Packet_Relay_Driver::arrival_period (u_long ap) // Get rate at which packets are to be relayed (usec). template u_long -Bounded_Packet_Relay_Driver::send_period (void) +Bounded_Packet_Relay_Driver::send_period () { return send_period_; } @@ -280,7 +279,7 @@ Bounded_Packet_Relay_Driver::send_period (u_long sp) // Get limit on the duration of the transmission (usec). template u_long -Bounded_Packet_Relay_Driver::duration_limit (void) +Bounded_Packet_Relay_Driver::duration_limit () { return duration_limit_; } @@ -295,7 +294,7 @@ Bounded_Packet_Relay_Driver::duration_limit (u_long dl) // Get logging level. template int -Bounded_Packet_Relay_Driver::logging_level (void) +Bounded_Packet_Relay_Driver::logging_level () { return logging_level_; } diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h index 1aa942bc38c6c..56dc447e6934a 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h @@ -44,10 +44,10 @@ class Bounded_Packet_Relay_Driver { public: /// Constructor. - Bounded_Packet_Relay_Driver (void); + Bounded_Packet_Relay_Driver (); /// Destructor. - virtual ~Bounded_Packet_Relay_Driver (void); + virtual ~Bounded_Packet_Relay_Driver (); /// Breaks up the input string buffer into pieces and executes the /// appropriate method to handle that operation. @@ -58,11 +58,11 @@ class Bounded_Packet_Relay_Driver * class should normally invoke this method. Returns 0 when * successful, or 0 otherwise. */ - virtual int run (void); + virtual int run (); /// This internal method gets the next request from the user. /// Returns -1 when user wants to exit. Returns 0 otherwise. - virtual int get_next_request (void); + virtual int get_next_request (); /** * Reads input from the user into the buffer with a maximum of @@ -73,37 +73,37 @@ class Bounded_Packet_Relay_Driver virtual ssize_t read_input (char *buf, size_t bufsiz); /// Prints the user interface for the driver to STDERR. - virtual int display_menu (void)=0; + virtual int display_menu () = 0; /// Initializes values and operations for the driver. - virtual int init (void)=0; + virtual int init () = 0; /// Get count of packets to send in a transmission. - u_long packet_count (void); + u_long packet_count (); /// Set count of packets to send in a transmission. void packet_count (u_long pc); /// Get rate at which input packets are to arrive. - u_long arrival_period (void); + u_long arrival_period (); /// Set rate at which input packets are to arrive. void arrival_period (u_long ap); /// Get rate at which packets are to be relayed (usec). - u_long send_period (void); + u_long send_period (); /// Set rate at which packets are to be relayed (usec). void send_period (u_long sp); /// Get limit on the duration of the transmission (usec). - u_long duration_limit (void); + u_long duration_limit (); /// Set limit on the duration of the transmission (usec). void duration_limit (u_long dl); /// Get logging level. - int logging_level (void); + int logging_level (); /// Set logging level. void logging_level (int ll); @@ -160,12 +160,6 @@ class Bounded_Packet_Relay_Driver int logging_level_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "BPR_Drivers_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BPR_Drivers_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _BPR_DRIVERS_T_H_ */ diff --git a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp index 880f1052c35b4..3d33608a4333a 100644 --- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp +++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp @@ -22,7 +22,6 @@ typedef ACE_Command_Callback HANDLER typedef ACE_Command_Callback SEND_HANDLER_CMD; - // Constructor. Text_Input_Device_Wrapper::Text_Input_Device_Wrapper (ACE_Thread_Manager *input_task_mgr, @@ -41,7 +40,7 @@ Text_Input_Device_Wrapper::Text_Input_Device_Wrapper (ACE_Thread_Manager *input_ // Destructor. -Text_Input_Device_Wrapper::~Text_Input_Device_Wrapper (void) +Text_Input_Device_Wrapper::~Text_Input_Device_Wrapper () { } @@ -67,9 +66,8 @@ Text_Input_Device_Wrapper::modify_device_settings (void *logging) // read from the underlying input device. ACE_Message_Block * -Text_Input_Device_Wrapper::create_input_message (void) +Text_Input_Device_Wrapper::create_input_message () { - // Construct a new message block to send. ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, @@ -173,7 +171,7 @@ User_Input_Task::User_Input_Task (Bounded_Packet_Relay *relay, // Destructor. -User_Input_Task::~User_Input_Task (void) +User_Input_Task::~User_Input_Task () { this->clear_all_timers (); } @@ -181,7 +179,7 @@ User_Input_Task::~User_Input_Task (void) // Runs the main event loop. int -User_Input_Task::svc (void) +User_Input_Task::svc () { for (;;) // Call back to the driver's implementation of how to read and @@ -448,7 +446,7 @@ User_Input_Task::shutdown (void *) // Helper method: clears all timers. int -User_Input_Task::clear_all_timers (void) +User_Input_Task::clear_all_timers () { // loop through the timers in the queue, cancelling each one for (ACE_Timer_Node_T *node; @@ -470,7 +468,7 @@ BPR_Handler_Base::BPR_Handler_Base (Bounded_Packet_Relay &relay, // Destructor. -BPR_Handler_Base::~BPR_Handler_Base (void) +BPR_Handler_Base::~BPR_Handler_Base () { } @@ -509,7 +507,7 @@ Send_Handler::Send_Handler (u_long send_count, // Destructor. -Send_Handler::~Send_Handler (void) +Send_Handler::~Send_Handler () { } @@ -560,7 +558,7 @@ Send_Handler::handle_timeout (const ACE_Time_Value &, // Cancellation hook. int -Send_Handler::cancelled (void) +Send_Handler::cancelled () { delete this; return 0; @@ -596,7 +594,7 @@ Termination_Handler::Termination_Handler (Bounded_Packet_Relay &relay, // Destructor. -Termination_Handler::~Termination_Handler (void) +Termination_Handler::~Termination_Handler () { } @@ -624,7 +622,7 @@ Termination_Handler::handle_timeout (const ACE_Time_Value &, // Cancellation hook int -Termination_Handler::cancelled (void) +Termination_Handler::cancelled () { delete this; return 0; @@ -639,14 +637,14 @@ Thread_Bounded_Packet_Relay_Driver::Thread_Bounded_Packet_Relay_Driver (Bounded_ // Destructor. -Thread_Bounded_Packet_Relay_Driver::~Thread_Bounded_Packet_Relay_Driver (void) +Thread_Bounded_Packet_Relay_Driver::~Thread_Bounded_Packet_Relay_Driver () { } // Display the user menu. int -Thread_Bounded_Packet_Relay_Driver::display_menu (void) +Thread_Bounded_Packet_Relay_Driver::display_menu () { static char menu[] = "\n\n Options:\n" @@ -690,7 +688,7 @@ Thread_Bounded_Packet_Relay_Driver::display_menu (void) // Initialize the driver. int -Thread_Bounded_Packet_Relay_Driver::init (void) +Thread_Bounded_Packet_Relay_Driver::init () { // Initialize the objects with their corresponding // methods from . @@ -748,7 +746,7 @@ Thread_Bounded_Packet_Relay_Driver::init (void) // Run the driver int -Thread_Bounded_Packet_Relay_Driver::run (void) +Thread_Bounded_Packet_Relay_Driver::run () { this->init (); return 0; diff --git a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h index 727393c551467..56bcf87fe1bae 100644 --- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h +++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h @@ -65,7 +65,6 @@ class Thread_Bounded_Packet_Relay_Driver; class Text_Input_Device_Wrapper : public Input_Device_Wrapper_Base { public: - // = Enumerated logging level flags enum Logging_Flags {NO_LOGGING = 0, LOG_MSGS_CREATED = 1}; @@ -77,7 +76,7 @@ class Text_Input_Device_Wrapper : public Input_Device_Wrapper_Base int logging = 0); /// Destructor. - virtual ~Text_Input_Device_Wrapper (void); + virtual ~Text_Input_Device_Wrapper (); /** * Modifies device settings based on passed pointer to a u_long. @@ -89,7 +88,7 @@ class Text_Input_Device_Wrapper : public Input_Device_Wrapper_Base protected: /// Creates a new message block, carrying data read from the /// underlying input device. - virtual ACE_Message_Block *create_input_message (void); + virtual ACE_Message_Block *create_input_message (); private: /// Length of the buffer into which to "read". @@ -106,7 +105,6 @@ class Text_Input_Device_Wrapper : public Input_Device_Wrapper_Base /// This value holds a count of packets created. u_long packet_count_; - }; /** @@ -120,7 +118,6 @@ class Text_Input_Device_Wrapper : public Input_Device_Wrapper_Base class Text_Output_Device_Wrapper : public Output_Device_Wrapper_Base { public: - // = Enumerated logging level flags enum Logging_Flags {NO_LOGGING = 0, LOG_MSGS_RCVD = 2, @@ -142,13 +139,11 @@ class Text_Output_Device_Wrapper : public Output_Device_Wrapper_Base virtual int modify_device_settings (void *logging); private: - /// This value holds the logging level. int logging_; /// This value holds a count of packets received. u_long packet_count_; - }; /** @@ -163,7 +158,6 @@ class Text_Output_Device_Wrapper : public Output_Device_Wrapper_Base class User_Input_Task : public ACE_Task_Base { public: - // = Trait for command accessible entry points. typedef int (User_Input_Task::*ACTION) (void *); @@ -174,7 +168,7 @@ class User_Input_Task : public ACE_Task_Base Thread_Bounded_Packet_Relay_Driver &timer_queue_driver); /// Destructor. - virtual ~User_Input_Task (void); + virtual ~User_Input_Task (); /// This method runs the event loop in the new thread. virtual int svc (); @@ -213,7 +207,7 @@ class User_Input_Task : public ACE_Task_Base int shutdown (void *); /// Helper method: clears all timers. - int clear_all_timers (void); + int clear_all_timers (); private: /// How many microseconds are in a second. @@ -241,7 +235,6 @@ class User_Input_Task : public ACE_Task_Base class BPR_Handler_Base : public ACE_Event_Handler { public: - // = Trait for command accessible entry points. typedef int (BPR_Handler_Base::*ACTION) (void *); @@ -252,7 +245,7 @@ class BPR_Handler_Base : public ACE_Event_Handler Thread_Timer_Queue &queue); /// Destructor. - virtual ~BPR_Handler_Base (void); + virtual ~BPR_Handler_Base (); // = Command accessible entry points. @@ -286,7 +279,6 @@ class Send_Handler; class Send_Handler : public BPR_Handler_Base { public: - // = Trait for command accessible entry points. typedef int (Send_Handler::*ACTION) (void *); @@ -299,14 +291,14 @@ class Send_Handler : public BPR_Handler_Base Thread_Bounded_Packet_Relay_Driver &driver); /// Destructor. - virtual ~Send_Handler (void); + virtual ~Send_Handler (); /// Call back hook. virtual int handle_timeout (const ACE_Time_Value ¤t_time, const void *arg); /// Cancellation hook. - virtual int cancelled (void); + virtual int cancelled (); // = Command accessible entry points. @@ -314,7 +306,6 @@ class Send_Handler : public BPR_Handler_Base virtual int reregister (void *timeout); private: - /// Count of the number of messages to send from the /// relay object to the output device object. u_long send_count_; @@ -345,14 +336,14 @@ class Termination_Handler : public BPR_Handler_Base Thread_Bounded_Packet_Relay_Driver &driver); /// Destructor. - virtual ~Termination_Handler (void); + virtual ~Termination_Handler (); /// Call back hook. virtual int handle_timeout (const ACE_Time_Value ¤t_time, const void *arg); /// Cancellation hook. - virtual int cancelled (void); + virtual int cancelled (); private: /// Reference to the driver that will redisplay the user input menu. @@ -380,16 +371,16 @@ class Thread_Bounded_Packet_Relay_Driver : public Bounded_Packet_Relay_Driver clients_; @@ -192,7 +192,7 @@ void AIO_Input_Handler::handle_read_stream /********************************************************/ -void AIO_CLD_Acceptor::close (void) { +void AIO_CLD_Acceptor::close () { ACE_Unbounded_Set_Iterator iter (clients_.begin ()); AIO_Input_Handler **ih; @@ -200,7 +200,7 @@ void AIO_CLD_Acceptor::close (void) { delete *ih; } -AIO_Input_Handler * AIO_CLD_Acceptor::make_handler (void) { +AIO_Input_Handler * AIO_CLD_Acceptor::make_handler () { AIO_Input_Handler *ih; ACE_NEW_RETURN (ih, AIO_Input_Handler (this), 0); if (clients_.insert (ih) == -1) @@ -221,7 +221,6 @@ AIO_Input_Handler * AIO_CLD_Acceptor::make_handler (void) { int AIO_CLD_Connector::validate_connection (const ACE_Asynch_Connect::Result& result, const ACE_INET_Addr &remote, const ACE_INET_Addr&) { - remote_addr_ = remote; if (!result.success ()) { ACE_Time_Value delay (retry_delay_); @@ -319,7 +318,7 @@ int AIO_Client_Logging_Daemon::fini () { return 0; } -int AIO_Client_Logging_Daemon::svc (void) { +int AIO_Client_Logging_Daemon::svc () { if (acceptor_.open (cld_addr_) == -1) return -1; if (CLD_CONNECTOR::instance ()->connect (sld_addr_) == 0) ACE_Proactor::instance ()->proactor_run_event_loop (); @@ -344,7 +343,6 @@ class AIO_Client_Logging_Daemon : public ACE_Task { }; int AIO_Client_Logging_Daemon::init (int, ACE_TCHAR *[]) { - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("This service requires AIO support\n")), -1); } @@ -353,7 +351,7 @@ int AIO_Client_Logging_Daemon::fini () { return 0; } -#endif /* (ACE_WIN32 && !ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ ACE_FACTORY_DEFINE (AIO_CLD, AIO_Client_Logging_Daemon) diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h index 2709285b859c0..351cb467962cb 100644 --- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h +++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h @@ -95,7 +95,7 @@ class AIO_CLD_Connector { open (); } // Destructor frees the SSL resources. - virtual ~AIO_CLD_Connector (void) { + virtual ~AIO_CLD_Connector () { SSL_free (ssl_); SSL_CTX_free (ssl_ctx_); proactor ()->cancel_timer (*this); @@ -108,7 +108,7 @@ class AIO_CLD_Connector const ACE_INET_Addr &remote, const ACE_INET_Addr& local); // Re-establish a connection to the logging server. - int reconnect (void) { return connect (remote_addr_); } + int reconnect () { return connect (remote_addr_); } protected: // Hook method called on timer expiration - retry connect @@ -116,7 +116,7 @@ class AIO_CLD_Connector (const ACE_Time_Value&, const void *); // Template method to create a new handler - virtual AIO_Output_Handler *make_handler (void) + virtual AIO_Output_Handler *make_handler () { return OUTPUT_HANDLER::instance (); } // Address at which logging server listens for connections. diff --git a/ACE/examples/C++NPv2/Configurable_Logging_Server.cpp b/ACE/examples/C++NPv2/Configurable_Logging_Server.cpp index 5f6b43691da71..dc5fc4580aa81 100644 --- a/ACE/examples/C++NPv2/Configurable_Logging_Server.cpp +++ b/ACE/examples/C++NPv2/Configurable_Logging_Server.cpp @@ -7,7 +7,6 @@ #include "ace/Reactor.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_STATIC_SVC_REGISTER (Reporter_Descriptor); ACE_Service_Config::open diff --git a/ACE/examples/C++NPv2/Logging_Event_Handler.cpp b/ACE/examples/C++NPv2/Logging_Event_Handler.cpp index 9465f1a011940..5a4238b1e6c47 100644 --- a/ACE/examples/C++NPv2/Logging_Event_Handler.cpp +++ b/ACE/examples/C++NPv2/Logging_Event_Handler.cpp @@ -9,7 +9,6 @@ #include "ace/os_include/os_netdb.h" int Logging_Event_Handler::open () { - static const char LOGFILE_SUFFIX[] = ".log"; char filename[MAXHOSTNAMELEN + sizeof (LOGFILE_SUFFIX)]; ACE_INET_Addr logging_peer_addr; diff --git a/ACE/examples/C++NPv2/README b/ACE/examples/C++NPv2/README index e741eb64ed815..b9fa446c91b04 100644 --- a/ACE/examples/C++NPv2/README +++ b/ACE/examples/C++NPv2/README @@ -7,7 +7,6 @@ The files in this directory contain the source code from the book We have compiled and run these files on the following platforms: - Sun Solaris 8 on SPARC using Sun Forte 6. Redhat Linux 7.1 using g++ 2.96. Microsoft Windows 2000 using Microsoft Visual C++ 6. diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h index b4839beb648ad..f3b1a3b784667 100644 --- a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h +++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h @@ -22,12 +22,6 @@ class Reactor_Logging_Server_Adapter : public ACE_Service_Object { Reactor_Logging_Server *server_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reactor_Logging_Server_Adapter.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reactor_Logging_Server_Adapter.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _REACTOR_LOGGING_SERVER_ADAPTER_H */ diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h index 2df69c8bb046d..e21a745ec0579 100644 --- a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h +++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h @@ -16,12 +16,6 @@ class Reactor_Logging_Server : public ACCEPTOR ACE_Reactor *reactor); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reactor_Logging_Server_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reactor_Logging_Server_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _REACTOR_LOGGING_SERVER_T_H */ diff --git a/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp b/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp index cc3a1ae9b3630..366562ef16744 100644 --- a/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp +++ b/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp @@ -35,7 +35,6 @@ class Quit_Handler : public ACE_Event_Handler { { delete this; return 0; } protected: - // Protected destructor ensures dynamic allocation. virtual ~Quit_Handler () {} }; diff --git a/ACE/examples/C++NPv2/Server_Shutdown.cpp b/ACE/examples/C++NPv2/Server_Shutdown.cpp index 5e9f7cfec4a76..eb75e3d6b1a32 100644 --- a/ACE/examples/C++NPv2/Server_Shutdown.cpp +++ b/ACE/examples/C++NPv2/Server_Shutdown.cpp @@ -33,7 +33,6 @@ class Quit_Handler : public ACE_Event_Handler { { delete this; return 0; } protected: - // Protected destructor ensures dynamic allocation. virtual ~Quit_Handler () {} }; diff --git a/ACE/examples/C++NPv2/TPC_Logging_Server.h b/ACE/examples/C++NPv2/TPC_Logging_Server.h index d4628813e7d6b..9ae3590a5128b 100644 --- a/ACE/examples/C++NPv2/TPC_Logging_Server.h +++ b/ACE/examples/C++NPv2/TPC_Logging_Server.h @@ -30,7 +30,7 @@ class TPC_Logging_Handler virtual int open (void *); - virtual int svc (void) { + virtual int svc () { for (;;) switch (logging_handler_.log_record ()) { case -1: return -1; // Error. @@ -63,7 +63,7 @@ class TPC_Logging_Acceptor : PARENT (r), ssl_ctx_ (0), ssl_ (0) {} // Destructor frees the SSL resources. - virtual ~TPC_Logging_Acceptor (void) { + virtual ~TPC_Logging_Acceptor () { SSL_free (this->ssl_); SSL_CTX_free (this->ssl_ctx_); } diff --git a/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp b/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp index 0695e751c8ea4..ab9c42ccc1308 100644 --- a/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp +++ b/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp @@ -36,7 +36,6 @@ class Quit_Handler : public ACE_Event_Handler { { delete this; return 0; } protected: - // Protected destructor ensures dynamic allocation. virtual ~Quit_Handler () {} }; diff --git a/ACE/examples/ConfigViewer/ValueDlg.h b/ACE/examples/ConfigViewer/ValueDlg.h index d909e75770de3..faae174c18a4d 100644 --- a/ACE/examples/ConfigViewer/ValueDlg.h +++ b/ACE/examples/ConfigViewer/ValueDlg.h @@ -42,7 +42,6 @@ class ValueDlg : public wxDialog u_int m_UINTValue; private: - }; #endif diff --git a/ACE/examples/ConfigViewer/ValueListCtrl.cpp b/ACE/examples/ConfigViewer/ValueListCtrl.cpp index 53bbc04cdc519..9a30226ef3b13 100644 --- a/ACE/examples/ConfigViewer/ValueListCtrl.cpp +++ b/ACE/examples/ConfigViewer/ValueListCtrl.cpp @@ -136,7 +136,6 @@ void ValueListCtrl::OnModify(wxCommandEvent& event) Value = Dlg.GetUINTValue(); m_pConfig->set_integer_value(m_Key, Name, Value); - } break; case ACE_Configuration::BINARY: diff --git a/ACE/examples/ConfigViewer/ValueListCtrl.h b/ACE/examples/ConfigViewer/ValueListCtrl.h index 914a8d7196759..78f33256a8947 100644 --- a/ACE/examples/ConfigViewer/ValueListCtrl.h +++ b/ACE/examples/ConfigViewer/ValueListCtrl.h @@ -36,7 +36,6 @@ class ValueListCtrl : public wxListCtrl DECLARE_EVENT_TABLE() private: - ACE_Configuration* m_pConfig; ACE_Configuration_Section_Key m_Key; }; diff --git a/ACE/examples/ConfigViewer/stdafx.h b/ACE/examples/ConfigViewer/stdafx.h index 5a62cdd3a2d42..0a3e236f0752f 100644 --- a/ACE/examples/ConfigViewer/stdafx.h +++ b/ACE/examples/ConfigViewer/stdafx.h @@ -11,4 +11,3 @@ - diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp index 9d0766d61d9ec..c0722d5ebda50 100644 --- a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp +++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp @@ -10,17 +10,16 @@ #include "SPIPE-acceptor.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) -Svc_Handler::Svc_Handler (void) +Svc_Handler::Svc_Handler () : mb_ (BUFSIZ + 1) { // An extra byte for null termination. this->mb_.size (BUFSIZ); } -Svc_Handler::~Svc_Handler (void) +Svc_Handler::~Svc_Handler () { } @@ -61,14 +60,14 @@ Svc_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) ACE_Proactor::end_event_loop (); } -IPC_Server::IPC_Server (void) +IPC_Server::IPC_Server () : n_threads_ (1), shutdown_ (0) { ACE_OS::strcpy (rendezvous_, ACE_TEXT ("acepipe")); } -IPC_Server::~IPC_Server (void) +IPC_Server::~IPC_Server () { } @@ -109,7 +108,7 @@ IPC_Server::init (int argc, ACE_TCHAR *argv[]) } int -IPC_Server::fini (void) +IPC_Server::fini () { return 0; } @@ -160,7 +159,7 @@ run_reactor_event_loop (void *) } int -IPC_Server::svc (void) +IPC_Server::svc () { // Performs the iterative server activities. while (this->shutdown_ == 0) diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.h b/ACE/examples/Connection/blocking/SPIPE-acceptor.h index 539fe2dc525a7..dd57e9930559c 100644 --- a/ACE/examples/Connection/blocking/SPIPE-acceptor.h +++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.h @@ -24,8 +24,8 @@ class Svc_Handler : public ACE_Svc_Handler , public ACE_Handler { public: - Svc_Handler (void); - ~Svc_Handler (void); + Svc_Handler (); + ~Svc_Handler (); virtual int open (void *); @@ -41,8 +41,8 @@ class Svc_Handler : public ACE_Svc_Handler , p class IPC_Server : public ACE_Oneshot_Acceptor { public: - IPC_Server (void); - ~IPC_Server (void); + IPC_Server (); + ~IPC_Server (); // = Dynamic linking hooks. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.cpp b/ACE/examples/Connection/blocking/SPIPE-connector.cpp index 61ef11b801cca..330defa5d63f9 100644 --- a/ACE/examples/Connection/blocking/SPIPE-connector.cpp +++ b/ACE/examples/Connection/blocking/SPIPE-connector.cpp @@ -11,13 +11,12 @@ #include "SPIPE-connector.h" - Peer_Handler::Peer_Handler (int iterations) : iterations_ (iterations) { } -Peer_Handler::~Peer_Handler (void) +Peer_Handler::~Peer_Handler () { } @@ -123,19 +122,19 @@ Peer_Handler::get_handle () const } void -Peer_Handler::display_menu (void) +Peer_Handler::display_menu () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nplease enter input..: "))); } -IPC_Client::IPC_Client (void) +IPC_Client::IPC_Client () : iterations_ (0), done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { ACE_OS::strcpy (rendezvous_, ACE_TEXT ("acepipe")); } -IPC_Client::~IPC_Client (void) +IPC_Client::~IPC_Client () { } @@ -177,13 +176,13 @@ IPC_Client::init (int argc, ACE_TCHAR *argv[]) } int -IPC_Client::fini (void) +IPC_Client::fini () { return 0; } int -IPC_Client::svc (void) +IPC_Client::svc () { ACE_Reactor::instance ()->run_reactor_event_loop (); return 0; diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.h b/ACE/examples/Connection/blocking/SPIPE-connector.h index ae11b7e8b6224..13954529c8ccb 100644 --- a/ACE/examples/Connection/blocking/SPIPE-connector.h +++ b/ACE/examples/Connection/blocking/SPIPE-connector.h @@ -23,7 +23,7 @@ class Peer_Handler : public ACE_Svc_Handler // is the number of buffers to send. If // == 0, then read from stdin. - ~Peer_Handler (void); + ~Peer_Handler (); virtual int open (void * = 0); // Activate the handler when connection is established. @@ -36,7 +36,7 @@ class Peer_Handler : public ACE_Svc_Handler virtual ACE_HANDLE get_handle () const; private: - void display_menu (void); + void display_menu (); int iterations_; // No. of buffers to send. @@ -46,8 +46,8 @@ class IPC_Client : public ACE_Connector { public: // Initialization - IPC_Client (void); - ~IPC_Client (void); + IPC_Client (); + ~IPC_Client (); // = Dynamic linking hooks. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp b/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp index 18ed1b7f6a745..1d3d2af5ebeac 100644 --- a/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp +++ b/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp @@ -3,7 +3,6 @@ #include "SPIPE-acceptor.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) int diff --git a/ACE/examples/Connection/blocking/test_spipe_connector.cpp b/ACE/examples/Connection/blocking/test_spipe_connector.cpp index f6a52f6c80520..7d992f7c30e4a 100644 --- a/ACE/examples/Connection/blocking/test_spipe_connector.cpp +++ b/ACE/examples/Connection/blocking/test_spipe_connector.cpp @@ -3,7 +3,6 @@ #include "SPIPE-connector.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/examples/Connection/misc/Connection_Handler.cpp b/ACE/examples/Connection/misc/Connection_Handler.cpp index f33407233aa2c..5a4a351527633 100644 --- a/ACE/examples/Connection/misc/Connection_Handler.cpp +++ b/ACE/examples/Connection/misc/Connection_Handler.cpp @@ -45,7 +45,7 @@ Connection_Handler::close (u_long) } int -Connection_Handler::svc (void) +Connection_Handler::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) in svc()\n"))); diff --git a/ACE/examples/Connection/misc/test_upipe.cpp b/ACE/examples/Connection/misc/test_upipe.cpp index 37b7e48d7f8c9..a2b6e225acdcc 100644 --- a/ACE/examples/Connection/misc/test_upipe.cpp +++ b/ACE/examples/Connection/misc/test_upipe.cpp @@ -10,7 +10,6 @@ #include "ace/UPIPE_Addr.h" - #if defined (ACE_HAS_THREADS) #include "test_upipe.h" diff --git a/ACE/examples/Connection/misc/test_upipe.h b/ACE/examples/Connection/misc/test_upipe.h index 8c1490db127db..277708422731c 100644 --- a/ACE/examples/Connection/misc/test_upipe.h +++ b/ACE/examples/Connection/misc/test_upipe.h @@ -24,7 +24,7 @@ class Server_Service : public SVC_HANDLER return 0; } - virtual int svc (void) + virtual int svc () { ACE_TRACE ("Server_Service::svc"); @@ -57,7 +57,7 @@ class Client_Service : public SVC_HANDLER return this->activate (THR_DETACHED | THR_NEW_LWP); } - virtual int svc (void) + virtual int svc () { ACE_TRACE ("Client_Service::svc"); char buf[BUFSIZ]; diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp index 51a61de8bd956..8b20bf97cc04b 100644 --- a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp +++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp @@ -145,19 +145,19 @@ IPC_Server::init (int argc, ACE_TCHAR *argv[]) } template -IPC_Server::IPC_Server (void) +IPC_Server::IPC_Server () : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { } template int -IPC_Server::fini (void) +IPC_Server::fini () { return 0; } template -IPC_Server::~IPC_Server (void) +IPC_Server::~IPC_Server () { } @@ -176,7 +176,7 @@ IPC_Server::handle_close (ACE_HANDLE handle, // Run the interative service. template int -IPC_Server::svc (void) +IPC_Server::svc () { ACE_TCHAR buf[BUFSIZ]; diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.h b/ACE/examples/Connection/non_blocking/CPP-acceptor.h index 3c38d7c0d7017..7a2eb1a3b00a2 100644 --- a/ACE/examples/Connection/non_blocking/CPP-acceptor.h +++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.h @@ -43,10 +43,10 @@ class IPC_Server : public ACE_Oneshot_Acceptor // = TITLE // This class illustrates how the works. public: - IPC_Server (void); + IPC_Server (); // Constructor. - ~IPC_Server (void); + ~IPC_Server (); // Destructor. // = Demultiplexing hooks. @@ -80,12 +80,6 @@ class IPC_Server : public ACE_Oneshot_Acceptor // signal. }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "CPP-acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("CPP-acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* CPP_ACCEPTOR_H */ diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.cpp b/ACE/examples/Connection/non_blocking/CPP-connector.cpp index 5eaea661e4e1c..06e8942991610 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.cpp +++ b/ACE/examples/Connection/non_blocking/CPP-connector.cpp @@ -58,14 +58,14 @@ Peer_Handler::close (u_long) } template int -Peer_Handler::uninitialized (void) +Peer_Handler::uninitialized () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("uninitialized!\n"))); return 0; } template int -Peer_Handler::connected (void) +Peer_Handler::connected () { char buf[BUFSIZ]; @@ -96,7 +96,7 @@ Peer_Handler::connected (void) } template int -Peer_Handler::stdio (void) +Peer_Handler::stdio () { char buf[BUFSIZ]; @@ -196,7 +196,7 @@ Peer_Handler::handle_close (ACE_HANDLE h, } template int -IPC_Client::svc (void) +IPC_Client::svc () { if (this->reactor ()) this->reactor ()->run_reactor_event_loop (); @@ -205,13 +205,13 @@ IPC_Client::svc (void) } template int -IPC_Client::fini (void) +IPC_Client::fini () { return 0; } template -IPC_Client::IPC_Client (void) +IPC_Client::IPC_Client () : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { } @@ -261,7 +261,7 @@ IPC_Client::init (int argc, ACE_TCHAR *argv[]) } template -IPC_Client::~IPC_Client (void) +IPC_Client::~IPC_Client () { } diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.h b/ACE/examples/Connection/non_blocking/CPP-connector.h index a6c228d0e9a8b..2f89038ce25db 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.h +++ b/ACE/examples/Connection/non_blocking/CPP-connector.h @@ -42,11 +42,11 @@ class Peer_Handler : public ACE_Svc_Handler const void *); protected: // = These methods implement the State pattern. - int uninitialized (void); - int connected (void); - int stdio (void); + int uninitialized (); + int connected (); + int stdio (); - int (Peer_Handler::*action_) (void); + int (Peer_Handler::*action_) (); // Keeps track of which state we are in. }; @@ -56,10 +56,10 @@ class IPC_Client : public ACE_Connector // = TITLE // This class illustrates how the works. public: - IPC_Client (void); + IPC_Client (); // Constructor. - ~IPC_Client (void); + ~IPC_Client (); // Destructor. // = Dynamic linking hooks. @@ -84,12 +84,6 @@ class IPC_Client : public ACE_Connector // signal. }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "CPP-connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("CPP-connector.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* CPP_CONNECTOR_H */ diff --git a/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp b/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp index 9589a043e5b76..419fc488bbe02 100644 --- a/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp @@ -18,7 +18,6 @@ ACE_TMAIN (int, ACE_TCHAR *argv[]) #include "CPP-connector.h" - typedef Peer_Handler PEER_HANDLER; typedef IPC_Client IPC_CLIENT; diff --git a/ACE/examples/Connection/non_blocking/test_sock_connector.cpp b/ACE/examples/Connection/non_blocking/test_sock_connector.cpp index 50bd1fc51ea8f..10693f528c686 100644 --- a/ACE/examples/Connection/non_blocking/test_sock_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_sock_connector.cpp @@ -5,7 +5,6 @@ #include "CPP-connector.h" - typedef Peer_Handler PEER_HANDLER; typedef IPC_Client IPC_CLIENT; diff --git a/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp b/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp index 954cd8de269fe..baa6c8e43b04d 100644 --- a/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp @@ -5,7 +5,6 @@ #include "CPP-connector.h" - #if !defined (ACE_WIN32) typedef Peer_Handler PEER_HANDLER; typedef IPC_Client IPC_CLIENT; diff --git a/ACE/examples/Connection/non_blocking/test_tli_connector.cpp b/ACE/examples/Connection/non_blocking/test_tli_connector.cpp index 8dca142fff67a..a61ba99968380 100644 --- a/ACE/examples/Connection/non_blocking/test_tli_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_tli_connector.cpp @@ -5,7 +5,6 @@ #include "CPP-connector.h" - #if defined (ACE_HAS_TLI) typedef Peer_Handler PEER_HANDLER; diff --git a/ACE/examples/DLL/Newsweek.cpp b/ACE/examples/DLL/Newsweek.cpp index 65856fe18c64f..52797d8ad4f4f 100644 --- a/ACE/examples/DLL/Newsweek.cpp +++ b/ACE/examples/DLL/Newsweek.cpp @@ -24,7 +24,7 @@ Newsweek::operator new (size_t bytes, const std::nothrow_t&) return ::new (std::nothrow) char[bytes]; } void -Newsweek::operator delete (void *p, const std::nothrow_t&) throw () +Newsweek::operator delete (void *p, const std::nothrow_t&) noexcept { delete [] static_cast (p); } @@ -37,10 +37,10 @@ Newsweek::operator delete (void *ptr) // Returns the Newsweek class pointer. // The ACE_BUILD_SVC_DLL and ACE_Svc_Export directives are necessary to // take care of exporting the function for Win32 platforms. -extern "C" ACE_Svc_Export Magazine *create_magazine (void); +extern "C" ACE_Svc_Export Magazine *create_magazine (); Magazine * -create_magazine (void) +create_magazine () { Magazine *mag = 0; ACE_NEW_RETURN (mag, Newsweek, 0); diff --git a/ACE/examples/DLL/Newsweek.h b/ACE/examples/DLL/Newsweek.h index dad7ce52fdbf3..aafce40e002e5 100644 --- a/ACE/examples/DLL/Newsweek.h +++ b/ACE/examples/DLL/Newsweek.h @@ -43,7 +43,7 @@ class Newsweek : public Magazine void *operator new (size_t bytes); // Overloaded new operator, nothrow_t variant. void *operator new (size_t bytes, const std::nothrow_t&); - void operator delete (void *p, const std::nothrow_t&) throw (); + void operator delete (void *p, const std::nothrow_t&) noexcept; void operator delete (void *ptr); }; diff --git a/ACE/examples/DLL/Today.cpp b/ACE/examples/DLL/Today.cpp index 2c48b1053b8fd..6ce81930b1347 100644 --- a/ACE/examples/DLL/Today.cpp +++ b/ACE/examples/DLL/Today.cpp @@ -25,7 +25,7 @@ Today::operator new (size_t bytes, const std::nothrow_t&) return ::new (std::nothrow) char[bytes]; } void -Today::operator delete (void *p, const std::nothrow_t&) throw () +Today::operator delete (void *p, const std::nothrow_t&) noexcept { delete [] static_cast (p); } @@ -38,9 +38,9 @@ Today::operator delete (void *ptr) // Returns the pointer to the Today class. // The ACE_BUILD_SVC_DLL and ACE_Svc_Export directives are necessary to // take care of exporting the function for Win32 platforms. -extern "C" ACE_Svc_Export Magazine *create_magazine (void); +extern "C" ACE_Svc_Export Magazine *create_magazine (); -Magazine *create_magazine (void) +Magazine *create_magazine () { Magazine *mag = 0; ACE_NEW_RETURN (mag, Today, 0); diff --git a/ACE/examples/DLL/Today.h b/ACE/examples/DLL/Today.h index b59fb1ff505ff..6201236e78a03 100644 --- a/ACE/examples/DLL/Today.h +++ b/ACE/examples/DLL/Today.h @@ -44,7 +44,7 @@ class Today : public Magazine void *operator new (size_t bytes); // Overloaded new operator, nothrow_t variant. void *operator new (size_t bytes, const std::nothrow_t&); - void operator delete (void *p, const std::nothrow_t&) throw (); + void operator delete (void *p, const std::nothrow_t&) noexcept; void operator delete (void *ptr); }; diff --git a/ACE/examples/DLL/test_dll.cpp b/ACE/examples/DLL/test_dll.cpp index 5eb1276cc8096..4f27a2e026162 100644 --- a/ACE/examples/DLL/test_dll.cpp +++ b/ACE/examples/DLL/test_dll.cpp @@ -6,7 +6,7 @@ #include "ace/Log_Msg.h" #include -typedef Magazine* (*Magazine_Creator) (void); +typedef Magazine* (*Magazine_Creator) (); int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/IOStream/server/iostream_server.cpp b/ACE/examples/IOStream/server/iostream_server.cpp index f658f703bade2..1128b002ae558 100644 --- a/ACE/examples/IOStream/server/iostream_server.cpp +++ b/ACE/examples/IOStream/server/iostream_server.cpp @@ -24,12 +24,12 @@ Handler::open (void *) return 0; } -Handler::Handler (void) +Handler::Handler () { ACE_DEBUG ((LM_DEBUG, "(%P) starting handler %x\n", this)); } -Handler::~Handler (void) +Handler::~Handler () { ACE_DEBUG ((LM_DEBUG, "(%P) shutting down handler %x\n", this)); ACE_Reactor::end_event_loop (); diff --git a/ACE/examples/IOStream/server/iostream_server.h b/ACE/examples/IOStream/server/iostream_server.h index 9145eb72b989d..0e3b6bf6267d3 100644 --- a/ACE/examples/IOStream/server/iostream_server.h +++ b/ACE/examples/IOStream/server/iostream_server.h @@ -28,8 +28,8 @@ class Handler : public ACE_Svc_Handler // iostream characteristics of the peer. { public: - Handler (void); - ~Handler (void); + Handler (); + ~Handler (); // = hooks. virtual int open (void *); diff --git a/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp b/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp index aa1a68175bc8a..4623ff1ae84fe 100644 --- a/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp +++ b/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp @@ -5,7 +5,6 @@ #include "ace/Log_Msg.h" - #if defined (ACE_HAS_ATM) #define MAX_LEAVES 32 @@ -132,7 +131,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) hosts[ i ], i, 0 ); - } } /* if num_leaves == 1 */ diff --git a/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp b/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp index cca4b3e62cb0a..57acb4a79305d 100644 --- a/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp +++ b/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp @@ -5,7 +5,6 @@ #include "ace/Log_Msg.h" - #if defined (ACE_HAS_ATM) // ACE_ATM Server diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp index 82810c26a36f0..65025e07ba2d4 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_string.h" - #if defined (ACE_HAS_STREAM_PIPES) int diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp index 588716fc91e69..a3d63dc0aaf7b 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp @@ -7,7 +7,6 @@ #include "ace/OS_main.h" - #if defined (ACE_HAS_STREAM_PIPES) int diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp index 6ff0fea3b5df1..9f27ef580b9a7 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp @@ -6,7 +6,6 @@ #include "ace/OS_main.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp index 3dbafa20cbab3..918f533b8c878 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp @@ -5,7 +5,6 @@ #include "ace/OS_main.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/IPC_SAP/FILE_SAP/client.cpp b/ACE/examples/IPC_SAP/FILE_SAP/client.cpp index 8bb5342e248b1..1a0f4c4e8cb74 100644 --- a/ACE/examples/IPC_SAP/FILE_SAP/client.cpp +++ b/ACE/examples/IPC_SAP/FILE_SAP/client.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_stdio.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp index 3b374b7de52fa..e4328d0f0b5fa 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp @@ -8,7 +8,6 @@ #include "ace/Default_Constants.h" - /* BSD socket client */ int diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp index d68cc78ac5ba7..500f091fee85c 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp @@ -9,7 +9,6 @@ #include "ace/Default_Constants.h" - /* BSD socket server. */ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp index 95634d813bc0f..9933b962de131 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp @@ -18,7 +18,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_main.h" -Options::Options (void) +Options::Options () : host_ (ACE_DEFAULT_SERVER_HOST), port_ (ACE_DEFAULT_SERVER_PORT), sleep_time_ (0, 0), // By default, don't sleep between calls. @@ -35,7 +35,7 @@ Options::Options (void) { } -Options::~Options (void) +Options::~Options () { ACE_MT (delete this->barrier_); delete [] this->message_buf_; @@ -45,9 +45,8 @@ Options::~Options (void) typedef ACE_Singleton OPTIONS; int -Options::init (void) +Options::init () { - ACE_DEBUG((LM_DEBUG,"Options::init, len = %d\n",this->message_len_)); // Check for default case. @@ -377,7 +376,7 @@ Options::twoway_client_test (void *) } ACE_THR_FUNC -Options::thr_func (void) +Options::thr_func () { ACE_DEBUG((LM_DEBUG,"(%P|%t) in thread func, mesg len = %d\n",this->message_len())); if (this->oneway_ == 0) @@ -387,7 +386,7 @@ Options::thr_func (void) } static int -run_client (void) +run_client () { // Raise the socket handle limit to the maximum. ACE::set_handle_limit (); diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h index e06aaf8268ea1..77b9e0947403f 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h @@ -13,10 +13,10 @@ class Options // Define the options for this test. { public: - Options (void); + Options (); // Constructor. - ~Options (void); + ~Options (); // Destructor. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -47,12 +47,12 @@ class Options const void *message_buf () const; // Returns a pointer to the message. - ACE_THR_FUNC thr_func (void); + ACE_THR_FUNC thr_func (); // Returns a pointer to the entry point into the thread that runs // the client test function. private: - int init (void); + int init (); // Initialize the message we're sending to the user and set up the // barrier. diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp index 369bde93281d2..221c55d4f15a6 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp @@ -14,7 +14,6 @@ #include "CPP-inserver-fancy.h" - // Forward declaration. class Handler; @@ -23,17 +22,17 @@ class Handler_Factory // = TITLE // Creates the oneway or twoway handlers. public: - Handler_Factory (void); + Handler_Factory (); // Constructor. - ~Handler_Factory (void); + ~Handler_Factory (); // Destructor. - int handle_events (void); + int handle_events (); // Run the main event loop. private: - int init_acceptors (void); + int init_acceptors (); // Initialize the acceptors. int create_handler (ACE_SOCK_Acceptor &acceptor, @@ -82,14 +81,14 @@ class Handler : public ACE_Svc_Handler // methods to get the header and the buffer to read the data. // This method factors out common code. - virtual int run (void) = 0; + virtual int run () = 0; // Hook method called by the template method to do the actual // protocol. Must be overridden by the subclass. virtual int svc (); // Template method entry point into the handler task. - virtual void print_results (void); + virtual void print_results (); // Print the results. size_t total_bytes_; @@ -111,7 +110,7 @@ class Twoway_Handler : public Handler // Constructor. private: - virtual int run (void); + virtual int run (); // Template Method hook called by . }; @@ -123,10 +122,10 @@ class Oneway_Handler : public Handler // Constructor. private: - virtual int run (void); + virtual int run (); // Template Method hook called by . - virtual void print_results (void); + virtual void print_results (); // Print the results. }; @@ -148,11 +147,11 @@ Options::reply_message_len () const return this->reply_message_len_; } -Options::~Options (void) +Options::~Options () { } -Options::Options (void) +Options::Options () : verbose_ (0), port_ (ACE_DEFAULT_SERVER_PORT), reply_message_len_ (24) // Default to the approximate size of an @@ -229,7 +228,7 @@ Handler::close (u_long) } int -Handler::svc (void) +Handler::svc () { // Timer logic. this->timer_.start (); @@ -273,7 +272,7 @@ Handler::parse_header_and_allocate_buffer (char *&request, } void -Handler::print_results (void) +Handler::print_results () { } @@ -285,7 +284,7 @@ Twoway_Handler::Twoway_Handler (ACE_HANDLE handle) // Function entry point into the twoway server task. int -Twoway_Handler::run (void) +Twoway_Handler::run () { // Read data from client (terminate on error). @@ -354,7 +353,7 @@ Oneway_Handler::Oneway_Handler (ACE_HANDLE handle) } void -Oneway_Handler::print_results (void) +Oneway_Handler::print_results () { ACE_Profile_Timer::ACE_Elapsed_Time et; this->timer_.elapsed_time (et); @@ -376,7 +375,7 @@ Oneway_Handler::print_results (void) // Function entry point into the oneway server task. int -Oneway_Handler::run (void) +Oneway_Handler::run () { // Read data from client (terminate on error). @@ -442,7 +441,7 @@ Handler_Factory::make_oneway_handler (ACE_HANDLE handle) } int -Handler_Factory::init_acceptors (void) +Handler_Factory::init_acceptors () { // Create the oneway and twoway server addresses. ACE_INET_Addr twoway_server_addr (OPTIONS::instance ()->port ()); @@ -505,11 +504,11 @@ Handler_Factory::create_handler (ACE_SOCK_Acceptor &acceptor, #endif /* ACE_HAS_THREADS */ } -Handler_Factory::Handler_Factory (void) +Handler_Factory::Handler_Factory () { } -Handler_Factory::~Handler_Factory (void) +Handler_Factory::~Handler_Factory () { this->twoway_acceptor_.close (); this->oneway_acceptor_.close (); @@ -518,7 +517,7 @@ Handler_Factory::~Handler_Factory (void) // Run the main event loop. int -Handler_Factory::handle_events (void) +Handler_Factory::handle_events () { if (this->init_acceptors () == -1) return -1; diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h index 6d9adcf89fd1c..24c3b74ce9269 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h @@ -9,10 +9,10 @@ class Options // Define the options for this test. { public: - Options (void); + Options (); // Constructor. - ~Options (void); + ~Options (); // Destructor. int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp index 9b3d40111bd34..8ba66a8ba24e1 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_stdio.h" - #if defined (ACE_HAS_POLL) // Should we be verbose? @@ -37,7 +36,7 @@ static struct pollfd poll_array[MAX_HANDLES]; static Buffer_Info buffer_array[MAX_HANDLES]; static void -init_poll_array (void) +init_poll_array () { int i; diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp index 0e8320c08f420..f1df73461eef4 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp @@ -13,7 +13,7 @@ #include "ace/High_Res_Timer.h" static int -run_client (void) +run_client () { ACE_MEM_Connector connector; ACE_MEM_Stream stream; diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp index 648882e29c7a0..77916986d5d1c 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp @@ -9,7 +9,6 @@ #include "ace/Profile_Timer.h" - static int run_event_loop (u_short port) { diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp index f9693012135e8..afd85f1bcf043 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_unistd.h" - #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp index 5baabeb8b6125..2dd15f6335239 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp @@ -8,7 +8,6 @@ #include "ace/OS_NS_unistd.h" - #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) // Are we running verbosely? @@ -55,7 +54,6 @@ server (void *arg) ACE_TEXT ("%p\n"), ACE_TEXT ("recv"))); break; - } else if (r_bytes == 0) { diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp index 2533bb321b48a..03e5131f917d9 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp @@ -5,7 +5,6 @@ #include "ace/OS_main.h" - #if defined (ACE_HAS_MSG) && !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) // ACE_LSOCK Client. diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp index 3f7690a43d166..6fc1b3f4bf015 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_stdlib.h" - #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) // ACE_LSOCK Server diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc index b8fc1278152b2..56eedf3342361 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc +++ b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc @@ -7,7 +7,6 @@ project(*C_inclient) : aceexe { } project(*C_inserver) : aceexe { - avoids += wince exename = C-inserver Source_Files { C-inserver.cpp diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp index e997ab269628b..6341ccc8d9889 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp @@ -8,7 +8,6 @@ #include "ace/OS_Memory.h" - #if defined (ACE_WIN32) #define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\") ACE_TEXT (X) #else diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp index 55cf607e59f98..3afde969abe65 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp @@ -5,7 +5,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_WIN32) #define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\") ACE_TEXT (X) #else diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp index 9c61536b21c5c..37ea3bdc53529 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_string.h" - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp index c1511cbb2d636..41f0631cb2939 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp @@ -7,7 +7,6 @@ #include "ace/Time_Value.h" - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp index f772fef27ef26..392513f92b2bd 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp @@ -7,7 +7,6 @@ #include "ace/Time_Value.h" - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp index 0c4d479b1e1f4..fbb9a7e06c5ca 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp @@ -9,7 +9,6 @@ #include "ace/Time_Value.h" - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp index 9f6f6eadbf8bd..d16fc8d080c3f 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp @@ -6,7 +6,6 @@ - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp index 16e03de54a0cb..43b65be91f248 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp index 4a1b866789822..1107e306fb721 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp @@ -18,7 +18,7 @@ #include "SSL-client-simple.h" -Options::Options (void) +Options::Options () : host_ (ACE_DEFAULT_SERVER_HOST), port_ (ACE_DEFAULT_SERVER_PORT), sleep_time_ (0, 0), // By default, don't sleep between calls. @@ -31,7 +31,7 @@ Options::Options (void) ACE_OS::strcpy (quit_string_, "q"); } -Options::~Options (void) +Options::~Options () { delete [] this->message_buf_; } @@ -40,7 +40,7 @@ Options::~Options (void) typedef ACE_Singleton OPTIONS; int -Options::init (void) +Options::init () { // Check for default case. if (this->message_len_ == 0) @@ -201,7 +201,7 @@ Options::shared_client_test (u_short port, // Static function entry point to the oneway client service. void -Options::oneway_client_test (void) +Options::oneway_client_test () { ACE_SSL_SOCK_Stream cli_stream; @@ -249,7 +249,7 @@ Options::oneway_client_test (void) // Static function entry point to the twoway client service. void -Options::twoway_client_test (void) +Options::twoway_client_test () { ACE_SSL_SOCK_Stream cli_stream; @@ -331,7 +331,7 @@ Options::twoway_client_test (void) } void -Options::run (void) +Options::run () { if (this->oneway_ == 0) this->twoway_client_test (); @@ -340,7 +340,7 @@ Options::run (void) } static int -run_client (void) +run_client () { // Raise the socket handle limit to the maximum. ACE::set_handle_limit (); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h index 5284aaa895704..80456d84a7884 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h @@ -13,10 +13,10 @@ class Options // Define the options for this test. { public: - Options (void); + Options (); // Constructor. - ~Options (void); + ~Options (); // Destructor. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -44,11 +44,11 @@ class Options const void *message_buf () const; // Returns a pointer to the message. - void run (void); + void run (); // Run the test private: - int init (void); + int init (); // Initialize the message we're sending to the user and set up the // barrier. @@ -57,10 +57,10 @@ class Options // Performs the shared behavior of the oneway and twoway client // tests. - void twoway_client_test (void); + void twoway_client_test (); // Performs the twoway test. - void oneway_client_test (void); + void oneway_client_test (); // Performs the oneway test. const ACE_TCHAR *host_; @@ -90,7 +90,6 @@ class Options char oneway_; // Are we running oneway or twoway? - }; #endif /* ACE_SSL_CLIENT_SIMPLE_H */ diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp index ffbeedbf8ebf2..cc035647927ee 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp @@ -17,7 +17,7 @@ #include "SSL-client.h" -Options::Options (void) +Options::Options () : host_ (ACE_DEFAULT_SERVER_HOST), port_ (ACE_DEFAULT_SERVER_PORT), sleep_time_ (0, 0), // By default, don't sleep between calls. @@ -34,7 +34,7 @@ Options::Options (void) ACE_OS::strcpy (quit_string_, "q"); } -Options::~Options (void) +Options::~Options () { ACE_MT (delete this->barrier_); delete [] this->message_buf_; @@ -44,7 +44,7 @@ Options::~Options (void) typedef ACE_Singleton OPTIONS; int -Options::init (void) +Options::init () { // Check for default case. if (this->message_len_ == 0) @@ -371,7 +371,7 @@ Options::twoway_client_test (void *) } ACE_THR_FUNC -Options::thr_func (void) +Options::thr_func () { if (this->oneway_ == 0) return ACE_THR_FUNC (&Options::twoway_client_test); @@ -380,7 +380,7 @@ Options::thr_func (void) } static int -run_client (void) +run_client () { // Raise the socket handle limit to the maximum. ACE::set_handle_limit (); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h index db869ac2b6ad8..57857970701e5 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h @@ -15,10 +15,10 @@ class Options { public: // Constructor. - Options (void); + Options (); // Destructor. - ~Options (void); + ~Options (); // Parse the command-line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -50,12 +50,12 @@ class Options // Returns a pointer to the entry point into the thread that runs // the client test function. - ACE_THR_FUNC thr_func (void); + ACE_THR_FUNC thr_func (); private: // Initialize the message we're sending to the user and set up the // barrier. - int init (void); + int init (); // Performs the shared behavior of the oneway and twoway client // tests. diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp index 2601dc1238924..e0a0c87b0f9fc 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp @@ -22,17 +22,17 @@ class Handler_Factory // = TITLE // Creates the oneway or twoway handlers. public: - Handler_Factory (void); + Handler_Factory (); // Constructor. - ~Handler_Factory (void); + ~Handler_Factory (); // Destructor. - int handle_events (void); + int handle_events (); // Run the main event loop. private: - int init_acceptors (void); + int init_acceptors (); // Initialize the acceptors. int create_handler (ACE_SSL_SOCK_Acceptor &acceptor, @@ -73,7 +73,6 @@ class Handler : public ACE_Svc_Handler //FUZZ: enable check_for_lack_ACE_OS protected: - Handler (ACE_SSL_SOCK_Stream *ssl_stream); // Constructor. @@ -83,14 +82,14 @@ class Handler : public ACE_Svc_Handler // methods to get the header and the buffer to read the data. // This method factors out common code. - virtual int run (void) = 0; + virtual int run () = 0; // Hook method called by the template method to do the actual // protocol. Must be overridden by the subclass. virtual int svc (); // Template method entry point into the handler task. - virtual void print_results (void); + virtual void print_results (); // Print the results. size_t total_bytes_; @@ -111,15 +110,12 @@ class Twoway_Handler : public Handler // = TITLE // Performs the twoway protocol. public: - Twoway_Handler (ACE_SSL_SOCK_Stream *ssl_stream); // Constructor. private: - - virtual int run (void); + virtual int run (); // Template Method hook called by . - }; class Oneway_Handler : public Handler @@ -130,10 +126,10 @@ class Oneway_Handler : public Handler // Constructor. private: - virtual int run (void); + virtual int run (); // Template Method hook called by . - virtual void print_results (void); + virtual void print_results (); // Print the results. }; @@ -155,11 +151,11 @@ Options::reply_message_len () const return ACE_Utils::truncate_cast (this->reply_message_len_); } -Options::~Options (void) +Options::~Options () { } -Options::Options (void) +Options::Options () : verbose_ (0), port_ (ACE_DEFAULT_SERVER_PORT), reply_message_len_ (24) // Default to the approximate size of an @@ -240,7 +236,7 @@ Handler::close (u_long) } int -Handler::svc (void) +Handler::svc () { // Timer logic. this->timer_.start (); @@ -284,7 +280,7 @@ Handler::parse_header_and_allocate_buffer (char *&request, } void -Handler::print_results (void) +Handler::print_results () { } @@ -296,7 +292,7 @@ Twoway_Handler::Twoway_Handler (ACE_SSL_SOCK_Stream* ssl_stream) // Function entry point into the twoway server task. int -Twoway_Handler::run (void) +Twoway_Handler::run () { // Read data from client (terminate on error). @@ -368,7 +364,7 @@ Oneway_Handler::Oneway_Handler (ACE_SSL_SOCK_Stream *ssl_stream) } void -Oneway_Handler::print_results (void) +Oneway_Handler::print_results () { ACE_Profile_Timer::ACE_Elapsed_Time et; this->timer_.elapsed_time (et); @@ -390,7 +386,7 @@ Oneway_Handler::print_results (void) // Function entry point into the oneway server task. int -Oneway_Handler::run (void) +Oneway_Handler::run () { // Read data from client (terminate on error). @@ -459,7 +455,7 @@ Handler_Factory::make_oneway_handler (ACE_SSL_SOCK_Stream *ssl_stream) } int -Handler_Factory::init_acceptors (void) +Handler_Factory::init_acceptors () { // Create the oneway and twoway server addresses. ACE_INET_Addr twoway_server_addr (OPTIONS::instance ()->port ()); @@ -525,11 +521,11 @@ Handler_Factory::create_handler ( #endif /* ACE_HAS_THREADS */ } -Handler_Factory::Handler_Factory (void) +Handler_Factory::Handler_Factory () { } -Handler_Factory::~Handler_Factory (void) +Handler_Factory::~Handler_Factory () { this->twoway_acceptor_.close (); this->oneway_acceptor_.close (); @@ -538,7 +534,7 @@ Handler_Factory::~Handler_Factory (void) // Run the main event loop. int -Handler_Factory::handle_events (void) +Handler_Factory::handle_events () { if (this->init_acceptors () == -1) return -1; @@ -590,7 +586,6 @@ Handler_Factory::handle_events (void) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_SSL_Context *context = ACE_SSL_Context::instance (); context->certificate ("./dummy.pem", SSL_FILETYPE_PEM); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h index 3fb64a1c7ebd2..974dc63ccdc32 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h @@ -10,10 +10,10 @@ class Options // Define the options for this test. { public: - Options (void); + Options (); // Constructor. - ~Options (void); + ~Options (); // Destructor. int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp index 74cf402d4d407..f4094eaf5cd4c 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp @@ -40,7 +40,7 @@ static struct pollfd poll_array[MAX_HANDLES]; static Buffer_Info buffer_array[MAX_HANDLES]; static void -init_poll_array (void) +init_poll_array () { int i; diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp index 4f9e645ee8389..618133a284cd0 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp @@ -4,7 +4,6 @@ #include "ace/Log_Msg.h" - #if defined (ACE_HAS_FORE_ATM_XTI) /* ACE_XTI/ATM Client */ diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp index 0f12a3f53bce5..b35ba5910ee65 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp @@ -3,7 +3,6 @@ #include "ace/Log_Msg.h" - #if defined (ACE_HAS_FORE_ATM_XTI) // ACE_TLI Server @@ -97,7 +96,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, "%p\n", "close")); - } /* NOTREACHED */ return 0; diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp index d91475470b421..6e3e63413da99 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp @@ -6,7 +6,6 @@ #include "ace/Time_Value.h" - #if defined (ACE_HAS_TLI) /* ACE_TLI Client */ diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp index f6559ae097d9c..7aa26e1ee48fd 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_TLI) // ACE_TLI Server @@ -71,7 +70,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, "%p\n", "close")); - } /* NOTREACHED */ return 0; diff --git a/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp index f656a51b249ee..de27c79613a48 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp @@ -5,7 +5,6 @@ #include "ace/Thread_Manager.h" - #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_TLI) // Global thread manager. diff --git a/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp b/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp index c5357163db387..48f11eea4b71a 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_TLI) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp index ac5a9fa34a68b..735a3f327bb5c 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp @@ -5,7 +5,6 @@ #include "ace/TLI_Acceptor.h" - #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_TLI) ACE_Thread_Manager thr_mgr; diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp b/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp index a658cb705c25e..a40faca8ed9d5 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp @@ -18,7 +18,6 @@ #include "ace/UPIPE_Connector.h" - #if defined (ACE_HAS_THREADS) // Global pattern diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp b/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp index a676f751bfcaf..f4eb783f9f8f0 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp @@ -18,7 +18,6 @@ #include "ace/OS_NS_time.h" - #if defined (ACE_HAS_THREADS) // Data for testsuite. diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp b/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp index 7f02b89b9ce9d..4e725621728a8 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_time.h" - #if defined (ACE_HAS_THREADS) // Data for testsuite. diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h index 40bc0d6becebd..23a4ba17a7136 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h @@ -46,7 +46,6 @@ class CLog_Msg_MFCApp : public CWinApp // MFC Log class for ACE_Log_Msg. To be used by ACE_DEBUG MFC_Log m_mfc_logger; - }; diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc index 43b42f64429e5..ba8c411b3259f 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- project : aceexe, ace_mfc { - avoids += wince exename = Log_Msg_MFC - Source_Files { + Source_Files { Log_Msg_MFC.cpp Log_Msg_MFCDlg.cpp MFC_Log.cpp diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp index 6528e292d4865..1e476e4bb89bf 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp @@ -103,7 +103,6 @@ BOOL CLog_Msg_MFCDlg::OnInitDialog() ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); ASSERT(IDM_ABOUTBOX < 0xF000); -#if !defined (_WIN32_WCE) CMenu* pSysMenu = GetSystemMenu(FALSE); if (pSysMenu != 0) { @@ -115,7 +114,6 @@ BOOL CLog_Msg_MFCDlg::OnInitDialog() pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu); } } -#endif /* !_WIN32_WCE */ // Set the icon for this dialog. The framework does this automatically // when the application's main window is not a dialog @@ -177,7 +175,6 @@ HCURSOR CLog_Msg_MFCDlg::OnQueryDragIcon() void CLog_Msg_MFCDlg::OnDebugButtonClicked() { ACE_DEBUG(( LM_DEBUG, "Debug message sent!\n" )); - } #endif /* ACE_WIN32 */ diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp b/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp index a7f5c56b3fa81..e72b8ca6e63a4 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp @@ -18,7 +18,6 @@ MFC_Log::MFC_Log () { - } void @@ -40,5 +39,4 @@ MFC_Log::log (ACE_Log_Record& log_record) MFC_Log::~MFC_Log () { - } diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.h b/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.h index 121839979fc67..285c3df7d77c2 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.h +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.h @@ -38,7 +38,6 @@ class MFC_Log : public virtual ACE_Log_Msg_Callback /// destructor virtual ~MFC_Log(); - }; #endif /* MFC_LOG_H */ diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp b/ACE/examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp index 367c927dfe89c..fe6cac897f652 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp @@ -5,4 +5,3 @@ #include "stdafx.h" - diff --git a/ACE/examples/Log_Msg/test_callback.cpp b/ACE/examples/Log_Msg/test_callback.cpp index 2216758203a74..5ccef91eed597 100644 --- a/ACE/examples/Log_Msg/test_callback.cpp +++ b/ACE/examples/Log_Msg/test_callback.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_stdio.h" - /** * @class Logger Subclassing from ACE_Log_Msg_Callback means that an instance of diff --git a/ACE/examples/Log_Msg/test_log_msg.cpp b/ACE/examples/Log_Msg/test_log_msg.cpp index 35b753072287d..5eb33e13d29a9 100644 --- a/ACE/examples/Log_Msg/test_log_msg.cpp +++ b/ACE/examples/Log_Msg/test_log_msg.cpp @@ -21,16 +21,15 @@ #include "ace/OS_NS_stdlib.h" - static void -cleanup (void) +cleanup () { ACE_DEBUG ((LM_INFO, "leaving (%P)!\n")); } static void -cause_error (void) +cause_error () { errno = EWOULDBLOCK; ACE_ERROR ((LM_DEBUG, diff --git a/ACE/examples/Log_Msg/test_ostream.cpp b/ACE/examples/Log_Msg/test_ostream.cpp index b8776e019cc30..ae6b9e9bd2b1e 100644 --- a/ACE/examples/Log_Msg/test_ostream.cpp +++ b/ACE/examples/Log_Msg/test_ostream.cpp @@ -19,7 +19,6 @@ #include "ace/Log_Msg.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp index 10b599142a96b..ba53e2b3af672 100644 --- a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -29,7 +29,7 @@ // Return the port number. u_short -Options::port (void) +Options::port () { return this->port_; } @@ -76,7 +76,7 @@ Logging_Acceptor; // Default constructor. -Logging_Handler::Logging_Handler (void) +Logging_Handler::Logging_Handler () { } diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.h b/ACE/examples/Logger/Acceptor-server/server_loggerd.h index 4a20bba2cb8da..46820b903eeed 100644 --- a/ACE/examples/Logger/Acceptor-server/server_loggerd.h +++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.h @@ -13,7 +13,7 @@ class Options // Keeps track of the options. public: void parse_args (int argc, ACE_TCHAR *argv[]); - u_short port (void); + u_short port (); private: u_short port_; @@ -32,7 +32,7 @@ class Logging_Handler : public ACE_Svc_Handler // utilize the timer mechanisms, as well. { public: - Logging_Handler (void); + Logging_Handler (); // = Hooks for opening and closing handlers. virtual int open (void *); diff --git a/ACE/examples/Logger/simple-server/Logging_Handler.cpp b/ACE/examples/Logger/simple-server/Logging_Handler.cpp index df4ec12799e34..8b58ade2c5cb6 100644 --- a/ACE/examples/Logger/simple-server/Logging_Handler.cpp +++ b/ACE/examples/Logger/simple-server/Logging_Handler.cpp @@ -19,7 +19,7 @@ Logging_Handler::~Logging_Handler () // Extract the underlying ACE_SOCK_Stream (e.g., for purposes of // accept()). ACE_SOCK_Stream & -Logging_Handler::peer (void) +Logging_Handler::peer () { return this->cli_stream_; } @@ -140,7 +140,7 @@ Logging_Handler::get_handle () const } int -Logging_Handler::open (void) +Logging_Handler::open () { ACE_INET_Addr addr; @@ -183,7 +183,7 @@ Logging_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) // Perform termination activities when close fails. int -Logging_Handler::close (void) +Logging_Handler::close () { return this->handle_close (); } diff --git a/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp b/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp index 3401fb675a18e..1d1167cf67363 100644 --- a/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp +++ b/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp @@ -14,12 +14,12 @@ IO_Test::IO_Test (const char *name, { } -IO_Test::~IO_Test (void) +IO_Test::~IO_Test () { } const char * -IO_Test::name (void) +IO_Test::name () { return this->name_; } diff --git a/ACE/examples/Mem_Map/IO-tests/IO_Test.h b/ACE/examples/Mem_Map/IO-tests/IO_Test.h index d179bfa1fcf73..58c541e5baf3e 100644 --- a/ACE/examples/Mem_Map/IO-tests/IO_Test.h +++ b/ACE/examples/Mem_Map/IO-tests/IO_Test.h @@ -12,16 +12,15 @@ class IO_Test { public: - // Initialize the test name IO_Test (const char *name, ACE_Profile_Timer &tm); // Destructor. - virtual ~IO_Test (void); + virtual ~IO_Test (); // Return the name of the test - const char *name (void); + const char *name (); // Execute the IO test (note this is a pure virtual function...) virtual int run_test (int iterations, diff --git a/ACE/examples/Mem_Map/IO-tests/test_io.cpp b/ACE/examples/Mem_Map/IO-tests/test_io.cpp index 65a48a0d65b04..4ddbe0931e470 100644 --- a/ACE/examples/Mem_Map/IO-tests/test_io.cpp +++ b/ACE/examples/Mem_Map/IO-tests/test_io.cpp @@ -32,7 +32,7 @@ static ACE_Profile_Timer profile_timer; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_OS::fprintf (stderr, "usage: %s" " [-i input_file] [-o output_file] [-n iteration_count] [-r]\n", diff --git a/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp b/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp index e858abad6add2..7e02c1fd31207 100644 --- a/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp +++ b/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp @@ -7,7 +7,6 @@ #include "ace/Truncate.h" - static void putline (const char *s) { diff --git a/ACE/examples/Misc/test_dump.cpp b/ACE/examples/Misc/test_dump.cpp index 291693a38fe96..9b8757f996380 100644 --- a/ACE/examples/Misc/test_dump.cpp +++ b/ACE/examples/Misc/test_dump.cpp @@ -9,7 +9,6 @@ #include "ace/Reactor.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Misc/test_dump.h b/ACE/examples/Misc/test_dump.h index bd7bb5ff9e355..6d4a3a5c6c820 100644 --- a/ACE/examples/Misc/test_dump.h +++ b/ACE/examples/Misc/test_dump.h @@ -10,8 +10,8 @@ class SOCK { public: - SOCK (void) { ACE_REGISTER_OBJECT (SOCK); } - ~SOCK (void) { ACE_REMOVE_OBJECT; } + SOCK () { ACE_REGISTER_OBJECT (SOCK); } + ~SOCK () { ACE_REMOVE_OBJECT; } void dump () const { ACE_DEBUG ((LM_DEBUG, "hello from SOCK = %@\n", this)); @@ -23,8 +23,8 @@ class SOCK class SOCK_Acceptor : public SOCK { public: - SOCK_Acceptor (void) { ACE_REGISTER_OBJECT (SOCK_Acceptor); } - ~SOCK_Acceptor (void) { ACE_REMOVE_OBJECT; } + SOCK_Acceptor () { ACE_REGISTER_OBJECT (SOCK_Acceptor); } + ~SOCK_Acceptor () { ACE_REMOVE_OBJECT; } void dump () const { ACE_DEBUG ((LM_DEBUG, "hello from SOCK_Acceptor = %@\n", this)); @@ -36,8 +36,8 @@ class SOCK_Acceptor : public SOCK class SOCK_Stream : public SOCK { public: - SOCK_Stream (void) { ACE_REGISTER_OBJECT (SOCK_Stream); } - ~SOCK_Stream (void) { ACE_REMOVE_OBJECT; } + SOCK_Stream () { ACE_REGISTER_OBJECT (SOCK_Stream); } + ~SOCK_Stream () { ACE_REMOVE_OBJECT; } void dump () const { ACE_DEBUG ((LM_DEBUG, "hello from SOCK_Stream = %@\n", this)); diff --git a/ACE/examples/Misc/test_get_opt.cpp b/ACE/examples/Misc/test_get_opt.cpp index 261ff47a13afd..5c35ad26ff225 100644 --- a/ACE/examples/Misc/test_get_opt.cpp +++ b/ACE/examples/Misc/test_get_opt.cpp @@ -5,7 +5,6 @@ #include "ace/Log_Msg.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/examples/Misc/test_profile_timer.cpp b/ACE/examples/Misc/test_profile_timer.cpp index 9143ab0652c88..042053f45d8f2 100644 --- a/ACE/examples/Misc/test_profile_timer.cpp +++ b/ACE/examples/Misc/test_profile_timer.cpp @@ -5,7 +5,6 @@ #include "ace/OS_NS_unistd.h" - static const int DEFAULT_ITERATIONS = 100000000; int diff --git a/ACE/examples/Misc/test_sstring.cpp b/ACE/examples/Misc/test_sstring.cpp index 8243ef7148294..a76a7758eb8d8 100644 --- a/ACE/examples/Misc/test_sstring.cpp +++ b/ACE/examples/Misc/test_sstring.cpp @@ -3,7 +3,6 @@ #include "ace/Log_Msg.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Misc/test_timestamp.cpp b/ACE/examples/Misc/test_timestamp.cpp index 8d1eb5249b59b..a0d3d6246dc1a 100644 --- a/ACE/examples/Misc/test_timestamp.cpp +++ b/ACE/examples/Misc/test_timestamp.cpp @@ -5,7 +5,6 @@ #include "ace/Log_Msg.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Misc/test_trace.cpp b/ACE/examples/Misc/test_trace.cpp index 13770d82a1c7d..32f062d5d8587 100644 --- a/ACE/examples/Misc/test_trace.cpp +++ b/ACE/examples/Misc/test_trace.cpp @@ -47,7 +47,7 @@ class My_Task : public ACE_Task_Base int recursive (size_t depth); - virtual int svc (void) + virtual int svc () { return this->recursive (this->depth_); } @@ -71,9 +71,9 @@ My_Task::recursive (size_t depth) extern "C" void -exithook (void) +exithook () { - ACE_TRACE ("void exithook (void)"); + ACE_TRACE ("void exithook ()"); ACE_DEBUG ((LM_DEBUG, "we're outta here!\n")); diff --git a/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp b/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp index d26d2418051e4..60e7eca8ba56f 100644 --- a/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp +++ b/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp @@ -14,7 +14,7 @@ using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control; class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/Monitor/CPU_Load/cpu_load.cpp b/ACE/examples/Monitor/CPU_Load/cpu_load.cpp index 5df97778106d6..4fe244f651db5 100644 --- a/ACE/examples/Monitor/CPU_Load/cpu_load.cpp +++ b/ACE/examples/Monitor/CPU_Load/cpu_load.cpp @@ -12,7 +12,7 @@ class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/Monitor/Constraint/constraint.cpp b/ACE/examples/Monitor/Constraint/constraint.cpp index ae05c8b852a1d..a85aa9c70cd81 100644 --- a/ACE/examples/Monitor/Constraint/constraint.cpp +++ b/ACE/examples/Monitor/Constraint/constraint.cpp @@ -34,7 +34,7 @@ class Trigger16k : public Control_Action class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/Monitor/Group/group.cpp b/ACE/examples/Monitor/Group/group.cpp index 6de5850b05491..30e6c309d25c1 100644 --- a/ACE/examples/Monitor/Group/group.cpp +++ b/ACE/examples/Monitor/Group/group.cpp @@ -17,7 +17,7 @@ using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control; class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/Monitor/MC_Test_Utilities.cpp b/ACE/examples/Monitor/MC_Test_Utilities.cpp index a49f8ad4f24d4..d6daa81d20e33 100644 --- a/ACE/examples/Monitor/MC_Test_Utilities.cpp +++ b/ACE/examples/Monitor/MC_Test_Utilities.cpp @@ -98,4 +98,3 @@ MC_Test_Utilities::display_packets_received ( #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ - diff --git a/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp b/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp index 7d335a3863145..c46b7d77b9a31 100644 --- a/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp +++ b/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp @@ -12,7 +12,7 @@ class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp b/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp index de57420f0b7b7..7f4606c22565b 100644 --- a/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp +++ b/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp @@ -20,7 +20,7 @@ class Monitor_Checker : public ACE_Task_Base { } - int svc (void) + int svc () { /// Reconstruct the monitor's unique name using the queue's hex address. const int nibbles = 2 * sizeof (ptrdiff_t); diff --git a/ACE/examples/Monitor/Num_Threads/num_threads.cpp b/ACE/examples/Monitor/Num_Threads/num_threads.cpp index 5bc46daec4f56..a9b829de9bcd9 100644 --- a/ACE/examples/Monitor/Num_Threads/num_threads.cpp +++ b/ACE/examples/Monitor/Num_Threads/num_threads.cpp @@ -9,7 +9,7 @@ class Worker : public ACE_Task_Base { public: - int svc (void) + int svc () { ACE_OS::sleep (5); return 0; @@ -22,7 +22,7 @@ class Worker : public ACE_Task_Base class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/NT_Service/NT_Service.mpc b/ACE/examples/NT_Service/NT_Service.mpc index 7652262184798..756d056254807 100644 --- a/ACE/examples/NT_Service/NT_Service.mpc +++ b/ACE/examples/NT_Service/NT_Service.mpc @@ -1,5 +1,4 @@ // -*- MPC -*- project : aceexe, winregistry { - avoids += wince exename = main } diff --git a/ACE/examples/NT_Service/main.cpp b/ACE/examples/NT_Service/main.cpp index b895d94c88863..fd3a982bc6834 100644 --- a/ACE/examples/NT_Service/main.cpp +++ b/ACE/examples/NT_Service/main.cpp @@ -27,15 +27,15 @@ class Process { public: - Process (void); - ~Process (void); + Process (); + ~Process (); int run(int argc, ACE_TCHAR* argv[]); private: void parse_args (int argc, ACE_TCHAR* argv[]); - void print_usage_and_die (void); + void print_usage_and_die (); private: char progname[128]; @@ -52,7 +52,7 @@ class Process typedef ACE_Singleton PROCESS; -Process::Process (void) +Process::Process () : opt_install (0), opt_remove (0), opt_start (0), @@ -66,13 +66,13 @@ Process::Process (void) ACE::init (); } -Process::~Process (void) +Process::~Process () { ACE::fini (); } void -Process::print_usage_and_die (void) +Process::print_usage_and_die () { ACE_DEBUG ((LM_INFO, "Usage: %s" diff --git a/ACE/examples/NT_Service/ntsvc.cpp b/ACE/examples/NT_Service/ntsvc.cpp index 2f1b224579804..451bf5e303fd2 100644 --- a/ACE/examples/NT_Service/ntsvc.cpp +++ b/ACE/examples/NT_Service/ntsvc.cpp @@ -16,13 +16,13 @@ #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) -Service::Service (void) +Service::Service () { // Remember the Reactor instance. reactor (ACE_Reactor::instance ()); } -Service::~Service (void) +Service::~Service () { if (ACE_Reactor::instance ()->cancel_timer(this) == -1) ACE_ERROR ((LM_ERROR, @@ -78,7 +78,7 @@ Service::handle_timeout (const ACE_Time_Value &tv, // request is received. int -Service::svc (void) +Service::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Service::svc\n"))); diff --git a/ACE/examples/NT_Service/ntsvc.h b/ACE/examples/NT_Service/ntsvc.h index 02d212adbd3ad..a7826d301ec22 100644 --- a/ACE/examples/NT_Service/ntsvc.h +++ b/ACE/examples/NT_Service/ntsvc.h @@ -27,9 +27,9 @@ class Service : public ACE_NT_Service { public: - Service (void); + Service (); - ~Service (void); + ~Service (); /// We override because it handles stop requests /// privately. diff --git a/ACE/examples/Naming/test_non_existent.cpp b/ACE/examples/Naming/test_non_existent.cpp index a5b5a92647a0f..03516654670e2 100644 --- a/ACE/examples/Naming/test_non_existent.cpp +++ b/ACE/examples/Naming/test_non_existent.cpp @@ -3,7 +3,6 @@ #include "ace/Log_Msg.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { int i; diff --git a/ACE/examples/Naming/test_open.cpp b/ACE/examples/Naming/test_open.cpp index abf9f393670c2..cdaf3323ca445 100644 --- a/ACE/examples/Naming/test_open.cpp +++ b/ACE/examples/Naming/test_open.cpp @@ -66,7 +66,6 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) if (i != 0) return -1; - } result = ns.close (); diff --git a/ACE/examples/Naming/test_writers.cpp b/ACE/examples/Naming/test_writers.cpp index 16a5b0997cc95..83a4f4fc93a1f 100644 --- a/ACE/examples/Naming/test_writers.cpp +++ b/ACE/examples/Naming/test_writers.cpp @@ -65,7 +65,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) if (i != 0) return -1; - } } return 0; diff --git a/ACE/examples/OS/Process/OS_Process.mpc b/ACE/examples/OS/Process/OS_Process.mpc index a6cffe933376b..3b23928c3adaa 100644 --- a/ACE/examples/OS/Process/OS_Process.mpc +++ b/ACE/examples/OS/Process/OS_Process.mpc @@ -6,7 +6,6 @@ project(*imore) : aceexe, avoids_ace_for_tao { } } project(*process) : aceexe { - avoids += wince exename = process Source_Files { process.cpp diff --git a/ACE/examples/OS/Process/imore.cpp b/ACE/examples/OS/Process/imore.cpp index 827e7ec4ccb17..bee6f5cd3f6cd 100644 --- a/ACE/examples/OS/Process/imore.cpp +++ b/ACE/examples/OS/Process/imore.cpp @@ -29,7 +29,6 @@ #include "ace/Signal.h" - #if defined (ACE_WIN32) static const ACE_TCHAR *executable = ACE_TEXT("MORE.COM"); #else @@ -42,7 +41,7 @@ static ACE_TCHAR *fname = 0; // File you want to view. static int use_named_pipe = 0; // Do we want to use named pipe? static void -usage (void) +usage () { ACE_ERROR ((LM_ERROR, "Usage: imore [-n|-u] \n" "\t-n Use named pipe.\n" @@ -241,7 +240,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "Error, bailing out!\n"), -1); } - options.command_line (executable); + options.command_line (ACE_TEXT("%") ACE_TEXT_PRIs, executable); if (new_process.spawn (options) == -1) { int const error_number = ACE_OS::last_error (); @@ -261,7 +260,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // if your child process don't need to interact with the terminal, // we can use the exact code for Unixes on NT. ACE_Process_Options options; - options.command_line (executable); + options.command_line (ACE_TEXT("%") ACE_TEXT_PRIs, executable); options.set_handles (infile); if (new_process.spawn (options) == -1) { diff --git a/ACE/examples/OS/Process/process.cpp b/ACE/examples/OS/Process/process.cpp index 17e27597fa441..f0d31e5babd72 100644 --- a/ACE/examples/OS/Process/process.cpp +++ b/ACE/examples/OS/Process/process.cpp @@ -26,7 +26,6 @@ #include "ace/Tokenizer_T.h" - #if defined (ACE_WIN32) #define EXEC_NAME ACE_TEXT ("MORE.COM") const ACE_TCHAR *DATE_PATH = ACE_TEXT ("date.exe"); @@ -113,7 +112,7 @@ parse_args (int argc, ACE_TCHAR **argv) // This shows how to set handles. static void -test_more (void) +test_more () { ACE_HANDLE infile = ACE_OS::open (print_file, O_RDONLY); @@ -125,7 +124,7 @@ test_more (void) ACE_Process new_process; ACE_Process_Options options; - options.command_line (executable); + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs, executable); options.set_handles (infile); if (new_process.spawn (options) == -1) @@ -151,10 +150,10 @@ test_more (void) // This is a simple usage of ACE_Process. static void -test_date (void) +test_date () { ACE_Process_Options options; - options.command_line (DATE_PATH); + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs, DATE_PATH); // Try to create a new process running date. ACE_Process new_process; @@ -178,14 +177,10 @@ test_date (void) } static void -test_ls (void) +test_ls () { ACE_Process_Options options; -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - options.command_line (ACE_TEXT ("%s -al"), LS_PATH); -#else - options.command_line (ACE_TEXT ("%ls -al"), LS_PATH); -#endif + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -al"), LS_PATH); ACE_Process new_process; if (new_process.spawn (options) == -1) { @@ -204,14 +199,10 @@ test_ls (void) } static void -test_wait (void) +test_wait () { ACE_Process_Options options; -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - options.command_line (ACE_TEXT ("%s 10"), SLEEP_PATH); -#else - options.command_line (ACE_TEXT ("%ls 10"), SLEEP_PATH); -#endif + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" 10"), SLEEP_PATH); ACE_Process process1; if (process1.spawn (options) == -1) { @@ -284,7 +275,7 @@ test_wait (void) // This is just to test the direct usage of CreateProcess. I use this // occasionally as a sanity check when ACE_Process breaks. static void -win32_test_ls (void) +win32_test_ls () { PROCESS_INFORMATION process_info; ACE_TEXT_STARTUPINFO startup_info; @@ -347,7 +338,7 @@ win32_test_ls (void) // environment variables. static void -win32_spawn_environment_process (void) +win32_spawn_environment_process () { PROCESS_INFORMATION process_info; ACE_TEXT_STARTUPINFO startup_info; @@ -466,11 +457,7 @@ test_setenv (const ACE_TCHAR *argv0) options.setenv (ACE_TEXT ("ACE_PROCESS_TEST= here's a large number %u"), 0 - 1); options.setenv (ACE_TEXT ("ACE_PROCESS_TEST2"), ACE_TEXT ("ophilli")); -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - options.command_line ("%s -g", argv0); -#else - options.command_line ("%ls -g", argv0); -#endif + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -g"), argv0); ACE_Process process; if (process.spawn (options) == -1) { @@ -522,13 +509,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (run_all) { -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - const ACE_TCHAR *cmdline = ACE_TEXT ("%s -d -l -s -w"); -#else - const ACE_TCHAR *cmdline = ACE_TEXT ("%ls -d -l -s -w"); -#endif ACE_Process_Options options; - options.command_line (cmdline, argv[0]); + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -d -l -s -w"), argv[0]); ACE_Process process; if (process.spawn (options) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp index c3f9e587b95d7..09b2ac532564a 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp @@ -2,10 +2,9 @@ #include "Fill_ACE_QoS.h" - const iovec Fill_ACE_QoS::iov_ = {0,0}; -Fill_ACE_QoS::Fill_ACE_QoS (void) +Fill_ACE_QoS::Fill_ACE_QoS () { ACE_NEW (this->default_traffic_, ACE_Flow_Spec (ACE_QOS_NOT_SPECIFIED, @@ -21,7 +20,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void) } // destructor. -Fill_ACE_QoS::~Fill_ACE_QoS (void) +Fill_ACE_QoS::~Fill_ACE_QoS () {} int @@ -90,7 +89,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos, } Fill_ACE_QoS::FLOW_SPEC_HASH_MAP& -Fill_ACE_QoS::map (void) +Fill_ACE_QoS::map () { return this->flow_spec_map_; } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h index dda1fe34d3f5c..a454c04915390 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h @@ -28,16 +28,15 @@ */ class Fill_ACE_QoS { - public: typedef ACE_Hash_Map_Manager FLOW_SPEC_HASH_MAP; //Initialization and termination methods. /// constructor. - Fill_ACE_QoS (void); + Fill_ACE_QoS (); /// destructor. - ~Fill_ACE_QoS (void); + ~Fill_ACE_QoS (); /// To be used by receivers. Fills the receiver qos and sets the /// sender qos to NO_TRAFFIC. @@ -56,10 +55,9 @@ class Fill_ACE_QoS const ACE_CString &send_flow_name); /// Returns the hash map of flowspecs indexed by flowspec name. - FLOW_SPEC_HASH_MAP& map (void); + FLOW_SPEC_HASH_MAP& map (); private: - // The Service Provider is currently set to NULL for all ACE_QoS. static const iovec iov_; diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp index 8a21d050fe0a5..38a09ac0b2ef0 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp @@ -3,7 +3,6 @@ #include "QoS_Signal_Handler.h" - // constructor. QoS_Signal_Handler::QoS_Signal_Handler (ACE_QoS_Session *qos_session) : qos_session_ (qos_session) diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp index e8ae923d6424e..551e3fe380c88 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_strings.h" - // constructor. QoS_Util::QoS_Util (int argc, ACE_TCHAR *argv[]) @@ -25,14 +24,14 @@ QoS_Util::QoS_Util (int argc, } // destructor. -QoS_Util::~QoS_Util (void) +QoS_Util::~QoS_Util () { delete this->mult_session_addr_; delete this->dest_addr_; } int -QoS_Util::parse_args (void) +QoS_Util::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); int c = 0; diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h index 3c9716d63cddd..4c69c80de3f05 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h @@ -23,17 +23,15 @@ */ class QoS_Util { - public: - // constructor. QoS_Util (int argc, ACE_TCHAR *argv[]); // destructor. - ~QoS_Util (void); + ~QoS_Util (); // Parse command-line arguments. - int parse_args (void); + int parse_args (); // GET methods. ACE_INET_Addr *mult_session_addr () const; @@ -47,7 +45,6 @@ class QoS_Util int multicast_flag () const; private: - // Command line arguments. int argc_; ACE_TCHAR **argv_; @@ -66,7 +63,6 @@ class QoS_Util // Multicast Flag. int multicast_flag_; - }; #endif /* QOS_UTIL_H */ diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/README b/ACE/examples/QOS/Change_Receiver_FlowSpec/README index 7fab042dd1919..5f1c66344dcaf 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/README +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/README @@ -6,7 +6,7 @@ A Regression test for ACE QoS features. This test implements a simple Receiver-Sender program that ensures Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The -test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. +test works for Winsock2 APIs on Win2K. In addition it dynamically changes the receiver flow spec which in turn changes the RESV messages sent. diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp index f20d0937f8776..95cfd81bafa3c 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp @@ -15,7 +15,7 @@ #include "Fill_ACE_QoS.h" // Constructor. -Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler () { } @@ -28,7 +28,7 @@ Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mca } // Destructor. -Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler () { } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h index b6a31e43eada1..7bb5f8301e2e8 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h @@ -22,14 +22,14 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Receiver_QoS_Event_Handler (void); + Receiver_QoS_Event_Handler (); /// Constructor. Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Receiver_QoS_Event_Handler (void); + ~Receiver_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. @@ -50,4 +50,3 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler #endif /* RECEIVER_QOS_EVENT_HANDLER_H */ - diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp index 1eab340fd8218..af8eab0cc77ef 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp @@ -15,7 +15,7 @@ #include "Fill_ACE_QoS.h" // Constructor. -Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::Sender_QoS_Event_Handler () { } @@ -29,7 +29,7 @@ Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_Q } // Destructor. -Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler () { } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h index 5d04e7ed862f3..55896d2c54a3b 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h @@ -25,14 +25,14 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Sender_QoS_Event_Handler (void); + Sender_QoS_Event_Handler (); /// Constructor. Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Sender_QoS_Event_Handler (void); + ~Sender_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. @@ -43,7 +43,6 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler virtual int handle_qos (ACE_HANDLE fd); private: - ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos_; ACE_QoS_Session *qos_session_; }; diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp index 6edc97b6d4a5e..db6cb5986cbc9 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp @@ -52,7 +52,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - QoS_Util qos_util(argc, argv); if (qos_util.parse_args () == -1) @@ -292,4 +291,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) } - diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp index 4da83d1ab657a..67e6ea972cf7a 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp @@ -9,7 +9,6 @@ //============================================================================= - #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Session_Impl.h" @@ -50,7 +49,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - ACE_DEBUG ((LM_DEBUG, "Sender\n")); @@ -287,7 +285,6 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - // Start the event loop. ACE_DEBUG ((LM_DEBUG, "Running the Event Loop ...\n")); @@ -307,5 +304,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - - diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp index c3f9e587b95d7..09b2ac532564a 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp @@ -2,10 +2,9 @@ #include "Fill_ACE_QoS.h" - const iovec Fill_ACE_QoS::iov_ = {0,0}; -Fill_ACE_QoS::Fill_ACE_QoS (void) +Fill_ACE_QoS::Fill_ACE_QoS () { ACE_NEW (this->default_traffic_, ACE_Flow_Spec (ACE_QOS_NOT_SPECIFIED, @@ -21,7 +20,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void) } // destructor. -Fill_ACE_QoS::~Fill_ACE_QoS (void) +Fill_ACE_QoS::~Fill_ACE_QoS () {} int @@ -90,7 +89,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos, } Fill_ACE_QoS::FLOW_SPEC_HASH_MAP& -Fill_ACE_QoS::map (void) +Fill_ACE_QoS::map () { return this->flow_spec_map_; } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h index f8f650c5212ff..e47fba10de0c2 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h @@ -27,16 +27,15 @@ */ class Fill_ACE_QoS { - public: typedef ACE_Hash_Map_Manager FLOW_SPEC_HASH_MAP; //Initialization and termination methods. /// constructor. - Fill_ACE_QoS (void); + Fill_ACE_QoS (); /// destructor. - ~Fill_ACE_QoS (void); + ~Fill_ACE_QoS (); /// To be used by receivers. Fills the receiver qos and sets the /// sender qos to NO_TRAFFIC. @@ -55,10 +54,9 @@ class Fill_ACE_QoS const ACE_CString &send_flow_name); /// Returns the hash map of flowspecs indexed by flowspec name. - FLOW_SPEC_HASH_MAP& map (void); + FLOW_SPEC_HASH_MAP& map (); private: - // The Service Provider is currently set to NULL for all ACE_QoS. static const iovec iov_; diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp index e8ae923d6424e..551e3fe380c88 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_strings.h" - // constructor. QoS_Util::QoS_Util (int argc, ACE_TCHAR *argv[]) @@ -25,14 +24,14 @@ QoS_Util::QoS_Util (int argc, } // destructor. -QoS_Util::~QoS_Util (void) +QoS_Util::~QoS_Util () { delete this->mult_session_addr_; delete this->dest_addr_; } int -QoS_Util::parse_args (void) +QoS_Util::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); int c = 0; diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h index 3c9716d63cddd..4c69c80de3f05 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h @@ -23,17 +23,15 @@ */ class QoS_Util { - public: - // constructor. QoS_Util (int argc, ACE_TCHAR *argv[]); // destructor. - ~QoS_Util (void); + ~QoS_Util (); // Parse command-line arguments. - int parse_args (void); + int parse_args (); // GET methods. ACE_INET_Addr *mult_session_addr () const; @@ -47,7 +45,6 @@ class QoS_Util int multicast_flag () const; private: - // Command line arguments. int argc_; ACE_TCHAR **argv_; @@ -66,7 +63,6 @@ class QoS_Util // Multicast Flag. int multicast_flag_; - }; #endif /* QOS_UTIL_H */ diff --git a/ACE/examples/QOS/Change_Sender_TSpec/README b/ACE/examples/QOS/Change_Sender_TSpec/README index 6b24dcc704b5b..34238f4fec4a8 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/README +++ b/ACE/examples/QOS/Change_Sender_TSpec/README @@ -6,7 +6,7 @@ A Regression test for ACE QoS features. This test implements a simple Receiver-Sender program that ensures Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The -test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. +test works for Winsock2 APIs on Win2K. In addition it dynamically changes the sender TSpec which in turn changes the PATH messages. diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp index 1a4d08b08ea1b..37443f87ea518 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp @@ -15,7 +15,7 @@ #include "Fill_ACE_QoS.h" // Constructor. -Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler () { } @@ -28,7 +28,7 @@ Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mca } // Destructor. -Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler () { } @@ -130,11 +130,9 @@ Receiver_QoS_Event_Handler::handle_qos (ACE_HANDLE fd) return 0; - } - diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h index b6a31e43eada1..7bb5f8301e2e8 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h @@ -22,14 +22,14 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Receiver_QoS_Event_Handler (void); + Receiver_QoS_Event_Handler (); /// Constructor. Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Receiver_QoS_Event_Handler (void); + ~Receiver_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. @@ -50,4 +50,3 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler #endif /* RECEIVER_QOS_EVENT_HANDLER_H */ - diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp index f98eed6ab354d..cc6f03acf2d39 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp @@ -15,7 +15,7 @@ #include "Fill_ACE_QoS.h" // Constructor. -Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::Sender_QoS_Event_Handler () { } @@ -29,7 +29,7 @@ Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_Q } // Destructor. -Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler () { } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h index 5d04e7ed862f3..55896d2c54a3b 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h @@ -25,14 +25,14 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Sender_QoS_Event_Handler (void); + Sender_QoS_Event_Handler (); /// Constructor. Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Sender_QoS_Event_Handler (void); + ~Sender_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. @@ -43,7 +43,6 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler virtual int handle_qos (ACE_HANDLE fd); private: - ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos_; ACE_QoS_Session *qos_session_; }; diff --git a/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp b/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp index 36fb26fdf2286..ae29ab7705669 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp @@ -52,7 +52,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - QoS_Util qos_util(argc, argv); if (qos_util.parse_args () == -1) @@ -311,4 +310,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) } - diff --git a/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp b/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp index 2f2a2d2856d5f..2654e16535a69 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp @@ -9,7 +9,6 @@ //============================================================================= - #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Session_Impl.h" @@ -50,7 +49,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - ACE_DEBUG ((LM_DEBUG, "Sender\n")); @@ -304,5 +302,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - - diff --git a/ACE/examples/QOS/Diffserv/NOTES.txt b/ACE/examples/QOS/Diffserv/NOTES.txt index 6009e2fed597a..4f88b9e1762f2 100644 --- a/ACE/examples/QOS/Diffserv/NOTES.txt +++ b/ACE/examples/QOS/Diffserv/NOTES.txt @@ -49,9 +49,3 @@ However, FreeBSD seems to be more fussy about the size of the parameter you pass into the setsockopt call. Make sure you get the size right, and cast it properly, ie. don't cast a short, or some other size. - - -Solaris notes -============= -No problems setting DSCP or ECN values. - diff --git a/ACE/examples/QOS/Diffserv/diffserv_test.cpp b/ACE/examples/QOS/Diffserv/diffserv_test.cpp index 595a384a1fbd0..83c4e8eaa401e 100644 --- a/ACE/examples/QOS/Diffserv/diffserv_test.cpp +++ b/ACE/examples/QOS/Diffserv/diffserv_test.cpp @@ -95,7 +95,6 @@ const char *dscp_char[]= int ACE_TMAIN (int argc , ACE_TCHAR *argv[]) { - if(argc != 3) { ACE_DEBUG((LM_DEBUG, "Usage:\n %s [destination host] [destination port]\n\n", argv[0])); diff --git a/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp index c3f9e587b95d7..09b2ac532564a 100644 --- a/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp @@ -2,10 +2,9 @@ #include "Fill_ACE_QoS.h" - const iovec Fill_ACE_QoS::iov_ = {0,0}; -Fill_ACE_QoS::Fill_ACE_QoS (void) +Fill_ACE_QoS::Fill_ACE_QoS () { ACE_NEW (this->default_traffic_, ACE_Flow_Spec (ACE_QOS_NOT_SPECIFIED, @@ -21,7 +20,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void) } // destructor. -Fill_ACE_QoS::~Fill_ACE_QoS (void) +Fill_ACE_QoS::~Fill_ACE_QoS () {} int @@ -90,7 +89,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos, } Fill_ACE_QoS::FLOW_SPEC_HASH_MAP& -Fill_ACE_QoS::map (void) +Fill_ACE_QoS::map () { return this->flow_spec_map_; } diff --git a/ACE/examples/QOS/Simple/Fill_ACE_QoS.h b/ACE/examples/QOS/Simple/Fill_ACE_QoS.h index 8873f3852ec9c..0dcb1a16a43b6 100644 --- a/ACE/examples/QOS/Simple/Fill_ACE_QoS.h +++ b/ACE/examples/QOS/Simple/Fill_ACE_QoS.h @@ -27,16 +27,15 @@ */ class Fill_ACE_QoS { - public: typedef ACE_Hash_Map_Manager FLOW_SPEC_HASH_MAP; //Initialization and termination methods. /// constructor. - Fill_ACE_QoS (void); + Fill_ACE_QoS (); /// destructor. - ~Fill_ACE_QoS (void); + ~Fill_ACE_QoS (); /// To be used by receivers. Fills the receiver qos and sets the /// sender qos to NO_TRAFFIC. @@ -55,10 +54,9 @@ class Fill_ACE_QoS const ACE_CString &send_flow_name); /// Returns the hash map of flowspecs indexed by flowspec name. - FLOW_SPEC_HASH_MAP& map (void); + FLOW_SPEC_HASH_MAP& map (); private: - // The Service Provider is currently set to NULL for all ACE_QoS. static const iovec iov_; diff --git a/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp b/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp index 77937f484b305..40201e0e0917c 100644 --- a/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp +++ b/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp @@ -3,7 +3,6 @@ #include "QoS_Signal_Handler.h" - // constructor. QoS_Signal_Handler::QoS_Signal_Handler (ACE_QoS_Session *qos_session) : qos_session_ (qos_session) @@ -14,7 +13,6 @@ QoS_Signal_Handler::QoS_Signal_Handler (ACE_QoS_Session *qos_session) int QoS_Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*) { - ACE_DEBUG ((LM_DEBUG, "QoS_Signal_Handler::handle_signal\n")); diff --git a/ACE/examples/QOS/Simple/QoS_Util.cpp b/ACE/examples/QOS/Simple/QoS_Util.cpp index e8ae923d6424e..551e3fe380c88 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.cpp +++ b/ACE/examples/QOS/Simple/QoS_Util.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_strings.h" - // constructor. QoS_Util::QoS_Util (int argc, ACE_TCHAR *argv[]) @@ -25,14 +24,14 @@ QoS_Util::QoS_Util (int argc, } // destructor. -QoS_Util::~QoS_Util (void) +QoS_Util::~QoS_Util () { delete this->mult_session_addr_; delete this->dest_addr_; } int -QoS_Util::parse_args (void) +QoS_Util::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); int c = 0; diff --git a/ACE/examples/QOS/Simple/QoS_Util.h b/ACE/examples/QOS/Simple/QoS_Util.h index 3c9716d63cddd..4c69c80de3f05 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.h +++ b/ACE/examples/QOS/Simple/QoS_Util.h @@ -23,17 +23,15 @@ */ class QoS_Util { - public: - // constructor. QoS_Util (int argc, ACE_TCHAR *argv[]); // destructor. - ~QoS_Util (void); + ~QoS_Util (); // Parse command-line arguments. - int parse_args (void); + int parse_args (); // GET methods. ACE_INET_Addr *mult_session_addr () const; @@ -47,7 +45,6 @@ class QoS_Util int multicast_flag () const; private: - // Command line arguments. int argc_; ACE_TCHAR **argv_; @@ -66,7 +63,6 @@ class QoS_Util // Multicast Flag. int multicast_flag_; - }; #endif /* QOS_UTIL_H */ diff --git a/ACE/examples/QOS/Simple/README b/ACE/examples/QOS/Simple/README index 39aa2fa3abd6b..5744f0c8099ba 100644 --- a/ACE/examples/QOS/Simple/README +++ b/ACE/examples/QOS/Simple/README @@ -6,7 +6,7 @@ A Regression test for ACE QoS features. This test implements a simple Receiver-Sender program that ensures Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The -test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. +test works for Winsock2 APIs on Win2K. ------------------------------------------------------------------------ diff --git a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp index c253dc283818b..0b93ac300c33b 100644 --- a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp @@ -14,7 +14,7 @@ #include "ace/OS_NS_string.h" // Constructor. -Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler () { } @@ -27,7 +27,7 @@ Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mca } // Destructor. -Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler () { } @@ -128,5 +128,4 @@ Receiver_QoS_Event_Handler::handle_qos (ACE_HANDLE fd) ace_get_qos.sending_flowspec ()->minimum_policed_size ())); return 0; - } diff --git a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h index b6a31e43eada1..7bb5f8301e2e8 100644 --- a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h @@ -22,14 +22,14 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Receiver_QoS_Event_Handler (void); + Receiver_QoS_Event_Handler (); /// Constructor. Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Receiver_QoS_Event_Handler (void); + ~Receiver_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. @@ -50,4 +50,3 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler #endif /* RECEIVER_QOS_EVENT_HANDLER_H */ - diff --git a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp index a259a2a04e0e5..f220353364f55 100644 --- a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp @@ -15,7 +15,7 @@ #include "ace/OS_NS_string.h" // Constructor. -Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::Sender_QoS_Event_Handler () { } @@ -29,7 +29,7 @@ Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_Q } // Destructor. -Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler () { } diff --git a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h index 5d04e7ed862f3..55896d2c54a3b 100644 --- a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h @@ -25,14 +25,14 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Sender_QoS_Event_Handler (void); + Sender_QoS_Event_Handler (); /// Constructor. Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Sender_QoS_Event_Handler (void); + ~Sender_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. @@ -43,7 +43,6 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler virtual int handle_qos (ACE_HANDLE fd); private: - ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos_; ACE_QoS_Session *qos_session_; }; diff --git a/ACE/examples/QOS/Simple/receiver.cpp b/ACE/examples/QOS/Simple/receiver.cpp index 0e4c2865df69f..47623ba50e23d 100644 --- a/ACE/examples/QOS/Simple/receiver.cpp +++ b/ACE/examples/QOS/Simple/receiver.cpp @@ -52,7 +52,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - QoS_Util qos_util(argc, argv); if (qos_util.parse_args () == -1) @@ -293,4 +292,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) } - diff --git a/ACE/examples/QOS/Simple/sender.cpp b/ACE/examples/QOS/Simple/sender.cpp index 44443955faf2b..8a3fa9f114c1a 100644 --- a/ACE/examples/QOS/Simple/sender.cpp +++ b/ACE/examples/QOS/Simple/sender.cpp @@ -9,7 +9,6 @@ //============================================================================= - #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Session_Impl.h" @@ -50,7 +49,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - ACE_DEBUG ((LM_DEBUG, "Sender\n")); @@ -286,7 +284,6 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) -1); - // Start the event loop. ACE_DEBUG ((LM_DEBUG, "Running the Event Loop ...\n")); @@ -306,5 +303,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - - diff --git a/ACE/examples/Reactor/Dgram/CODgram.cpp b/ACE/examples/Reactor/Dgram/CODgram.cpp index 2b531e2c3dd71..f8671b31e993a 100644 --- a/ACE/examples/Reactor/Dgram/CODgram.cpp +++ b/ACE/examples/Reactor/Dgram/CODgram.cpp @@ -33,7 +33,6 @@ #include "ace/Log_Msg.h" - // Port used to receive for dgrams. static u_short port1; diff --git a/ACE/examples/Reactor/Dgram/Dgram.cpp b/ACE/examples/Reactor/Dgram/Dgram.cpp index 04944fc5704d3..0c2920df69a1d 100644 --- a/ACE/examples/Reactor/Dgram/Dgram.cpp +++ b/ACE/examples/Reactor/Dgram/Dgram.cpp @@ -32,7 +32,6 @@ #include "ace/Log_Msg.h" - // Port used to receive for dgrams. static u_short port1; diff --git a/ACE/examples/Reactor/FIFO/client.cpp b/ACE/examples/Reactor/FIFO/client.cpp index fbfd55bf82ec2..f84085f519407 100644 --- a/ACE/examples/Reactor/FIFO/client.cpp +++ b/ACE/examples/Reactor/FIFO/client.cpp @@ -3,7 +3,6 @@ #include "ace/OS_NS_stropts.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Reactor/FIFO/server.cpp b/ACE/examples/Reactor/FIFO/server.cpp index a3f264170c070..eedf91e9e2ca0 100644 --- a/ACE/examples/Reactor/FIFO/server.cpp +++ b/ACE/examples/Reactor/FIFO/server.cpp @@ -7,12 +7,11 @@ #include "ace/OS_NS_stropts.h" - class FIFO_Recv_Handler : public ACE_Event_Handler { public: - FIFO_Recv_Handler (void); - ~FIFO_Recv_Handler (void); + FIFO_Recv_Handler (); + ~FIFO_Recv_Handler (); virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); @@ -21,7 +20,7 @@ class FIFO_Recv_Handler : public ACE_Event_Handler ACE_FIFO_Recv_Msg fifo_reader_; }; -FIFO_Recv_Handler::FIFO_Recv_Handler (void) +FIFO_Recv_Handler::FIFO_Recv_Handler () { ACE_OS::unlink (ACE_DEFAULT_RENDEZVOUS); @@ -42,7 +41,7 @@ FIFO_Recv_Handler::get_handle () const return this->fifo_reader_.get_handle (); } -FIFO_Recv_Handler::~FIFO_Recv_Handler (void) +FIFO_Recv_Handler::~FIFO_Recv_Handler () { this->fifo_reader_.close (); this->fifo_reader_.remove (); diff --git a/ACE/examples/Reactor/Misc/notification.cpp b/ACE/examples/Reactor/Misc/notification.cpp index a31fd5f3fe113..6e36d13813248 100644 --- a/ACE/examples/Reactor/Misc/notification.cpp +++ b/ACE/examples/Reactor/Misc/notification.cpp @@ -7,7 +7,6 @@ #include "ace/Truncate.h" - #if defined (ACE_HAS_THREADS) #define MAX_ITERATIONS 10000 @@ -32,7 +31,7 @@ class Thread_Handler : public ACE_Event_Handler Thread_Handler (size_t id, size_t max_iterations); - ~Thread_Handler (void); + ~Thread_Handler (); // Destructor. virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); @@ -93,7 +92,7 @@ Thread_Handler::Thread_Handler (size_t id, { } -Thread_Handler::~Thread_Handler (void) +Thread_Handler::~Thread_Handler () { // Cleanup resources so that we don't crash and burn when shutdown. ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance (), @@ -226,7 +225,7 @@ Thread_Handler::handle_input (ACE_HANDLE handle) // capabilities in separate threads. int -Thread_Handler::svc (void) +Thread_Handler::svc () { ACE_Time_Value sleep_timeout (Thread_Handler::interval_.sec () / 2); diff --git a/ACE/examples/Reactor/Misc/test_demuxing.cpp b/ACE/examples/Reactor/Misc/test_demuxing.cpp index 661dfce25b2c5..1dc03bbd4a257 100644 --- a/ACE/examples/Reactor/Misc/test_demuxing.cpp +++ b/ACE/examples/Reactor/Misc/test_demuxing.cpp @@ -16,7 +16,6 @@ #include "ace/OS_NS_unistd.h" - // Default is to have a 2 second timeout. static int timeout = 2; @@ -164,14 +163,14 @@ class STDIN_Handler : public ACE_Event_Handler // This class illustrates that the ACE_Reactor can handle signals, // STDIO, and timeouts using the same mechanisms. public: - STDIN_Handler (void); - ~STDIN_Handler (void); + STDIN_Handler (); + ~STDIN_Handler (); virtual int handle_input (ACE_HANDLE); virtual int handle_timeout (const ACE_Time_Value &, const void *arg); }; -STDIN_Handler::STDIN_Handler (void) +STDIN_Handler::STDIN_Handler () { if (ACE_Event_Handler::register_stdin_handler (this, ACE_Reactor::instance (), @@ -195,7 +194,7 @@ STDIN_Handler::STDIN_Handler (void) 1)); } -STDIN_Handler::~STDIN_Handler (void) +STDIN_Handler::~STDIN_Handler () { if (ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance (), ACE_Thread_Manager::instance ()) == -1) @@ -260,7 +259,7 @@ STDIN_Handler::handle_input (ACE_HANDLE handle) class Message_Handler : public ACE_Task { public: - Message_Handler (void); + Message_Handler (); virtual int handle_input (ACE_HANDLE); // Called back within the context of the Singleton to @@ -276,7 +275,7 @@ class Message_Handler : public ACE_Task // message is enqueued. }; -Message_Handler::Message_Handler (void) +Message_Handler::Message_Handler () : notification_strategy_ (ACE_Reactor::instance (), this, ACE_Event_Handler::READ_MASK) @@ -291,7 +290,7 @@ Message_Handler::Message_Handler (void) } int -Message_Handler::svc (void) +Message_Handler::svc () { for (int i = 0;; i++) { diff --git a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp index 9915f0bb167b3..5aa6707297a0b 100644 --- a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp +++ b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp @@ -4,8 +4,8 @@ class ACE_Test_Sig_Handler { public: - ACE_Test_Sig_Handler (void) {} - virtual ~ACE_Test_Sig_Handler (void) {} + ACE_Test_Sig_Handler () {} + virtual ~ACE_Test_Sig_Handler () {} virtual ACE_HANDLE get_handle () const { return 0; } virtual void set_handle (ACE_HANDLE) {} virtual int handle_async_io (ACE_HANDLE) { return 0; } diff --git a/ACE/examples/Reactor/Misc/test_reactors.cpp b/ACE/examples/Reactor/Misc/test_reactors.cpp index 1d01416e1e96b..194adbc3e3cb6 100644 --- a/ACE/examples/Reactor/Misc/test_reactors.cpp +++ b/ACE/examples/Reactor/Misc/test_reactors.cpp @@ -7,7 +7,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) #include "ace/Recursive_Thread_Mutex.h" @@ -18,8 +17,8 @@ static const int MAX_TASKS = 20; class Test_Task : public ACE_Task { public: - Test_Task (void); - ~Test_Task (void); + Test_Task (); + ~Test_Task (); //FUZZ: disable check_for_lack_ACE_OS virtual int open (void *args = 0); @@ -44,7 +43,7 @@ static ACE_Atomic_Op done_count = MAX_TASKS * 2; static ACE_Recursive_Thread_Mutex reclock_; -Test_Task::Test_Task (void) +Test_Task::Test_Task () : handled_ (0) { ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, reclock_); @@ -55,7 +54,7 @@ Test_Task::Test_Task (void) Test_Task::task_count_)); } -Test_Task::~Test_Task (void) +Test_Task::~Test_Task () { ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, reclock_); @@ -84,7 +83,7 @@ Test_Task::close (u_long) } int -Test_Task::svc (void) +Test_Task::svc () { for (int i = 0; i < NUM_INVOCATIONS; i++) { @@ -152,7 +151,6 @@ worker (void *args) } // ACE_DEBUG ((LM_DEBUG, "(%t) done with handle_events\n")); - } ACE_NOTREACHED(return 0); diff --git a/ACE/examples/Reactor/Misc/test_signals_2.cpp b/ACE/examples/Reactor/Misc/test_signals_2.cpp index 66db4d2d5fb05..437aedee1bb1f 100644 --- a/ACE/examples/Reactor/Misc/test_signals_2.cpp +++ b/ACE/examples/Reactor/Misc/test_signals_2.cpp @@ -102,7 +102,6 @@ #include "ace/Signal.h" - class Sig_Handler_1 : public ACE_Event_Handler { public: diff --git a/ACE/examples/Reactor/Misc/test_time_value.cpp b/ACE/examples/Reactor/Misc/test_time_value.cpp index 8949b9c7c8d8d..fc3563629c1e6 100644 --- a/ACE/examples/Reactor/Misc/test_time_value.cpp +++ b/ACE/examples/Reactor/Misc/test_time_value.cpp @@ -5,7 +5,6 @@ #include "ace/Time_Value.h" - inline int my_abs (int d) { return d > 0 ? d : -d; } ostream & diff --git a/ACE/examples/Reactor/Misc/test_timer_queue.cpp b/ACE/examples/Reactor/Misc/test_timer_queue.cpp index c53bda87e779d..098128e917293 100644 --- a/ACE/examples/Reactor/Misc/test_timer_queue.cpp +++ b/ACE/examples/Reactor/Misc/test_timer_queue.cpp @@ -10,7 +10,7 @@ class Example_Handler : public ACE_Event_Handler { public: - Example_Handler (void) + Example_Handler () : count_ (1) {} diff --git a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp index e7016d4e22b38..108463c42d641 100644 --- a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp +++ b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp @@ -11,14 +11,13 @@ #include "ace/OS_NS_stdlib.h" - -Log_Wrapper::Log_Wrapper (void) +Log_Wrapper::Log_Wrapper () { sequence_number_ = 0; this->log_msg_.app_id = ACE_OS::getpid (); } -Log_Wrapper::~Log_Wrapper (void) +Log_Wrapper::~Log_Wrapper () { } diff --git a/ACE/examples/Reactor/Multicast/Log_Wrapper.h b/ACE/examples/Reactor/Multicast/Log_Wrapper.h index 4de674e3ce450..13982529bce99 100644 --- a/ACE/examples/Reactor/Multicast/Log_Wrapper.h +++ b/ACE/examples/Reactor/Multicast/Log_Wrapper.h @@ -19,8 +19,8 @@ class Log_Wrapper // multicast. { public: - Log_Wrapper (void); - ~Log_Wrapper (void); + Log_Wrapper (); + ~Log_Wrapper (); // = Types of logging messages. enum Log_Priority diff --git a/ACE/examples/Reactor/Multicast/client.cpp b/ACE/examples/Reactor/Multicast/client.cpp index cc219eea84d2c..d4e2d02851654 100644 --- a/ACE/examples/Reactor/Multicast/client.cpp +++ b/ACE/examples/Reactor/Multicast/client.cpp @@ -11,7 +11,6 @@ #include "Log_Wrapper.h" - // Multi-cast address. static const char *MCAST_ADDR = ACE_DEFAULT_MULTICAST_ADDR; diff --git a/ACE/examples/Reactor/Multicast/server.cpp b/ACE/examples/Reactor/Multicast/server.cpp index ee081dd09481f..93d5f4fa90001 100644 --- a/ACE/examples/Reactor/Multicast/server.cpp +++ b/ACE/examples/Reactor/Multicast/server.cpp @@ -15,7 +15,6 @@ #include "ace/os_include/os_netdb.h" - #if defined (ACE_HAS_IP_MULTICAST) class Server_Events : public ACE_Event_Handler { @@ -23,7 +22,7 @@ class Server_Events : public ACE_Event_Handler Server_Events (u_short port, const char *mcast_addr, long time_interval = 0); - ~Server_Events (void); + ~Server_Events (); virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, @@ -31,7 +30,7 @@ class Server_Events : public ACE_Event_Handler virtual ACE_HANDLE get_handle () const; - ACE_Time_Value *wait_time (void); + ACE_Time_Value *wait_time (); private: char *message_; @@ -67,7 +66,7 @@ Server_Events::get_handle () const } ACE_Time_Value * -Server_Events::wait_time (void) +Server_Events::wait_time () { return this->how_long_; } @@ -105,7 +104,7 @@ Server_Events::Server_Events (u_short port, // A destructor that emacs refuses to color blue ;-) -Server_Events::~Server_Events (void) +Server_Events::~Server_Events () { this->mcast_dgram_.leave (this->mcast_addr_); diff --git a/ACE/examples/Reactor/Ntalker/ntalker.cpp b/ACE/examples/Reactor/Ntalker/ntalker.cpp index 119b07df74470..dfa1295f22955 100644 --- a/ACE/examples/Reactor/Ntalker/ntalker.cpp +++ b/ACE/examples/Reactor/Ntalker/ntalker.cpp @@ -29,7 +29,7 @@ class Handler : public ACE_Event_Handler ACE_Reactor & ); // Constructor. - ~Handler (void); + ~Handler (); // Destructor. // Event demuxer hooks. @@ -130,7 +130,7 @@ Handler::handle_close (ACE_HANDLE h, ACE_Reactor_Mask) return 0; } -Handler::~Handler (void) +Handler::~Handler () { if (this->mcast_.leave (sockmc_addr_) == -1) ACE_ERROR ((LM_ERROR, diff --git a/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp b/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp index 29fd141ee593f..95fc16e8a3327 100644 --- a/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp +++ b/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp @@ -11,7 +11,6 @@ //============================================================================= - #include #include #include @@ -25,8 +24,8 @@ #include -int do_sysconf (void); -int have_asynchio (void); +int do_sysconf (); +int have_asynchio (); static int file_handle = -1; char mb1 [BUFSIZ + 1]; @@ -35,15 +34,15 @@ aiocb aiocb1, aiocb2; sigset_t completion_signal; // For testing the stuff. -int test_aio_calls (void); -int issue_aio_calls (void); -int query_aio_completions (void); -int setup_signal_delivery (void); -int do_sysconf (void); -int have_asynchio (void); +int test_aio_calls (); +int issue_aio_calls (); +int query_aio_completions (); +int setup_signal_delivery (); +int do_sysconf (); +int have_asynchio (); int -do_sysconf (void) +do_sysconf () { // Call sysconf to find out runtime values. errno = 0; @@ -85,7 +84,7 @@ do_sysconf (void) } int -have_asynchio (void) +have_asynchio () { #if defined (_POSIX_ASYNCHRONOUS_IO) // POSIX Asynch IO is present in this system. diff --git a/ACE/examples/Reactor/Proactor/post_completions.cpp b/ACE/examples/Reactor/Proactor/post_completions.cpp index 0f0c39e2b6969..88419f00de5ce 100644 --- a/ACE/examples/Reactor/Proactor/post_completions.cpp +++ b/ACE/examples/Reactor/Proactor/post_completions.cpp @@ -54,7 +54,6 @@ static ACE_Atomic_Op Completions_To_Go; */ class My_Result : public RESULT_CLASS { - public: My_Result (ACE_Handler &handler, const void *act, @@ -71,7 +70,7 @@ class My_Result : public RESULT_CLASS {} // Constructor. - virtual ~My_Result (void) + virtual ~My_Result () {} // Destructor. @@ -117,13 +116,12 @@ class My_Result : public RESULT_CLASS */ class My_Handler : public ACE_Handler { - public: /// Constructor. - My_Handler (void) {} + My_Handler () {} /// Destructor. - virtual ~My_Handler (void) {} + virtual ~My_Handler () {} }; /** @@ -136,10 +134,10 @@ class My_Task: public ACE_Task { public: /// Constructor. - My_Task (void) {} + My_Task () {} /// Destructor. - virtual ~My_Task (void) {} + virtual ~My_Task () {} //FUZZ: disable check_for_lack_ACE_OS int open (void *proactor) @@ -153,7 +151,7 @@ class My_Task: public ACE_Task return 0; } - int svc (void) + int svc () { // Handle events for 13 seconds. ACE_Time_Value run_time (13); diff --git a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp index 68635e259c03b..4a1e4d415062a 100644 --- a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp @@ -19,7 +19,6 @@ #include "ace/OS_main.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. @@ -37,17 +36,16 @@ static ACE_TCHAR *dump_file = ACE_TEXT("simple_output"); */ class Simple_Tester : public ACE_Handler { - public: /// Constructor. - Simple_Tester (void); + Simple_Tester (); - ~Simple_Tester (void); + ~Simple_Tester (); //FUZZ: disable check_for_lack_ACE_OS /// Open the operations and initiate read from the file. ///FUZZ: enble check_for_lack_ACE_OS - int open (void); + int open (); protected: // = These methods are called by the freamwork. @@ -59,7 +57,7 @@ class Simple_Tester : public ACE_Handler virtual void handle_write_file (const ACE_Asynch_Write_File::Result &result); private: - int initiate_read_file (void); + int initiate_read_file (); /// rf (read file): for writing from the file. ACE_Asynch_Read_File rf_; @@ -81,13 +79,13 @@ class Simple_Tester : public ACE_Handler }; -Simple_Tester::Simple_Tester (void) +Simple_Tester::Simple_Tester () : input_file_ (ACE_INVALID_HANDLE), dump_file_ (ACE_INVALID_HANDLE) { } -Simple_Tester::~Simple_Tester (void) +Simple_Tester::~Simple_Tester () { ACE_OS::close (this->input_file_); ACE_OS::close (this->dump_file_); @@ -95,7 +93,7 @@ Simple_Tester::~Simple_Tester (void) int -Simple_Tester::open (void) +Simple_Tester::open () { // Initialize stuff @@ -133,7 +131,7 @@ Simple_Tester::open (void) int -Simple_Tester::initiate_read_file (void) +Simple_Tester::initiate_read_file () { // Create Message_Block ACE_Message_Block *mb = 0; diff --git a/ACE/examples/Reactor/Proactor/test_aiocb.cpp b/ACE/examples/Reactor/Proactor/test_aiocb.cpp index 88a48951f3607..deb1085a77370 100644 --- a/ACE/examples/Reactor/Proactor/test_aiocb.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiocb.cpp @@ -34,16 +34,16 @@ class Test_Aio { public: /// Default constructor. - Test_Aio (void); + Test_Aio (); /// Initting the output file and the buffer. - int init (void); + int init (); /// Doing the testing stuff. - int do_aio (void); + int do_aio (); /// Destructor. - ~Test_Aio (void); + ~Test_Aio (); private: /// Output file descriptor. int out_fd_; @@ -61,7 +61,7 @@ class Test_Aio char *buffer_read_; }; -Test_Aio::Test_Aio (void) +Test_Aio::Test_Aio () : aiocb_write_ (new struct aiocb), aiocb_read_ (new struct aiocb), buffer_write_ (0), @@ -69,7 +69,7 @@ Test_Aio::Test_Aio (void) { } -Test_Aio::~Test_Aio (void) +Test_Aio::~Test_Aio () { delete aiocb_write_; delete aiocb_read_; @@ -79,7 +79,7 @@ Test_Aio::~Test_Aio (void) // Init the output file and init the buffer. int -Test_Aio::init (void) +Test_Aio::init () { // Open the output file. this->out_fd_ = open ("test_aio.log", O_RDWR | O_CREAT | O_TRUNC, 0666); @@ -101,7 +101,7 @@ Test_Aio::init (void) // Go on aio_suspend. Wait for completion. // Print out the result. int -Test_Aio::do_aio (void) +Test_Aio::do_aio () { // = Write to the file. diff --git a/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp b/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp index 5ae92a52e9a22..1d9ab41ea23ec 100644 --- a/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp @@ -35,16 +35,16 @@ class Test_Aio { public: /// Default constructor. - Test_Aio (void); + Test_Aio (); /// Initting the output file and the buffer. - int init (void); + int init (); /// Doing the testing stuff. - int do_aio (void); + int do_aio (); /// Destructor. - ~Test_Aio (void); + ~Test_Aio (); private: /// Output file descriptor. int out_fd_; @@ -62,7 +62,7 @@ class Test_Aio char *buffer_read_; }; -Test_Aio::Test_Aio (void) +Test_Aio::Test_Aio () : aiocb_write_ (0), aiocb_read_ (0), buffer_write_ (0), @@ -74,7 +74,7 @@ Test_Aio::Test_Aio (void) struct aiocb); } -Test_Aio::~Test_Aio (void) +Test_Aio::~Test_Aio () { delete aiocb_write_; delete aiocb_read_; @@ -84,7 +84,7 @@ Test_Aio::~Test_Aio (void) // Init the output file and init the buffer. int -Test_Aio::init (void) +Test_Aio::init () { // Open the output file. this->out_fd_ = ACE_OS::open ("test_aio.log", @@ -114,7 +114,7 @@ Test_Aio::init (void) // Go on aio_suspend. Wait for completion. // Print out the result. int -Test_Aio::do_aio (void) +Test_Aio::do_aio () { // = Write to the file. @@ -227,7 +227,6 @@ Test_Aio::do_aio (void) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); diff --git a/ACE/examples/Reactor/Proactor/test_aiosig.cpp b/ACE/examples/Reactor/Proactor/test_aiosig.cpp index 0dee9cdc9fd10..bea369ad14092 100644 --- a/ACE/examples/Reactor/Proactor/test_aiosig.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiosig.cpp @@ -36,15 +36,15 @@ aiocb aiocb1, aiocb2; sigset_t completion_signal; // Function prototypes. -int setup_signal_delivery (void); -int issue_aio_calls (void); -int query_aio_completions (void); -int test_aio_calls (void); -int setup_signal_handler (void); +int setup_signal_delivery (); +int issue_aio_calls (); +int query_aio_completions (); +int test_aio_calls (); +int setup_signal_handler (); int setup_signal_handler (int signal_number); int -setup_signal_delivery (void) +setup_signal_delivery () { // Make the sigset_t consisting of the completion signal. if (sigemptyset (&completion_signal) == -1) @@ -70,7 +70,7 @@ setup_signal_delivery (void) } int -issue_aio_calls (void) +issue_aio_calls () { // Setup AIOCB. aiocb1.aio_fildes = file_handle; @@ -111,7 +111,7 @@ issue_aio_calls (void) } int -query_aio_completions (void) +query_aio_completions () { size_t number_of_compleions = 0; for (number_of_compleions = 0; @@ -220,7 +220,7 @@ query_aio_completions (void) } int -test_aio_calls (void) +test_aio_calls () { // Set up the input file. // Open file (in SEQUENTIAL_SCAN mode) diff --git a/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp b/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp index 3da506a11254a..4e530b6abf705 100644 --- a/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp @@ -44,15 +44,15 @@ static aiocb aiocb3; static sigset_t completion_signal; // Function prototypes. -static int setup_signal_delivery (void); -static int issue_aio_calls (void); -static int query_aio_completions (void); -static int test_aio_calls (void); +static int setup_signal_delivery (); +static int issue_aio_calls (); +static int query_aio_completions (); +static int test_aio_calls (); static void null_handler (int signal_number, siginfo_t *info, void *context); static int setup_signal_handler (int signal_number); static int -setup_signal_delivery (void) +setup_signal_delivery () { // = Mask all the signals. @@ -116,7 +116,7 @@ setup_signal_handler (int signal_number) static int -issue_aio_calls (void) +issue_aio_calls () { // Setup AIOCB. aiocb1.aio_fildes = file_handle; @@ -174,7 +174,7 @@ issue_aio_calls (void) } static int -query_aio_completions (void) +query_aio_completions () { for (size_t number_of_compleions = 0; number_of_compleions < 3; @@ -298,7 +298,7 @@ query_aio_completions (void) } static int -test_aio_calls (void) +test_aio_calls () { // Set up the input file. // Open file (in SEQUENTIAL_SCAN mode) diff --git a/ACE/examples/Reactor/Proactor/test_cancel.cpp b/ACE/examples/Reactor/Proactor/test_cancel.cpp index e02228084fdb4..8dfb8259e16cf 100644 --- a/ACE/examples/Reactor/Proactor/test_cancel.cpp +++ b/ACE/examples/Reactor/Proactor/test_cancel.cpp @@ -13,10 +13,7 @@ * cancel the operation and so the program exits closing the * connection. * - * Works fine on NT. On Solaris platforms, the asynch read is - * pending, but the cancel returns with the value - * indicating all the operations in that handle are done. - * But, LynxOS has a good implementation. It works + * Works fine on NT. LynxOS has a good implementation. It works * fine. * * = RUN @@ -45,7 +42,6 @@ #include "ace/OS_NS_sys_socket.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. @@ -57,13 +53,13 @@ static int done = 0; static int read_size = 2; -Receiver::Receiver (void) +Receiver::Receiver () : mb_ (read_size + 1), handle_ (ACE_INVALID_HANDLE) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { ACE_DEBUG ((LM_DEBUG, "Receiver: Closing down Remote connection:%d\n", diff --git a/ACE/examples/Reactor/Proactor/test_cancel.h b/ACE/examples/Reactor/Proactor/test_cancel.h index 4ab7daca364df..7b2dc6f9dfcb9 100644 --- a/ACE/examples/Reactor/Proactor/test_cancel.h +++ b/ACE/examples/Reactor/Proactor/test_cancel.h @@ -20,8 +20,8 @@ class Receiver : public ACE_Service_Handler // the network connection and dump it to a file. public: - Receiver (void); - ~Receiver (void); + Receiver (); + ~Receiver (); virtual void open (ACE_HANDLE handle, ACE_Message_Block &message_block); diff --git a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp index 44c67d7e6fb37..853750bbb6c39 100644 --- a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp +++ b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp @@ -37,12 +37,12 @@ class My_Task: public ACE_Task { public: // Constructor. - My_Task (void) + My_Task () : time_flag_ (0) {} /// Destructor. - virtual ~My_Task (void) {} + virtual ~My_Task () {} //FUZZ: disable check_for_lack_ACE_OS // If time_flag is zero do the eventloop indefinitely, otherwise do @@ -68,7 +68,7 @@ class My_Task: public ACE_Task } // Thread function. - int svc (void) + int svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t):Starting svc routine\n")); diff --git a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp index 6d00413a2a446..f22cc5d6b57d3 100644 --- a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp +++ b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) /** @@ -29,9 +28,8 @@ */ class Timeout_Handler : public ACE_Handler, public ACE_Event_Handler { - public: - Timeout_Handler (void) + Timeout_Handler () { } @@ -68,9 +66,8 @@ class Timeout_Handler : public ACE_Handler, public ACE_Event_Handler class Worker : public ACE_Task { public: - // Thread fuction. - int svc (void) + int svc () { ACE_DEBUG ((LM_DEBUG, "(%t) Worker started\n")); diff --git a/ACE/examples/Reactor/Proactor/test_proactor.cpp b/ACE/examples/Reactor/Proactor/test_proactor.cpp index e944f6b2f89e8..52c8a271105cd 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor.cpp @@ -33,7 +33,6 @@ #include "ace/OS_NS_fcntl.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. @@ -60,13 +59,13 @@ static int done = 0; static int initial_read_size = BUFSIZ; -Receiver::Receiver (void) +Receiver::Receiver () : dump_file_ (ACE_INVALID_HANDLE), handle_ (ACE_INVALID_HANDLE) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { ACE_OS::close (this->dump_file_); ACE_OS::closesocket (this->handle_); @@ -159,7 +158,7 @@ Receiver::open (ACE_HANDLE handle, } int -Receiver::initiate_read_stream (void) +Receiver::initiate_read_stream () { // Create a new . Note that this message block will // be used both to data asynchronously from the socket and to @@ -276,8 +275,8 @@ Receiver::handle_write_file (const ACE_Asynch_Write_File::Result &result) class Sender : public ACE_Handler { public: - Sender (void); - ~Sender (void); + Sender (); + ~Sender (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS @@ -301,10 +300,10 @@ class Sender : public ACE_Handler private: /// Transmit the entire file in one fell swoop. - int transmit_file (void); + int transmit_file (); /// Initiate an asynchronous file read. - int initiate_read_file (void); + int initiate_read_file (); /// Network I/O handle ACE_SOCK_Stream stream_; @@ -338,7 +337,7 @@ class Sender : public ACE_Handler int transmit_file_done_; }; -Sender::Sender (void) +Sender::Sender () : input_file_ (ACE_INVALID_HANDLE), file_offset_ (0), file_size_ (0), @@ -352,7 +351,7 @@ Sender::Sender (void) this->welcome_message_.wr_ptr (ACE_OS::strlen (data)); } -Sender::~Sender (void) +Sender::~Sender () { this->stream_.close (); } @@ -423,7 +422,7 @@ Sender::open (const ACE_TCHAR *host, } int -Sender::transmit_file (void) +Sender::transmit_file () { // Open file (in SEQUENTIAL_SCAN mode) ACE_HANDLE file_handle = @@ -487,7 +486,7 @@ Sender::handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result) } int -Sender::initiate_read_file (void) +Sender::initiate_read_file () { // Create a new . Note that this message block will // be used both to data asynchronously from the file and to diff --git a/ACE/examples/Reactor/Proactor/test_proactor.h b/ACE/examples/Reactor/Proactor/test_proactor.h index 3efad0222bdbf..1dc7b45448ebf 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor.h +++ b/ACE/examples/Reactor/Proactor/test_proactor.h @@ -14,8 +14,8 @@ class Receiver : public ACE_Service_Handler // connections arrive. This class will then receive data from // the network connection and dump it to a file. public: - Receiver (void); - ~Receiver (void); + Receiver (); + ~Receiver (); virtual void open (ACE_HANDLE handle, ACE_Message_Block &message_block); @@ -33,7 +33,7 @@ class Receiver : public ACE_Service_Handler // completes. private: - int initiate_read_stream (void); + int initiate_read_stream (); // Initiate an asynchronous operation on the socket. ACE_Asynch_Read_Stream rs_; diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp index c040865422555..247dbe9e07230 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp @@ -35,7 +35,6 @@ #include "ace/OS_main.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. @@ -82,10 +81,8 @@ static int initial_read_size = BUFSIZ; //-------------------------------------------------------------------------- class MyTask: public ACE_Task { - public: - - int svc (void) ; + int svc () ; }; @@ -108,9 +105,8 @@ int MyTask::svc () class Receiver : public ACE_Service_Handler { public: - - Receiver (void); - ~Receiver (void); + Receiver (); + ~Receiver (); //FUZZ: disable check_for_lack_ACE_OS /// This is called after the new connection has been accepted. @@ -132,7 +128,7 @@ class Receiver : public ACE_Service_Handler &result); private: - int initiate_read_stream (void); + int initiate_read_stream (); int initiate_write_stream (ACE_Message_Block & mb, int nBytes ); bool check_destroy () ; @@ -147,7 +143,7 @@ class Receiver : public ACE_Service_Handler long Receiver::nSessions = 0 ; -Receiver::Receiver (void) +Receiver::Receiver () : handle_ (ACE_INVALID_HANDLE), nIOCount ( 0 ) { @@ -156,7 +152,7 @@ Receiver::Receiver (void) ACE_DEBUG ((LM_DEBUG, "Receiver Ctor nSessions=%d\n", nSessions )); } -Receiver::~Receiver (void) +Receiver::~Receiver () { ACE_GUARD (MyMutex, locker, m_Mtx); nSessions -- ; @@ -198,7 +194,6 @@ void Receiver::open (ACE_HANDLE handle, ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Asynch_Write_Stream::open")); - } else if (this->rs_.open (*this, this->handle_) == -1) { @@ -215,7 +210,7 @@ void Receiver::open (ACE_HANDLE handle, check_destroy (); } -int Receiver::initiate_read_stream (void) +int Receiver::initiate_read_stream () { ACE_GUARD_RETURN (MyMutex, locker, m_Mtx, -1); @@ -364,8 +359,8 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result class Sender : public ACE_Handler { public: - Sender (void); - ~Sender (void); + Sender (); + ~Sender (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS @@ -387,9 +382,8 @@ virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); private: - -int initiate_read_stream (void); -int initiate_write_stream (void); +int initiate_read_stream (); +int initiate_write_stream (); /// Network I/O handle ACE_SOCK_Stream stream_; @@ -409,14 +403,14 @@ long nIOCount ; static const char *data = "Welcome to Irfan World! Irfan RULES here !!\n"; -Sender::Sender (void) +Sender::Sender () :nIOCount ( 0 ) { // Moment of inspiration... :-) this->welcome_message_.init (data, ACE_OS::strlen (data)); } -Sender::~Sender (void) +Sender::~Sender () { this->close (); } @@ -480,7 +474,7 @@ int Sender::open (const ACE_TCHAR *host, u_short port) return 0; } -int Sender::initiate_write_stream (void) +int Sender::initiate_write_stream () { ACE_GUARD_RETURN (MyMutex, locker, m_Mtx, -1); @@ -502,7 +496,7 @@ int Sender::initiate_write_stream (void) return 0; } -int Sender::initiate_read_stream (void) +int Sender::initiate_read_stream () { ACE_GUARD_RETURN (MyMutex, locker, m_Mtx, -1); @@ -704,7 +698,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Simplify , initial read with zero size Rc = acceptor.open (ACE_INET_Addr (port),0,1); - } else { @@ -740,7 +733,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) //-------------------------------------------------------------------- int DisableSignal ( int SigNum ) { - #ifndef ACE_WIN32 sigset_t signal_set; if ( ACE_OS::sigemptyset (&signal_set) == - 1 ) diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp index 096e89b0021e6..68542f460801f 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp @@ -33,7 +33,6 @@ #include "ace/Task.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. @@ -45,14 +44,13 @@ #elif defined (ACE_HAS_AIO_CALLS) #include "ace/POSIX_Proactor.h" -#include "ace/SUN_Proactor.h" #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ // Some debug helper functions static int disable_signal (int sigmin, int sigmax); #if 0 -static int print_sigmask (void); +static int print_sigmask (); #endif #define COUT(X) cout << X; cout.flush (); @@ -89,10 +87,10 @@ static u_short port = ACE_DEFAULT_SERVER_PORT; class MyTask: public ACE_Task { public: - MyTask (void) : threads_ (0), proactor_ (0) {} + MyTask () : threads_ (0), proactor_ (0) {} - int svc (void); - void waitready (void) { event_.wait (); } + int svc (); + void waitready () { event_.wait (); } private: ACE_Recursive_Thread_Mutex mutex_; @@ -100,12 +98,12 @@ class MyTask: public ACE_Task ACE_Proactor *proactor_; ACE_Manual_Event event_; - void create_proactor (void); - void delete_proactor (void); + void create_proactor (); + void delete_proactor (); }; void -MyTask::create_proactor (void) +MyTask::create_proactor () { ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, mutex_); @@ -129,12 +127,6 @@ MyTask::create_proactor (void) proactor = new ACE_POSIX_SIG_Proactor; ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SIG\n")); break; -# if defined (sun) - case 3: - proactor = new ACE_SUN_Proactor (max_aio_operations); - ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SUN\n")); - break; -# endif /* sun */ default: proactor = new ACE_POSIX_SIG_Proactor; ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SIG\n")); @@ -152,7 +144,7 @@ MyTask::create_proactor (void) } void -MyTask::delete_proactor (void) +MyTask::delete_proactor () { ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, mutex_); if (--threads_ == 0) @@ -165,7 +157,7 @@ MyTask::delete_proactor (void) } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, "(%t) MyTask started\n")); @@ -184,9 +176,8 @@ MyTask::svc (void) class Receiver : public ACE_Service_Handler { public: - - Receiver (void); - ~Receiver (void); + Receiver (); + ~Receiver (); //FUZZ: disable check_for_lack_ACE_OS /// This is called after the new connection has been accepted. @@ -194,7 +185,7 @@ class Receiver : public ACE_Service_Handler virtual void open (ACE_HANDLE handle, ACE_Message_Block &message_block); - static long get_number_sessions (void) { return sessions_; } + static long get_number_sessions () { return sessions_; } protected: // These methods are called by the framework @@ -208,9 +199,9 @@ class Receiver : public ACE_Service_Handler virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); private: - int initiate_read_stream (void); + int initiate_read_stream (); int initiate_write_stream (ACE_Message_Block & mb, int nBytes); - int check_destroy (void); + int check_destroy (); ACE_Asynch_Read_Stream rs_; ACE_Asynch_Write_Stream ws_; @@ -222,7 +213,7 @@ class Receiver : public ACE_Service_Handler long Receiver::sessions_ = 0; -Receiver::Receiver (void) +Receiver::Receiver () : handle_ (ACE_INVALID_HANDLE), io_count_ (0) { @@ -231,7 +222,7 @@ Receiver::Receiver (void) ACE_DEBUG ((LM_DEBUG, "Receiver Ctor sessions_=%d\n", sessions_)); } -Receiver::~Receiver (void) +Receiver::~Receiver () { ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, mutex_); sessions_--; @@ -241,7 +232,7 @@ Receiver::~Receiver (void) // return true if we alive, false we commited suicide int -Receiver::check_destroy (void) +Receiver::check_destroy () { { ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1); @@ -278,7 +269,7 @@ Receiver::open (ACE_HANDLE handle, } int -Receiver::initiate_read_stream (void) +Receiver::initiate_read_stream () { ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1); @@ -422,13 +413,13 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) class Sender : public ACE_Handler { public: - Sender (void); - ~Sender (void); + Sender (); + ~Sender (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS int open (const ACE_TCHAR *host, u_short port); - void close (void); + void close (); ACE_HANDLE handle () const; virtual void handle (ACE_HANDLE); @@ -443,9 +434,8 @@ class Sender : public ACE_Handler virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); private: - - int initiate_read_stream (void); - int initiate_write_stream (void); + int initiate_read_stream (); + int initiate_write_stream (); /// Network I/O handle ACE_SOCK_Stream stream_; @@ -465,19 +455,19 @@ class Sender : public ACE_Handler static const char *data = "Welcome to Irfan World! Irfan RULES here !!\n"; -Sender::Sender (void) +Sender::Sender () : io_count_ (0) { // Moment of inspiration... :-) this->welcome_message_.init (data, ACE_OS::strlen (data)); } -Sender::~Sender (void) +Sender::~Sender () { this->close (); } -void Sender::close (void) +void Sender::close () { this->stream_.close (); } @@ -534,7 +524,7 @@ int Sender::open (const ACE_TCHAR *host, u_short port) } int -Sender::initiate_write_stream (void) +Sender::initiate_write_stream () { ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1); @@ -553,7 +543,7 @@ Sender::initiate_write_stream (void) } int -Sender::initiate_read_stream (void) +Sender::initiate_read_stream () { ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1); @@ -674,9 +664,6 @@ set_proactor_type (const char *ptype) case 'D' : proactor_type = 0; return true; case 'A' : proactor_type = 1; return true; case 'I' : proactor_type = 2; return true; -#if defined (sun) - case 'S' : proactor_type = 3; return true; -#endif /* sun */ } return false; } @@ -740,9 +727,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { -#if defined (sun) - ACE_DEBUG ((LM_DEBUG, "\nSUN defined!\n")); -#endif if (parse_args (argc, argv) == -1) return -1; @@ -848,7 +832,7 @@ disable_signal (int sigmin, int sigmax) #if 0 static int -print_sigmask (void) +print_sigmask () { #ifndef ACE_WIN32 sigset_t mask; diff --git a/ACE/examples/Reactor/Proactor/test_timeout.cpp b/ACE/examples/Reactor/Proactor/test_timeout.cpp index 5ac1c9fe36e1b..1d511a34c0682 100644 --- a/ACE/examples/Reactor/Proactor/test_timeout.cpp +++ b/ACE/examples/Reactor/Proactor/test_timeout.cpp @@ -32,7 +32,7 @@ class Timeout_Handler : public ACE_Handler { public: - Timeout_Handler (void) + Timeout_Handler () : start_time_ (ACE_OS::gettimeofday ()) { } @@ -61,7 +61,7 @@ class Timeout_Handler : public ACE_Handler class Worker : public ACE_Task { public: - int svc (void) + int svc () { // Handle events for 13 seconds. ACE_Time_Value run_time (13); diff --git a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp index dbc7fdb820c5b..af43be19501b5 100644 --- a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp +++ b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp @@ -16,7 +16,6 @@ #include "ace/OS_main.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. @@ -28,9 +27,8 @@ */ class Timeout_Handler : public ACE_Handler { - public: - Timeout_Handler (void) + Timeout_Handler () : count_ (0), start_time_ (ACE_OS::gettimeofday ()) { diff --git a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp index e0de23e72843e..46805f29b2e2c 100644 --- a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp @@ -23,7 +23,6 @@ #include "ace/Log_Msg.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on asynch I/O-capable platforms. @@ -45,8 +44,8 @@ static int done = 0; class Receiver : public ACE_Service_Handler { public: - Receiver (void); - ~Receiver (void); + Receiver (); + ~Receiver (); int open_addr (const ACE_INET_Addr &localAddr); @@ -66,13 +65,13 @@ class Receiver : public ACE_Service_Handler const char* act_; }; -Receiver::Receiver (void) +Receiver::Receiver () : completion_key_ ("Receiver Completion Key"), act_ ("Receiver ACT") { } -Receiver::~Receiver (void) +Receiver::~Receiver () { sock_dgram_.close (); } @@ -219,8 +218,8 @@ Receiver::handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) class Sender : public ACE_Handler { public: - Sender (void); - ~Sender (void); + Sender (); + ~Sender (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS @@ -234,7 +233,6 @@ class Sender : public ACE_Handler virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result); private: - /// Network I/O handle ACE_SOCK_Dgram sock_dgram_; @@ -245,13 +243,13 @@ class Sender : public ACE_Handler const char* act_; }; -Sender::Sender (void) +Sender::Sender () : completion_key_ ("Sender completion key"), act_ ("Sender ACT") { } -Sender::~Sender (void) +Sender::~Sender () { this->sock_dgram_.close (); } diff --git a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp index 2499d06156d97..c02a4a68bf417 100644 --- a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp +++ b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp @@ -23,8 +23,8 @@ AcceptHandler::~AcceptHandler() { ACE_TRACE("AcceptHandler::~AcceptHandler()"); } -int AcceptHandler::open(void) { - ACE_TRACE("AcceptHandler::open(void)"); +int AcceptHandler::open() { + ACE_TRACE("AcceptHandler::open()"); // create the local address used for the service (PORT is from common.h) ACE_INET_Addr addr(PORT); @@ -52,7 +52,7 @@ int AcceptHandler::open(void) { } ACE_HANDLE AcceptHandler::get_handle() const { - ACE_TRACE("AcceptHandler::get_handle(void)"); + ACE_TRACE("AcceptHandler::get_handle()"); return mAcceptor.get_handle(); } diff --git a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h index ba388aaac293a..0a0fd089e769a 100644 --- a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h +++ b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h @@ -15,9 +15,7 @@ * This accept handler is based on the provided solution from the ACE course. */ class AcceptHandler : public ACE_Event_Handler { - private: - /** * The reactor to which the accept handler belongs. */ @@ -29,7 +27,6 @@ class AcceptHandler : public ACE_Event_Handler { ACE_SOCK_Acceptor mAcceptor; public: - /** * @param reactor The reactor which will use this accept handler. */ @@ -45,13 +42,12 @@ class AcceptHandler : public ACE_Event_Handler { * * @return 0 on success, -1 on failure */ - int open(void); + int open(); /** * @name Overridden methods from the ACE_Event_Handler */ // @{ - /** * Provides the handle of mAcceptor. */ diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp index b5116b0e2ced4..cb688852485f7 100644 --- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp +++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp @@ -44,13 +44,13 @@ ReadHandler::~ReadHandler() { delete[] mData; } -ACE_SOCK_Stream &ReadHandler::getStream(void) { - ACE_TRACE("ReadHandler::getStream(void)"); +ACE_SOCK_Stream &ReadHandler::getStream() { + ACE_TRACE("ReadHandler::getStream()"); return mStream; } ACE_HANDLE ReadHandler::get_handle() const { - ACE_TRACE("ReadHandler::get_handle(void)"); + ACE_TRACE("ReadHandler::get_handle()"); return mStream.get_handle(); } @@ -63,7 +63,6 @@ int ReadHandler::handle_input(ACE_HANDLE) { char response = 0; if (mCallCounter == 0) { - /* * This is the first request from the client. */ @@ -110,7 +109,6 @@ int ReadHandler::handle_input(ACE_HANDLE) { INVOCATION_RETURN(-1); // the client will not send data if response != 'K' } else if (mCallCounter == 1) { - /* * This is the second request from the client. */ diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h index 2f3fcaf13c9f3..b3445ee643372 100644 --- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h +++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h @@ -17,9 +17,7 @@ * data sent in the second call. */ class ReadHandler : public ACE_Event_Handler { - private: - /** * The stream socket used for data exchange. */ @@ -47,11 +45,10 @@ class ReadHandler : public ACE_Event_Handler { int mInvocationCounter; public: - /** * Initialization. */ - ReadHandler(void); + ReadHandler(); /** * Clean up data. @@ -61,13 +58,12 @@ class ReadHandler : public ACE_Event_Handler { /** * Provide access to the internal stream socket. */ - ACE_SOCK_Stream &getStream(void); + ACE_SOCK_Stream &getStream(); /** * @name Overridden methods from the ACE_Event_Handler */ // @{ - /** * Provides the handle of mStream; */ diff --git a/ACE/examples/Reactor/TP_Reactor/client.cpp b/ACE/examples/Reactor/TP_Reactor/client.cpp index eb6deecf8eea2..ef6bc7d1a394b 100644 --- a/ACE/examples/Reactor/TP_Reactor/client.cpp +++ b/ACE/examples/Reactor/TP_Reactor/client.cpp @@ -30,7 +30,6 @@ int printUsage(ACE_TCHAR *arg) { } int ACE_TMAIN(int argc, ACE_TCHAR **argv) { - // size and count for transmissions int size = 0, count = -1; @@ -67,7 +66,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) { // -1 is running indefinitely while ((count == -1) || (count-- != 0)) { - // some output, that we know something is happening //ACE_DEBUG((LM_DEBUG, ACE_TEXT("%N:%l: Passes left: %i\n"), count)); ACE_DEBUG((LM_DEBUG, ACE_TEXT("."))); @@ -81,7 +79,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) { } try { - // send the request to the server (number of MiB in the next call) // Note: only use the sizeof and pointer to int on compatible // platforms (i.e. little-endian/big-endian, data type size) @@ -100,7 +97,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) { // server answer, 'K" indicates a positive answer if (answer == 'K') { - // send a huge message to the server if (stream.send_n(someData, size, &connTimeout) != size) { ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to send ") diff --git a/ACE/examples/Reactor/TP_Reactor/server.cpp b/ACE/examples/Reactor/TP_Reactor/server.cpp index 7f78287ed7dc3..c7f49245745b8 100644 --- a/ACE/examples/Reactor/TP_Reactor/server.cpp +++ b/ACE/examples/Reactor/TP_Reactor/server.cpp @@ -33,7 +33,6 @@ ACE_THR_FUNC_RETURN threadFunc(void *arg) { * the solution to exercise 4c of the ACE course. */ int ACE_TMAIN(int, ACE_TCHAR **) { - // create a reactor from a TP reactor ACE_TP_Reactor tpReactor; ACE_Reactor reactor(&tpReactor); diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp index 5f9792a716623..00d21aa59c55b 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp @@ -12,7 +12,7 @@ #include "ace/OS_main.h" -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && _WIN32_WINNT >= 0x400 +#if defined (ACE_WIN32) && _WIN32_WINNT >= 0x400 #include "ace/Reactor.h" #include "ace/Auto_Event.h" @@ -41,7 +41,7 @@ apc_callback (DWORD) } void -queue_apc (void) +queue_apc () { DWORD result = ::QueueUserAPC (reinterpret_cast (&apc_callback), // pointer to APC function diff --git a/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp index 83df6afa6b45c..44b1076feb7c8 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp @@ -26,7 +26,7 @@ class Event_Handler : public ACE_Event_Handler { public: Event_Handler (ACE_Reactor &reactor); - ~Event_Handler (void); + ~Event_Handler (); int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); @@ -54,7 +54,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor) ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n")); } -Event_Handler::~Event_Handler (void) +Event_Handler::~Event_Handler () { } @@ -77,7 +77,7 @@ Event_Handler::handle_close (ACE_HANDLE, } void -worker (void) +worker () { ACE_DEBUG ((LM_DEBUG, "(%t) Thread creation\n")); ACE_DEBUG ((LM_DEBUG, "(%t) Thread creating temporary file\n")); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp index 18e0373eccc6b..b33b002752266 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp @@ -24,14 +24,14 @@ class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (void) + Event_Handler () : event_ (1) { ACE_DEBUG ((LM_DEBUG, "Event_Handler created\n")); } - ~Event_Handler (void) + ~Event_Handler () { ACE_DEBUG ((LM_DEBUG, "Event_Handler destroyed\n")); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp index 71511985a77d3..9a2a4840559a3 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp @@ -21,7 +21,6 @@ #include "ace/OS_main.h" - // Use the WFMO_Reactor static int opt_wfmo_reactor = 0; @@ -57,7 +56,7 @@ class Handler : public ACE_Event_Handler { } - ~Handler (void) + ~Handler () { this->reactor (0); } @@ -112,13 +111,12 @@ class Handler : public ACE_Event_Handler class Different_Handler : public ACE_Event_Handler { public: - Different_Handler (ACE_Pipe &pipe) : pipe_ (pipe) { } - ~Different_Handler (void) + ~Different_Handler () { this->reactor (0); } @@ -205,13 +203,13 @@ class Different_Handler : public ACE_Event_Handler // Selection of which reactor should get created // ACE_Reactor * -create_reactor (void) +create_reactor () { ACE_Reactor_Impl *impl = 0; if (opt_wfmo_reactor) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) ACE_NEW_RETURN (impl, ACE_WFMO_Reactor, 0); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp index 06735f2eaf747..ded3e193cb8f9 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp @@ -25,7 +25,6 @@ #include "ace/OS_NS_time.h" - static int concurrent_threads = 1; static int number_of_handles = static_cast (ACE_Reactor::instance ()->size ()); static int number_of_handles_to_signal = 1; @@ -34,7 +33,7 @@ static int iterations = 10; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, "usage: \n\t" @@ -85,7 +84,7 @@ class Task_Handler : public ACE_Task size_t concurrent_threads); /// Destructor. - ~Task_Handler (void); + ~Task_Handler (); /// Called when object is removed from the ACE_Reactor virtual int handle_close (ACE_HANDLE handle, @@ -99,7 +98,7 @@ class Task_Handler : public ACE_Task const void *arg = 0); /// Task event loop. - int svc (void); + int svc (); //FUZZ: disable check_for_lack_ACE_OS /// Signal an event. @@ -112,7 +111,7 @@ class Task_Handler : public ACE_Task // All threads do reactor->handle_events () int -Task_Handler::svc (void) +Task_Handler::svc () { // Try to become the owner ACE_Reactor::instance ()->owner (ACE_Thread::self ()); @@ -140,7 +139,7 @@ Task_Handler::Task_Handler (size_t number_of_handles, "activate")); } -Task_Handler::~Task_Handler (void) +Task_Handler::~Task_Handler () { this->reactor (0); delete [] this->events_; diff --git a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp index 304b746e536b3..87145b96e0015 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp @@ -31,7 +31,6 @@ #include "ace/OS_main.h" - class Network_Handler : public ACE_Event_Handler { public: @@ -44,7 +43,6 @@ class Network_Handler : public ACE_Event_Handler virtual ACE_HANDLE get_handle () const; ACE_SOCK_Stream stream_; - }; Network_Handler::Network_Handler (ACE_SOCK_Stream &s) @@ -112,8 +110,8 @@ class Network_Listener : public ACE_Event_Handler public: /// Default constructor /// Default constructor - Network_Listener (void); - ~Network_Listener (void); + Network_Listener (); + ~Network_Listener (); virtual int handle_input (ACE_HANDLE handle); virtual int handle_close (ACE_HANDLE handle, @@ -124,7 +122,7 @@ class Network_Listener : public ACE_Event_Handler ACE_SOCK_Acceptor acceptor_; }; -Network_Listener::Network_Listener (void) +Network_Listener::Network_Listener () : local_address_ (ACE_DEFAULT_SERVER_PORT), acceptor_ (local_address_, 1) { @@ -134,7 +132,7 @@ Network_Listener::Network_Listener (void) ACE_TEST_ASSERT (result == 0); } -Network_Listener::~Network_Listener (void) +Network_Listener::~Network_Listener () { } diff --git a/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp index d117cb07e173d..998f71ca6c161 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp @@ -16,7 +16,6 @@ #include "ace/Log_Msg.h" - /** * @class Event_Handler * diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp index d9d89d72160fd..b6816aada541a 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp @@ -35,7 +35,6 @@ #include "ace/Log_Msg.h" - // Globals for this test int stop_test = 0; ACE_Reactor reactor; @@ -45,7 +44,7 @@ class Simple_Handler : public ACE_Event_Handler { public: /// Default constructor - Simple_Handler (void); + Simple_Handler (); virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); virtual int handle_close (ACE_HANDLE handle, @@ -57,7 +56,7 @@ class Simple_Handler : public ACE_Event_Handler int handle_close_count_; }; -Simple_Handler::Simple_Handler (void) +Simple_Handler::Simple_Handler () : handle_signal_count_ (0), handle_close_count_ (0) { @@ -107,7 +106,7 @@ Simple_Handler::handle_close (ACE_HANDLE handle, Simple_Handler simple_handler; void -worker (void) +worker () { ACE_DEBUG ((LM_DEBUG, "(%t) Thread creation\n")); ACE_DEBUG ((LM_DEBUG, "(%t) Thread sleeping\n")); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp index c5b166217a449..7a16cab069289 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp @@ -26,11 +26,11 @@ class Event_Handler : public ACE_Event_Handler { public: Event_Handler (ACE_Reactor &reactor); - ~Event_Handler (void); + ~Event_Handler (); int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); - ACE_Registry::Naming_Context &context (void); + ACE_Registry::Naming_Context &context (); private: ACE_Auto_Event event_; @@ -55,7 +55,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor) ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n")); } -Event_Handler::~Event_Handler (void) +Event_Handler::~Event_Handler () { } @@ -84,7 +84,7 @@ Event_Handler::handle_close (ACE_HANDLE, } ACE_Registry::Naming_Context & -Event_Handler::context (void) +Event_Handler::context () { return this->context_; } diff --git a/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp b/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp index ce267ee95416b..a35703ad69270 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp @@ -20,7 +20,6 @@ #include "ace/Event.h" - /** * @class Event_Handler * diff --git a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp index 942fd9e9795bd..7f1c7f1adec29 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp @@ -20,7 +20,6 @@ class Event_Handler : public ACE_Event_Handler { public: - ACE_HANDLE get_handle () const { return this->event_.handle (); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp index 6e62e2efde2e2..44a93e339a7a7 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp @@ -139,7 +139,6 @@ #include "ace/OS_NS_unistd.h" - typedef ACE_Task MT_TASK; /** @@ -152,7 +151,7 @@ class Peer_Handler : public MT_TASK, public ACE_Handler { public: Peer_Handler (int argc, ACE_TCHAR *argv[]); - ~Peer_Handler (void); + ~Peer_Handler (); //FUZZ: disable check_for_lack_ACE_OS /** @@ -244,7 +243,7 @@ class STDIN_Handler : public ACE_Task virtual int close (u_long = 0); /// Thread runs here as an active object. - int svc (void); + int svc (); int handle_close (ACE_HANDLE, ACE_Reactor_Mask); @@ -255,7 +254,7 @@ class STDIN_Handler : public ACE_Task static void handler (int signum); /// Helper function to register with the Reactor for thread exit. - void register_thread_exit_hook (void); + void register_thread_exit_hook (); /// The STDIN thread has exited. This means the user hit ^C. We can /// end the event loop. @@ -298,7 +297,7 @@ Peer_Handler::Peer_Handler (int argc, ACE_TCHAR *argv[]) } } -Peer_Handler::~Peer_Handler (void) +Peer_Handler::~Peer_Handler () { } @@ -472,7 +471,7 @@ STDIN_Handler::close (u_long) // Thread runs here. int -STDIN_Handler::svc (void) +STDIN_Handler::svc () { this->register_thread_exit_hook (); @@ -513,7 +512,7 @@ STDIN_Handler::svc (void) // Register an exit hook with the reactor. void -STDIN_Handler::register_thread_exit_hook (void) +STDIN_Handler::register_thread_exit_hook () { // Get a real handle to our thread. ACE_Thread_Manager::instance ()->thr_self (this->thr_handle_); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp b/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp index 5ae99f803c9b5..e346a8bec6f41 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp @@ -20,7 +20,6 @@ #include "ace/OS_main.h" - /** * @class Timeout_Handler * @@ -29,7 +28,7 @@ class Timeout_Handler : public ACE_Event_Handler { public: - Timeout_Handler (void) + Timeout_Handler () : count_ (0) {} /// Print out when timeouts occur. diff --git a/ACE/examples/Registry/test_registry_iterator.cpp b/ACE/examples/Registry/test_registry_iterator.cpp index 7403838781a8d..6ee7023c82537 100644 --- a/ACE/examples/Registry/test_registry_iterator.cpp +++ b/ACE/examples/Registry/test_registry_iterator.cpp @@ -15,7 +15,6 @@ #include "ace/streams.h" - // Indentation while printing names static const u_long INDENTATION_LEVEL = 3; diff --git a/ACE/examples/Registry/test_registry_update.cpp b/ACE/examples/Registry/test_registry_update.cpp index 919eb050b670a..a9d7c80ae953f 100644 --- a/ACE/examples/Registry/test_registry_update.cpp +++ b/ACE/examples/Registry/test_registry_update.cpp @@ -21,7 +21,6 @@ #include "ace/streams.h" - // Name for application's naming context static ACE_Registry::Name application_context_name; diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp index 1999c84271d67..0575e55fa0f09 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp @@ -17,7 +17,7 @@ static ACE_TCHAR *program_name; static unsigned short broadcast_port_number = ACE_DEFAULT_BROADCAST_PORT; static void -print_usage_and_die (void) +print_usage_and_die () { ACE_OS::fprintf (stderr, "usage: %s [-p broadcast portnum]\n", ACE_TEXT_ALWAYS_CHAR (program_name)); diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp index b40cfa5c2370e..85b5b343f5bdc 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp @@ -24,7 +24,7 @@ static const ACE_TCHAR *rendezvous_dgram = ACE_TEXT ("/tmp/foo_dgram"); static const ACE_TCHAR *file_name = ACE_TEXT ("local_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("usage: %s [-r rendezvous_dgram] ") diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp index f962221ca7785..c9ef86849e77a 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp @@ -21,7 +21,7 @@ static const ACE_TCHAR *rendezvous_fifo = ACE_TEXT("/tmp/foo_fifo"); static const ACE_TCHAR *file_name = ACE_TEXT("./local_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, "usage: %s [-d] [-f rendezvous_fifo]\n", diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp index 79f193c1fb80b..829522f94f0af 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp @@ -21,7 +21,7 @@ static const ACE_TCHAR *rendezvous = ACE_TEXT ("/tmp/foo_pipe"); static const ACE_TCHAR *file_name = ACE_TEXT ("local_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("usage: %s [-r rendezvous] [-f file]\n"), diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp index c571ab1c927ce..18109c9cb0d12 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp @@ -20,7 +20,7 @@ static const ACE_TCHAR *rendezvous_spipe = ACE_TEXT ("/tmp/foo_spipe"); static const ACE_TCHAR *file_name = ACE_TEXT ("./local_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("usage: %s [-d] [-r rendezvous_spipe]\n"), diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp index 5151f99c8c193..1b33350b3de15 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp @@ -19,7 +19,7 @@ static const ACE_TCHAR *rendezvous = ACE_TEXT ("/tmp/foo_stream"); static const ACE_TCHAR *file_name = ACE_TEXT ("local_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("usage: %s [-r rendezvous] [-f file]\n"), diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp index af3067efbca9c..37efd678c32cb 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp @@ -20,7 +20,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST; // Name of file to send. static const ACE_TCHAR *file_name = ACE_TEXT("./remote_data"); -static void print_usage_and_die (void) +static void print_usage_and_die () { ACE_ERROR ((LM_ERROR, "usage: %s [-p portnum] [-h host_name] [-f file]\n", diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp index 1dfed4b7de6d1..66aa05734a2ec 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp @@ -19,7 +19,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST; static int remote_reconfigure = 0; static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, "usage: %n [-p portnum] [-h host_name] [-r]\n")); diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp index 297b9bba245bd..62f09757075f5 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp @@ -25,7 +25,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST; static const ACE_TCHAR *file_name = ACE_TEXT("./remote_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, "usage: %s [-p portnum] [-h host_name] [-f file]\n", diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp index 086cb64c9642f..edd852437d0ee 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp @@ -23,7 +23,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST; // Name of file to send. static const ACE_TCHAR *file_name = ACE_TEXT ("./remote_data"); -static void print_usage_and_die (void) +static void print_usage_and_die () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("usage: %s [-p portnum] [-h host_name] [-f file]\n"), diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp index ee07d34fa2f1b..249ee30fa746e 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp @@ -1,29 +1,5 @@ #include "Handle_Broadcast.h" -#if defined (SunOS4) -extern "C" -{ - int init (void); - int fini (void); - void __sti__Handle_Broadcast_C_init_(); - void __std__Handle_Broadcast_C_init_(); -} - -int -init (void) -{ - __sti__Handle_Broadcast_C_init_(); - return 0; -} - -int -fini (void) -{ - __std__Handle_Broadcast_C_init_(); - return 0; -} -#endif /* SunOS4 */ - unsigned short Handle_Broadcast::DEFAULT_PORT = ACE_DEFAULT_BROADCAST_PORT; #if !defined (__ACE_INLINE__) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h index dac570674ebfd..52c04194130df 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h @@ -20,8 +20,8 @@ class ACE_Svc_Export Handle_Broadcast : public ACE_Service_Object, public ACE_SOCK_Dgram { public: - Handle_Broadcast (void); - ~Handle_Broadcast (void); + Handle_Broadcast (); + ~Handle_Broadcast (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl index b043d4cc00321..5347dcaec9b51 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl @@ -6,12 +6,12 @@ #include "ace/OS_NS_unistd.h" ACE_INLINE -Handle_Broadcast::~Handle_Broadcast (void) +Handle_Broadcast::~Handle_Broadcast () { } ACE_INLINE -Handle_Broadcast::Handle_Broadcast (void) +Handle_Broadcast::Handle_Broadcast () { } @@ -78,7 +78,7 @@ Handle_Broadcast::init (int argc, ACE_TCHAR *argv[]) } ACE_INLINE int -Handle_Broadcast::fini (void) +Handle_Broadcast::fini () { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h index d7e54b2e4c81d..6ceb220198534 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h @@ -21,7 +21,7 @@ class ACE_Svc_Export Handle_L_CODgram : public ACE_Service_Object, public ACE_LSOCK_CODgram { public: - Handle_L_CODgram (void); + Handle_L_CODgram (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl index 856a2ffa99a49..ef1707d6df5e4 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl @@ -5,7 +5,7 @@ #include "ace/OS_NS_unistd.h" ACE_INLINE -Handle_L_CODgram::Handle_L_CODgram (void) +Handle_L_CODgram::Handle_L_CODgram () { } @@ -69,7 +69,7 @@ Handle_L_CODgram::init (int argc, ACE_TCHAR *argv[]) } ACE_INLINE int -Handle_L_CODgram::fini(void) +Handle_L_CODgram::fini() { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h index 53059e67004f9..323b4b5e1b786 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h @@ -21,7 +21,7 @@ class ACE_Svc_Export Handle_L_Dgram : public ACE_Service_Object, public ACE_LSOCK_Dgram { public: - Handle_L_Dgram (void); + Handle_L_Dgram (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl index c53e6841a6427..b101c79b0ce8c 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl @@ -5,7 +5,7 @@ #include "ace/OS_NS_unistd.h" ACE_INLINE -Handle_L_Dgram::Handle_L_Dgram (void) +Handle_L_Dgram::Handle_L_Dgram () { } @@ -71,7 +71,7 @@ Handle_L_Dgram::init (int argc, ACE_TCHAR *argv[]) } ACE_INLINE int -Handle_L_Dgram::fini (void) +Handle_L_Dgram::fini () { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp index 7d837aac71f56..cdf7eb650c042 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp @@ -1,31 +1,5 @@ #include "Handle_L_FIFO.h" - - -#if defined (SunOS4) -extern "C" -{ - int init (void); - int fini (void); - void __sti__Handle_L_FIFO_C_init_(); - void __std__Handle_L_FIFO_C_init_(); -} - -int -init (void) -{ - __sti__Handle_L_FIFO_C_init_(); - return 0; -} - -int -fini (void) -{ - __std__Handle_L_FIFO_C_init_(); - return 0; -} -#endif /* SunOS4 */ - const ACE_TCHAR *Handle_L_FIFO::DEFAULT_RENDEZVOUS = ACE_TEXT("/tmp/foo_fifo"); #if !defined (__ACE_INLINE__) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h index 989dd102f9115..2268c92f2b954 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h @@ -20,7 +20,7 @@ class ACE_Svc_Export Handle_L_FIFO : public ACE_Service_Object, public ACE_FIFO_Recv_Msg { public: - Handle_L_FIFO (void); + Handle_L_FIFO (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl index 1684001b85f09..9fd9052c57042 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl @@ -7,7 +7,7 @@ #include "ace/OS_NS_unistd.h" ACE_INLINE -Handle_L_FIFO::Handle_L_FIFO (void) +Handle_L_FIFO::Handle_L_FIFO () { } @@ -70,7 +70,7 @@ Handle_L_FIFO::init (int argc, ACE_TCHAR *argv[]) } ACE_INLINE int -Handle_L_FIFO::fini (void) +Handle_L_FIFO::fini () { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h index 3e944acc5e28d..5e34a65347f56 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h @@ -22,8 +22,8 @@ class ACE_Svc_Export Handle_L_Pipe : public ACE_Service_Object, public ACE_LSOCK_Acceptor { public: - Handle_L_Pipe (void); - ~Handle_L_Pipe (void); + Handle_L_Pipe (); + ~Handle_L_Pipe (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl index e9bc4503657d8..34cca37478b76 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl @@ -5,12 +5,12 @@ #include "ace/OS_NS_unistd.h" ACE_INLINE -Handle_L_Pipe::~Handle_L_Pipe (void) +Handle_L_Pipe::~Handle_L_Pipe () { } ACE_INLINE -Handle_L_Pipe::Handle_L_Pipe (void) +Handle_L_Pipe::Handle_L_Pipe () { } @@ -73,7 +73,7 @@ Handle_L_Pipe::init (int argc, ACE_TCHAR *argv[]) } ACE_INLINE int -Handle_L_Pipe::fini (void) +Handle_L_Pipe::fini () { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h index 79fa31707c877..5a247db7e0c3e 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h @@ -21,7 +21,7 @@ class ACE_Svc_Export Handle_L_SPIPE : public ACE_Service_Object, public ACE_SPIPE_Acceptor { public: - Handle_L_SPIPE (void); + Handle_L_SPIPE (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl index 7981fb6519a37..93c6fec50da90 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl @@ -12,7 +12,7 @@ ACE_INLINE -Handle_L_SPIPE::Handle_L_SPIPE (void) +Handle_L_SPIPE::Handle_L_SPIPE () { } @@ -75,7 +75,7 @@ Handle_L_SPIPE::init (int argc, ACE_TCHAR *argv[]) } ACE_INLINE int -Handle_L_SPIPE::fini (void) +Handle_L_SPIPE::fini () { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h index a56631f61e633..54e34be7be933 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h @@ -21,8 +21,8 @@ class ACE_Svc_Export Handle_L_Stream : public ACE_Service_Object, public ACE_LSOCK_Acceptor { public: - Handle_L_Stream (void); - ~Handle_L_Stream (void); + Handle_L_Stream (); + ~Handle_L_Stream (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl index 4cb5b66e16ec7..7e65e837497d6 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl @@ -6,12 +6,12 @@ #include "ace/OS_NS_unistd.h" ACE_INLINE -Handle_L_Stream::~Handle_L_Stream (void) +Handle_L_Stream::~Handle_L_Stream () { } ACE_INLINE -Handle_L_Stream::Handle_L_Stream (void) +Handle_L_Stream::Handle_L_Stream () { if (Handle_L_Stream::login_name == 0) { #if !defined(ACE_LACKS_CUSERID) @@ -85,7 +85,7 @@ Handle_L_Stream::init (int argc, ACE_TCHAR *argv[]) } ACE_INLINE int -Handle_L_Stream::fini (void) +Handle_L_Stream::fini () { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp index 4600d5840d1ff..89c0e227e5a89 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp @@ -1,29 +1,5 @@ #include "Handle_R_Dgram.h" -#if defined (SunOS4) -extern "C" -{ - int init (void); - int fini (void); - void __sti__Handle_R_Dgram_C_init_(); - void __std__Handle_R_Dgram_C_init_(); -} - -int -init (void) -{ - __sti__Handle_R_Dgram_C_init_(); - return 0; -} - -int -fini (void) -{ - __std__Handle_R_Dgram_C_init_(); - return 0; -} -#endif /* SunOS4 */ - unsigned short Handle_R_Dgram::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT; #if !defined (__ACE_INLINE__) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h index 6c0be72cb708a..c2181e86b55f4 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h @@ -19,7 +19,7 @@ class ACE_Svc_Export Handle_R_Dgram : public ACE_Service_Object, public ACE_SOCK_Dgram { public: - Handle_R_Dgram (void); + Handle_R_Dgram (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl index f4ac2cb07d204..3e339c733f9b7 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl @@ -5,7 +5,7 @@ #include "ace/OS_NS_unistd.h" ACE_INLINE -Handle_R_Dgram::Handle_R_Dgram (void) +Handle_R_Dgram::Handle_R_Dgram () { } @@ -64,7 +64,7 @@ Handle_R_Dgram::init (int argc, ACE_TCHAR *argv[]) } ACE_INLINE int -Handle_R_Dgram::fini (void) +Handle_R_Dgram::fini () { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp index f478d26dcc3d0..240cb2980aeb3 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp @@ -1,31 +1,6 @@ #include "Handle_R_Stream.h" -#if defined (SunOS4) -extern "C" -{ - int init (void); - int fini (void); - void __sti__Handle_R_Stream_C_recv_n_(); - void __std__Handle_R_Stream_C_recv_n_(); -} - -int -init (void) -{ - __sti__Handle_R_Stream_C_recv_n_(); - return 0; -} - -int -fini (void) -{ - __std__Handle_R_Stream_C_recv_n_(); - return 0; -} -#endif /* SunOS4 */ - // Static variables. - u_short Handle_R_Stream::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT; char *Handle_R_Stream::login_name = 0; char Handle_R_Stream::login[ACE_MAX_USERID]; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h index e192ccab1c6f1..3b551e2550c5e 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h @@ -21,7 +21,7 @@ class ACE_Svc_Export Handle_R_Stream : public ACE_Service_Object, public ACE_SOCK_Acceptor { public: - Handle_R_Stream (void); + Handle_R_Stream (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl index 59582edb6a2c2..a61cda4cce7cc 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl @@ -8,7 +8,7 @@ #include "ace/Truncate.h" ACE_INLINE -Handle_R_Stream::Handle_R_Stream (void) +Handle_R_Stream::Handle_R_Stream () { if (Handle_R_Stream::login_name == 0) { #if !defined(ACE_LACKS_CUSERID) @@ -90,7 +90,7 @@ Handle_R_Stream::init (int argc, ACE_TCHAR *argv[]) } ACE_INLINE int -Handle_R_Stream::fini (void) +Handle_R_Stream::fini () { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp index 41a5d36c25c52..172fefacc57d1 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp @@ -21,12 +21,12 @@ #define PR_ST_2 ACE_PEER_STREAM_2 template -Handle_Thr_Acceptor::~Handle_Thr_Acceptor (void) +Handle_Thr_Acceptor::~Handle_Thr_Acceptor () { } template -Handle_Thr_Acceptor::Handle_Thr_Acceptor (void) +Handle_Thr_Acceptor::Handle_Thr_Acceptor () : thr_flags_ (THR_DETACHED | THR_NEW_LWP) { } @@ -98,7 +98,7 @@ Handle_Thr_Acceptor::init (int argc, ACE_TCHAR *argv[]) } template int -Handle_Thr_Acceptor::fini (void) +Handle_Thr_Acceptor::fini () { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); @@ -141,7 +141,7 @@ CLI_Stream::open (void *) } template int -CLI_Stream::svc (void) +CLI_Stream::svc () { char buf[BUFSIZ]; char login_name[ACE_MAX_USERID]; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h index 8db8172dca36d..76c78c9b8ceb6 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h @@ -20,8 +20,8 @@ class Handle_Thr_Acceptor : public ACE_Strategy_Acceptor. { public: - Handle_Thr_Acceptor (void); - ~Handle_Thr_Acceptor (void); + Handle_Thr_Acceptor (); + ~Handle_Thr_Acceptor (); // = Dynamic linking hooks. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -63,8 +63,6 @@ class CLI_Stream : public ACE_Svc_Handler extern ACE_Service_Object_Type rts; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Handle_Thr_Stream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_HAS_THREADS */ #endif /* _HANDLE_THR_STREAM_H */ diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp index a7eb8b74cb8e1..b605faab14fd2 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp @@ -1,29 +1,5 @@ #include "Handle_Timeout.h" -#if defined (SunOS4) -extern "C" -{ - int init (void); - int fini (void); - void __sti__Handle_Timeout_C_init_(); - void __std__Handle_Timeout_C_init_(); -} - -int -init (void) -{ - __sti__Handle_Timeout_C_init_(); - return 0; -} - -int -fini (void) -{ - __std__Handle_Timeout_C_init_(); - return 0; -} -#endif /* SunOS4 */ - #if !defined (__ACE_INLINE__) #include "Handle_Timeout.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h index 5e3ddd628d2b6..6f56eef2d3f0d 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h @@ -18,7 +18,7 @@ class ACE_Svc_Export Handle_Timeout : public ACE_Service_Object { public: - Handle_Timeout (void); + Handle_Timeout (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl index ca8f917ad5bbe..be717e9183866 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl @@ -6,7 +6,7 @@ #include "ace/Truncate.h" ACE_INLINE -Handle_Timeout::Handle_Timeout (void): count (0) +Handle_Timeout::Handle_Timeout () : count (0) { } @@ -63,7 +63,7 @@ Handle_Timeout::init (int argc, ACE_TCHAR *argv[]) } ACE_INLINE int -Handle_Timeout::fini (void) +Handle_Timeout::fini () { return 0; } diff --git a/ACE/examples/Service_Configurator/Misc/README b/ACE/examples/Service_Configurator/Misc/README index d9a9568fbd486..d02bf5fed62fe 100644 --- a/ACE/examples/Service_Configurator/Misc/README +++ b/ACE/examples/Service_Configurator/Misc/README @@ -1,25 +1,6 @@ - - This directory contains an example that illustrates how the ACE Service Configurator can configure static and dynamic services, both from the command-line and from a svc.config file. We define several instances, i.e., Timer_Service_1 and Timer_Service_2 of the SAME service just to exercise different configuration options. A "real" application would usually define different services. - -Windows CE: ------------ - -When using Windows CE (WCE) emulator, make sure that you use the -following command to copy the svc.conf files into the top-level -directory in CE emulator. - - empfile -c svc.conf1 wce:\svc.conf1 - empfile -c svc.conf2 wce:\svc.conf2 - -The command "empfile" moves the files to emulator's root directory and -resigters the files with CE emulator's object store. - -Also make sure you type in at least one argument (which is argv[0],) -when the program dialog box requests you to key in the program -arguments. Otherwise, the program won't run at all. diff --git a/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp b/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp index bd2fd5a7fd62d..6415f164d9797 100644 --- a/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp +++ b/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp @@ -3,8 +3,7 @@ #include "ace/Log_Msg.h" - -Timer_Service_1::Timer_Service_1 (void) +Timer_Service_1::Timer_Service_1 () { ACE_OS::strcpy (this->name_, ACE_TEXT ("Timer_Service_1")); @@ -105,13 +104,13 @@ Timer_Service_1::handle_close (ACE_HANDLE, return 0; } -Timer_Service_2::Timer_Service_2 (void) +Timer_Service_2::Timer_Service_2 () { ACE_OS::strcpy (this->name_, ACE_TEXT ("Timer_Service_2")); } -Timer_Service_3::Timer_Service_3 (void) +Timer_Service_3::Timer_Service_3 () { ACE_OS::strcpy (this->name_, ACE_TEXT ("Timer_Service_3")); diff --git a/ACE/examples/Service_Configurator/Misc/Timer_Service.h b/ACE/examples/Service_Configurator/Misc/Timer_Service.h index 148278f396d70..e886818cf9639 100644 --- a/ACE/examples/Service_Configurator/Misc/Timer_Service.h +++ b/ACE/examples/Service_Configurator/Misc/Timer_Service.h @@ -16,7 +16,7 @@ class ACE_Svc_Export Timer_Service_1 : public ACE_Service_Object // Demonstrates a simple timer service that can be configured // statically. public: - Timer_Service_1 (void); + Timer_Service_1 (); // Default constructor. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -50,14 +50,14 @@ class ACE_Svc_Export Timer_Service_1 : public ACE_Service_Object class ACE_Svc_Export Timer_Service_2 : public Timer_Service_1 { public: - Timer_Service_2 (void); + Timer_Service_2 (); // Default constructor. }; class ACE_Svc_Export Timer_Service_3 : public Timer_Service_1 { public: - Timer_Service_3 (void); + Timer_Service_3 (); // Default constructor. }; diff --git a/ACE/examples/Service_Configurator/Misc/main.cpp b/ACE/examples/Service_Configurator/Misc/main.cpp index 8d717900e6127..0dde3f483a8ad 100644 --- a/ACE/examples/Service_Configurator/Misc/main.cpp +++ b/ACE/examples/Service_Configurator/Misc/main.cpp @@ -19,7 +19,6 @@ #include "Timer_Service.h" - // Create an object that will insert the into the list // of statically linked services that the will // process at run-time. diff --git a/ACE/examples/Shared_Malloc/Malloc.cpp b/ACE/examples/Shared_Malloc/Malloc.cpp index 5cc8afe963506..d4a8e0b0fa94b 100644 --- a/ACE/examples/Shared_Malloc/Malloc.cpp +++ b/ACE/examples/Shared_Malloc/Malloc.cpp @@ -15,7 +15,6 @@ #include "ace/Malloc_T.h" - // Strategic typedefs for memory allocation. typedef ACE_Malloc L_ALLOCATOR; @@ -41,7 +40,7 @@ ACE_Allocator *Malloc::instance_ = 0; // This is a factory that decides what type of allocator to create. ACE_Allocator * -Malloc::instance (void) +Malloc::instance () { if (Malloc::instance_ == 0) { diff --git a/ACE/examples/Shared_Malloc/Malloc.h b/ACE/examples/Shared_Malloc/Malloc.h index 2cce26fb98e37..facf80c8236e1 100644 --- a/ACE/examples/Shared_Malloc/Malloc.h +++ b/ACE/examples/Shared_Malloc/Malloc.h @@ -17,11 +17,11 @@ class Malloc // Allocator Singleton. { public: - static ACE_Allocator *instance (void); + static ACE_Allocator *instance (); // Returns static instance. private: - Malloc (void); + Malloc (); // Ensure Singleton. static ACE_Allocator *instance_; diff --git a/ACE/examples/Shared_Malloc/Options.cpp b/ACE/examples/Shared_Malloc/Options.cpp index 4e4a8c300ba58..0c8fc3710d23e 100644 --- a/ACE/examples/Shared_Malloc/Options.cpp +++ b/ACE/examples/Shared_Malloc/Options.cpp @@ -8,7 +8,7 @@ Options *Options::instance_ = 0; Options * -Options::instance (void) +Options::instance () { if (Options::instance_ == 0) Options::instance_ = new Options (); @@ -17,73 +17,73 @@ Options::instance (void) } const char * -Options::program_name (void) +Options::program_name () { return this->program_name_; } const char * -Options::slave_name (void) +Options::slave_name () { return this->slave_name_; } int -Options::debug (void) +Options::debug () { return this->debug_; } int -Options::exec_slave (void) +Options::exec_slave () { return this->exec_slave_; } size_t -Options::iteration_count (void) +Options::iteration_count () { return this->iteration_count_; } int -Options::use_sbrk (void) +Options::use_sbrk () { return this->use_sbrk_; } size_t -Options::max_msg_size (void) +Options::max_msg_size () { return this->max_msg_size_; } size_t -Options::spawn_count (void) +Options::spawn_count () { return this->spawn_count_; } int -Options::spawn_threads (void) +Options::spawn_threads () { return this->spawn_threads_; } int -Options::use_mmap (void) +Options::use_mmap () { return this->use_mmap_; } int -Options::use_shmem (void) +Options::use_shmem () { return this->use_shmem_; } int -Options::child (void) +Options::child () { return this->child_; } @@ -91,7 +91,7 @@ Options::child (void) // Explain usage and exit. void -Options::print_usage_and_die (void) +Options::print_usage_and_die () { //FUZZ: disable check_for_lack_ACE_OS ACE_ERROR ((LM_ERROR, @@ -112,7 +112,7 @@ Options::print_usage_and_die (void) /* NOTREACHED */ } -Options::Options (void) +Options::Options () : debug_ (0), exec_slave_ (0), iteration_count_ (100), diff --git a/ACE/examples/Shared_Malloc/Options.h b/ACE/examples/Shared_Malloc/Options.h index 0c23fd3d89424..1fd71fde574ad 100644 --- a/ACE/examples/Shared_Malloc/Options.h +++ b/ACE/examples/Shared_Malloc/Options.h @@ -14,34 +14,34 @@ class Options // Options Singleton. { public: - static Options *instance (void); + static Options *instance (); // Return Singleton. void parse_args (int argc, ACE_TCHAR *argv[]); // Parse the arguments. // = Accessor methods. - const char *program_name (void); - const char *slave_name (void); - int debug (void); - int exec_slave (void); - size_t iteration_count (void); - int use_sbrk (void); - int use_shmem (void); - size_t max_msg_size (void); - size_t spawn_count (void); - int spawn_threads (void); - int use_mmap (void); - int child (void); + const char *program_name (); + const char *slave_name (); + int debug (); + int exec_slave (); + size_t iteration_count (); + int use_sbrk (); + int use_shmem (); + size_t max_msg_size (); + size_t spawn_count (); + int spawn_threads (); + int use_mmap (); + int child (); private: - Options (void); + Options (); // Ensure Singleton. static Options *instance_; // Singleton. - void print_usage_and_die (void); + void print_usage_and_die (); // Explain usage and exit. char program_name_[MAXPATHLEN]; diff --git a/ACE/examples/Shared_Malloc/test_malloc.cpp b/ACE/examples/Shared_Malloc/test_malloc.cpp index 9f68c9eb74578..d0a1bf279f960 100644 --- a/ACE/examples/Shared_Malloc/test_malloc.cpp +++ b/ACE/examples/Shared_Malloc/test_malloc.cpp @@ -14,9 +14,8 @@ #include "Options.h" - static int -gen_size (void) +gen_size () { #if defined (ACE_HAS_THREADS) unsigned int seed = @@ -98,7 +97,7 @@ worker (void *arg) // Create the appropriate type of process/thread. static void -spawn (void) +spawn () { if (Options::instance ()->spawn_threads ()) { @@ -169,7 +168,7 @@ spawn (void) // Wait for all the child processes/threads to exit. static void -wait_for_children (void) +wait_for_children () { if (Options::instance ()->spawn_threads ()) { diff --git a/ACE/examples/Shared_Malloc/test_persistence.cpp b/ACE/examples/Shared_Malloc/test_persistence.cpp index 5635297da0348..c57544b1d9b10 100644 --- a/ACE/examples/Shared_Malloc/test_persistence.cpp +++ b/ACE/examples/Shared_Malloc/test_persistence.cpp @@ -27,7 +27,7 @@ static ACE_TCHAR backing_store[MAXPATHLEN + 1] = ACE_TEXT (""); class Employee { public: - Employee (void): name_ (0), id_ (0) {} + Employee () : name_ (0), id_ (0) {} Employee (const char *name, u_long id) : id_ (id) { @@ -36,7 +36,7 @@ class Employee ACE_OS::strcpy (this->name_, name); } - ~Employee (void) { shmem_allocator->free (this->name_); } + ~Employee () { shmem_allocator->free (this->name_); } const char *name () const { return this->name_; } @@ -63,7 +63,7 @@ class Employee { return shmem_allocator->malloc (sizeof (Employee)); } - void operator delete (void *p, const std::nothrow_t&) throw () + void operator delete (void *p, const std::nothrow_t&) noexcept { shmem_allocator->free (p); } @@ -84,16 +84,16 @@ class Employee class GUI_Handler { public: - GUI_Handler (void) { menu (); } + GUI_Handler () { menu (); } - ~GUI_Handler (void) + ~GUI_Handler () { TEST_MALLOC::MEMORY_POOL &pool = shmem_allocator->memory_pool (); pool.sync (); } - int service(void) + int service() { char option[BUFSIZ]; char buf1[BUFSIZ]; @@ -149,7 +149,7 @@ class GUI_Handler return 0; } - void menu(void) + void menu() { cout << endl; cout << "\t************************** " << endl; @@ -169,7 +169,7 @@ class GUI_Handler int insert_employee (const char *name, u_long id); int find_employee (const char *name); - int list_employees (void); + int list_employees (); int delete_employee (const char *name); }; @@ -219,7 +219,7 @@ GUI_Handler::find_employee (const char *name) } int -GUI_Handler::list_employees (void) +GUI_Handler::list_employees () { ACE_DEBUG ((LM_DEBUG, "The following employees were found.......\n\n")); diff --git a/ACE/examples/Shared_Malloc/test_position_independent_malloc.h b/ACE/examples/Shared_Malloc/test_position_independent_malloc.h index d01985ce0dab4..97da10749c17b 100644 --- a/ACE/examples/Shared_Malloc/test_position_independent_malloc.h +++ b/ACE/examples/Shared_Malloc/test_position_independent_malloc.h @@ -1,6 +1,5 @@ // -// Define struct used in test_position_independent_malloc.cpp - needs -// to be in a separate file for template generation on AIX IBM C++. +// Define struct used in test_position_independent_malloc.cpp #ifndef __TEST_POSITION_INDEPENDENT_MALLOC_H #define __TEST_POSITION_INDEPENDENT_MALLOC_H diff --git a/ACE/examples/Shared_Memory/test_MM.cpp b/ACE/examples/Shared_Memory/test_MM.cpp index a589bde588c92..03be6b7363a6e 100644 --- a/ACE/examples/Shared_Memory/test_MM.cpp +++ b/ACE/examples/Shared_Memory/test_MM.cpp @@ -8,7 +8,7 @@ ACE_TCHAR shm_key[] = ACE_TEXT ("/tmp/fooXXXXXX"); static void -client (void) +client () { ACE_Shared_Memory *shm_client = new ACE_Shared_Memory_MM (shm_key); char *shm = (char *) shm_client->malloc (); @@ -21,7 +21,7 @@ client (void) } static void -server (void) +server () { ACE_Shared_Memory *shm_server = new ACE_Shared_Memory_MM (shm_key, SHMSZ); char *shm = (char *) shm_server->malloc (); diff --git a/ACE/examples/Shared_Memory/test_SV.cpp b/ACE/examples/Shared_Memory/test_SV.cpp index 217acf068fca1..ac20d33e93a21 100644 --- a/ACE/examples/Shared_Memory/test_SV.cpp +++ b/ACE/examples/Shared_Memory/test_SV.cpp @@ -6,7 +6,7 @@ #define SHM_KEY (key_t) 5678 static void -client (void) +client () { ACE_Shared_Memory_SV shm_client (SHM_KEY, SHMSZ); char *shm = (char *) shm_client.malloc (); @@ -19,7 +19,7 @@ client (void) } static void -server (void) +server () { ACE_Shared_Memory_SV shm_server (SHM_KEY, SHMSZ, diff --git a/ACE/examples/Smart_Pointers/Gadget.cpp b/ACE/examples/Smart_Pointers/Gadget.cpp index 3ecbe663e2a2c..f0dc39b0f6d58 100644 --- a/ACE/examples/Smart_Pointers/Gadget.cpp +++ b/ACE/examples/Smart_Pointers/Gadget.cpp @@ -9,6 +9,6 @@ #include "Gadget.h" -Gadget::~Gadget (void) +Gadget::~Gadget () { } diff --git a/ACE/examples/Smart_Pointers/Gadget.h b/ACE/examples/Smart_Pointers/Gadget.h index 9455faa05ef70..a6150d152bcae 100644 --- a/ACE/examples/Smart_Pointers/Gadget.h +++ b/ACE/examples/Smart_Pointers/Gadget.h @@ -22,7 +22,7 @@ class Gadget { public: /// Destructor. - virtual ~Gadget (void); + virtual ~Gadget (); /// Add a new part to the gadget. The gadget automatically takes shared /// responsibility for the ownership of the part object since we are passing @@ -32,10 +32,10 @@ class Gadget /// Remove a random part from the gadget. Responsibility for ownership of the /// part is automatically returned to the caller since we are returning a /// Gadget_Part_var. - virtual Gadget_Part_var remove_part (void) = 0; + virtual Gadget_Part_var remove_part () = 0; /// Ask the gadget to print information about the parts that it contains. - virtual void list_parts (void) = 0; + virtual void list_parts () = 0; }; // The Gadget_var smart pointer has shared (reference counted) ownership diff --git a/ACE/examples/Smart_Pointers/Gadget_Factory.cpp b/ACE/examples/Smart_Pointers/Gadget_Factory.cpp index 503e2edce681b..5461f7190c6a1 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Factory.cpp +++ b/ACE/examples/Smart_Pointers/Gadget_Factory.cpp @@ -10,7 +10,7 @@ #include "Gadget_Factory.h" #include "Gadget_Impl.h" -Gadget_var Gadget_Factory::create_gadget (void) +Gadget_var Gadget_Factory::create_gadget () { return Gadget_var (new Gadget_Impl); } diff --git a/ACE/examples/Smart_Pointers/Gadget_Factory.h b/ACE/examples/Smart_Pointers/Gadget_Factory.h index adead6f2d005e..42bfce567d3a4 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Factory.h +++ b/ACE/examples/Smart_Pointers/Gadget_Factory.h @@ -24,7 +24,7 @@ class Gadget_Factory /// transferred to the caller since we return a Gadget_var. This also means /// that the object will be deleted automatically if the caller "forgets" to /// collect the return value. - static Gadget_var create_gadget (void); + static Gadget_var create_gadget (); }; #endif /* GADGET_FACTORY_H */ diff --git a/ACE/examples/Smart_Pointers/Gadget_Impl.cpp b/ACE/examples/Smart_Pointers/Gadget_Impl.cpp index 32b7d1167df19..d7227c9461459 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Impl.cpp +++ b/ACE/examples/Smart_Pointers/Gadget_Impl.cpp @@ -10,12 +10,12 @@ #include "Gadget_Impl.h" #include "ace/Log_Msg.h" -Gadget_Impl::Gadget_Impl (void) +Gadget_Impl::Gadget_Impl () { ACE_DEBUG ((LM_DEBUG, "Gadget_Impl constructor\n")); } -Gadget_Impl::~Gadget_Impl (void) +Gadget_Impl::~Gadget_Impl () { ACE_DEBUG ((LM_DEBUG, "Gadget_Impl destructor\n")); } @@ -25,7 +25,7 @@ void Gadget_Impl::add_part (Gadget_Part_var part) parts_.enqueue_tail (part); } -Gadget_Part_var Gadget_Impl::remove_part (void) +Gadget_Part_var Gadget_Impl::remove_part () { Gadget_Part_var removed_part; if (parts_.dequeue_head (removed_part) == -1) @@ -33,7 +33,7 @@ Gadget_Part_var Gadget_Impl::remove_part (void) return removed_part; } -void Gadget_Impl::list_parts (void) +void Gadget_Impl::list_parts () { ACE_Unbounded_Queue_Iterator iter (parts_); Gadget_Part_var *current_part; diff --git a/ACE/examples/Smart_Pointers/Gadget_Impl.h b/ACE/examples/Smart_Pointers/Gadget_Impl.h index b52663fa2ec92..d0731c31b22f3 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Impl.h +++ b/ACE/examples/Smart_Pointers/Gadget_Impl.h @@ -23,10 +23,10 @@ class Gadget_Impl : public Gadget { public: /// Constructor. - Gadget_Impl (void); + Gadget_Impl (); /// Destructor. - virtual ~Gadget_Impl (void); + virtual ~Gadget_Impl (); /// Add a new part to the gadget. The gadget takes ownership of the part /// object. @@ -34,10 +34,10 @@ class Gadget_Impl : public Gadget /// Remove a random part from the gadget. Ownership of the part is returned /// to the caller. - virtual Gadget_Part_var remove_part (void); + virtual Gadget_Part_var remove_part (); /// Ask the gadget to print information about the parts that it contains. - virtual void list_parts (void); + virtual void list_parts (); private: /// The parts which make up this gadget. The set actually contains instances diff --git a/ACE/examples/Smart_Pointers/Gadget_Part.cpp b/ACE/examples/Smart_Pointers/Gadget_Part.cpp index b70887f57fb36..6aebdecb45d97 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Part.cpp +++ b/ACE/examples/Smart_Pointers/Gadget_Part.cpp @@ -9,6 +9,6 @@ #include "Gadget_Part.h" -Gadget_Part::~Gadget_Part (void) +Gadget_Part::~Gadget_Part () { } diff --git a/ACE/examples/Smart_Pointers/Gadget_Part.h b/ACE/examples/Smart_Pointers/Gadget_Part.h index 5132dfffcffc1..958fb039f6355 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Part.h +++ b/ACE/examples/Smart_Pointers/Gadget_Part.h @@ -23,13 +23,13 @@ class Gadget_Part { public: /// Destructor. - virtual ~Gadget_Part (void); + virtual ~Gadget_Part (); /// Ask the part to print information about itself. - virtual void print_info (void) = 0; + virtual void print_info () = 0; /// Ask the part to remove itself from the gadget that contains it. - virtual void remove_from_owner (void) = 0; + virtual void remove_from_owner () = 0; }; // The Gadget_Part_var smart pointer has shared (reference counted) ownership diff --git a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp index 30c1b0dc83167..cee3b09e54819 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp +++ b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp @@ -22,19 +22,19 @@ Gadget_Part_Impl::Gadget_Part_Impl (Gadget_ptr owner, ACE_DEBUG ((LM_DEBUG, "Gadget_Part_Impl constructor\n")); } -Gadget_Part_Impl::~Gadget_Part_Impl (void) +Gadget_Part_Impl::~Gadget_Part_Impl () { ACE_DEBUG ((LM_DEBUG, "Gadget_Part_Impl destructor\n")); delete [] name_; } -void Gadget_Part_Impl::print_info (void) +void Gadget_Part_Impl::print_info () { ACE_DEBUG ((LM_INFO, "Gadget part: name=%s size=%d\n", name_, size_)); } -void Gadget_Part_Impl::remove_from_owner (void) +void Gadget_Part_Impl::remove_from_owner () { // Need to guarantee the existence of the owner for the duration of this call. Gadget_var owner = owner_; diff --git a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h index 0b63e139a596e..7acd3e631d1c1 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h +++ b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h @@ -25,13 +25,13 @@ class Gadget_Part_Impl : public Gadget_Part Gadget_Part_Impl (Gadget_ptr owner, const char* name, int size); /// Destructor. - virtual ~Gadget_Part_Impl (void); + virtual ~Gadget_Part_Impl (); /// Ask the part to print information about itself. - virtual void print_info (void); + virtual void print_info (); /// Ask the part to remove itself from the gadget that contains it. - virtual void remove_from_owner (void); + virtual void remove_from_owner (); private: /// The gadget that contains this part. diff --git a/ACE/examples/Smart_Pointers/Widget.cpp b/ACE/examples/Smart_Pointers/Widget.cpp index de56e871a728f..92ee626616624 100644 --- a/ACE/examples/Smart_Pointers/Widget.cpp +++ b/ACE/examples/Smart_Pointers/Widget.cpp @@ -9,6 +9,6 @@ #include "Widget.h" -Widget::~Widget (void) +Widget::~Widget () { } diff --git a/ACE/examples/Smart_Pointers/Widget.h b/ACE/examples/Smart_Pointers/Widget.h index 7c1d1ad85c9a9..41006fd2eab55 100644 --- a/ACE/examples/Smart_Pointers/Widget.h +++ b/ACE/examples/Smart_Pointers/Widget.h @@ -21,7 +21,7 @@ class Widget { public: /// Destructor. - virtual ~Widget (void); + virtual ~Widget (); /// Add a new part to the widget. The widget takes ownership of the part /// object. @@ -29,10 +29,10 @@ class Widget /// Remove a random part from the widget. Ownership of the part is returned /// to the caller. - virtual Widget_Part *remove_part (void) = 0; + virtual Widget_Part *remove_part () = 0; /// Ask the widget to print information about the parts that it contains. - virtual void list_parts (void) = 0; + virtual void list_parts () = 0; }; #endif /* WIDGET_H */ diff --git a/ACE/examples/Smart_Pointers/Widget_Factory.cpp b/ACE/examples/Smart_Pointers/Widget_Factory.cpp index e35119d3d514a..52921fa0d1f05 100644 --- a/ACE/examples/Smart_Pointers/Widget_Factory.cpp +++ b/ACE/examples/Smart_Pointers/Widget_Factory.cpp @@ -10,7 +10,7 @@ #include "Widget_Factory.h" #include "Widget_Impl.h" -Widget *Widget_Factory::create_widget (void) +Widget *Widget_Factory::create_widget () { return new Widget_Impl; } diff --git a/ACE/examples/Smart_Pointers/Widget_Factory.h b/ACE/examples/Smart_Pointers/Widget_Factory.h index e78c05e805a5f..792da334295a6 100644 --- a/ACE/examples/Smart_Pointers/Widget_Factory.h +++ b/ACE/examples/Smart_Pointers/Widget_Factory.h @@ -22,7 +22,7 @@ class Widget_Factory public: /// Create an instance of a widget. Ownership of the newly created object is /// transferred to the caller. - static Widget *create_widget (void); + static Widget *create_widget (); }; #endif /* WIDGET_FACTORY_H */ diff --git a/ACE/examples/Smart_Pointers/Widget_Impl.cpp b/ACE/examples/Smart_Pointers/Widget_Impl.cpp index 504fc05089232..e62f3ccdd1cb0 100644 --- a/ACE/examples/Smart_Pointers/Widget_Impl.cpp +++ b/ACE/examples/Smart_Pointers/Widget_Impl.cpp @@ -10,12 +10,12 @@ #include "Widget_Impl.h" #include "ace/Log_Msg.h" -Widget_Impl::Widget_Impl (void) +Widget_Impl::Widget_Impl () { ACE_DEBUG ((LM_DEBUG, "Widget_Impl constructor\n")); } -Widget_Impl::~Widget_Impl (void) +Widget_Impl::~Widget_Impl () { ACE_DEBUG ((LM_DEBUG, "Widget_Impl destructor\n")); } @@ -28,7 +28,7 @@ void Widget_Impl::add_part (Widget_Part *part) parts_.enqueue_tail (new_part); } -Widget_Part *Widget_Impl::remove_part (void) +Widget_Part *Widget_Impl::remove_part () { ACE_Refcounted_Auto_Ptr removed_part; if (parts_.dequeue_head (removed_part) == -1) @@ -38,7 +38,7 @@ Widget_Part *Widget_Impl::remove_part (void) return removed_part.release(); } -void Widget_Impl::list_parts (void) +void Widget_Impl::list_parts () { ACE_Unbounded_Queue_Iterator > iter (parts_); ACE_Refcounted_Auto_Ptr *current_part; diff --git a/ACE/examples/Smart_Pointers/Widget_Impl.h b/ACE/examples/Smart_Pointers/Widget_Impl.h index a8982e77dd526..220c5f752fc67 100644 --- a/ACE/examples/Smart_Pointers/Widget_Impl.h +++ b/ACE/examples/Smart_Pointers/Widget_Impl.h @@ -28,10 +28,10 @@ class Widget_Impl : public Widget { public: /// Constructor. - Widget_Impl (void); + Widget_Impl (); /// Destructor. - virtual ~Widget_Impl (void); + virtual ~Widget_Impl (); /// Add a new part to the widget. The widget takes ownership of the part /// object. @@ -39,10 +39,10 @@ class Widget_Impl : public Widget /// Remove a random part from the widget. Ownership of the part is returned /// to the caller. - virtual Widget_Part *remove_part (void); + virtual Widget_Part *remove_part (); /// Ask the widget to print information about the parts that it contains. - virtual void list_parts (void); + virtual void list_parts (); private: /// The parts which make up this widget. The set actually contains instances diff --git a/ACE/examples/Smart_Pointers/Widget_Part.cpp b/ACE/examples/Smart_Pointers/Widget_Part.cpp index cea74f60aaee3..7f0f81b6fb5b3 100644 --- a/ACE/examples/Smart_Pointers/Widget_Part.cpp +++ b/ACE/examples/Smart_Pointers/Widget_Part.cpp @@ -9,6 +9,6 @@ #include "Widget_Part.h" -Widget_Part::~Widget_Part (void) +Widget_Part::~Widget_Part () { } diff --git a/ACE/examples/Smart_Pointers/Widget_Part.h b/ACE/examples/Smart_Pointers/Widget_Part.h index 2b251ec6e6fae..4661e0b013f29 100644 --- a/ACE/examples/Smart_Pointers/Widget_Part.h +++ b/ACE/examples/Smart_Pointers/Widget_Part.h @@ -19,13 +19,13 @@ class Widget_Part { public: /// Destructor. - virtual ~Widget_Part (void); + virtual ~Widget_Part (); /// Ask the part to print information about itself. - virtual void print_info (void) = 0; + virtual void print_info () = 0; /// Ask the part to remove itself from the widget that contains it. - virtual void remove_from_owner (void) = 0; + virtual void remove_from_owner () = 0; }; #endif /* WIDGET_PART_H */ diff --git a/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp b/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp index b0433a9974642..bc55b76be7f51 100644 --- a/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp +++ b/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp @@ -22,19 +22,19 @@ Widget_Part_Impl::Widget_Part_Impl (Widget *owner, const char* name, int size) ACE_DEBUG ((LM_DEBUG, "Widget_Part_Impl constructor\n")); } -Widget_Part_Impl::~Widget_Part_Impl (void) +Widget_Part_Impl::~Widget_Part_Impl () { ACE_DEBUG ((LM_DEBUG, "Widget_Part_Impl destructor\n")); delete [] name_; } -void Widget_Part_Impl::print_info (void) +void Widget_Part_Impl::print_info () { ACE_DEBUG ((LM_INFO, "Widget part: name=%s size=%d\n", name_, size_)); } -void Widget_Part_Impl::remove_from_owner (void) +void Widget_Part_Impl::remove_from_owner () { // Since we only have a raw pointer to refer to the owner, we have no way of // checking whether the owner still exists, and if it does guaranteeing that diff --git a/ACE/examples/Smart_Pointers/Widget_Part_Impl.h b/ACE/examples/Smart_Pointers/Widget_Part_Impl.h index 28adb326fb3eb..01df1b593d487 100644 --- a/ACE/examples/Smart_Pointers/Widget_Part_Impl.h +++ b/ACE/examples/Smart_Pointers/Widget_Part_Impl.h @@ -25,13 +25,13 @@ class Widget_Part_Impl : public Widget_Part Widget_Part_Impl (Widget *owner, const char* name, int size); /// Destructor. - virtual ~Widget_Part_Impl (void); + virtual ~Widget_Part_Impl (); /// Ask the part to print information about itself. - virtual void print_info (void); + virtual void print_info (); /// Ask the part to remove itself from the widget that contains it. - virtual void remove_from_owner (void); + virtual void remove_from_owner (); private: /// The widget that contains this part. diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp index ec9044d0b7b19..12586b1136d01 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_stdlib.h" - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) int diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp index 8b92f26eba357..b38313766a2b0 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_stdlib.h" - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) // Must be global for signal Message... diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp index b705830d2073b..86081a2049f16 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_unistd.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp index c04a4f8ba875f..1502384605127 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) // Must be global for signal Message... diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/test.h b/ACE/examples/System_V_IPC/SV_Message_Queues/test.h index a6fc1e39efcda..1355d51ddff41 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/test.h +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/test.h @@ -22,13 +22,13 @@ class Message_Data ACE_OS::strncpy (this->mtext_, text, MSGSZ); } - long pid (void) { return this->pid_; } + long pid () { return this->pid_; } void pid (long p) { this->pid_ = p; } - char *user (void) { return this->username_; } + char *user () { return this->username_; } void user (char user[]) { ACE_OS::strncpy (this->username_, user, 9); } - char *text (void) { return this->mtext_; } + char *text () { return this->mtext_; } void text (char text[]) { ACE_OS::strncpy (this->mtext_, text, MSGSZ); } - int length (void) { return sizeof *this - sizeof this->mtext_ + ACE_OS::strlen (this->mtext_) + 1; } + int length () { return sizeof *this - sizeof this->mtext_ + ACE_OS::strlen (this->mtext_) + 1; } protected: long pid_; diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp b/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp index 7e4d1a1fa480b..c2f71ae81a13a 100644 --- a/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp +++ b/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp @@ -11,7 +11,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) // Shared memory allocator (note that this chews up the diff --git a/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp b/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp index 0f399034ec194..aa0ef26866c96 100644 --- a/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp +++ b/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp @@ -6,11 +6,10 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) static void -client (void) +client () { ACE_SV_Shared_Memory shm_client; @@ -26,7 +25,7 @@ client (void) } static void -server (void) +server () { ACE_SV_Shared_Memory shm_server; diff --git a/ACE/examples/Threads/TSS_Data.h b/ACE/examples/Threads/TSS_Data.h index c10a1f8781e6e..3ea13e5f4b197 100644 --- a/ACE/examples/Threads/TSS_Data.h +++ b/ACE/examples/Threads/TSS_Data.h @@ -24,7 +24,7 @@ class TSS_Data { public: - void *data (void) { return this->data_; } + void *data () { return this->data_; } void data (void *v) { this->data_ = v; } private: @@ -35,4 +35,3 @@ class TSS_Data typedef ACE_TSS_Singleton TSS_DATA; - diff --git a/ACE/examples/Threads/TSS_Obj.h b/ACE/examples/Threads/TSS_Obj.h index 1df5b751c8aec..0940110cab77c 100644 --- a/ACE/examples/Threads/TSS_Obj.h +++ b/ACE/examples/Threads/TSS_Obj.h @@ -26,11 +26,10 @@ class TSS_Obj { public: - TSS_Obj (void); - ~TSS_Obj (void); + TSS_Obj (); + ~TSS_Obj (); private: - static ACE_Atomic_Op count_; }; diff --git a/ACE/examples/Threads/TSS_Task.h b/ACE/examples/Threads/TSS_Task.h index 0bb3a765f9645..0804e8f9b8206 100644 --- a/ACE/examples/Threads/TSS_Task.h +++ b/ACE/examples/Threads/TSS_Task.h @@ -22,9 +22,8 @@ class Test_Task { public: - - Test_Task (void); - ~Test_Task (void); + Test_Task (); + ~Test_Task (); int open (void *arg); diff --git a/ACE/examples/Threads/barrier1.cpp b/ACE/examples/Threads/barrier1.cpp index 5db1564217af1..6dea32ad377ff 100644 --- a/ACE/examples/Threads/barrier1.cpp +++ b/ACE/examples/Threads/barrier1.cpp @@ -7,7 +7,6 @@ #include "ace/Service_Config.h" - #if defined (ACE_HAS_THREADS) struct Tester_Args diff --git a/ACE/examples/Threads/barrier2.cpp b/ACE/examples/Threads/barrier2.cpp index aaddab06bc985..112590a639271 100644 --- a/ACE/examples/Threads/barrier2.cpp +++ b/ACE/examples/Threads/barrier2.cpp @@ -15,7 +15,6 @@ #include "ace/Service_Config.h" - #if defined (ACE_HAS_THREADS) #include "ace/Null_Barrier.h" @@ -29,7 +28,7 @@ class Worker_Task : public ACE_Task int n_threads, int inp_serialize = 1); - virtual int producer (void); + virtual int producer (); // produce input for workers virtual int input (ACE_Message_Block *mb); @@ -140,7 +139,7 @@ Worker_Task::service (ACE_Message_Block *mb, // for all other threads to complete this iteration. template int -Worker_Task::svc (void) +Worker_Task::svc () { // Note that the method automatically adds us to // the Thread_Manager when the thread begins. @@ -188,7 +187,7 @@ Worker_Task::svc (void) } template int -Worker_Task::producer (void) +Worker_Task::producer () { // Keep reading stdin, until we reach EOF. diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp index 57fe594f4ae0b..20d6c54332a53 100644 --- a/ACE/examples/Threads/future1.cpp +++ b/ACE/examples/Threads/future1.cpp @@ -24,7 +24,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) typedef ACE_Atomic_Op ATOMIC_INT; @@ -54,7 +53,7 @@ class Scheduler : public ACE_Task_Base friend class Method_RequestWork; public: Scheduler (const char *, Scheduler * = 0); - virtual ~Scheduler (void); + virtual ~Scheduler (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS @@ -64,11 +63,11 @@ class Scheduler : public ACE_Task_Base virtual int svc (); ACE_Future work (u_long param, int count = 1); - ACE_Future name (void); - void end (void); + ACE_Future name (); + void end (); u_long work_i (u_long, int); - const char *name_i (void); + const char *name_i (); private: char *name_; @@ -85,8 +84,8 @@ class Method_Request_work : public ACE_Method_Request { public: Method_Request_work (Scheduler *, u_long, int, ACE_Future &); - virtual ~Method_Request_work (void); - virtual int call (void); + virtual ~Method_Request_work (); + virtual int call (); private: Scheduler *scheduler_; @@ -108,14 +107,14 @@ Method_Request_work::Method_Request_work (Scheduler* new_Scheduler, "(%t) Method_Request_work created\n")); } -Method_Request_work::~Method_Request_work (void) +Method_Request_work::~Method_Request_work () { ACE_DEBUG ((LM_DEBUG, "(%t) Method_Request_work will be deleted.\n")); } int -Method_Request_work::call (void) +Method_Request_work::call () { return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_)); } @@ -129,8 +128,8 @@ class Method_Request_name : public ACE_Method_Request { public: Method_Request_name (Scheduler *, ACE_Future &); - virtual ~Method_Request_name (void); - virtual int call (void); + virtual ~Method_Request_name (); + virtual int call (); private: Scheduler *scheduler_; @@ -146,14 +145,14 @@ Method_Request_name::Method_Request_name (Scheduler *new_scheduler, "(%t) Method_Request_name created\n")); } -Method_Request_name::~Method_Request_name (void) +Method_Request_name::~Method_Request_name () { ACE_DEBUG ((LM_DEBUG, "(%t) Method_Request_name will be deleted.\n")); } int -Method_Request_name::call (void) +Method_Request_name::call () { return future_result_.set (scheduler_->name_i ()); } @@ -167,8 +166,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Scheduler *new_scheduler): scheduler_ (new_scheduler) {} - virtual ~Method_Request_end (void) {} - virtual int call (void) { return -1; } + virtual ~Method_Request_end () {} + virtual int call () { return -1; } private: /// Keep track of our scheduler. @@ -186,7 +185,7 @@ Scheduler::Scheduler (const char *newname, } // Destructor -Scheduler::~Scheduler (void) +Scheduler::~Scheduler () { ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s will be destroyed\n", this->name_)); delete [] this->name_; @@ -212,7 +211,7 @@ Scheduler::close (u_long) // service.. int -Scheduler::svc (void) +Scheduler::svc () { for (;;) { @@ -232,7 +231,7 @@ Scheduler::svc (void) } void -Scheduler::end (void) +Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } @@ -249,7 +248,7 @@ Scheduler::work_i (u_long param, } const char * -Scheduler::name_i (void) +Scheduler::name_i () { char *the_name; @@ -260,7 +259,7 @@ Scheduler::name_i (void) } ACE_Future -Scheduler::name (void) +Scheduler::name () { if (this->scheduler_) // Delegate to the Scheduler. diff --git a/ACE/examples/Threads/future2.cpp b/ACE/examples/Threads/future2.cpp index 1708fbe0d5e10..e8e19fe5cd0f2 100644 --- a/ACE/examples/Threads/future2.cpp +++ b/ACE/examples/Threads/future2.cpp @@ -47,9 +47,8 @@ class Scheduler : public ACE_Task_Base friend class Method_Request_name; friend class Method_Request_end; public: - Scheduler (const char *, Scheduler * = 0); - virtual ~Scheduler (void); + virtual ~Scheduler (); //FUZZ: disable check_for_lack_ACE_OS /// The method that is used to start the active object. @@ -59,8 +58,8 @@ class Scheduler : public ACE_Task_Base // = Here are the methods exported by the class. They return an // . ACE_Future work (u_long param, int count = 1); - ACE_Future name (void); - void end (void); + ACE_Future name (); + void end (); private: //FUZZ: disable check_for_lack_ACE_OS @@ -73,7 +72,7 @@ class Scheduler : public ACE_Task_Base // = Implementation methods. u_long work_i (u_long, int); - char *name_i (void); + char *name_i (); char *name_; ACE_Activation_Queue activation_queue_; @@ -89,8 +88,8 @@ class Method_Request_work : public ACE_Method_Request { public: Method_Request_work (Scheduler *, u_long, int, ACE_Future &); - virtual ~Method_Request_work (void); - virtual int call (void); + virtual ~Method_Request_work (); + virtual int call (); private: Scheduler *scheduler_; @@ -110,12 +109,12 @@ Method_Request_work::Method_Request_work (Scheduler* new_Scheduler, { } -Method_Request_work::~Method_Request_work (void) +Method_Request_work::~Method_Request_work () { } int -Method_Request_work::call (void) +Method_Request_work::call () { return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_)); } @@ -129,8 +128,8 @@ class Method_Request_name : public ACE_Method_Request { public: Method_Request_name (Scheduler *, ACE_Future &); - virtual ~Method_Request_name (void); - virtual int call (void); + virtual ~Method_Request_name (); + virtual int call (); private: Scheduler *scheduler_; @@ -147,14 +146,14 @@ Method_Request_name::Method_Request_name (Scheduler *new_scheduler, " (%t) Method_Request_name created\n")); } -Method_Request_name::~Method_Request_name (void) +Method_Request_name::~Method_Request_name () { ACE_DEBUG ((LM_DEBUG, " (%t) Method_Request_name will be deleted.\n")); } int -Method_Request_name::call (void) +Method_Request_name::call () { return future_result_.set (scheduler_->name_i ()); } @@ -168,8 +167,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {} - virtual ~Method_Request_end (void) {} - virtual int call (void) { return -1; } + virtual ~Method_Request_end () {} + virtual int call () { return -1; } private: /// Keep track of our scheduler. @@ -186,7 +185,7 @@ Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler) } // Destructor -Scheduler::~Scheduler (void) +Scheduler::~Scheduler () { ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s will be destroyed\n", this->name_)); } @@ -208,7 +207,7 @@ Scheduler::close (u_long) } int -Scheduler::svc (void) +Scheduler::svc () { // Main event loop for this active object. for (;;) @@ -229,7 +228,7 @@ Scheduler::svc (void) } void -Scheduler::end (void) +Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } @@ -245,7 +244,7 @@ Scheduler::work_i (u_long param, } char * -Scheduler::name_i (void) +Scheduler::name_i () { char *the_name; @@ -256,7 +255,7 @@ Scheduler::name_i (void) } ACE_Future -Scheduler::name (void) +Scheduler::name () { if (this->scheduler_) // Delegate to the other scheduler @@ -308,7 +307,7 @@ Scheduler::work (u_long newparam, int newcount) } static int -determine_iterations (void) +determine_iterations () { int n_iterations; diff --git a/ACE/examples/Threads/manual_event.cpp b/ACE/examples/Threads/manual_event.cpp index 52fe12859f370..8642d6da3ad39 100644 --- a/ACE/examples/Threads/manual_event.cpp +++ b/ACE/examples/Threads/manual_event.cpp @@ -18,7 +18,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) static ACE_Atomic_Op amount_of_work = 0; @@ -37,7 +36,7 @@ class Pseudo_Barrier Pseudo_Barrier (u_long count); //FUZZ: disable check_for_lack_ACE_OS - int wait (void); + int wait (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -51,7 +50,7 @@ Pseudo_Barrier::Pseudo_Barrier (u_long count) } int -Pseudo_Barrier::wait (void) +Pseudo_Barrier::wait () { if (--this->counter_ == 0) return this->event_.signal (); diff --git a/ACE/examples/Threads/process_manager.cpp b/ACE/examples/Threads/process_manager.cpp index c7cbc2f36d1fb..4e9ebe88d1061 100644 --- a/ACE/examples/Threads/process_manager.cpp +++ b/ACE/examples/Threads/process_manager.cpp @@ -32,7 +32,7 @@ class ExitHandler : public ACE_Event_Handler ExitHandler (const char *name); /// Called when object is removed from the . - virtual ~ExitHandler (void); + virtual ~ExitHandler (); virtual int handle_exit (ACE_Process *proc); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); @@ -48,7 +48,7 @@ ExitHandler::ExitHandler (const char *name) { } -ExitHandler::~ExitHandler (void) +ExitHandler::~ExitHandler () { ACE_DEBUG ((LM_DEBUG, "(%P|%t@%T) ExitHandler \"%s\" destroyed\n", diff --git a/ACE/examples/Threads/process_semaphore.cpp b/ACE/examples/Threads/process_semaphore.cpp index 31defa67b1278..e8c6718c7afa7 100644 --- a/ACE/examples/Threads/process_semaphore.cpp +++ b/ACE/examples/Threads/process_semaphore.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_stdlib.h" - static sig_atomic_t done; extern "C" void diff --git a/ACE/examples/Threads/reader_writer.cpp b/ACE/examples/Threads/reader_writer.cpp index aed53cbda4bd3..b9677035febe4 100644 --- a/ACE/examples/Threads/reader_writer.cpp +++ b/ACE/examples/Threads/reader_writer.cpp @@ -8,7 +8,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) #include "ace/Guard_T.h" @@ -40,7 +39,7 @@ static ACE_Thread_Manager thr_mgr; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, "usage: %n [-r n_readers] [-w n_writers] [-n iteration_count]\n")); diff --git a/ACE/examples/Threads/recursive_mutex.cpp b/ACE/examples/Threads/recursive_mutex.cpp index 42470e525eea2..522a4ce7bfa74 100644 --- a/ACE/examples/Threads/recursive_mutex.cpp +++ b/ACE/examples/Threads/recursive_mutex.cpp @@ -7,7 +7,6 @@ #include "ace/Get_Opt.h" - #if defined (ACE_HAS_THREADS) #include "ace/Guard_T.h" @@ -19,7 +18,7 @@ static size_t n_threads = 4; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, "usage: %n [-t n_threads] [-n iteration_count]\n")); diff --git a/ACE/examples/Threads/task_five.cpp b/ACE/examples/Threads/task_five.cpp index 1a5a5c197c077..a999638939a8f 100644 --- a/ACE/examples/Threads/task_five.cpp +++ b/ACE/examples/Threads/task_five.cpp @@ -11,7 +11,6 @@ //============================================================================= - #include "ace/OS_main.h" #include "ace/Thread_Manager.h" #include "ace/Task.h" @@ -34,17 +33,17 @@ class Test_Task : public ACE_Task { public: Test_Task (ACE_Thread_Manager * = ACE_Thread_Manager::instance ()); - ~Test_Task (void) {}; + ~Test_Task () {}; //FUZZ: disable check_for_lack_ACE_OS int open (void * = 0); - int svc (void); + int svc (); int close (u_long); ///FUZZ: enable check_for_lack_ACE_OS - int shutdown (void); + int shutdown (); - int synch (void); + int synch (); }; Test_Task::Test_Task (ACE_Thread_Manager *thrmgr) @@ -67,7 +66,7 @@ Test_Task::open (void *) } int -Test_Task::svc (void) +Test_Task::svc () { while (thr_mgr_->testcancel (ACE_OS::thr_self ()) == 0) // Sleep for 350 msecs. @@ -84,13 +83,13 @@ Test_Task::close (u_long) } int -Test_Task::shutdown (void) +Test_Task::shutdown () { return thr_mgr_->cancel_grp (grp_id_); } int -Test_Task::synch (void) +Test_Task::synch () { return thr_mgr_->wait_grp (grp_id_); } diff --git a/ACE/examples/Threads/task_four.cpp b/ACE/examples/Threads/task_four.cpp index e1f06fa7d1f83..200aa17f52cb4 100644 --- a/ACE/examples/Threads/task_four.cpp +++ b/ACE/examples/Threads/task_four.cpp @@ -119,7 +119,7 @@ Worker_Task::open (void *) } int -Worker_Task::svc (void) +Worker_Task::svc () { ACE_DEBUG ((LM_DEBUG, " (%t) in worker %d\n", @@ -167,7 +167,7 @@ Invoker_Task::Invoker_Task (ACE_Thread_Manager *thr_mgr, // for all other threads to complete this iteration. int -Invoker_Task::svc (void) +Invoker_Task::svc () { // Note that the ACE_Task::svc_run () method automatically adds us // to the Thread_Manager when the thread begins. diff --git a/ACE/examples/Threads/task_one.cpp b/ACE/examples/Threads/task_one.cpp index bb0474c28941a..e2dab9b6369d3 100644 --- a/ACE/examples/Threads/task_one.cpp +++ b/ACE/examples/Threads/task_one.cpp @@ -8,7 +8,6 @@ #include "ace/Service_Config.h" - #if defined (ACE_HAS_THREADS) #include "ace/Task.h" @@ -50,7 +49,7 @@ Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, // for all other threads to complete this iteration. int -Barrier_Task::svc (void) +Barrier_Task::svc () { // Note that the ACE_Task::svc_run() method automatically adds us to // the Thread_Manager when the thread begins. diff --git a/ACE/examples/Threads/task_three.cpp b/ACE/examples/Threads/task_three.cpp index dd7d1c749ee8f..89d118daba0b7 100644 --- a/ACE/examples/Threads/task_three.cpp +++ b/ACE/examples/Threads/task_three.cpp @@ -22,7 +22,6 @@ #include "ace/Signal.h" - #if defined (ACE_HAS_THREADS) static ACE_OSTREAM_TYPE *out_stream = 0; @@ -33,8 +32,8 @@ static const size_t TASK_COUNT = 130; class Test_Task : public ACE_Task { public: - Test_Task (void); - ~Test_Task (void); + Test_Task (); + ~Test_Task (); //FUZZ: disable check_for_lack_ACE_OS virtual int open (void *args = 0); @@ -56,7 +55,7 @@ size_t Test_Task::done_cnt_ = 0; static ACE_Thread_Mutex Lock; -Test_Task::Test_Task (void) +Test_Task::Test_Task () { ACE_GUARD (ACE_Thread_Mutex, ace_mon, Lock); @@ -67,7 +66,7 @@ Test_Task::Test_Task (void) Test_Task::current_count_)); } -Test_Task::~Test_Task (void) +Test_Task::~Test_Task () { ACE_GUARD (ACE_Thread_Mutex, ace_mon, Lock); @@ -96,7 +95,7 @@ Test_Task::close (u_long) } int -Test_Task::svc (void) +Test_Task::svc () { // Every thread must register the same stream to write to file. if (out_stream) diff --git a/ACE/examples/Threads/task_two.cpp b/ACE/examples/Threads/task_two.cpp index 828322defa8d8..47ccea2ae985b 100644 --- a/ACE/examples/Threads/task_two.cpp +++ b/ACE/examples/Threads/task_two.cpp @@ -9,7 +9,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) typedef ACE_Atomic_Op ATOMIC_INT; @@ -68,7 +67,7 @@ Task_Test::close (u_long) } int -Task_Test::svc (void) +Task_Test::svc () { wait_count++; max_count++; diff --git a/ACE/examples/Threads/thread_manager.cpp b/ACE/examples/Threads/thread_manager.cpp index f38c9ac932ec4..408ca76f53cea 100644 --- a/ACE/examples/Threads/thread_manager.cpp +++ b/ACE/examples/Threads/thread_manager.cpp @@ -10,7 +10,6 @@ #include "ace/Signal.h" - #if defined (ACE_HAS_THREADS) extern "C" void diff --git a/ACE/examples/Threads/thread_pool.cpp b/ACE/examples/Threads/thread_pool.cpp index 9d560cb29e00a..9ea0488c33038 100644 --- a/ACE/examples/Threads/thread_pool.cpp +++ b/ACE/examples/Threads/thread_pool.cpp @@ -17,7 +17,6 @@ #include "ace/Service_Config.h" - #if defined (ACE_HAS_THREADS) // Default number of iterations to run the test. @@ -35,7 +34,7 @@ class Thread_Pool : public ACE_Task int n_threads); // Constructor activates in the thread pool. - ~Thread_Pool (void); + ~Thread_Pool (); // Destructor... virtual int svc (); @@ -73,7 +72,7 @@ Thread_Pool::Thread_Pool (ACE_Thread_Manager *thr_mgr, "activate failed")); } -Thread_Pool::~Thread_Pool (void) +Thread_Pool::~Thread_Pool () { } @@ -90,7 +89,7 @@ Thread_Pool::put (ACE_Message_Block *mb, // for all other threads to complete this iteration. int -Thread_Pool::svc (void) +Thread_Pool::svc () { // Note that the method automatically adds us to // the Thread_Manager when the thread begins. diff --git a/ACE/examples/Threads/thread_specific.h b/ACE/examples/Threads/thread_specific.h index fbc18d450f758..d5adaca837028 100644 --- a/ACE/examples/Threads/thread_specific.h +++ b/ACE/examples/Threads/thread_specific.h @@ -13,15 +13,15 @@ class Errno { public: - int error (void) { return this->errno_; } + int error () { return this->errno_; } void error (int i) { this->errno_ = i; } - int line (void) { return this->lineno_; } + int line () { return this->lineno_; } void line (int l) { this->lineno_ = l; } // Errno::flags_ is a static variable, so we've got to protect it // with a mutex since it isn't kept in thread-specific storage. - int flags (void) + int flags () { ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1); diff --git a/ACE/examples/Threads/token.cpp b/ACE/examples/Threads/token.cpp index b9c7bbd3e4182..411b37fbdf7e9 100644 --- a/ACE/examples/Threads/token.cpp +++ b/ACE/examples/Threads/token.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_time.h" - #if defined (ACE_HAS_THREADS) class My_Task : public ACE_Task @@ -40,7 +39,7 @@ My_Task::sleep_hook (void *) // Test out the behavior of the ACE_Token class. int -My_Task::svc (void) +My_Task::svc () { for (size_t i = 0; i < 100; i++) { diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp index 9fa78c3f2af4b..201aee8885e11 100644 --- a/ACE/examples/Threads/tss1.cpp +++ b/ACE/examples/Threads/tss1.cpp @@ -20,12 +20,10 @@ #include "ace/Task.h" - #if defined (ACE_HAS_THREADS) #include "thread_specific.h" -// (Sun C++ 4.2 with -O3 won't link if the following is not const.) static const int iterations = 100; // Static variables. @@ -33,7 +31,6 @@ ACE_MT (ACE_Thread_Mutex Errno::lock_); int Errno::flags_; // This is our thread-specific error handler... -// (Sun C++ 4.2 with -O3 won't link if the following is static.) ACE_TSS TSS_Error; // Keeps track of whether Tester::close () has started. @@ -44,8 +41,8 @@ template class Tester: public ACE_Task { public: - Tester (void) {} - ~Tester (void) {} + Tester () {} + ~Tester () {} virtual int svc (); @@ -58,7 +55,7 @@ class Tester: public ACE_Task }; template int -Tester::svc (void) +Tester::svc () { ACE_DEBUG ((LM_DEBUG, "(%t) svc: setting error code to 1\n")); diff --git a/ACE/examples/Threads/tss2.cpp b/ACE/examples/Threads/tss2.cpp index e7ee60fee4dc0..eba9b59e29d60 100644 --- a/ACE/examples/Threads/tss2.cpp +++ b/ACE/examples/Threads/tss2.cpp @@ -20,7 +20,6 @@ #include "TSS_Task.h" - #if defined (ACE_HAS_THREADS) const int MAX_TASKS = 4; @@ -36,26 +35,26 @@ static ACE_Token token; ACE_Atomic_Op TSS_Obj::count_ = 0; -TSS_Obj::TSS_Obj (void) +TSS_Obj::TSS_Obj () { TSS_Obj::count_++; ACE_DEBUG ((LM_DEBUG, "(%t) TSS_Obj+: %d\n", TSS_Obj::count_.value ())); } -TSS_Obj::~TSS_Obj (void) +TSS_Obj::~TSS_Obj () { TSS_Obj::count_--; ACE_DEBUG ((LM_DEBUG, "(%t) TSS_Obj-: %d\n", TSS_Obj::count_.value ())); } -Test_Task::Test_Task (void) +Test_Task::Test_Task () { Test_Task::count_++; ACE_DEBUG ((LM_DEBUG, "(%t) Test_Task+: %d\n", Test_Task::count_.value ())); } -Test_Task::~Test_Task (void) +Test_Task::~Test_Task () { Test_Task::count_--; diff --git a/ACE/examples/Threads/wfmo.cpp b/ACE/examples/Threads/wfmo.cpp index a0c22c3399151..08ee7eb82de7c 100644 --- a/ACE/examples/Threads/wfmo.cpp +++ b/ACE/examples/Threads/wfmo.cpp @@ -11,7 +11,6 @@ #include "ace/OS_main.h" - #if defined (ACE_WIN32) // Number of threads. @@ -47,7 +46,7 @@ WFMO_Test::open (void *arg) } int -WFMO_Test::svc (void) +WFMO_Test::svc () { while(1) { diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp index daab575784ee4..b1e1f1367bf9e 100644 --- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp @@ -19,7 +19,6 @@ #include "Async_Timer_Queue_Test.h" - // Hook method that is called to handle the expiration of a timer. int Async_Timer_Handler::handle_timeout (const ACE_Time_Value &tv, @@ -44,7 +43,7 @@ Async_Timer_Queue *Async_Timer_Queue::instance_ = 0; // Implement the Singleton logic. Async_Timer_Queue * -Async_Timer_Queue::instance (void) +Async_Timer_Queue::instance () { if (Async_Timer_Queue::instance_ == 0) { @@ -70,7 +69,7 @@ Async_Timer_Queue::Async_Timer_Queue (ACE_Sig_Set *ss) : // Dump the contents of the queue when we receive ^C. void -Async_Timer_Queue::dump (void) +Async_Timer_Queue::dump () { ACE_DEBUG ((LM_DEBUG, "begin dumping timer queue\n")); @@ -197,7 +196,7 @@ signal_handler (int signum) // However, SIGQUIT is never blocked... static void -register_signal_handlers (void) +register_signal_handlers () { #if !defined (ACE_LACKS_UNIX_SIGNALS) // Register SIGQUIT (never blocked). @@ -220,14 +219,14 @@ register_signal_handlers (void) // constructor -Async_Timer_Queue_Test_Driver::Async_Timer_Queue_Test_Driver (void) +Async_Timer_Queue_Test_Driver::Async_Timer_Queue_Test_Driver () { } // displays the menu of options. int -Async_Timer_Queue_Test_Driver::display_menu (void) +Async_Timer_Queue_Test_Driver::display_menu () { // The menu of options provided to the user. static char menu[] = @@ -244,7 +243,7 @@ Async_Timer_Queue_Test_Driver::display_menu (void) // Initializes the test driver. int -Async_Timer_Queue_Test_Driver::init (void) +Async_Timer_Queue_Test_Driver::init () { typedef Command CMD; diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h index 9e4c74bd4c5f7..69d4568118fc2 100644 --- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h +++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h @@ -56,7 +56,7 @@ class Async_Timer_Queue typedef int (Async_Timer_Queue::*ACTION) (void *); /// Singleton access point. - static Async_Timer_Queue *instance (void); + static Async_Timer_Queue *instance (); /// Schedule a timer to expire in the future. void schedule (u_int microsecs); @@ -65,7 +65,7 @@ class Async_Timer_Queue void cancel (long timer_id); /// Dump the contents of the queue. - void dump (void); + void dump (); /// hook method to schedule a timer. Called from /// @@ -108,13 +108,13 @@ class Async_Timer_Queue class ACE_Svc_Export Async_Timer_Queue_Test_Driver : public Timer_Queue_Test_Driver { public: - Async_Timer_Queue_Test_Driver (void); + Async_Timer_Queue_Test_Driver (); /// Print menu of options. - virtual int display_menu (void); + virtual int display_menu (); /// Initializes the driver's internal variables inherited from the parent - virtual int init (void); + virtual int init (); }; #endif /* _ASYNC_TIMER_QUEUE_TEST_H_ */ diff --git a/ACE/examples/Timer_Queue/Custom_Handler.cpp b/ACE/examples/Timer_Queue/Custom_Handler.cpp index 9fa50ffdc3e7a..5e7357260e905 100644 --- a/ACE/examples/Timer_Queue/Custom_Handler.cpp +++ b/ACE/examples/Timer_Queue/Custom_Handler.cpp @@ -19,7 +19,7 @@ Custom_Handler::Custom_Handler(const ACE_Time_Value &expiration_time) { } -Custom_Handler::~Custom_Handler (void) +Custom_Handler::~Custom_Handler () { } diff --git a/ACE/examples/Timer_Queue/Custom_Handler.h b/ACE/examples/Timer_Queue/Custom_Handler.h index 0419496277865..3da0b1aab3274 100644 --- a/ACE/examples/Timer_Queue/Custom_Handler.h +++ b/ACE/examples/Timer_Queue/Custom_Handler.h @@ -28,12 +28,10 @@ */ class Custom_Handler { - public: - Custom_Handler (const ACE_Time_Value &expiration_time); - virtual ~Custom_Handler (void); + virtual ~Custom_Handler (); // Set the custom handler's id void set_id (int id); @@ -43,7 +41,6 @@ class Custom_Handler const void *arg); private: - // Store the expected time of expiration, it is used to print a nice // message saying how much delay was at the actual expiration time. ACE_Time_Value expires_; @@ -61,7 +58,6 @@ class Custom_Handler class ACE_Svc_Export Custom_Handler_Upcall { public: - typedef ACE_Timer_Queue_T TTimerQueue; diff --git a/ACE/examples/Timer_Queue/Driver.cpp b/ACE/examples/Timer_Queue/Driver.cpp index 52b1332ea621d..345a1fc68f14d 100644 --- a/ACE/examples/Timer_Queue/Driver.cpp +++ b/ACE/examples/Timer_Queue/Driver.cpp @@ -21,7 +21,6 @@ #include "Driver.h" - // constructor template @@ -34,7 +33,7 @@ Command::Command (RECEIVER &recvr, // destructor template -Command::~Command (void) +Command::~Command () { } @@ -49,12 +48,12 @@ Command::execute (void *arg) // gets the next request from the user input. template -Timer_Queue_Test_Driver::~Timer_Queue_Test_Driver (void) +Timer_Queue_Test_Driver::~Timer_Queue_Test_Driver () { } template int -Timer_Queue_Test_Driver::get_next_request (void) +Timer_Queue_Test_Driver::get_next_request () { char buf[BUFSIZ]; @@ -74,7 +73,7 @@ Timer_Queue_Test_Driver::get_next_request (void) // Runs the test. template int -Timer_Queue_Test_Driver::run_test (void) +Timer_Queue_Test_Driver::run_test () { this->init (); @@ -133,7 +132,6 @@ Timer_Queue_Test_Driver::parse_commands (const char *buf) if (cancel_cmd_->execute ((void *) &id) == -1) ACE_DEBUG ((LM_DEBUG, "Timer #%d is not valid\n", id)); - } break; /* NOTREACHED */ diff --git a/ACE/examples/Timer_Queue/Driver.h b/ACE/examples/Timer_Queue/Driver.h index 2a570dd8247a0..ac9d6a98c4906 100644 --- a/ACE/examples/Timer_Queue/Driver.h +++ b/ACE/examples/Timer_Queue/Driver.h @@ -46,7 +46,7 @@ class Command /// of the Command to . Command (RECEIVER &recvr, ACTION action); - virtual ~Command (void); + virtual ~Command (); /// Invokes the method from the object . virtual int execute (void *arg); @@ -77,7 +77,7 @@ class Timer_Queue_Test_Driver { public: /// Default destructor - virtual ~Timer_Queue_Test_Driver (void); + virtual ~Timer_Queue_Test_Driver (); /// Breaks up the input string buffer into pieces and executes /// the appropriate method to handle that operation. @@ -88,11 +88,11 @@ class Timer_Queue_Test_Driver * of the class should normally invoke this method. * Returns 0 when successful, or 0 otherwise. */ - virtual int run_test (void); + virtual int run_test (); /// This internal method gets the next request from the user. /// Returns -1 when user wants to exit. Returns 0 otherwise. - virtual int get_next_request (void); + virtual int get_next_request (); /** * Reads input from the user into the buffer with a maximum @@ -104,10 +104,10 @@ class Timer_Queue_Test_Driver // = Template Methods. /// Prints the user interface for the driver to STDOUT. - virtual int display_menu (void)=0; + virtual int display_menu () = 0; /// Initializes values and operations for the driver. - virtual int init (void)=0; + virtual int init () = 0; protected: /// timer queue @@ -128,12 +128,6 @@ class Timer_Queue_Test_Driver Command *shutdown_cmd_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Driver.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Driver.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _DRIVER_H_ */ diff --git a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp index 8463e2ba5eedb..6d668f9edc840 100644 --- a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp @@ -20,7 +20,6 @@ #include "Reactor_Timer_Queue_Test.h" - void Reactor_Timer_Handler::set_timer_id (long tid) { @@ -51,7 +50,7 @@ Input_Handler::Input_Handler (ACE_Timer_Queue *tq, } int -Input_Handler::done (void) +Input_Handler::done () { return this->done_; } @@ -128,19 +127,19 @@ Input_Handler::handle_input (ACE_HANDLE) return driver_.get_next_request (); } -Reactor_Timer_Queue_Test_Driver::Reactor_Timer_Queue_Test_Driver (void) +Reactor_Timer_Queue_Test_Driver::Reactor_Timer_Queue_Test_Driver () : thandler_ (&timer_queue_, *this) { } -Reactor_Timer_Queue_Test_Driver::~Reactor_Timer_Queue_Test_Driver (void) +Reactor_Timer_Queue_Test_Driver::~Reactor_Timer_Queue_Test_Driver () { // unhook our timer queue ACE_Reactor::instance ()->timer_queue (0); } int -Reactor_Timer_Queue_Test_Driver::display_menu (void) +Reactor_Timer_Queue_Test_Driver::display_menu () { static char menu[] = "\n*****\n" @@ -157,7 +156,7 @@ Reactor_Timer_Queue_Test_Driver::display_menu (void) } int -Reactor_Timer_Queue_Test_Driver::init (void) +Reactor_Timer_Queue_Test_Driver::init () { typedef Command CMD; @@ -193,7 +192,7 @@ Reactor_Timer_Queue_Test_Driver::init (void) // run test was overrun due to the reactive way of handling input. int -Reactor_Timer_Queue_Test_Driver::run_test (void) +Reactor_Timer_Queue_Test_Driver::run_test () { ACE_DEBUG ((LM_DEBUG, "TIMER TEST STARTED\n")); diff --git a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h index fc39a412a2ca8..33b74a1fb5c4a 100644 --- a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h +++ b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h @@ -61,7 +61,7 @@ class Input_Handler : public ACE_Event_Handler * exiting the program.A value of 0 indicates that we are NOT done, * 1 otherwise. */ - int done (void); + int done (); // = Hook methods to be called from @@ -112,23 +112,23 @@ class ACE_Svc_Export Reactor_Timer_Queue_Test_Driver : public Timer_Queue_Test_D * methods are the common factored out code from other * implementations of timer queues. */ - Reactor_Timer_Queue_Test_Driver (void); + Reactor_Timer_Queue_Test_Driver (); /// Default destructor - virtual ~Reactor_Timer_Queue_Test_Driver (void); + virtual ~Reactor_Timer_Queue_Test_Driver (); /// Prints the menu of options. - virtual int display_menu (void); + virtual int display_menu (); /** * Sets the timer queue that the REACTOR will use; registers the * stdin input handler with the REACTOR and sets the s that * the will execute(). */ - virtual int init (void); + virtual int init (); /// Main entry point to the test driver implementation. - virtual int run_test (void); + virtual int run_test (); private: /// This is the stdin handler. diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp index 43f8ab11b51a3..8f6bae445ad52 100644 --- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp +++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp @@ -35,7 +35,7 @@ Custom_Handler_Input_Task::Custom_Handler_Input_Task (Thread_Timer_Queue *queue, // user. int -Custom_Handler_Input_Task::svc (void) +Custom_Handler_Input_Task::svc () { for (;;) // call back to the driver's implementation on how to read and @@ -127,7 +127,7 @@ Custom_Handler_Input_Task::shutdown_timer (void *) } void -Custom_Handler_Input_Task::dump (void) +Custom_Handler_Input_Task::dump () { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->queue_->mutex ()); @@ -145,24 +145,24 @@ Custom_Handler_Input_Task::dump (void) // constructor -Thread_Timer_Queue_Custom_Handler_Test::Thread_Timer_Queue_Custom_Handler_Test (void) +Thread_Timer_Queue_Custom_Handler_Test::Thread_Timer_Queue_Custom_Handler_Test () : input_task_ (&timer_queue_, *this) { } -Thread_Timer_Queue_Custom_Handler_Test::~Thread_Timer_Queue_Custom_Handler_Test (void) +Thread_Timer_Queue_Custom_Handler_Test::~Thread_Timer_Queue_Custom_Handler_Test () { } int -Thread_Timer_Queue_Custom_Handler_Test::run_test (void) +Thread_Timer_Queue_Custom_Handler_Test::run_test () { this->init (); return 0; } int -Thread_Timer_Queue_Custom_Handler_Test::display_menu (void) +Thread_Timer_Queue_Custom_Handler_Test::display_menu () { static char menu[] = "Usage:\n" @@ -178,7 +178,7 @@ Thread_Timer_Queue_Custom_Handler_Test::display_menu (void) } int -Thread_Timer_Queue_Custom_Handler_Test::init (void) +Thread_Timer_Queue_Custom_Handler_Test::init () { typedef Command CMD; diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h index 6a357be66c937..452543671f996 100644 --- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h +++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h @@ -81,7 +81,7 @@ class Custom_Handler_Input_Task : public ACE_Task_Base int shutdown_timer (void *); /// Dump the state of the timer queue. - void dump (void); + void dump (); private: /// The timer queue implementation. @@ -108,12 +108,12 @@ class Custom_Handler_Input_Task : public ACE_Task_Base class ACE_Svc_Export Thread_Timer_Queue_Custom_Handler_Test : public Timer_Queue_Test_Driver { public: - Thread_Timer_Queue_Custom_Handler_Test (void); - ~Thread_Timer_Queue_Custom_Handler_Test (void); + Thread_Timer_Queue_Custom_Handler_Test (); + ~Thread_Timer_Queue_Custom_Handler_Test (); - virtual int display_menu (void); - virtual int init (void); - virtual int run_test (void); + virtual int display_menu (); + virtual int init (); + virtual int run_test (); private: /// Subclassed from ACE_Task. diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp index c49e8ca9756e4..5c238e99af1f3 100644 --- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp @@ -23,7 +23,6 @@ #include "ace/Thread_Mutex.h" - // Administrivia methods... Handler::Handler(const ACE_Time_Value &expiration_time) : expires_ (expiration_time), @@ -31,7 +30,7 @@ Handler::Handler(const ACE_Time_Value &expiration_time) { } -Handler::~Handler (void) +Handler::~Handler () { } @@ -76,7 +75,7 @@ Input_Task::Input_Task (Thread_Timer_Queue *queue, // user. int -Input_Task::svc (void) +Input_Task::svc () { for (;;) // call back to the driver's implementation on how to read and @@ -168,7 +167,7 @@ Input_Task::shutdown_timer (void *) } void -Input_Task::dump (void) +Input_Task::dump () { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->queue_->mutex ()); @@ -186,24 +185,24 @@ Input_Task::dump (void) // constructor -Thread_Timer_Queue_Test_Driver::Thread_Timer_Queue_Test_Driver (void) +Thread_Timer_Queue_Test_Driver::Thread_Timer_Queue_Test_Driver () : input_task_ (&timer_queue_, *this) { } -Thread_Timer_Queue_Test_Driver::~Thread_Timer_Queue_Test_Driver (void) +Thread_Timer_Queue_Test_Driver::~Thread_Timer_Queue_Test_Driver () { } int -Thread_Timer_Queue_Test_Driver::run_test (void) +Thread_Timer_Queue_Test_Driver::run_test () { this->init (); return 0; } int -Thread_Timer_Queue_Test_Driver::display_menu (void) +Thread_Timer_Queue_Test_Driver::display_menu () { static char menu[] = "Usage:\n" @@ -219,7 +218,7 @@ Thread_Timer_Queue_Test_Driver::display_menu (void) } int -Thread_Timer_Queue_Test_Driver::init (void) +Thread_Timer_Queue_Test_Driver::init () { typedef Command CMD; diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h index 10e8443ad8c6b..abdabe082a27c 100644 --- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h +++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h @@ -83,7 +83,7 @@ class Input_Task : public ACE_Task_Base int shutdown_timer (void *); /// Dump the state of the timer queue. - void dump (void); + void dump (); private: /// The timer queue implementation. @@ -110,12 +110,12 @@ class Input_Task : public ACE_Task_Base class ACE_Svc_Export Thread_Timer_Queue_Test_Driver : public Timer_Queue_Test_Driver { public: - Thread_Timer_Queue_Test_Driver (void); - ~Thread_Timer_Queue_Test_Driver (void); + Thread_Timer_Queue_Test_Driver (); + ~Thread_Timer_Queue_Test_Driver (); - virtual int display_menu (void); - virtual int init (void); - virtual int run_test (void); + virtual int display_menu (); + virtual int init (); + virtual int run_test (); private: /// Subclassed from ACE_Task. @@ -134,7 +134,7 @@ class Handler : public ACE_Event_Handler { public: Handler (const ACE_Time_Value &expiration_time); - ~Handler (void); + ~Handler (); /// Store an "id" for the Handler, which is only use to print better /// messages. diff --git a/ACE/examples/Web_Crawler/Command_Processor.cpp b/ACE/examples/Web_Crawler/Command_Processor.cpp index 4957b91c4d01c..e629a4a0ded5d 100644 --- a/ACE/examples/Web_Crawler/Command_Processor.cpp +++ b/ACE/examples/Web_Crawler/Command_Processor.cpp @@ -6,8 +6,7 @@ #include "URL_Visitor.h" - -Command::~Command (void) +Command::~Command () { } @@ -17,9 +16,8 @@ URL_Command::URL_Command (URL *url) } int -URL_Command::execute (void) +URL_Command::execute () { - ACE_CString check_string (ACE_TEXT_ALWAYS_CHAR (this->url_->url_addr ().get_path_name ())); if (check_string.find ("news:") != ACE_CString::npos) @@ -56,28 +54,28 @@ URL_Command::execute (void) } int -URL_Command::destroy (void) +URL_Command::destroy () { delete this; return 0; } -Command_Processor::Command_Processor (void) +Command_Processor::Command_Processor () { } -Command_Processor::~Command_Processor (void) +Command_Processor::~Command_Processor () { } int -Command_Processor::destroy (void) +Command_Processor::destroy () { delete this; return 0; } int -Command_Processor::execute (void) +Command_Processor::execute () { Command *command; while (this->url_queue_.is_empty () != 1) diff --git a/ACE/examples/Web_Crawler/Command_Processor.h b/ACE/examples/Web_Crawler/Command_Processor.h index d0d8cd8860aea..18fb594c0bab9 100644 --- a/ACE/examples/Web_Crawler/Command_Processor.h +++ b/ACE/examples/Web_Crawler/Command_Processor.h @@ -33,11 +33,11 @@ class Command { public: /// Virtual destructor. - virtual ~Command (void); + virtual ~Command (); /// This is the entry point to execute the command. - virtual int execute (void) = 0; - virtual int destroy (void) = 0; + virtual int execute () = 0; + virtual int destroy () = 0; }; /** @@ -54,10 +54,10 @@ class URL_Command : public Command URL_Command (URL *); /// Execute the URL command. - virtual int execute (void); + virtual int execute (); /// Commit suicide. - int destroy (void); + int destroy (); private: /// Pointer to the URL. URL *url_; @@ -73,20 +73,20 @@ class URL_Command : public Command class Command_Processor { public: - Command_Processor (void); + Command_Processor (); /// Insert a new into the 's queue. int insert (Command *); /// Execute all the in the queue. - int execute (void); + int execute (); /// Destroy the . - int destroy (void); + int destroy (); protected: /// Ensure dynamic allocation. - ~Command_Processor (void); + ~Command_Processor (); private: // @@ You fill in here... diff --git a/ACE/examples/Web_Crawler/HTTP_URL.cpp b/ACE/examples/Web_Crawler/HTTP_URL.cpp index af4d404072dbb..3a0206d04f813 100644 --- a/ACE/examples/Web_Crawler/HTTP_URL.cpp +++ b/ACE/examples/Web_Crawler/HTTP_URL.cpp @@ -6,7 +6,6 @@ #include "HTTP_URL.h" - const ACE_URL_Addr & HTTP_URL::url_addr () const { @@ -22,7 +21,7 @@ HTTP_URL::HTTP_URL (const ACE_URL_Addr &url_addr, } ssize_t -HTTP_URL::send_request (void) +HTTP_URL::send_request () { size_t commandsize = ACE_OS::strlen (this->url_addr ().get_path_name ()) @@ -77,7 +76,7 @@ HTTP_URL::accept (URL_Visitor *visitor) } int -HTTP_URL::destroy (void) +HTTP_URL::destroy () { delete this; return 0; diff --git a/ACE/examples/Web_Crawler/HTTP_URL.h b/ACE/examples/Web_Crawler/HTTP_URL.h index 87ab46b56a5f4..817a5f1119e75 100644 --- a/ACE/examples/Web_Crawler/HTTP_URL.h +++ b/ACE/examples/Web_Crawler/HTTP_URL.h @@ -47,13 +47,13 @@ class HTTP_URL : public URL /// Send a command to fetch the contents in the URI from the /// server. - virtual ssize_t send_request (void); + virtual ssize_t send_request (); /// Returns the URL that we represent. virtual const ACE_URL_Addr &url_addr () const; /// Commit suicide - int destroy (void); + int destroy (); private: /// Address of the URL we're connected to. ACE_URL_Addr url_addr_; diff --git a/ACE/examples/Web_Crawler/Iterators.cpp b/ACE/examples/Web_Crawler/Iterators.cpp index ef691d18f68f1..d5edd7a5f12bb 100644 --- a/ACE/examples/Web_Crawler/Iterators.cpp +++ b/ACE/examples/Web_Crawler/Iterators.cpp @@ -2,12 +2,12 @@ #include "Options.h" #include "Iterators.h" -URL_Iterator::~URL_Iterator (void) +URL_Iterator::~URL_Iterator () { } int -URL_Iterator::destroy (void) +URL_Iterator::destroy () { // Commit suicide. delete this; @@ -31,7 +31,6 @@ HTML_Body_Iterator::next (ACE_CString &url) buf != 0; buf = this->url_.stream ().recv (len)) { - buffer.set (buf, BUFSIZ, 1); href_index = ACE_Utils::truncate_cast (buffer.find ("HREF")); @@ -76,7 +75,6 @@ HTML_Body_Iterator::next (ACE_CString &url) } } return 0; - } HTTP_Header_Iterator::HTTP_Header_Iterator (URL &url) diff --git a/ACE/examples/Web_Crawler/Iterators.h b/ACE/examples/Web_Crawler/Iterators.h index 936af00cc4d92..a799f97f28637 100644 --- a/ACE/examples/Web_Crawler/Iterators.h +++ b/ACE/examples/Web_Crawler/Iterators.h @@ -32,7 +32,7 @@ class URL_Iterator { public: /// "virtual" destructor. - virtual int destroy (void); + virtual int destroy (); // = Iterator methods. /// Pass back the next that hasn't been seen yet. Returns 0 @@ -41,7 +41,7 @@ class URL_Iterator protected: /// C++ destructor. - virtual ~URL_Iterator (void); + virtual ~URL_Iterator (); }; /** diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp index 532f1b636c7ca..47a0f54e1f258 100644 --- a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp +++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp @@ -5,9 +5,8 @@ #include "Mem_Map_Stream.h" - ACE_SOCK_Stream & -Mem_Map_Stream::stream (void) +Mem_Map_Stream::stream () { return svc_handler_->peer (); } @@ -25,7 +24,7 @@ Mem_Map_Stream::eof () const } int -Mem_Map_Stream::get_char (void) +Mem_Map_Stream::get_char () { if (this->eof () && this->grow_file_and_remap () == -1) return EOF; @@ -34,7 +33,7 @@ Mem_Map_Stream::get_char (void) } int -Mem_Map_Stream::rewind (void) +Mem_Map_Stream::rewind () { this->recv_pos_ = reinterpret_cast (this->mem_map_.addr ()); @@ -127,7 +126,7 @@ Mem_Map_Stream::seek (ACE_OFF_T offset, int whence) } Mem_Map_Stream::Svc_Handler * -Mem_Map_Stream::svc_handler (void) +Mem_Map_Stream::svc_handler () { return this->svc_handler_; } @@ -145,7 +144,6 @@ Mem_Map_Stream::open (STRAT_CONNECTOR *connector, if (connector->connect (svc_handler_, addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "%p %s %d\n", "Connect failed", @@ -181,7 +179,7 @@ Mem_Map_Stream::open (STRAT_CONNECTOR *connector, } int -Mem_Map_Stream::grow_file_and_remap (void) +Mem_Map_Stream::grow_file_and_remap () { char buf[BUFSIZ + 1]; @@ -232,7 +230,7 @@ Mem_Map_Stream::grow_file_and_remap (void) return 0; } -Mem_Map_Stream::~Mem_Map_Stream (void) +Mem_Map_Stream::~Mem_Map_Stream () { // Remove the mapping and the file. this->mem_map_.remove (); diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.h b/ACE/examples/Web_Crawler/Mem_Map_Stream.h index 60a504f3b2d65..f2e9195ce61d6 100644 --- a/ACE/examples/Web_Crawler/Mem_Map_Stream.h +++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.h @@ -50,7 +50,6 @@ */ class Mem_Map_Stream { - public: typedef ACE_Svc_Handler Svc_Handler; @@ -58,18 +57,18 @@ class Mem_Map_Stream ACE_SOCK_CONNECTOR> STRAT_CONNECTOR; - // Mem_Map_Stream (void); + // Mem_Map_Stream (); // constructor added:KIRTHIKA /// Initialize this object. virtual int open (STRAT_CONNECTOR *connector, const ACE_INET_Addr &); /// Destructor. - virtual ~Mem_Map_Stream (void); + virtual ~Mem_Map_Stream (); // = Accessor. /// Returns the underlying . - ACE_SOCK_Stream &stream (void); + ACE_SOCK_Stream &stream (); // = I/O methods. @@ -84,7 +83,7 @@ class Mem_Map_Stream * position. Returns EOF when the position reaches the end of * the HTTP stream. */ - virtual int get_char (void); + virtual int get_char (); /** * Returns a pointer to array of at most characters starting @@ -109,7 +108,7 @@ class Mem_Map_Stream * stream. This works since all the data has been cached in the * memory-mapped backing store. */ - virtual int rewind (void); + virtual int rewind (); /** * Returns the nth character from the position in the @@ -155,7 +154,7 @@ class Mem_Map_Stream ACE_SYNCH_NULL_MUTEX> CACHED_CONNECT_STRATEGY;*/ - Svc_Handler *svc_handler (void); + Svc_Handler *svc_handler (); private: /** @@ -163,7 +162,7 @@ class Mem_Map_Stream * extend the mapping to cover this chunk. Returns -1 on failure or * EOF, else 0. */ - int grow_file_and_remap (void); + int grow_file_and_remap (); //ACE_SOCK_Stream stream_; @@ -193,7 +192,6 @@ class Mem_Map_Stream /// Address at the end of the file mapping. char *end_of_mapping_plus1_; - }; #include /**/ "ace/post.h" diff --git a/ACE/examples/Web_Crawler/Options.cpp b/ACE/examples/Web_Crawler/Options.cpp index b09d892e053cc..824b4b784dbad 100644 --- a/ACE/examples/Web_Crawler/Options.cpp +++ b/ACE/examples/Web_Crawler/Options.cpp @@ -5,7 +5,6 @@ #include "ace/OS_NS_string.h" - int Options::parse_args (int argc, ACE_TCHAR *argv[]) { @@ -173,7 +172,7 @@ Options::visitor (URL_Visitor *v) } int -Options::handle_limit (void) +Options::handle_limit () { return this->handle_limit_; } diff --git a/ACE/examples/Web_Crawler/Options.h b/ACE/examples/Web_Crawler/Options.h index 7a8b9f02f4815..c4b1537f0e498 100644 --- a/ACE/examples/Web_Crawler/Options.h +++ b/ACE/examples/Web_Crawler/Options.h @@ -76,7 +76,7 @@ class Options void visitor (URL_Visitor *); // Get the handle_limit. - int handle_limit (void); + int handle_limit (); private: /// Are we recursving. int recurse_; diff --git a/ACE/examples/Web_Crawler/URL.cpp b/ACE/examples/Web_Crawler/URL.cpp index 3f75e5685e9da..c9eb6fd738271 100644 --- a/ACE/examples/Web_Crawler/URL.cpp +++ b/ACE/examples/Web_Crawler/URL.cpp @@ -1,19 +1,18 @@ #include "URL.h" - Mem_Map_Stream & -URL::stream (void) +URL::stream () { return this->stream_; } -URL::~URL (void) +URL::~URL () { } const URL_Status & -URL::reply_status (void) +URL::reply_status () { return this->reply_status_; } @@ -25,7 +24,7 @@ URL::reply_status (const URL_Status &rs) } const ACE_CString & -URL::content_type (void) +URL::content_type () { return this->content_type_; } diff --git a/ACE/examples/Web_Crawler/URL.h b/ACE/examples/Web_Crawler/URL.h index bbbc8b37655b6..796c7bf6fd2c3 100644 --- a/ACE/examples/Web_Crawler/URL.h +++ b/ACE/examples/Web_Crawler/URL.h @@ -38,7 +38,7 @@ class URL { public: /// Destructor. - virtual ~URL (void); + virtual ~URL (); /** * Accept the visitor, which will then perform a particular @@ -49,24 +49,23 @@ class URL /// Send a command to fetch the contents in the URI from the /// server. - virtual ssize_t send_request (void) = 0; + virtual ssize_t send_request () = 0; /// Returns the URL that we represent. virtual const ACE_URL_Addr &url_addr () const = 0; /// Returns the . - virtual Mem_Map_Stream &stream (void); + virtual Mem_Map_Stream &stream (); // = Get/set the reply status. - virtual const URL_Status &reply_status (void); + virtual const URL_Status &reply_status (); virtual void reply_status (const URL_Status &); // = Get/set the reply status. - virtual const ACE_CString &content_type (void); + virtual const ACE_CString &content_type (); virtual void content_type (const ACE_CString &); - private: /// Reply status of the URL. URL_Status reply_status_; diff --git a/ACE/examples/Web_Crawler/URL_Addr.cpp b/ACE/examples/Web_Crawler/URL_Addr.cpp index f7d92b2c13e43..bf9e9d439eb1c 100644 --- a/ACE/examples/Web_Crawler/URL_Addr.cpp +++ b/ACE/examples/Web_Crawler/URL_Addr.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_Memory.h" -ACE_URL_Addr::ACE_URL_Addr (void) +ACE_URL_Addr::ACE_URL_Addr () : path_name_ (0), addr_string_ (0), addr_string_len_ (0) @@ -210,7 +210,7 @@ ACE_URL_Addr::get_path_name () const return this->path_name_; } -ACE_URL_Addr::~ACE_URL_Addr (void) +ACE_URL_Addr::~ACE_URL_Addr () { ACE_OS::free (reinterpret_cast (const_cast (this->path_name_))); @@ -220,7 +220,7 @@ ACE_URL_Addr::~ACE_URL_Addr (void) } int -ACE_URL_Addr::destroy (void) +ACE_URL_Addr::destroy () { // Commit suicide. delete this; diff --git a/ACE/examples/Web_Crawler/URL_Addr.h b/ACE/examples/Web_Crawler/URL_Addr.h index 565b1d068e7f3..2b27dd181dfc5 100644 --- a/ACE/examples/Web_Crawler/URL_Addr.h +++ b/ACE/examples/Web_Crawler/URL_Addr.h @@ -30,7 +30,7 @@ class ACE_URL_Addr : public ACE_INET_Addr { public: /// Constructor. - ACE_URL_Addr (void); + ACE_URL_Addr (); ACE_URL_Addr (const ACE_TCHAR *host_name, const ACE_TCHAR *path_name, @@ -82,7 +82,7 @@ class ACE_URL_Addr : public ACE_INET_Addr void operator= (const ACE_URL_Addr &addr); /// Destructor. - ~ACE_URL_Addr (void); + ~ACE_URL_Addr (); /** * Compare two addresses for equality. The addresses are considered @@ -101,7 +101,7 @@ class ACE_URL_Addr : public ACE_INET_Addr const ACE_TCHAR *get_path_name () const; /// Commit suicide. - int destroy (void); + int destroy (); private: /// Our path name. ACE_TCHAR *path_name_; diff --git a/ACE/examples/Web_Crawler/URL_Status.cpp b/ACE/examples/Web_Crawler/URL_Status.cpp index 29a3d017fd813..6ccb29c422acc 100644 --- a/ACE/examples/Web_Crawler/URL_Status.cpp +++ b/ACE/examples/Web_Crawler/URL_Status.cpp @@ -2,7 +2,6 @@ #include "URL_Status.h" - URL_Status::URL_Status (STATUS_CODE code) : status_ (code) { @@ -31,7 +30,7 @@ URL_Status::status (URL_Status::STATUS_CODE s) this->status_ = s; } -int URL_Status::destroy (void) +int URL_Status::destroy () { delete this; return 0; diff --git a/ACE/examples/Web_Crawler/URL_Status.h b/ACE/examples/Web_Crawler/URL_Status.h index 08760a3ee27ff..a9054470b37da 100644 --- a/ACE/examples/Web_Crawler/URL_Status.h +++ b/ACE/examples/Web_Crawler/URL_Status.h @@ -50,7 +50,7 @@ class URL_Status STATUS_CODE status () const; void status (int); void status (STATUS_CODE); - int destroy (void); + int destroy (); private: STATUS_CODE status_; }; diff --git a/ACE/examples/Web_Crawler/URL_Visitor.cpp b/ACE/examples/Web_Crawler/URL_Visitor.cpp index 2383eae253d6b..8f6ed5af3e0f5 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor.cpp +++ b/ACE/examples/Web_Crawler/URL_Visitor.cpp @@ -4,7 +4,6 @@ #include "Command_Processor.h" - URL_Processing_Strategy::URL_Processing_Strategy (URL &url, URL_Iterator &iterator) : url_ (url), @@ -12,12 +11,12 @@ URL_Processing_Strategy::URL_Processing_Strategy (URL &url, { } -URL_Processing_Strategy::~URL_Processing_Strategy (void) +URL_Processing_Strategy::~URL_Processing_Strategy () { } int -URL_Processing_Strategy::destroy (void) +URL_Processing_Strategy::destroy () { // Commit suicide. delete this; @@ -31,7 +30,7 @@ URL_Download_Strategy::URL_Download_Strategy (URL &url, } int -URL_Download_Strategy::execute (void) +URL_Download_Strategy::execute () { ACE_CString buffer; @@ -52,7 +51,7 @@ HTTP_Header_Processing_Strategy::HTTP_Header_Processing_Strategy (URL &url, } int -HTTP_Header_Processing_Strategy::execute (void) +HTTP_Header_Processing_Strategy::execute () { // Set the get() position.Necessary since later a peek is done. if (this->url_.stream ().get_char () == 0) @@ -88,7 +87,6 @@ HTTP_Header_Processing_Strategy::execute (void) } else { - if (line.find ("text/html") != ACE_CString::npos) { ACE_CString url_content_type("text/html"); @@ -97,7 +95,6 @@ HTTP_Header_Processing_Strategy::execute (void) } } return 0; - } HTML_Body_Validation_Strategy::HTML_Body_Validation_Strategy (URL &url, @@ -109,7 +106,7 @@ HTML_Body_Validation_Strategy::HTML_Body_Validation_Strategy (URL &url, } int -HTML_Body_Validation_Strategy::execute (void) +HTML_Body_Validation_Strategy::execute () { char host_name_buf[BUFSIZ + 1]; ACE_CString host_name (host_name_buf); @@ -187,7 +184,7 @@ HTML_Body_Validation_Strategy::execute (void) } URL_Iterator * -URL_Validation_Visitation_Strategy_Factory::make_header_iterator (void) +URL_Validation_Visitation_Strategy_Factory::make_header_iterator () { URL_Iterator *i; ACE_NEW_RETURN (i, @@ -197,7 +194,7 @@ URL_Validation_Visitation_Strategy_Factory::make_header_iterator (void) } URL_Iterator * -URL_Validation_Visitation_Strategy_Factory::make_body_iterator (void) +URL_Validation_Visitation_Strategy_Factory::make_body_iterator () { URL_Iterator *i; ACE_NEW_RETURN (i, @@ -230,18 +227,18 @@ URL_Validation_Visitation_Strategy_Factory::make_body_strategy (URL_Iterator &it } int -URL_Validation_Visitation_Strategy_Factory::destroy (void) +URL_Validation_Visitation_Strategy_Factory::destroy () { // Commit suicide. delete this; return 0; } -URL_Visitor::~URL_Visitor (void) +URL_Visitor::~URL_Visitor () { } -URL_Validation_Visitor::URL_Validation_Visitor (void) +URL_Validation_Visitor::URL_Validation_Visitor () { ACE_NEW (this->caching_connect_strategy_, CACHED_CONNECT_STRATEGY (this->caching_strategy_)); @@ -255,10 +252,9 @@ URL_Validation_Visitor::URL_Validation_Visitor (void) "%p %s\n" "strategy connector creation failed")); - } -URL_Validation_Visitor::~URL_Validation_Visitor (void) +URL_Validation_Visitor::~URL_Validation_Visitor () { this->strat_connector_ = 0; if (this->caching_connect_strategy_ != 0) @@ -266,7 +262,7 @@ URL_Validation_Visitor::~URL_Validation_Visitor (void) } URL_Validation_Visitor::URL_CACHE & -URL_Validation_Visitor::url_cache (void) +URL_Validation_Visitor::url_cache () { return this->url_cache_; } @@ -323,7 +319,6 @@ URL_Validation_Visitor::make_visitation_strategy_factory (URL &url) // HTTP URL. else { - URL_Visitation_Strategy_Factory *vs; ACE_NEW_RETURN (vs, URL_Validation_Visitation_Strategy_Factory (&url, @@ -334,7 +329,7 @@ URL_Validation_Visitor::make_visitation_strategy_factory (URL &url) } int -URL_Validation_Visitor::destroy (void) +URL_Validation_Visitor::destroy () { delete this->strat_connector_; // Commit suicide. @@ -412,13 +407,12 @@ URL_Validation_Visitor::visit (HTTP_URL &http_url) "%p\n", "body execute"), -1); - } return 0; } int -URL_Download_Visitation_Strategy_Factory::destroy (void) +URL_Download_Visitation_Strategy_Factory::destroy () { // Commit suicide. delete this; @@ -426,13 +420,13 @@ URL_Download_Visitation_Strategy_Factory::destroy (void) } URL_Iterator * -URL_Download_Visitation_Strategy_Factory::make_header_iterator (void) +URL_Download_Visitation_Strategy_Factory::make_header_iterator () { return 0; } URL_Iterator * -URL_Download_Visitation_Strategy_Factory::make_body_iterator (void) +URL_Download_Visitation_Strategy_Factory::make_body_iterator () { URL_Iterator *i; ACE_NEW_RETURN (i, @@ -466,7 +460,7 @@ URL_Visitation_Strategy_Factory::URL_Visitation_Strategy_Factory (URL *url) { } -URL_Visitation_Strategy_Factory::~URL_Visitation_Strategy_Factory (void) +URL_Visitation_Strategy_Factory::~URL_Visitation_Strategy_Factory () { } @@ -492,7 +486,6 @@ URL_Download_Visitor::make_visitation_strategy_factory (URL &url) int retval = url.send_request (); if (retval != -1) break; - } // @@ Here's where we could check to see if the was HTTP or // FTP, etc. But for now we'll just assume that everything is an @@ -502,11 +495,10 @@ URL_Download_Visitor::make_visitation_strategy_factory (URL &url) URL_Download_Visitation_Strategy_Factory (&url), 0); return vs; - } int -URL_Download_Visitor::destroy (void) +URL_Download_Visitor::destroy () { // Commit suicide. delete this; diff --git a/ACE/examples/Web_Crawler/URL_Visitor.h b/ACE/examples/Web_Crawler/URL_Visitor.h index d0a0b8c501359..a7b9590f1fb9b 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor.h +++ b/ACE/examples/Web_Crawler/URL_Visitor.h @@ -42,12 +42,12 @@ class URL_Processing_Strategy URL_Processing_Strategy (URL &, URL_Iterator &); - virtual ~URL_Processing_Strategy (void); + virtual ~URL_Processing_Strategy (); /// Perform the strategy. - virtual int execute (void) = 0; + virtual int execute () = 0; - virtual int destroy (void); + virtual int destroy (); // Close down the resources. @@ -72,7 +72,7 @@ class HTTP_Header_Processing_Strategy : public URL_Processing_Strategy URL_Iterator &); /// Perform the strategy for processing an HTTP header. - virtual int execute (void); + virtual int execute (); }; /** @@ -96,7 +96,7 @@ class HTML_Body_Validation_Strategy : public URL_Processing_Strategy * iterates over the HTML file and recursively visits embedded links * to process them, as well. */ - virtual int execute (void); + virtual int execute (); private: /// This is the context of the visit. @@ -118,7 +118,7 @@ class URL_Download_Strategy : public URL_Processing_Strategy URL_Iterator &); /// Perform the strategy for downloading a URL to a temporary file. - virtual int execute (void); + virtual int execute (); }; /** @@ -132,14 +132,14 @@ class URL_Visitation_Strategy_Factory URL_Visitation_Strategy_Factory (URL *); /// Destructor. - virtual ~URL_Visitation_Strategy_Factory (void); + virtual ~URL_Visitation_Strategy_Factory (); // = Factory Methods. /// Factory Method that makes the header iterator. - virtual URL_Iterator *make_header_iterator (void) = 0; + virtual URL_Iterator *make_header_iterator () = 0; /// Factory Method that makes the body iterator. - virtual URL_Iterator *make_body_iterator (void) = 0; + virtual URL_Iterator *make_body_iterator () = 0; /// Factory Method that makes the header processing strategy. virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &) = 0; @@ -148,7 +148,7 @@ class URL_Visitation_Strategy_Factory virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &) = 0; /// Close down the resources. - virtual int destroy (void) = 0; + virtual int destroy () = 0; protected: /// Stash the URL so we don't have to pass it around. @@ -168,10 +168,10 @@ class URL_Download_Visitation_Strategy_Factory : public URL_Visitation_Strategy_ // = Factory Methods. /// Factory Method that makes an . - virtual URL_Iterator *make_header_iterator (void); + virtual URL_Iterator *make_header_iterator (); /// Factory Method that makes an . - virtual URL_Iterator *make_body_iterator (void); + virtual URL_Iterator *make_body_iterator (); /// Factory Method that makes the header processing strategy. virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &); @@ -180,7 +180,7 @@ class URL_Download_Visitation_Strategy_Factory : public URL_Visitation_Strategy_ virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &); /// Close down the resources. - virtual int destroy (void); + virtual int destroy (); }; /** @@ -197,10 +197,10 @@ class URL_Validation_Visitation_Strategy_Factory : public URL_Visitation_Strateg // = Factory Methods. /// Factory Method that makes an . - virtual URL_Iterator *make_header_iterator (void); + virtual URL_Iterator *make_header_iterator (); /// Factory Method that makes an . - virtual URL_Iterator *make_body_iterator (void); + virtual URL_Iterator *make_body_iterator (); /// Factory Method that makes the header processing strategy. virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &); @@ -209,7 +209,7 @@ class URL_Validation_Visitation_Strategy_Factory : public URL_Visitation_Strateg virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &); /// Close down the resources. - virtual int destroy (void); + virtual int destroy (); private: /// Context of the visitor. @@ -226,8 +226,7 @@ class URL_Validation_Visitation_Strategy_Factory : public URL_Visitation_Strateg class URL_Visitor { public: - - virtual ~URL_Visitor (void); + virtual ~URL_Visitor (); /// Visit an . virtual int visit (HTTP_URL &http_url) = 0; @@ -236,7 +235,7 @@ class URL_Visitor // virtual int visit (FTP_URL &http_url) = 0; /// Cleanup the resources. - virtual int destroy (void) = 0; + virtual int destroy () = 0; protected: /// Make the appropriate . @@ -311,16 +310,16 @@ class URL_Validation_Visitor : public URL_Visitor // virtual int visit (FTP_URL &http_url); /// Cleanup the resources. - URL_Validation_Visitor (void); - virtual int destroy (void); + URL_Validation_Visitor (); + virtual int destroy (); /// Returns a reference to the URL cache. - URL_CACHE &url_cache (void); + URL_CACHE &url_cache (); protected: /// Factory Method that makes a /// . - virtual ~URL_Validation_Visitor (void); + virtual ~URL_Validation_Visitor (); virtual URL_Visitation_Strategy_Factory *make_visitation_strategy_factory (URL &); /// Cache the status of URLs we've already validated. @@ -365,7 +364,7 @@ class URL_Download_Visitor : public URL_Visitor // virtual int visit (FTP_URL &http_url); /// Cleanup the resources. - virtual int destroy (void); + virtual int destroy (); protected: /// Factory Method that makes a . @@ -387,15 +386,15 @@ class Auto_Destroyer { public: Auto_Destroyer (T *t): t_ (t) {} - T *operator-> (void) { return this->t_; } - T *operator *(void) { return this->t_; } + T *operator-> () { return this->t_; } + T *operator *() { return this->t_; } void operator= (T *t) { if (this->t_ != 0) this->t_->destroy (); this->t_ = t; } - ~Auto_Destroyer (void) + ~Auto_Destroyer () { if (this->t_ != 0) t_->destroy (); diff --git a/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp b/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp index aadb46732d22b..8978411ddea0e 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp +++ b/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp @@ -1,12 +1,12 @@ /* -*- C++ -*- */ #include "URL_Visitor_Factory.h" -URL_Visitor_Factory::~URL_Visitor_Factory (void) +URL_Visitor_Factory::~URL_Visitor_Factory () { } URL_Visitor * -URL_Validation_Visitor_Factory::make_visitor (void) +URL_Validation_Visitor_Factory::make_visitor () { URL_Visitor *v; @@ -18,7 +18,7 @@ URL_Validation_Visitor_Factory::make_visitor (void) } Command_Processor * -URL_Validation_Visitor_Factory::make_command_processor (void) +URL_Validation_Visitor_Factory::make_command_processor () { Command_Processor *cp; @@ -29,7 +29,7 @@ URL_Validation_Visitor_Factory::make_command_processor (void) } URL_Visitor * -URL_Download_Visitor_Factory::make_visitor (void) +URL_Download_Visitor_Factory::make_visitor () { URL_Visitor *v; @@ -40,7 +40,7 @@ URL_Download_Visitor_Factory::make_visitor (void) } Command_Processor * -URL_Download_Visitor_Factory::make_command_processor (void) +URL_Download_Visitor_Factory::make_command_processor () { return 0; } diff --git a/ACE/examples/Web_Crawler/URL_Visitor_Factory.h b/ACE/examples/Web_Crawler/URL_Visitor_Factory.h index 64aa68e00de7f..f56b0fc676a54 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor_Factory.h +++ b/ACE/examples/Web_Crawler/URL_Visitor_Factory.h @@ -30,16 +30,15 @@ class URL_Visitor_Factory { public: - /// Destructor. - virtual ~URL_Visitor_Factory (void); + virtual ~URL_Visitor_Factory (); /// Factory Method that makes the appropriate type of . - virtual URL_Visitor *make_visitor (void) = 0; + virtual URL_Visitor *make_visitor () = 0; /// Factory Method that makes the appropriate type of /// . - virtual Command_Processor *make_command_processor (void) = 0; + virtual Command_Processor *make_command_processor () = 0; }; /** @@ -51,12 +50,10 @@ class URL_Validation_Visitor_Factory : public URL_Visitor_Factory { public: /// Factory Method that makes a . - virtual URL_Visitor *make_visitor (void); + virtual URL_Visitor *make_visitor (); /// Factory Method that makes a . - virtual Command_Processor *make_command_processor (void); - - + virtual Command_Processor *make_command_processor (); }; /** @@ -68,10 +65,10 @@ class URL_Download_Visitor_Factory : public URL_Visitor_Factory { public: /// Factory Method that makes a . - virtual URL_Visitor *make_visitor (void); + virtual URL_Visitor *make_visitor (); /// Factory Method that makes a . - virtual Command_Processor *make_command_processor (void); + virtual Command_Processor *make_command_processor (); }; #endif /* _URL_VISITOR_FACTORY_H */ diff --git a/ACE/examples/Web_Crawler/Web_Crawler.cpp b/ACE/examples/Web_Crawler/Web_Crawler.cpp index e5972e90b5c9b..29a6ad3ed9f3a 100644 --- a/ACE/examples/Web_Crawler/Web_Crawler.cpp +++ b/ACE/examples/Web_Crawler/Web_Crawler.cpp @@ -3,13 +3,12 @@ #include "Web_Crawler.h" - -Web_Crawler::~Web_Crawler (void) +Web_Crawler::~Web_Crawler () { delete this->url_visitor_factory_; } -Web_Crawler::Web_Crawler (void) +Web_Crawler::Web_Crawler () : url_visitor_factory_ (0) { } @@ -31,7 +30,7 @@ Web_Crawler::open (int argc, ACE_TCHAR *argv[]) } int -Web_Crawler::run (void) +Web_Crawler::run () { // Make the appropriate . Auto_Destroyer visitor (this->url_visitor_factory_->make_visitor ()); diff --git a/ACE/examples/Web_Crawler/Web_Crawler.h b/ACE/examples/Web_Crawler/Web_Crawler.h index b799cc151cf35..a63ba252d75b3 100644 --- a/ACE/examples/Web_Crawler/Web_Crawler.h +++ b/ACE/examples/Web_Crawler/Web_Crawler.h @@ -35,10 +35,10 @@ class Web_Crawler { public: /// Constructor. - Web_Crawler (void); + Web_Crawler (); /// Destructor. - ~Web_Crawler (void); + ~Web_Crawler (); /// Parses the command-line options and initializes the /// . @@ -46,7 +46,7 @@ class Web_Crawler /// Run the Web Crawler and carries out whatever visitation strategy /// is configured. Returns -1 on failure and 0 on success. - int run (void); + int run (); private: /** diff --git a/ACE/examples/Web_Crawler/main.cpp b/ACE/examples/Web_Crawler/main.cpp index 3521fe405fb6e..832548aba8ae4 100644 --- a/ACE/examples/Web_Crawler/main.cpp +++ b/ACE/examples/Web_Crawler/main.cpp @@ -17,7 +17,6 @@ #include "Options.h" - void sig_handler (int) { ACE_DEBUG ((LM_DEBUG, @@ -28,9 +27,7 @@ void sig_handler (int) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { -#if !defined (ACE_HAS_WINCE) ACE_Sig_Action sa ((ACE_SignalHandler) sig_handler, SIGFPE); -#endif Web_Crawler crawler; if (crawler.open (argc, argv) == -1) @@ -42,4 +39,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } - diff --git a/ACE/include/makeinclude/platform_aix.GNU b/ACE/include/makeinclude/platform_aix.GNU deleted file mode 100644 index 7d09c969385bf..0000000000000 --- a/ACE/include/makeinclude/platform_aix.GNU +++ /dev/null @@ -1,103 +0,0 @@ - -# AIX 5.x using the IBM C Set++ compiler. -# -# NOTE! IBM is no longer supporting AIX at any version earlier than 4.3, -# and Riverace is not testing or supporting ACE on them either. No steps -# have been taken to intentionally disable anything, but it is not being -# tested either. -# -# NOTE 2! This file is only for use with the older CSet++ compiler, which -# IBM doesn't sell or support any longer. Riverace doesn't support ACE -# with it either. This file is still here in case there is some site -# still using the old compiler, but it is completely unsupported. -# -# On 4.1, this file assumes that the user has installed the AIX patch -# containing the dl*() APIs. To use these APIs, IBM has created a -# separate product (free to AIX licensees) called shared library -# hookable symbols (or slhs/6000). If they don't have this patch, the -# sv* commands for compiling and linking will not be present on the -# system. -# -# On 4.2, the AIX fileset bos.rte.bind_cmds must be at version 4.2.0.2 or -# higher in order to build libACEshr.a, and at 4.2.0.4 or higher for dl*() -# routines to work properly. Best to apply the update available at: -# ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff -# or a successor. - -debug ?= 1 -distrib ?= 0 -optimize ?= 0 -threads ?= 1 - -# In case anything here or in the config depends on OS version number, -# grab it here and pass it all to the compiler as well. -AIX_MAJOR_VERS := $(shell uname -v) -AIX_MINOR_VERS := $(shell uname -r) - -# aix_build turns on the funky shared library building code. -aix_build = 1 -# ibmcxx_build turns on the extra step for instantiating and compiling -# template instances. -ibmcxx_build = 1 - -ifeq ($(threads),1) -CC = xlc_r -CXX = xlC_r -DLD = makeC++SharedLib_r -else -CC = xlc -CXX = xlC -DLD = makeC++SharedLib -endif - -# -qextchk is handy, but produces false type mismatches when linking -# netsvcs with 3.1.4, so it's disabled. IBM reports this fixed in 3.6.4. -TEMPINCDIR = tempinc -CCFLAGS += $(CFLAGS) -qtempinc=$(TEMPINCDIR) -qinfo - -# IBM C/C++ compiler 3.6.x produces a bazillion warnings about 0-valued -# preprocessor defs. Since both 3.1 and 3.4 could be installed, don't ask -# lslpp for one or the other. Instead, compile a file and see which compiler -# the user has set up for use. This trick was submitted by Craig Rodrigues -# , originally from the vacpp compiler newsgroup. -# It relies on the preprocessor defining __xlC__ to the proper version -# number of the compiler. -XLCVERSION := $(shell echo "__xlC__" > ./testAIXCompilerVersion.cpp) -XLCVERSION := $(shell $(CXX) -E ./testAIXCompilerVersion.cpp | tail -1) -ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp) -ifeq ($(XLCVERSION),0x0306) - CCFLAGS += -qflag=e:e -else - CCFLAGS += -qflag=w:w -endif -CPPFLAGS += -qlanglvl=ansi -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS) - -# -qinitauto seems useful, but when built with -qinitauto=5F, the -# Process_Strategy_Test went CPU bound in ostream, so I removed it (S. Huston) -DCFLAGS += -g -qcheck=nobounds:div:null - -ACELIB = -lACE -LD = $(CXX) - -ifeq ($(AIX_MINOR_VERS),1) -LLIBS = -lsvld -ltli_r $(ACELIB) -LIBS += $(filter-out $(SHLIBA:lib%.a=-l%), $(LLIBS)) -else -LIBS += -ltli_r -ldl -endif - -ARFLAGS = ruv -AR = ar -LDFLAGS += -bI:/lib/pse.exp -# Default OCCFLAGS builds common code for all RS/6000 architectures but -# this can be set to optimize for your particular computer. The commented -# out example optimizes for RS/6000 43P. -# OCCFLAGS is not used by default. To used it, set optimize=1 -# either in this file or on the command line. -#OCCFLAGS += -qarch=ppc -qtune=604 -OCCFLAGS += -O2 -qarch=com -RANLIB = ranlib -SOFLAGS = -p 0 - -SOVERSION = -SONAME = diff --git a/ACE/include/makeinclude/platform_aix_g++.GNU b/ACE/include/makeinclude/platform_aix_g++.GNU deleted file mode 100644 index 0ec6775e3702a..0000000000000 --- a/ACE/include/makeinclude/platform_aix_g++.GNU +++ /dev/null @@ -1,92 +0,0 @@ -# Platform macros for building on AIX with g++. This has been tested on -# AIX 4.3 and 5 with gcc 3. Earlier versions of gcc may compile, but are -# known to have serious problems on AIX. -# -# Contributed by Ian Wright -# Updated for AIX 4.3 and gcc 3 by Steve Huston - -debug ?= 1 -distrib ?= 0 -optimize ?= 1 -threads ?= 1 -buildbits ?= 32 -with_ld ?= aix -no_hidden_visibility ?= 1 - -PLATFORM_XT_CPPFLAGS= -PLATFORM_XT_LIBS=-lXt -PLATFORM_XT_LDFLAGS= - -PLATFORM_X11_CPPFLAGS= -PLATFORM_X11_LIBS=-lX11 -PLATFORM_X11_LDFLAGS= - -# Yes, believe it or not... -# The way to make a shared lib on AIX is to make a shared object file and -# then put that in an archive. -# Non-shared archives are named libns.a - ns = non-shared. -SOEXT = so -LDFLAGS += -Wl,-brtl - -ifeq (1,$(threads)) - FLAGS_C_CC += -pthread -endif - -ifeq ($(shared_libs),1) -ACELIB = -lACE -else -ACELIB = -lACEns -endif - -# In case anything here or in the config depends on OS version number, -# grab it here and pass it all to the compiler as well. -AIX_MAJOR_VERS := $(shell uname -v) -AIX_MINOR_VERS := $(shell uname -r) -AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS) - -CC = gcc -CXX = g++ - -FLAGS_C_CC += -DACE_AIX_VERS=$(AIX_VERS) -ifeq ($(buildbits),32) - FLAGS_C_CC += -maix32 -endif -ifeq ($(buildbits),64) - FLAGS_C_CC += -maix64 - LDFLAGS += -maix64 - ARFLAGS += -X64 -endif -DCFLAGS += -g -DCCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -# Linking TAO_IDL runs out of TOC space unless -bbigtoc is given to ld. -# Don't do it for everything because it decreases run-time performance. -ifeq ($(notdir $(shell pwd)), TAO_IDL) -LDFLAGS += -Wl,-bbigtoc -endif - -OCFLAGS = -O2 -OCCFLAGS = $(OCFLAGS) -ifeq ($(threads),1) - SOFLAGS += -pthread -endif - -# AIX 5 has a new ld option, -bexpfull, that exports all the symbols that -# g++ 3.3+ needs to work correctly. The new option is available by default -# in AIX 5.2 and later, but must be installed by a patch to AIX 5.1. -ifeq ($(AIX_MAJOR_VERS),5) - SOFLAGS += -shared -Wl,-bexpfull # -Wl,-bloadmap:lib.mapelse -else - SOFLAGS += -shared -Wl,-bexpall # -Wl,-bloadmap:lib.map -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 -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU diff --git a/ACE/include/makeinclude/platform_aix_ibm.GNU b/ACE/include/makeinclude/platform_aix_ibm.GNU deleted file mode 100644 index aa9f3f76775e1..0000000000000 --- a/ACE/include/makeinclude/platform_aix_ibm.GNU +++ /dev/null @@ -1,194 +0,0 @@ - -# This file is for use with AIX 5.x and up, using either of the IBM -# compilers (Visual Age C++ 6 or newer XL C++ compiler). - -debug ?= 1 -distrib ?= 0 -optimize ?= 0 -threads ?= 1 -buildbits ?= 32 - -ifeq (,$(inline)) -ifeq (1,$(debug)) - inline = 0 -else - inline = 1 -endif -endif - -# First, find out which compiler we're building with. The settings we -# use for compiling, as well as how to build shared libraries, depend on -# the compiler version. There's no easy way to ask lslpp which is installed. -# Instead, compile a file and see which compiler is set up for use. This -# trick was submitted by Craig Rodrigues , originally -# from the vacpp compiler newsgroup. -# It relies on the preprocessor defining __xlC__ to the proper version -# number of the compiler. -XLCVERSION := $(shell echo "__xlC__" > ./testxlCvers.cpp;xlC -E ./testxlCvers.cpp | tail -n 1;$(RM) testxlCvers.cpp) -#XLCVERSION := $(shell xlC -E ./testAIXCompilerVersion.cpp | tail -1') -#ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp) - -# In case anything here or in the config depends on OS version number, -# grab it here and pass it all to the compiler as well. -AIX_MAJOR_VERS := $(shell uname -v) -AIX_MINOR_VERS := $(shell uname -r) -AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS) - -SOEXT = so -SOFLAGS += -G -LDFLAGS += -brtl -#SHR_FILTER=$(ACE_ROOT)/bin/aix_shr - -ifeq ($(threads),1) -# Note - the _r form of the compiler command turns on -qthreads and the -# thread-required preprocessor defines, as well as -lpthreads for linking. -# If this is Visual Age C++ 5, DLD will get reset below. -CC = xlc_r -CXX = xlC_r -DLD = makeC++SharedLib_r -else -CC = xlc -CXX = xlC -DLD = makeC++SharedLib -endif - -ARFLAGS = ruv -AR = ar -LD = $(SHR_FILTER) $(CXX) -RANLIB = ranlib - -CPPFLAGS += -DACE_AIX_VERS=$(AIX_VERS) - -# AIX 5.2 offers POSIX aio, but the Visual Age C++ compiler can't grok the -# aio.h header file. This is a known problem and will be addressed in -# May 2004 (per IBM). This is a workaround for it, supplied by IBM. -# When the compiler fix is released, this workaround (and the change -# to -qflag, below) can be removed. (Steve Huston) -ifeq (502,$(AIX_VERS)) -CPPFLAGS += -U__C99_RESTRICT -endif - -# -qinitauto seems like an interesting option, but some tests (specifically -# Process_Strategy_Test) hang with it turned on. This should be investigated -# at some point. -DCCFLAGS += -g -qcheck=nobounds:div:null -DCFLAGS += -g - -ifeq ($(XLCVERSION),0x0600) - # This is just for the workaround for aio, above. Without it, the - # compiler warns that __C99_RESTRICT is reserved. When that workaround - # is gone, this ifeq can be removed also. -qflag=w:w is what we want - # in the end. - CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) - ifeq (502,$(AIX_VERS)) - CCFLAGS += -qflag=e:e - else - CCFLAGS += -qflag=w:w - endif -else - ifeq ($(XLCVERSION),0x0700) - CCFLAGS += -qflag=w:w - ifeq ($(templates),manual) - CCFLAGS += -qnotempinc -qnotemplateregistry - else - CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) - endif - # According to documentation, default is -qeh, which is equivalent - # to -qeh=v5. Apparently 6.0 fixed some problems with nested - # try-catch blocks. - CCFLAGS += -qeh=v6 - else - ifeq ($(XLCVERSION),0x0800) - CCFLAGS += -qflag=w:w - ifeq ($(templates),manual) - CCFLAGS += -qnotempinc -qnotemplateregistry - else - CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) - endif - # According to documentation, default is -qeh, which is equivalent - # to -qeh=v5. Apparently 6.0 fixed some problems with nested - # try-catch blocks. - CCFLAGS += -qeh=v6 - else - # Until there's a reason to change, use the V9 settings for V10.1, 11.1, - # 12.1 and 13.1. - ifeq ($(XLCVERSION),0x0a01) - XLCVERSION = 0x0900 - endif - ifeq ($(XLCVERSION),0x0b01) - XLCVERSION = 0x0900 - endif - ifeq ($(XLCVERSION),0x0c01) - XLCVERSION = 0x0900 - endif - ifeq ($(XLCVERSION),0x0d01) - XLCVERSION = 0x0900 - endif - ifeq ($(XLCVERSION),0x0900) - CCFLAGS += -qflag=w:w - ifeq ($(templates),manual) - CCFLAGS += -qnotempinc -qnotemplateregistry - else - CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) - endif - # According to documentation, default is -qeh, which is equivalent - # to -qeh=v5. Apparently 6.0 fixed some problems with nested - # try-catch blocks. - CCFLAGS += -qeh=v6 - else - CXX = echo "Unrecognized compiler version $(XLCVERSION)\n" - endif - endif - endif -endif - -DLD = $(CXX) -qmkshrobj -SOFLAGS += $(CCFLAGS) $(CPPFLAGS) $(INCLDIRS) - -ifeq ($(buildbits),64) - DLD += -q64 - CFLAGS += -q64 -qwarn64 - CCFLAGS += -q64 -qwarn64 - ARFLAGS := -X64 $(ARFLAGS) - - # This option results in a crash of TAO when building 64bit with - # Visual Age 6. No idea why but don't use it when using Visual Age 6. - ifneq ($(XLCVERSION),0x0600) - # CCFLAGS += -qstaticinline - endif -else - # Using 32bit the staticinline option works. - #CCFLAGS += -qstaticinline -endif - -# The Visual Age preprocessor is not usable with the TAO_IDL compiler. -# At the moment an idl file just contains includes of other idl files -# the Visual Age preprocessor doesn't report that file in the list of -# files that is used. The only way we can workaround this is using the -# gcc preprocessor, do this in your platform_macros.GNU is this -# causes problems -# TAO_IDL_PREPROCESSOR = gcc - -ifeq ($(exceptions),0) - CCFLAGS += -qnoeh -endif - -CCFLAGS += -qrtti=all - -ifeq ($(shared_libs),1) -ACELIB = -lACE -else -ACELIB = -lACEns -endif - -LIBS += -lxti -ldl - -SONAME = -SOVERSION = -# Default OCCFLAGS builds turns on mid-level optimize level. Compiler defaults -# to build machine's architecture and a reasonable tuning effort for recent -# machine architectures. To optimize for a more specific architecture, set -# your OCCFLAGS to the desired -qarch and/or -qtune values. For example: -#OCCFLAGS += -qarch=ppc -qtune=604 - -OCCFLAGS += -qlibansi -O2 diff --git a/ACE/include/makeinclude/platform_gcc_clang_common.GNU b/ACE/include/makeinclude/platform_gcc_clang_common.GNU index ac70c620b6191..bd147cc874644 100644 --- a/ACE/include/makeinclude/platform_gcc_clang_common.GNU +++ b/ACE/include/makeinclude/platform_gcc_clang_common.GNU @@ -80,15 +80,7 @@ templates ?= automatic versioned_so ?= 1 with_ld ?= ifneq ($(versioned_so),0) - ifeq ($(with_ld),hpux) - SOFLAGS += -Wl,+h -Wl,$(SONAME) - else - ifeq ($(with_ld),aix) - # What to do here??? - else - SOFLAGS += -Wl,-h -Wl,$(SONAME) - endif - endif + SOFLAGS += -Wl,-h -Wl,$(SONAME) endif ifeq ($(versioned_so),2) diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU deleted file mode 100644 index 5a6dbea96fffc..0000000000000 --- a/ACE/include/makeinclude/platform_hpux_aCC.GNU +++ /dev/null @@ -1,213 +0,0 @@ -# -# This is for HP-UX 11.x using the aC++ compiler. -# -# HP-UX 11 supports both 32-bit and 64-bit builds, regardless of which -# architecture the build is done on. This file is set up to build native -# to the machine it's running on. To cross-build for another platform, add -# "buildbits=32" to make a 32-bit build, and "buildbits=64" to do a 64-bit -# build. Note that if you explicitly specify a 64-bit build, the option -# -Wl,+vnocompatwarnings is added to shut up the "At least one PA 2.0 object -# file detected..." messages. - -buildbits ?= 0 -debug ?= 1 -distrib ?= 0 -optimize ?= 0 -stdcpplib ?= 1 -threads ?= 1 -versioned_so ?= 0 - -# First, extract the OS version number. -HPVERS_WORDS := $(subst ., ,$(shell uname -r)) -HPMODEL := $(shell uname -m) -HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) -# -CC = /bin/cc -CXX = aCC - -# Determine compiler version -CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1)) -CXXINFO := $(word 3, $(CXXVERS_WORDS)) -# aCC++ 3.67 gives "aCC: HP ANSI C++ B3910B A.03.67" -# aCC++ 3.73 gives "aCC: HP ANSI C++ B3910B A.03.73" -# -ifeq (ANSI, $(CXXINFO)) - CXXMINORVERS := $(word 8, $(CXXVERS_WORDS)) - CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS)) -else - ifeq (aC++/ANSI, $(CXXINFO)) - CXXMINORVERS := $(word 8, $(CXXVERS_WORDS)) - CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS)) - else - CXXMINORVERS := $(word 7, $(CXXVERS_WORDS)) - CXXMAJORVERS := $(word 6, $(CXXVERS_WORDS)) - endif -endif - -# Want to be able to do [unsigned] long long. -CCFLAGS += -ext - -ifeq (1,$(stdcpplib)) - CCFLAGS += -AA - ifeq (03,$(CXXMAJORVERS)) - # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP - # as support call 3201224717. (Steve Huston, 23-Nov-2002) - CCFLAGS += +W930 - endif -# Compile errors using -AA and +noeh together - HP problem report -# JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001. -else - CCFLAGS += -AP -endif - -# Set the appropriate preprocessor defs for threading based on OS version -# and specified compiler options. -ifeq ($(threads),1) - THR_DEFS = -DACE_HAS_THREADS - CC_THR_DEFS += -mt -else - THR_DEFS = -DACE_HAS_THREADS=0 - # On HP-UX 11, even without building for threads, the *_r reentrant - # functions are available, and _REENTRANT enables them. - THR_DEFS += -D_REENTRANT -endif - -ifeq ($(HPMODEL), ia64) - itanium = 1 -endif - -ifeq (03,$(CXXMAJORVERS)) - # Suppress Warning 302 ((...) parameter list is a non-portable feature) - # Suppress Warning 361 (missing return from non-void function) - # Suppress Warning 1039(Binary incompatabilty between old and new compilers) - CCFLAGS += +W302,361,1039 - ifeq (57,$(CXXMINORVERS)) - # aCC 3.57 has a bug. When a class has private constructors - # and is trying to be created from a friend class we end up with - # a compile error. We disable array optimization in the compiler - # by setting this environment variable. HP CR JAGaf43094 - export aCC_ARRAY_OPT=OFF - endif - ifeq (60,$(CXXMINORVERS)) - # Same bug as above - export aCC_ARRAY_OPT=OFF - endif - ifeq (80,$(CXXMINORVERS)) - # Enabled template meta programming - CCFLAGS += +hpxstd98 - endif - ifeq (85,$(CXXMINORVERS)) - # Enabled template meta programming - CCFLAGS += +hpxstd98 - endif -endif - -ifeq (05,$(CXXMAJORVERS)) - # Warnings about binary incompatiblity - CCFLAGS += +W1016,1031 -endif - -ifeq (06,$(CXXMAJORVERS)) - ifeq (13,$(CXXMINORVERS)) - # Warnings dllexport/dllimport conflict with "x" (declared at line y); dllexport assumed - CCFLAGS += +W3390,3397 - endif -endif - -CPPFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE -CCFLAGS += $(CC_THR_DEFS) - -DCCFLAGS += -g -DLD = $(CXX) $(CCFLAGS) -LD = $(CXX) -OCCFLAGS = -O -PIC = +Z - -AR = /usr/ccs/bin/ar -ARFLAGS = ruv -RANLIB = echo -LDFLAGS = -Wl,+s -z -SOFLAGS += -b - -ifeq ($(distrib),1) - -ifeq ($(buildbits),32) -SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib -endif -ifeq ($(buildbits),64) - ifeq ($(itanium),1) - SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/hpux64 - else - SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 - endif -endif - -endif - -ifeq ($(itanium),1) - SOEXT = so -else - SOEXT = sl -endif - -ifeq ($(buildbits),32) - ifeq ($(itanium),1) - CFLAGS += +DD32 - CCFLAGS += +DD32 - else - CFLAGS += +DA1.1 +DS1.1 - CCFLAGS += +DA1.1 +DS1.1 - endif -else -ifeq ($(buildbits),64) - ifeq ($(itanium),1) - CFLAGS += +DD64 - CCFLAGS += +DD64 - else - ## Without the W, it isn't really a 64-bit build - CFLAGS += +DA2.0W +DS2.0W - CCFLAGS += +DA2.0W +DS2.0W - endif -LDFLAGS += -Wl,+vnocompatwarnings -else - ifneq ($(itanium),1) - # HP aCC on Itanium doesn't support this option, defaults to 32bit then. - CFLAGS += +DAportable - CCFLAGS += +DAportable - endif -endif -endif - -#11.x: -ifeq ($(threads),1) - # If -mt is in CCFLAGS, we don't need to add anything to LIBS; -mt does it. - ifeq ($(findstring -mt,$(CCFLAGS)),) - ## -L./ must directly preceed the system libraries for 64-bit builds - ## with aCC 3.27. Without this change, libpthread.sl can not be found. - LIBS += -L./ -lpthread - endif -endif -LIBS += -lxti -lrt -ldld - -# The correct flags to pass to the linker for dynamic shared library -# versioning -# -ifneq ($(SONAME),) - SOFLAGS += -Wl,+h -Wl,$(SONAME) -endif - -# if _FILE_OFFSET_BITS==64 then the HP headers will produce -# spurious 600 warnings, except on 11.23 -# Can also (possible) be fixed with patch PHKL_34670 on HP-UX 11.11 -# -ifeq ($(64bitoffsets),1) - ifneq ($(HPUX_VERS), 1123) - CCFLAGS += +W600 - endif -endif - -ifeq ($(c++11),1) - CCFLAGS += -Ax -endif - -LD_RPATH = -Wl,+s,+b, diff --git a/ACE/include/makeinclude/platform_hpux_gcc.GNU b/ACE/include/makeinclude/platform_hpux_gcc.GNU deleted file mode 100644 index f6b754aa32a67..0000000000000 --- a/ACE/include/makeinclude/platform_hpux_gcc.GNU +++ /dev/null @@ -1,105 +0,0 @@ -# - -buildbits ?= 64 -debug ?= 1 -distrib ?= 0 -optimize ?= 1 -stdcpplib ?= 1 -threads ?= 1 -versioned_so ?= 0 -with_ld ?= hpux - -# First, extract the OS version number. -HPVERS_WORDS := $(subst ., ,$(shell uname -r)) -HPMODEL := $(shell uname -m) -HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) -# -CC = gcc -CXX = g++ -CFLAGS += -w - -# -# Set the appropriate preprocessor defs for threading based on OS version. -# If the user has requested building without threads, then don't set any. -# -ifeq ($(threads),1) - ifeq (3.,$(findstring 3.,$(CXX_VERSION))) - THR_DEFS = -threads - endif - ifeq ($(word 2,$(HPVERS_WORDS)), 11) - THR_DEFS += -DACE_HAS_THREADS -D_POSIX_C_SOURCE=199506L - else - THR_DEFS += -DACE_HAS_THREADS -D_REENTRANT - endif -endif - -ifeq ($(HPMODEL), ia64) - itanium = 1 -endif - -# On HP-UX 11, there's a conflict with pthread_atfork in sys/unistd.h and -# sys/pthread.h - both define the function, but slightly differently. -# -fstrict-prototype resolves the issue. -#ifeq ($(word 2,$(HPVERS_WORDS)), 11) -#CCFLAGS += -fstrict-prototype -#endif -DCFLAGS += -g -DCCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -OCFLAGS += -O2 -PIC = -fPIC -# GNU ar doesn't work (missing libfl.sl?) so use HP ar. -AR = /usr/bin/ar -ARFLAGS = ruv -RANLIB = echo -LDFLAGS = -L. -L$(ACE_ROOT)/lib -Wl,+s -SOFLAGS += $(CPPFLAGS) -shared -nostdlib $(PIC) -Wl,-E -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.$(SOEXT) $< -PRELIB = @true - -ifeq ($(itanium),1) - SOEXT = so -else - SOEXT = sl -endif - -ifeq ($(itanium),1) - ifeq ($(buildbits),64) - CCFLAGS += -mlp64 - CFLAGS += -mlp64 - else - CCFLAGS += -milp32 - CFLAGS += -milp32 - endif -endif - -# -# Grab the appropriate libraries based on the version of HP-UX we're building -# on and whether or not thread support is being used. -# -ifeq ($(word 2,$(HPVERS_WORDS)), 11) - - #11.x: - ifeq ($(threads),1) - LIBS += -lxti -lpthread -lrt -ldld - else - LIBS += -lxti -lrt -ldld - endif - -else - - # 10.x: - LIBS += -lxti -ldld - ifeq ($(threads),1) - LIBS += -lcma - endif - -endif - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += -DHPUX_VERS=$(HPUX_VERS) $(THR_DEFS) diff --git a/ACE/include/makeinclude/platform_linux_suncc.GNU b/ACE/include/makeinclude/platform_linux_suncc.GNU deleted file mode 100644 index 3489fc423e962..0000000000000 --- a/ACE/include/makeinclude/platform_linux_suncc.GNU +++ /dev/null @@ -1,74 +0,0 @@ - -# This file should allow ACE to be built on Linux, using the Sun compiler. -# The Sun compiler on linux is still in the Alpha stage, so no guarantees -# given at this point - -include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU - -no_hidden_visibility ?= 1 - -ifeq ($(insure),0) - CC = CC - CXX = CC -endif - -GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION) -ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION))) - CPPFLAGS += -DACE_HAS_LINUX_NPTL -endif - -DCCFLAGS += -g -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LIBS += -ldl -OCCFLAGS = -O3 -OCFLAGS = -O3 -PRELIB = @true -SOFLAGS += -shared -PIC = -PIC - -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \ - $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o - -ifeq ($(threads),1) - CPPFLAGS += -D_REENTRANT - LIBS += -lpthread -lrt -endif - -ifeq ($(optimize),0) - # Disable all optimizing in code - CPPFLAGS += -O0 -endif - - -ifeq ($(shared_libs), 1) - ifneq ($static_libs_only), 1) - ifneq ($(no_hidden_visibility),1) - CCFLAGS += -fvisibility=hidden - else - CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0 - endif # no_hidden_visibility - endif -endif - -ifeq ($(buildbits),32) - CFLAGS += -m32 - LDFLAGS += -m32 -endif -ifeq ($(buildbits),64) - CFLAGS += -m64 -endif - -# Enable GNU extensions -CPPFLAGS+= -D_GNU_SOURCE - -# Added line below to support "Executable Shared Object" files (as -# needed by the service configurator). -# Marius Kjeldahl -ifeq ($(threads),1) - ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $< - ifndef PRELIB - PRELIB = @true - endif # ! PRELIB -endif diff --git a/ACE/include/makeinclude/platform_openvms.GNU b/ACE/include/makeinclude/platform_openvms.GNU deleted file mode 100644 index ee2cb678ba784..0000000000000 --- a/ACE/include/makeinclude/platform_openvms.GNU +++ /dev/null @@ -1,101 +0,0 @@ - -# for OpenVMS GNV - -ACE_OPENVMS = 1 -versioned_so ?= 0 -debug ?= 1 -optimize ?= 0 -threads ?= 1 -pthread ?= 1 -ssl ?= 0 -rwho ?= 0 -buildbits ?= 32 - -VDIR ?= obj/ -VSHDIR ?= shobj/ -PRELINK_TYPE ?= USE_OLB - -LN_S = cp -p -DEFFLAGS += -CCFLAGS += -D__USE_STD_IOSTREAM -ieee -names_as_is_short -ifeq ($(HOSTTYPE),ia64) - CCFLAGS += "-Wc/warn=DISABLE=(INTOVERFLOW,REFTEMPORARY,INTSIGNCHANGE)" -else - CCFLAGS += -msg_disable intoverflow,reftemporary,intsignchange -endif -CCFLAGS += -Wc/template=auto - -ifeq ($(buildbits),64) - CCFLAGS += -Wc/MODEL=ANSI -endif - -ifeq ($(HOSTTYPE),ia64) - ACE_OPENVMS_IA64 = 1 - SYMVEC_OPT_FILE ?= $(LIB_NAME)_symvec.opt - ifeq ($(PRJ_TYPE),library) - ifeq ($(shared_libs),1) - CCFLAGS += "-Wc/export_sym=(OPTIONS_FILE=$(SYMVEC_OPT_FILE),ALL,NOTEMPLATES)" - endif - endif -else - LDFLAGS += -Wl/PRELINK=$(PRELINK_TYPE)/MAP/CROSS -endif - -ifeq ($(debug),1) - LDFLAGS += -g -endif -LDFLAGS += -threads -DCCFLAGS += -g -OCCFLAGS += -O - -CFLAGS += -ieee -names_as_is_short -DCFLAGS += -g -OCFLAGS += -O - -PIC = -RANLIB = @true -ifeq ($(HOSTTYPE),ia64) - ARFLAGS = -r - SOFLAGS = -shared $(SYMVEC_OPT_FILE) -else - ARFLAGS = -c - SOFLAGS = -shared -auto_symvec -endif -ifeq ($(pthread),1) - LIBS += -lpthread -endif - -CC = cc -CXX = cxx -LD = $(CXX) -DLD = $(CXX) -SOVERSION = -SOEXT = exe -EXEEXT = .exe - -ifeq ($(HOSTTYPE),ia64) - REALCLEAN_FILES += $(SYMVEC_OPT_FILE) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \ - $(CLEANUP_BIN:%=%.DSF) $(basename $(BIN)) -else - REALCLEAN_FILES += $(CLEANUP_VSHLIB_NO_VER:%.exe=%_symvec.opt) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \ - $(CLEANUP_BIN:%=%.DSF) $(basename $(BIN)) -endif - -ifneq ($(MAKEFILE),$(DEPENDENCY_FILE)) -VMS_DUMMY_ := $(shell touch $(DEPENDENCY_FILE)) -VMS_DUMMY_ := $(VMS_DUMMY_) -endif - -ifeq ($(HOSTTYPE),ia64) - ifeq ($(shared_libs),1) - ifneq ($(SHLIB),) -BUILD := post_build.local - -.PHONY: post_build.local - -post_build.local: - @-if [ ! -z "$(VSHLIB)" ]; then dcl "set image/success $(VSHLIB)"; echo ""; fi - - endif - endif -endif diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU deleted file mode 100644 index 2f61e6a647eb3..0000000000000 --- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU +++ /dev/null @@ -1,49 +0,0 @@ -# -*- Makefile -*- - -# RTEMS 4.6.6 and later with GNU g++. - -CROSS-COMPILE = 1 - -debug ?= 1 -optimize ?= 1 -threads ?= 1 - -shared_libs = -static_libs = 1 -rwho = 0 - -ifneq (,$(HOST_ROOT)) - TAO_IDL = $(HOST_ROOT)/bin/tao_idl - TAO_IDL_DEP = $(TAO_IDL) -endif - -ifeq (,$(RTEMS_MAKEFILE_PATH)) - default: - @ERROR: you must set your RTEMS_MAKEFILE_PATH environment variable -endif # RTEMS_MAKEFILE_PATH - -ifeq (,$(PERL_PATH)) - PERL_PATH = perl -endif # ! PERL_PATH - -include $(RTEMS_MAKEFILE_PATH)/Makefile.inc -include $(RTEMS_MAKEFILE_PATH)/make/target.cfg - -# Test for template instantiation. -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -ifeq (no,$(RTEMS_HAS_NETWORKING)) - CFLAGS += -DACE_LACKS_NETWORKING - CCFLAGS += -DACE_LACKS_NETWORKING -endif - -CFLAGS += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib -DCFLAGS += -g -DCCFLAGS += -g -DLD = $(LD) -INCLDIRS += - -LD = $(CXX) -LDFLAGS += -Wl,--allow-multiple-definition -B$(RTEMS_MAKEFILE_PATH)/lib -Wl,-Ttext,0x00100000 -OCFLAGS += -O -PIC = diff --git a/ACE/include/makeinclude/platform_sunos5_common.GNU b/ACE/include/makeinclude/platform_sunos5_common.GNU deleted file mode 100644 index 0dc819189f160..0000000000000 --- a/ACE/include/makeinclude/platform_sunos5_common.GNU +++ /dev/null @@ -1,45 +0,0 @@ -# -*- Makefile -*- - - -# SunOS 5.x common settings - -ifeq ($(shell /bin/uname -r),5.9) - # Solaris 9 puts sendfile() in a separate library. - LIBS += -lsendfile -endif -ifeq ($(shell /bin/uname -r),5.10) - # Solaris 10 puts sendfile() in a separate library. - LIBS += -lsendfile - sctp ?= lksctp -endif -ifeq ($(shell /bin/uname -r),5.11) - # Solaris 11 puts sendfile() in a separate library. - LIBS += -lsendfile - sctp ?= lksctp -endif -kstat ?= 1 -ifeq ($(kstat),1) - # Unguard the raw monitor code and link the system lib. - FLAGS_C_CC += -DACE_HAS_KSTAT - LIBS += -lkstat -endif - -PLATFORM_X11_CPPFLAGS= -I/usr/openwin/include -I/usr/dt/include -PLATFORM_X11_LIBS =-lX11 -PLATFORM_X11_LDFLAGS= - -PLATFORM_TK_CPPFLAGS= -PLATFORM_TK_LIBS=-ltk -ltcl -PLATFORM_TK_LDFLAGS= - -# TODO: Fix the parameters -#PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4 -#PLATFORM_TCL_LIBS=-ltcl8.4 -#PLATFORM_TCL_LDFLAGS= - -sctp ?= -ifeq ($(sctp),lksctp) - PLATFORM_SCTP_CPPFLAGS+= -DACE_HAS_LKSCTP - PLATFORM_SCTP_LIBS?= -lsctp -endif - diff --git a/ACE/include/makeinclude/platform_sunos5_g++.GNU b/ACE/include/makeinclude/platform_sunos5_g++.GNU deleted file mode 100644 index f5f0b990bb644..0000000000000 --- a/ACE/include/makeinclude/platform_sunos5_g++.GNU +++ /dev/null @@ -1,65 +0,0 @@ -# -*- Makefile -*- - -# SunOS 5.x (Solaris 2.x) with g++ - -# NOTE: On Solaris86, you'll need to use GNU as instead of /usr/ccs/bin/as, -# if you want -gstabs+ and -pipe support. - -debug ?= 1 -optimize ?= 1 -threads ?= 1 -buildbits ?= 32 - -ifeq ($(buildbits),64) - FLAGS_C_CC += -m64 - LDFLAGS += -m64 -endif - -ifeq ($(shell /bin/uname -m),i86pc) - #### gcc on Solaris86 doesn't use -g - DCFLAGS += -gstabs+ - DCCFLAGS += -gstabs+ -else # ! i86pc - DCFLAGS += -g - DCCFLAGS += -g -endif # ! i86pc - -CC = gcc -CXX = g++ - -ifeq ($(threads),1) - CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -endif - -DLD = $(CXX) -LD = $(CXX) -LDFLAGS += -LIBS += -lsocket -ldl -lgen -lnsl -lposix4 -lthread -OCFLAGS += -O3 -OCCFLAGS += -O3 -PIC = -fPIC -AR = ar -ARFLAGS = ruv -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -# Make sure we resolve all symbols at link time, see bugzilla 2710 -LDFLAGS += -z now - -## Unfortunately, gcc 3.0 fails to many cpp files with -## optimization enabled. Even -O causes the compiler -## to core dump on some files. -ifeq ($(shell $(CXX) --version),3.0) - override optimize = 0 -endif diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU deleted file mode 100644 index 34c6be57aeb3e..0000000000000 --- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU +++ /dev/null @@ -1,264 +0,0 @@ -# -*- Makefile -*- - - -# SunOS 5.x (Solaris 2.x) with Sun C++ 4.2 and 5.x -# -# NOTE: Sun C++ 5.0 users might need to add this to their CCFLAGS: -# -compat=4 and/or remove -instances=explicit. Please note that -# inlining is disabled by default with Sun C++ 5.0. If you'd like -# to try enabling it, comment out the "inline = 0" line below. -# -# To enable compilation of 64-bit binaries with Sun CC 5.0, a -# platform_macros.GNU file such as this can be used: -# fast=1 -# include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU -# CFLAGS += -xtarget=ultra2 -xarch=v9a #### CPU specific! -# SOFLAGS += -xtarget=ultra2 -xarch=v9a -# LDFLAGS += -L/opt/SUNWspro/SC5.0/lib/v9 -L/usr/lib/sparcv9 -# Please note that the xtarget and xarch settings are specific to -# the target CPU. The /opt/SUNWspro/ Sun C++ installation directory -# is site-specific. -# -# To build 64-bit binaries with Forte 6 and later, build with the -# "buildbits=64" option (make buildbits=64). -# -# With slight modification, this file could be used with Sun C++ 4.1. -# However, it's likely that you won't be able to build all of ACE -# with Sun C++ 4.1. -# -# NOTE: some ACE files might generate this warning: -# "Warning: Could not find source for " one of the following: -# default constructor, copy constructor, destructor, or assignment -# operator. It appears that with +w, Sun C++ 4.x issues this warning -# whenever it has to generate one of these functions (because it wasn't -# defined by the user). This isn't really a problem. -# This warning appears to be fixed by Sun C++ 4.2 jumbo patch 104631-02. -# -# -pta instantiates all template members, which makes libraries bigger. -# But, it's supposed to put each member into it's own .o, so executable -# size should not be penalized. We don't use it because it's not -# necessary with automatic template instantiation. - -compat4 ?= 0 -debug ?= 1 -distrib ?= 1 -rwtools ?= 0 -stdcpplib ?= 1 -stlport ?= 0 -threads ?= 1 -pthreads ?= 1 -versioned_so ?= 1 -tk_reactor ?= 0 -ace_with_x11 ?= 0 -no_annotations ?= 1 -no_hidden_visibility ?= 1 -templates ?= automatic - -## If you set this to 1 you will need to add -xarch=v8plus (or higher) -## to CFLAGS or the assembler code will not compile -atomic_ops_sparc ?= 0 - -ifeq ($(threads),1) - CFLAGS += -mt - LDFLAGS += -mt -endif # threads - -CC = cc -CXX = CC - -CC_VERSION := $(shell $(CXX) -V 2>&1) - -### CC 5.4 provides insufficient preprocessor output (at 111715-17 2005/10/13) -### We need to use cc instead - see bugzilla #2478. -ifeq (C++ 5.4,$(findstring C++ 5.4,$(CC_VERSION))) - ACE_CC_PREPROCESSOR = cc -endif - -ifeq ($(atomic_ops_sparc),1) - CFLAGS += -DACE_HAS_BUILTIN_ATOMIC_OP -DACE_INCLUDE_ATOMIC_OP_SPARC -endif - -#### The following macro overrides enable creation of fast executables. -#### They _don't_ support fast compilation :-) -#### To use, add fast=1 to your "make" invocation. -#### -#### -g is incompatible with -fast. If you need -g, you can -#### use "-fast -O3". -#### -#### Have to do this _before_ adding any -xarch, -xtarget, etc. flags since -#### -fast is shorthand for a list of internally-assigned options, some of -#### which will are -xarch, -xtarget. Thus, explicit -xarch needs to go -#### to the right of -fast. -DCFLAGS += -g -DCCFLAGS += -DLD = $(CXX) -ifeq (1,$(fast)) - CFLAGS += -fast - DCFLAGS = - DCCFLAGS = - LDFLAGS += -fast -endif # fast -# Make sure we resolve all symbols at link time, see bugzilla 2710 -LDFLAGS += -z now - -# Studio 8 or better has version greater than 5.4 (Studio 8 == CC 5.5). -STUDIO_8_OR_BETTER = $(shell a=`echo $(CC_VERSION) | sed -e 's/[^0-9]*\([0-9]*\)\.\([0-9]*\).*$$/\1\2/g'`; if test "$$a" -gt 54; then echo 1; else echo 0; fi) -STUDIO_12_OR_BETTER = $(shell a=`echo $(CC_VERSION) | sed -e 's/[^0-9]*\([0-9]*\)\.\([0-9]*\).*$$/\1\2/g'`; if test "$$a" -gt 58; then echo 1; else echo 0; fi) - -ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION))) - #### CC 5.0 or later - #### Inlining appears to cause link problems with early releases of - #### CC 5.0. - ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION))) - inline = 0 - else - ifeq (C++ 5.1 ,$(findstring C++ 5.1 ,$(CC_VERSION))) - inline = 0 - else # ! 5.1 - inline ?= 1 - endif # 5.2 or greater - endif #! 5.0 - - CCFLAGS += $(CFLAGS) - - #### If compat=4 is desired, set up for that. There are syntactic diffs - #### in the compatibility modes, but here all we need to be concerned with - #### is turning on -compat=4, and not trying to enable the new libraries. - ifeq ($(compat4),1) - CCFLAGS += -compat=4 - CCFLAGS += -features=rtti - else - ifneq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION))) - # If 64-bit build is desired, turn that on. If no code gen options - # are given to Forte 6, the default build is 32-bit, even when - # building on a 64-bit system. Specifying xarch=v9 generates code - # that runs on any Sparc v9 (64-bit) processor. - # Beginning at (I believe) Studio 10 (C++ 5.7) there's a - # -xarch=generic64 option that works for both Sparc and x86. - # If you want to tune this further, you should extract and insert - # from CCFLAGS in a private platform_macros.GNU file. - ifeq (64,$(buildbits)) - ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) - CFLAGS += -xarch=generic64 - LDFLAGS += -xarch=generic64 - else - ifeq (C++ 5.8,$(findstring C++ 5.8,$(CC_VERSION))) - CFLAGS += -xarch=generic64 - LDFLAGS += -xarch=generic64 - else - # Starting at Studio 12 (CC 5.9), -m64 is used in place of -xarch - ifeq (1,$(STUDIO_12_OR_BETTER)) - CFLAGS += -m64 - LDFLAGS += -m64 - else - CFLAGS += -xarch=v9 - LDFLAGS += -xarch=v9 - endif # C++ 5.9+ - endif # C++ 5.8 - endif # C++ 5.7 - endif # buildbits - endif # CC 5.0 - endif # compat4 requested -endif # CC 5.0 or later - -ifeq ($(shared_libs), 1) - ifneq ($(static_libs_only), 1) - # Take advantage of Sun Studio 8 (v5.5) symbol scopes to - # generate improved shared library binaries. - ifeq ($(STUDIO_8_OR_BETTER),1) - ifneq ($(no_hidden_visibility),1) - CCFLAGS += -xldscope=hidden - else - CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0 - endif # no_hidden_visibility - endif # Sun Studio 8 (C++ 5.5) or better. - endif # static_libs_only -endif # shared_libs - -LD = $(CXX) -ifeq ($(distrib),0) - LDFLAGS += -R $(ACE_ROOT)/lib -R./ -endif - -# Get common Solaris settings -include $(ACE_ROOT)/include/makeinclude/platform_sunos5_common.GNU - -LIBS += -lsocket -lrt -laio -ldl -lnsl -lgen -lposix4 -ladm - -# Support alternate CC libraries (i.e. STLport, Tools.h++, Cstd) -# See: http://docs.sun.com/app/docs/doc/820-7599/bkaty?a=view -ifeq ($(stlport),1) - CC_LIBRARY = stlport4 - PLATFORM_STLPORT_CCFLAGS += -library=$(CC_LIBRARY) - PLATFORM_STLPORT_LDFLAGS += -library=$(CC_LIBRARY) -else - ifeq ($(rwtools),1) - ifeq ($(stdcpplib),1) - CC_LIBRARY = rwtools7_std - else - CC_LIBRARY = rwtools7,iostream - CPPFLAGS += -DACE_USES_OLD_IOSTREAMS - endif - else # default - ifeq ($(stdcpplib),1) - CC_LIBRARY = Cstd - else - CC_LIBRARY = no%Cstd,iostream - CPPFLAGS += -DACE_USES_OLD_IOSTREAMS - endif - endif - CCFLAGS += -library=$(CC_LIBRARY) - LDFLAGS += -library=$(CC_LIBRARY) -endif - -### CC 5.10 enables annotation support by default; allow user to override -### new behavior. This also provides a work around for 64-bit linker crashes, -### see: http://defect.opensolaris.org/bz/show_bug.cgi?id=9720 -ifeq (C++ 5.10,$(findstring C++ 5.10,$(CC_VERSION))) - ifeq ($(no_annotations),1) - LDFLAGS += -xannotate=no - endif -endif - -LDFLAGS += -xildoff -ifeq ($(pthreads),1) - CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -endif -OCFLAGS += -xO4 -PIC = -KPIC -AR = CC -ARFLAGS = -xar -o -RANLIB = echo -SOFLAGS += -G $(CPPFLAGS) - -# The correct flags to pass to the linker for ELF dynamic shared library -# versioning. This knows that wrapper_macros.GNU will set versioned_so to -# 1 if it's not set. So, the only way SOFLAGS should _not_ get this is if -# versioned_so has been explicitly disabled. -# -ifeq ($(versioned_so),1) - SOFLAGS += -h $(SONAME) -endif - -ifdef CLEANUP_BIN - #### Builds .shobj/$*.o file, then .shobj/$*.so file. The .o files - #### are used for building libraries and executables. But, it seems - #### to be necessary to build the .so files (with -G) in order to get - #### all template instantiations. - SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ - $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o -else - #### Optimize builds when no executables are built in the current - #### directory. Only a library is being created, and -G is used - #### in that step. Therefore, all templates instantations are - #### included in the library. This optimization saves almost 11 Mb - #### (2.6 percent) and 27 minutes (22 percent) on the entire ACE - #### build on a 168 MHz Sun Ultra2. - #### - #### Sun C++ won't allow the output from a compile to be named with - #### a .so extension. Rather than muck with the ACE build rules and - #### risk upsetting builds on other platforms, just ln the output - #### after building it. - SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ - /bin/ln $(VSHDIR)$*.o $@ -endif # CLEANUP_BIN diff --git a/ACE/include/makeinclude/platform_vxworks6.6.GNU b/ACE/include/makeinclude/platform_vxworks6.6.GNU index a8ad549cf0508..9f00cbd694157 100644 --- a/ACE/include/makeinclude/platform_vxworks6.6.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.6.GNU @@ -6,10 +6,6 @@ endif # VXWORKS_VERSION_FLAG include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.5.GNU -ifeq ("$(WIND_HOST_TYPE)","sun4-solaris2") - override RM=rm -f -endif # sun4-solaris2 - # Disable strict aliasing warnings, these are given on some VxWorks system # header files and has been reported to WindRiver ifeq ("$(TOOL_FAMILY)","gnu") diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU index 4ca47346ccf87..644d19d30e972 100644 --- a/ACE/include/makeinclude/platform_vxworks7.0.GNU +++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU @@ -72,6 +72,10 @@ endif VXWORKS_VERSION_FLAG ?= -DACE_VXWORKS=0x700 CPPFLAGS += $(VXWORKS_VERSION_FLAG) +ifneq ($(WIND_RELEASE_ID), ) + CPPFLAGS += -DACE_VXWORKS_RELEASE=0x$(subst .,,$(WIND_RELEASE_ID)) +endif + ifeq ($(pthread),1) CPPFLAGS += -DACE_HAS_PTHREADS endif @@ -98,6 +102,20 @@ endif ace_vx_mk_dir = $(if $(findstring 1,$(rtp)),$(WIND_USR_MK),$(WIND_KRNL_MK)) include $(ace_vx_mk_dir)/defs.library.mk +ifneq ($(rtp),0) + ## If we are building rtp and using the llvm (clang) compiler, we need to + ## use the linker directly to create shared libraries and executables. + ifeq ($(TOOL),llvm) + LLD = $(__WRS_TOOL_PATH)/ld$(TOOLENV) + define LINK.cc.override +$(LLD) $(LDFLAGS) $(LD_EMULATION) --allow-shlib-undefined -EL $(VSB_DIR)/usr/lib/common/crt0.o -o $@ $(filter %.o,$^) --start-group --as-needed $(LDLIBS) -lc -lc_internal -lllvm -lcplusplus -lllvmcplus -lnet -ldl --end-group + endef + define SOLINK.cc.override +$(LLD) $(LDFLAGS) $(LD_EMULATION) -shared --exclude-libs libc_internal.a -u __init -u __fini -o $@ $(filter %.o,$^) --start-group --as-needed $(ACE_SHLIBS) -lc -lc_internal -lcplusplus -lnet --end-group + endef + endif +endif + dkm_libstdcpp ?= $(if $(findstring y,$(_WRS_CONFIG_PRI_diab)),1,0) ifeq ($(dkm_libstdcpp),1) DKM_LIBS += -L$(VSB_DIR)/krnl/gnu_standard --start-group -lstl -lgnucplus --end-group diff --git a/ACE/include/makeinclude/rules.bin.GNU b/ACE/include/makeinclude/rules.bin.GNU index 9fb934580cb76..3da9b1b5eaa0e 100644 --- a/ACE/include/makeinclude/rules.bin.GNU +++ b/ACE/include/makeinclude/rules.bin.GNU @@ -1,7 +1,7 @@ # -*- Makefile -*- #---------------------------------------------------------------------------- -# +# # # Build binaries # GNU version @@ -35,18 +35,12 @@ PSRC += $(addsuffix .cpp, $(CLEANUP_BIN)) CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(VAR)$(EXEEXT)) VXWORKSLINK ?= -using_aix_vacpp ?= ifeq ($(VXWORKSLINK),1) $(ARCH_BIN): $(DEFAULTRULE) mv $(DEFAULTRULE) $@ else # !VXWORKSLINK - ifeq (1,$(using_aix_vacpp)) -$(ARCH_BIN): %: %.icc $(SRC) - vacbld_r $< -severitylevel=warning - else # !using_aix_vacpp # Since we add in the vdir, don't use arch_bin. use bin instead! $(ARCH_BIN): %: $(VDIR)$(BIN).$(OBJEXT) $(VOBJS) $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$(BIN).$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(POSTLINK) - endif # using_aix_vacpp endif diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index 1a84f3d92cddc..6b8c2e8fc1334 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -137,7 +137,6 @@ ifneq ($(INSLIB),) endif # INSLIB ace_lib_prelink ?= 0 -aix_build ?= 0 ifeq (1,$(VXWORKS)) @@ -187,25 +186,11 @@ $(VLIB): $(VLOBJS) #### to lib files, for example. -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR) endif # ace_lib_prelink - ifeq (1,$(ACE_OPENVMS)) - find $(TMPINCDIR:%=%) -name "*.$(OBJEXT)" -or -name "*.obj" | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) - else - ifneq (,$(AR.cc.override)) + ifneq (,$(AR.cc.override)) $(AR.cc.override) else ([ "`echo $(TMPINCDIR:%=%/*.$(OBJEXT))`" != "$(TMPINCDIR:%=%/*.$(OBJEXT))" ] && echo $(TMPINCDIR:%=%/*.$(OBJEXT)); \ echo $(filter %.$(OBJEXT), $^)) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) - endif - endif - ifdef ibmcxx_build -# This is required to get AIX IBM C/C++ to instantiate and compile the needed -# templates. - if test -s ./$(TEMPINCDIR)/*.C; \ - then \ - $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ - $(RM) dummy; \ - $(AR) $(ARFLAGS) $@ $(TEMPINCDIR)/*.$(OBJEXT); \ - fi endif -chmod a+r $@ ifneq (,$(RANLIB)) @@ -214,55 +199,19 @@ $(VLIB): $(VLOBJS) endif # !VXWORKS -# Note that if you don't want to build shared libraries, just remove the -# $(VSHOBJS) -# -# The AIX shr.o build is out here to keep it away from the SOVERSION stuff. -# The SOVERSION transform is applied after building the library file. -ifeq (1,$(aix_build)) -shr.o: $(VSHOBJS) - $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) - -.INTERMEDIATE: shr.o -endif # aix_build - ifeq ($(VXWORKSLINK),1) $(VSHLIB): $(basename $(notdir $(PRJ_FILE))).out -$(RM) $@ -$(LN_S) $(PROJECT_OUT) $@ -$(POST_BUILD_RULE) else # !VXWORKSLINK - ifeq (1,$(aix_build)) -$(VSHLIB): shr.o - $(AR) $(ARFLAGS) $@ $? - ifneq (,$(RANLIB)) - -$(RANLIB) $@ - endif # RANLIB - else # ! aix_build $(VSHLIB): $(VSHOBJS) - ifdef PRELIB + ifdef PRELIB $(PRELIB) - endif # PRELIB - ifdef ibmcxx_build - # This is required to get AIX IBM C/C++ to instantiate and compile the needed - # templates before building the library. - if test -s ./$(TEMPINCDIR)/*.C; \ - then \ - $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ - $(RM) dummy; \ - fi - endif # ibmcxx_build - ifdef SHLIBBUILD + endif # PRELIB + ifdef SHLIBBUILD $(SHLIBBUILD) else # ! SHLIBBUILD - ifdef ibmcxx_build - if test -s ./$(TEMPINCDIR)/*.$(OBJEXT); \ - then \ - $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(TEMPINCDIR)/*.$(OBJEXT) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ - else \ - $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ - fi - else # !ibmcxx_build ifeq (1,$(ace_lib_prelink)) #### Attempt a link (which will fail), to add template instantiations #### to lib files, for example. @@ -273,9 +222,7 @@ $(VSHLIB): $(VSHOBJS) else $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) endif #override - endif # ibmcxx_build - endif # SHLIBBUILD - endif # aix_build + endif # SHLIBBUILD endif # VXWORKSLINK ifneq ($(SOVERSION),) # This carefully works with both ARCH (where VSHLIB_* refer to the ARCH diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index e562b5acc99ae..d2da721b3f1bc 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -1,6 +1,6 @@ # -*- Makefile -*- #---------------------------------------------------------------------------- -# +# # # Local targets # GNU version @@ -27,20 +27,9 @@ ifdef TEMPINCDIR CLEANUP_DIRS += $(TEMPINCDIR) endif -ifdef sun - CLEANUP_DIRS += SunWS_cache -endif - vxworks_ntbuild ?= 0 lacks_touch ?= 0 -#### TEMPLATE_REPOSITORY can be set in individual platform files -#### to create template repository directories. See -#### platform_sunos5_sunc++.GNU for an example. -ifdef TEMPLATE_REPOSITORY -CLEANUP_DIRS += $(TEMPLATE_REPOSITORY) -endif - ifeq ($(use_pwd_call),) ifneq ($(mingw32),1) use_pwd_call := 0 @@ -293,11 +282,17 @@ $(INSMAN)/manl/% \ $(INSMAN)/mann/% : @$(MKDIR) $(@D) ifeq ($(vxworks_ntbuild),1) + ifeq ($(SOVERSION),) + @if not "$(ARCH_SOURCE_DIR)/$(@F)" == "$@" \ + echo $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $@ && \ + $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $@ + else @if not exist $@ $(RM) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) && \ $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) && \ $(RM) $@ && \ echo $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $@ && \ $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $@ + endif #SOVERSION else #not vxworks_ntbuild ifeq ($(firstword $(LN_S)),cp) ifneq ($(SOVERSION),) @@ -363,7 +358,7 @@ ifneq ($(SHLIB_UNCHECKED),) -$(RM) $(SHLIB_UNCHECKED) ifeq ($(versioned_so),1) -$(RM) $(SHLIB_UNCHECKED)$(SOVERSION) -else +else ifeq ($(versioned_so),2) -$(RM) $(SHLIB_UNCHECKED:.$(SOEXT)=$(SOVERSION).$(SOEXT)) endif @@ -504,7 +499,7 @@ depend.local: $(MAKEFILE) idl_stubs.local @$(RM) $(DEPENDENCY_FILE).old @cp $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old $(DEPGEN_ENV) $(DEPGEN) -A $(DEPEND_CMD_ARGS) -f $(DEPENDENCY_FILE) \ - $(CPPFLAGS) -t gnu -DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC) + $(CPPFLAGS) -t gnu -DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC) @if cmp -s $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old ;\ then echo "GNUmakefile dependencies unchanged." ;\ else \ diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index f98882814674d..d815f61466263 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -26,7 +26,6 @@ # to CPPFLAGS, PLATFORM_DMALLOC_LDFLAGS to LDFLAGS, and # PLATFORM_DMALLOC_LIBS to LIBS. For more information on # dmalloc, see http://dmalloc.com. -# fast Enable -fast option, e.g., with Sun C++. # inline Enable ACE inlining. Some platforms enable inlining by # default, others do not. If platform_macros.GNU does not # set this, inline is enabled. @@ -224,7 +223,6 @@ endif # alternate_platform_macros # Define some variables to silence warnings GHS ?= -AIX_TEMPLATE_HACK ?= # $(ACE_PLATFORM_CONFIG) is used in dependency rules and corresponds to the # platform dependent config-*.h file included in config.h, and can be set @@ -843,10 +841,6 @@ ifdef quantify PURELINK += quantify -best-effort -cache-dir=$(PURE_CACHE_DIR) \ -max_threads=100 $(PLATFORM_QUANTIFY_OPTIONS) CPPFLAGS += -DACE_HAS_QUANTIFY -I$(ACE_QUANTIFY_DIR) - - ifeq ($(shell uname -p),sparc) - PURELINK += -record-register-window-traps - endif # sparc endif # quantify repo ?= diff --git a/ACE/lib/.empty b/ACE/lib/.empty deleted file mode 100644 index eb0e403e06a0f..0000000000000 --- a/ACE/lib/.empty +++ /dev/null @@ -1 +0,0 @@ -This file keeps the directory around even when using cvs update -dP diff --git a/ACE/netsvcs/clients/Naming/Client/Client_Test.cpp b/ACE/netsvcs/clients/Naming/Client/Client_Test.cpp index c4d48a685f247..0fb055c05033d 100644 --- a/ACE/netsvcs/clients/Naming/Client/Client_Test.cpp +++ b/ACE/netsvcs/clients/Naming/Client/Client_Test.cpp @@ -16,22 +16,22 @@ // Get the instance of Name_Service using Dynamic_Service //inline Name_Service * -//NAME_SERVICE (void) +//NAME_SERVICE () inline ACE_Naming_Context * -NAMING_CONTEXT (void) +NAMING_CONTEXT () { return ACE_Dynamic_Service::instance ("ACE_Naming_Context"); } -Client_Test::Client_Test (void) +Client_Test::Client_Test () { ACE_DEBUG ((LM_DEBUG, "Client_Test::Client_Test\n")); } int -Client_Test::open (void) +Client_Test::open () { // Cache the name options. this->name_options_ = NAMING_CONTEXT ()->name_options (); @@ -50,7 +50,7 @@ Client_Test::open (void) int -Client_Test::close (void) +Client_Test::close () { // Deregister this handler with the ACE_Reactor. return ACE_Reactor::instance ()->remove_handler @@ -222,7 +222,7 @@ Client_Test::handle_input (ACE_HANDLE) } void -Client_Test::display_menu (void) +Client_Test::display_menu () { ACE_DEBUG ((LM_DEBUG, "\n")); this->list_options (); @@ -246,7 +246,7 @@ Client_Test::display_menu (void) } void -Client_Test::list_options (void) +Client_Test::list_options () { switch (this->name_options_->context ()) { @@ -276,7 +276,7 @@ Client_Test::list_options (void) } int -Client_Test::set_proc_local (void) +Client_Test::set_proc_local () { // Close down original name space NAMING_CONTEXT ()->close (); @@ -286,7 +286,7 @@ Client_Test::set_proc_local (void) } int -Client_Test::set_node_local (void) +Client_Test::set_node_local () { // Close down original name space NAMING_CONTEXT ()->close (); diff --git a/ACE/netsvcs/clients/Naming/Client/Client_Test.h b/ACE/netsvcs/clients/Naming/Client/Client_Test.h index 8332e06b8da6d..1a2b0738d0615 100644 --- a/ACE/netsvcs/clients/Naming/Client/Client_Test.h +++ b/ACE/netsvcs/clients/Naming/Client/Client_Test.h @@ -9,18 +9,18 @@ class Client_Test : public ACE_Event_Handler { public: - Client_Test (void); + Client_Test (); - int open (void); + int open (); // Cache reactor and then register self with reactor - int close (void); + int close (); // Close things down and free up resources. virtual int handle_input (ACE_HANDLE handle); // Handle user entered commands - void list_options (void); + void list_options (); // Print name options int bind (const char *key, @@ -61,13 +61,13 @@ class Client_Test : public ACE_Event_Handler ACE_Name_Options *name_options_; // Name Options associated with the Naming Context - void display_menu (void); + void display_menu (); // Display user menu - int set_proc_local (void); + int set_proc_local (); // Set options to use PROC_LOCAL naming context - int set_node_local (void); + int set_node_local (); // Set options to use NODE_LOCAL naming context int set_host (const char *hostname, int port); diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp index d3b598dad6ffa..9572f57efa0fc 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_unistd.h" - Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[]) : infile_ (0) { @@ -57,7 +56,7 @@ Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("register_stdin_handler"))); } -Dump_Restore::~Dump_Restore (void) +Dump_Restore::~Dump_Restore () { // Deregister this handler with the ACE_Reactor. ACE_Reactor::instance ()->remove_handler @@ -136,7 +135,7 @@ Dump_Restore::handle_input (ACE_HANDLE) } void -Dump_Restore::display_menu (void) +Dump_Restore::display_menu () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); @@ -196,7 +195,7 @@ Dump_Restore::display_menu (void) int -Dump_Restore::set_proc_local (void) +Dump_Restore::set_proc_local () { // Set Name Options this->name_options_->nameserver_host (ACE_TEXT ("localhost")); @@ -224,7 +223,7 @@ Dump_Restore::set_proc_local (void) } int -Dump_Restore::set_node_local (void) +Dump_Restore::set_node_local () { // Set Name Options this->name_options_->nameserver_host (ACE_TEXT ("localhost")); @@ -442,13 +441,13 @@ Dump_Restore::rebind (const char *key, } int -Dump_Restore::quit (void) +Dump_Restore::quit () { return ACE_OS::kill (ACE_OS::getpid (), SIGINT); } void -Dump_Restore::dump (void) +Dump_Restore::dump () { ofstream output_file (dump_filename_); diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h index b833a6bf29f8d..901aba05813f6 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h @@ -20,24 +20,24 @@ class Dump_Restore : public ACE_Event_Handler Dump_Restore (int argc, ACE_TCHAR *argv[]); // Initialize name options and naming context - ~Dump_Restore (void); + ~Dump_Restore (); virtual int handle_input (ACE_HANDLE handle); // Handle user entered commands - void dump (void); + void dump (); private: ACE_TCHAR hostname_[MAXHOSTNAMELEN + 1]; // Cache the hostname and port number for remote case - void display_menu (void); + void display_menu (); // Display user menu. - int set_proc_local (void); + int set_proc_local (); // Set options to use PROC_LOCAL naming context. - int set_node_local (void); + int set_node_local (); // Set options to use NODE_LOCAL naming context. int set_host (const ACE_TCHAR *hostname, @@ -45,7 +45,7 @@ class Dump_Restore : public ACE_Event_Handler // Set options to use NET_LOCAL naming context specifying host name // and port number. - int quit (void); + int quit (); // Gracefully exit. int populate (Dump_Restore::Operation_Type op); diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/createfile.cpp b/ACE/netsvcs/clients/Naming/Dump_Restore/createfile.cpp index efca2e5eff47a..ce32ac6f1d041 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/createfile.cpp +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/createfile.cpp @@ -3,7 +3,6 @@ #include "ace/ACE.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/main.cpp b/ACE/netsvcs/clients/Naming/Dump_Restore/main.cpp index 77724d89d2db3..11c5c2f7e64f2 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/main.cpp +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/main.cpp @@ -5,7 +5,6 @@ #include "Dump_Restore.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/netsvcs/clients/Tokens/collection/collection.cpp b/ACE/netsvcs/clients/Tokens/collection/collection.cpp index 842a9841c9540..583c991237212 100644 --- a/ACE/netsvcs/clients/Tokens/collection/collection.cpp +++ b/ACE/netsvcs/clients/Tokens/collection/collection.cpp @@ -21,7 +21,6 @@ #include "ace/Service_Config.h" - #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY) static const char *server_host = ACE_DEFAULT_SERVER_HOST; diff --git a/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp b/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp index 3a4dc1e613804..f84d15b7f191a 100644 --- a/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp +++ b/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp @@ -6,7 +6,6 @@ #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY) - static ACE_Token_Proxy *global_rlock; static ACE_Token_Proxy *global_wlock; diff --git a/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp index e6f4b2826c94d..4818fb99785c7 100644 --- a/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp +++ b/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp @@ -200,7 +200,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } int -mutex_test (void) +mutex_test () { ACE_Thread_Manager thr_mgr; @@ -242,7 +242,7 @@ mutex_test (void) } static int -rwlock_test (void) +rwlock_test () { ACE_Thread_Manager thr_mgr; diff --git a/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp b/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp index 55d7b02ee4eb2..47da7c085b6f4 100644 --- a/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp +++ b/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp @@ -91,7 +91,7 @@ run_mutex (void *) } static int -run_final_test (void) +run_final_test () { ACE_DEBUG ((LM_DEBUG, "starting mutex tests 1 & 2\n")); diff --git a/ACE/netsvcs/clients/Tokens/manual/manual.cpp b/ACE/netsvcs/clients/Tokens/manual/manual.cpp index 82f2bad2a1881..329a40b765ecd 100644 --- a/ACE/netsvcs/clients/Tokens/manual/manual.cpp +++ b/ACE/netsvcs/clients/Tokens/manual/manual.cpp @@ -23,7 +23,6 @@ #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY) - typedef ACE_Token_Invariant_Manager ACE_TOKEN_INVARIANTS; /** @@ -37,7 +36,7 @@ class STDIN_Token : public ACE_Event_Handler { public: /// Construction. - STDIN_Token (void); + STDIN_Token (); /// Parse command-line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -54,9 +53,8 @@ class STDIN_Token : public ACE_Event_Handler typedef ACE_CString TID; private: - /// Display options. - void display_menu (void); + void display_menu (); /// Get or make a proxy to with a client id. ACE_Token_Proxy *get_proxy (const char *tid, const char *token, char type); @@ -87,7 +85,7 @@ class STDIN_Token : public ACE_Event_Handler int remote_; }; -STDIN_Token::STDIN_Token (void) +STDIN_Token::STDIN_Token () : server_host_ (ACE_DEFAULT_SERVER_HOST), server_port_ (ACE_DEFAULT_SERVER_PORT), ignore_deadlock_ (0), @@ -251,7 +249,7 @@ STDIN_Token::handle_input (ACE_HANDLE fd) } void -STDIN_Token::display_menu (void) +STDIN_Token::display_menu () { ACE_OS::printf (" \n"); } diff --git a/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp b/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp index 6e4a571675435..fd1b2797d1232 100644 --- a/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp +++ b/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp @@ -20,7 +20,6 @@ #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY) - typedef ACE_Token_Invariant_Manager ACE_TOKEN_INVARIANTS; static ACE_Token_Proxy *global_rlock; diff --git a/ACE/netsvcs/lib/Base_Optimizer.cpp b/ACE/netsvcs/lib/Base_Optimizer.cpp index 56c025d631207..d007a639aee9f 100644 --- a/ACE/netsvcs/lib/Base_Optimizer.cpp +++ b/ACE/netsvcs/lib/Base_Optimizer.cpp @@ -4,7 +4,7 @@ #include "Base_Optimizer.h" template -Base_Optimizer::Base_Optimizer (void) +Base_Optimizer::Base_Optimizer () { } diff --git a/ACE/netsvcs/lib/Base_Optimizer.h b/ACE/netsvcs/lib/Base_Optimizer.h index ec7c4dd7edf0e..ba98f50d34f5b 100644 --- a/ACE/netsvcs/lib/Base_Optimizer.h +++ b/ACE/netsvcs/lib/Base_Optimizer.h @@ -26,9 +26,8 @@ template class Base_Optimizer : public Base { - public: - Base_Optimizer (void); + Base_Optimizer (); Base_Optimizer (const Base &base); Base_Optimizer (const Base &base, const Member &member); @@ -36,12 +35,6 @@ class Base_Optimizer : public Base Member m_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Base_Optimizer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Base_Optimizer.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* BASE_OPTIMIZER_H */ diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp index 87c1ff3266f8d..ceef4fccbb8ec 100644 --- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp +++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp @@ -428,7 +428,7 @@ class ACE_Client_Logging_Acceptor : public ACE_Acceptor. public: - ACE_Client_Logging_Acceptor (void); + ACE_Client_Logging_Acceptor (); // Default constructor. protected: @@ -446,8 +446,8 @@ class ACE_Client_Logging_Acceptor : public ACE_Acceptor. // = Scheduling hooks. - virtual int suspend (void); - virtual int resume (void); + virtual int suspend (); + virtual int resume (); private: int parse_args (int argc, ACE_TCHAR *argv[]); @@ -477,7 +477,7 @@ class ACE_Client_Logging_Acceptor : public ACE_Acceptorclose (); @@ -520,7 +520,7 @@ ACE_Client_Logging_Acceptor::info (ACE_TCHAR **strp, size_t length) const return ACE_OS::strlen (buf); } -ACE_Client_Logging_Acceptor::ACE_Client_Logging_Acceptor (void) +ACE_Client_Logging_Acceptor::ACE_Client_Logging_Acceptor () : server_host_ (ACE_OS::strdup (ACE_DEFAULT_SERVER_HOST)), server_port_ (ACE_DEFAULT_LOGGING_SERVER_PORT), logger_key_ (ACE_OS::strdup (ACE_DEFAULT_LOGGER_KEY)), @@ -682,14 +682,14 @@ ACE_Client_Logging_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) } int -ACE_Client_Logging_Acceptor::suspend (void) +ACE_Client_Logging_Acceptor::suspend () { // To be done... return 0; } int -ACE_Client_Logging_Acceptor::resume (void) +ACE_Client_Logging_Acceptor::resume () { // To be done... return 0; diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.cpp b/ACE/netsvcs/lib/Log_Message_Receiver.cpp index a5a611183cba0..c775f77074b66 100644 --- a/ACE/netsvcs/lib/Log_Message_Receiver.cpp +++ b/ACE/netsvcs/lib/Log_Message_Receiver.cpp @@ -40,14 +40,14 @@ template ACE_SYNCH_MUTEX_T Log_Message_Receiver_Impl::copy_lock_; template -Log_Message_Receiver_Impl::Log_Message_Receiver_Impl (void) +Log_Message_Receiver_Impl::Log_Message_Receiver_Impl () : count_ (0) { } template Log_Message_Receiver_Impl * -Log_Message_Receiver_Impl::create (void) +Log_Message_Receiver_Impl::create () { return new Log_Message_Receiver_Impl; } @@ -103,13 +103,13 @@ Log_Message_Receiver_Impl::log_output (const ACE_TCHAR *hostname, } template -Log_Message_Receiver_Impl::~Log_Message_Receiver_Impl (void) +Log_Message_Receiver_Impl::~Log_Message_Receiver_Impl () { ACE_ASSERT (count_ == 0 - 1); } template -Log_Message_Receiver::Log_Message_Receiver (void) +Log_Message_Receiver::Log_Message_Receiver () : receiver_impl_ (Log_Message_Receiver_Impl::create ()) { ACE_ASSERT (receiver_impl_ != 0); @@ -142,7 +142,7 @@ Log_Message_Receiver::log_output(const ACE_TCHAR *hostname, } template -Log_Message_Receiver::~Log_Message_Receiver (void) +Log_Message_Receiver::~Log_Message_Receiver () { ACE_ASSERT (receiver_impl_ != 0); Log_Message_Receiver_Impl::detach (receiver_impl_); diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.h b/ACE/netsvcs/lib/Log_Message_Receiver.h index d9891a84e1604..e98e221cf6a43 100644 --- a/ACE/netsvcs/lib/Log_Message_Receiver.h +++ b/ACE/netsvcs/lib/Log_Message_Receiver.h @@ -95,7 +95,6 @@ template class Static_Log_Message_Receiver { - public: /// Prints the log_record to stderr using record.print (hostname, 0, stderr). /// Serializes the output by using a ACE_SYNCH_MUTEX. @@ -147,9 +146,9 @@ class Log_Message_Receiver { public: /// Creates a new Log_Message_Receiver - Log_Message_Receiver (void); + Log_Message_Receiver (); Log_Message_Receiver(Log_Message_Receiver const &rhs); - ~Log_Message_Receiver (void); + ~Log_Message_Receiver (); void log_record (const ACE_TCHAR *hostname, ACE_Log_Record &record); @@ -174,7 +173,7 @@ class Log_Message_Receiver_Impl { public: // Methods for handling reference count and instance lifetime - static Log_Message_Receiver_Impl *create (void); + static Log_Message_Receiver_Impl *create (); static Log_Message_Receiver_Impl *attach (Log_Message_Receiver_Impl *body); static void detach (Log_Message_Receiver_Impl *body); @@ -185,8 +184,8 @@ class Log_Message_Receiver_Impl ostream *output); protected: - Log_Message_Receiver_Impl (void); - ~Log_Message_Receiver_Impl (void); + Log_Message_Receiver_Impl (); + ~Log_Message_Receiver_Impl (); /// Attributes int count_; @@ -199,12 +198,6 @@ class Log_Message_Receiver_Impl Log_Message_Receiver_Impl (const Log_Message_Receiver_Impl &) = delete; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Log_Message_Receiver.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Log_Message_Receiver.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* LOG_MESSAGE_RECEIVER_H */ diff --git a/ACE/netsvcs/lib/Name_Handler.cpp b/ACE/netsvcs/lib/Name_Handler.cpp index cef63c56bd667..05a91eb309ead 100644 --- a/ACE/netsvcs/lib/Name_Handler.cpp +++ b/ACE/netsvcs/lib/Name_Handler.cpp @@ -207,7 +207,7 @@ ACE_Name_Handler::send_request (ACE_Name_Request &request) // unexpectedly). /* VIRTUAL */ int -ACE_Name_Handler::abandon (void) +ACE_Name_Handler::abandon () { ACE_TRACE ("ACE_Name_Handler::abandon"); return this->send_reply (-1, errno); @@ -234,7 +234,7 @@ ACE_Name_Handler::get_handle () const // Dispatch the appropriate operation to handle the client request. /* VIRTUAL */ int -ACE_Name_Handler::dispatch (void) +ACE_Name_Handler::dispatch () { ACE_TRACE ("ACE_Name_Handler::dispatch"); // Dispatch the appropriate request. @@ -254,7 +254,7 @@ ACE_Name_Handler::dispatch (void) // should use non-blocking I/O. /* VIRTUAL */ int -ACE_Name_Handler::recv_request (void) +ACE_Name_Handler::recv_request () { ACE_TRACE ("ACE_Name_Handler::recv_request"); // Read the first 4 bytes to get the length of the message This @@ -336,14 +336,14 @@ ACE_Name_Handler::handle_input (ACE_HANDLE) } int -ACE_Name_Handler::bind (void) +ACE_Name_Handler::bind () { ACE_TRACE ("ACE_Name_Handler::bind"); return this->shared_bind (0); } int -ACE_Name_Handler::rebind (void) +ACE_Name_Handler::rebind () { ACE_TRACE ("ACE_Name_Handler::rebind"); int result = this->shared_bind (1); @@ -388,7 +388,7 @@ ACE_Name_Handler::shared_bind (int rebind) } int -ACE_Name_Handler::resolve (void) +ACE_Name_Handler::resolve () { ACE_TRACE ("ACE_Name_Handler::resolve"); #if 0 @@ -421,7 +421,7 @@ ACE_Name_Handler::resolve (void) } int -ACE_Name_Handler::unbind (void) +ACE_Name_Handler::unbind () { ACE_TRACE ("ACE_Name_Handler::unbind"); #if 0 @@ -472,7 +472,7 @@ ACE_Name_Handler::type_request (ACE_NS_WString *one_type) } int -ACE_Name_Handler::lists (void) +ACE_Name_Handler::lists () { ACE_TRACE ("ACE_Name_Handler::lists"); @@ -523,7 +523,7 @@ ACE_Name_Handler::lists (void) } int -ACE_Name_Handler::lists_entries (void) +ACE_Name_Handler::lists_entries () { ACE_TRACE ("ACE_Name_Handler::lists_entries"); ACE_BINDING_SET set; @@ -612,18 +612,18 @@ ACE_Name_Handler::lists_entries (void) } ACE_Naming_Context * -ACE_Name_Handler::naming_context (void) +ACE_Name_Handler::naming_context () { return naming_context_; } ACE_Naming_Context * -ACE_Name_Acceptor::naming_context (void) +ACE_Name_Acceptor::naming_context () { return &naming_context_; } -ACE_Name_Handler::~ACE_Name_Handler (void) +ACE_Name_Handler::~ACE_Name_Handler () { ACE_TRACE ("ACE_Name_Handler::~ACE_Name_Handler"); #if 0 diff --git a/ACE/netsvcs/lib/Name_Handler.h b/ACE/netsvcs/lib/Name_Handler.h index 43a063beb9abe..7d499b3f65c07 100644 --- a/ACE/netsvcs/lib/Name_Handler.h +++ b/ACE/netsvcs/lib/Name_Handler.h @@ -50,7 +50,7 @@ class ACE_Svc_Export ACE_Name_Handler : public ACE_Svc_Handler::ha } template const ACE_TCHAR * -ACE_Server_Logging_Handler_T::host_name (void) +ACE_Server_Logging_Handler_T::host_name () { #if !defined (__GNUG__) return this->receiver_.m_.fast_rep (); @@ -245,7 +245,7 @@ ACE_Server_Logging_Handler_T::ha // established. template int -ACE_Server_Logging_Handler_T::open_common (void) +ACE_Server_Logging_Handler_T::open_common () { // Shut off non-blocking IO if it was enabled... if (this->peer ().disable (ACE_NONBLOCK) == -1) @@ -279,18 +279,18 @@ ACE_Server_Logging_Handler_T::op } template -ACE_Server_Logging_Acceptor_T::ACE_Server_Logging_Acceptor_T (void) +ACE_Server_Logging_Acceptor_T::ACE_Server_Logging_Acceptor_T () { } template LMR & -ACE_Server_Logging_Acceptor_T::receiver (void) +ACE_Server_Logging_Acceptor_T::receiver () { return receiver_; } template SST & -ACE_Server_Logging_Acceptor_T::scheduling_strategy (void) +ACE_Server_Logging_Acceptor_T::scheduling_strategy () { #if !defined (__GNUG__) return receiver_.m_; @@ -446,7 +446,7 @@ ACE_Thr_Server_Logging_Handler::open (void *) // Process remote logging records. template int -ACE_Thr_Server_Logging_Handler::svc (void) +ACE_Thr_Server_Logging_Handler::svc () { int result = 0; diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.h b/ACE/netsvcs/lib/Server_Logging_Handler_T.h index ccc4bb2b68536..0a6e3804e99f7 100644 --- a/ACE/netsvcs/lib/Server_Logging_Handler_T.h +++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.h @@ -55,11 +55,11 @@ class ACE_Server_Logging_Handler_T : public ACE_Svc_Handler class ACE_Server_Logging_Handler : public ACE_Server_Logging_Handler_T { - public: ACE_Server_Logging_Handler (ACE_Thread_Manager * = 0); ACE_Server_Logging_Handler (ACE_Thread_Manager *, @@ -192,7 +191,6 @@ typedef u_long ACE_LOGGER_COUNTER; template class ACE_Thr_Server_Logging_Handler : public ACE_Server_Logging_Handler_T { - public: ACE_Thr_Server_Logging_Handler (ACE_Thread_Manager * = 0); ACE_Thr_Server_Logging_Handler (ACE_Thread_Manager *, @@ -201,12 +199,6 @@ class ACE_Thr_Server_Logging_Handler : public ACE_Server_Logging_Handler_Tstate_; @@ -51,7 +51,7 @@ ACE_TS_Clerk_Handler::timeout (long to) // backoff. Returns the original timeout (i.e., before the // recalculation). long -ACE_TS_Clerk_Handler::timeout (void) +ACE_TS_Clerk_Handler::timeout () { ACE_TRACE ("ACE_TS_Clerk_Handler::timeout"); long old_timeout = this->timeout_; @@ -80,7 +80,7 @@ ACE_TS_Clerk_Handler::max_timeout (long mto) // Gets the max timeout delay. long -ACE_TS_Clerk_Handler::max_timeout (void) +ACE_TS_Clerk_Handler::max_timeout () { ACE_TRACE ("ACE_TS_Clerk_Handler::max_timeout"); return this->max_timeout_; @@ -146,7 +146,7 @@ ACE_TS_Clerk_Handler::handle_close (ACE_HANDLE, } int -ACE_TS_Clerk_Handler::reinitiate_connection (void) +ACE_TS_Clerk_Handler::reinitiate_connection () { ACE_TRACE ("ACE_TS_Clerk_Handler::reinitiate_connection"); // Skip over deactivated descriptors. @@ -223,7 +223,7 @@ ACE_TS_Clerk_Handler::remote_addr (ACE_INET_Addr &addr) } ACE_INET_Addr & -ACE_TS_Clerk_Handler::remote_addr (void) +ACE_TS_Clerk_Handler::remote_addr () { ACE_TRACE ("ACE_TS_Clerk_Handler::remote_addr"); return this->remote_addr_; @@ -323,7 +323,7 @@ ACE_TS_Clerk_Processor::ACE_TS_Clerk_Processor () } void -ACE_TS_Clerk_Processor::alloc (void) +ACE_TS_Clerk_Processor::alloc () { ACE_TRACE ("ACE_TS_Clerk_Processor::alloc"); ACE_NEW (this->shmem_, ALLOCATOR (this->poolname_)); @@ -424,7 +424,7 @@ ACE_TS_Clerk_Processor::update_time () int -ACE_TS_Clerk_Processor::fini (void) +ACE_TS_Clerk_Processor::fini () { ACE_TRACE ("ACE_TS_Clerk_Processor::fini"); @@ -608,14 +608,14 @@ ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[]) } int -ACE_TS_Clerk_Processor::suspend (void) +ACE_TS_Clerk_Processor::suspend () { ACE_TRACE ("ACE_TS_Clerk_Processor::suspend"); return 0; } int -ACE_TS_Clerk_Processor::resume (void) +ACE_TS_Clerk_Processor::resume () { ACE_TRACE ("ACE_TS_Clerk_Processor::resume"); return 0; diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.h b/ACE/netsvcs/lib/TS_Clerk_Handler.h index 75ed73303eea0..135276bd91d0d 100644 --- a/ACE/netsvcs/lib/TS_Clerk_Handler.h +++ b/ACE/netsvcs/lib/TS_Clerk_Handler.h @@ -34,7 +34,6 @@ */ class ACE_Time_Info { - public: time_t delta_time_; @@ -81,15 +80,15 @@ class ACE_Svc_Export ACE_TS_Clerk_Handler : public ACE_Svc_Handler @@ -112,7 +111,7 @@ class ACE_Svc_Export ACE_TS_Clerk_Handler : public ACE_Svc_Handlertime_request_.size (); @@ -248,7 +248,7 @@ ACE_TS_Server_Handler::handle_input (ACE_HANDLE) return this->dispatch (); } -ACE_TS_Server_Handler::~ACE_TS_Server_Handler (void) +ACE_TS_Server_Handler::~ACE_TS_Server_Handler () { ACE_TRACE ("ACE_TS_Server_Handler::~ACE_TS_Server_Handler"); ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/netsvcs/lib/TS_Server_Handler.h b/ACE/netsvcs/lib/TS_Server_Handler.h index 14bd8d59e06b9..7d9e89371466a 100644 --- a/ACE/netsvcs/lib/TS_Server_Handler.h +++ b/ACE/netsvcs/lib/TS_Server_Handler.h @@ -45,23 +45,23 @@ class ACE_Svc_Export ACE_TS_Server_Handler : public ACE_Svc_Handler { - public: /// Dynamic linking hook. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/netsvcs/lib/Time_Request_Reply.cpp b/ACE/netsvcs/lib/Time_Request_Reply.cpp index e04d5212b8e40..9ba8213d6d80f 100644 --- a/ACE/netsvcs/lib/Time_Request_Reply.cpp +++ b/ACE/netsvcs/lib/Time_Request_Reply.cpp @@ -8,7 +8,7 @@ #include "Time_Request_Reply.h" // Default "do nothing" constructor. -ACE_Time_Request::ACE_Time_Request (void) +ACE_Time_Request::ACE_Time_Request () { ACE_TRACE ("ACE_Time_Request::ACE_Time_Request"); } @@ -135,7 +135,7 @@ ACE_Time_Request::encode (void *&buf) // Decode the transfer buffer into host byte byte order // so that it can be used by the server. int -ACE_Time_Request::decode (void) +ACE_Time_Request::decode () { ACE_TRACE ("ACE_Time_Request::decode"); // Decode diff --git a/ACE/netsvcs/lib/Time_Request_Reply.h b/ACE/netsvcs/lib/Time_Request_Reply.h index 3ef13b3e221f7..729848a774f13 100644 --- a/ACE/netsvcs/lib/Time_Request_Reply.h +++ b/ACE/netsvcs/lib/Time_Request_Reply.h @@ -44,7 +44,7 @@ class ACE_Svc_Export ACE_Time_Request }; /// Default constructor. - ACE_Time_Request (void); + ACE_Time_Request (); /** * Create a ACE_Time_Request message. @@ -87,7 +87,7 @@ class ACE_Svc_Export ACE_Time_Request int encode (void *&); /// Decode message after reception. - int decode (void); + int decode (); /// Print out the values of the message for debugging purposes. void dump () const; diff --git a/ACE/netsvcs/lib/Token_Handler.cpp b/ACE/netsvcs/lib/Token_Handler.cpp index 81f77765e00bf..9bce275923dfa 100644 --- a/ACE/netsvcs/lib/Token_Handler.cpp +++ b/ACE/netsvcs/lib/Token_Handler.cpp @@ -293,7 +293,7 @@ ACE_Token_Handler::handle_timeout (const ACE_Time_Value &, // Dispatch the appropriate operation to handle the client request. ACE_Token_Proxy * -ACE_Token_Handler::get_proxy (void) +ACE_Token_Handler::get_proxy () { ACE_TRACE ("ACE_Token_Handler::get_proxy"); @@ -325,7 +325,7 @@ ACE_Token_Handler::get_proxy (void) } ACE_Token_Proxy * -ACE_Token_Handler::create_proxy (void) +ACE_Token_Handler::create_proxy () { ACE_TRACE ("ACE_Token_Handler::create_proxy"); @@ -362,7 +362,7 @@ ACE_Token_Handler::create_proxy (void) } int -ACE_Token_Handler::dispatch (void) +ACE_Token_Handler::dispatch () { ACE_TRACE ("ACE_Token_Handler::dispatch"); ACE_Token_Proxy *proxy = this->get_proxy (); @@ -394,7 +394,7 @@ ACE_Token_Handler::dispatch (void) // Note, this method should use non-blocking I/O. /* VIRTUAL */ int -ACE_Token_Handler::recv_request (void) +ACE_Token_Handler::recv_request () { ACE_TRACE ("ACE_Token_Handler::recv_request"); ssize_t n; @@ -478,7 +478,7 @@ ACE_Token_Handler::handle_input (ACE_HANDLE) } void -ACE_Token_Handler::sleep_hook (void) +ACE_Token_Handler::sleep_hook () { ACE_TRACE ("ACE_Token_Handler::sleep_hook"); // @@ what should we do? @@ -541,7 +541,7 @@ ACE_TS_Mutex::ACE_TS_Mutex (const ACE_TS_Mutex &m) } void -ACE_TS_Mutex::sleep_hook (void) +ACE_TS_Mutex::sleep_hook () { ACE_TRACE ("ACE_TS_Mutex::sleep_hook"); th_->sleep_hook (); @@ -585,7 +585,7 @@ ACE_TS_RLock::ACE_TS_RLock (const ACE_TS_RLock &r) } void -ACE_TS_RLock::sleep_hook (void) +ACE_TS_RLock::sleep_hook () { ACE_TRACE ("ACE_TS_RLock::sleep_hook"); th_->sleep_hook (); @@ -630,7 +630,7 @@ ACE_TS_WLock::ACE_TS_WLock (const ACE_TS_WLock &w) } void -ACE_TS_WLock::sleep_hook (void) +ACE_TS_WLock::sleep_hook () { ACE_TRACE ("ACE_TS_WLock::sleep_hook"); th_->sleep_hook (); diff --git a/ACE/netsvcs/lib/Token_Handler.h b/ACE/netsvcs/lib/Token_Handler.h index bbfa532c8b182..162b3b9bc7a09 100644 --- a/ACE/netsvcs/lib/Token_Handler.h +++ b/ACE/netsvcs/lib/Token_Handler.h @@ -43,7 +43,6 @@ */ class ACE_Svc_Export ACE_Token_Handler : public ACE_Svc_Handler { - public: /// Default constructor. ACE_Token_Handler (ACE_Thread_Manager * = 0); @@ -78,7 +77,7 @@ class ACE_Svc_Export ACE_Token_Handler : public ACE_Svc_Handler empty_iteration_time_ ? elapsed_time_ - empty_iteration_time_ : @@ -143,9 +143,9 @@ class Empty_Iteration_Test : public Basic_Test { public: Empty_Iteration_Test (ACE_High_Res_Timer &timer) : Basic_Test (timer, 0) {} - virtual ~Empty_Iteration_Test (void) {}; + virtual ~Empty_Iteration_Test () {}; - virtual void run (void); + virtual void run (); ACE_hrtime_t empty_iteration_time () const { @@ -154,7 +154,7 @@ class Empty_Iteration_Test : public Basic_Test private: // Require the timer reference. - Empty_Iteration_Test (void); + Empty_Iteration_Test (); // Force construction of independent instances by prohibiting copying. Empty_Iteration_Test (const Empty_Iteration_Test &); @@ -162,7 +162,7 @@ class Empty_Iteration_Test : public Basic_Test }; void -Empty_Iteration_Test::run (void) +Empty_Iteration_Test::run () { this->start_timing (); @@ -186,13 +186,13 @@ class Inline_Call_Test : public Basic_Test Inline_Call_Test (ACE_High_Res_Timer &timer, ACE_hrtime_t empty_iteration_time) : Basic_Test (timer, empty_iteration_time) {} - virtual ~Inline_Call_Test (void) {}; + virtual ~Inline_Call_Test () {}; - virtual void run (void); + virtual void run (); private: // Require the timer reference. - Inline_Call_Test (void); + Inline_Call_Test (); // Force construction of independent instances by prohibiting copying. Inline_Call_Test (const Inline_Call_Test &); @@ -200,7 +200,7 @@ class Inline_Call_Test : public Basic_Test }; void -Inline_Call_Test::run (void) +Inline_Call_Test::run () { this->start_timing (); @@ -222,13 +222,13 @@ class Noninline_Call_Test : public Basic_Test Noninline_Call_Test (ACE_High_Res_Timer &timer, ACE_hrtime_t empty_iteration_time) : Basic_Test (timer, empty_iteration_time) {} - virtual ~Noninline_Call_Test (void) {}; + virtual ~Noninline_Call_Test () {}; - virtual void run (void); + virtual void run (); private: // Require the timer reference. - Noninline_Call_Test (void); + Noninline_Call_Test (); // Force construction of independent instances by prohibiting copying. Noninline_Call_Test (const Noninline_Call_Test &); @@ -236,7 +236,7 @@ class Noninline_Call_Test : public Basic_Test }; void -Noninline_Call_Test::run (void) +Noninline_Call_Test::run () { this->start_timing (); @@ -258,13 +258,13 @@ class Inline_Member_Call_Test : public Basic_Test Inline_Member_Call_Test (ACE_High_Res_Timer &timer, ACE_hrtime_t empty_iteration_time) : Basic_Test (timer, empty_iteration_time) {} - virtual ~Inline_Member_Call_Test (void) {}; + virtual ~Inline_Member_Call_Test () {}; - virtual void run (void); + virtual void run (); private: // Require the timer reference. - Inline_Member_Call_Test (void); + Inline_Member_Call_Test (); // Force construction of independent instances by prohibiting copying. Inline_Member_Call_Test (const Inline_Member_Call_Test &); @@ -272,7 +272,7 @@ class Inline_Member_Call_Test : public Basic_Test }; void -Inline_Member_Call_Test::run (void) +Inline_Member_Call_Test::run () { this->start_timing (); @@ -294,13 +294,13 @@ class Noninline_Member_Call_Test : public Basic_Test Noninline_Member_Call_Test (ACE_High_Res_Timer &timer, ACE_hrtime_t empty_iteration_time) : Basic_Test (timer, empty_iteration_time) {} - virtual ~Noninline_Member_Call_Test (void) {}; + virtual ~Noninline_Member_Call_Test () {}; - virtual void run (void); + virtual void run (); private: // Require the timer reference. - Noninline_Member_Call_Test (void); + Noninline_Member_Call_Test (); // Force construction of independent instances by prohibiting copying. Noninline_Member_Call_Test (const Noninline_Member_Call_Test &); @@ -308,7 +308,7 @@ class Noninline_Member_Call_Test : public Basic_Test }; void -Noninline_Member_Call_Test::run (void) +Noninline_Member_Call_Test::run () { this->start_timing (); @@ -330,13 +330,13 @@ class Inline_Member_With_Virtual_Call_Test : public Basic_Test Inline_Member_With_Virtual_Call_Test (ACE_High_Res_Timer &timer, ACE_hrtime_t empty_iteration_time) : Basic_Test (timer, empty_iteration_time) {} - virtual ~Inline_Member_With_Virtual_Call_Test (void) {}; + virtual ~Inline_Member_With_Virtual_Call_Test () {}; - virtual void run (void); + virtual void run (); private: // Require the timer reference. - Inline_Member_With_Virtual_Call_Test (void); + Inline_Member_With_Virtual_Call_Test (); // Force construction of independent instances by prohibiting copying. Inline_Member_With_Virtual_Call_Test ( @@ -346,7 +346,7 @@ class Inline_Member_With_Virtual_Call_Test : public Basic_Test }; void -Inline_Member_With_Virtual_Call_Test::run (void) +Inline_Member_With_Virtual_Call_Test::run () { this->start_timing (); @@ -368,13 +368,13 @@ class Noninline_Member_With_Virtual_Call_Test : public Basic_Test Noninline_Member_With_Virtual_Call_Test (ACE_High_Res_Timer &timer, ACE_hrtime_t empty_iteration_time) : Basic_Test (timer, empty_iteration_time) {} - virtual ~Noninline_Member_With_Virtual_Call_Test (void) {}; + virtual ~Noninline_Member_With_Virtual_Call_Test () {}; - virtual void run (void); + virtual void run (); private: // Require the timer reference. - Noninline_Member_With_Virtual_Call_Test (void); + Noninline_Member_With_Virtual_Call_Test (); // Force construction of independent instances by prohibiting copying. Noninline_Member_With_Virtual_Call_Test @@ -384,7 +384,7 @@ class Noninline_Member_With_Virtual_Call_Test : public Basic_Test }; void -Noninline_Member_With_Virtual_Call_Test::run (void) +Noninline_Member_With_Virtual_Call_Test::run () { this->start_timing (); @@ -406,13 +406,13 @@ class Virtual_Member_Optimizable_Call_Test : public Basic_Test Virtual_Member_Optimizable_Call_Test (ACE_High_Res_Timer &timer, ACE_hrtime_t empty_iteration_time) : Basic_Test (timer, empty_iteration_time) {} - virtual ~Virtual_Member_Optimizable_Call_Test (void) {}; + virtual ~Virtual_Member_Optimizable_Call_Test () {}; - virtual void run (void); + virtual void run (); private: // Require the timer reference. - Virtual_Member_Optimizable_Call_Test (void); + Virtual_Member_Optimizable_Call_Test (); // Force construction of independent instances by prohibiting copying. Virtual_Member_Optimizable_Call_Test ( @@ -422,7 +422,7 @@ class Virtual_Member_Optimizable_Call_Test : public Basic_Test }; void -Virtual_Member_Optimizable_Call_Test::run (void) +Virtual_Member_Optimizable_Call_Test::run () { Foo_v &fv_o = foo_v; @@ -446,13 +446,13 @@ class Virtual_Member_Call_Test : public Basic_Test Virtual_Member_Call_Test (ACE_High_Res_Timer &timer, ACE_hrtime_t empty_iteration_time) : Basic_Test (timer, empty_iteration_time) {} - virtual ~Virtual_Member_Call_Test (void) {}; + virtual ~Virtual_Member_Call_Test () {}; - virtual void run (void); + virtual void run (); private: // Require the timer reference. - Virtual_Member_Call_Test (void); + Virtual_Member_Call_Test (); // Force construction of independent instances by prohibiting copying. Virtual_Member_Call_Test (const Virtual_Member_Call_Test &); @@ -460,7 +460,7 @@ class Virtual_Member_Call_Test : public Basic_Test }; void -Virtual_Member_Call_Test::run (void) +Virtual_Member_Call_Test::run () { Foo_v *fv; diff --git a/ACE/performance-tests/Misc/childbirth_time.cpp b/ACE/performance-tests/Misc/childbirth_time.cpp index 09177e6cdf6e5..2cefc86ec35fc 100644 --- a/ACE/performance-tests/Misc/childbirth_time.cpp +++ b/ACE/performance-tests/Misc/childbirth_time.cpp @@ -27,7 +27,7 @@ * on UN*X platform. * * -t: Measure the performance of native thread creation - * mechanisms. On Solaris, this is thr_create (). + * mechanisms. * On NT, this is CreateThread (). Currently, only * these two platforms are implemented. * @@ -171,7 +171,7 @@ prof_fork (size_t iteration) static double prof_native_thread (size_t iteration) { -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WTHREADS) || defined (ACE_HAS_STHREADS)) +#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_WTHREADS) if (iteration != 0) { ACE_Profile_Timer ptimer; @@ -191,14 +191,6 @@ prof_native_thread (size_t iteration) 0, CREATE_SUSPENDED, 0) == 0) -#elif defined (ACE_HAS_STHREADS) - //FUZZ: disable check_for_lack_ACE_OS - if (::thr_create (0, - 0, - &ace_empty, - 0, - THR_SUSPENDED, - 0) != 0) #endif ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CreateThread"), -1); //FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/performance-tests/Misc/context_switch_time.cpp b/ACE/performance-tests/Misc/context_switch_time.cpp index 89dc0749080fa..a4315a1a15537 100644 --- a/ACE/performance-tests/Misc/context_switch_time.cpp +++ b/ACE/performance-tests/Misc/context_switch_time.cpp @@ -24,12 +24,6 @@ * from the one described in 1) above, and the result is divided by * two to yield the context switch time. * - * Notes: - * On Solaris 2.5.1, it appears that the lowest context switching times, - * at least on a single-CPU machine, are obtained _without_ creating new - * LWPs for new threads (THR_NEW_LWP). The -n option enables the use of - * THR_NEW_LWP for testing. - * * = CREATION DATE * 17 January 1997 * @@ -218,10 +212,6 @@ Suspend_Resume_Test::svc () low_.ready (); - // For information: the cost of the just the loop itself below, - // without the suspend and resume calls, on a 166 MHz Ultrasparc - // is about 12.3 nanoseconds per iteration. - timer_.start (); for (ACE_UINT32 i = 0; i < iterations_; ++i) @@ -443,10 +433,6 @@ Ping_Suspend_Resume_Test::svc () priority, high_priority)); #endif /* ACE_DEBUG_CST */ - // For information: the cost of the just the loop itself below, - // without the suspend and resume calls, on a 166 MHz Ultrasparc - // is about 12.3 nanoseconds per iteration. - timer_.start (); ACE_UINT32 i; @@ -999,10 +985,6 @@ Synchronized_Suspend_Resume_Test::svc () priority, high_priority)); #endif /* ACE_DEBUG_CST */ - // For information: the cost of the just the loop itself below, - // without the suspend and resume calls, on a 166 MHz Ultrasparc - // is about 12.3 nanoseconds per iteration. - ACE_UINT32 i; for (i = 0; i < iterations_; ++i) diff --git a/ACE/performance-tests/Misc/preempt.cpp b/ACE/performance-tests/Misc/preempt.cpp index f2331b979f9f6..20b70117e5ac0 100644 --- a/ACE/performance-tests/Misc/preempt.cpp +++ b/ACE/performance-tests/Misc/preempt.cpp @@ -37,10 +37,6 @@ #if defined (ACE_HAS_THREADS) || ! defined (ACE_LACKS_FORK) -#if defined (ACE_HAS_STHREADS) -# include /* for _lwp_self () */ -#endif /* ACE_HAS_STHREADS */ - static const char usage [] = "[-? |\n" #if defined (ACE_HAS_THREADS) " [-f use fork instead of spawn]\n" @@ -77,14 +73,14 @@ ACE_hrtime_t starttime; class High_Priority_Task : public ACE_Task { public: - High_Priority_Task (void); - ~High_Priority_Task (void); + High_Priority_Task (); + ~High_Priority_Task (); //FUZZ: disable check_for_lack_ACE_OS int open (void *); //FUZZ: enable check_for_lack_ACE_OS - int svc (void); + int svc (); int done () const { return done_; } void print_times () const; @@ -94,7 +90,7 @@ class High_Priority_Task : public ACE_Task u_long *time_; }; -High_Priority_Task::High_Priority_Task (void) +High_Priority_Task::High_Priority_Task () : ACE_Task (ACE_Thread_Manager::instance ()), priority_ (ACE_Sched_Params::next_priority ( ACE_SCHED_FIFO, @@ -106,7 +102,7 @@ High_Priority_Task::High_Priority_Task (void) ACE_NEW (time_, u_long[high_iterations]); } -High_Priority_Task::~High_Priority_Task (void) +High_Priority_Task::~High_Priority_Task () { delete [] time_; time_ = 0; @@ -141,7 +137,7 @@ High_Priority_Task::open (void *) } int -High_Priority_Task::svc (void) +High_Priority_Task::svc () { ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); @@ -150,13 +146,9 @@ High_Priority_Task::svc (void) if (ACE_Thread::getprio (thr_handle, prio) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "getprio failed"), -1); -#if defined (ACE_HAS_STHREADS) - ACE_DEBUG ((LM_DEBUG, "(%P|%u|%t) High: prio = %d, priority_ = %d\n", - _lwp_self (), prio, this->priority_)); -#else /* ! ACE_HAS_STHREADS */ ACE_DEBUG ((LM_DEBUG, "(%P|%t) High: prio = %d, priority_ = %d\n", prio, this->priority_)); -#endif /* ! ACE_HAS_STHREADS */ + ACE_ASSERT (this->priority_ == prio); ACE_Time_Value pause (0, read_period); @@ -199,7 +191,7 @@ class Low_Priority_Task : public ACE_Task int open (void *); //FUZZ: enable check_for_lack_ACE_OS - int svc (void); + int svc (); private: int priority_; @@ -242,7 +234,7 @@ Low_Priority_Task::open (void *) } int -Low_Priority_Task::svc (void) +Low_Priority_Task::svc () { ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); @@ -251,13 +243,9 @@ Low_Priority_Task::svc (void) if (ACE_Thread::getprio (thr_handle, prio) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "getprio failed"), -1); -#if defined (ACE_HAS_STHREADS) - ACE_DEBUG ((LM_DEBUG, "(%P|%u|%t) Low: prio = %d, priority_ = %d\n", - _lwp_self (), prio, this->priority_)); -#else /* ! ACE_HAS_STHREADS */ ACE_DEBUG ((LM_DEBUG, "(%P|%t) Low: prio = %d, priority_ = %d\n", prio, this->priority_)); -#endif /* ! ACE_HAS_STHREADS */ + ACE_ASSERT (this->priority_ == prio); u_long iterations = 0; @@ -371,7 +359,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (get_options (argc, argv)) ACE_OS::exit (-1); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params ( ACE_Sched_Params ( ACE_SCHED_FIFO, diff --git a/ACE/performance-tests/Misc/test_guard.cpp b/ACE/performance-tests/Misc/test_guard.cpp index d56886b56d096..4e676ba8ff722 100644 --- a/ACE/performance-tests/Misc/test_guard.cpp +++ b/ACE/performance-tests/Misc/test_guard.cpp @@ -18,11 +18,11 @@ enum }; ACE_Thread_Mutex lock_; -typedef void (*guard_func)(void); +typedef void (*guard_func)(); int test_type = TEST_GUARD; int dummy = 0; -void guard (void) +void guard () { ACE_GUARD (ACE_Thread_Mutex, _ace_mon, lock_); dummy++; diff --git a/ACE/performance-tests/Misc/test_mutex.cpp b/ACE/performance-tests/Misc/test_mutex.cpp index a342405afb1b0..74986ede573ed 100644 --- a/ACE/performance-tests/Misc/test_mutex.cpp +++ b/ACE/performance-tests/Misc/test_mutex.cpp @@ -58,33 +58,33 @@ static const int DEFAULT_ITERATIONS = 100000000; class Thread_Mutex { public: - Thread_Mutex (void); - ~Thread_Mutex (void); - int acquire (void); - int release (void); + Thread_Mutex (); + ~Thread_Mutex (); + int acquire (); + int release (); private: ACE_mutex_t mutex_; }; -Thread_Mutex::Thread_Mutex (void) +Thread_Mutex::Thread_Mutex () { ACE_OS::mutex_init (&this->mutex_); } -Thread_Mutex::~Thread_Mutex (void) +Thread_Mutex::~Thread_Mutex () { ACE_OS::mutex_destroy (&this->mutex_); } inline int -Thread_Mutex::acquire (void) +Thread_Mutex::acquire () { return ACE_OS::mutex_lock (&this->mutex_); } inline int -Thread_Mutex::release (void) +Thread_Mutex::release () { return ACE_OS::mutex_unlock (&this->mutex_); } @@ -93,12 +93,12 @@ Thread_Mutex::release (void) class Mutex_Base { public: - virtual ~Mutex_Base (void); - virtual int acquire (void) = 0; - virtual int release (void) = 0; + virtual ~Mutex_Base (); + virtual int acquire () = 0; + virtual int release () = 0; }; -Mutex_Base::~Mutex_Base (void) +Mutex_Base::~Mutex_Base () { } @@ -106,33 +106,33 @@ Mutex_Base::~Mutex_Base (void) class Thread_Mutex_Derived : public Mutex_Base { public: - Thread_Mutex_Derived (void); - virtual ~Thread_Mutex_Derived (void); - virtual int acquire (void); - virtual int release (void); + Thread_Mutex_Derived (); + virtual ~Thread_Mutex_Derived (); + virtual int acquire (); + virtual int release (); private: ACE_mutex_t mutex_; }; -Thread_Mutex_Derived::Thread_Mutex_Derived (void) +Thread_Mutex_Derived::Thread_Mutex_Derived () { ACE_OS::mutex_init (&this->mutex_); } -Thread_Mutex_Derived::~Thread_Mutex_Derived (void) +Thread_Mutex_Derived::~Thread_Mutex_Derived () { ACE_OS::mutex_destroy (&this->mutex_); } inline int -Thread_Mutex_Derived::acquire (void) +Thread_Mutex_Derived::acquire () { return ACE_OS::mutex_lock (&this->mutex_); } inline int -Thread_Mutex_Derived::release (void) +Thread_Mutex_Derived::release () { return ACE_OS::mutex_unlock (&this->mutex_); } diff --git a/ACE/performance-tests/Misc/test_singleton.cpp b/ACE/performance-tests/Misc/test_singleton.cpp index 904ab434ae0f2..a3723f165ee97 100644 --- a/ACE/performance-tests/Misc/test_singleton.cpp +++ b/ACE/performance-tests/Misc/test_singleton.cpp @@ -41,9 +41,9 @@ static const int DEFAULT_ITERATIONS = 100000000; class Mutex_Singleton { public: - Mutex_Singleton (void) {} - void svc (void) {} - static Mutex_Singleton *instance (void); + Mutex_Singleton () {} + void svc () {} + static Mutex_Singleton *instance (); private: static ACE_SYNCH_MUTEX lock_; @@ -55,7 +55,7 @@ ACE_SYNCH_MUTEX Mutex_Singleton::lock_; Mutex_Singleton *Mutex_Singleton::instance_; Mutex_Singleton * -Mutex_Singleton::instance (void) +Mutex_Singleton::instance () { // Acquire the lock every time in. ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, Mutex_Singleton::lock_, 0); @@ -71,7 +71,7 @@ ACE_SYNCH_MUTEX DC_Singleton::lock_; DC_Singleton *DC_Singleton::instance_; DC_Singleton * -DC_Singleton::instance (void) +DC_Singleton::instance () { if (DC_Singleton::instance_ == 0) { diff --git a/ACE/performance-tests/Misc/test_singleton.h b/ACE/performance-tests/Misc/test_singleton.h index 15da34e6bd18e..e9ae536359fd4 100644 --- a/ACE/performance-tests/Misc/test_singleton.h +++ b/ACE/performance-tests/Misc/test_singleton.h @@ -1,6 +1,4 @@ -// Define the DC_Singleton here - it needs to be in a separate file to -// get picked up correctly on AIX with auto template instantiation using -// IBM C++ compiler (xlC). +// Define the DC_Singleton here #ifndef __TEST_SINGLETON_H #define __TEST_SINGLETON_H @@ -10,9 +8,9 @@ class DC_Singleton { public: - DC_Singleton (void) {} - void svc (void) {} - static DC_Singleton *instance (void); + DC_Singleton () {} + void svc () {} + static DC_Singleton *instance (); private: static ACE_SYNCH_MUTEX lock_; diff --git a/ACE/performance-tests/RPC/client.cpp b/ACE/performance-tests/RPC/client.cpp index c55671bf35862..5481f77405405 100644 --- a/ACE/performance-tests/RPC/client.cpp +++ b/ACE/performance-tests/RPC/client.cpp @@ -58,7 +58,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) throughput.sample (end - test_start, end - start); - } ACE_DEBUG ((LM_DEBUG, "Calibrating high resolution timer . . .")); diff --git a/ACE/performance-tests/SCTP/Options_Manager.cpp b/ACE/performance-tests/SCTP/Options_Manager.cpp index acba6c0825344..acd9373de2c10 100644 --- a/ACE/performance-tests/SCTP/Options_Manager.cpp +++ b/ACE/performance-tests/SCTP/Options_Manager.cpp @@ -149,7 +149,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c client_port = ACE_OS::atoi(get_opt->opt_arg ()); break; case 'i':{ - // The argument to this option is a comma-separated list // of dotted-decimal ipv4 addresses. @@ -177,7 +176,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c // If this representation was not obtained, terminate with // an error. if (!aton_retval) { - ACE_TCHAR error_message[Options_Manager::string_len + 100]; ACE_OS::strcpy (error_message, @@ -214,7 +212,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c while (next_secondary_addr && num_secondary_connect_addrs < max_num_secondary_connect_addrs) { - // Get a pointer to the next comma in the list. ACE_TCHAR *next_next_secondary_addr = ACE_OS::strchr(next_secondary_addr, ','); @@ -240,7 +237,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c secondary_connect_addrs[num_secondary_connect_addrs++] = ntohl(foo.s_addr); } else { - ACE_TCHAR error_message[Options_Manager::string_len + 100]; ACE_OS::strcpy (error_message, @@ -266,7 +262,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c server_port = ACE_OS::atoi(get_opt->opt_arg ()); break; case 'a':{ - // The argument to this option is a comma-separated list // of dotted-decimal ipv4 addresses. @@ -294,7 +289,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c // If this representation was not obtained, terminate with // an error. if (!aton_retval) { - ACE_TCHAR error_message[Options_Manager::string_len + 100]; ACE_OS::strcpy (error_message, @@ -331,7 +325,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c while (next_secondary_addr && num_secondary_accept_addrs < max_num_secondary_accept_addrs) { - // Get a pointer to the next comma in the list. ACE_TCHAR *next_next_secondary_addr = ACE_OS::strchr(next_secondary_addr, ','); @@ -357,7 +350,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c secondary_accept_addrs[num_secondary_accept_addrs++] = ntohl(foo.s_addr); } else { - ACE_TCHAR error_message[Options_Manager::string_len + 100]; ACE_OS::strcpy (error_message, @@ -509,7 +501,6 @@ void Options_Manager::_show_usage(FILE* out, ACE_TCHAR const * const opts_set) ACE_OS::fprintf (out, " -h none help\n"); ACE_OS::fprintf (out, "\n"); - } else if (!ACE_OS::strcmp(ACE_TEXT ("server-opts"), opts_set)){ ACE_OS::fprintf (out, " Flag Args Option-Name Default\n" " -n none test-enable-nagle NO NAGLING\n"); @@ -533,7 +524,6 @@ void Options_Manager::_show_usage(FILE* out, ACE_TCHAR const * const opts_set) ACE_OS::fprintf (out, " -h none help\n"); ACE_OS::fprintf (out, "\n"); - } else { ACE_OS::fprintf (out, "Invalid options set specified.\n"); } diff --git a/ACE/performance-tests/SCTP/Options_Manager.h b/ACE/performance-tests/SCTP/Options_Manager.h index 7239d7aae68bf..b26e168a250ac 100644 --- a/ACE/performance-tests/SCTP/Options_Manager.h +++ b/ACE/performance-tests/SCTP/Options_Manager.h @@ -16,7 +16,6 @@ class Options_Manager { public: - Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * const opts_set); // constant string size @@ -59,7 +58,6 @@ class Options_Manager private: static ACE_CDR::Boolean __initialized; static ACE_TCHAR __program_name[string_len]; - }; #endif /* OPTIONS_MANAGER_H */ diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp index 3fdfa90ed9c6d..c677a757f0f26 100644 --- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp +++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp @@ -37,27 +37,20 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_INET_Addr serverAddr; if (argc < 2) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Usage: SOCK_SEQPACK_Association_Test hostname:port\n"))); status = 1; - } else if (serverAddr.set(argv[1])) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_INET_Addr::set"))); status = 1; - } else if (connector.connect (dataStream, serverAddr)) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::connect"))); status = 1; - } else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Connected to server at %s\n"), argv[1])); @@ -84,7 +77,6 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc) // Get local addresses of the association if (assoc.get_local_addrs(in_out, in_out_size)) { - ACE_ERROR((LM_ERROR, "%p\n", "get_local_addrs")); @@ -95,9 +87,7 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc) // Print individual results of get_local_addrs for (i = 0; i < in_out_size; ++i) { - if (in_out[i].addr_to_string(outbuf, outbuf_size)) { - ACE_ERROR((LM_ERROR, "%p\n", "addr_to_string")); @@ -115,7 +105,6 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc) // Get remote addresses of the association if (assoc.get_remote_addrs(in_out, in_out_size)) { - ACE_ERROR((LM_ERROR, "%p\n", "get_remote_addrs")); @@ -126,9 +115,7 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc) // Print individual results of get_remote_addrs for (i = 0; i < in_out_size; ++i) { - if (in_out[i].addr_to_string(outbuf, outbuf_size)) { - ACE_ERROR((LM_ERROR, "%p\n", "addr_to_string")); diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp index f218a31cf44ee..dfeff21fbac31 100644 --- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp +++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp @@ -42,7 +42,6 @@ ACE_High_Res_Timer::global_scale_factor_type const microsec_clock_scale_factor ACE_SCTP::HIST runTest(ACE_SOCK_SEQPACK_Association &); int ACE_TMAIN (int argc, ACE_TCHAR **argv){ - // Initialize the options manager Options_Manager optsMgr(argc, argv, ACE_TEXT ("client-opts")); @@ -135,7 +134,6 @@ ACE_SCTP::HIST createHistogram(ACE_CDR::ULong messageSize){ // send the test header (only contains number of iterations) int sendHeader(ACE_SOCK_SEQPACK_Association & stream) { - // create an ACE CDR output stream and place the header information // into it ACE_OutputCDR hdrCDR; @@ -155,7 +153,6 @@ int sendHeader(ACE_SOCK_SEQPACK_Association & stream) { // conduct the UnMarshalled Octet performance test using separate // send_n calls with Nagle's algorithm disabled ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_SEQPACK_Association & stream){ - ACE_CDR::ULong const testIterations = Options_Manager::test_iterations; size_t bt; @@ -181,7 +178,6 @@ ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_ // prime the client and server before starting the test for(cnt=0;cnt (arg); ACE_SOCK_SEQPACK_Association * dataModeStream = args->stream; @@ -51,7 +50,6 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ // serve the client for numIterations synchronous invocations do { - // READ A MESSAGE FROM THE CLIENT size_t bt; @@ -89,7 +87,6 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ ACE_TEXT ("%p\n"), ACE_TEXT ("send_n")), 0); - } while (--numIterations); // close and destroy the stream @@ -216,7 +213,6 @@ static void run_server (ACE_HANDLE handle) int ACE_TMAIN (int argc, ACE_TCHAR **argv){ - Options_Manager optsMgr(argc, argv, ACE_TEXT ("server-opts")); // show usage is requested @@ -306,7 +302,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ handle_set.set_bit(acceptor_socket.get_handle()); for (;;){ - ACE_Time_Value timeout(ACE_DEFAULT_TIMEOUT); ACE_Handle_Set temp = handle_set; @@ -330,7 +325,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ else if (result == 0){ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) select timed out\n"))); - } else { // case where a file descriptor was actually set if (!(temp.is_set(acceptor_socket.get_handle()))){ @@ -349,7 +343,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ else{ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) spawning server\n"))); - } // Run the server. run_server (new_stream.get_handle ()); diff --git a/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp index 967a7838a8dfc..858ba407a7d4f 100644 --- a/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp +++ b/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp @@ -43,7 +43,6 @@ ACE_High_Res_Timer::global_scale_factor_type const microsec_clock_scale_factor = ACE_SCTP::HIST runTest(ACE_SOCK_Stream &); int ACE_TMAIN (int argc, ACE_TCHAR **argv){ - // Initialize the options manager Options_Manager optsMgr(argc, argv, ACE_TEXT ("client-opts")); @@ -110,7 +109,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ // create a histogram to store test results ACE_SCTP::HIST createHistogram(ACE_CDR::ULong messageSize){ - // The histogram created below lives beyond the scope of this // function. So the memory allocated here cannot be cleaned up when // this function goes out of scope. Unfortunately the histogram @@ -135,7 +133,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ // send the test header (only contains number of iterations) int sendHeader(ACE_SOCK_Stream & stream) { - // create an ACE CDR output stream and place the header information // into it ACE_OutputCDR hdrCDR; @@ -155,7 +152,6 @@ int sendHeader(ACE_SOCK_Stream & stream) { // conduct the UnMarshalled Octet performance test using separate // send_n calls with Nagle's algorithm disabled ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_Stream & stream){ - ACE_CDR::ULong const testIterations = Options_Manager::test_iterations; size_t bt; @@ -191,7 +187,6 @@ ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_ // prime the client and server before starting the test for(cnt=0;cnt (arg); ACE_SOCK_Stream * dataModeStream = args->stream; @@ -49,7 +48,6 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ // serve the client for numIterations synchronous invocations do { - // READ A MESSAGE FROM THE CLIENT size_t bt; @@ -87,7 +85,6 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ ACE_TEXT ("%p\n"), ACE_TEXT ("send_n")), 0); - } while (--numIterations); // close and destroy the stream @@ -221,7 +218,6 @@ static void run_server (ACE_HANDLE handle) } int ACE_TMAIN (int argc, ACE_TCHAR **argv){ - Options_Manager optsMgr(argc, argv, ACE_TEXT ("server-opts")); // show usage is requested @@ -301,7 +297,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ handle_set.set_bit(acceptor_socket.get_handle()); for (;;){ - ACE_Time_Value timeout(ACE_DEFAULT_TIMEOUT); ACE_Handle_Set temp = handle_set; @@ -325,7 +320,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ else if (result == 0){ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) select timed out\n"))); - } else { // case where a file descriptor was actually set if (!(temp.is_set(acceptor_socket.get_handle()))){ @@ -344,7 +338,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ else{ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) spawning server\n"))); - } // Run the server. run_server (new_stream.get_handle ()); diff --git a/ACE/performance-tests/SCTP/hist.cpp b/ACE/performance-tests/SCTP/hist.cpp index 7dff4e8b0b7c7..bcda96c00294b 100644 --- a/ACE/performance-tests/SCTP/hist.cpp +++ b/ACE/performance-tests/SCTP/hist.cpp @@ -31,7 +31,6 @@ #include "hist.h" namespace ACE_SCTP { - hist_t *head_hist, *tail_hist; hist_t *histogram(char *name, unsigned int num_bins, double first, @@ -299,7 +298,6 @@ void add_histogram(HIST dest, HIST source) { } double histfloor (double x) { - #ifdef WIN32 return ACE_OS::floor(x); #else diff --git a/ACE/performance-tests/SCTP/hist.h b/ACE/performance-tests/SCTP/hist.h index 2e3844ec5af24..4aae40379c9d3 100644 --- a/ACE/performance-tests/SCTP/hist.h +++ b/ACE/performance-tests/SCTP/hist.h @@ -4,7 +4,6 @@ namespace ACE_SCTP { - struct optheader { char *key; char *value; diff --git a/ACE/performance-tests/Server_Concurrency/Latency_Stats.h b/ACE/performance-tests/Server_Concurrency/Latency_Stats.h index a998bcba21c56..80a88bea8d42c 100644 --- a/ACE/performance-tests/Server_Concurrency/Latency_Stats.h +++ b/ACE/performance-tests/Server_Concurrency/Latency_Stats.h @@ -1,7 +1,7 @@ class Latency_Stats { public: - Latency_Stats (void); + Latency_Stats (); void dump_results (const ACE_TCHAR* test_name, const ACE_TCHAR* sub_test); @@ -20,7 +20,7 @@ class Latency_Stats }; inline -Latency_Stats::Latency_Stats (void) +Latency_Stats::Latency_Stats () : n_ (0), sum_ (0), sum2_ (0), @@ -98,12 +98,12 @@ Latency_Stats::accumulate (const Latency_Stats& rhs) class Throughput_Stats { public: - Throughput_Stats (void); + Throughput_Stats (); void dump_results (const ACE_TCHAR* test_name, const ACE_TCHAR* sub_test); - void sample (void); + void sample (); // An event has been received void accumulate (const Throughput_Stats& stats); @@ -166,7 +166,7 @@ Throughput_Stats::dump_results (const ACE_TCHAR *test_name, } inline -Throughput_Stats::Throughput_Stats (void) +Throughput_Stats::Throughput_Stats () : n_ (0), start_ (), stop_ () @@ -174,7 +174,7 @@ Throughput_Stats::Throughput_Stats (void) } inline void -Throughput_Stats::sample (void) +Throughput_Stats::sample () { if (this->n_ == 0) { @@ -185,9 +185,9 @@ Throughput_Stats::sample (void) } inline void -move_to_rt_class (void) +move_to_rt_class () { - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp index 1ab919b1b2a87..9eedb672dd580 100644 --- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp +++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp @@ -1,7 +1,6 @@ #include "RT_CORBA_Leader_Follower.h" - #if defined (ACE_HAS_THREADS) // We need the following only if we have threads enabled.. @@ -38,10 +37,9 @@ ACE_High_Res_Timer test_timer; - /*******************************************************************/ // Constructor for Synchronisers -Synchronisers::Synchronisers (void) +Synchronisers::Synchronisers () : mutex_ (), condition_ (mutex_), event_ () @@ -50,7 +48,7 @@ Synchronisers::Synchronisers (void) int -Synchronisers::start_synchronization (void) +Synchronisers::start_synchronization () { // Hold the lock and increment the global variable to indicate // number of ready threads @@ -67,7 +65,6 @@ Synchronisers::start_synchronization (void) if (ready_threads == number_of_threads) { - // Reset the ready_threads so that we can wait at the end of // runs ready_threads = 0; @@ -92,7 +89,7 @@ Synchronisers::start_synchronization (void) } int -Synchronisers::end_synchronization (void) +Synchronisers::end_synchronization () { // Hold the lock and increment the global variable to indicate // number of ready threads @@ -109,7 +106,6 @@ Synchronisers::end_synchronization (void) if (ready_threads == number_of_threads) { - // Reset the ready_threads so that we can wait at the end of // runs ready_threads = 0; @@ -143,13 +139,13 @@ Leader_Follower_Task::Leader_Follower_Task (Synchronisers &synch) } int -Leader_Follower_Task::processed (void) +Leader_Follower_Task::processed () { return this->messages_consumed_; } int -Leader_Follower_Task::svc (void) +Leader_Follower_Task::svc () { (void) this->synch_.start_synchronization (); diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h index f8512655a8ecd..a34a75d641a1c 100644 --- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h +++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h @@ -47,13 +47,12 @@ class Synchronisers friend class Leader_Follower_Task; /// Ctor - Synchronisers (void); + Synchronisers (); - int start_synchronization (void); - int end_synchronization (void); + int start_synchronization (); + int end_synchronization (); private: - /// The mutex and condition variable that is used for /// synchronisation. ACE_SYNCH_MUTEX mutex_; @@ -79,15 +78,14 @@ class Synchronisers class Leader_Follower_Task : public ACE_Task_Base { public: - /// Ctor with a mutex and a condition variable Leader_Follower_Task (Synchronisers &synch); /// Messages consumed - int processed (void); + int processed (); /// Method that is run by a daemon thread - int svc (void); + int svc (); private: /// Number of messages processed by this thread diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/ACE/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp index ee29140c103c5..9fb9e34cda184 100644 --- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp +++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp @@ -37,7 +37,7 @@ class Leader_Follower_Task : public TASK public: Leader_Follower_Task (ACE_SYNCH_MUTEX &mutex, ACE_SYNCH_CONDITION &condition); - int svc (void); + int svc (); size_t messages_consumed_; ACE_SYNCH_MUTEX &mutex_; @@ -56,7 +56,7 @@ Leader_Follower_Task::Leader_Follower_Task (ACE_SYNCH_MUTEX &mutex, } int -Leader_Follower_Task::svc (void) +Leader_Follower_Task::svc () { for (;;) { diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp index 6c604f70d8d7f..e86f7247039d9 100644 --- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp +++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp @@ -35,7 +35,7 @@ ACE_Data_Block *data_block = 0; /*******************************************************************/ // Constructor for Synchronisers -Synchronisers::Synchronisers (void) +Synchronisers::Synchronisers () : mutex_ (), event_ () { @@ -43,7 +43,7 @@ Synchronisers::Synchronisers (void) int -Synchronisers::start_synchronization (void) +Synchronisers::start_synchronization () { // Hold the lock and increment the global variable to indicate // number of ready threads @@ -91,7 +91,7 @@ Synchronisers::start_synchronization (void) } int -Synchronisers::end_synchronization (void) +Synchronisers::end_synchronization () { // Hold the lock and increment the global variable to indicate // number of ready threads @@ -149,7 +149,7 @@ Worker_Task::Worker_Task (Message_Queue *mq, } int -Worker_Task::svc (void) +Worker_Task::svc () { // Start synchronization (void) this->synch_.start_synchronization (); @@ -246,7 +246,7 @@ Worker_Task::svc (void) } int -Worker_Task::processed (void) +Worker_Task::processed () { return this->messages_processed_; } @@ -261,7 +261,7 @@ Input_Task::Input_Task (Message_Queue *mq, } int -Input_Task::svc (void) +Input_Task::svc () { // Synchronise threads (void) this->synch_.start_synchronization (); @@ -343,7 +343,7 @@ Output_Task::Output_Task (Message_Queue *mq, } int -Output_Task::svc (void) +Output_Task::svc () { // Synchronise threads (void) this->synch_.start_synchronization (); @@ -519,7 +519,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } - // Activate the input and output threads result = input_task.activate (flags, 1, @@ -530,7 +529,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return result; - // Activate the workers. result = output_task.activate (flags, 1, @@ -541,7 +539,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return result; - // Wait for all threads to terminate. result = ACE_Thread_Manager::instance ()->wait (); diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h index 3fc194cdd2b67..ed2187b7e0549 100644 --- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h +++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h @@ -57,13 +57,12 @@ class Synchronisers }; /// Ctor - Synchronisers (void); + Synchronisers (); - int start_synchronization (void); - int end_synchronization (void); + int start_synchronization (); + int end_synchronization (); private: - /// The mutex that is used for synchronisation. ACE_SYNCH_MUTEX mutex_; @@ -88,10 +87,9 @@ class Input_Task : public ACE_Task Synchronisers &synch); /// The thread runs inside this method.. - int svc (void); + int svc (); private: - /// Our referance to Synchronisers Synchronisers &synch_; }; @@ -112,13 +110,12 @@ class Output_Task : public ACE_Task Synchronisers &synch); /// The thread runs inside this method.. - int svc (void); + int svc (); /// Need to overload this method to do anything useful.. virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0); private: - /// Our referance to Synchronisers Synchronisers &synch_; }; @@ -140,12 +137,11 @@ class Worker_Task : public ACE_Task Synchronisers &synch); /// Methods in which the threads run on - int svc (void); + int svc (); /// Processed messages - int processed (void); + int processed (); private: - /// Our referance to Synchronisers Synchronisers &synch_; @@ -155,7 +151,6 @@ class Worker_Task : public ACE_Task - #endif /*ACE_HAS_THREADS*/ #include /**/ "ace/post.h" diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp index 455c9b74afc5b..f393b1637bdcf 100644 --- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp +++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp @@ -48,7 +48,7 @@ class Worker_Task : public TASK { public: Worker_Task (ACE_Message_Queue *mq); - int svc (void); + int svc (); size_t messages_dequeued_; @@ -60,7 +60,7 @@ class IO_Task : public TASK { public: IO_Task (ACE_Message_Queue *mq); - int svc (void); + int svc (); }; Worker_Task::Worker_Task (ACE_Message_Queue *mq) @@ -70,7 +70,7 @@ Worker_Task::Worker_Task (ACE_Message_Queue *mq) } int -Worker_Task::svc (void) +Worker_Task::svc () { for (;;) { @@ -157,7 +157,7 @@ IO_Task::IO_Task (ACE_Message_Queue *mq) } int -IO_Task::svc (void) +IO_Task::svc () { size_t i = 0; size_t messages_queued = 1; diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp index 35533276dc8f1..a03bfa0f1bcb5 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp @@ -17,7 +17,7 @@ Baseline_Test_Options baseline_options; // Static Baseline Options holds the test configuration information // and the test statistics. -Baseline_Test_Base::Baseline_Test_Base (void) +Baseline_Test_Base::Baseline_Test_Base () : Benchmark_Base (Benchmark_Base::BASELINE), yield_method_ (Baseline_Test_Options::USE_SLEEP_ZERO), iteration_ (DEFAULT_ITERATIONS), @@ -76,7 +76,7 @@ Baseline_Test_Base::parse_args (int argc, ACE_TCHAR *argv[]) } void -Baseline_Test_Base::yield (void) +Baseline_Test_Base::yield () { if (this->yield_method_ == Baseline_Test_Options::USE_SLEEP_ZERO) ACE_OS::sleep (0); @@ -84,7 +84,7 @@ Baseline_Test_Base::yield (void) ACE_OS::thr_yield (); } -Baseline_Test_Options::Baseline_Test_Options (void) +Baseline_Test_Options::Baseline_Test_Options () : test_try_lock_ (0), verbose_ (0), current_yield_method_ (0), @@ -132,7 +132,7 @@ Baseline_Test_Options::reset_params (size_t iteration, } void -Baseline_Test_Options::print_result (void) +Baseline_Test_Options::print_result () { ACE_Time_Value tv; ACE_hrtime_t nsec; @@ -148,7 +148,7 @@ Baseline_Test_Options::print_result (void) (int) (nsec / this->current_iteration_))); } -Baseline_Test::Baseline_Test (void) +Baseline_Test::Baseline_Test () : current_test_ (0), get_lock_ (2), let_go_lock_ (2) @@ -183,7 +183,7 @@ Baseline_Test::pre_run_test (Benchmark_Base *bb) } int -Baseline_Test::run_test (void) +Baseline_Test::run_test () { if (baseline_options.test_try_lock ()) return this->current_test_->test_try_lock (); @@ -192,7 +192,7 @@ Baseline_Test::run_test (void) } int -Baseline_Test::post_run_test (void) +Baseline_Test::post_run_test () { if (baseline_options.test_try_lock ()) { diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h index 9bca30c4764ad..3477e79e0d37c 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h @@ -43,11 +43,11 @@ class ACE_Svc_Export Baseline_Test_Base : public Benchmark_Base virtual void yield (); // Yield to other thread. - size_t iteration (void); + size_t iteration (); // Access methods. protected: - Baseline_Test_Base (void); + Baseline_Test_Base (); int yield_method_; // Should we your thr_yield or sleep (0). @@ -72,7 +72,7 @@ class ACE_Svc_Export Baseline_Test_Options USE_THR_YIELD }; - Baseline_Test_Options (void); + Baseline_Test_Options (); // ctor. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -81,20 +81,20 @@ class ACE_Svc_Export Baseline_Test_Options int reset_params (size_t iteration, int yield); // Reset test parameters for next round. - int test_try_lock (void); + int test_try_lock (); // Return test configuration. - void start_inc_timer (void); - void stop_inc_timer (void); + void start_inc_timer (); + void stop_inc_timer (); // Start/stop measuring time. - int inc_loop_counter (void); + int inc_loop_counter (); // Returns - size_t current_iteration (void); + size_t current_iteration (); // Return . - void print_result (void); + void print_result (); // Print out the result. private: @@ -123,11 +123,11 @@ extern Baseline_Test_Options baseline_options; class ACE_Svc_Export Baseline_Test : public Benchmark_Method_Base { public: - Baseline_Test (void); + Baseline_Test (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int pre_run_test (Benchmark_Base *bp); - virtual int run_test (void); - virtual int post_run_test (void); + virtual int run_test (); + virtual int post_run_test (); virtual int valid_test_object (Benchmark_Base *); static void *hold_lock (void * arg); diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.inl b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.inl index b9165356b0b30..421584a4605b8 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.inl +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.inl @@ -1,41 +1,41 @@ ACE_INLINE size_t -Baseline_Test_Base::iteration (void) +Baseline_Test_Base::iteration () { return this->iteration_; } ACE_INLINE int -Baseline_Test_Base::yield_method (void) +Baseline_Test_Base::yield_method () { return this->yield_method_; } ACE_INLINE int -Baseline_Test_Options::test_try_lock (void) +Baseline_Test_Options::test_try_lock () { return this->test_try_lock_; } ACE_INLINE size_t -Baseline_Test_Options::current_iteration (void) +Baseline_Test_Options::current_iteration () { return this->current_iteration_; } ACE_INLINE void -Baseline_Test_Options::start_inc_timer (void) +Baseline_Test_Options::start_inc_timer () { this->timer.start_incr (); } ACE_INLINE void -Baseline_Test_Options::stop_inc_timer (void) +Baseline_Test_Options::stop_inc_timer () { this->timer.stop_incr (); } ACE_INLINE int -Baseline_Test_Options::inc_loop_counter (void) +Baseline_Test_Options::inc_loop_counter () { return (++this->current_iteration_ < this->total_iteration_); } diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp index 34e8aaa5eaf2e..ca93041aaf1e7 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp @@ -7,7 +7,7 @@ ACE_Lock *Adaptive_Lock_Performance_Test_Base::lock_ = 0; int -Adaptive_Lock_Performance_Test_Base::fini (void) +Adaptive_Lock_Performance_Test_Base::fini () { delete Adaptive_Lock_Performance_Test_Base::lock_; Adaptive_Lock_Performance_Test_Base::lock_ = 0; @@ -15,7 +15,7 @@ Adaptive_Lock_Performance_Test_Base::fini (void) } int -Adaptive_Lock_Performance_Test_Base::svc (void) +Adaptive_Lock_Performance_Test_Base::svc () { // Extract out the unique thread-specific value to be used as an // index... diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp index f1665b07d07c1..4b1dddbe9d894 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp @@ -12,13 +12,13 @@ int buffer; /* static */ sig_atomic_t Benchmark_Performance::done_ = 0; -Benchmark_Performance_Test_Base::Benchmark_Performance_Test_Base (void) +Benchmark_Performance_Test_Base::Benchmark_Performance_Test_Base () : Benchmark_Base (Benchmark_Base::PERFORMANCE) { } sig_atomic_t -Benchmark_Performance::done (void) +Benchmark_Performance::done () { return Benchmark_Performance::done_; } @@ -42,7 +42,7 @@ Benchmark_Performance::info (ACE_TCHAR **, size_t) const } int -Benchmark_Performance::fini (void) +Benchmark_Performance::fini () { return -1; } diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h index c3b963a0a28a6..9568bd00ffa71 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h @@ -18,7 +18,7 @@ class ACE_Svc_Export Benchmark_Performance_Test_Base : public Benchmark_Base // = TITLE // This class identifies itself as Benmarking Performance Test class. protected: - Benchmark_Performance_Test_Base (void); + Benchmark_Performance_Test_Base (); }; class ACE_Svc_Export Benchmark_Performance : public Benchmark_Performance_Test_Base @@ -27,7 +27,7 @@ class ACE_Svc_Export Benchmark_Performance : public Benchmark_Performance_Test_B // Base class for all the timing tests. public: // = Hooks inherited from ACE_Service_Object. - virtual int svc (void) = 0; + virtual int svc () = 0; virtual int init (int, ACE_TCHAR *[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); @@ -36,7 +36,7 @@ class ACE_Svc_Export Benchmark_Performance : public Benchmark_Performance_Test_B // = Set/get flag that controls how the tests are shut down // gracefully. static void done (sig_atomic_t); - static sig_atomic_t done (void); + static sig_atomic_t done (); protected: static sig_atomic_t done_; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp index 9c83e5068c531..e7db4e909a275 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp @@ -10,7 +10,7 @@ #include "ace/Service_Repository.h" #include "ace/Reactor.h" -Performance_Test::Performance_Test (void) +Performance_Test::Performance_Test () : n_lwps_ (0), orig_n_lwps_ (0) { @@ -47,7 +47,7 @@ Performance_Test::pre_run_test (Benchmark_Base *bb) } int -Performance_Test::run_test (void) +Performance_Test::run_test () { // Tell the threads that we are not finished. Benchmark_Performance::done (0); @@ -70,7 +70,7 @@ Performance_Test::run_test (void) } int -Performance_Test::post_run_test (void) +Performance_Test::post_run_test () { // Stop thread(s) from making any further progress. ACE_Thread_Manager::instance ()->suspend_all (); diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h index 77e8207091ae1..79e2cee9cf631 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h @@ -11,11 +11,11 @@ class ACE_Svc_Export Performance_Test : public Benchmark_Method_Base { public: - Performance_Test (void); + Performance_Test (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int pre_run_test (Benchmark_Base *bp); - virtual int run_test (void); - virtual int post_run_test (void); + virtual int run_test (); + virtual int post_run_test (); virtual int valid_test_object (Benchmark_Base *); private: int n_lwps_; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp index 0b06ba68623a2..626db592f8af0 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp @@ -7,7 +7,7 @@ Performance_Test_Options performance_test_options; size_t -Performance_Test_Options::count (void) +Performance_Test_Options::count () { size_t total = 0; @@ -28,13 +28,13 @@ Performance_Test_Options::count (void) } void -Performance_Test_Options::init (void) +Performance_Test_Options::init () { for (int i = 0; i < this->thr_wc_size; i++) this->thr_work_count[i] = 0; } -Performance_Test_Options::Performance_Test_Options (void) +Performance_Test_Options::Performance_Test_Options () : thr_wc_size (10000), _service_entry (0), _mapped_file (0), @@ -280,7 +280,7 @@ Performance_Test_Options::parse_args (int argc, ACE_TCHAR *argv[]) } void -Performance_Test_Options::print_results (void) +Performance_Test_Options::print_results () { ACE_Profile_Timer::ACE_Elapsed_Time et; this->_itimer.elapsed_time (et); diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h index 1ba69c09cbaa0..14c0d1e8e2eaf 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h @@ -21,73 +21,73 @@ class ACE_Svc_Export Performance_Test_Options { public: - Performance_Test_Options (void); + Performance_Test_Options (); void parse_args (int argc, ACE_TCHAR *argv[]); - void init (void); + void init (); - void start_timer (void); - void stop_timer (void); + void start_timer (); + void stop_timer (); void thr_count (size_t count); - size_t thr_count (void); + size_t thr_count (); void pipe_addr (ACE_TCHAR pipe[]); - ACE_TCHAR *pipe_addr (void); + ACE_TCHAR *pipe_addr (); void mapped_file (ACE_TCHAR filename[]); - ACE_TCHAR *mapped_file (void); + ACE_TCHAR *mapped_file (); void service_entry (ACE_TCHAR *service_entry); - ACE_TCHAR *service_entry (void); + ACE_TCHAR *service_entry (); void sleep_time (size_t count); - size_t sleep_time (void); + size_t sleep_time (); void logical_connections (size_t count); - size_t logical_connections (void); + size_t logical_connections (); void physical_connections (size_t count); - size_t physical_connections (void); + size_t physical_connections (); void consecutive_ports (size_t count); - size_t consecutive_ports (void); + size_t consecutive_ports (); void initial_queue_length (size_t length); - size_t initial_queue_length (void); + size_t initial_queue_length (); void high_water_mark (size_t size); - size_t high_water_mark (void); + size_t high_water_mark (); void low_water_mark (size_t size); - size_t low_water_mark (void); + size_t low_water_mark (); void msg_size (size_t size); - size_t msg_size (void); + size_t msg_size (); void iterations (size_t n); - size_t iterations (void); + size_t iterations (); void n_lwps (size_t n); - size_t n_lwps (void); + size_t n_lwps (); void t_flags (long flag); - long t_flags (void); - - size_t count (void); - - int debug (void); - int verbose (void); - int do_checksum (void); - int do_generate (void); - int do_ack (void); - int do_delete (void); - int do_eager_exit (void); - int do_print_summary (void); - int do_udp (void); - int do_xdr (void); - int do_zero_copy (void); - void print_results (void); + long t_flags (); + + size_t count (); + + int debug (); + int verbose (); + int do_checksum (); + int do_generate (); + int do_ack (); + int do_delete (); + int do_eager_exit (); + int do_print_summary (); + int do_udp (); + int do_xdr (); + int do_zero_copy (); + void print_results (); ACE_Atomic_Op msg_count; // Keep track of number of messages atomically. int *thr_work_count; // Count activity per-thread. diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.inl b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.inl index 2b2e04b75d1c9..9191fddfc9903 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.inl +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.inl @@ -9,67 +9,67 @@ inline int -Performance_Test_Options::do_print_summary (void) +Performance_Test_Options::do_print_summary () { return this->_print_summary; } inline int -Performance_Test_Options::do_udp (void) +Performance_Test_Options::do_udp () { return this->_udp; } inline void -Performance_Test_Options::start_timer (void) +Performance_Test_Options::start_timer () { this->_itimer.start (); } inline void -Performance_Test_Options::stop_timer (void) +Performance_Test_Options::stop_timer () { this->_itimer.stop (); } inline int -Performance_Test_Options::do_generate (void) +Performance_Test_Options::do_generate () { return this->_generate; } inline int -Performance_Test_Options::do_ack (void) +Performance_Test_Options::do_ack () { return this->_ack; } inline int -Performance_Test_Options::do_eager_exit (void) +Performance_Test_Options::do_eager_exit () { return this->_eager_exit; } inline int -Performance_Test_Options::do_zero_copy (void) +Performance_Test_Options::do_zero_copy () { return this->_zero_copy; } inline int -Performance_Test_Options::do_checksum (void) +Performance_Test_Options::do_checksum () { return this->_checksum; } inline int -Performance_Test_Options::do_delete (void) +Performance_Test_Options::do_delete () { return this->_free_memory; } inline int -Performance_Test_Options::do_xdr (void) +Performance_Test_Options::do_xdr () { return this->_xdr; } @@ -81,7 +81,7 @@ Performance_Test_Options::n_lwps (size_t count) } inline size_t -Performance_Test_Options::n_lwps (void) +Performance_Test_Options::n_lwps () { return this->_n_lwps; } @@ -93,7 +93,7 @@ Performance_Test_Options::pipe_addr (ACE_TCHAR *pipe) } inline ACE_TCHAR * -Performance_Test_Options::pipe_addr (void) +Performance_Test_Options::pipe_addr () { return this->_pipe_addr; } @@ -105,7 +105,7 @@ Performance_Test_Options::service_entry (ACE_TCHAR *pipe) } inline ACE_TCHAR * -Performance_Test_Options::service_entry (void) +Performance_Test_Options::service_entry () { return this->_service_entry; } @@ -117,7 +117,7 @@ Performance_Test_Options::mapped_file (ACE_TCHAR *filename) } inline ACE_TCHAR * -Performance_Test_Options::mapped_file (void) +Performance_Test_Options::mapped_file () { return this->_mapped_file; } @@ -129,7 +129,7 @@ Performance_Test_Options::sleep_time (size_t count) } inline size_t -Performance_Test_Options::sleep_time (void) +Performance_Test_Options::sleep_time () { return this->_sleep_time; } @@ -141,7 +141,7 @@ Performance_Test_Options::thr_count (size_t count) } inline size_t -Performance_Test_Options::thr_count (void) +Performance_Test_Options::thr_count () { return this->_thr_count; } @@ -153,7 +153,7 @@ Performance_Test_Options::consecutive_ports (size_t count) } inline size_t -Performance_Test_Options::consecutive_ports (void) +Performance_Test_Options::consecutive_ports () { return this->_consecutive_ports; } @@ -165,7 +165,7 @@ Performance_Test_Options::logical_connections (size_t count) } inline size_t -Performance_Test_Options::logical_connections (void) +Performance_Test_Options::logical_connections () { return this->_logical_connections; } @@ -177,7 +177,7 @@ Performance_Test_Options::physical_connections (size_t count) } inline size_t -Performance_Test_Options::physical_connections (void) +Performance_Test_Options::physical_connections () { return this->_physical_connections; } @@ -189,7 +189,7 @@ Performance_Test_Options::initial_queue_length (size_t length) } inline size_t -Performance_Test_Options::initial_queue_length (void) +Performance_Test_Options::initial_queue_length () { return this->_initial_queue_length; } @@ -201,7 +201,7 @@ Performance_Test_Options::high_water_mark (size_t size) } inline size_t -Performance_Test_Options::high_water_mark (void) +Performance_Test_Options::high_water_mark () { return this->_high_water_mark; } @@ -213,7 +213,7 @@ Performance_Test_Options::low_water_mark (size_t size) } inline size_t -Performance_Test_Options::low_water_mark (void) +Performance_Test_Options::low_water_mark () { return this->_low_water_mark; } @@ -225,7 +225,7 @@ Performance_Test_Options::msg_size (size_t size) } inline size_t -Performance_Test_Options::msg_size (void) +Performance_Test_Options::msg_size () { return this->_msg_size; } @@ -237,7 +237,7 @@ Performance_Test_Options::iterations (size_t n) } inline size_t -Performance_Test_Options::iterations (void) +Performance_Test_Options::iterations () { return this->_iterations; } @@ -249,19 +249,19 @@ Performance_Test_Options::t_flags (long flag) } inline long -Performance_Test_Options::t_flags (void) +Performance_Test_Options::t_flags () { return this->_t_flags; } inline int -Performance_Test_Options::debug (void) +Performance_Test_Options::debug () { return this->_debugging; } inline int -Performance_Test_Options::verbose (void) +Performance_Test_Options::verbose () { return this->_verbosity; } diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README index 179391919c764..e3ac204493a1c 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README @@ -27,12 +27,7 @@ details. Some reasonable options to use to run the tests are: -v -B -s 15 -v -n 4 -t 4 -s 15 -You should experiment with other options as you see fit. Note that on -Solaris, you should always make sure that you have more than 1 LWP (by -using either the -B or the -n options) since otherwise the program may -get into an infinite loop due to the semantics of SunOS unbound -threads... (This may no longer be the case.) - +You should experiment with other options as you see fit. Available Options in Performance_Test module: ============================================= diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp index 5de752a85b1bc..c71d3eb6bfb38 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp @@ -23,7 +23,7 @@ ACE_Condition_Thread_Mutex Cond_Brdcast_Test::notfull (Cond_Brdcast_Test::mutex) ACE_Condition_Thread_Mutex Cond_Brdcast_Test::notempty (Cond_Brdcast_Test::mutex); int -Cond_Brdcast_Test::svc (void) +Cond_Brdcast_Test::svc () { int ni = this->thr_id (); synch_count = 2; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp index 17882016d2a3f..66bea60448d6f 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp @@ -23,7 +23,7 @@ ACE_Condition_Thread_Mutex Cond_Signal_Test::notfull (Cond_Signal_Test::mutex); ACE_Condition_Thread_Mutex Cond_Signal_Test::notempty (Cond_Signal_Test::mutex); int -Cond_Signal_Test::svc (void) +Cond_Signal_Test::svc () { int ni = this->thr_id (); synch_count = 2; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp index ba507128c872b..23c6542dfa4b4 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp @@ -11,7 +11,7 @@ class ACE_Svc_Export Context_Test : public Benchmark_Performance }; int -Context_Test::svc (void) +Context_Test::svc () { int ni = this->thr_id (); diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp index 45c136989bf38..29427e1abba83 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp @@ -59,7 +59,7 @@ Guard_Test::init (int argc, ACE_TCHAR *argv[]) } int -Guard_Test::svc (void) +Guard_Test::svc () { // Extract out the unique thread-specific value to be used as an // index... diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp index e5446a721cefa..8d871b45259b0 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp @@ -13,7 +13,7 @@ class ACE_Svc_Export Memory_Test : public Benchmark_Performance }; int -Memory_Test::svc (void) +Memory_Test::svc () { int ni = this->thr_id (); size_t length = performance_test_options.msg_size (); diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp index 1bfca0accc043..0d4f4e3f8f3c9 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp @@ -16,7 +16,7 @@ class ACE_Svc_Export Mutex_Test : public Benchmark_Performance ACE_Thread_Mutex Mutex_Test::mutex; int -Mutex_Test::svc (void) +Mutex_Test::svc () { // Extract out the unique thread-specific value to be used as an // index... diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp index 291ef0d6f236d..4ba9eefba76ab 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp @@ -55,7 +55,7 @@ Pipe_Proc_Test::reader (ACE_HANDLE handle) int -Pipe_Proc_Test::svc (void) +Pipe_Proc_Test::svc () { ssize_t length = performance_test_options.msg_size (); int ni = this->thr_id (); diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp index 3f0a3b432fc06..c63cbd2af1f96 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp @@ -51,7 +51,7 @@ Pipe_Thr_Test::init (int, ACE_TCHAR **) } int -Pipe_Thr_Test::svc (void) +Pipe_Thr_Test::svc () { ssize_t length = performance_test_options.msg_size (); ACE_HANDLE handle = this->pipe_handles[1]; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp index 97b731c24ee68..73bc23239b9a8 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp @@ -17,7 +17,7 @@ class ACE_Svc_Export Recursive_Lock_Test : public Benchmark_Performance ACE_Recursive_Thread_Mutex Recursive_Lock_Test::mutex; int -Recursive_Lock_Test::svc (void) +Recursive_Lock_Test::svc () { int ni = this->thr_id (); synch_count = 2; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp index 118ddcd47ca92..12ee04bf97e46 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp @@ -17,7 +17,7 @@ class ACE_Svc_Export RWRD_Test : public Benchmark_Performance ACE_RW_Mutex RWRD_Test::rw_lock; int -RWRD_Test::svc (void) +RWRD_Test::svc () { int ni = this->thr_id (); synch_count = 2; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp index de143e2117079..635b6c6e0f094 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp @@ -17,7 +17,7 @@ class ACE_Svc_Export RWWR_Test : public Benchmark_Performance ACE_RW_Mutex RWWR_Test::rw_lock; int -RWWR_Test::svc (void) +RWWR_Test::svc () { int ni = this->thr_id (); synch_count = 2; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp index fd0af5d8bb4e5..8020f16bae6d1 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp @@ -17,7 +17,7 @@ class ACE_Svc_Export Sema_Test : public Benchmark_Performance ACE_Semaphore Sema_Test::sema (1); int -Sema_Test::svc (void) +Sema_Test::svc () { int ni = this->thr_id (); synch_count = 2; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp index 5a366d8dafa88..63ba5d8f8912f 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp @@ -31,14 +31,14 @@ SYSVSema_Test::init (int, ACE_TCHAR *[]) } int -SYSVSema_Test::fini (void) +SYSVSema_Test::fini () { delete SYSVSema_Test::sema; return 0; } int -SYSVSema_Test::svc (void) +SYSVSema_Test::svc () { int ni = this->thr_id (); synch_count = 2; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp index 1bc1136424d4b..45e462a779214 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp @@ -17,7 +17,7 @@ class ACE_Svc_Export Token_Test : public Benchmark_Performance ACE_Token Token_Test::token; int -Token_Test::svc (void) +Token_Test::svc () { // Extract out the unique thread-specific value to be used as an // index... diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp index ff53768431760..43bd16d38e276 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp @@ -16,13 +16,13 @@ Benchmark_Base::Benchmark_Base (int type) } int -Benchmark_Base::benchmark_type (void) +Benchmark_Base::benchmark_type () { return this->benchmark_type_; } int -Benchmark_Base::thr_id (void) +Benchmark_Base::thr_id () { #if defined (ACE_HAS_PTHREADS) || defined (VXWORKS) // This invokes the thread-specific storage smart pointer. @@ -32,7 +32,7 @@ Benchmark_Base::thr_id (void) #endif /* ACE_HAS_PTHREADS || VXWORKS */ } -Benchmark_Method_Base::Benchmark_Method_Base (void) +Benchmark_Method_Base::Benchmark_Method_Base () : Benchmark_Base (Benchmark_Base::METHOD) { } @@ -53,7 +53,6 @@ Benchmark_Method_Base::exec (ACE_Service_Repository_Iterator *sri) if (this->valid_test_object (bp)) { - ACE_DEBUG ((LM_DEBUG, "\nstarting up %s\n", sr->name ())); int notused = this->pre_run_test (bp) == 0 && this->run_test () == 0 && @@ -70,13 +69,13 @@ Benchmark_Method_Base::exec (ACE_Service_Repository_Iterator *sri) /* static */ MT_INT Thr_ID::thread_id_ (0); -Thr_ID::Thr_ID (void) +Thr_ID::Thr_ID () : thr_id_ (++Thr_ID::thread_id_) { } int -Thr_ID::thr_id (void) +Thr_ID::thr_id () { return this->thr_id_; } diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h index 5c26b3ad20450..7023dfccffd98 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h +++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h @@ -29,12 +29,12 @@ class Thr_ID // // DESCRIPTION // Pthreads are too lame to have a sensible scalar values for the - // thread id (unlike Solaris threads). Therefore, we have to + // thread id. Therefore, we have to // emulate this ourselves with this class (gag). { public: - Thr_ID (void); - int thr_id (void); + Thr_ID (); + int thr_id (); void thr_id (int); private: @@ -61,10 +61,10 @@ class SYNCHLIB_Export Benchmark_Base : public ACE_Service_Object PERFORMANCE }; - int benchmark_type (void); + int benchmark_type (); // RTTI information of this module. - int thr_id (void); + int thr_id (); // Returns our thread id; protected: @@ -93,11 +93,11 @@ class SYNCHLIB_Export Benchmark_Method_Base : public Benchmark_Base // Before running the real test. Subclasses implement this method // to dictate how the test is performed. - virtual int run_test (void) = 0; + virtual int run_test () = 0; // Run the real test. Subclasses implement this method to // dictate how the test is performed. - virtual int post_run_test (void) = 0; + virtual int post_run_test () = 0; // After running the real test. Subclasses implement this method to // dictate how the test is performed. @@ -105,7 +105,7 @@ class SYNCHLIB_Export Benchmark_Method_Base : public Benchmark_Base // Check if we got a valid test to perform. protected: - Benchmark_Method_Base (void); + Benchmark_Method_Base (); }; # endif /* ACE_HAS_THREADS */ diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp index ce04311b7e487..375cb51d3e31f 100644 --- a/ACE/performance-tests/TCP/tcp_test.cpp +++ b/ACE/performance-tests/TCP/tcp_test.cpp @@ -66,7 +66,7 @@ enum { static void -usage (void) +usage () { ACE_ERROR ((LM_ERROR, "tcp_test\n" @@ -94,7 +94,7 @@ class Client : public ACE_Event_Handler public: Client (const ACE_INET_Addr &remote_addr); - virtual ~Client (void); + virtual ~Client (); // = Override methods. virtual ACE_HANDLE get_handle () const; @@ -111,11 +111,11 @@ class Client : public ACE_Event_Handler int get_response (char *buf, size_t len); /// Send messages to server and record statistics. - int run (void); + int run (); //FUZZ: disable check_for_lack_ACE_OS /// Send shutdown message to server. - int shutdown (void); + int shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -149,7 +149,7 @@ Client::Client (const ACE_INET_Addr &remote_addr) } } -Client::~Client (void) +Client::~Client () { } @@ -201,7 +201,7 @@ Client::get_response (char *buf, size_t len) } int -Client::run (void) +Client::run () { ACE_OS::memset (sbuf, 0, bufsz); ACE_OS::memset (rbuf, 0, bufsz); @@ -268,7 +268,7 @@ Client::run (void) } int -Client::shutdown (void) +Client::shutdown () { const char buf = 'S'; int n = this->endpoint_.send (&buf, 1u); @@ -292,7 +292,7 @@ class Server : public ACE_Event_Handler public: Server (const ACE_INET_Addr &addr); - virtual ~Server (void); + virtual ~Server (); // = Override methods. virtual ACE_HANDLE get_handle () const; @@ -304,7 +304,7 @@ class Server : public ACE_Event_Handler /// Receives datagrams. ACE_SOCK_Stream endpoint_; - Server (void) = delete; + Server () = delete; Server (const Server &) = delete; Server &operator= (const Server &) = delete; }; @@ -365,7 +365,7 @@ Server::Server (const ACE_INET_Addr &addr) "close failed")); } -Server::~Server (void) +Server::~Server () { this->endpoint_.close (); } @@ -516,8 +516,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling, e.g. if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp index e06e86cd02194..863d8643d6009 100644 --- a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp +++ b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp @@ -178,7 +178,7 @@ void err (char *s); void mes (char *s); void pattern (register char *cp, register int cnt); char *outfmt (double b); -void prep_timer (void); +void prep_timer (); double read_timer (char *str, int len); static void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp); static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1); @@ -713,7 +713,6 @@ read_timer (char *str, int len) { perror ("Getting 'itimer' REAL failed"); return (0.0); - } fprintf(stdout, "End transaction time = %d sec and %d usec\n", itimedol.it_value.tv_sec, itimedol.it_value.tv_usec); prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line); @@ -851,7 +850,6 @@ prusage (register struct rusage *r0, struct rusage *r1, static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1) { - tsum->tv_sec = t0->tv_sec + t1->tv_sec; tsum->tv_usec = t0->tv_usec + t1->tv_usec; if (tsum->tv_usec > 1000000) @@ -861,7 +859,6 @@ tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1) static void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0) { - tdiff->tv_sec = t1->tv_sec - t0->tv_sec; tdiff->tv_usec = t1->tv_usec - t0->tv_usec; if (tdiff->tv_usec < 0) diff --git a/ACE/performance-tests/TTCP/C/new-ttcp.cpp b/ACE/performance-tests/TTCP/C/new-ttcp.cpp index bd5038ceaa8fd..8edfb790c458b 100644 --- a/ACE/performance-tests/TTCP/C/new-ttcp.cpp +++ b/ACE/performance-tests/TTCP/C/new-ttcp.cpp @@ -185,7 +185,7 @@ void mes (char *s); void pattern (register char *cp, register int cnt); char *outfmt (double b); static void getrusage (int ignored, register struct rusage *ru); -void prep_timer (void); +void prep_timer (); double read_timer (char *str, int len); static void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp); static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1); @@ -871,7 +871,6 @@ prusage (register struct rusage *r0, struct rusage *r1, static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1) { - tsum->tv_sec = t0->tv_sec + t1->tv_sec; tsum->tv_usec = t0->tv_usec + t1->tv_usec; if (tsum->tv_usec > 1000000) @@ -881,7 +880,6 @@ tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1) static void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0) { - tdiff->tv_sec = t1->tv_sec - t0->tv_sec; tdiff->tv_usec = t1->tv_usec - t0->tv_usec; if (tdiff->tv_usec < 0) diff --git a/ACE/performance-tests/UDP/udp_test.cpp b/ACE/performance-tests/UDP/udp_test.cpp index 753f9f15fcd88..48936920de4f3 100644 --- a/ACE/performance-tests/UDP/udp_test.cpp +++ b/ACE/performance-tests/UDP/udp_test.cpp @@ -54,7 +54,7 @@ ACE_hrtime_t total_ltime; ACE_hrtime_t ltime; static void -usage (void) +usage () { ACE_ERROR ((LM_ERROR, "%s\n" @@ -86,7 +86,7 @@ class Client : public ACE_Event_Handler Client (const ACE_INET_Addr &addr, const ACE_INET_Addr &remote_addr); - virtual ~Client (void); + virtual ~Client (); // = Override methods. virtual ACE_HANDLE get_handle () const; @@ -103,11 +103,11 @@ class Client : public ACE_Event_Handler int get_response (char *buf, size_t len); /// Send messages to server and record statistics. - int run (void); + int run (); //FUZZ: disable check_for_lack_ACE_OS /// Send shutdown message to server. - int shutdown (void); + int shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -117,7 +117,7 @@ class Client : public ACE_Event_Handler /// The address to send messages to. ACE_INET_Addr remote_addr_; - Client (void) = delete; + Client () = delete; Client (const Client &) = delete; Client &operator= (const Client &) = delete; }; @@ -136,7 +136,7 @@ Client::Client (const ACE_INET_Addr &addr, } } -Client::~Client (void) +Client::~Client () { } @@ -190,7 +190,7 @@ Client::get_response (char *buf, size_t len) } int -Client::run (void) +Client::run () { int ndist = 0; int i; @@ -447,7 +447,7 @@ Client::run (void) } int -Client::shutdown (void) +Client::shutdown () { const char buf = 'S'; const int n = endpoint_.send (&buf, 1u, remote_addr_); @@ -469,7 +469,7 @@ class Server : public ACE_Event_Handler public: Server (const ACE_INET_Addr &addr); - virtual ~Server (void); + virtual ~Server (); // = Override methods. virtual ACE_HANDLE get_handle () const; @@ -481,7 +481,7 @@ class Server : public ACE_Event_Handler /// Receives datagrams. ACE_SOCK_Dgram endpoint_; - Server (void) = delete; + Server () = delete; Server (const Server &) = delete; Server &operator= (const Server &) = delete; }; @@ -499,7 +499,7 @@ Server::Server (const ACE_INET_Addr &addr) } } -Server::~Server (void) +Server::~Server () { } diff --git a/ACE/protocols/ace/HTBP/HTBP.rc b/ACE/protocols/ace/HTBP/HTBP.rc new file mode 100644 index 0000000000000..7a0673ffbc80d --- /dev/null +++ b/ACE/protocols/ace/HTBP/HTBP.rc @@ -0,0 +1,30 @@ +#include "../../../ace/Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACE_HTBP\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACE_HTBPDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACE_HTBP.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h index 1b99b1f417bc2..3484700dc533f 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Addr.h +++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h @@ -28,7 +28,6 @@ namespace ACE { namespace HTBP { - /** * @class Addr * @@ -80,7 +79,6 @@ namespace ACE /// HTID - web-obtained unique-identifier ACE_CString htid_; }; - } } diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp index b39b6976fabbe..b7c6ca1caab84 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp @@ -95,7 +95,7 @@ ACE::HTBP::Channel::Channel (ACE_HANDLE h) } /// Destructor. -ACE::HTBP::Channel::~Channel (void) +ACE::HTBP::Channel::~Channel () { delete this->notifier_; delete this->filter_; @@ -108,7 +108,7 @@ ACE::HTBP::Channel::dump () const } unsigned long -ACE::HTBP::Channel::request_count (void) +ACE::HTBP::Channel::request_count () { return this->request_count_++; } @@ -135,7 +135,7 @@ ACE::HTBP::Channel::register_notifier (ACE_Reactor *r) } ACE::HTBP::Notifier * -ACE::HTBP::Channel::notifier (void) +ACE::HTBP::Channel::notifier () { return this->notifier_; } @@ -158,7 +158,7 @@ ACE::HTBP::Channel::data_consumed (size_t n) } int -ACE::HTBP::Channel::load_buffer (void) +ACE::HTBP::Channel::load_buffer () { this->leftovers_.crunch(); if (this->state() == Detached || @@ -203,7 +203,7 @@ ACE::HTBP::Channel::load_buffer (void) } int -ACE::HTBP::Channel::flush_buffer (void) +ACE::HTBP::Channel::flush_buffer () { if (this->session_) return this->session_->flush_outbound_queue(); @@ -211,13 +211,13 @@ ACE::HTBP::Channel::flush_buffer (void) } int -ACE::HTBP::Channel::send_ack (void) +ACE::HTBP::Channel::send_ack () { return this->filter_->send_ack(this); } int -ACE::HTBP::Channel::recv_ack (void) +ACE::HTBP::Channel::recv_ack () { if (load_buffer() == -1) return -1; @@ -236,7 +236,7 @@ ACE::HTBP::Channel::state (ACE::HTBP::Channel::State s) } int -ACE::HTBP::Channel::consume_error (void) +ACE::HTBP::Channel::consume_error () { if (error_buffer_ == 0) { @@ -293,7 +293,7 @@ ACE::HTBP::Channel::consume_error (void) /// one direction on one stream. int -ACE::HTBP::Channel::pre_recv(void) +ACE::HTBP::Channel::pre_recv() { if (ACE::debug()) ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.h b/ACE/protocols/ace/HTBP/HTBP_Channel.h index 02c4285fa1a04..790f104c039e4 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.h +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.h @@ -86,7 +86,7 @@ namespace ACE Channel (ACE_HANDLE h); /// Destructor. - ~Channel (void); + ~Channel (); enum State { Init, @@ -158,17 +158,17 @@ namespace ACE // = Selectively close endpoints. /// Close down the reader. - int close_reader (void); + int close_reader (); /// Close down the writer. - int close_writer (void); + int close_writer (); /** * Close down the socket (we need this to make things work correctly * on Win32, which requires use to do a before doing * the close to avoid losing data). */ - int close (void); + int close (); // = Meta-type info typedef ACE_INET_Addr PEER_ADDR; @@ -183,14 +183,14 @@ namespace ACE Session *session () const; void session (Session *); - Notifier *notifier (void); + Notifier *notifier (); void register_notifier (ACE_Reactor *r); ACE_HANDLE get_handle () const; const ACE_SOCK_Stream &ace_stream () const; - ACE_SOCK_Stream &ace_stream (void); + ACE_SOCK_Stream &ace_stream (); ///@notes Added the following methods to continue with /// current compilation of HTIOP. Might not be needed in @@ -214,25 +214,24 @@ namespace ACE //@} // buffer related methods. - ACE_Message_Block &leftovers (void); + ACE_Message_Block &leftovers (); size_t data_len () const; void data_len (size_t n); size_t data_consumed () const; void data_consumed (size_t n); - int load_buffer (void); - int flush_buffer (void); - int recv_ack (void); - int send_ack (void); + int load_buffer (); + int flush_buffer (); + int recv_ack (); + int send_ack (); unsigned long request_count(); Filter *filter () const; void filter (Filter *); State state () const; void state (Channel::State s); - int pre_recv(void); - int consume_error (void); + int pre_recv(); + int consume_error (); private: - /// The filter_ is a pluggable component used to manage the /// wrapping of data in a way suitable for the proxy to /// manage. The actual filter instance is owned by the diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.inl b/ACE/protocols/ace/HTBP/HTBP_Channel.inl index c0ffb7ec252b8..b8d2f58c97c08 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.inl +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.inl @@ -39,21 +39,21 @@ ACE::HTBP::Channel::filter (ACE::HTBP::Filter *f) ACE_INLINE int -ACE::HTBP::Channel::close_reader (void) +ACE::HTBP::Channel::close_reader () { return this->ace_stream_.close_reader(); } ACE_INLINE int -ACE::HTBP::Channel::close_writer (void) +ACE::HTBP::Channel::close_writer () { return this->ace_stream_.close_writer(); } ACE_INLINE int -ACE::HTBP::Channel::close (void) +ACE::HTBP::Channel::close () { return this->ace_stream_.close(); } @@ -67,7 +67,7 @@ ACE::HTBP::Channel::state () const ACE_INLINE ACE_Message_Block & -ACE::HTBP::Channel::leftovers (void) +ACE::HTBP::Channel::leftovers () { return this->leftovers_; } @@ -103,7 +103,7 @@ ACE::HTBP::Channel::ace_stream () const ACE_INLINE ACE_SOCK_Stream& -ACE::HTBP::Channel::ace_stream (void) +ACE::HTBP::Channel::ace_stream () { return this->ace_stream_; } diff --git a/ACE/protocols/ace/HTBP/HTBP_Environment.h b/ACE/protocols/ace/HTBP/HTBP_Environment.h index 91fda93cf163a..37e0ccd991051 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Environment.h +++ b/ACE/protocols/ace/HTBP/HTBP_Environment.h @@ -19,7 +19,6 @@ namespace ACE { namespace HTBP { - /** * @class Environment * @@ -31,7 +30,6 @@ namespace ACE class HTBP_Export Environment { public: - /// Constructor Environment (ACE_Configuration *config = 0, int using_registry = 0, @@ -41,7 +39,7 @@ namespace ACE ~Environment (); /// removes all htbp related values from the configuration - void clear (void); + void clear (); /// Accessors to HTID URL /// Returns 0 on success @@ -97,7 +95,6 @@ namespace ACE /// We created the config instance, so we must clean it up bool own_config_; - }; } } diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Filter.cpp index b63151e30f1fe..c4add8cb6726b 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Filter.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Filter.cpp @@ -9,7 +9,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE::HTBP::Filter::Filter (void) +ACE::HTBP::Filter::Filter () :http_code_ (0) { } diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Filter.h index 456f0984fc3ca..4e71dab6c2a10 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Filter.h +++ b/ACE/protocols/ace/HTBP/HTBP_Filter.h @@ -26,7 +26,6 @@ namespace ACE { namespace HTBP { - // Forward declarations. class Channel; @@ -48,9 +47,9 @@ namespace ACE class HTBP_Export Filter { public: - Filter (void); + Filter (); - virtual ~Filter (void) = default; + virtual ~Filter () = default; /// Inside and outside Send filters need to supply a data header that /// sets the stage before sending the data body, and then (maybe) send a @@ -76,10 +75,10 @@ namespace ACE virtual ssize_t recv_data_trailer(Channel *ch); /// reset the http_code_ in anticipation of a new message. - void reset_http_code (void); + void reset_http_code (); /// get the value of the most recent http result code - int http_code (void); + int http_code (); protected: char *header_complete (Channel *ch); @@ -88,7 +87,6 @@ namespace ACE /// Store the most recent HTTP result code. Typically it will be 200, /// but it could be a 4xx or 5xx code if the proxy reports an error. int http_code_; - }; } } diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.inl b/ACE/protocols/ace/HTBP/HTBP_Filter.inl index d188aedf5f8ff..0f37b1d50dfd5 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Filter.inl +++ b/ACE/protocols/ace/HTBP/HTBP_Filter.inl @@ -45,14 +45,14 @@ ACE::HTBP::Filter::recv_data_trailer(ACE::HTBP::Channel *) ACE_INLINE void -ACE::HTBP::Filter::reset_http_code (void) +ACE::HTBP::Filter::reset_http_code () { this->http_code_ = 0; } ACE_INLINE int -ACE::HTBP::Filter::http_code (void) +ACE::HTBP::Filter::http_code () { return this->http_code_; } diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.cpp b/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.cpp index 00cf1cd5b455d..d1770741c8ef5 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.cpp @@ -7,7 +7,6 @@ #include "ace/Log_Msg.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE::HTBP::Filter_Factory::Filter_Factory () diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.h b/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.h index f50428d88dae6..eddcb895e9fef 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.h +++ b/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.h @@ -40,7 +40,6 @@ namespace ACE class HTBP_Export Filter_Factory : public ACE_Service_Object { public: - /// Constructor Filter_Factory (); @@ -61,6 +60,5 @@ ACE_STATIC_SVC_DECLARE_EXPORT (HTBP, ACE_HTBP_Filter_Factory) ACE_FACTORY_DECLARE (HTBP, ACE_HTBP_Filter_Factory) - #include /**/ "ace/post.h" #endif /* ACE_HTBP_FILTER_FACTORY */ diff --git a/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h b/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h index 8e76da9128ca3..03bb0c4cd2e93 100644 --- a/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h +++ b/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h @@ -51,7 +51,6 @@ namespace ACE static ACE_TString htid_; static ACE_SYNCH_MUTEX htid_lock_; }; - } } diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp index ee6fc0dd45be6..826fa3f716346 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp @@ -199,7 +199,6 @@ ACE::HTBP::Inside_Squid_Filter::send_ack (ACE::HTBP::Channel *ch) int ACE::HTBP::Inside_Squid_Filter::recv_ack (ACE::HTBP::Channel *ch) { - char *header_end = this->header_complete(ch); if (header_end == 0) { diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h index 9746ad0ede1e6..a6da5c0fbb54f 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h +++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h @@ -25,7 +25,6 @@ namespace ACE { namespace HTBP { - /** * @class Inside_Squid_Filter * @@ -45,7 +44,7 @@ namespace ACE { public: /// Destructor. - virtual ~Inside_Squid_Filter (void); + virtual ~Inside_Squid_Filter (); /// Inside and outside Send filters need to supply a data header /// that sets the stage before sending the data body, and then @@ -74,7 +73,6 @@ namespace ACE virtual ssize_t recv_data_trailer(Channel *); private: int make_request_header (Channel *, const char *, char *, size_t ); - }; } } diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl index f673a8353186a..9aaa57588baf5 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl +++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE::HTBP::Inside_Squid_Filter::~Inside_Squid_Filter (void) +ACE::HTBP::Inside_Squid_Filter::~Inside_Squid_Filter () { } diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp index 6caeb70eb0d3b..8aaff832e57f0 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp @@ -69,11 +69,10 @@ int ACE::HTBP::Notifier::handle_output (ACE_HANDLE ) { return -1; - } void -ACE::HTBP::Notifier::unregister (void) +ACE::HTBP::Notifier::unregister () { if (this->reactor()) this->reactor()->remove_handler(this, diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.h b/ACE/protocols/ace/HTBP/HTBP_Notifier.h index ef17804fdcb7f..1670b23a61f1e 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Notifier.h +++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.h @@ -36,7 +36,7 @@ namespace ACE int handle_input(ACE_HANDLE ); int handle_output(ACE_HANDLE ); - void unregister (void); + void unregister (); ACE_HANDLE get_handle () const; diff --git a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h index dcdd49f9919a7..15a557bdd2416 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h +++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h @@ -45,7 +45,7 @@ namespace ACE { public: /// Destructor. - virtual ~Outside_Squid_Filter (void); + virtual ~Outside_Squid_Filter (); /// Outside and outside Send filters need to supply a data header that /// sets the stage before sending the data body, and then (maybe) send a @@ -70,7 +70,6 @@ namespace ACE virtual ssize_t recv_data_header (Channel *); virtual ssize_t recv_data_trailer(Channel *); }; - } } diff --git a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl index 57a2c48af68c3..a3780af298e4c 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl +++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE::HTBP::Outside_Squid_Filter::~Outside_Squid_Filter (void) +ACE::HTBP::Outside_Squid_Filter::~Outside_Squid_Filter () { } diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.cpp b/ACE/protocols/ace/HTBP/HTBP_Session.cpp index 7f13e9ef77046..d488e446a9a73 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp @@ -56,7 +56,7 @@ ACE::HTBP::Session::find_session (const ACE::HTBP::Session_Id_t &sid, ACE::HTBP: } //---------------------------------------------------------------------------- -ACE::HTBP::Session::Session (void) +ACE::HTBP::Session::Session () : proxy_addr_ (0), destroy_proxy_addr_ (0), inbound_ (0), @@ -133,7 +133,7 @@ ACE::HTBP::Session::operator= (const ACE::HTBP::Session &) return *this; } -ACE::HTBP::Session::~Session (void) +ACE::HTBP::Session::~Session () { if (destroy_proxy_addr_) delete proxy_addr_; @@ -143,7 +143,7 @@ ACE::HTBP::Session::~Session (void) } int -ACE::HTBP::Session::close (void) +ACE::HTBP::Session::close () { if (this->inbound_) this->inbound_->close(); @@ -198,7 +198,7 @@ ACE::HTBP::Session::reconnect_i (ACE::HTBP::Channel *s) const } ACE_Event_Handler * -ACE::HTBP::Session::handler (void) +ACE::HTBP::Session::handler () { return this->handler_; } @@ -238,7 +238,7 @@ ACE::HTBP::Session::enqueue (ACE_Message_Block *msg) } int -ACE::HTBP::Session::flush_outbound_queue (void) +ACE::HTBP::Session::flush_outbound_queue () { int result = 0; if (this->outbound_queue_.message_count() > 0) @@ -299,7 +299,7 @@ ACE::HTBP::Session::disable (int flags) } ACE::HTBP::Stream * -ACE::HTBP::Session::stream (void)const +ACE::HTBP::Session::stream () const { return this->stream_; } diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.h b/ACE/protocols/ace/HTBP/HTBP_Session.h index f9edc5eb65019..37e9bb78d2437 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.h +++ b/ACE/protocols/ace/HTBP/HTBP_Session.h @@ -37,7 +37,6 @@ namespace ACE { namespace HTBP { - class Session_Id_t { public: @@ -73,7 +72,7 @@ namespace ACE public: // Initialization and termination methods. /// Constructor. - Session (void); + Session (); /// Constructor (sets the underlying session id with ). Session (const Addr& peer, @@ -89,7 +88,7 @@ namespace ACE Session& operator= (const Session &other); /// Destructor. - ~Session (void); + ~Session (); /// The following methods are specific to the Session static ACE_UINT32 next_session_id (); @@ -103,7 +102,7 @@ namespace ACE void stream (Stream *); int enqueue (ACE_Message_Block *msg); - int flush_outbound_queue (void); + int flush_outbound_queue (); int close_inbound () const; int close_outbound () const; @@ -138,9 +137,9 @@ namespace ACE void local_addr (const Addr &); /// invoke close on both streams, then remove self from session map - int close (void); + int close (); - ACE_Event_Handler *handler (void); + ACE_Event_Handler *handler (); void handler (ACE_Event_Handler *); void reactor (ACE_Reactor *); void detach (Channel *); diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp index a371cfc68d408..75da921bbda5a 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp @@ -28,7 +28,7 @@ ACE::HTBP::Stream::Stream (ACE::HTBP::Session *s) } /// Destructor. -ACE::HTBP::Stream::~Stream (void) +ACE::HTBP::Stream::~Stream () { } @@ -39,7 +39,6 @@ ACE::HTBP::Stream::dump () const } - //--------------------------------------------------------------------------- // = I/O functions. @@ -285,19 +284,19 @@ ACE::HTBP::Stream::sendv_n (const iovec [], } int -ACE::HTBP::Stream::close_reader (void) +ACE::HTBP::Stream::close_reader () { return this->session_->close_inbound(); } int -ACE::HTBP::Stream::close_writer (void) +ACE::HTBP::Stream::close_writer () { return this->session_->close_outbound(); } int -ACE::HTBP::Stream::close (void) +ACE::HTBP::Stream::close () { return this->session_->close(); } diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.h b/ACE/protocols/ace/HTBP/HTBP_Stream.h index e6f5f3a7ca194..4ec5198baef4d 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Stream.h +++ b/ACE/protocols/ace/HTBP/HTBP_Stream.h @@ -90,7 +90,7 @@ namespace ACE Stream (Session *s = 0); /// Destructor. - ~Stream (void); + ~Stream (); // = I/O functions. @@ -211,17 +211,17 @@ namespace ACE size_t *bytes_transferred = 0) const; // = Selectively close endpoints. / Close down the reader. - int close_reader (void); + int close_reader (); /// Close down the writer. - int close_writer (void); + int close_writer (); /** * Close down the socket (we need this to make things work correctly * on Win32, which requires use to do a before doing * the close to avoid losing data). */ - int close (void); + int close (); // = Meta-type info typedef Addr PEER_ADDR; @@ -278,7 +278,6 @@ namespace ACE /// associated with. On the inside, sessions are created by the Connector, /// which then create streams on demand. Session *session_; - }; } } diff --git a/ACE/protocols/ace/INet/BidirStreamBuffer.cpp b/ACE/protocols/ace/INet/BidirStreamBuffer.cpp index 7a0a81145ac0d..fe6850aedb749 100644 --- a/ACE/protocols/ace/INet/BidirStreamBuffer.cpp +++ b/ACE/protocols/ace/INet/BidirStreamBuffer.cpp @@ -11,7 +11,6 @@ namespace ACE { namespace IOS { - template BasicBidirStreamBuffer::BasicBidirStreamBuffer ( STREAM_HANDLER* sh, diff --git a/ACE/protocols/ace/INet/BidirStreamBuffer.h b/ACE/protocols/ace/INet/BidirStreamBuffer.h index 4267be12d21b8..1b5f0e4a76bf2 100644 --- a/ACE/protocols/ace/INet/BidirStreamBuffer.h +++ b/ACE/protocols/ace/INet/BidirStreamBuffer.h @@ -119,19 +119,12 @@ namespace ACE BidirStreamBuffer(const BidirStreamBuffer&); BidirStreamBuffer& operator = (const BidirStreamBuffer&); }; - } } ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/BidirStreamBuffer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BidirStreamBuffer.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_BIDIR_STREAM_BUFFER_H */ diff --git a/ACE/protocols/ace/INet/BufferedStreamBuffer.cpp b/ACE/protocols/ace/INet/BufferedStreamBuffer.cpp index 514de700ebcbe..d805603983586 100644 --- a/ACE/protocols/ace/INet/BufferedStreamBuffer.cpp +++ b/ACE/protocols/ace/INet/BufferedStreamBuffer.cpp @@ -11,7 +11,6 @@ namespace ACE { namespace IOS { - template BasicBufferedStreamBuffer::BasicBufferedStreamBuffer ( std::streamsize bufsz, diff --git a/ACE/protocols/ace/INet/BufferedStreamBuffer.h b/ACE/protocols/ace/INet/BufferedStreamBuffer.h index 4bb2a5c394b6b..56bae21bb221e 100644 --- a/ACE/protocols/ace/INet/BufferedStreamBuffer.h +++ b/ACE/protocols/ace/INet/BufferedStreamBuffer.h @@ -95,13 +95,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/BufferedStreamBuffer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BufferedStreamBuffer.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_BUFFERED_STREAM_BUFFER_H */ diff --git a/ACE/protocols/ace/INet/ClientRequestHandler.cpp b/ACE/protocols/ace/INet/ClientRequestHandler.cpp index c0ef1f794b633..8b17d981330a7 100644 --- a/ACE/protocols/ace/INet/ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/ClientRequestHandler.cpp @@ -6,14 +6,12 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace INet { - ClientRequestHandler::ClientRequestHandler () {} ClientRequestHandler::~ClientRequestHandler () {} diff --git a/ACE/protocols/ace/INet/ClientRequestHandler.h b/ACE/protocols/ace/INet/ClientRequestHandler.h index 660eeeaddee91..f448e06cb0eb3 100644 --- a/ACE/protocols/ace/INet/ClientRequestHandler.h +++ b/ACE/protocols/ace/INet/ClientRequestHandler.h @@ -96,7 +96,6 @@ namespace ACE u_short port_; }; }; - } } diff --git a/ACE/protocols/ace/INet/ConnectionCache.cpp b/ACE/protocols/ace/INet/ConnectionCache.cpp index 064baaf346bcd..703b06be77e73 100644 --- a/ACE/protocols/ace/INet/ConnectionCache.cpp +++ b/ACE/protocols/ace/INet/ConnectionCache.cpp @@ -7,14 +7,12 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace INet { - ConnectionKey::ConnectionKey () {} diff --git a/ACE/protocols/ace/INet/ConnectionCache.h b/ACE/protocols/ace/INet/ConnectionCache.h index 2cac139da5be5..809503fd0d454 100644 --- a/ACE/protocols/ace/INet/ConnectionCache.h +++ b/ACE/protocols/ace/INet/ConnectionCache.h @@ -22,7 +22,6 @@ namespace ACE { namespace INet { - /** * @class ACE_INet_ConnectionKey * @@ -254,8 +253,6 @@ namespace ACE ACE_SYNCH_CONDITION condition_; map_type cache_map_; }; - - } } diff --git a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp index f406821a1ddd1..dda846531078d 100644 --- a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp @@ -13,14 +13,12 @@ #include "ace/SOCK_Acceptor.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace FTP { - ClientRequestHandler::SessionHolder::SessionHolder () : session_ () { diff --git a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h index a11dc3bf84077..64019d9c178d8 100644 --- a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h +++ b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h @@ -218,7 +218,6 @@ namespace ACE ACE_CString current_user_; }; - } } diff --git a/ACE/protocols/ace/INet/FTP_IOStream.cpp b/ACE/protocols/ace/INet/FTP_IOStream.cpp index 110b943168114..b58eb0135e586 100644 --- a/ACE/protocols/ace/INet/FTP_IOStream.cpp +++ b/ACE/protocols/ace/INet/FTP_IOStream.cpp @@ -8,14 +8,12 @@ #include "ace/Truncate.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace FTP { - StreamBuffer::StreamBuffer (std::iostream * stream) : ACE::IOS::BufferedStreamBuffer (BUFFER_SIZE, std::ios::in | std::ios::out), diff --git a/ACE/protocols/ace/INet/FTP_IOStream.h b/ACE/protocols/ace/INet/FTP_IOStream.h index 387591e3db02e..feb001bf3aa19 100644 --- a/ACE/protocols/ace/INet/FTP_IOStream.h +++ b/ACE/protocols/ace/INet/FTP_IOStream.h @@ -26,7 +26,6 @@ namespace ACE { namespace FTP { - /** * @class ACE_FTP_StreamBuffer * @@ -111,7 +110,6 @@ namespace ACE void set_interceptor (StreamBuffer::interceptor_type& interceptor); }; - } } diff --git a/ACE/protocols/ace/INet/FTP_Request.cpp b/ACE/protocols/ace/INet/FTP_Request.cpp index 13206f0e7bfcd..edddd1ef555e1 100644 --- a/ACE/protocols/ace/INet/FTP_Request.cpp +++ b/ACE/protocols/ace/INet/FTP_Request.cpp @@ -10,14 +10,12 @@ #include "ace/INet/String_IOStream.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace FTP { - const ACE_CString Request::FTP_USER = "USER"; const ACE_CString Request::FTP_PASS = "PASS"; const ACE_CString Request::FTP_QUIT = "QUIT"; diff --git a/ACE/protocols/ace/INet/FTP_Request.h b/ACE/protocols/ace/INet/FTP_Request.h index bc03d34c6e4bd..69d44972ff686 100644 --- a/ACE/protocols/ace/INet/FTP_Request.h +++ b/ACE/protocols/ace/INet/FTP_Request.h @@ -20,7 +20,6 @@ namespace ACE { namespace FTP { - /** * @class ACE_FTP_Request * @@ -101,7 +100,6 @@ namespace ACE ACE_CString command_; ACE_CString args_; }; - } } diff --git a/ACE/protocols/ace/INet/FTP_Response.cpp b/ACE/protocols/ace/INet/FTP_Response.cpp index 84b30c5888997..a08528b8e4220 100644 --- a/ACE/protocols/ace/INet/FTP_Response.cpp +++ b/ACE/protocols/ace/INet/FTP_Response.cpp @@ -11,7 +11,6 @@ #include "ace/INet/String_IOStream.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/FTP_Response.h b/ACE/protocols/ace/INet/FTP_Response.h index 72d3545e857d3..9b54236dd0882 100644 --- a/ACE/protocols/ace/INet/FTP_Response.h +++ b/ACE/protocols/ace/INet/FTP_Response.h @@ -21,7 +21,6 @@ namespace ACE { namespace FTP { - /** * @class ACE_FTP_Response * @@ -117,7 +116,6 @@ namespace ACE int status_; ACE_Array response_; }; - } } diff --git a/ACE/protocols/ace/INet/FTP_Session.cpp b/ACE/protocols/ace/INet/FTP_Session.cpp index d834e7848140e..69532057609da 100644 --- a/ACE/protocols/ace/INet/FTP_Session.cpp +++ b/ACE/protocols/ace/INet/FTP_Session.cpp @@ -19,7 +19,6 @@ namespace ACE { namespace FTP { - template Session_T::Session_T () : port_ (FTP_PORT), diff --git a/ACE/protocols/ace/INet/FTP_Session.h b/ACE/protocols/ace/INet/FTP_Session.h index 787877cee8efe..8a218490fde69 100644 --- a/ACE/protocols/ace/INet/FTP_Session.h +++ b/ACE/protocols/ace/INet/FTP_Session.h @@ -112,13 +112,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/FTP_Session.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("FTP_Session.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_FTP_SESSION_H */ diff --git a/ACE/protocols/ace/INet/HTTPS_Context.cpp b/ACE/protocols/ace/INet/HTTPS_Context.cpp index fd6cdf30c3c92..9bdb52864322e 100644 --- a/ACE/protocols/ace/INet/HTTPS_Context.cpp +++ b/ACE/protocols/ace/INet/HTTPS_Context.cpp @@ -15,7 +15,6 @@ namespace ACE { namespace HTTPS { - int Context::ssl_mode_ = ACE_SSL_Context::SSLv23; bool Context::ssl_strict_ = false; bool Context::ssl_once_ = true; diff --git a/ACE/protocols/ace/INet/HTTPS_Context.h b/ACE/protocols/ace/INet/HTTPS_Context.h index 41e46cde31672..f0e533c09c6ba 100644 --- a/ACE/protocols/ace/INet/HTTPS_Context.h +++ b/ACE/protocols/ace/INet/HTTPS_Context.h @@ -52,7 +52,7 @@ namespace ACE bool operator ! () const; - ACE_SSL_Context& ssl_context (void); + ACE_SSL_Context& ssl_context (); const ACE_SSL_Context& ssl_context () const; diff --git a/ACE/protocols/ace/INet/HTTPS_Context.inl b/ACE/protocols/ace/INet/HTTPS_Context.inl index 98c2e3ca271dd..ce68777488a95 100644 --- a/ACE/protocols/ace/INet/HTTPS_Context.inl +++ b/ACE/protocols/ace/INet/HTTPS_Context.inl @@ -19,7 +19,7 @@ namespace ACE } ACE_INLINE - ACE_SSL_Context& Context::ssl_context (void) + ACE_SSL_Context& Context::ssl_context () { return *this->ssl_ctx_; } diff --git a/ACE/protocols/ace/INet/HTTPS_Session.cpp b/ACE/protocols/ace/INet/HTTPS_Session.cpp index 94ba1f6f735c7..a92d4a054cb6f 100644 --- a/ACE/protocols/ace/INet/HTTPS_Session.cpp +++ b/ACE/protocols/ace/INet/HTTPS_Session.cpp @@ -22,7 +22,6 @@ namespace ACE { namespace HTTPS { - template Session_T::Session_T (bool keep_alive #if defined (SSL_HAS_SSL_set_SSL_CTX) && (SSL_HAS_SSL_set_SSL_CTX == 1) diff --git a/ACE/protocols/ace/INet/HTTPS_Session.h b/ACE/protocols/ace/INet/HTTPS_Session.h index 91dd7d11cfcd4..e08d9dd61cd6e 100644 --- a/ACE/protocols/ace/INet/HTTPS_Session.h +++ b/ACE/protocols/ace/INet/HTTPS_Session.h @@ -62,7 +62,6 @@ namespace ACE bool attach_connection (connection_type* connection); protected: - void close_connection (); virtual bool connect_i (const ACE_Synch_Options& sync_opt); @@ -87,13 +86,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTPS_Session.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTTPS_Session.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HTTPS_SESSION_H */ diff --git a/ACE/protocols/ace/INet/HTTPS_SessionFactory.cpp b/ACE/protocols/ace/INet/HTTPS_SessionFactory.cpp index 17818a92b5b77..ef54eb8262b16 100644 --- a/ACE/protocols/ace/INet/HTTPS_SessionFactory.cpp +++ b/ACE/protocols/ace/INet/HTTPS_SessionFactory.cpp @@ -8,7 +8,6 @@ namespace ACE { namespace HTTPS { - SessionFactory_Impl::SessionHolder_Impl::SessionHolder_Impl () : session_ (true) { diff --git a/ACE/protocols/ace/INet/HTTPS_SessionFactory.h b/ACE/protocols/ace/INet/HTTPS_SessionFactory.h index a38b99f6c680c..7d64fef174722 100644 --- a/ACE/protocols/ace/INet/HTTPS_SessionFactory.h +++ b/ACE/protocols/ace/INet/HTTPS_SessionFactory.h @@ -59,7 +59,6 @@ namespace ACE virtual ACE::INet::ConnectionHolder* create_connection ( const ACE::INet::ConnectionKey& key) const; }; - } } diff --git a/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp b/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp index e03154b718c83..1454898d3eb8f 100644 --- a/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp +++ b/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp @@ -7,14 +7,12 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace HTTP { - const char* BasicAuthentication::SCHEME = "Basic"; BasicAuthentication::BasicAuthentication() diff --git a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp index 3e7afb48baebe..5f510650abbcb 100644 --- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp @@ -14,7 +14,6 @@ namespace ACE { namespace HTTP { - SessionFactoryRegistry::SessionFactoryRegistry () { } diff --git a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h index d1f2c77d22a44..79747658edfdc 100644 --- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h +++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h @@ -117,7 +117,6 @@ namespace ACE friend class ACE_Singleton; public: - void register_session_factory (const ACE_CString& scheme, SessionFactory* factory); @@ -234,7 +233,6 @@ namespace ACE Response response_; SessionHolder* session_; }; - } } diff --git a/ACE/protocols/ace/INet/HTTP_Header.cpp b/ACE/protocols/ace/INet/HTTP_Header.cpp index 392ca64551492..ceb296554a9eb 100644 --- a/ACE/protocols/ace/INet/HTTP_Header.cpp +++ b/ACE/protocols/ace/INet/HTTP_Header.cpp @@ -7,14 +7,12 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace HTTP { - const ACE_CString Header::HTTP_1_0 = "HTTP/1.0"; const ACE_CString Header::HTTP_1_1 = "HTTP/1.1"; const ACE_CString Header::CHUNKED_TRANSFER_ENCODING = "chunked"; diff --git a/ACE/protocols/ace/INet/HTTP_IOStream.cpp b/ACE/protocols/ace/INet/HTTP_IOStream.cpp index 7095c673c9b1f..c7dabea92c69d 100644 --- a/ACE/protocols/ace/INet/HTTP_IOStream.cpp +++ b/ACE/protocols/ace/INet/HTTP_IOStream.cpp @@ -8,14 +8,12 @@ #include "ace/Truncate.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace HTTP { - StreamBuffer::StreamBuffer (std::iostream& stream, StreamBuffer::policy_type* policy) : ACE::IOS::BufferedStreamBuffer (BUFFER_SIZE, std::ios::in | std::ios::out), diff --git a/ACE/protocols/ace/INet/HTTP_IOStream.h b/ACE/protocols/ace/INet/HTTP_IOStream.h index 8983fec9c3372..621c1f3a3eea9 100644 --- a/ACE/protocols/ace/INet/HTTP_IOStream.h +++ b/ACE/protocols/ace/INet/HTTP_IOStream.h @@ -27,7 +27,6 @@ namespace ACE { namespace HTTP { - /** * @class ACE_HTTP_StreamBuffer * @@ -117,7 +116,6 @@ namespace ACE void set_interceptor (StreamBuffer::interceptor_type& interceptor); }; - } } diff --git a/ACE/protocols/ace/INet/HTTP_Request.cpp b/ACE/protocols/ace/INet/HTTP_Request.cpp index 980ffb70cd530..1511672f91e25 100644 --- a/ACE/protocols/ace/INet/HTTP_Request.cpp +++ b/ACE/protocols/ace/INet/HTTP_Request.cpp @@ -9,14 +9,12 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace HTTP { - const ACE_CString Request::HTTP_GET = "GET"; const ACE_CString Request::HTTP_HEAD = "HEAD"; const ACE_CString Request::HTTP_PUT = "PUT"; diff --git a/ACE/protocols/ace/INet/HTTP_Response.cpp b/ACE/protocols/ace/INet/HTTP_Response.cpp index 25e77c5eef83b..a3f5d1309d69f 100644 --- a/ACE/protocols/ace/INet/HTTP_Response.cpp +++ b/ACE/protocols/ace/INet/HTTP_Response.cpp @@ -10,14 +10,12 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace HTTP { - const ACE_CString Response::COOKIE = "Set-Cookie"; Response::Response() diff --git a/ACE/protocols/ace/INet/HTTP_Session.cpp b/ACE/protocols/ace/INet/HTTP_Session.cpp index 77854ca1397b1..80ce9fa5106d8 100644 --- a/ACE/protocols/ace/INet/HTTP_Session.cpp +++ b/ACE/protocols/ace/INet/HTTP_Session.cpp @@ -18,7 +18,6 @@ namespace ACE { namespace HTTP { - template Session_T::Session_T (bool keep_alive) : SessionBase (URL::HTTP_PORT, keep_alive), diff --git a/ACE/protocols/ace/INet/HTTP_Session.h b/ACE/protocols/ace/INet/HTTP_Session.h index b1254a8c76ea4..784f607337389 100644 --- a/ACE/protocols/ace/INet/HTTP_Session.h +++ b/ACE/protocols/ace/INet/HTTP_Session.h @@ -45,7 +45,6 @@ namespace ACE bool attach_connection (connection_type* connection); protected: - void close_connection (); virtual bool connect_i (const ACE_Synch_Options& sync_opt); @@ -67,13 +66,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTP_Session.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTTP_Session.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HTTP_SESSION_H */ diff --git a/ACE/protocols/ace/INet/HTTP_SessionBase.cpp b/ACE/protocols/ace/INet/HTTP_SessionBase.cpp index 4040828c984ae..0248382bb0d26 100644 --- a/ACE/protocols/ace/INet/HTTP_SessionBase.cpp +++ b/ACE/protocols/ace/INet/HTTP_SessionBase.cpp @@ -20,7 +20,6 @@ namespace ACE { namespace HTTP { - SessionBase::SessionBase (u_short port, bool keep_alive) : port_ (port), reactive_ (false), diff --git a/ACE/protocols/ace/INet/HTTP_SessionBase.h b/ACE/protocols/ace/INet/HTTP_SessionBase.h index 492facfca3fe7..1b6b492c8b5a0 100644 --- a/ACE/protocols/ace/INet/HTTP_SessionBase.h +++ b/ACE/protocols/ace/INet/HTTP_SessionBase.h @@ -84,7 +84,6 @@ namespace ACE void close (); protected: - bool reconnect_needed (); void close_streams (); diff --git a/ACE/protocols/ace/INet/HTTP_Status.cpp b/ACE/protocols/ace/INet/HTTP_Status.cpp index 6fc7471d3743c..d7927115e7b48 100644 --- a/ACE/protocols/ace/INet/HTTP_Status.cpp +++ b/ACE/protocols/ace/INet/HTTP_Status.cpp @@ -7,14 +7,12 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace HTTP { - const ACE_CString Status::HTTP_REASON_CONTINUE = "Continue"; const ACE_CString Status::HTTP_REASON_SWITCHING_PROTOCOLS = "Switching Protocols"; const ACE_CString Status::HTTP_REASON_OK = "OK"; diff --git a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h index c465148b5b1b9..ca8c9889b592f 100644 --- a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h +++ b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h @@ -80,19 +80,12 @@ namespace ACE }; typedef ChunkedTransferStreamPolicyBase ChunkedTransferStreamPolicy; - } } ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTP_StreamPolicy.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTTP_StreamPolicy.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HTTP_STREAM_POLICY_H */ diff --git a/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h b/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h index a305492f59a95..5f2e1b58097d6 100644 --- a/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h +++ b/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h @@ -52,13 +52,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTP_StreamPolicyBase.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTTP_StreamPolicyBase.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HTTP_STREAM_POLICY_BASE_H */ diff --git a/ACE/protocols/ace/INet/HeaderBase.cpp b/ACE/protocols/ace/INet/HeaderBase.cpp index e944c312f438c..bbff0b8b17e89 100644 --- a/ACE/protocols/ace/INet/HeaderBase.cpp +++ b/ACE/protocols/ace/INet/HeaderBase.cpp @@ -8,14 +8,12 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace INet { - const int HeaderBase::UNKNOWN_CONTENT_LENGTH = -1; const ACE_CString HeaderBase::UNKNOWN_CONTENT_TYPE; const ACE_CString HeaderBase::CONTENT_LENGTH = "Content-Length"; @@ -62,7 +60,6 @@ namespace ACE bool HeaderBase::read(std::istream& str) { - ACE_CString name (64, '\0'); ACE_CString value (128, '\0'); int ch = str.peek (); diff --git a/ACE/protocols/ace/INet/INet.rc b/ACE/protocols/ace/INet/INet.rc new file mode 100644 index 0000000000000..dfa4476f0f7f7 --- /dev/null +++ b/ACE/protocols/ace/INet/INet.rc @@ -0,0 +1,30 @@ +#include "../../../ace/Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACE_INet\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACE_INetDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACE_INet.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/protocols/ace/INet/INet_Log.cpp b/ACE/protocols/ace/INet/INet_Log.cpp index e52a835986e42..11cc0af024bb2 100644 --- a/ACE/protocols/ace/INet/INet_Log.cpp +++ b/ACE/protocols/ace/INet/INet_Log.cpp @@ -10,7 +10,7 @@ namespace ACE { unsigned int INet_Log::debug_level_ = INet_Log::Initializer (); - unsigned int INet_Log::Initializer(void) + unsigned int INet_Log::Initializer() { unsigned int debug_level = 0; bool trace = false; diff --git a/ACE/protocols/ace/INet/INet_Log.h b/ACE/protocols/ace/INet/INet_Log.h index 5ee5c160a33de..ce5b18d5c227b 100644 --- a/ACE/protocols/ace/INet/INet_Log.h +++ b/ACE/protocols/ace/INet/INet_Log.h @@ -25,7 +25,7 @@ namespace ACE static unsigned int debug_level_; - static unsigned int Initializer (void); + static unsigned int Initializer (); }; } diff --git a/ACE/protocols/ace/INet/Request.cpp b/ACE/protocols/ace/INet/Request.cpp index 49dab2ce0125a..d59763ed197e6 100644 --- a/ACE/protocols/ace/INet/Request.cpp +++ b/ACE/protocols/ace/INet/Request.cpp @@ -1,14 +1,12 @@ #include "ace/INet/Request.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace INet { - Request::Request () {} Request::~Request () {} diff --git a/ACE/protocols/ace/INet/Request.h b/ACE/protocols/ace/INet/Request.h index 05a193438b18f..947cb71dea320 100644 --- a/ACE/protocols/ace/INet/Request.h +++ b/ACE/protocols/ace/INet/Request.h @@ -17,7 +17,6 @@ namespace ACE { namespace INet { - /** * @class ACE_INet_Request * @@ -30,7 +29,6 @@ namespace ACE Request (); virtual ~Request (); }; - } } diff --git a/ACE/protocols/ace/INet/RequestHandler.cpp b/ACE/protocols/ace/INet/RequestHandler.cpp index 2c9d0b12583e2..bce353071eed0 100644 --- a/ACE/protocols/ace/INet/RequestHandler.cpp +++ b/ACE/protocols/ace/INet/RequestHandler.cpp @@ -1,14 +1,12 @@ #include "ace/INet/RequestHandler.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace INet { - RequestHandler::RequestHandler () {} RequestHandler::~RequestHandler () {} diff --git a/ACE/protocols/ace/INet/RequestHandler.h b/ACE/protocols/ace/INet/RequestHandler.h index 06f029222f306..37dbb4aa58913 100644 --- a/ACE/protocols/ace/INet/RequestHandler.h +++ b/ACE/protocols/ace/INet/RequestHandler.h @@ -19,7 +19,6 @@ namespace ACE { namespace INet { - /** * @class ACE_INet_RequestHandler * @@ -40,7 +39,6 @@ namespace ACE virtual const Response& response () const = 0; }; - } } diff --git a/ACE/protocols/ace/INet/Response.cpp b/ACE/protocols/ace/INet/Response.cpp index 6660475afd7bb..65cbc49c7ff07 100644 --- a/ACE/protocols/ace/INet/Response.cpp +++ b/ACE/protocols/ace/INet/Response.cpp @@ -1,14 +1,12 @@ #include "ace/INet/Response.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace INet { - Response::Response () {} Response::~Response () {} diff --git a/ACE/protocols/ace/INet/Response.h b/ACE/protocols/ace/INet/Response.h index 8d7b4c063ff0f..8ddecfc40b1fb 100644 --- a/ACE/protocols/ace/INet/Response.h +++ b/ACE/protocols/ace/INet/Response.h @@ -17,7 +17,6 @@ namespace ACE { namespace INet { - /** * @class ACE_INet_Response * @@ -30,7 +29,6 @@ namespace ACE Response (); virtual ~Response (); }; - } } diff --git a/ACE/protocols/ace/INet/SSLSock_IOStream.cpp b/ACE/protocols/ace/INet/SSLSock_IOStream.cpp index 5651f4802f54f..5b39ad2e8cc20 100644 --- a/ACE/protocols/ace/INet/SSLSock_IOStream.cpp +++ b/ACE/protocols/ace/INet/SSLSock_IOStream.cpp @@ -10,7 +10,6 @@ namespace ACE { namespace IOS { - template SSLSock_StreamBufferBase::SSLSock_StreamBufferBase (stream_type* stream) : BidirStreamBuffer > ( diff --git a/ACE/protocols/ace/INet/SSLSock_IOStream.h b/ACE/protocols/ace/INet/SSLSock_IOStream.h index cec9f4f6ba98d..92d719136364b 100644 --- a/ACE/protocols/ace/INet/SSLSock_IOStream.h +++ b/ACE/protocols/ace/INet/SSLSock_IOStream.h @@ -158,19 +158,12 @@ namespace ACE typedef SSLSock_IStreamBase SSLSock_IStream; typedef SSLSock_OStreamBase SSLSock_OStream; typedef SSLSock_IOStreamBase SSLSock_IOStream; - } } ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/SSLSock_IOStream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("SSLSock_IOStream.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_SSLSOCK_IOSTREAM_H */ diff --git a/ACE/protocols/ace/INet/SSL_CallbackManager.cpp b/ACE/protocols/ace/INet/SSL_CallbackManager.cpp index 330b8e5535211..f78dab0db4bd3 100644 --- a/ACE/protocols/ace/INet/SSL_CallbackManager.cpp +++ b/ACE/protocols/ace/INet/SSL_CallbackManager.cpp @@ -16,7 +16,6 @@ namespace ACE { namespace INet { - int SSL_CallbackManager::ssl_ctx_mngr_index_ = (-2); SSL_CallbackManager::SSL_CallbackManager () diff --git a/ACE/protocols/ace/INet/SSL_CallbackManager.h b/ACE/protocols/ace/INet/SSL_CallbackManager.h index 2e58acac03e5d..c2c807809de3f 100644 --- a/ACE/protocols/ace/INet/SSL_CallbackManager.h +++ b/ACE/protocols/ace/INet/SSL_CallbackManager.h @@ -22,7 +22,7 @@ namespace ACE { namespace INet { - // NOTE: Solaris studio compilers amongst others will issue warnings if the + // NOTE: Some compilers will issue warnings if the // the correct type of function pointer (i.e. extern "C" ) is not stored/used // of the form: // Warning (Anachronism): Formal argument 1 of type diff --git a/ACE/protocols/ace/INet/SSL_CertificateCallback.cpp b/ACE/protocols/ace/INet/SSL_CertificateCallback.cpp index 36d6625ca8c36..929be0e85dbb2 100644 --- a/ACE/protocols/ace/INet/SSL_CertificateCallback.cpp +++ b/ACE/protocols/ace/INet/SSL_CertificateCallback.cpp @@ -13,7 +13,6 @@ namespace ACE { namespace INet { - SSL_CertificateCallbackArg::SSL_CertificateCallbackArg (const ACE_SSL_Context* ssl_ctx, ::X509_STORE_CTX* cert_ctx) : ssl_ctx_ (ssl_ctx), diff --git a/ACE/protocols/ace/INet/SSL_CertificateCallback.h b/ACE/protocols/ace/INet/SSL_CertificateCallback.h index 1dc8ba499d0d5..f6f49912f53c5 100644 --- a/ACE/protocols/ace/INet/SSL_CertificateCallback.h +++ b/ACE/protocols/ace/INet/SSL_CertificateCallback.h @@ -36,7 +36,7 @@ namespace ACE const ACE_SSL_Context& context () const; - SSL_X509Cert& certificate (void); + SSL_X509Cert& certificate (); int error_depth () const; diff --git a/ACE/protocols/ace/INet/SSL_CertificateCallback.inl b/ACE/protocols/ace/INet/SSL_CertificateCallback.inl index 4fb0974cb339c..6f75fd9ba0ee8 100644 --- a/ACE/protocols/ace/INet/SSL_CertificateCallback.inl +++ b/ACE/protocols/ace/INet/SSL_CertificateCallback.inl @@ -13,7 +13,7 @@ namespace ACE } ACE_INLINE - SSL_X509Cert& SSL_CertificateCallbackArg::certificate (void) + SSL_X509Cert& SSL_CertificateCallbackArg::certificate () { return this->ssl_cert_; } diff --git a/ACE/protocols/ace/INet/SSL_PasswordCallback.cpp b/ACE/protocols/ace/INet/SSL_PasswordCallback.cpp index d94a502c57f01..e918c9ed40838 100644 --- a/ACE/protocols/ace/INet/SSL_PasswordCallback.cpp +++ b/ACE/protocols/ace/INet/SSL_PasswordCallback.cpp @@ -6,7 +6,6 @@ namespace ACE { namespace INet { - SSL_PasswordCallback::SSL_PasswordCallback () { } diff --git a/ACE/protocols/ace/INet/SSL_Proxy_Connector.cpp b/ACE/protocols/ace/INet/SSL_Proxy_Connector.cpp index 0c17a4317cefd..91e42445763b2 100644 --- a/ACE/protocols/ace/INet/SSL_Proxy_Connector.cpp +++ b/ACE/protocols/ace/INet/SSL_Proxy_Connector.cpp @@ -15,7 +15,6 @@ namespace ACE { namespace INet { - SSL_Proxy_Connector::SSL_Proxy_Connector () {} SSL_Proxy_Connector::~SSL_Proxy_Connector () {} diff --git a/ACE/protocols/ace/INet/SSL_X509Cert.h b/ACE/protocols/ace/INet/SSL_X509Cert.h index db032cea7b38e..d030af4b9ce31 100644 --- a/ACE/protocols/ace/INet/SSL_X509Cert.h +++ b/ACE/protocols/ace/INet/SSL_X509Cert.h @@ -37,7 +37,7 @@ namespace ACE SSL_X509Cert& operator= (::X509* ssl_cert); SSL_X509Cert& operator= (const SSL_X509Cert& ssl_cert); - ::X509* operator & (void); + ::X509* operator & (); private: ::X509* ssl_cert_; diff --git a/ACE/protocols/ace/INet/SSL_X509Cert.inl b/ACE/protocols/ace/INet/SSL_X509Cert.inl index 9e7e11b1bcfbd..b278e35b521eb 100644 --- a/ACE/protocols/ace/INet/SSL_X509Cert.inl +++ b/ACE/protocols/ace/INet/SSL_X509Cert.inl @@ -57,7 +57,7 @@ namespace ACE } ACE_INLINE - ::X509* SSL_X509Cert::operator & (void) + ::X509* SSL_X509Cert::operator & () { return this->ssl_cert_; } diff --git a/ACE/protocols/ace/INet/Sock_IOStream.cpp b/ACE/protocols/ace/INet/Sock_IOStream.cpp index 06979f90942cb..9b09310fe441a 100644 --- a/ACE/protocols/ace/INet/Sock_IOStream.cpp +++ b/ACE/protocols/ace/INet/Sock_IOStream.cpp @@ -10,7 +10,6 @@ namespace ACE { namespace IOS { - template Sock_StreamBufferBase::Sock_StreamBufferBase (stream_type* stream) : BidirStreamBuffer > ( diff --git a/ACE/protocols/ace/INet/Sock_IOStream.h b/ACE/protocols/ace/INet/Sock_IOStream.h index 970480246bdfd..609be0fcedc56 100644 --- a/ACE/protocols/ace/INet/Sock_IOStream.h +++ b/ACE/protocols/ace/INet/Sock_IOStream.h @@ -157,19 +157,12 @@ namespace ACE typedef Sock_IStreamBase Sock_IStream; typedef Sock_OStreamBase Sock_OStream; typedef Sock_IOStreamBase Sock_IOStream; - } } ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/Sock_IOStream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Sock_IOStream.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_SOCK_IOSTREAM_H */ diff --git a/ACE/protocols/ace/INet/StreamHandler.h b/ACE/protocols/ace/INet/StreamHandler.h index 2a680d6145063..f2314122f114c 100644 --- a/ACE/protocols/ace/INet/StreamHandler.h +++ b/ACE/protocols/ace/INet/StreamHandler.h @@ -137,13 +137,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/StreamHandler.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("StreamHandler.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_STREAM_HANDLER_H */ diff --git a/ACE/protocols/ace/INet/StreamInterceptor.cpp b/ACE/protocols/ace/INet/StreamInterceptor.cpp index 205f0b5a016c1..80580ad92825c 100644 --- a/ACE/protocols/ace/INet/StreamInterceptor.cpp +++ b/ACE/protocols/ace/INet/StreamInterceptor.cpp @@ -9,7 +9,6 @@ namespace ACE { namespace IOS { - template StreamInterceptorBase::StreamInterceptorBase () { diff --git a/ACE/protocols/ace/INet/StreamInterceptor.h b/ACE/protocols/ace/INet/StreamInterceptor.h index 82368efefbdf7..1df803c1142bd 100644 --- a/ACE/protocols/ace/INet/StreamInterceptor.h +++ b/ACE/protocols/ace/INet/StreamInterceptor.h @@ -50,23 +50,16 @@ namespace ACE virtual void before_read (std::streamsize length_to_read); virtual void after_read (const char_type* buffer, int length_read); - virtual void on_eof (void); + virtual void on_eof (); }; typedef StreamInterceptorBase StreamInterceptor; - } } ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/StreamInterceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("StreamInterceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_STREAM_INTERCEPTOR_H */ diff --git a/ACE/protocols/ace/INet/String_IOStream.cpp b/ACE/protocols/ace/INet/String_IOStream.cpp index 630eb4ffe4203..5dde4c4f0989b 100644 --- a/ACE/protocols/ace/INet/String_IOStream.cpp +++ b/ACE/protocols/ace/INet/String_IOStream.cpp @@ -11,7 +11,6 @@ namespace ACE { namespace IOS { - template String_StreamBufferBase::String_StreamBufferBase (openmode mode) : BasicBufferedStreamBuffer (BUFFER_SIZE, mode), @@ -40,7 +39,6 @@ namespace ACE seekdir way, openmode which) { - if (which != this->get_mode () || which == std::ios::out) return pos_type (-1); diff --git a/ACE/protocols/ace/INet/String_IOStream.h b/ACE/protocols/ace/INet/String_IOStream.h index 2cddd9cbf1e7a..f1be7ffa2da88 100644 --- a/ACE/protocols/ace/INet/String_IOStream.h +++ b/ACE/protocols/ace/INet/String_IOStream.h @@ -155,19 +155,12 @@ namespace ACE typedef String_IOSBase CString_IOS; typedef String_OStreamBase CString_OStream; typedef String_IStreamBase CString_IStream; - } } ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/String_IOStream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("String_IOStream.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_STRING_IOSTREAM_H */ diff --git a/ACE/protocols/ace/INet/URLBase.cpp b/ACE/protocols/ace/INet/URLBase.cpp index 84244bf4b1ec5..8814eb94dadc8 100644 --- a/ACE/protocols/ace/INet/URLBase.cpp +++ b/ACE/protocols/ace/INet/URLBase.cpp @@ -16,7 +16,6 @@ namespace ACE { namespace INet { - URLStream::URLStream (const URLStream& url_stream) : request_handler_ref_ (url_stream.request_handler_ref_), request_handler_ (url_stream.request_handler_) diff --git a/ACE/protocols/ace/INet/URLBase.h b/ACE/protocols/ace/INet/URLBase.h index cf02ca18b116d..e6efb596a92c0 100644 --- a/ACE/protocols/ace/INet/URLBase.h +++ b/ACE/protocols/ace/INet/URLBase.h @@ -26,7 +26,6 @@ namespace ACE { namespace INet { - /** * @class ACE_INet_URLStream * @@ -239,7 +238,6 @@ namespace ACE static authenticator_map authenticators_; }; - } } diff --git a/ACE/protocols/ace/INet/inet.mpc b/ACE/protocols/ace/INet/inet.mpc index 3d7d8c815ca0e..e0c77ec0bc7cd 100644 --- a/ACE/protocols/ace/INet/inet.mpc +++ b/ACE/protocols/ace/INet/inet.mpc @@ -3,7 +3,6 @@ project(INet) : acelib, ace_output, install { sharedname = ACE_INet dynamicflags += ACE_INET_BUILD_DLL includes += $(ACE_ROOT)/protocols - avoids += wince avoids += old_stdstream avoids += exclude_inet avoids += ace_for_tao diff --git a/ACE/protocols/ace/RMCast/Acknowledge.cpp b/ACE/protocols/ace/RMCast/Acknowledge.cpp index a07977a6076d3..bd617f220fea1 100644 --- a/ACE/protocols/ace/RMCast/Acknowledge.cpp +++ b/ACE/protocols/ace/RMCast/Acknowledge.cpp @@ -116,7 +116,6 @@ namespace ACE_RMCast Message_ptr m (new Message); m->add (nrtm); msgs.push_back (m); - } } } diff --git a/ACE/protocols/ace/RMCast/Acknowledge.h b/ACE/protocols/ace/RMCast/Acknowledge.h index 67487e4a85f9b..1c3f968a789e0 100644 --- a/ACE/protocols/ace/RMCast/Acknowledge.h +++ b/ACE/protocols/ace/RMCast/Acknowledge.h @@ -42,10 +42,7 @@ namespace ACE_RMCast virtual void send (Message_ptr m); - // Sun C++ 5.4 can't handle private here. - // - // private: - public: + private: struct Descr { //@@ There should be no default c-tor. diff --git a/ACE/protocols/ace/RMCast/Link.cpp b/ACE/protocols/ace/RMCast/Link.cpp index b2bef9723a8e8..fb5bc709de3c3 100644 --- a/ACE/protocols/ace/RMCast/Link.cpp +++ b/ACE/protocols/ace/RMCast/Link.cpp @@ -51,7 +51,6 @@ namespace ACE_RMCast ssock_.get_option (SOL_SOCKET, SO_RCVBUF, &r, &s); //cerr << 5 << "send buffer size: " << r << endl; - } // Bind address and port. diff --git a/ACE/protocols/ace/RMCast/Protocol.h b/ACE/protocols/ace/RMCast/Protocol.h index ce36bffc407db..9bbd6ee49e7e1 100644 --- a/ACE/protocols/ace/RMCast/Protocol.h +++ b/ACE/protocols/ace/RMCast/Protocol.h @@ -750,7 +750,6 @@ namespace ACE_RMCast class NAK : public Profile { public: - static u16 const id; typedef ACE_Vector SerialNumbers; @@ -1078,7 +1077,6 @@ namespace ACE_RMCast os << sn; os << addr; os << port; - } } @@ -1262,7 +1260,6 @@ namespace ACE_RMCast u32 of_; u64 total_size_; }; - } /* diff --git a/ACE/protocols/ace/RMCast/RMCast.rc b/ACE/protocols/ace/RMCast/RMCast.rc new file mode 100644 index 0000000000000..8f7581ff3722c --- /dev/null +++ b/ACE/protocols/ace/RMCast/RMCast.rc @@ -0,0 +1,30 @@ +#include "../../../ace/Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACE_RMCast\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACE_RMCastDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACE_RMCast.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/protocols/ace/TMCast/Group.cpp b/ACE/protocols/ace/TMCast/Group.cpp index 1fa028e83622d..844a78219d6ba 100644 --- a/ACE/protocols/ace/TMCast/Group.cpp +++ b/ACE/protocols/ace/TMCast/Group.cpp @@ -181,7 +181,6 @@ namespace ACE_TMCast } else if ((data = dynamic_cast (m.get ()))) { - // INSYNC, TL, CT // Filter out loopback. diff --git a/ACE/protocols/ace/TMCast/TMCast.rc b/ACE/protocols/ace/TMCast/TMCast.rc new file mode 100644 index 0000000000000..a3c8b8f17a3b1 --- /dev/null +++ b/ACE/protocols/ace/TMCast/TMCast.rc @@ -0,0 +1,30 @@ +#include "../../../ace/Version.h" + +1 VERSIONINFO + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "ACE_TMCast\0" + VALUE "FileVersion", ACE_VERSION "\0" + VALUE "InternalName", "ACE_TMCastDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "ACE_TMCast.DLL\0" + VALUE "ProductName", "ACE\0" + VALUE "ProductVersion", ACE_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/ACE/protocols/examples/INet/FTP_Simple_exec.cpp b/ACE/protocols/examples/INet/FTP_Simple_exec.cpp index 9350edb99c062..b2db0f45abfb2 100644 --- a/ACE/protocols/examples/INet/FTP_Simple_exec.cpp +++ b/ACE/protocols/examples/INet/FTP_Simple_exec.cpp @@ -13,7 +13,7 @@ ACE_CString password; bool do_active = false; void -usage (void) +usage () { std::cout << "usage: ftp_simple_wget [options] \n"; std::cout << "Executes an FTP download request and sends the result to STDOUT or file\n"; diff --git a/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp b/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp index 0c4f2e24754b9..35abddb6b89a1 100644 --- a/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp +++ b/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp @@ -25,7 +25,7 @@ ACE_CString ca_location; #endif void -usage (void) +usage () { std::cout << "usage: http_simple_wget [options] \n"; std::cout << "Executes an HTTP GET request and sends the result to STDOUT or file\n"; diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp index 4716ef081c4d4..ade9454a8e57d 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp @@ -52,7 +52,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_OS::socket_init (ACE_WSOCK_VERSION); if (parse_args(argc, argv) != 0) diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp index d2bc3bb661a5c..5f46b6f30bc18 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp @@ -54,7 +54,7 @@ class Accept_Handler : public ACE_Event_Handler { public: Accept_Handler (ACE_SOCK_Acceptor& a); - virtual ~Accept_Handler (void); + virtual ~Accept_Handler (); virtual int handle_input (ACE_HANDLE ); private: ACE_SOCK_Acceptor& acceptor_; diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h index 67e46f054e8bb..b14823f17b0de 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h @@ -39,13 +39,7 @@ // The second #undef protects against being reset in a config.h file. #undef ACE_NDEBUG -#if defined (ACE_HAS_WINCE) -// Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. -// PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0. -# define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("\\log") -# define ACE_LOG_DIRECTORY ACE_TEXT ("\\log\\") -# define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) # define ACE_LOG_DIRECTORY ACE_TEXT ("log\\") # define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) #else @@ -53,17 +47,13 @@ # define MAKE_PIPE_NAME(X) ACE_TEXT (X) #endif /* ACE_WIN32 */ -#if defined (ACE_HAS_WINCE) -#define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".txt") -#else #define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") -#endif /* ACE_HAS_WINCE */ -#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_PHARLAP) const size_t ACE_MAX_CLIENTS = 4; #else const size_t ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_HAS_PHARLAP */ const size_t ACE_NS_MAX_ENTRIES = 1000; const size_t ACE_DEFAULT_USECS = 1000; @@ -153,17 +143,17 @@ const size_t ACE_MAX_THREADS = 4; class ACE_Test_Output { public: - ACE_Test_Output (void); - ~ACE_Test_Output (void); + ACE_Test_Output (); + ~ACE_Test_Output (); int set_output (const ACE_TCHAR *filename, int append = 0); - OFSTREAM *output_file (void); - void close (void); + OFSTREAM *output_file (); + void close (); private: OFSTREAM *output_file_; }; -inline ACE_Test_Output::ACE_Test_Output (void) +inline ACE_Test_Output::ACE_Test_Output () : output_file_ (0) { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -171,7 +161,7 @@ inline ACE_Test_Output::ACE_Test_Output (void) #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ } -inline ACE_Test_Output::~ACE_Test_Output (void) +inline ACE_Test_Output::~ACE_Test_Output () { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) ACE_LOG_MSG->msg_ostream (&cerr); @@ -186,7 +176,7 @@ inline ACE_Test_Output::~ACE_Test_Output (void) } inline OFSTREAM * -ACE_Test_Output::output_file (void) +ACE_Test_Output::output_file () { return this->output_file_; } @@ -205,11 +195,9 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; -#if !defined (ACE_HAS_WINCE) test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR")); if (test_dir == 0) -#endif /* ACE_HAS_WINCE */ test_dir = ACE_TEXT (""); ACE_OS::sprintf (temp, @@ -234,14 +222,10 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # else /* ! VXWORKS */ // This doesn't seem to work on VxWorks if the directory doesn't // exist: it creates a plain file instead of a directory. If the - // directory does exist, it causes a wierd console error message + // directory does exist, it causes a weird console error message // about "cat: input error on standard input: Is a directory". So, // VxWorks users must create the directory manually. -# if defined (ACE_HAS_WINCE) - ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR); -# else ACE_OS::mkdir (ACE_LOG_DIRECTORY); -# endif // ACE_HAS_WINCE # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -268,7 +252,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) } inline void -ACE_Test_Output::close (void) +ACE_Test_Output::close () { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) this->output_file_->flush (); diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 3e5a7e4fe5de6..7168e8acf84c6 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,6 +1,6 @@ # Set the version number here. -%define ACEVER 7.0.8 -%define TAOVER 3.0.8 +%define ACEVER 7.0.11 +%define TAOVER 3.0.11 # Conditional build # Default values are @@ -1128,13 +1128,13 @@ cat mmraw.list |\ sort -u > allhdrs.list # Add missing headers. -echo ace/QtReactor/QtReactor.h >> allhdrs.list +ls ace/*{.h,.inl,.cpp} >> allhdrs.list %if 0%{?_with_tao:1}%{?_without_tao:0} -echo TAO/tao/QtResource/QtResource_Factory.h >> allhdrs.list -echo TAO/tao/QtResource/QtResource_Loader.h >> allhdrs.list -echo TAO/tao/PortableServer/get_arg.h >> allhdrs.list -echo TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.{h,inl,cpp} >> allhdrs.list -echo TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.{h,inl,cpp} >> allhdrs.list +ls TAO/tao/*{.h,.inl,_T.cpp} >> allhdrs.list +ls TAO/tao/*/*{.h,.inl,.cpp} >> allhdrs.list +ls TAO/orbsvcs/orbsvcs/*{.idl,.h,.inl,_T.cpp} >> allhdrs.list +ls TAO/orbsvcs/orbsvcs/*/*{.h,.inl,_T.cpp} >> allhdrs.list +ls TAO/orbsvcs/orbsvcs/ESF/*.cpp >> allhdrs.list %endif # Install headers and create header lists diff --git a/ACE/rpmbuild/etc/logrotate.d/tao-cosconcurrency b/ACE/rpmbuild/etc/logrotate.d/tao-cosconcurrency index d256e1a8331b3..e290e59a572f4 100644 --- a/ACE/rpmbuild/etc/logrotate.d/tao-cosconcurrency +++ b/ACE/rpmbuild/etc/logrotate.d/tao-cosconcurrency @@ -2,5 +2,4 @@ copytruncate missingok size 1M - endscript } diff --git a/ACE/rpmbuild/etc/logrotate.d/tao-cosevent b/ACE/rpmbuild/etc/logrotate.d/tao-cosevent index f49bbd21995ea..fc5307572522f 100644 --- a/ACE/rpmbuild/etc/logrotate.d/tao-cosevent +++ b/ACE/rpmbuild/etc/logrotate.d/tao-cosevent @@ -2,5 +2,4 @@ copytruncate missingok size 1M - endscript } diff --git a/ACE/rpmbuild/etc/logrotate.d/tao-cosnaming b/ACE/rpmbuild/etc/logrotate.d/tao-cosnaming index c9458cd01bbec..556718f1ac5ca 100644 --- a/ACE/rpmbuild/etc/logrotate.d/tao-cosnaming +++ b/ACE/rpmbuild/etc/logrotate.d/tao-cosnaming @@ -2,5 +2,4 @@ copytruncate missingok size 1M - endscript } diff --git a/ACE/rpmbuild/etc/logrotate.d/tao-cosnotification b/ACE/rpmbuild/etc/logrotate.d/tao-cosnotification index bccc92eef2ca9..384226b9009ef 100644 --- a/ACE/rpmbuild/etc/logrotate.d/tao-cosnotification +++ b/ACE/rpmbuild/etc/logrotate.d/tao-cosnotification @@ -2,5 +2,4 @@ copytruncate missingok size 1M - endscript } diff --git a/ACE/rpmbuild/etc/logrotate.d/tao-costrading b/ACE/rpmbuild/etc/logrotate.d/tao-costrading index 6eb6b78c69595..3bf835e3439ee 100644 --- a/ACE/rpmbuild/etc/logrotate.d/tao-costrading +++ b/ACE/rpmbuild/etc/logrotate.d/tao-costrading @@ -2,5 +2,4 @@ copytruncate missingok size 1M - endscript } diff --git a/ACE/rpmbuild/etc/logrotate.d/tao-rtevent b/ACE/rpmbuild/etc/logrotate.d/tao-rtevent index 80d2e7b673686..a7358da6d950b 100644 --- a/ACE/rpmbuild/etc/logrotate.d/tao-rtevent +++ b/ACE/rpmbuild/etc/logrotate.d/tao-rtevent @@ -2,5 +2,4 @@ copytruncate missingok size 1M - endscript } diff --git a/ACE/tests/ACE_Init_Test.cpp b/ACE/tests/ACE_Init_Test.cpp index 4884ae930530a..62dad5f2ad636 100644 --- a/ACE/tests/ACE_Init_Test.cpp +++ b/ACE/tests/ACE_Init_Test.cpp @@ -122,7 +122,6 @@ wait_and_kill_dialog (void *pBox) ACE_OS::sleep(2); pDialog->EndModalLoop (IDOK); return 0; - } #endif /* ACE_HAS_MFC */ diff --git a/ACE/tests/ACE_Init_Test.h b/ACE/tests/ACE_Init_Test.h index 2af1f698866e2..9850939feda9c 100644 --- a/ACE/tests/ACE_Init_Test.h +++ b/ACE/tests/ACE_Init_Test.h @@ -28,7 +28,7 @@ class CACE_Init_TestApp : public CWinApp { public: - CACE_Init_TestApp (void); + CACE_Init_TestApp (); // Overrides // ClassWizard generated virtual function overrides diff --git a/ACE/tests/ARGV_Test.cpp b/ACE/tests/ARGV_Test.cpp index 4f6f90e25cfc1..64f8e106264ae 100644 --- a/ACE/tests/ARGV_Test.cpp +++ b/ACE/tests/ARGV_Test.cpp @@ -20,7 +20,6 @@ #include "test_config.h" - static void consume_arg (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/tests/Arg_Shifter_Test.cpp b/ACE/tests/Arg_Shifter_Test.cpp index 08bb29c290078..407cbdf80b2c6 100644 --- a/ACE/tests/Arg_Shifter_Test.cpp +++ b/ACE/tests/Arg_Shifter_Test.cpp @@ -15,7 +15,6 @@ #include "test_config.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Array_Map_Test.cpp b/ACE/tests/Array_Map_Test.cpp index 2e48f16b4d4f0..725814d7f3331 100644 --- a/ACE/tests/Array_Map_Test.cpp +++ b/ACE/tests/Array_Map_Test.cpp @@ -296,7 +296,7 @@ index_operator_test () const_reverse_iterator const rlast = const_phonetic.rend (); for (const_reverse_iterator r = const_phonetic.rbegin (); - !(r == rlast); // Sun C++ Forte doesn't support operator!= + (r != rlast); ++r, --letter, --word) { if ((*r).first != *letter || (*r).second != *word) @@ -336,7 +336,6 @@ index_operator_test () class RefCounted { public: - RefCounted () : refcount_ (0) { @@ -382,9 +381,7 @@ class RefCounted } private: - unsigned int * refcount_; - }; // -------- @@ -415,9 +412,6 @@ reference_count_test () std::pair result; { - // Enter a new scope block to assure destruction of temporaries - // on systems like Solaris / Sun C++. - result = map.insert (std::make_pair (ACE_TString (ACE_TEXT ("Two")), counted)); @@ -427,9 +421,6 @@ reference_count_test () ACE_TEST_ASSERT (counted.refcount () == 3); { - // Enter a new scope block to assure destruction of temporaries - // on systems like Solaris / Sun C++. - result = map.insert (std::make_pair (ACE_TString (ACE_TEXT ("Three")), counted)); diff --git a/ACE/tests/Auto_Event_Test.cpp b/ACE/tests/Auto_Event_Test.cpp index 7b7d2828a4341..dd960c7584355 100644 --- a/ACE/tests/Auto_Event_Test.cpp +++ b/ACE/tests/Auto_Event_Test.cpp @@ -22,7 +22,7 @@ #include "ace/Atomic_Op.h" // msec that times are allowed to differ before test fails. -#if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \ +#if defined (ACE_HAS_HI_RES_TIMER) || \ defined (ACE_HAS_PENTIUM) || \ defined (ACE_HAS_POWERPC_TIMER) # define ACE_ALLOWED_SLACK 100 diff --git a/ACE/tests/Auto_IncDec_Test.cpp b/ACE/tests/Auto_IncDec_Test.cpp index e075af5f71321..8022519994bd5 100644 --- a/ACE/tests/Auto_IncDec_Test.cpp +++ b/ACE/tests/Auto_IncDec_Test.cpp @@ -18,7 +18,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_THREADS) // Default number of threads. diff --git a/ACE/tests/Barrier_Test.cpp b/ACE/tests/Barrier_Test.cpp index 9f332599731e1..a79a4d1daf379 100644 --- a/ACE/tests/Barrier_Test.cpp +++ b/ACE/tests/Barrier_Test.cpp @@ -16,7 +16,6 @@ #include "ace/Thread_Manager.h" - #if defined (ACE_HAS_THREADS) struct Tester_Args diff --git a/ACE/tests/Based_Pointer_Test.cpp b/ACE/tests/Based_Pointer_Test.cpp index 875bb70d188bc..7b5f2ef37618e 100644 --- a/ACE/tests/Based_Pointer_Test.cpp +++ b/ACE/tests/Based_Pointer_Test.cpp @@ -49,7 +49,7 @@ class Void_Pointer : public ACE_Based_Pointer # define OBJ_SUFFIX ACE_DLL_SUFFIX #endif /* ACE_LD_DECORATOR_STR */ -#if defined (ACE_WIN32) || defined (ACE_OPENVMS) +#if defined (ACE_WIN32) # define OBJ_PREFIX ACE_DLL_PREFIX #else # define OBJ_PREFIX ACE_TEXT("./") ACE_DLL_PREFIX @@ -108,12 +108,7 @@ int singleton_test () -1); } -#if defined (ACE_OPENVMS) - // with OPENVMS symbol names > 31 cause us trouble with dlsym() - void* foo = dll.symbol (ACE_TEXT ("get_based_pointer_repo_inst")); -#else void* foo = dll.symbol (ACE_TEXT ("get_based_pointer_repository_instance")); -#endif // Cast the void* to function* with a long as intermediate. ptrdiff_t tmp = reinterpret_cast (foo); diff --git a/ACE/tests/Based_Pointer_Test_Lib.cpp b/ACE/tests/Based_Pointer_Test_Lib.cpp index 1b27fdead9c7e..fc0b9481c1af4 100644 --- a/ACE/tests/Based_Pointer_Test_Lib.cpp +++ b/ACE/tests/Based_Pointer_Test_Lib.cpp @@ -14,16 +14,9 @@ #include "ace/svc_export.h" #include "ace/Based_Pointer_Repository.h" -#if defined (ACE_OPENVMS) -// with OPENVMS symbol names > 31 cause us trouble with dlsym() -extern "C" ACE_Svc_Export void * -get_based_pointer_repo_inst (void) -#else -extern "C" ACE_Svc_Export void * -get_based_pointer_repository_instance (void) -#endif +extern "C" ACE_Svc_Export void *get_based_pointer_repository_instance () { - void* baddr = ACE_BASED_POINTER_REPOSITORY::instance(); - return baddr; + void* baddr = ACE_BASED_POINTER_REPOSITORY::instance(); + return baddr; } diff --git a/ACE/tests/Bound_Ptr_Test.h b/ACE/tests/Bound_Ptr_Test.h index cad392822367e..80cefeff78cb2 100644 --- a/ACE/tests/Bound_Ptr_Test.h +++ b/ACE/tests/Bound_Ptr_Test.h @@ -3,8 +3,7 @@ /** * @file Bound_Ptr_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author @author Christopher Kohlhoff */ @@ -49,7 +48,7 @@ class Scheduler : public ACE_Task friend class Method_Request_end; public: /// Constructor. - Scheduler (void); + Scheduler (); /// Initializer. virtual int open (void *args = 0); @@ -58,11 +57,11 @@ class Scheduler : public ACE_Task virtual int close (u_long flags = 0); /// Destructor. - virtual ~Scheduler (void); + virtual ~Scheduler (); // = These methods are part of the Active Object Proxy interface. void print (Printer_var &printer); - void end (void); + void end (); protected: /// Runs the Scheduler's event loop, which dequeues diff --git a/ACE/tests/Buffer_Stream_Test.cpp b/ACE/tests/Buffer_Stream_Test.cpp index 254a60aa11de3..798f61f5e0084 100644 --- a/ACE/tests/Buffer_Stream_Test.cpp +++ b/ACE/tests/Buffer_Stream_Test.cpp @@ -23,7 +23,6 @@ #include "ace/OS_NS_time.h" - #if defined (ACE_HAS_THREADS) static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; @@ -80,7 +79,6 @@ class Consumer : public Common_Task /// Receive message from Supplier and print to stdout. int svc () override; private: - /// Amount of time to wait for a timeout. ACE_Time_Value timeout_; }; diff --git a/ACE/tests/Bug_2540_Regression_Test.cpp b/ACE/tests/Bug_2540_Regression_Test.cpp index 6d624def92687..9812966170307 100644 --- a/ACE/tests/Bug_2540_Regression_Test.cpp +++ b/ACE/tests/Bug_2540_Regression_Test.cpp @@ -178,7 +178,6 @@ ACE_HANDLE Handler::get_handle() const int Handler::handle_input(ACE_HANDLE /* h */) { - ++handle_input_count_; // ACE_DEBUG((LM_DEBUG, "Handler::handle_input called for %d\n", h)); diff --git a/ACE/tests/Bug_2653_Regression_Test.cpp b/ACE/tests/Bug_2653_Regression_Test.cpp index bd33cc00d3ec6..e6e971506b55a 100644 --- a/ACE/tests/Bug_2653_Regression_Test.cpp +++ b/ACE/tests/Bug_2653_Regression_Test.cpp @@ -24,7 +24,6 @@ #include "ace/OS_NS_unistd.h" - static const char *message = "Hello there! Hope you get this message"; diff --git a/ACE/tests/Bug_2659_Regression_Test.cpp b/ACE/tests/Bug_2659_Regression_Test.cpp index f393e7626ddd1..f5ae94fa881dd 100644 --- a/ACE/tests/Bug_2659_Regression_Test.cpp +++ b/ACE/tests/Bug_2659_Regression_Test.cpp @@ -67,7 +67,6 @@ class EntryExit #endif // if defined RUN_DEBUG - static void handle_signal (int ) { @@ -79,7 +78,6 @@ handle_signal (int ) class ReactorTask : public ACE_Task_Base { public: - ~ReactorTask () override { EE_DEBUG ("ReactorTask", "~ReactorTask", this); diff --git a/ACE/tests/Bug_2980_Regression_Dll.cpp b/ACE/tests/Bug_2980_Regression_Dll.cpp index ecab20be41be9..0aaa591c17530 100644 --- a/ACE/tests/Bug_2980_Regression_Dll.cpp +++ b/ACE/tests/Bug_2980_Regression_Dll.cpp @@ -4,8 +4,7 @@ extern "C" { - -ACE_Proper_Export_Flag int capi_init(void) +ACE_Proper_Export_Flag int capi_init() { int ret = ACE::init(); ACE_START_TEST (ACE_TEXT ("Bug_2980_Regression_Test")); @@ -16,7 +15,7 @@ ACE_Proper_Export_Flag int capi_init(void) } -ACE_Proper_Export_Flag int capi_fini(void) +ACE_Proper_Export_Flag int capi_fini() { ACE_START_TEST (ACE_TEXT ("Bug_2980_Regression_Test")); ACE_DEBUG ((LM_INFO, @@ -27,7 +26,7 @@ ACE_Proper_Export_Flag int capi_fini(void) } -ACE_Proper_Export_Flag int capi_dosomething(void) +ACE_Proper_Export_Flag int capi_dosomething() { ACE_START_TEST (ACE_TEXT ("Bug_2980_Regression_Test")); diff --git a/ACE/tests/Bug_3334_Regression_Test.cpp b/ACE/tests/Bug_3334_Regression_Test.cpp index 9f129fb08de13..4631ead5bb708 100644 --- a/ACE/tests/Bug_3334_Regression_Test.cpp +++ b/ACE/tests/Bug_3334_Regression_Test.cpp @@ -18,7 +18,6 @@ #include "ace/Service_Config.h" - int run_main (int, ACE_TCHAR *argv[]) { diff --git a/ACE/tests/Bug_3432_Regression_Test.cpp b/ACE/tests/Bug_3432_Regression_Test.cpp index c56d92c5ae7af..e0ff5a8c9cb82 100644 --- a/ACE/tests/Bug_3432_Regression_Test.cpp +++ b/ACE/tests/Bug_3432_Regression_Test.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_time.h" - int strptime_test () { diff --git a/ACE/tests/Bug_3505_Regression_Test.cpp b/ACE/tests/Bug_3505_Regression_Test.cpp index 1f3fc5d39e908..291fd895f660e 100644 --- a/ACE/tests/Bug_3505_Regression_Test.cpp +++ b/ACE/tests/Bug_3505_Regression_Test.cpp @@ -14,8 +14,6 @@ #include "ace/Service_Gestalt.h" #include "test_config.h" - - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Bug_3541_Regression_Test.cpp b/ACE/tests/Bug_3541_Regression_Test.cpp index 8fb700a7d34dc..302ade29a3bac 100644 --- a/ACE/tests/Bug_3541_Regression_Test.cpp +++ b/ACE/tests/Bug_3541_Regression_Test.cpp @@ -21,7 +21,7 @@ run_main (int, ACE_TCHAR *[]) int ret = 0; -#if defined(ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) +#if defined(ACE_WIN32) int lastError; // ACE_OS::event_init() diff --git a/ACE/tests/Bug_3710_Regression_Test.cpp b/ACE/tests/Bug_3710_Regression_Test.cpp index 82451b7d526ab..d61b05770cde8 100644 --- a/ACE/tests/Bug_3710_Regression_Test.cpp +++ b/ACE/tests/Bug_3710_Regression_Test.cpp @@ -12,7 +12,6 @@ #include "ace/OS_Memory.h" - // Main function. int diff --git a/ACE/tests/Bug_3911_Regression_Test.cpp b/ACE/tests/Bug_3911_Regression_Test.cpp index 39657681b563a..55a98040cd0a6 100644 --- a/ACE/tests/Bug_3911_Regression_Test.cpp +++ b/ACE/tests/Bug_3911_Regression_Test.cpp @@ -20,14 +20,7 @@ init_test () { // Cleanup the MMAP file so we won't trip over the leftover mmap // file from the previous crash. -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (ACE_DEFAULT_BASE_ADDR); -#endif /* ACE_HAS_WINCE */ //FUZZ: disable check_for_lack_ACE_OS ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options); //FUZZ: enable check_for_lack_ACE_OS @@ -135,7 +128,6 @@ class ShmemMan return shared; }; - }; ShmemMan* ShmemMan::c_instance = 0; diff --git a/ACE/tests/Bug_3912_Regression_Test.cpp b/ACE/tests/Bug_3912_Regression_Test.cpp index c1c9fe0a321a3..ea997da539e02 100644 --- a/ACE/tests/Bug_3912_Regression_Test.cpp +++ b/ACE/tests/Bug_3912_Regression_Test.cpp @@ -31,7 +31,6 @@ using MT_Module = ACE_Module; class Close_Handler : public virtual MT_Task { public: - Close_Handler(bool* close_called_arg) : close_called_ (close_called_arg) { diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index 8fdf4a0f98b7b..25d9e48e46d83 100644 --- a/ACE/tests/Bug_3943_Regression_Test.cpp +++ b/ACE/tests/Bug_3943_Regression_Test.cpp @@ -67,7 +67,6 @@ #define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable namespace { - const char FINISHED_CHAR = '%'; const char RESTART_CHAR = '&'; const char START_CHAR = '0'; @@ -96,7 +95,6 @@ namespace { const DWORD minorVersion, const BYTE productType) { -#if !defined(ACE_HAS_WINCE) OSVERSIONINFOEX versioninfo; versioninfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX); versioninfo.dwMajorVersion = majorVersion; @@ -171,27 +169,19 @@ namespace { } return 0; -#else // defined(ACE_HAS_WINCE) - // no version testing of WinCE has been performed - ACE_UNUSED_ARG (majorVersion); - ACE_UNUSED_ARG (minorVersion); - ACE_UNUSED_ARG (productType); - return -1; -#endif /* ACE_HAS_WINCE */ } #endif /* ACE_WIN32 */ int processENOBUFS() { -#if defined (ACE_WIN32) && !defined(ACE_HAS_WINCE) +#if defined (ACE_WIN32) // it has been identified that Windows7 does not have the ENOBUFS issue // but testing has not been performed on Server 2008 or Vista to identify - // wether the issue exists or not + // whether the issue exists or not return beforeVersion(6, 1, VER_NT_WORKSTATION); -#else // defined(ACE_HAS_WINCE) - // currently, no versions of WINCE identified to not have the ENOBUFS error +#else return 0; -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } struct IovecGuard @@ -206,31 +196,27 @@ namespace { static const int ALL_SLOTS = -1; }; + /* + * This class is the product created by both ACE_Connector + * and ACE_Acceptor objects. + */ class Svc_Handler : public ACE_Svc_Handler { - // = TITLE - // This class is the product created by both - // and objects. - // - // = DESCRIPTION - // This class gets its own header file to work around AIX C++ - // compiler "features" related to template instantiation... It is - // only used by Conn_Test.cpp. public: - Svc_Handler (ACE_Thread_Manager * = 0); // Do-nothing constructor. + Svc_Handler (ACE_Thread_Manager * = nullptr); - int open (void *) override; // Initialization hook. + int open (void *) override; - void send_data (); // Send data to server. + void send_data (); - void recv_data (); // Recv data from client. + void recv_data (); - int close (u_long = 0) override; // Shutdown the . + int close (u_long = 0) override; private: enum Direction { READX, WRITEX }; // VxWorks defines READ and WRITE @@ -244,7 +230,6 @@ namespace { ssize_t send (char send_char, const ACE_TCHAR * const send_desc); const ACE_Time_Value DEFAULT_TIME_VALUE; - }; } // namespace "" @@ -974,7 +959,6 @@ client (void *arg) { // Send the data to the server. svc_handler->send_data (); - } return 0; } diff --git a/ACE/tests/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp index a051dcfa37937..9b68d8a099153 100644 --- a/ACE/tests/CDR_Array_Test.cpp +++ b/ACE/tests/CDR_Array_Test.cpp @@ -48,7 +48,6 @@ #endif - // Default number of elements for check buffer, for each tested CDR type. // Be aware that time will be affected by the buffer fitting/not fitting // in the cache (ie, if default_total*sizeof(T) bytes fit in the cache). @@ -233,7 +232,6 @@ CDR_Test::CDR_Test (int total, int niter, int use_array) CDR_Test::do_test(tdelta, niter, 1, srcbuf, dstbuf, sk, dk); - } } } diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp index 62be7259803c7..40ccca78f0090 100644 --- a/ACE/tests/CDR_File_Test.cpp +++ b/ACE/tests/CDR_File_Test.cpp @@ -33,7 +33,6 @@ */ class CDR_Test { - /// Output the state of a object to the . friend ostream& operator << (ostream &os, const CDR_Test &t); @@ -71,32 +70,6 @@ ostream & operator << (ostream &os, const CDR_Test &t) { -#if defined (ACE_OPENVMS) - // to circumvent some obscure bug with OpenVMS iostreams digit conversions - // combined with shared libraries???? - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n" - "Char: %c\n" - "Short: %u\n" - "Long: %d\n"), - t.char_, - t.word2_, - t.word4_)); - - ACE_CDR::ULongLong hi = (t.word8_ >> 32); - ACE_CDR::ULongLong lo = (t.word8_ & 0xffffffff); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n" - "ULongLong 1st half: %x\n" - "ULongLong 2nd half: %x\n" - "Float: %f\n" - "Double: %f\n"), - ACE_Utils::truncate_cast (hi), - ACE_Utils::truncate_cast (lo), - t.fpoint_, - t.dprec_)); -#else os << "Char: " << t.char_ << endl << "Short: " << t.word2_ << endl << "Long: " << t.word4_ << endl; @@ -114,7 +87,6 @@ operator << (ostream &os, << dec << endl << "Float: " << t.fpoint_ << endl << "Double: " << t.dprec_ << endl; -#endif return os; } diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp index fa140dc5c65db..c9fcf68dcf2ae 100644 --- a/ACE/tests/CDR_Test.cpp +++ b/ACE/tests/CDR_Test.cpp @@ -22,7 +22,6 @@ #include "ace/OS_NS_wchar.h" - static int n = 4096; static int nloops = 100; diff --git a/ACE/tests/Cache_Map_Manager_Test.h b/ACE/tests/Cache_Map_Manager_Test.h index 24cf916479a96..31b2569f23e9c 100644 --- a/ACE/tests/Cache_Map_Manager_Test.h +++ b/ACE/tests/Cache_Map_Manager_Test.h @@ -4,8 +4,7 @@ /** * @file Cache_Map_Manager_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kirthika Parameswaran */ diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp index 960816e3402ff..71c07ca733c76 100644 --- a/ACE/tests/Cached_Accept_Conn_Test.cpp +++ b/ACE/tests/Cached_Accept_Conn_Test.cpp @@ -30,18 +30,7 @@ #pragma warning(disable:4503) #endif /* _MSC_VER */ -// Note: To keep both sunCC5.0 without debugging symbols and gcc2.7.3 -// happy, it was necessary to have the definitions of the methods of -// the Accept_Strategy before the instantiations. - -// HPUX doesn't accept these declaration after their usage. - -// For some strange reason this must *not* be static since otherwise -// certain versions of SunC++ will not link properly. int connection_accepted = 0; - -// For some strange reason this must *not* be static since otherwise -// certain versions of SunC++ will not link properly. int debug = 0; template diff --git a/ACE/tests/Cached_Accept_Conn_Test.h b/ACE/tests/Cached_Accept_Conn_Test.h index 28f8d089211c2..def161547ec4f 100644 --- a/ACE/tests/Cached_Accept_Conn_Test.h +++ b/ACE/tests/Cached_Accept_Conn_Test.h @@ -3,8 +3,7 @@ /** * @file Cached_Accept_Conn_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kirthika Parameswaran */ @@ -28,7 +27,6 @@ class Client_Svc_Handler : public ACE_Svc_Handler { public: - Client_Svc_Handler (ACE_Thread_Manager *t = 0); int open (void *v = 0); int close (u_long flags = 0); @@ -37,7 +35,6 @@ class Client_Svc_Handler : public ACE_Svc_Handler { public: - Server_Svc_Handler (ACE_Thread_Manager *t = 0); int open (void *v = 0); }; @@ -101,7 +98,6 @@ template class Accept_Strategy : public ACE_Accept_Strategy { public: - /// Constructor. Accept_Strategy (CACHED_CONNECT_STRATEGY &caching_connect_strategy); @@ -122,11 +118,10 @@ class Accept_Strategy : public ACE_Accept_Strategy ACCEPT_STRATEGY_BASE; /// Handler for removing cached connections. - int out_of_sockets_handler (void); + int out_of_sockets_handler (); CACHED_CONNECT_STRATEGY &caching_connect_strategy_; }; diff --git a/ACE/tests/Cached_Allocator_Test.cpp b/ACE/tests/Cached_Allocator_Test.cpp index d954c2980cd9c..0012f88c57f39 100644 --- a/ACE/tests/Cached_Allocator_Test.cpp +++ b/ACE/tests/Cached_Allocator_Test.cpp @@ -16,7 +16,6 @@ #include "ace/High_Res_Timer.h" - #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" @@ -76,7 +75,6 @@ using STATIC_ALLOCATOR = ACE_Cached_Allocator; using ACE_ADDR = ARHR; diff --git a/ACE/tests/Cached_Conn_Test.h b/ACE/tests/Cached_Conn_Test.h index 09a9da0169c8c..4ca36cd919c42 100644 --- a/ACE/tests/Cached_Conn_Test.h +++ b/ACE/tests/Cached_Conn_Test.h @@ -3,8 +3,7 @@ /** * @file Cached_Conn_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kirthika Parameswaran */ @@ -20,7 +19,6 @@ class Svc_Handler : public ACE_Svc_Handler { public: - Svc_Handler (ACE_Thread_Manager *t = 0); int open (void *v = 0); int close (u_long flags = 0); diff --git a/ACE/tests/Chrono_Test.cpp b/ACE/tests/Chrono_Test.cpp index 1c9e86c685778..7a09b1d9a99d9 100644 --- a/ACE/tests/Chrono_Test.cpp +++ b/ACE/tests/Chrono_Test.cpp @@ -289,7 +289,6 @@ test_streamers () } - ACE_Time_Value const test_sec {12, 132}; // Seconds s << test_sec; diff --git a/ACE/tests/Codecs_Test.cpp b/ACE/tests/Codecs_Test.cpp index c851b26c08e23..24b65cb9c9ff9 100644 --- a/ACE/tests/Codecs_Test.cpp +++ b/ACE/tests/Codecs_Test.cpp @@ -16,7 +16,6 @@ #include "ace/ACE.h" - // Don't change the strings thinking that they are typos const ACE_Byte normal_stream[] = "This is a sample test stream, to test simple Base64 encoding"; diff --git a/ACE/tests/Collection_Test.h b/ACE/tests/Collection_Test.h index b8f4c1cd76ede..176fa491e51dc 100644 --- a/ACE/tests/Collection_Test.h +++ b/ACE/tests/Collection_Test.h @@ -5,8 +5,7 @@ /** * @file Collection_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Irfan Pyarali */ diff --git a/ACE/tests/Compiler_Features_01_Test.cpp b/ACE/tests/Compiler_Features_01_Test.cpp index ecf26f1b251da..75d5b7e5421c8 100644 --- a/ACE/tests/Compiler_Features_01_Test.cpp +++ b/ACE/tests/Compiler_Features_01_Test.cpp @@ -16,7 +16,6 @@ #include - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Compiler_Features_09_Test.cpp b/ACE/tests/Compiler_Features_09_Test.cpp index c765724237a4d..28e0be3cdc101 100644 --- a/ACE/tests/Compiler_Features_09_Test.cpp +++ b/ACE/tests/Compiler_Features_09_Test.cpp @@ -71,10 +71,6 @@ run_main (int, ACE_TCHAR *[]) // ... with a compliant implementation of std::auto_ptr<> you should be // able to write: // x = y; - // but the Solaris compiler was broken as of August, 2009!! So you have - // to work around in the following way. This compiler is important - // enough for the ACE community, so we have to support this broken - // configuration ... x.reset(y.release()); // ... there should be just one destruction so far ... diff --git a/ACE/tests/Compiler_Features_10_Test.cpp b/ACE/tests/Compiler_Features_10_Test.cpp index 5c5ed2a6b60b9..4621bc62f5eee 100644 --- a/ACE/tests/Compiler_Features_10_Test.cpp +++ b/ACE/tests/Compiler_Features_10_Test.cpp @@ -125,7 +125,6 @@ namespace } - int run_main (int, ACE_TCHAR *[]) { @@ -201,7 +200,6 @@ run_main (int, ACE_TCHAR *[]) namespace { - void check_constructor_count(int expected, char const * filename, diff --git a/ACE/tests/Compiler_Features_22_DLL.h b/ACE/tests/Compiler_Features_22_DLL.h index a7dd73aff6b22..a45101a21076c 100644 --- a/ACE/tests/Compiler_Features_22_DLL.h +++ b/ACE/tests/Compiler_Features_22_DLL.h @@ -19,7 +19,6 @@ class A { public: - A () {}; }; diff --git a/ACE/tests/Config_Test.cpp b/ACE/tests/Config_Test.cpp index 31eda47e3e18e..e16932db307e5 100644 --- a/ACE/tests/Config_Test.cpp +++ b/ACE/tests/Config_Test.cpp @@ -780,7 +780,6 @@ Config_Test::testEquality () ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Cannot open heap1\n")), -1); - } else if ((heap2.open ()) != 0) { @@ -1077,7 +1076,6 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) else // if the type is invalid, then go ahead and fail it. rc = false; - }// end if the original type was not a string. else { @@ -1097,11 +1095,9 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) // before we move on remove this value from the original. original.remove_value (originalSection, valueName.c_str ()); - }// end else if values match. valueIndex++; - }// end value while loop // at this point the original should have no values. look @@ -1116,7 +1112,6 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) // having a value indicates a mismatch rc = valueIndex == 0; - }// end else if sections match. if (rc) @@ -1126,7 +1121,6 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) 0); // do not remove subsections. ++sectionIndex; - }// end section while loop // Finally, if the original has any sections, then we're not equal diff --git a/ACE/tests/Config_Test.h b/ACE/tests/Config_Test.h index b950133860811..d125defbdf8a5 100644 --- a/ACE/tests/Config_Test.h +++ b/ACE/tests/Config_Test.h @@ -21,8 +21,8 @@ const int TEST_MAX_STRING = 256; class Config_Test { public: - Config_Test (void): equality_tested_ (0) { } - ~Config_Test (void) { } + Config_Test () : equality_tested_ (0) { } + ~Config_Test () { } // Used to test the equality and inequality operations. int testEquality (); diff --git a/ACE/tests/Conn_Test.cpp b/ACE/tests/Conn_Test.cpp index 4986926a2a06c..c44c607df256b 100644 --- a/ACE/tests/Conn_Test.cpp +++ b/ACE/tests/Conn_Test.cpp @@ -36,7 +36,6 @@ #include "ace/os_include/os_netdb.h" - static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; // This test doesn't work well using fork() on MacOS X. So we diff --git a/ACE/tests/Conn_Test.h b/ACE/tests/Conn_Test.h index af8708263808a..49531fb56038c 100644 --- a/ACE/tests/Conn_Test.h +++ b/ACE/tests/Conn_Test.h @@ -4,9 +4,6 @@ /** * @file Conn_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. - * * @author Irfan Pyarali */ //============================================================================= @@ -27,10 +24,6 @@ * * @brief This class is the product created by both * and objects. - * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Conn_Test.cpp. */ class Svc_Handler : public ACE_Svc_Handler { @@ -45,10 +38,10 @@ class Svc_Handler : public ACE_Svc_Handler virtual int recycle (void * = 0); /// Send data to server. - void send_data (void); + void send_data (); /// Recv data from client. - void recv_data (void); + void recv_data (); /// Shutdown the . int close (u_long = 0); diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp index 7e43c6267f8df..6539deccb62fd 100644 --- a/ACE/tests/DLL_Test.cpp +++ b/ACE/tests/DLL_Test.cpp @@ -26,7 +26,7 @@ # define OBJ_SUFFIX ACE_DLL_SUFFIX #endif /* ACE_LD_DECORATOR_STR */ -#if defined (ACE_WIN32) || defined (ACE_OPENVMS) +#if defined (ACE_WIN32) # define OBJ_PREFIX ACE_DLL_PREFIX #else # define OBJ_PREFIX ACE_TEXT("./") ACE_DLL_PREFIX diff --git a/ACE/tests/DLL_Test_Impl.cpp b/ACE/tests/DLL_Test_Impl.cpp index 23f503e3491f9..3a6ae2e428da0 100644 --- a/ACE/tests/DLL_Test_Impl.cpp +++ b/ACE/tests/DLL_Test_Impl.cpp @@ -62,7 +62,7 @@ Hello_Impl::operator new (size_t bytes, const std::nothrow_t &nt) } void -Hello_Impl::operator delete (void *ptr, const std::nothrow_t&) throw () +Hello_Impl::operator delete (void *ptr, const std::nothrow_t&) noexcept { ACE_DEBUG ((LM_INFO, "Hello_Impl::delete\n")); ::delete [] static_cast (ptr); diff --git a/ACE/tests/DLL_Test_Impl.h b/ACE/tests/DLL_Test_Impl.h index 8c3633e4f90d0..acfcb76fa679d 100644 --- a/ACE/tests/DLL_Test_Impl.h +++ b/ACE/tests/DLL_Test_Impl.h @@ -52,7 +52,7 @@ class Hello_Impl : public Hello /// Overloaded new operator, nothrow_t variant. void *operator new (size_t bytes, const std::nothrow_t &nt); - void operator delete (void *p, const std::nothrow_t&) throw (); + void operator delete (void *p, const std::nothrow_t&) noexcept; void operator delete (void *ptr); }; diff --git a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp index f33a16646cd85..b634d93a08148 100644 --- a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp @@ -37,7 +37,6 @@ using SVC_HANDLER = ACE_Svc_Handler; class Client : public SVC_HANDLER { public: - Client (); //FUZZ: disable check_for_lack_ACE_OS @@ -65,7 +64,6 @@ class Client : public SVC_HANDLER class Server : public SVC_HANDLER { public: - Server (); int handle_input (ACE_HANDLE handle) override; @@ -369,7 +367,6 @@ using CONNECTOR = ACE_Connector; class TestAcceptor : public ACCEPTOR { public: - int accept_svc_handler (Server * handler) override { int result = this->ACCEPTOR::accept_svc_handler (handler); @@ -391,7 +388,6 @@ class TestAcceptor : public ACCEPTOR return result; } - }; // ---------------------------------------------------- @@ -399,7 +395,6 @@ class TestAcceptor : public ACCEPTOR class TestConnector : public CONNECTOR { public: - int connect_svc_handler ( CONNECTOR::handler_type *& handler, const CONNECTOR::addr_type &remote_addr, diff --git a/ACE/tests/Dev_Poll_Reactor_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Test.cpp index 14cfa9e27e8e0..8dffa050bf385 100644 --- a/ACE/tests/Dev_Poll_Reactor_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Test.cpp @@ -43,7 +43,6 @@ using SVC_HANDLER = ACE_Svc_Handler; class Client : public SVC_HANDLER { public: - Client (); //FUZZ: disable check_for_lack_ACE_OS @@ -59,16 +58,13 @@ class Client : public SVC_HANDLER ACE_Reactor_Mask mask) override; private: - unsigned int call_count_; - }; class Server : public SVC_HANDLER { public: - Server (); int handle_input (ACE_HANDLE handle) override; @@ -80,9 +76,7 @@ class Server : public SVC_HANDLER ACE_Reactor_Mask mask) override; private: - unsigned int call_count_; - }; // ---------------------------------------------------- @@ -230,7 +224,6 @@ Server::handle_input (ACE_HANDLE /* handle */) { if (errno == EWOULDBLOCK) { - // ACE_HEX_DUMP ((LM_DEBUG, // buf, // 80, @@ -318,7 +311,6 @@ using CONNECTOR = ACE_Connector; class TestAcceptor : public ACCEPTOR { public: - int accept_svc_handler (Server * handler) override { int result = this->ACCEPTOR::accept_svc_handler (handler); @@ -360,7 +352,6 @@ class TestAcceptor : public ACCEPTOR return result; } - }; // ---------------------------------------------------- @@ -368,7 +359,6 @@ class TestAcceptor : public ACCEPTOR class TestConnector : public CONNECTOR { public: - int connect_svc_handler ( CONNECTOR::handler_type *& handler, const CONNECTOR::addr_type &remote_addr, diff --git a/ACE/tests/Dirent_Test.cpp b/ACE/tests/Dirent_Test.cpp index 118675e37303d..f38fd33beaecf 100644 --- a/ACE/tests/Dirent_Test.cpp +++ b/ACE/tests/Dirent_Test.cpp @@ -39,7 +39,6 @@ static const int RECURSION_INDENT = 3; static int entrycount = 0; extern "C" { - static int selector (const ACE_DIRENT *d) { diff --git a/ACE/tests/Dynamic_Priority_Test.cpp b/ACE/tests/Dynamic_Priority_Test.cpp index 136e29f0e44c9..0d2ec3ff127cc 100644 --- a/ACE/tests/Dynamic_Priority_Test.cpp +++ b/ACE/tests/Dynamic_Priority_Test.cpp @@ -52,7 +52,6 @@ #endif /* VXWORKS */ - #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) enum Test_Type {BEST, WORST, RANDOM}; @@ -64,7 +63,6 @@ enum Test_Type {BEST, WORST, RANDOM}; class ArgStruct { public: - /// message queue to test ACE_Message_Queue *queue_; @@ -683,7 +681,6 @@ run_performance_test (u_int min_load, // Free the allocated pointer array. delete [] supplier_args.array_; - } // Free resources and leave. @@ -700,7 +697,7 @@ run_main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("Dynamic_Priority_Test")); #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params ( ACE_Sched_Params ( ACE_SCHED_FIFO, diff --git a/ACE/tests/Dynamic_Test.cpp b/ACE/tests/Dynamic_Test.cpp index 958ac6fa10ef5..305e8af518c07 100644 --- a/ACE/tests/Dynamic_Test.cpp +++ b/ACE/tests/Dynamic_Test.cpp @@ -16,7 +16,6 @@ #include "ace/OS_Memory.h" - class A { public: @@ -24,8 +23,8 @@ class A void *operator new (size_t n); - void *operator new (size_t n, const std::nothrow_t&) throw(); - void operator delete (void *p, const std::nothrow_t&) throw (); + void *operator new (size_t n, const std::nothrow_t&) noexcept; + void operator delete (void *p, const std::nothrow_t&) noexcept; void * operator new (size_t n, void *p); void operator delete (void *); @@ -61,7 +60,7 @@ A::operator new (size_t n) } void* -A::operator new (size_t n, const std::nothrow_t&) throw() +A::operator new (size_t n, const std::nothrow_t&) noexcept { ACE_Dynamic *const dynamic_instance = ACE_Dynamic::instance (); @@ -85,7 +84,7 @@ A::operator new (size_t n, const std::nothrow_t&) throw() } void -A::operator delete (void *p, const std::nothrow_t&) throw() +A::operator delete (void *p, const std::nothrow_t&) noexcept { ::delete [] static_cast (p); } diff --git a/ACE/tests/FIFO_Test.cpp b/ACE/tests/FIFO_Test.cpp index c5f665a4fdc38..7a2648516c6d7 100644 --- a/ACE/tests/FIFO_Test.cpp +++ b/ACE/tests/FIFO_Test.cpp @@ -104,15 +104,8 @@ server (void *arg) ACE_TEXT ("select")), 0); - // On AIX, select() always seems to select a fifo handle as a normal file, - // always readable. Just wait a second... -# if defined (AIX) || defined (HPUX) || defined (__osf__) - ACE_OS::sleep (1); -# endif /* AIX || HPUX */ - // Read the things the client is sending; alphabet, huge overflow, then // alphabet. - char buf[BUFSIZ]; ssize_t recv_count; ssize_t expect = static_cast (ACE_OS::strlen (ACE_ALPHABET)); diff --git a/ACE/tests/FlReactor_Test.cpp b/ACE/tests/FlReactor_Test.cpp index 834345bb9636e..06df42125ff3a 100644 --- a/ACE/tests/FlReactor_Test.cpp +++ b/ACE/tests/FlReactor_Test.cpp @@ -20,7 +20,6 @@ - #include "ace/FlReactor/FlReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" @@ -47,11 +46,11 @@ class Test_Window : public Fl_Gl_Window int sides () const; void sides (int s); - void incr_sides (void); + void incr_sides (); private: /// from the Fl_Gl_Window... - virtual void draw (void); + virtual void draw (); int sides_; }; @@ -78,7 +77,7 @@ Test_Window::sides (int s) } void -Test_Window::incr_sides (void) +Test_Window::incr_sides () { this->sides_++; if (this->sides_ > 10) @@ -87,7 +86,7 @@ Test_Window::incr_sides (void) } void -Test_Window::draw (void) +Test_Window::draw () { // the valid() property may be used to avoid reinitializing your // GL transformation for each redraw: diff --git a/ACE/tests/Framework_Component_DLL.h b/ACE/tests/Framework_Component_DLL.h index 91deea999cb24..f99bbce477735 100644 --- a/ACE/tests/Framework_Component_DLL.h +++ b/ACE/tests/Framework_Component_DLL.h @@ -3,8 +3,7 @@ /** * @file Framework_Component_DLL.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Don Hinton */ diff --git a/ACE/tests/Framework_Component_Test.h b/ACE/tests/Framework_Component_Test.h index 92b5202d49f39..2b8fd75d3e1a1 100644 --- a/ACE/tests/Framework_Component_Test.h +++ b/ACE/tests/Framework_Component_Test.h @@ -3,8 +3,7 @@ /** * @file Framework_Component_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Don Hinton */ @@ -20,11 +19,11 @@ class Simple_Service { public: - Simple_Service (void) + Simple_Service () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Service::Simple_Service\n"))); } - virtual ~Simple_Service (void) + virtual ~Simple_Service () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Service::~Simple_Service\n"))); } diff --git a/ACE/tests/Get_Opt_Test.cpp b/ACE/tests/Get_Opt_Test.cpp index 7ba700aa89c52..6395c0a1f2ef8 100644 --- a/ACE/tests/Get_Opt_Test.cpp +++ b/ACE/tests/Get_Opt_Test.cpp @@ -20,7 +20,6 @@ #include "test_config.h" - /* * This is the heart of the test. It sets up the optstring, instantiates * ACE_Get_Opt, add long options, processes them in a loop, and prints out diff --git a/ACE/tests/Hash_Map_Manager_Test.cpp b/ACE/tests/Hash_Map_Manager_Test.cpp index 034c73e80bab5..f03a5b3f7d518 100644 --- a/ACE/tests/Hash_Map_Manager_Test.cpp +++ b/ACE/tests/Hash_Map_Manager_Test.cpp @@ -20,7 +20,6 @@ #include "ace/Null_Mutex.h" - static const size_t STRING_TABLE_ENTRIES = 3 * 2; static const size_t MAX_HASH = 6; diff --git a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp index 144befd426bf5..3c687bc65b08d 100644 --- a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp +++ b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp @@ -16,7 +16,6 @@ #include "ace/Null_Mutex.h" - using HASH_STRING_MAP = ACE_Hash_Multi_Map_Manager, ACE_Equal_To, ACE_Null_Mutex>; using HASH_STRING_ENTRY = HASH_STRING_MAP::ENTRY; diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp index ff1b5f8fe6e97..2a7e69a51bf91 100644 --- a/ACE/tests/INET_Addr_Test.cpp +++ b/ACE/tests/INET_Addr_Test.cpp @@ -248,11 +248,6 @@ int run_main (int, ACE_TCHAR *[]) static_cast (addr_port.get_addr()); const struct sockaddr_in6 *check_in6 = static_cast (check.get_addr()); -# if defined(AIX) - - ACE_ERROR((LM_ERROR, ACE_TEXT (" addr_port_in6->sin6_len=%d, check_in6->sin6_len=%d\n") - , (int)addr_port_in6->sin6_len, (int)check_in6->sin6_len)); -# endif ACE_ERROR((LM_ERROR, ACE_TEXT (" addr_port_in6->sin6_family=%d, check_in6->sin6_family=%d\n") , (int)addr_port_in6->sin6_family, (int)check_in6->sin6_family)); diff --git a/ACE/tests/IOStream_Test.cpp b/ACE/tests/IOStream_Test.cpp index a9c51dfe39f4c..7901b5e84cfbb 100644 --- a/ACE/tests/IOStream_Test.cpp +++ b/ACE/tests/IOStream_Test.cpp @@ -61,7 +61,7 @@ typedef ACE_IOStream ACE_SOCK_IOStream; class qchar { public: - qchar (void) { c_ = '\0'; } + qchar () { c_ = '\0'; } qchar (char c) : c_ (c) { }; @@ -153,9 +153,8 @@ client (void *arg = 0) // We don't _need_ to dynamically allocate the ACE_SOCK_IOStream. // But if we don't, it doesn't get destroyed on some platforms, - // e.g., g++ 2.7.2.1 and Sun C++ 4.2 on Solaris 2.5.1. (It does work - // on Linux, so the code seems fine.) If we manage the storage - // ourselves, we _will_ destroy it at the end of this function. + // If we manage the storage ourselves, we _will_ destroy it at + // the end of this function. ACE_SOCK_IOStream server; ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg; @@ -269,9 +268,8 @@ server (void *arg = 0) { // We don't _need_ to dynamically allocate the ACE_SOCK_IOStream. // But if we don't, it doesn't get destroyed on some platforms, - // e.g., g++ 2.7.2.1 and Sun C++ 4.2 on Solaris 2.5.1. (It does work - // on Linux, so the code seems fine.) If we manage the storage - // ourselves, we _will_ destroy it at the end of this function. + // If we manage the storage ourselves, we _will_ destroy it at + // the end of this function. ACE_SOCK_IOStream client_handler; ACE_INET_Addr server_addr; @@ -383,7 +381,7 @@ server (void *arg = 0) } static int -spawn (void) +spawn () { // Acceptor; ACE_SOCK_Acceptor acceptor; diff --git a/ACE/tests/Lazy_Map_Manager_Test.cpp b/ACE/tests/Lazy_Map_Manager_Test.cpp index 22bae652ccce9..eb155786a1ec1 100644 --- a/ACE/tests/Lazy_Map_Manager_Test.cpp +++ b/ACE/tests/Lazy_Map_Manager_Test.cpp @@ -17,7 +17,6 @@ #include "ace/Active_Map_Manager.h" - // Simple map manager. using LAZY_MAP = ACE_Map_Manager; diff --git a/ACE/tests/Log_Thread_Inheritance_Test.cpp b/ACE/tests/Log_Thread_Inheritance_Test.cpp index 7f35886b04c9c..e27fa012b6519 100644 --- a/ACE/tests/Log_Thread_Inheritance_Test.cpp +++ b/ACE/tests/Log_Thread_Inheritance_Test.cpp @@ -60,7 +60,6 @@ bool test_inherited_attributes () struct MyThread : ACE_Task_Base { - enum { THREAD_DEFAULTS = THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED }; explicit MyThread (bool openfile = false) diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index 273dbcadf48c4..c3d61cadabb30 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -36,8 +36,7 @@ #include "ace/Thread_Manager.h" #if defined (ACE_AS_STATIC_LIBS) || \ - (!defined (ACE_WIN32) && !defined (ACE_HAS_SVR4_DYNAMIC_LINKING) && \ - !defined (__hpux)) + (!defined (ACE_WIN32) && !defined (ACE_HAS_SVR4_DYNAMIC_LINKING)) #include "ace/Logging_Strategy.h" #endif @@ -430,9 +429,7 @@ int run_main (int argc, ACE_TCHAR *argv []) // though, and you may activate the logging strategy as described in // the non-DLL section below under DLL environments as well. -#if !defined (ACE_AS_STATIC_LIBS) && \ - (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || \ - defined (__hpux)) +#if !defined (ACE_AS_STATIC_LIBS) && (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING)) // Platform support DLLs, and not configured to link statically ACE_TCHAR arg_str[250]; @@ -467,8 +464,7 @@ int run_main (int argc, ACE_TCHAR *argv []) ((LM_ERROR, "Error initializing the ACE_Logging_Strategy.\n"), 1); -#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 || - ACE_HAS_SVR4_DYNAMIC_LINKING || __hpux) */ +#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 ACE_HAS_SVR4_DYNAMIC_LINKING) */ // launch a new Thread if (ACE_Thread_Manager::instance ()->spawn diff --git a/ACE/tests/MEM_Stream_Test.cpp b/ACE/tests/MEM_Stream_Test.cpp index 8cc11482e4ae0..56e7d629cd644 100644 --- a/ACE/tests/MEM_Stream_Test.cpp +++ b/ACE/tests/MEM_Stream_Test.cpp @@ -281,12 +281,7 @@ test_reactive (const ACE_TCHAR *prog, ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n ()"))); #else ACE_Process_Options opts; -# if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%s -p%d -r"); -# else - const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%ls -p%d -r"); -# endif /* ACE_WIN32 || !ACE_USES_WCHAR */ - opts.command_line (cmdline_fmt, prog, sport); + opts.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -p%d -r"), prog, sport); if (ACE_Process_Manager::instance ()->spawn_n (NUMBER_OF_REACTIVE_CONNECTIONS, opts) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n ()"))); @@ -372,12 +367,7 @@ test_concurrent (const ACE_TCHAR *prog, ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n()"))); #else ACE_Process_Options opts; -# if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%s -p%d -m"); -# else - const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%ls -p%d -m"); -# endif /* ACE_WIN32 || !ACE_USES_WCHAR */ - opts.command_line (cmdline_fmt, prog, sport); + opts.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -p%d -m"), prog, sport); if (ACE_Process_Manager::instance ()->spawn_n (NUMBER_OF_MT_CONNECTIONS, opts) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n()"))); diff --git a/ACE/tests/MEM_Stream_Test.h b/ACE/tests/MEM_Stream_Test.h index cbba67d556231..990fdd4645e63 100644 --- a/ACE/tests/MEM_Stream_Test.h +++ b/ACE/tests/MEM_Stream_Test.h @@ -5,8 +5,7 @@ * @file MEM_Stream_Test.h * * This file has the class definitions needed for template generation in - * MEM_Stream_Test.cpp. They have to be in a separate file so AIX xlC can - * find them at auto-instantiate time. + * MEM_Stream_Test.cpp. * * @author Steve Huston */ @@ -38,7 +37,7 @@ class Echo_Handler : public ACE_Svc_Handler /// The Svc_Handler callbacks. Echo_Handler (ACE_Thread_Manager *thr_mgr = 0); virtual int open (void *); - static void reset_handler (void); + static void reset_handler (); virtual int handle_input (ACE_HANDLE h); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); diff --git a/ACE/tests/MT_Reactor_Timer_Test.cpp b/ACE/tests/MT_Reactor_Timer_Test.cpp index 85cedf6f5c446..6b952c9d5d064 100644 --- a/ACE/tests/MT_Reactor_Timer_Test.cpp +++ b/ACE/tests/MT_Reactor_Timer_Test.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_THREADS) // This test exercises the setting and cancelling of timers from a @@ -147,7 +146,6 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv, Dispatch_Count_Handler::Dispatch_Count_Handler () { - ACE_Reactor *r = ACE_Reactor::instance (); this->input_seen_ = this->notify_seen_ = 0; diff --git a/ACE/tests/MT_Reactor_Timer_Test.h b/ACE/tests/MT_Reactor_Timer_Test.h index 966a48e150092..7302db9a3b242 100644 --- a/ACE/tests/MT_Reactor_Timer_Test.h +++ b/ACE/tests/MT_Reactor_Timer_Test.h @@ -33,11 +33,11 @@ class Time_Handler : public ACE_Task { public: - Time_Handler (void); + Time_Handler (); - void setup (void); + void setup (); - int verify_results(void); + int verify_results(); /// Run by a daemon thread to handle deferred processing. virtual int svc (); @@ -66,7 +66,6 @@ class Time_Handler : public ACE_Task #if defined ACE_HAS_THREADS ACE_Thread_Mutex lock_; #endif /* ACE_HAS_THREADS */ - }; /** @@ -78,7 +77,7 @@ class Time_Handler : public ACE_Task class Dispatch_Count_Handler : public ACE_Event_Handler { public: - Dispatch_Count_Handler (void); + Dispatch_Count_Handler (); /// Clean up resources from the Reactor. int handle_close (ACE_HANDLE h, @@ -95,7 +94,7 @@ class Dispatch_Count_Handler : public ACE_Event_Handler virtual int handle_exception (ACE_HANDLE); /// Verify that the expected events did happen. - int verify_results (void); + int verify_results (); private: /// Provide something to trigger I/O. @@ -104,7 +103,6 @@ class Dispatch_Count_Handler : public ACE_Event_Handler int input_seen_; int notify_seen_; size_t timers_fired_; - }; #endif /* ACE_TESTS_MT_REACTOR_TIMER_TEST_H */ diff --git a/ACE/tests/MT_Reactor_Upcall_Test.cpp b/ACE/tests/MT_Reactor_Upcall_Test.cpp index 207233b05aa52..7b850bb1d2ab2 100644 --- a/ACE/tests/MT_Reactor_Upcall_Test.cpp +++ b/ACE/tests/MT_Reactor_Upcall_Test.cpp @@ -25,7 +25,6 @@ #include "ace/ACE.h" - int number_of_event_loop_threads = 3; int number_of_messages = 10; int sleep_time_in_msec = 100; diff --git a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp index f9d2d2156c67d..42b229011702d 100644 --- a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -138,7 +138,6 @@ disable_signal (int sigmin, int sigmax) class Pipe { public: - Pipe (); //FUZZ: disable check_for_lack_ACE_OS @@ -226,7 +225,6 @@ static Event_Loop_Thread *global_event_loop_thread_variable = 0; class Sender : public ACE_Event_Handler { public: - Sender (ACE_HANDLE handle, Connection_Cache &connection_cache); @@ -243,13 +241,11 @@ class Sender : public ACE_Event_Handler ACE_HANDLE handle_; Connection_Cache &connection_cache_; - }; class Connection_Cache { public: - Connection_Cache (); ~Connection_Cache (); @@ -361,20 +357,17 @@ Sender::send_message () class Event_Loop_Thread : public ACE_Task_Base { public: - Event_Loop_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor); int svc () override; ACE_Reactor &reactor_; - }; class Receiver : public ACE_Task_Base { public: - Receiver (ACE_Thread_Manager &thread_manager, ACE_HANDLE handle, int nested_upcalls); @@ -398,7 +391,6 @@ class Receiver : public ACE_Task_Base int nested_upcalls_; int nested_upcalls_level_; - }; Receiver::Receiver (ACE_Thread_Manager &thread_manager, @@ -541,7 +533,6 @@ Receiver::close (u_long) class Connector { public: - Connector (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor, int nested_upcalls); @@ -557,7 +548,6 @@ class Connector ACE_Reactor &reactor_; int nested_upcalls_; - }; Connector::Connector (ACE_Thread_Manager &thread_manager, @@ -760,7 +750,6 @@ Connection_Cache::~Connection_Cache () class Invocation_Thread : public ACE_Task_Base { public: - Invocation_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor, Connection_Cache &connection_cache, @@ -786,7 +775,6 @@ class Invocation_Thread : public ACE_Task_Base int run_receiver_thread_; int nested_upcalls_; - }; Invocation_Thread::Invocation_Thread (ACE_Thread_Manager &thread_manager, @@ -970,7 +958,6 @@ Invocation_Thread::svc () class Close_Socket_Thread : public ACE_Task_Base { public: - Close_Socket_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor, ACE_Auto_Event &new_connection_event, @@ -986,7 +973,6 @@ class Close_Socket_Thread : public ACE_Task_Base int make_invocations_; int run_receiver_thread_; - }; Close_Socket_Thread::Close_Socket_Thread (ACE_Thread_Manager &thread_manager, @@ -1105,7 +1091,6 @@ Event_Loop_Thread::svc () class Purger_Thread : public ACE_Task_Base { public: - Purger_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor, Connection_Cache &connection_cache); @@ -1115,7 +1100,6 @@ class Purger_Thread : public ACE_Task_Base ACE_Reactor &reactor_; Connection_Cache &connection_cache_; - }; Purger_Thread::Purger_Thread (ACE_Thread_Manager &thread_manager, @@ -1280,7 +1264,6 @@ test::test (int ignore_nested_upcalls, (nested_upcalls == -1 || nested_upcalls == test_configs[i][4])) { - #if 0 /* defined (ACE_LINUX) */ // @@ I am not sure why but when is 0 and diff --git a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp index a1ba734631684..ab03322f09244 100644 --- a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp @@ -37,7 +37,6 @@ static int debug = 1; class Reference_Counted_Event_Handler : public ACE_Event_Handler { public: - Reference_Counted_Event_Handler (); ~Reference_Counted_Event_Handler () override; @@ -47,7 +46,6 @@ class Reference_Counted_Event_Handler : public ACE_Event_Handler ACE_Event_Handler::Reference_Count add_reference () override; ACE_Event_Handler::Reference_Count remove_reference () override; - }; Reference_Counted_Event_Handler::Reference_Counted_Event_Handler () @@ -131,7 +129,6 @@ Reference_Counted_Event_Handler::remove_reference () class Simple_Event_Handler : public ACE_Event_Handler { public: - Simple_Event_Handler (int notifies); ~Simple_Event_Handler () override; @@ -172,7 +169,6 @@ Simple_Event_Handler::handle_input (ACE_HANDLE) class Event_Loop_Thread : public ACE_Task_Base { public: - Event_Loop_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor, int extra_iterations_needed); diff --git a/ACE/tests/Main.cpp b/ACE/tests/Main.cpp index 46833b5d73f02..3d248d7016363 100644 --- a/ACE/tests/Main.cpp +++ b/ACE/tests/Main.cpp @@ -10,11 +10,8 @@ */ //============================================================================= - #include "ace/OS_main.h" -#if defined (ACE_HAS_WINCE) -# include "ace/ACE.h" -#endif /* ACE_HAS_WINCE */ + int run_main (int argc, ACE_TCHAR *argv[]); int diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index 037e5744ddb46..c93ea9b304e8b 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -35,7 +35,7 @@ typedef ACE_Malloc MALLOC; #define MMAP_FILENAME ACE_TEXT ("test_file") #define MUTEX_NAME ACE_TEXT ("test_lock") -#if !defined (ACE_LINUX) && !defined (ACE_OPENVMS) \ +#if !defined (ACE_LINUX) \ && !defined (ACE_ANDROID) \ && !(defined (ACE_WIN32) \ && (defined (ghs) || defined (__MINGW32__) )) \ @@ -70,7 +70,7 @@ static const void *PARENT_BASE_ADDR = ACE_DEFAULT_BASE_ADDR; // processes. So, though the whole PI pointer thing is tested here, // it isn't actually using multiple address ranges. -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 && !defined (HPUX)) +#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) # define CHILD_ADDR_DELTA (1024*1024) #else # define CHILD_ADDR_DELTA 0 @@ -91,16 +91,7 @@ myallocator (const void *base_addr = 0) if (static_allocator.get () == 0) { - -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_UNUSED_ARG (base_addr); - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (base_addr); -#endif /* ACE_HAS_WINCE */ #if !defined (ACE_TEST_REMAP_ON_FAULT) options.minimum_bytes_ = 512 * 1024; @@ -119,15 +110,7 @@ init_test (const void *base_addr = 0) { // Cleanup the MMAP file so we won't trip over the leftover mmap // file from the previous crash. -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_UNUSED_ARG (base_addr); - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (base_addr); -#endif /* ACE_HAS_WINCE */ //FUZZ: disable check_for_lack_ACE_OS ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options); //FUZZ: enable check_for_lack_ACE_OS @@ -308,11 +291,11 @@ child () // virtual address on every 32 bit process. On WinNT/2k, memory above // 2Gb is reserved for the system. So, we need to check at runtime // (we want an ACE_HAS_WINNT4 == 0 ace to run on either). -// To catch any odd case arising from Pharlap and/or WinCE, do the +// To catch any odd case arising from Pharlap, do the // run time check and run the NT4-or-better code unless we're on // CE or something other than NT4 (Pharlap reports itself as NT 3.51). static void -get_base_addrs (void) +get_base_addrs () { # if defined(__clang__) # pragma clang diagnostic push @@ -358,12 +341,10 @@ run_main (int argc, ACE_TCHAR *argv[]) // No arguments means we're the parent process. ACE_Process_Options options (1); -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - static const ACE_TCHAR* format = ACE_TEXT ("%ls%ls%ls"); -#else - static const ACE_TCHAR* format = ACE_TEXT ("%s%s%s"); -#endif /* !ACE_WIN32 && ACE_USES_WCHAR */ - options.command_line (format, EXE_LOCATION, + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("%") ACE_TEXT_PRIs, + EXE_LOCATION, argc > 0 ? argv[0] : ACE_TEXT ("Malloc_Test"), ACE_TEXT (" run_as_test")); diff --git a/ACE/tests/Malloc_Test.h b/ACE/tests/Malloc_Test.h index c675830581b6e..6b64e856531dc 100644 --- a/ACE/tests/Malloc_Test.h +++ b/ACE/tests/Malloc_Test.h @@ -2,9 +2,7 @@ /** * @file Malloc_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Malloc_Test.cpp. + * It is only used by Malloc_Test.cpp. * * @author Douglas C. Schmidt */ diff --git a/ACE/tests/Map_Test.cpp b/ACE/tests/Map_Test.cpp index 91c55896b4302..706ca1bb78860 100644 --- a/ACE/tests/Map_Test.cpp +++ b/ACE/tests/Map_Test.cpp @@ -17,7 +17,6 @@ #include "ace/Profile_Timer.h" - #undef THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL #define THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL(X) \ ((X) \ diff --git a/ACE/tests/Map_Test.h b/ACE/tests/Map_Test.h index c896c52e71aab..5b82ff9b7ef46 100644 --- a/ACE/tests/Map_Test.h +++ b/ACE/tests/Map_Test.h @@ -5,8 +5,7 @@ * @file Map_Test.h * * This file has the class definitions needed for template generation in - * Map_Test.cpp. They have to be in a separate file so AIX xlC can - * find them at auto-instantiate time. + * Map_Test.cpp. * * @author Irfan Pyarali */ @@ -38,8 +37,7 @@ typedef ACE_Array KEY; class Key_Generator { public: - - Key_Generator (void) + Key_Generator () : counter_ (0) { } @@ -90,7 +88,6 @@ class Hash_Key class Key_Adapter { public: - int encode (const KEY &original_key, const ACE_Active_Map_Manager_Key &active_key, KEY &modified_key) diff --git a/ACE/tests/Max_Default_Port_Test.cpp b/ACE/tests/Max_Default_Port_Test.cpp index 2e555005b3a34..90641fcb1543e 100644 --- a/ACE/tests/Max_Default_Port_Test.cpp +++ b/ACE/tests/Max_Default_Port_Test.cpp @@ -51,7 +51,6 @@ My_Accept_Handler::~My_Accept_Handler () int My_Accept_Handler::open (ACE_INET_Addr &addr) { - if (this->peer_acceptor_.open (addr, 1) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), @@ -60,7 +59,6 @@ My_Accept_Handler::open (ACE_INET_Addr &addr) } return 0; - } ACE_HANDLE @@ -72,7 +70,6 @@ My_Accept_Handler::get_handle () const int My_Accept_Handler::handle_input (ACE_HANDLE) { - if (this->peer_acceptor_.accept(this->stream_, 0) == -1) { ACE_ERROR((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("peer_acceptor.accept"))); @@ -164,7 +161,6 @@ client (void *arg) int run_main (int argc, ACE_TCHAR *argv[]) { - ACE_START_TEST (ACE_TEXT ("Max_Default_Port_Test")); ACE_UNUSED_ARG (argc); @@ -287,7 +283,6 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("Invalid ACE_MAX_DEFAULT_PORT ") ACE_TEXT ("or %d port may be busy; got to %d\n"), ACE_MAX_DEFAULT_PORT, max_listened_port)); - } #endif // ACE_LACKS_ACCEPT diff --git a/ACE/tests/Max_Default_Port_Test.h b/ACE/tests/Max_Default_Port_Test.h index 70d68dea58673..10439aaeedc6f 100644 --- a/ACE/tests/Max_Default_Port_Test.h +++ b/ACE/tests/Max_Default_Port_Test.h @@ -9,7 +9,6 @@ //============================================================================= - #ifndef ACE_TESTS_MAX_DEFAULT_PORT_TEST #define ACE_TESTS_MAX_DEFAULT_PORT_TEST @@ -25,7 +24,6 @@ */ class My_Accept_Handler : public ACE_Event_Handler { - public: My_Accept_Handler (ACE_INET_Addr &addr); ~My_Accept_Handler (); diff --git a/ACE/tests/Max_Default_Port_Test_IPV6.cpp b/ACE/tests/Max_Default_Port_Test_IPV6.cpp index 22ae15ea6eeda..fe0df33bcf707 100644 --- a/ACE/tests/Max_Default_Port_Test_IPV6.cpp +++ b/ACE/tests/Max_Default_Port_Test_IPV6.cpp @@ -43,7 +43,6 @@ My_Accept_Handler::~My_Accept_Handler () int My_Accept_Handler::open (ACE_INET_Addr &addr) { - if (this->peer_acceptor_.open (addr, 1) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), @@ -52,7 +51,6 @@ My_Accept_Handler::open (ACE_INET_Addr &addr) } return 0; - } ACE_HANDLE @@ -64,7 +62,6 @@ My_Accept_Handler::get_handle () const int My_Accept_Handler::handle_input (ACE_HANDLE) { - if (this->peer_acceptor_.accept(this->stream_, 0) == -1) { ACE_ERROR((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("peer_acceptor.accept"))); @@ -242,7 +239,6 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("Invalid ACE_MAX_DEFAULT_PORT ") ACE_TEXT ("or %d port may be busy; got to %d\n"), ACE_MAX_DEFAULT_PORT, max_listened_port)); - } #endif /* ACE_HAS_IPV6 */ diff --git a/ACE/tests/Mem_Map_Test.cpp b/ACE/tests/Mem_Map_Test.cpp index 73bb98590cf68..7549be0c73aa9 100644 --- a/ACE/tests/Mem_Map_Test.cpp +++ b/ACE/tests/Mem_Map_Test.cpp @@ -22,7 +22,6 @@ #include "ace/OS_Memory.h" - #if !defined (ACE_LACKS_MMAP) static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; diff --git a/ACE/tests/Message_Block_Large_Copy_Test.cpp b/ACE/tests/Message_Block_Large_Copy_Test.cpp index 44fb9bf15f6f9..3107b3ea07944 100644 --- a/ACE/tests/Message_Block_Large_Copy_Test.cpp +++ b/ACE/tests/Message_Block_Large_Copy_Test.cpp @@ -99,12 +99,10 @@ run_clone_test (const size_t msg_block_count, int run_main (int , ACE_TCHAR *[]) { - int rc = 0; ACE_START_TEST (ACE_TEXT ("Message_Block_Large_Copy_Test")); { - // Message_Block size() and Length() of 24,000,000 const size_t MSG_BLOCK_COUNT = 8000; const size_t MSG_BLOCK_SIZE = 3000; diff --git a/ACE/tests/Message_Queue_Notifications_Test.cpp b/ACE/tests/Message_Queue_Notifications_Test.cpp index 91cb7138a5def..7ea1d2971eb8c 100644 --- a/ACE/tests/Message_Queue_Notifications_Test.cpp +++ b/ACE/tests/Message_Queue_Notifications_Test.cpp @@ -41,7 +41,6 @@ #include "ace/OS_NS_unistd.h" - static int iterations = 10; static const size_t worker_threads = 2; @@ -219,7 +218,6 @@ Watermark_Test::producer () i--; if (this->msg_queue ()->is_full ()) break; - } ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Producer: High water mark hit ----\n"))); diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index 0e3768ab8371b..be63d886a1a6d 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -38,18 +38,13 @@ #include "ace/OS_NS_unistd.h" - const ACE_TCHAR usage[] = ACE_TEXT ("usage: Message_Queue_Test \n"); using QUEUE = ACE_Message_Queue; using ITERATOR = ACE_Message_Queue_Iterator; using REVERSE_ITERATOR = ACE_Message_Queue_Reverse_Iterator; -#if defined (ACE_HAS_WINCE) -static const int MESSAGE_FACTOR = 10000; -#else static const int MESSAGE_FACTOR = 100000; -#endif static const int MAX_MESSAGES = 10000; static const int MAX_MESSAGE_SIZE = 32; static const char test_message[] = "ACE_Message_Queue Test Message"; @@ -409,7 +404,6 @@ iterator_test () static int chained_block_test () { - QUEUE q; const char * s = "123456789"; // Will be length 10 when copied to block const size_t slen = 10; @@ -959,7 +953,6 @@ run_main (int argc, ACE_TCHAR *argv[]) timer = 0; - ACE_END_TEST; return status; } diff --git a/ACE/tests/Message_Queue_Test_Ex.cpp b/ACE/tests/Message_Queue_Test_Ex.cpp index 3182d2c6d0bb4..853eebb8504be 100644 --- a/ACE/tests/Message_Queue_Test_Ex.cpp +++ b/ACE/tests/Message_Queue_Test_Ex.cpp @@ -373,7 +373,6 @@ MQ_Ex_N_Tester::test_enqueue_head () timer->reset (); return 0; - } #if defined (ACE_HAS_THREADS) diff --git a/ACE/tests/Message_Queue_Test_Ex.h b/ACE/tests/Message_Queue_Test_Ex.h index bee0a36c50f01..0642fffb96aa5 100644 --- a/ACE/tests/Message_Queue_Test_Ex.h +++ b/ACE/tests/Message_Queue_Test_Ex.h @@ -4,8 +4,7 @@ /** * @file Message_Queue_Test_Ex.h * - * Define class needed for generating templates. IBM C++ requires this - * to be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Michael Vitlo * @author Irfan Pyarali @@ -31,7 +30,7 @@ class User_Class ACE_OS::strcpy (this->message_, inputMsg); } - ~User_Class (void) { delete [] this->message_; } + ~User_Class () { delete [] this->message_; } const char *message () const { @@ -60,10 +59,10 @@ struct Receive_Messages; class MQ_Ex_N_Tester { public: - int single_thread_performance_test (void); + int single_thread_performance_test (); #if defined (ACE_HAS_THREADS) - int performance_test (void); + int performance_test (); /// Sender runs with an autonomous thread static ACE_THR_FUNC_RETURN sender (void *); @@ -80,8 +79,8 @@ class MQ_Ex_N_Tester private: /// Helper methods - int test_enqueue_head (void); - int test_enqueue_tail (void); + int test_enqueue_head (); + int test_enqueue_tail (); }; #endif /* ACE_TESTS_MESSAGE_QUEUE_TEST_EX_H */ diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp index f07d65e65c827..524767532ec24 100644 --- a/ACE/tests/Multicast_Test.cpp +++ b/ACE/tests/Multicast_Test.cpp @@ -80,7 +80,6 @@ static sig_atomic_t error = 0; class MCT_Config { public: - enum { PRODUCER = 1, @@ -256,7 +255,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) { int n = ACE_OS::atoi (getopt.opt_arg ()); // I'm assuming 0 means unlimited, so just use whatever the - // user provides. Seems to work okay on Solaris 5.8. + // user provides. if (IP_MAX_MEMBERSHIPS == 0) this->groups_ = n; else @@ -759,7 +758,6 @@ MCT_Task::svc () int send_dgram (ACE_SOCK_Dgram &socket, ACE_INET_Addr addr, int done = 0) { - // Send each message twice, once to the right port, and once to the "wrong" // port. This helps generate noise and lets us see if port filtering is // working properly. diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index 0eda873a68cff..11056ef53c77f 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -86,7 +86,6 @@ static sig_atomic_t error = 0; class MCT_Config { public: - enum { PRODUCER = 1, @@ -266,7 +265,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) { int n = ACE_OS::atoi (getopt.opt_arg ()); // I'm assuming 0 means unlimited, so just use whatever the - // user provides. Seems to work okay on Solaris 5.8. + // user provides. if (IP_MAX_MEMBERSHIPS == 0) this->groups_ = n; else @@ -755,7 +754,6 @@ MCT_Task::svc () int send_dgram (ACE_SOCK_Dgram &socket, ACE_INET_Addr addr, int done = 0) { - // Send each message twice, once to the right port, and once to the "wrong" // port. This helps generate noise and lets us see if port filtering is // working properly. @@ -930,7 +928,6 @@ int advance_addr (ACE_INET_Addr &addr) ACE_TEXT ("multicast group address past %s\n"), addr.get_host_addr ()), -1); - } } #endif /* ACE_HAS_IPV6 */ diff --git a/ACE/tests/Multihomed_INET_Addr_Test.cpp b/ACE/tests/Multihomed_INET_Addr_Test.cpp index bf8d53308c224..922c2fc38d38f 100644 --- a/ACE/tests/Multihomed_INET_Addr_Test.cpp +++ b/ACE/tests/Multihomed_INET_Addr_Test.cpp @@ -92,8 +92,6 @@ int run_main (int, ACE_TCHAR *[]) // Run the test with a varying number of secondary addresses for (i = 0; i <= num_secondaries; ++i) { - - /****** Clear the in_out array and test subject ******/ @@ -135,7 +133,6 @@ int run_main (int, ACE_TCHAR *[]) // secondary addresses. size_t returned_num_secondaries = addr.get_num_secondary_addresses(); if (returned_num_secondaries == num_secondaries) { - // Set a stay_out element to the state that we expect to see // from every in_out element after the in_out array is passed to // the accessor of the test subject. @@ -146,9 +143,7 @@ int run_main (int, ACE_TCHAR *[]) // Check that the in_out array matches stay_out element for (j = 0; j < num_secondaries; ++j) { - if (in_out[j] != stay_out[0]) { - ACE_TCHAR in_out_string[100]; ACE_TCHAR stay_out_string[100]; @@ -172,9 +167,7 @@ int run_main (int, ACE_TCHAR *[]) for (j = 0, pointer = in_out_sockaddr; j < num_secondaries + 1; ++j, ++pointer) { - if (ACE_OS::memcmp(pointer, stay_out[0].get_addr(), sizeof(sockaddr))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed get_addresses check\n"))); @@ -183,14 +176,12 @@ int run_main (int, ACE_TCHAR *[]) } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed get_num_secondary_addresses check\n") ACE_TEXT ("%d != %d\n"), returned_num_secondaries, num_secondaries)); status = 1; - } @@ -230,7 +221,6 @@ int run_main (int, ACE_TCHAR *[]) // secondary addresses. returned_num_secondaries = addr.get_num_secondary_addresses(); if (returned_num_secondaries == i) { - // Initialize the stay_out array with the secondary addresses for (j = 0; j < i; ++j) { stay_out[j].set(port, secondary_dotted_decimals[j]); @@ -241,9 +231,7 @@ int run_main (int, ACE_TCHAR *[]) // Check that the in_out array matches stay_out array for (j = 0; j < i; ++j) { - if (in_out[j] != stay_out[j]) { - ACE_TCHAR in_out_string[100]; ACE_TCHAR stay_out_string[100]; @@ -266,13 +254,11 @@ int run_main (int, ACE_TCHAR *[]) // Check that the primary address in the in_out_sockaddr array // matches the primary address reported by the superclass if (ACE_OS::memcmp(in_out_sockaddr, addr.get_addr(), sizeof(sockaddr))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed second get_addresses check ") ACE_TEXT ("(for primary address)\n"))); status = 1; - } // Check that the secondary addresses in the in_out_sockaddr @@ -280,9 +266,7 @@ int run_main (int, ACE_TCHAR *[]) for (j = 1, pointer = &in_out_sockaddr[1]; j < i + 1; ++j, ++pointer) { - if (ACE_OS::memcmp(pointer, stay_out[j-1].get_addr(), sizeof(sockaddr))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed second get_addresses check ") ACE_TEXT ("(for secondary addresses)\n"))); @@ -292,7 +276,6 @@ int run_main (int, ACE_TCHAR *[]) } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed second get_num_secondary_addresses check\n") ACE_TEXT ("%d != %d\n"), @@ -339,7 +322,6 @@ int run_main (int, ACE_TCHAR *[]) // secondary addresses. returned_num_secondaries = addr.get_num_secondary_addresses(); if (returned_num_secondaries == num_secondaries) { - // Set a stay_out element to the state that we expect to see // from every in_out element after the in_out array is passed to // the accessor of the test subject. @@ -350,9 +332,7 @@ int run_main (int, ACE_TCHAR *[]) // Check that the in_out array matches stay_out array for (j = 0; j < num_secondaries; ++j) { - if (in_out[j] != stay_out[0]) { - ACE_TCHAR in_out_string[100]; ACE_TCHAR stay_out_string[100]; @@ -370,14 +350,12 @@ int run_main (int, ACE_TCHAR *[]) } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed third get_num_secondary_addresses check\n") ACE_TEXT ("%d != %d\n"), returned_num_secondaries, num_secondaries)); status = 1; - } @@ -415,7 +393,6 @@ int run_main (int, ACE_TCHAR *[]) // secondary addresses. returned_num_secondaries = addr.get_num_secondary_addresses(); if (returned_num_secondaries == i) { - // Initialize the stay_out array with the secondary addresses for (j = 0; j < i; ++j) { stay_out[j].set(port, secondary_addr32[j]); @@ -426,9 +403,7 @@ int run_main (int, ACE_TCHAR *[]) // Check that the in_out array matches stay_out array for (j = 0; j < i; ++j) { - if (in_out[j] != stay_out[j]) { - ACE_TCHAR in_out_string[100]; ACE_TCHAR stay_out_string[100]; @@ -446,7 +421,6 @@ int run_main (int, ACE_TCHAR *[]) } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed forth get_num_secondary_addresses check\n") ACE_TEXT ("%d != %d\n"), diff --git a/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp b/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp index bab97e3c0321c..ef9fc882510d8 100644 --- a/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp +++ b/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp @@ -63,8 +63,6 @@ int run_main (int argc, ACE_TCHAR *argv[]) sockaddr_in6 in_out_sockaddr6[num_sockaddrs]; for (i = 0; i <= num_secondaries; ++i) { - - /**** Test set (u_short, const char[], int, int, const char *([]), size_t) ****/ @@ -101,7 +99,6 @@ int run_main (int argc, ACE_TCHAR *argv[]) // secondary addresses. size_t returned_num_secondaries = addr.get_num_secondary_addresses(); if (returned_num_secondaries == i) { - // Initialize the stay_out array with the secondary addresses for (j = 0; j < i; ++j) { stay_out[j].set(port, secondary_ipv6[j]); @@ -112,9 +109,7 @@ int run_main (int argc, ACE_TCHAR *argv[]) // Check that the in_out array matches stay_out array for (j = 0; j < i; ++j) { - if (in_out[j] != stay_out[j]) { - ACE_TCHAR in_out_string[100]; ACE_TCHAR stay_out_string[100]; @@ -138,13 +133,11 @@ int run_main (int argc, ACE_TCHAR *argv[]) // matches the primary address reported by the superclass if (ACE_OS::memcmp(in_out_sockaddr6, addr.get_addr(), sizeof(sockaddr_in6))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed second get_addresses check ") ACE_TEXT ("(for primary address)\n"))); status = 1; - } // Check that the secondary addresses in the in_out_sockaddr @@ -152,10 +145,8 @@ int run_main (int argc, ACE_TCHAR *argv[]) for (j = 1, pointer6 = &in_out_sockaddr6[1]; j < i + 1; ++j, ++pointer6) { - if (ACE_OS::memcmp(pointer6, stay_out[j-1].get_addr(), sizeof(sockaddr_in6))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed get_addresses check ") ACE_TEXT ("(for secondary addresses)\n"))); @@ -164,7 +155,6 @@ int run_main (int argc, ACE_TCHAR *argv[]) } } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed get_num_secondary_addresses check\n") ACE_TEXT ("%d != %d\n"), @@ -177,5 +167,4 @@ int run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return status; - } diff --git a/ACE/tests/Naming_Test.cpp b/ACE/tests/Naming_Test.cpp index 04f183c738c7b..a593c0adb3c7b 100644 --- a/ACE/tests/Naming_Test.cpp +++ b/ACE/tests/Naming_Test.cpp @@ -257,11 +257,7 @@ run_main (int argc, ACE_TCHAR *argv[]) } // Set the database name using the pid. mktemp isn't always available. ACE_OS::snprintf(temp_file, BUFSIZ, -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_TEXT ("%ls%d"), -#else - ACE_TEXT ("%s%d"), -#endif + ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT ("%d"), pname, (int)ACE_OS::getpid ()); diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index e42fc226182bc..248387827043e 100644 --- a/ACE/tests/Network_Adapters_Test.cpp +++ b/ACE/tests/Network_Adapters_Test.cpp @@ -615,7 +615,6 @@ Stop_Handler::handle_input (ACE_HANDLE handle) // protect from deleted pointer try { - this->reactor ()->cancel_timer (this->handlers_to_stop_[i]); this->reactor ()->remove_handler (this->handlers_to_stop_[i], @@ -836,7 +835,7 @@ extern "C" } #endif /* #if defined (ACE_HAS_SIG_C_FUNC) */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) { switch (fdwCtrlType) @@ -992,7 +991,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) default: // return print_usage (argc,argv); break; - } } @@ -1013,9 +1011,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_START_TEST (ACE_TEXT ("Network_Adapters_Test")); #if defined (ACE_WIN32) -#if !defined (ACE_HAS_WINCE) SetConsoleCtrlHandler(&CtrlHandler, TRUE); -#endif #else /* #if defined (ACE_WIN32) */ // Set a handler for SIGSEGV signal to call for abort. ACE_Sig_Action sa1 ((ACE_SignalHandler) sigsegv_handler, SIGSEGV); diff --git a/ACE/tests/Network_Adapters_Test.h b/ACE/tests/Network_Adapters_Test.h index ead6e6a120aed..2541e6eafeda8 100644 --- a/ACE/tests/Network_Adapters_Test.h +++ b/ACE/tests/Network_Adapters_Test.h @@ -35,10 +35,10 @@ class Echo_Handler : public ACE_Event_Handler { public: /// Default constructor - Echo_Handler (void); + Echo_Handler (); /// Destructor - virtual ~Echo_Handler (void); + virtual ~Echo_Handler (); /** * Initialization of a handler, performing echo-checks against a @@ -117,14 +117,13 @@ class Echo_Handler : public ACE_Event_Handler int dispatch_echo_checks (int first_call = 0); /// Access to ping_socket. - ACE_Ping_Socket& ping_socket (void); + ACE_Ping_Socket& ping_socket (); /// Returns 1 if a single char of success_status_ is 0 /// (connected). - int does_echo_test_successful (void); + int does_echo_test_successful (); private: - /// Wrapper for sending/receiving ICMPs. ACE_Ping_Socket ping_socket_; @@ -172,10 +171,10 @@ class Stop_Handler : public ACE_Event_Handler Stop_Handler (ACE_Reactor * const reactor = ACE_Reactor::instance ()); // Destructor. - virtual ~Stop_Handler (void); + virtual ~Stop_Handler (); // Initialization. Registers this for SIGINT, SIGTERM and SIGQUIT. - virtual int open (void); + virtual int open (); // De-registers this from the reactor and stops reactors event_loop. virtual int handle_close (ACE_HANDLE handle, @@ -197,7 +196,6 @@ class Stop_Handler : public ACE_Event_Handler virtual int unregister_handler (ACE_Event_Handler * handler); private: - enum { HANDLERS_TO_STOP_TABLE_SIZE = 10 @@ -220,10 +218,10 @@ class Repeats_Handler : public ACE_Event_Handler { public: // Constructor. - Repeats_Handler (void); + Repeats_Handler (); // Destructor. - virtual ~Repeats_Handler (void); + virtual ~Repeats_Handler (); // Initialization. virtual int open (Echo_Handler *check_handler, diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index abe20bdc17a43..b9fad77374903 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -108,7 +108,7 @@ rename_test () } ACE_OS::fclose (f); -#if defined (ACE_WIN32) && defined (ACE_LACKS_WIN32_MOVEFILEEX) || defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && defined (ACE_LACKS_WIN32_MOVEFILEEX) // Can't rename if new_file exists already. ACE_OS::unlink (new_file); #endif @@ -603,8 +603,6 @@ snprintf_test (SNPrintF_t fn) ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE); retval = fn (buf, BUFFER_SIZE, "%d", 1234); - // HP-UX has broken vsnprintf -#if !defined (HPUX) if (retval != 4) { ACE_ERROR ((LM_ERROR, @@ -612,7 +610,6 @@ snprintf_test (SNPrintF_t fn) retval)); ++error_count; } -#endif /* !HPUX */ if (buf[3] != 0) { @@ -861,7 +858,6 @@ string_strsncpy_test () 9) == 0); // size should be 9 (+ '\0' char) THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL(ACE_OS::strlen(strsncpy2) == 9); - } #if defined (ACE_HAS_WCHAR) diff --git a/ACE/tests/Object_Manager_Flipping_Test.cpp b/ACE/tests/Object_Manager_Flipping_Test.cpp index 572df1a262c88..12f72e0ea9dc6 100644 --- a/ACE/tests/Object_Manager_Flipping_Test.cpp +++ b/ACE/tests/Object_Manager_Flipping_Test.cpp @@ -26,7 +26,7 @@ static u_int *ip; extern "C" void -hook1 (void) +hook1 () { delete ip; ip = 0; @@ -105,5 +105,4 @@ int run_main (int, ACE_TCHAR *[]) } return errors == 0 ? 0 : 1; - } diff --git a/ACE/tests/Object_Manager_Test.cpp b/ACE/tests/Object_Manager_Test.cpp index 27870763f34ef..790647e3954fb 100644 --- a/ACE/tests/Object_Manager_Test.cpp +++ b/ACE/tests/Object_Manager_Test.cpp @@ -16,12 +16,11 @@ #include "ace/Init_ACE.h" - static u_int *ip; extern "C" void -hook1 (void) +hook1 () { delete ip; ip = 0; diff --git a/ACE/tests/OrdMultiSet_Test.cpp b/ACE/tests/OrdMultiSet_Test.cpp index f62bf4ada6fcc..efd30bb1d5148 100644 --- a/ACE/tests/OrdMultiSet_Test.cpp +++ b/ACE/tests/OrdMultiSet_Test.cpp @@ -20,7 +20,6 @@ #include "ace/Containers.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Pipe_Test.cpp b/ACE/tests/Pipe_Test.cpp index 9b1a1120d4aca..5cb4b10e1b407 100644 --- a/ACE/tests/Pipe_Test.cpp +++ b/ACE/tests/Pipe_Test.cpp @@ -113,14 +113,10 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_START_TEST (ACE_TEXT("Pipe_Test")); ACE_INIT_LOG (ACE_TEXT("Pipe_Test-children")); -# if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%s -c%s"); -# else - const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%ls -c%ls"); -# endif /* ACE_WIN32 || !ACE_USES_WCHAR */ ACE_Process_Options options; # ifndef ACE_LACKS_VA_FUNCTIONS - options.command_line (cmdline_fmt, + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT (" -c%") ACE_TEXT_PRIs, argc > 0 ? argv[0] : ACE_TEXT ("Pipe_Test"), close_pipe == 0 ? ACE_TEXT (" -d") : ACE_TEXT ("")); # else diff --git a/ACE/tests/Priority_Buffer_Test.cpp b/ACE/tests/Priority_Buffer_Test.cpp index 57d257d8b3761..4877f5e1cdbaa 100644 --- a/ACE/tests/Priority_Buffer_Test.cpp +++ b/ACE/tests/Priority_Buffer_Test.cpp @@ -18,7 +18,6 @@ #include "ace/Thread_Manager.h" - #if defined (ACE_HAS_THREADS) static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; diff --git a/ACE/tests/Priority_Reactor_Test.cpp b/ACE/tests/Priority_Reactor_Test.cpp index b2a99ea8e0aac..c37451a61893d 100644 --- a/ACE/tests/Priority_Reactor_Test.cpp +++ b/ACE/tests/Priority_Reactor_Test.cpp @@ -32,7 +32,6 @@ #include - static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; // The number of children to run, it can be changed using the -c diff --git a/ACE/tests/Priority_Reactor_Test.h b/ACE/tests/Priority_Reactor_Test.h index 10a7ba3cd016c..44b64f7bbd167 100644 --- a/ACE/tests/Priority_Reactor_Test.h +++ b/ACE/tests/Priority_Reactor_Test.h @@ -3,9 +3,7 @@ /** * @file Priority_Reactor_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Priority_Reactor_Test.cpp. + * It is only used by Priority_Reactor_Test.cpp. * * @author Carlos O'Ryan */ @@ -42,7 +40,7 @@ class Read_Handler : public ACE_Svc_Handler static void set_countdown (int nchildren); /// Get the number of children we are still waiting for. - static int get_countdown (void); + static int get_countdown (); /// The Svc_Handler callbacks. virtual int open (void *); diff --git a/ACE/tests/Priority_Task_Test.cpp b/ACE/tests/Priority_Task_Test.cpp index 91a1659673081..305c7f0aa83af 100644 --- a/ACE/tests/Priority_Task_Test.cpp +++ b/ACE/tests/Priority_Task_Test.cpp @@ -199,12 +199,6 @@ run_main (int argc, ACE_TCHAR *argv[]) // Spawn off ACE_MAX_ITERATIONS of tasks, passing each one their // iteration number as their priority. - - // NOTE: on Solaris, for example, this requests the min FIFO - // priority. But, this test doesn't use the Realtime scheduling - // class. The FIFO priorities are used because they're all - // nonnegative. - ACE_Sched_Priority_Iterator priority (ACE_SCHED_FIFO, ACE_SCOPE_THREAD); diff --git a/ACE/tests/Proactor_Scatter_Gather_Test.cpp b/ACE/tests/Proactor_Scatter_Gather_Test.cpp index d0e75e84e25e2..0210ddb43ef6f 100644 --- a/ACE/tests/Proactor_Scatter_Gather_Test.cpp +++ b/ACE/tests/Proactor_Scatter_Gather_Test.cpp @@ -247,15 +247,15 @@ class Acceptor : public ACE_Asynch_Acceptor friend class Receiver; public: - Acceptor (void); - virtual ~Acceptor (void); + Acceptor (); + virtual ~Acceptor (); - void stop (void); + void stop (); // Virtual from ACE_Asynch_Acceptor - virtual Receiver *make_handler (void); + virtual Receiver *make_handler (); - int get_number_sessions (void) { return this->sessions_; } + int get_number_sessions () { return this->sessions_; } private: void on_new_receiver (Receiver &rcvr); @@ -275,7 +275,7 @@ class Receiver : public ACE_Service_Handler public: Receiver (Acceptor *acceptor = 0, int index = -1); - virtual ~Receiver (void); + virtual ~Receiver (); //FUZZ: disable check_for_lack_ACE_OS /// This is called after the new connection has been accepted. @@ -289,9 +289,9 @@ class Receiver : public ACE_Service_Handler virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result); private: - int initiate_read_stream (void); + int initiate_read_stream (); - void check_destroy (void); + void check_destroy (); Acceptor *acceptor_; int index_; @@ -317,11 +317,11 @@ class Writer : public ACE_Handler friend class Receiver; public: - Writer (void); - virtual ~Writer (void); + Writer (); + virtual ~Writer (); //FUZZ: disable check_for_lack_ACE_OS - void open (void); + void open (); //FUZZ: enable check_for_lack_ACE_OS // this is *not* a callback from the framework @@ -338,7 +338,7 @@ class Writer : public ACE_Handler virtual void handle_write_file (const ACE_Asynch_Write_File::Result &result); private: - int initiate_write_file (void); + int initiate_write_file (); private: // Output file @@ -384,7 +384,7 @@ Receiver::Receiver (Acceptor * acceptor, int index) this->acceptor_->on_new_receiver (*this); } -Receiver::~Receiver (void) +Receiver::~Receiver () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver::~Receiver\n"))); @@ -405,7 +405,7 @@ Receiver::~Receiver (void) } void -Receiver::check_destroy (void) +Receiver::check_destroy () { if (this->io_count_ <= 0) delete this; @@ -433,7 +433,7 @@ Receiver::open (ACE_HANDLE handle, ACE_Message_Block &) } int -Receiver::initiate_read_stream (void) +Receiver::initiate_read_stream () { if (!Receiver::writer_) return -1; @@ -571,21 +571,21 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) // Acceptor Impl // ************************************************************* -Acceptor::Acceptor (void) +Acceptor::Acceptor () : sessions_ (0) { for (int i = 0; i < RECEIVERS; ++i) this->list_receivers_[i] = 0; } -Acceptor::~Acceptor (void) +Acceptor::~Acceptor () { this->stop (); } void -Acceptor::stop (void) +Acceptor::stop () { // This method can be called only after proactor event loop is done // in all threads. @@ -621,7 +621,7 @@ Acceptor::on_delete_receiver (Receiver & rcvr) } Receiver * -Acceptor::make_handler (void) +Acceptor::make_handler () { if (this->sessions_ >= RECEIVERS) return 0; @@ -644,7 +644,7 @@ Acceptor::make_handler (void) // Writer Impl // ************************************************************* -Writer::Writer (void) +Writer::Writer () : output_file_handle_ (ACE_INVALID_HANDLE), writing_file_offset_ (0), reported_file_offset_ (0), @@ -655,7 +655,7 @@ Writer::Writer (void) { } -Writer::~Writer (void) +Writer::~Writer () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Writer::~Writer\n"))); @@ -693,7 +693,7 @@ Writer::on_delete_receiver () } void -Writer::open (void) +Writer::open () { // Open the file for output if (ACE_INVALID_HANDLE == (this->output_file_handle_ = ACE_OS::open (output_file, @@ -728,7 +728,7 @@ Writer::handle_read_chunks_chain (ACE_Message_Block *mb, } int -Writer::initiate_write_file (void) +Writer::initiate_write_file () { // find out how much can we merge ACE_Message_Block *dummy_last = 0; @@ -891,17 +891,17 @@ class Connector : public ACE_Asynch_Connector friend class Sender; public: - Connector (void); - virtual ~Connector (void); + Connector (); + virtual ~Connector (); // Address to pass to Sender for secondary connect. void set_address (const ACE_INET_Addr &addr); - const ACE_INET_Addr &get_address (void); + const ACE_INET_Addr &get_address (); - void stop (void); + void stop (); // Virtual from ACE_Asynch_Connector - virtual Sender *make_handler (void); + virtual Sender *make_handler (); private: void on_new_sender (Sender &rcvr); @@ -916,10 +916,9 @@ class Sender : public ACE_Service_Handler { friend class Connector; public: - Sender (Connector *connector = 0, int index = -1); - virtual ~Sender (void); + virtual ~Sender (); //FUZZ: disable check_for_lack_ACE_OS /// This is called after the new connection has been established. @@ -936,9 +935,9 @@ class Sender : public ACE_Service_Handler virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); private: - void check_destroy (void); + void check_destroy (); - int initiate_read_file (void); + int initiate_read_file (); int initiate_write_stream (ACE_Message_Block &mb); @@ -962,14 +961,14 @@ class Sender : public ACE_Service_Handler // Connector Impl // ************************************************************* -Connector::Connector (void) +Connector::Connector () : sessions_ (0) { for (int i = 0; i < SENDERS; ++i) this->list_senders_[i] = 0; } -Connector::~Connector (void) +Connector::~Connector () { this->stop (); } @@ -982,13 +981,13 @@ Connector::set_address (const ACE_INET_Addr &addr) } const ACE_INET_Addr & -Connector::get_address (void) +Connector::get_address () { return this->addr_; } void -Connector::stop (void) +Connector::stop () { // This method can be called only after proactor event loop is done // in all threads. @@ -1025,7 +1024,7 @@ Connector::on_delete_sender (Sender &sndr) } Sender * -Connector::make_handler (void) +Connector::make_handler () { if (this->sessions_ >= SENDERS) return 0; @@ -1061,7 +1060,7 @@ Sender::Sender (Connector * connector, int index) this->connector_->on_new_sender (*this); } -Sender::~Sender (void) +Sender::~Sender () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender::~Sender\n"))); @@ -1084,7 +1083,7 @@ Sender::~Sender (void) // return true if we alive, false we commited suicide void -Sender::check_destroy (void) +Sender::check_destroy () { if (this->io_count_ <= 0) delete this; @@ -1151,7 +1150,7 @@ Sender::open (ACE_HANDLE handle, ACE_Message_Block &) } int -Sender::initiate_read_file (void) +Sender::initiate_read_file () { ACE_TEST_ASSERT (0 == this->file_offset_ % chunk_size); diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp index 04bea2e7779b7..6657c096a158b 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -50,7 +50,6 @@ # include "ace/POSIX_Proactor.h" # include "ace/POSIX_CB_Proactor.h" -# include "ace/SUN_Proactor.h" #endif /* ACE_WIN32 */ @@ -58,7 +57,7 @@ // Proactor Type (UNIX only, Win32 ignored) -using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -103,13 +102,11 @@ static char complete_message[] = class LogLocker { public: - LogLocker () { ACE_LOG_MSG->acquire (); } virtual ~LogLocker () { ACE_LOG_MSG->release (); } }; - // Function to remove signals from the signal mask. static int disable_signal (int sigmin, int sigmax) @@ -190,7 +187,6 @@ class MyTask : public ACE_Task ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; ACE_Proactor * proactor_; - }; int @@ -241,16 +237,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -# if defined (sun) - case SUN: - ACE_NEW_RETURN (proactor_impl, - ACE_SUN_Proactor (max_op), - -1); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%t) Create Proactor Type = SUN\n"))); - break; -# endif /* sun */ - # if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, @@ -1725,7 +1711,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[]) ACE_TEXT ("\n a AIOCB") ACE_TEXT ("\n i SIG") ACE_TEXT ("\n c CB") - ACE_TEXT ("\n s SUN") ACE_TEXT ("\n d default") ACE_TEXT ("\n-d ") ACE_TEXT ("\n-h for Client mode") @@ -1764,11 +1749,6 @@ set_proactor_type (const ACE_TCHAR *ptype) case 'I': proactor_type = SIG; return 1; -#if defined (sun) - case 'S': - proactor_type = SUN; - return 1; -#endif /* sun */ #if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; @@ -1852,13 +1832,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } // switch } // while - if (proactor_type == SUN && threads > 1) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ") - ACE_TEXT ("changing to 1 thread\n"))); - threads = 1; - } - return 0; } diff --git a/ACE/tests/Proactor_Test.h b/ACE/tests/Proactor_Test.h index 02bd4a407967c..e6c2f6f0706e3 100644 --- a/ACE/tests/Proactor_Test.h +++ b/ACE/tests/Proactor_Test.h @@ -25,13 +25,13 @@ class Server : public ACE_Service_Handler public: Server (); Server (TestData *tester, int id); - ~Server (void); + ~Server (); - int id (void) { return this->id_; } - size_t get_total_snd (void) { return this->total_snd_; } - size_t get_total_rcv (void) { return this->total_rcv_; } - long get_total_w (void) { return this->total_w_; } - long get_total_r (void) { return this->total_r_; } + int id () { return this->id_; } + size_t get_total_snd () { return this->total_snd_; } + size_t get_total_rcv () { return this->total_rcv_; } + long get_total_w () { return this->total_w_; } + long get_total_r () { return this->total_r_; } // This is called to pass the new connection's addresses. virtual void addresses (const ACE_INET_Addr& peer, @@ -57,7 +57,7 @@ class Server : public ACE_Service_Handler virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); private: - int initiate_read_stream (void); + int initiate_read_stream (); int initiate_write_stream (ACE_Message_Block &mb, size_t nbytes); TestData *tester_; @@ -83,20 +83,19 @@ class Server : public ACE_Service_Handler class Client : public ACE_Service_Handler { public: - /// This is called after the new connection has been established. virtual void open (ACE_HANDLE handle, ACE_Message_Block &message_block); Client (); Client (TestData *tester, int id); - ~Client (void); + ~Client (); - int id (void) { return this->id_; } - size_t get_total_snd (void) { return this->total_snd_; } - size_t get_total_rcv (void) { return this->total_rcv_; } - int get_total_w (void) { return this->total_w_; } - int get_total_r (void) { return this->total_r_; } + int id () { return this->id_; } + size_t get_total_snd () { return this->total_snd_; } + size_t get_total_rcv () { return this->total_rcv_; } + int get_total_w () { return this->total_w_; } + int get_total_r () { return this->total_r_; } // This is called to pass the new connection's addresses. virtual void addresses (const ACE_INET_Addr& peer, @@ -108,12 +107,12 @@ class Client : public ACE_Service_Handler /// This is called when asynchronous writes from the socket complete virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); - void cancel (void); + void cancel (); private: - int initiate_read_stream (void); - int initiate_write_stream (void); - void close (void); + int initiate_read_stream (); + int initiate_write_stream (); + void close (); TestData *tester_; int id_; diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp index c4e2adb050de9..0a4e4e84c1870 100644 --- a/ACE/tests/Proactor_Test_IPV6.cpp +++ b/ACE/tests/Proactor_Test_IPV6.cpp @@ -51,14 +51,13 @@ # include "ace/POSIX_Proactor.h" # include "ace/POSIX_CB_Proactor.h" -# include "ace/SUN_Proactor.h" #endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */ #include "Proactor_Test.h" // Proactor Type (UNIX only, Win32 ignored) -using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -200,7 +199,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) ACE_TEST_ASSERT (this->proactor_ == 0); -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) ACE_UNUSED_ARG (type_proactor); ACE_UNUSED_ARG (max_op); @@ -238,16 +237,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -# if defined (sun) - case SUN: - ACE_NEW_RETURN (proactor_impl, - ACE_SUN_Proactor (max_op), - -1); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%t) Create Proactor Type = SUN\n"))); - break; -# endif /* sun */ - # if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, @@ -264,7 +253,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; } -#endif // (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#endif // (ACE_WIN32) // always delete implementation 1 , not !(proactor_impl == 0) ACE_NEW_RETURN (this->proactor_, @@ -1316,8 +1305,7 @@ Client::initiate_write_stream () static const size_t complete_message_length = ACE_OS::strlen (complete_message); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - +#if defined (ACE_WIN32) ACE_Message_Block *mb1 = 0, *mb2 = 0, *mb3 = 0; @@ -1354,7 +1342,7 @@ Client::initiate_write_stream () ACE_TEXT ("Client::ACE_Asynch_Stream::writev")), -1); } -#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#else /* defined (ACE_WIN32) */ ACE_Message_Block *mb = 0; @@ -1381,7 +1369,7 @@ Client::initiate_write_stream () ACE_TEXT ("write")), -1); } -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ this->io_count_++; this->total_w_++; @@ -1397,7 +1385,7 @@ Client::initiate_read_stream () static const size_t complete_message_length = ACE_OS::strlen (complete_message); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) ACE_Message_Block *mb1 = 0, *mb2 = 0, *mb3 = 0, @@ -1446,7 +1434,7 @@ Client::initiate_read_stream () ACE_TEXT ("Client::ACE_Asynch_Read_Stream::readv")), -1); } -#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#else /* defined (ACE_WIN32) */ // Try to read more chunks size_t blksize = ( complete_message_length > BUFSIZ ) ? @@ -1479,7 +1467,7 @@ Client::initiate_read_stream () ACE_TEXT ("read")), -1); } -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ this->io_count_++; this->total_r_++; @@ -1530,7 +1518,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_TEXT ("error"), result.error ())); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) size_t bytes_transferred = result.bytes_transferred (); char index = 0; for (ACE_Message_Block* mb_i = &mb; @@ -1561,7 +1549,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) index, mb_i->rd_ptr ())); } -#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#else /* defined (ACE_WIN32) */ // write 0 at string end for proper printout (if end of mb, it's 0 already) mb.rd_ptr()[0] = '\0'; // move rd_ptr backwards as required for printout @@ -1570,7 +1558,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_TEXT ("%s = %s\n"), ACE_TEXT ("message_block"), mb.rd_ptr ())); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("**** end of message ****************\n"))); @@ -1760,7 +1748,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[]) ACE_TEXT ("\n a AIOCB") ACE_TEXT ("\n i SIG") ACE_TEXT ("\n c CB") - ACE_TEXT ("\n s SUN") ACE_TEXT ("\n d default") ACE_TEXT ("\n-d ") ACE_TEXT ("\n-h for Client mode") @@ -1799,11 +1786,6 @@ set_proactor_type (const ACE_TCHAR *ptype) case 'I': proactor_type = SIG; return 1; -#if defined (sun) - case 'S': - proactor_type = SUN; - return 1; -#endif /* sun */ #if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; @@ -1891,13 +1873,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } // switch } // while - if (proactor_type == SUN && threads > 1) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ") - ACE_TEXT ("changing to 1 thread\n"))); - threads = 1; - } - return 0; } diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp index 9f4cbd438fb67..30457b30ac3a1 100644 --- a/ACE/tests/Proactor_UDP_Test.cpp +++ b/ACE/tests/Proactor_UDP_Test.cpp @@ -47,12 +47,11 @@ # include "ace/POSIX_Proactor.h" # include "ace/POSIX_CB_Proactor.h" -# include "ace/SUN_Proactor.h" #endif /* ACE_WIN32 */ // Proactor Type (UNIX only, Win32 ignored) -using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -100,7 +99,6 @@ static char close_ack_msg[] = "CLOSE-ACK"; class LogLocker { public: - LogLocker () { ACE_LOG_MSG->acquire (); } virtual ~LogLocker () { ACE_LOG_MSG->release (); } }; @@ -184,7 +182,6 @@ class MyTask : public ACE_Task ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; ACE_Proactor * proactor_; - }; int @@ -235,16 +232,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -# if defined (sun) - case SUN: - ACE_NEW_RETURN (proactor_impl, - ACE_SUN_Proactor (max_op), - -1); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%t) Create Proactor Type = SUN\n"))); - break; -# endif /* sun */ - # if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, @@ -748,10 +735,9 @@ struct Session_Data // indicating the addressing info for the client. // Master is initialized with a count of the number of expected sessions. After // this number are set up, Master will stop listening for session requests. -// This is a bit fragile but is necessary because on HP-UX, AIX, et al., it -// is impossible to close/cancel a socket with an outstanding UDP recieve -// (on AIX the process is so wedged the machine needs to be rebooted to -// clear it!). So, this bit of messiness is necessary for portability. +// This is a bit fragile but is necessary because on HP-UX, et al., it +// is impossible to close/cancel a socket with an outstanding UDP receive +// So, this bit of messiness is necessary for portability. // When the Master is destroyed, it will try to stop establishing sessions // but this will only work on Windows. class Master : public ACE_Handler @@ -1991,7 +1977,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[]) ACE_TEXT ("\n a AIOCB") ACE_TEXT ("\n i SIG") ACE_TEXT ("\n c CB") - ACE_TEXT ("\n s SUN") ACE_TEXT ("\n d default") ACE_TEXT ("\n-d ") ACE_TEXT ("\n-h for Client mode") @@ -2030,11 +2015,6 @@ set_proactor_type (const ACE_TCHAR *ptype) case 'I': proactor_type = SIG; return 1; -#if defined (sun) - case 'S': - proactor_type = SUN; - return 1; -#endif /* sun */ #if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; @@ -2118,13 +2098,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } // switch } // while - if (proactor_type == SUN && threads > 1) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ") - ACE_TEXT ("changing to 1 thread\n"))); - threads = 1; - } - return 0; } diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp index 559ef8fef196f..4b9342c85574a 100644 --- a/ACE/tests/Process_Env_Test.cpp +++ b/ACE/tests/Process_Env_Test.cpp @@ -14,10 +14,9 @@ #include "ace/Process.h" #include "ace/SString.h" +#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) using setenvfn_t = void (*)(const ACE_TCHAR *, const ACE_TCHAR *, void *); -#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE) - void create_large_env (setenvfn_t setenv, void *ctx) { static const size_t varsize = 1600; @@ -55,7 +54,7 @@ run_main (int, ACE_TCHAR*[]) int test_status = 0; ACE_START_TEST (ACE_TEXT ("Process_Env_Test")); -#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) ACE_Process_Options options ( 0, ACE_Process_Options::DEFAULT_COMMAND_LINE_BUF_LEN, @@ -100,7 +99,7 @@ run_main (int, ACE_TCHAR*[]) 128 * 1024); create_large_env (thisproc_setenv, 0); opts2.enable_unicode_environment (); - opts2.setenv (ACE_TEXT ("ZZ"), ACE_TEXT ("1")); + opts2.setenv (ACE_TEXT ("Z"), ACE_TEXT ("1")); opts2.command_line (ACE_TEXT ("cmd.exe /d /c ") ACE_TEXT ("\"if defined Z (exit 1) else (exit 2)\"")); ACE_Process process2; @@ -121,7 +120,7 @@ run_main (int, ACE_TCHAR*[]) #else ACE_DEBUG ((LM_INFO, "This test is for Win32 without ACE_USES_WCHAR\n")); -#endif /* ACE_WIN32 && !ACE_USES_WCHAR && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 && !ACE_USES_WCHAR */ ACE_END_TEST; return test_status; diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index 02d89c320c4bf..241498941b938 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -75,10 +75,7 @@ spawn_child (const ACE_TCHAR *argv0, int sleep_time, int my_process_id) { - -#if defined (ACE_HAS_WINCE) -const ACE_TCHAR *cmdline_format = ACE_TEXT("%s %d"); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) const ACE_TCHAR *cmdline_format = ACE_TEXT("\"%s\" %s %d"); #elif !defined (ACE_USES_WCHAR) const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT("%s %s %d"); @@ -135,9 +132,7 @@ const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE opts.process_name (argv0); #ifndef ACE_LACKS_VA_FUNCTIONS opts.command_line (cmdline_format, -#if !defined (ACE_HAS_WINCE) argv0, -#endif /* !ACE_HAS_WINCE */ cmd, sleep_time); #else @@ -241,7 +236,7 @@ command_line_test () ACE_Process_Options options (1, command_len + 1); #ifndef ACE_LACKS_VA_FUNCTIONS - options.command_line (command); + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs, command); #endif ACE_TCHAR * const *procargv = options.command_line_argv (); @@ -571,8 +566,7 @@ run_main (int argc, ACE_TCHAR *argv[]) } #endif /* ACE_HAS_THREADS */ -#if !defined (ACE_OPENVMS) && \ - (defined ACE_WIN32 || !defined ACE_LACKS_UNIX_SIGNALS) +#if defined ACE_WIN32 || !defined ACE_LACKS_UNIX_SIGNALS // -------------------------------------------------- // Finally, try the reactor stuff... mgr.open (ACE_Process_Manager::DEFAULT_SIZE, @@ -602,7 +596,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P) %d processes left in manager\n"), nr_procs)); -#endif /* !defined (ACE_OPENVMS) */ +#endif /* defined (ACE_WIN32) */ #endif // ACE_HAS_PROCESS_SPAWN ACE_END_TEST; return test_status; diff --git a/ACE/tests/Process_Manual_Event_Test.cpp b/ACE/tests/Process_Manual_Event_Test.cpp index 10c2d9187a653..a7a4832f4573e 100644 --- a/ACE/tests/Process_Manual_Event_Test.cpp +++ b/ACE/tests/Process_Manual_Event_Test.cpp @@ -184,20 +184,6 @@ run_main (int argc, ACE_TCHAR *argv[]) // The parent cleans up any remnant of past runs of this test. // See Bugzilla #2662 for further info. - // On AIX, this is done by removing the shared memory objects before - // trying to run. -# if defined (AIX) - // FUZZ: disable check_for_lack_ACE_OS - if (::shm_unlink (event_ping_name) != 0 && errno != ENOENT) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P) event_ping %p\n"), - ACE_TEXT ("shm_unlink"))); - if (::shm_unlink (event_pong_name) != 0 && errno != ENOENT) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P) event_pong %p\n"), - ACE_TEXT ("shm_unlink"))); - // FUZZ: enable check_for_lack_ACE_OS -# endif /* AIX */ ACE_TCHAR const * argv_0 = argc > 0 ? argv[0] : ACE_TEXT ("Process_Manual_Event_Test"); diff --git a/ACE/tests/Process_Mutex_Test.cpp b/ACE/tests/Process_Mutex_Test.cpp index 5d35c51bb7a8f..cc522300d5465 100644 --- a/ACE/tests/Process_Mutex_Test.cpp +++ b/ACE/tests/Process_Mutex_Test.cpp @@ -146,18 +146,14 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_Process_Mutex mutex( mutex_name ); # endif -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - static const ACE_TCHAR* format = ACE_TEXT ("%ls -c -n %ls%ls"); -#else - static const ACE_TCHAR* format = ACE_TEXT ("%s -c -n %s%s"); -#endif /* !ACE_WIN32 && ACE_USES_WCHAR */ ACE_Process_Options options; #ifndef ACE_LACKS_VA_FUNCTIONS - options.command_line (format, argc > 0 ? argv[0] : ACE_TEXT ("Process_Mutex_Test"), mutex_name, + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT (" -c -n %") ACE_TEXT_PRIs + ACE_TEXT ("%") ACE_TEXT_PRIs, + argc > 0 ? argv[0] : ACE_TEXT ("Process_Mutex_Test"), mutex_name, release_mutex == 0 ? ACE_TEXT (" -d") : ACE_TEXT ("")); -#else - ACE_UNUSED_ARG (format); #endif #ifdef ACE_HAS_PROCESS_SPAWN diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp index 8b29d6343943a..d8df9490bac1a 100644 --- a/ACE/tests/Process_Strategy_Test.cpp +++ b/ACE/tests/Process_Strategy_Test.cpp @@ -48,11 +48,6 @@ // Counting_Service and Options in here #include "Process_Strategy_Test.h" -// This test does not function properly when fork() is used on HP-UX -#if defined(__hpux) -#define ACE_LACKS_FORK -#endif /* __hpux */ - ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Null_Mutex); // Define a that's parameterized by the @@ -361,13 +356,6 @@ Counting_Service::handle_input (ACE_HANDLE) { char buf[BUFSIZ]; ACE_Time_Value* timeout = 0; -#if defined (__hpux) - // Even though we're in handle_input, there seems to be a - // situation on HP-UX where there is nothing to recv just yet. - // So, we recv() with a timeout and everything works. - ACE_Time_Value hpux_timeout (3); - timeout = &hpux_timeout; -#endif /* __hpux */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reading from peer on %d\n"), diff --git a/ACE/tests/Process_Strategy_Test.h b/ACE/tests/Process_Strategy_Test.h index 190b1d392ea33..8075bd35e7c0f 100644 --- a/ACE/tests/Process_Strategy_Test.h +++ b/ACE/tests/Process_Strategy_Test.h @@ -5,8 +5,7 @@ * @file Process_Strategy_Test.h * * This file contains the definition of Counting_Service and - * Options. Some compilers need it in a .h file for template - * instantiation (such as AIX C Set ++). + * Options. * * @author Doug Schmidt and Kevin Boyle */ @@ -54,10 +53,10 @@ class Counting_Service : public ACE_Svc_Handler and . @@ -72,7 +71,6 @@ class Counting_Service : public ACE_Svc_Handler { public: - // Constructor Process_Strategy (size_t n_processes = 1, ACE_Event_Handler *acceptor = 0, @@ -80,7 +78,7 @@ class Process_Strategy : public ACE_Process_Strategy int flags = 0); // Destructor - ~Process_Strategy (void); + ~Process_Strategy (); // Overwrite the process creation method to include connection // counting @@ -97,10 +95,10 @@ class Options : public ACE_Event_Handler { public: /// Constructor. - Options (void); + Options (); /// Destructor. - ~Options (void); + ~Options (); /// Read command-line arguments and initialize options. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -113,17 +111,17 @@ class Options : public ACE_Event_Handler }; // = Get/set concurrency type. - Concurrency_Type concurrency_type (void); + Concurrency_Type concurrency_type (); void concurrency_type (Concurrency_Type); /// Returns the file lock. - ACE_File_Lock &file_lock (void); + ACE_File_Lock &file_lock (); /// Returns the filename that we're using as the lock. - const ACE_TCHAR *filename (void); + const ACE_TCHAR *filename (); /// Returns the concurrency strategy. - ACE_Concurrency_Strategy *concurrency_strategy (void); + ACE_Concurrency_Strategy *concurrency_strategy (); private: /// Concurrency strategy that we're running. diff --git a/ACE/tests/Process_Test.cpp b/ACE/tests/Process_Test.cpp index d18a5265af81e..da2c0f67bb2e0 100644 --- a/ACE/tests/Process_Test.cpp +++ b/ACE/tests/Process_Test.cpp @@ -34,13 +34,7 @@ test_setenv () ACE_OS::strcat (bigval, ACE_TEXT ("01234567890123456789012345678901234567890123456789")); #ifndef ACE_LACKS_VA_FUNCTIONS -# if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - const ACE_TCHAR *fmt = ACE_TEXT ("%ls"); -# else - const ACE_TCHAR *fmt = ACE_TEXT ("%s"); -# endif - - if (0 != opts.setenv (ACE_TEXT ("A"), fmt, bigval)) + if (0 != opts.setenv (ACE_TEXT ("A"), ACE_TEXT ("%") ACE_TEXT_PRIs, bigval)) { status = errno; ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("setenv"))); @@ -258,9 +252,7 @@ run_main (int argc, ACE_TCHAR *argv[]) // Although most systems provide some mechanism to do this, the code // in this test uses Linux-specific techniques. Thus, although it // is possible to add the code for the checks on, for example, - // HP-UX (pstat_getproc, pstat_getpathname) and - // AIX (/proc is available, but there's no self and the fds are not links - // to the opened file names), the code isn't here at present. + // HP-UX (pstat_getproc, pstat_getpathname) #if defined (ACE_LACKS_FORK) || defined (ACE_LACKS_READLINK) || !defined(ACE_LINUX) ACE_ERROR ((LM_INFO, ACE_TEXT ("The remainder of this test is not supported on this platform\n"))); diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp index cbc994d43005b..dbb33561dee99 100644 --- a/ACE/tests/QtReactor_Test.cpp +++ b/ACE/tests/QtReactor_Test.cpp @@ -611,7 +611,6 @@ int HandlersRegister::scheduleTimers (const ACE_Time_Value &p_TestTime) -1); DgramHandlers_[ i ] ->expectedTriggers (DgramsToSend); - } return 0; @@ -900,7 +899,6 @@ void testQtReactor (int argc, ACE_TCHAR *argv[]) 0 <= handlersRegister.registerDgramHandlers () && 0 <= handlersRegister.registerTCPHandlers ()) { - app.exec (TotalTestTime); if (0 != handlersRegister.analyze ()) diff --git a/ACE/tests/RB_Tree_Test.h b/ACE/tests/RB_Tree_Test.h index 1b9d52fa91ca7..1ba8030c89957 100644 --- a/ACE/tests/RB_Tree_Test.h +++ b/ACE/tests/RB_Tree_Test.h @@ -23,7 +23,6 @@ template class ACE_RB_Tree_Test { - // To run the test class on a particular type instantiation of the // RB_Tree, simply instantiate the test class template with the // same type parameters, and invoke the run_test method. @@ -44,29 +43,28 @@ class ACE_RB_Tree_Test int order_index []); /// Destructor. - ~ACE_RB_Tree_Test (void); + ~ACE_RB_Tree_Test (); /// Run the individual interface and iteration tests in order. - void run_test (void); + void run_test (); private: - /// Tests stable and deprecated insertion interfaces. - void test_tree_insertion (void); + void test_tree_insertion (); /// Tests forward and reverse iteration after insertion in both /// trees. - void test_post_insertion_iteration (void); + void test_post_insertion_iteration (); ///Tests forward and reverse partial iteration - void test_partial_iteration(void); + void test_partial_iteration(); /// Tests stable and deprecated deletion interfaces. - void test_tree_deletion (void); + void test_tree_deletion (); /// Tests forward and reverse iteration after deletions in both /// trees. - void test_post_deletion_iteration (void); + void test_post_deletion_iteration (); /// Tree for testing stable interface. TREE stable_tree_; @@ -101,5 +99,4 @@ class ACE_RB_Tree_Test /// Order of indices in the key and item arrays. int *order_index_; - }; diff --git a/ACE/tests/RW_Process_Mutex_Test.cpp b/ACE/tests/RW_Process_Mutex_Test.cpp index 36ba22dd187d3..88781945c2fd2 100644 --- a/ACE/tests/RW_Process_Mutex_Test.cpp +++ b/ACE/tests/RW_Process_Mutex_Test.cpp @@ -22,7 +22,6 @@ #include "ace/OS_NS_unistd.h" - // The parent process is number -1. Writer is 0; Readers are 1-3. static int child_nr = -1; static u_short reporting_port = 0; @@ -431,11 +430,6 @@ run_main (int argc, ACE_TCHAR *argv[]) mutex_name.c_str (), ACE_TEXT ("ctor"))); } -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - static const ACE_TCHAR* format = ACE_TEXT ("%ls -c %d -p %u -n %ls"); -#else - static const ACE_TCHAR* format = ACE_TEXT ("%s -c %d -p %u -n %s"); -#endif /* !ACE_WIN32 && ACE_USES_WCHAR */ // The parent process reads time ranges sent from the children via // UDP. Grab an unused UDP port to tell the children to send to. @@ -462,13 +456,12 @@ run_main (int argc, ACE_TCHAR *argv[]) Child *child = (i == 0 ? &writer : &readers[i-1]); ACE_Process_Options options; #ifndef ACE_LACKS_VA_FUNCTIONS - options.command_line (format, + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT (" -c %d -p %u -n %") ACE_TEXT_PRIs, argc > 0 ? argv[0] : ACE_TEXT ("RW_Process_Mutex_Test"), i, (unsigned int)me.get_port_number (), mutex_name.c_str ()); -#else - ACE_UNUSED_ARG (format); #endif if (child->spawn (options) == -1) { diff --git a/ACE/tests/Reactor_Fairness_Test.cpp b/ACE/tests/Reactor_Fairness_Test.cpp index 426adc3e269c2..3a01da60f2325 100644 --- a/ACE/tests/Reactor_Fairness_Test.cpp +++ b/ACE/tests/Reactor_Fairness_Test.cpp @@ -31,7 +31,6 @@ #if defined (ACE_HAS_THREADS) namespace { - const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; // Number of connections to run diff --git a/ACE/tests/Reactor_Fairness_Test.h b/ACE/tests/Reactor_Fairness_Test.h index 468439c218ab1..848a817ba92a5 100644 --- a/ACE/tests/Reactor_Fairness_Test.h +++ b/ACE/tests/Reactor_Fairness_Test.h @@ -4,9 +4,7 @@ * @file Reactor_Fairness_Test.h * * This file includes template class definitions for the - * Reactor_Fairness_Test.cpp program. This class gets its own - * header file to work around AIX C++ compiler "features" related - * to template instantiation... + * Reactor_Fairness_Test.cpp program. * * @author Steve Huston */ diff --git a/ACE/tests/Reactor_Notification_Queue_Test.cpp b/ACE/tests/Reactor_Notification_Queue_Test.cpp index 47bdfe3c42986..8b643af240f14 100644 --- a/ACE/tests/Reactor_Notification_Queue_Test.cpp +++ b/ACE/tests/Reactor_Notification_Queue_Test.cpp @@ -180,7 +180,6 @@ Event_Handler::handle_exception (ACE_HANDLE) { if(notifications_curr_ >= max_notifications_) { - return 0; } send_notifications(); diff --git a/ACE/tests/Reactor_Notify_Test.cpp b/ACE/tests/Reactor_Notify_Test.cpp index 08874f291c376..89afd26e4fc96 100644 --- a/ACE/tests/Reactor_Notify_Test.cpp +++ b/ACE/tests/Reactor_Notify_Test.cpp @@ -446,7 +446,6 @@ run_test (int disable_notify_pipe, */ class Purged_Notify : public ACE_Event_Handler { - int handle_exception (ACE_HANDLE = ACE_INVALID_HANDLE) override { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/tests/Reactor_Performance_Test.h b/ACE/tests/Reactor_Performance_Test.h index f7282864f734e..758ac20745f49 100644 --- a/ACE/tests/Reactor_Performance_Test.h +++ b/ACE/tests/Reactor_Performance_Test.h @@ -4,9 +4,7 @@ * @file Reactor_Performance_Test.h * * This file includes template class definitions for the - * Reactor_Performance_Test.cpp program. This class gets its own - * header file to work around AIX C++ compiler "features" related - * to template instantiation... + * Reactor_Performance_Test.cpp program. * * @author Irfan Pyarali and Steve Huston */ @@ -55,7 +53,7 @@ class Write_Handler : public ACE_Svc_Handler { public: virtual int open (void *); - virtual int send_data (void); + virtual int send_data (); }; #endif /* ACE_TESTS_REACTOR_PERFORMANCE_TEST_H */ diff --git a/ACE/tests/Reactor_Registration_Test.cpp b/ACE/tests/Reactor_Registration_Test.cpp index f4d98da89e5f5..ffee3485de3ba 100644 --- a/ACE/tests/Reactor_Registration_Test.cpp +++ b/ACE/tests/Reactor_Registration_Test.cpp @@ -24,7 +24,6 @@ static int iteration = 1; class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (ACE_Reactor &reactor, ACE_HANDLE read, ACE_HANDLE write); diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp index e70af6e1f0904..6fa52a697ec6b 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp @@ -29,13 +29,11 @@ int overall_result = 0; class Bogus_Handler : public ACE_Event_Handler { public: - Bogus_Handler (ACE_Reactor * reactor, ACE_HANDLE read_handle, bool & okay_to_close); protected: - ~Bogus_Handler () override; ACE_HANDLE get_handle () const override; @@ -45,13 +43,11 @@ class Bogus_Handler : public ACE_Event_Handler int resume_handler () override; private: - ACE_HANDLE const read_handle_; // If the reactor closes the event handler before it gets the okay, // we will issue an error. bool & okay_to_close_; - }; Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor, @@ -113,7 +109,6 @@ Bogus_Handler::resume_handler () class Bad_Handler : public ACE_Event_Handler { public: - Bad_Handler (ACE_Reactor * reactor, ACE_HANDLE read_handle, bool & okay_to_close, @@ -122,11 +117,9 @@ class Bad_Handler : public ACE_Event_Handler ACE_HANDLE write_handle () const; protected: - ~Bad_Handler () override; private: - ACE_HANDLE get_handle () const override; int handle_input (ACE_HANDLE handle) override; int handle_close (ACE_HANDLE handle, @@ -135,7 +128,6 @@ class Bad_Handler : public ACE_Event_Handler int handle_input_result () const; private: - ACE_HANDLE const read_handle_; bool handle_close_called_; @@ -146,7 +138,6 @@ class Bad_Handler : public ACE_Event_Handler // Are we running the event handler suspension or removal test? bool suspension_test_; - }; Bad_Handler::Bad_Handler (ACE_Reactor * reactor, @@ -161,7 +152,6 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor, { this->reference_counting_policy ().value ( ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } Bad_Handler::~Bad_Handler () diff --git a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp index 943304eaf492a..e591a9b015931 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp @@ -33,13 +33,11 @@ int overall_result = 0; class Bogus_Handler : public ACE_Event_Handler { public: - Bogus_Handler (ACE_Reactor * reactor, ACE_HANDLE read_handle, bool & okay_to_close); protected: - ~Bogus_Handler () override; ACE_HANDLE get_handle () const override; @@ -49,13 +47,11 @@ class Bogus_Handler : public ACE_Event_Handler int resume_handler () override; private: - ACE_HANDLE const read_handle_; // If the reactor closes the event handler before it gets the okay, // we will issue an error. bool & okay_to_close_; - }; Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor, @@ -117,7 +113,6 @@ Bogus_Handler::resume_handler () class Bad_Handler : public ACE_Event_Handler { public: - Bad_Handler (ACE_Reactor * reactor, ACE_HANDLE read_handle, bool & okay_to_close, @@ -126,11 +121,9 @@ class Bad_Handler : public ACE_Event_Handler ACE_HANDLE write_handle () const; protected: - ~Bad_Handler () override; private: - ACE_HANDLE get_handle () const override; int handle_input (ACE_HANDLE handle) override; int handle_close (ACE_HANDLE handle, @@ -139,7 +132,6 @@ class Bad_Handler : public ACE_Event_Handler int handle_input_result () const; private: - ACE_HANDLE const read_handle_; bool handle_close_called_; @@ -150,7 +142,6 @@ class Bad_Handler : public ACE_Event_Handler // Are we running the event handler suspension or removal test? bool suspension_test_; - }; Bad_Handler::Bad_Handler (ACE_Reactor * reactor, @@ -165,7 +156,6 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor, { this->reference_counting_policy ().value ( ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } Bad_Handler::~Bad_Handler () diff --git a/ACE/tests/Reader_Writer_Test.cpp b/ACE/tests/Reader_Writer_Test.cpp index a9c747f5f2f91..95ff35d4457ac 100644 --- a/ACE/tests/Reader_Writer_Test.cpp +++ b/ACE/tests/Reader_Writer_Test.cpp @@ -157,7 +157,6 @@ reader (void *) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) could not upgrade to write lock!\n"))); - } else // result == -1 { diff --git a/ACE/tests/Recursive_Mutex_Test.cpp b/ACE/tests/Recursive_Mutex_Test.cpp index 891cf42b6df06..4ecd657ffa286 100644 --- a/ACE/tests/Recursive_Mutex_Test.cpp +++ b/ACE/tests/Recursive_Mutex_Test.cpp @@ -21,7 +21,6 @@ #include "ace/Recursive_Thread_Mutex.h" - #if defined (ACE_HAS_THREADS) #include "ace/Guard_T.h" diff --git a/ACE/tests/Refcounted_Auto_Ptr_Test.h b/ACE/tests/Refcounted_Auto_Ptr_Test.h index bc723826f6841..62ba56def9813 100644 --- a/ACE/tests/Refcounted_Auto_Ptr_Test.h +++ b/ACE/tests/Refcounted_Auto_Ptr_Test.h @@ -20,9 +20,9 @@ struct Printer { Printer (const char *message); - ~Printer (void) ; + ~Printer (); - void print (void); + void print (); const char *message_; unsigned int which_; diff --git a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp index 92bad5dd0dd20..591581b8951a6 100644 --- a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp +++ b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp @@ -21,7 +21,6 @@ #include "ace/ACE.h" - #if defined (ACE_HAS_DEV_POLL) || defined (ACE_HAS_EVENT_POLL) static const char *message = diff --git a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp index 7e2081b837dea..02a2272cbd5b0 100644 --- a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp @@ -764,7 +764,6 @@ simple (ACE_Reactor_Impl *impl) class Closed_In_Upcall_Event_Handler : public ACE_Event_Handler { public: - Closed_In_Upcall_Event_Handler (int &events); ~Closed_In_Upcall_Event_Handler () override; @@ -781,7 +780,6 @@ class Closed_In_Upcall_Event_Handler : public ACE_Event_Handler ACE_Pipe pipe_; int &events_; - }; Closed_In_Upcall_Event_Handler::Closed_In_Upcall_Event_Handler (int &events) diff --git a/ACE/tests/SOCK_Connector_Test.cpp b/ACE/tests/SOCK_Connector_Test.cpp index 78cabecb0d033..2db953b4c2188 100644 --- a/ACE/tests/SOCK_Connector_Test.cpp +++ b/ACE/tests/SOCK_Connector_Test.cpp @@ -62,7 +62,7 @@ host_is_up (ACE_TCHAR hostname[]) // The original problem this program tested for was incorrectly saying // a non-blocking connect completed successfully when it didn't. The // test doesn't always work when done to localhost -// (platform-dependant) so we look around for another host - any other +// (platform-dependent) so we look around for another host - any other // one will do. static void @@ -72,7 +72,6 @@ find_another_host (ACE_TCHAR other_host[]) if (cached_other_host[0] == '\0') { - ACE_OS::strcpy (other_host, ACE_DEFAULT_SERVER_HOST); // If all else fails @@ -104,10 +103,9 @@ find_another_host (ACE_TCHAR other_host[]) // an infinite loop on Linux --mas 03-08-2001 while ((h = gethostent ()) != 0) { - if (ACE_OS::strcmp (h->h_name, - ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0) + if (ACE_OS::strcmp (h->h_name, ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0) continue; - // AIX just _has_ to be different + if (ACE_OS::strcmp (h->h_name, "loopback") == 0) continue; @@ -316,4 +314,3 @@ run_main (int, ACE_TCHAR *[]) } - diff --git a/ACE/tests/SOCK_Netlink_Test.cpp b/ACE/tests/SOCK_Netlink_Test.cpp index d4c8e08bd2a38..49122342009a8 100644 --- a/ACE/tests/SOCK_Netlink_Test.cpp +++ b/ACE/tests/SOCK_Netlink_Test.cpp @@ -190,7 +190,6 @@ struct Netlink_Request }; - /** * The handler first is trying to delete an ip-address, further * to add the ip and, if successful to cleanup the address. @@ -198,7 +197,6 @@ struct Netlink_Request class Secondary_Ipaddr_Handler : public ACE_Event_Handler { public: - // Default constructor Secondary_Ipaddr_Handler (); @@ -260,7 +258,6 @@ class Secondary_Ipaddr_Handler : public ACE_Event_Handler int get_state () const { return this->state_;} protected: - //FUZZ: disable check_for_lack_ACE_OS // De-registers the handler from the reactor, // other cleanup jobs @@ -270,7 +267,6 @@ class Secondary_Ipaddr_Handler : public ACE_Event_Handler ACE_SOCK_Netlink& socket (); private: - // Schedule two sec timer. int schedule_one_sec_timer (); diff --git a/ACE/tests/SOCK_Send_Recv_Test.cpp b/ACE/tests/SOCK_Send_Recv_Test.cpp index 045ee1077adfc..544bf8a6641b2 100644 --- a/ACE/tests/SOCK_Send_Recv_Test.cpp +++ b/ACE/tests/SOCK_Send_Recv_Test.cpp @@ -29,7 +29,6 @@ #include "ace/SOCK_Stream.h" - // Change to non-zero if test fails static int Test_Result = 0; diff --git a/ACE/tests/SOCK_Send_Recv_Test_IPV6.cpp b/ACE/tests/SOCK_Send_Recv_Test_IPV6.cpp index b93f38ef47939..567077e580746 100644 --- a/ACE/tests/SOCK_Send_Recv_Test_IPV6.cpp +++ b/ACE/tests/SOCK_Send_Recv_Test_IPV6.cpp @@ -313,7 +313,7 @@ server (void *arg) #if defined (ACE_HAS_IPV6) static void -spawn (void) +spawn () { // Acceptor ACE_SOCK_Acceptor peer_acceptor; diff --git a/ACE/tests/SOCK_Test.cpp b/ACE/tests/SOCK_Test.cpp index 0235a6b9123c4..63e74c76a63e3 100644 --- a/ACE/tests/SOCK_Test.cpp +++ b/ACE/tests/SOCK_Test.cpp @@ -25,7 +25,6 @@ #include "ace/Handle_Set.h" - static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; void * diff --git a/ACE/tests/SOCK_Test_IPv6.cpp b/ACE/tests/SOCK_Test_IPv6.cpp index 652d0a41dde93..1723b383a5e7a 100644 --- a/ACE/tests/SOCK_Test_IPv6.cpp +++ b/ACE/tests/SOCK_Test_IPv6.cpp @@ -208,7 +208,7 @@ server (void *arg) } static void -spawn (void) +spawn () { // Acceptor ACE_SOCK_Acceptor peer_acceptor; diff --git a/ACE/tests/SPIPE_Test.cpp b/ACE/tests/SPIPE_Test.cpp index 7d782abd66a8d..0871fbdb14715 100644 --- a/ACE/tests/SPIPE_Test.cpp +++ b/ACE/tests/SPIPE_Test.cpp @@ -25,7 +25,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_HAS_WIN32_NAMED_PIPES) # define TEST_HAS_STREAM_PIPES #endif diff --git a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp index b85526f970e9a..5acc67f194780 100644 --- a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp +++ b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp @@ -104,7 +104,7 @@ typedef ACE_Singleton #define CLIENT_PROACTOR_TASK Client_Proactor_Task_Singleton::instance() int -Client_Proactor_Task::svc (void) +Client_Proactor_Task::svc () { // Keep RT signals on POSIX from killing us. disable_signal (ACE_SIGRTMIN, ACE_SIGRTMAX); @@ -133,7 +133,7 @@ typedef ACE_Singleton #define SERVER_PROACTOR_TASK Server_Proactor_Task_Singleton::instance () int -Server_Proactor_Task::svc (void) +Server_Proactor_Task::svc () { // Keep RT signals on POSIX from killing us. disable_signal (ACE_SIGRTMIN, ACE_SIGRTMAX); @@ -213,7 +213,7 @@ tmp_dh_callback (SSL *s, int is_export, int keylength) } bool -init_ssl (void) +init_ssl () { SSL_CTX_set_quiet_shutdown (ACE_SSL_Context::instance ()->context(), 1); SSL_CTX_set_options (ACE_SSL_Context::instance ()->context(), @@ -240,9 +240,9 @@ init_ssl (void) class Server_Service_Handler : public ACE_Service_Handler { public: - Server_Service_Handler (void); + Server_Service_Handler (); - virtual ~Server_Service_Handler (void); + virtual ~Server_Service_Handler (); //FUZZ: disable check_for_lack_ACE_OS virtual void open (ACE_HANDLE h, ACE_Message_Block&); @@ -254,13 +254,13 @@ class Server_Service_Handler : public ACE_Service_Handler virtual void handle_write_stream ( const ACE_Asynch_Write_Stream::Result &result); - virtual void handle_wakeup (void); + virtual void handle_wakeup (); - void cancel_and_close (void); + void cancel_and_close (); - int read_data (void); + int read_data (); - int write_data (void); + int write_data (); //FUZZ: disable check_for_lack_ACE_OS int read (ACE_Message_Block &mb, size_t bytes_to_read); @@ -280,7 +280,7 @@ class Server_Service_Handler : public ACE_Service_Handler int closing_; }; -Server_Service_Handler::Server_Service_Handler (void) : +Server_Service_Handler::Server_Service_Handler () : ssl_stream_ (ACE_SSL_Asynch_Stream::ST_SERVER), pending_writes_ (0), pending_reads_ (0), @@ -290,7 +290,7 @@ Server_Service_Handler::Server_Service_Handler (void) : { } -Server_Service_Handler::~Server_Service_Handler (void) +Server_Service_Handler::~Server_Service_Handler () { if (ACE_INVALID_HANDLE != this->handle ()) { @@ -432,7 +432,7 @@ Server_Service_Handler::handle_write_stream ( } void -Server_Service_Handler::handle_wakeup (void) +Server_Service_Handler::handle_wakeup () { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); @@ -440,7 +440,7 @@ Server_Service_Handler::handle_wakeup (void) } void -Server_Service_Handler::cancel_and_close (void) +Server_Service_Handler::cancel_and_close () { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); @@ -450,7 +450,7 @@ Server_Service_Handler::cancel_and_close (void) } int -Server_Service_Handler::read_data (void) +Server_Service_Handler::read_data () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); @@ -470,7 +470,7 @@ Server_Service_Handler::read_data (void) } int -Server_Service_Handler::write_data (void) +Server_Service_Handler::write_data () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); @@ -543,16 +543,16 @@ Server_Service_Handler::safe_to_delete () const class Acceptor : public ACE_Asynch_Acceptor { public: - Acceptor (void); + Acceptor (); - virtual ~Acceptor (void); + virtual ~Acceptor (); - virtual int cancel (void); + virtual int cancel (); virtual int validate_connection (const ACE_Asynch_Accept::Result& result, const ACE_INET_Addr &remote, const ACE_INET_Addr& local); - virtual Server_Service_Handler *make_handler (void); + virtual Server_Service_Handler *make_handler (); //FUZZ: disable check_for_lack_ACE_OS virtual int accept (size_t bytes_to_read = 0, const void *act = 0); @@ -573,19 +573,19 @@ class Acceptor : public ACE_Asynch_Acceptor typedef ACE_Singleton Acceptor_Singleton; #define ACCEPTOR Acceptor_Singleton::instance () -Acceptor::Acceptor (void) : +Acceptor::Acceptor () : accept_cnt_ (0), cancel_flag_ (0), service_handler_ (0) { } -Acceptor::~Acceptor (void) +Acceptor::~Acceptor () { } int -Acceptor::cancel (void) +Acceptor::cancel () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); @@ -635,7 +635,7 @@ Acceptor::validate_connection (const ACE_Asynch_Accept::Result& result, } Server_Service_Handler* -Acceptor::make_handler (void) +Acceptor::make_handler () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, 0); @@ -679,9 +679,9 @@ Acceptor::handle_accept (const ACE_Asynch_Accept::Result &result) class Client_Service_Handler : public ACE_Service_Handler { public: - Client_Service_Handler (void); + Client_Service_Handler (); - virtual ~Client_Service_Handler (void); + virtual ~Client_Service_Handler (); //FUZZ: disable check_for_lack_ACE_OS virtual void open (ACE_HANDLE h, ACE_Message_Block&); @@ -693,13 +693,13 @@ class Client_Service_Handler : public ACE_Service_Handler virtual void handle_write_stream ( const ACE_Asynch_Write_Stream::Result &result); - virtual void handle_wakeup (void); + virtual void handle_wakeup (); - void cancel_and_close (void); + void cancel_and_close (); - int read_data (void); + int read_data (); - int write_data (void); + int write_data (); //FUZZ: disable check_for_lack_ACE_OS int read (ACE_Message_Block &mb, size_t bytes_to_read); @@ -729,7 +729,7 @@ class Client_Service_Handler : public ACE_Service_Handler int closing_; }; -Client_Service_Handler::Client_Service_Handler (void) : +Client_Service_Handler::Client_Service_Handler () : ssl_stream_ (ACE_SSL_Asynch_Stream::ST_CLIENT), read_successful_ (0), pending_writes_ (0), @@ -741,7 +741,7 @@ Client_Service_Handler::Client_Service_Handler (void) : { } -Client_Service_Handler::~Client_Service_Handler (void) +Client_Service_Handler::~Client_Service_Handler () { if (ACE_INVALID_HANDLE != this->handle ()) { @@ -893,7 +893,7 @@ Client_Service_Handler::handle_write_stream ( } void -Client_Service_Handler::handle_wakeup (void) +Client_Service_Handler::handle_wakeup () { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); @@ -901,7 +901,7 @@ Client_Service_Handler::handle_wakeup (void) } void -Client_Service_Handler::cancel_and_close (void) +Client_Service_Handler::cancel_and_close () { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); @@ -911,7 +911,7 @@ Client_Service_Handler::cancel_and_close (void) } int -Client_Service_Handler::read_data (void) +Client_Service_Handler::read_data () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); @@ -931,7 +931,7 @@ Client_Service_Handler::read_data (void) } int -Client_Service_Handler::write_data (void) +Client_Service_Handler::write_data () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); @@ -1022,9 +1022,9 @@ Client_Service_Handler::read_successful () const class Connector : public ACE_Asynch_Connector { public: - Connector (void); + Connector (); - virtual ~Connector (void); + virtual ~Connector (); //FUZZ: disable check_for_lack_ACE_OS virtual int connect ( @@ -1047,7 +1047,7 @@ class Connector : public ACE_Asynch_Connector protected: virtual void handle_connect (const ACE_Asynch_Connect::Result &result); - virtual Client_Service_Handler* make_handler (void); + virtual Client_Service_Handler* make_handler (); mutable ACE_SYNCH_RECURSIVE_MUTEX mtx_; Client_Service_Handler *service_handler_; @@ -1057,12 +1057,12 @@ class Connector : public ACE_Asynch_Connector typedef ACE_Singleton Connector_Singleton; #define CONNECTOR Connector_Singleton::instance () -Connector::Connector (void) : +Connector::Connector () : service_handler_ (0) { } -Connector::~Connector (void) +Connector::~Connector () { } @@ -1111,7 +1111,7 @@ Connector::handle_connect (const ACE_Asynch_Connect::Result &result) } Client_Service_Handler* -Connector::make_handler (void) +Connector::make_handler () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, 0); diff --git a/ACE/tests/SSL/Main.cpp b/ACE/tests/SSL/Main.cpp index 46833b5d73f02..3d248d7016363 100644 --- a/ACE/tests/SSL/Main.cpp +++ b/ACE/tests/SSL/Main.cpp @@ -10,11 +10,8 @@ */ //============================================================================= - #include "ace/OS_main.h" -#if defined (ACE_HAS_WINCE) -# include "ace/ACE.h" -#endif /* ACE_HAS_WINCE */ + int run_main (int argc, ACE_TCHAR *argv[]); int diff --git a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp index 3bfe9271e7f05..162d22215fb64 100644 --- a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp +++ b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp @@ -38,9 +38,7 @@ #include "ace/SSL/SSL_SOCK_Acceptor.h" #include "ace/SSL/SSL_SOCK_Stream.h" - - -#if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if defined (ACE_HAS_THREADS) && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h index 6d96043f40ff0..487756358624c 100644 --- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h +++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h @@ -3,9 +3,7 @@ /** * @file Thread_Pool_Reactor_SSL_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Thread_Pool_Reactor_Test_SSL.cpp. + * It is only used by Thread_Pool_Reactor_Test_SSL.cpp. * * @author Irfan Pyarali Nanbor Wang */ diff --git a/ACE/tests/SString_Test.cpp b/ACE/tests/SString_Test.cpp index b79c597910514..75d47ad8b847b 100644 --- a/ACE/tests/SString_Test.cpp +++ b/ACE/tests/SString_Test.cpp @@ -18,7 +18,6 @@ #include "ace/SString.h" - static int testConcatenation() { #ifdef ACE_HAS_WCHAR ACE_WString s1; @@ -161,7 +160,6 @@ run_main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("SString_Test")); { - /* Set #1 */ ACE_CString s0 ("hello"); ACE_CString s1 ("hello"); diff --git a/ACE/tests/STL_algorithm_Test_T.cpp b/ACE/tests/STL_algorithm_Test_T.cpp index 5c9b99cfe6832..50c830ed1ec6b 100644 --- a/ACE/tests/STL_algorithm_Test_T.cpp +++ b/ACE/tests/STL_algorithm_Test_T.cpp @@ -9,10 +9,9 @@ template class Element_Counter { public: - Element_Counter (void) + Element_Counter () : count_ (0) { - } void operator () (typename T::value_type & item) diff --git a/ACE/tests/STL_algorithm_Test_T.h b/ACE/tests/STL_algorithm_Test_T.h index 7aeccccb1ea8d..0b7a40b0f7192 100644 --- a/ACE/tests/STL_algorithm_Test_T.h +++ b/ACE/tests/STL_algorithm_Test_T.h @@ -16,12 +16,6 @@ template int test_STL_algorithm (T & container); -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "STL_algorithm_Test_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("STL_algorithm_Test_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_TESTS_STL_ALGORITHM_TEST_T_H */ diff --git a/ACE/tests/SV_Shared_Memory_Test.cpp b/ACE/tests/SV_Shared_Memory_Test.cpp index ab3a6aba346cd..b877621691765 100644 --- a/ACE/tests/SV_Shared_Memory_Test.cpp +++ b/ACE/tests/SV_Shared_Memory_Test.cpp @@ -24,7 +24,6 @@ - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) // The shared memory allocator, which uses up the ACE_DEFAULT_SEM_KEY. diff --git a/ACE/tests/Semaphore_Test.cpp b/ACE/tests/Semaphore_Test.cpp index d43318c96aa39..6818f969d347a 100644 --- a/ACE/tests/Semaphore_Test.cpp +++ b/ACE/tests/Semaphore_Test.cpp @@ -20,7 +20,7 @@ #include "ace/OS_NS_unistd.h" // msec that times are allowed to differ before test fails. -#if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \ +#if defined (ACE_HAS_HI_RES_TIMER) || \ defined (ACE_HAS_PENTIUM) || \ defined (ACE_HAS_POWERPC_TIMER) # define ACE_ALLOWED_SLACK 100 diff --git a/ACE/tests/Service_Config_DLL.h b/ACE/tests/Service_Config_DLL.h index ca66ec748dbaf..be3e9db1a1a40 100644 --- a/ACE/tests/Service_Config_DLL.h +++ b/ACE/tests/Service_Config_DLL.h @@ -34,9 +34,8 @@ class Service_Config_DLL_Export Service_Config_DLL : public ACE_Task_Base { public: - /// Constructor. - Service_Config_DLL (void); + Service_Config_DLL (); /// Initializes object when dynamic linking occurs. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -52,11 +51,9 @@ class Service_Config_DLL_Export Service_Config_DLL : public ACE_Task_Base virtual int svc (); private: - /// Directives to be passed to be processed by the Service /// Configurator in separate threads. ACE_TCHAR directive_[2][BUFSIZ]; - }; /** diff --git a/ACE/tests/Service_Config_Stream_DLL.cpp b/ACE/tests/Service_Config_Stream_DLL.cpp index c33e875e931b5..4b65e329d849f 100644 --- a/ACE/tests/Service_Config_Stream_DLL.cpp +++ b/ACE/tests/Service_Config_Stream_DLL.cpp @@ -3,7 +3,6 @@ #include "ace/Service_Types.h" - int Test_Task::open (void *) { @@ -48,41 +47,41 @@ ACE_FACTORY_DEFINE (Service_Config_Stream_DLL, Test_Task) // Dynamically linked functions used to control configuration. -extern "C" Service_Config_Stream_DLL_Export MT_Stream *make_stream (void); -extern "C" Service_Config_Stream_DLL_Export MT_Module *make_da (void); -extern "C" Service_Config_Stream_DLL_Export MT_Module *make_ea (void); -extern "C" Service_Config_Stream_DLL_Export MT_Module *make_mr (void); -extern "C" Service_Config_Stream_DLL_Export MT_Module *make_close (void); +extern "C" Service_Config_Stream_DLL_Export MT_Stream *make_stream (); +extern "C" Service_Config_Stream_DLL_Export MT_Module *make_da (); +extern "C" Service_Config_Stream_DLL_Export MT_Module *make_ea (); +extern "C" Service_Config_Stream_DLL_Export MT_Module *make_mr (); +extern "C" Service_Config_Stream_DLL_Export MT_Module *make_close (); MT_Stream * -make_stream (void) +make_stream () { return new MT_Stream; } MT_Module * -make_da (void) +make_da () { return new MT_Module (ACE_TEXT ("Device_Adapter"), new Test_Task, new Test_Task); } MT_Module * -make_ea (void) +make_ea () { return new MT_Module (ACE_TEXT ("Event_Analyzer"), new Test_Task, new Test_Task); } MT_Module * -make_mr (void) +make_mr () { return new MT_Module (ACE_TEXT ("Multicast_Router"), new Test_Task, new Test_Task); } MT_Module * -make_close (void) +make_close () { return new MT_Module (ACE_TEXT ("Close_Test_Module"), new Test_Task, new Test_Task); diff --git a/ACE/tests/Service_Config_Test.cpp b/ACE/tests/Service_Config_Test.cpp index faecd5b834bf4..859d7d33cb2d5 100644 --- a/ACE/tests/Service_Config_Test.cpp +++ b/ACE/tests/Service_Config_Test.cpp @@ -183,7 +183,7 @@ testLoadingServiceConfFileAndProcessNo (int argc, ACE_TCHAR *argv[]) // Configurator file appropriate to the platform. // For example, Windows Unicode uses UTF-16. // - // iconv(1) found on Linux and Solaris, for example, can + // iconv(1) found on Linux, for example, can // be used to convert between encodings. // // Byte ordering is also an issue, so we should be @@ -285,7 +285,7 @@ testLoadingServiceConfFile (int argc, ACE_TCHAR *argv[]) // Configurator file appropriate to the platform. // For example, Windows Unicode uses UTF-16. // - // iconv(1) found on Linux and Solaris, for example, can + // iconv(1) found on Linux, for example, can // be used to convert between encodings. // // Byte ordering is also an issue, so we should be @@ -676,7 +676,7 @@ testNonACEThread () u_int errors_before = error; -#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WTHREADS) HANDLE thr_h = (HANDLE)_beginthreadex (0, 0, &nonacethreadentry, diff --git a/ACE/tests/Sig_Handlers_Test.cpp b/ACE/tests/Sig_Handlers_Test.cpp index 495fc85aadc31..9378667c33c8b 100644 --- a/ACE/tests/Sig_Handlers_Test.cpp +++ b/ACE/tests/Sig_Handlers_Test.cpp @@ -23,7 +23,6 @@ #include "ace/SString.h" - class Test_SIGINT_Handler : public ACE_Event_Handler { public: diff --git a/ACE/tests/Signal_Test.cpp b/ACE/tests/Signal_Test.cpp index 29f40c78eb9be..25cf75a6e5d8e 100644 --- a/ACE/tests/Signal_Test.cpp +++ b/ACE/tests/Signal_Test.cpp @@ -336,7 +336,7 @@ run_test (ACE_THR_FUNC worker, { // For the synchronous signal tests, block signals to prevent // asynchronous delivery to default handler (at least necessary - // on linux and solaris; POSIX spec also states that signal(s) + // on linux ; POSIX spec also states that signal(s) // should be blocked before call to sigwait()) ACE_Sig_Guard guard; diff --git a/ACE/tests/Sigset_Ops_Test.cpp b/ACE/tests/Sigset_Ops_Test.cpp index e29272100e102..9402ab7f0cc13 100644 --- a/ACE/tests/Sigset_Ops_Test.cpp +++ b/ACE/tests/Sigset_Ops_Test.cpp @@ -17,7 +17,6 @@ #include "ace/OS_NS_errno.h" - void siglistset (sigset_t x, int *sigset, int can_miss = 0) { diff --git a/ACE/tests/Simple_Message_Block_Test.cpp b/ACE/tests/Simple_Message_Block_Test.cpp index 0023f88a4a359..2c331dd96968b 100644 --- a/ACE/tests/Simple_Message_Block_Test.cpp +++ b/ACE/tests/Simple_Message_Block_Test.cpp @@ -21,7 +21,6 @@ #include "ace/Thread_Mutex.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Singleton_Test.cpp b/ACE/tests/Singleton_Test.cpp index 33d9ab857c7a8..936295f4277eb 100644 --- a/ACE/tests/Singleton_Test.cpp +++ b/ACE/tests/Singleton_Test.cpp @@ -14,7 +14,6 @@ #include "ace/Singleton.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Stack_Trace_Test.cpp b/ACE/tests/Stack_Trace_Test.cpp index ec14d0dc9e4c7..57cda976c3158 100644 --- a/ACE/tests/Stack_Trace_Test.cpp +++ b/ACE/tests/Stack_Trace_Test.cpp @@ -16,7 +16,6 @@ #include "test_config.h" - /* * Ultra-basic test of stack trace. * diff --git a/ACE/tests/TP_Reactor_Test.cpp b/ACE/tests/TP_Reactor_Test.cpp index 48691c478c44d..d81410851ba13 100644 --- a/ACE/tests/TP_Reactor_Test.cpp +++ b/ACE/tests/TP_Reactor_Test.cpp @@ -106,7 +106,6 @@ static char data[] = class LogLocker { public: - LogLocker () { ACE_LOG_MSG->acquire (); } virtual ~LogLocker () { ACE_LOG_MSG->release (); } }; @@ -693,13 +692,11 @@ Connector::on_delete_sender (Sender & sndr) bufs, bufr, this->sessions_)); - } int Connector::start (const ACE_INET_Addr & addr, int num) { - if (ACE_Connector::open (ACE_Reactor::instance (), ACE_NONBLOCK) < 0) ACE_ERROR_RETURN @@ -1176,7 +1173,6 @@ run_main (int argc, ACE_TCHAR *argv[]) if (addr.set (port, host, 1, addr.get_type ()) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), host)); rc += connector.start (addr, senders); - } if (rc > 0) diff --git a/ACE/tests/TP_Reactor_Test.h b/ACE/tests/TP_Reactor_Test.h index 92fe33b074748..b5f7e66cd3c97 100644 --- a/ACE/tests/TP_Reactor_Test.h +++ b/ACE/tests/TP_Reactor_Test.h @@ -3,8 +3,7 @@ /** * @file TP_Reactor_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Alexander Libman * @author @@ -38,15 +37,14 @@ class Receiver : public ACE_Svc_Handler { friend class Acceptor; public: - Receiver (Acceptor * acceptor=0, size_t index=MAX_RECEIVERS+1); - ~Receiver (void); + ~Receiver (); - long get_total_snd (void) { return this->total_snd_; } - long get_total_rcv (void) { return this->total_rcv_; } - long get_total_w (void) { return this->total_w_; } - long get_total_r (void) { return this->total_r_; } + long get_total_snd () { return this->total_snd_; } + long get_total_rcv () { return this->total_rcv_; } + long get_total_w () { return this->total_w_; } + long get_total_r () { return this->total_r_; } // virtual from ACE_Svc_Handler<> virtual int open (void * pVoid); @@ -59,7 +57,7 @@ class Receiver : public ACE_Svc_Handler private: int terminate_io (ACE_Reactor_Mask mask); int initiate_io (ACE_Reactor_Mask mask); - int check_destroy (void); + int check_destroy (); Acceptor * acceptor_; size_t index_; @@ -78,23 +76,22 @@ class Acceptor : public ACE_Acceptor { friend class Receiver; public: - size_t get_number_sessions (void) { return sessions_; } - long get_total_snd (void) { return this->total_snd_; } - long get_total_rcv (void) { return this->total_rcv_; } - long get_total_w (void) { return this->total_w_; } - long get_total_r (void) { return this->total_r_; } + size_t get_number_sessions () { return sessions_; } + long get_total_snd () { return this->total_snd_; } + long get_total_rcv () { return this->total_rcv_; } + long get_total_w () { return this->total_w_; } + long get_total_r () { return this->total_r_; } - Acceptor (void); - virtual ~Acceptor (void); + Acceptor (); + virtual ~Acceptor (); - void stop (void); + void stop (); int start (const ACE_INET_Addr & addr); // virtual from ACE_Acceptor virtual int make_svc_handler (Receiver * & sh); private: - ACE_Recursive_Thread_Mutex mutex_; size_t sessions_; Receiver *list_receivers_[MAX_RECEIVERS]; @@ -121,12 +118,12 @@ class Sender : public ACE_Svc_Handler public: Sender (Connector * connector=0, size_t index=MAX_SENDERS+1); - ~Sender (void); + ~Sender (); - long get_total_snd (void) { return this->total_snd_; } - long get_total_rcv (void) { return this->total_rcv_; } - long get_total_w (void) { return this->total_w_; } - long get_total_r (void) { return this->total_r_; } + long get_total_snd () { return this->total_snd_; } + long get_total_rcv () { return this->total_rcv_; } + long get_total_w () { return this->total_w_; } + long get_total_r () { return this->total_r_; } // virtual from ACE_Svc_Handler<> virtual int open (void * pVoid); @@ -140,7 +137,7 @@ class Sender : public ACE_Svc_Handler int terminate_io (ACE_Reactor_Mask mask); int initiate_io (ACE_Reactor_Mask mask); int initiate_write (); - int check_destroy (void); + int check_destroy (); Connector * connector_; size_t index_; @@ -161,11 +158,11 @@ class Connector: public ACE_Connector { friend class Sender; public: - size_t get_number_sessions (void) { return sessions_; } - long get_total_snd (void) { return this->total_snd_; } - long get_total_rcv (void) { return this->total_rcv_; } - long get_total_w (void) { return this->total_w_; } - long get_total_r (void) { return this->total_r_; } + size_t get_number_sessions () { return sessions_; } + long get_total_snd () { return this->total_snd_; } + long get_total_rcv () { return this->total_rcv_; } + long get_total_w () { return this->total_w_; } + long get_total_r () { return this->total_r_; } Connector (); @@ -178,7 +175,6 @@ class Connector: public ACE_Connector virtual int make_svc_handler (Sender * & sh); private: - ACE_Recursive_Thread_Mutex mutex_; size_t sessions_; Sender * list_senders_ [MAX_SENDERS]; diff --git a/ACE/tests/TSS_Static_Test.cpp b/ACE/tests/TSS_Static_Test.cpp index 8a3aef6f659f5..c86f1e4fee63e 100644 --- a/ACE/tests/TSS_Static_Test.cpp +++ b/ACE/tests/TSS_Static_Test.cpp @@ -20,17 +20,16 @@ #include "ace/Thread.h" - #if defined (ACE_HAS_TSS_EMULATION) class Some_Object { public: - Some_Object (void); - ~Some_Object (void); + Some_Object (); + ~Some_Object (); }; -Some_Object::Some_Object (void) +Some_Object::Some_Object () { ACE::init (); @@ -46,7 +45,7 @@ Some_Object::Some_Object (void) } -Some_Object::~Some_Object (void) +Some_Object::~Some_Object () { ACE::fini (); } diff --git a/ACE/tests/TSS_Test.cpp b/ACE/tests/TSS_Test.cpp index 79c7ca3d1136c..62feb2045194b 100644 --- a/ACE/tests/TSS_Test.cpp +++ b/ACE/tests/TSS_Test.cpp @@ -23,7 +23,6 @@ #include "TSS_Test_Errno.h" - static u_int errors = 0; #if defined (ACE_HAS_THREADS) diff --git a/ACE/tests/TSS_Test_Errno.h b/ACE/tests/TSS_Test_Errno.h index 2964351b743b6..de556a585fca1 100644 --- a/ACE/tests/TSS_Test_Errno.h +++ b/ACE/tests/TSS_Test_Errno.h @@ -4,9 +4,7 @@ /** * @file TSS_Test_Errno.h * - * This file contains the definition of Errno. Some compilers need - * it in a .h file for template instantiation (such as AIX C Set - * ++). + * This file contains the definition of Errno. * * @author Douglas C. Schmidt */ @@ -21,9 +19,7 @@ * * @brief Define a simple Errno abstraction * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by TSS_Test.cpp. + * It is only used by TSS_Test.cpp. */ class Errno { @@ -39,15 +35,15 @@ class Errno deleted_ += 1; } - int error (void) { return this->errno_; } + int error () { return this->errno_; } void error (int i) { this->errno_ = i; } - int line (void) { return this->lineno_; } + int line () { return this->lineno_; } void line (int l) { this->lineno_ = l; } // Errno::flags_ is a static variable, so we've got to protect it // with a mutex since it isn't kept in thread-specific storage. - int flags (void) + int flags () { ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_Mon, *Errno::lock_, -1)); @@ -61,12 +57,12 @@ class Errno return 0; } - static int created (void) + static int created () { return created_; } - static int deleted (void) + static int deleted () { return deleted_; } @@ -74,7 +70,7 @@ class Errno #if defined (ACE_HAS_THREADS) static ACE_Thread_Mutex * - allocate_lock (void) + allocate_lock () { ACE_NEW_RETURN (Errno::lock_, ACE_Thread_Mutex, 0); return Errno::lock_; diff --git a/ACE/tests/Task_Ex_Test.cpp b/ACE/tests/Task_Ex_Test.cpp index 4acc9159ea6dd..c362de4c6fb25 100644 --- a/ACE/tests/Task_Ex_Test.cpp +++ b/ACE/tests/Task_Ex_Test.cpp @@ -41,7 +41,6 @@ class Consumer : public ACE_Task_Ex /// svc thread entry point int svc () override; private: - }; int Consumer::open (void*) diff --git a/ACE/tests/Task_Ex_Test.h b/ACE/tests/Task_Ex_Test.h index 01aa1c1ce0855..ccb7c377ed912 100644 --- a/ACE/tests/Task_Ex_Test.h +++ b/ACE/tests/Task_Ex_Test.h @@ -4,8 +4,7 @@ /** * @file Task_Ex_Test.h * - * Define class needed for generating templates. IBM C++ requires this - * to be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kobi Cohen-Arazi */ diff --git a/ACE/tests/Thread_Attrs_Test.cpp b/ACE/tests/Thread_Attrs_Test.cpp index 3f70624918c25..a8edb0327b839 100644 --- a/ACE/tests/Thread_Attrs_Test.cpp +++ b/ACE/tests/Thread_Attrs_Test.cpp @@ -125,7 +125,6 @@ Cancel_Check::open (void *) */ class Stack_Size_Check : public ACE_Task { - public: /// Create the thread with specified stack size Stack_Size_Check (size_t stack_size); diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp index 04d501e1eb6b4..1627e0133095d 100644 --- a/ACE/tests/Thread_Creation_Threshold_Test.cpp +++ b/ACE/tests/Thread_Creation_Threshold_Test.cpp @@ -6,11 +6,7 @@ * This test program stresses how many threads can be * consecutively (not simultaneously) created on a platform. * Rather than testing exhaustively, it establishes a - * semi-arbitrary upper limit (MAX_THREAD)of threads. The limit - * is only partly arbitrary because it was chosen as a value that - * exceeded an observed upper limit on the values that Solaris 9 - * will accept as arguments to thr_concurrency(), used by - * ACE_OS::thr_create(THR_NEW_LWP). + * semi-arbitrary upper limit (MAX_THREAD)of threads. * * @author Chris Cleeland */ @@ -21,7 +17,6 @@ #include "ace/Task.h" - #if defined (ACE_HAS_THREADS) #include "ace/Lock_Adapter_T.h" #include "ace/OS_NS_stdio.h" diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp index 5a99165519340..878f83d23e9c6 100644 --- a/ACE/tests/Thread_Manager_Test.cpp +++ b/ACE/tests/Thread_Manager_Test.cpp @@ -192,7 +192,6 @@ ThrMgr_Task::svc () static int test_task_record_keeping (ACE_Thread_Manager *mgr) { - int status = 0; ThrMgr_Task t1 (mgr), t2 (mgr); diff --git a/ACE/tests/Thread_Mutex_Test.cpp b/ACE/tests/Thread_Mutex_Test.cpp index b8b0485b56bcf..3f72afe6db662 100644 --- a/ACE/tests/Thread_Mutex_Test.cpp +++ b/ACE/tests/Thread_Mutex_Test.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_THREADS) #include "ace/Guard_T.h" diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp index 168352223545b..edfbcf035a7fc 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -39,7 +39,6 @@ #include "ace/TP_Reactor.h" - #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT #include "Thread_Pool_Reactor_Resume_Test.h" diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h index 677dd333e1cd5..a2fe552260dff 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h @@ -3,9 +3,7 @@ /** * @file Thread_Pool_Reactor_Resume_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Thread_Pool_Reactor_Test.cpp. + * It is only used by Thread_Pool_Reactor_Test.cpp. * * @author Irfan Pyarali Nanbor Wang */ @@ -31,19 +29,18 @@ class Request_Handler : public ACE_Svc_Handler { public: - /// The default constructor makes sure the right reactor is used. Request_Handler (ACE_Thread_Manager *tm = 0); /// Dtor.. - ~Request_Handler (void); + ~Request_Handler (); virtual int open (void * = 0); protected: virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE); virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask = 0); - virtual int resume_handler (void); + virtual int resume_handler (); private: size_t nr_msgs_rcvd_; diff --git a/ACE/tests/Thread_Pool_Reactor_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Test.cpp index 07c134f96fdb4..aa654361fba34 100644 --- a/ACE/tests/Thread_Pool_Reactor_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Test.cpp @@ -42,7 +42,6 @@ #include "ace/TP_Reactor.h" - #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT #include "Thread_Pool_Reactor_Test.h" diff --git a/ACE/tests/Thread_Pool_Reactor_Test.h b/ACE/tests/Thread_Pool_Reactor_Test.h index 78e9dc7b0be8b..a1abf6852a9e5 100644 --- a/ACE/tests/Thread_Pool_Reactor_Test.h +++ b/ACE/tests/Thread_Pool_Reactor_Test.h @@ -3,9 +3,7 @@ /** * @file Thread_Pool_Reactor_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Thread_Pool_Reactor_Test.cpp. + * It is only used by Thread_Pool_Reactor_Test.cpp. * * @author Irfan Pyarali Nanbor Wang */ diff --git a/ACE/tests/Thread_Pool_Test.cpp b/ACE/tests/Thread_Pool_Test.cpp index 0a76061e31ab5..7be44853b3647 100644 --- a/ACE/tests/Thread_Pool_Test.cpp +++ b/ACE/tests/Thread_Pool_Test.cpp @@ -223,14 +223,12 @@ Thread_Pool::test_queue_deactivation_shutdown () if (manual) { -#if !defined (ACE_HAS_WINCE) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) enter a new message for ") ACE_TEXT ("the task pool..."))); n = ACE_OS::read (ACE_STDIN, mb->wr_ptr (), mb->size ()); -#endif // ACE_HAS_WINCE } else { @@ -315,14 +313,12 @@ Thread_Pool::test_empty_message_shutdown () if (manual) { -#if !defined (ACE_HAS_WINCE) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) enter a new message for ") ACE_TEXT ("the task pool..."))); n = ACE_OS::read (ACE_STDIN, mb->wr_ptr (), mb->size ()); -#endif // ACE_HAS_WINCE } else { diff --git a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp index f932dbd2ad59a..b5d62df79a66a 100644 --- a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp +++ b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp @@ -22,7 +22,6 @@ class ICustomEventHandler { public: - /// Default constructor. /// /// @return @@ -51,7 +50,6 @@ class ICustomEventHandler class CCustomEventHandlerUpcall { public: - using TTimerQueue = ACE_Timer_Queue_T; /// Default constructor @@ -115,7 +113,6 @@ class CCustomEventHandlerUpcall class CTestEventHandler : public ICustomEventHandler { public: - /// Default constructor. /// /// @return @@ -154,7 +151,6 @@ class CTestEventHandler : public ICustomEventHandler } private: - long* m_p_iCallCount; ACE_Thread_Mutex m_Mutex; }; diff --git a/ACE/tests/Time_Service_Test.cpp b/ACE/tests/Time_Service_Test.cpp index f8350526b36d3..295d784f5f955 100644 --- a/ACE/tests/Time_Service_Test.cpp +++ b/ACE/tests/Time_Service_Test.cpp @@ -65,7 +65,7 @@ run_main (int, ACE_TCHAR *[]) const ACE_TCHAR *server_cl = APPLICATION ACE_TEXT ("server.conf"); ACE_Process_Options server_options; #ifndef ACE_LACKS_VA_FUNCTIONS - server_options.command_line (server_cl); + server_options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs, server_cl); #endif ACE_Process server; @@ -85,7 +85,7 @@ run_main (int, ACE_TCHAR *[]) const ACE_TCHAR *clerk_cl = APPLICATION ACE_TEXT ("clerk.conf"); ACE_Process_Options clerk_options; #ifndef ACE_LACKS_VA_FUNCTIONS - clerk_options.command_line (clerk_cl); + clerk_options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs, clerk_cl); #endif ACE_Process clerk; diff --git a/ACE/tests/Timeprobe_Test.cpp b/ACE/tests/Timeprobe_Test.cpp index 9c518837edb07..d4fa1f1d350ce 100644 --- a/ACE/tests/Timeprobe_Test.cpp +++ b/ACE/tests/Timeprobe_Test.cpp @@ -23,7 +23,6 @@ #include "ace/Timeprobe.h" - #if defined (ACE_ENABLE_TIMEPROBES) static const char *events_descriptions_0[] = diff --git a/ACE/tests/Timer_Cancellation_Test.cpp b/ACE/tests/Timer_Cancellation_Test.cpp index b4f3aa96d46b9..af2a3fae4cb72 100644 --- a/ACE/tests/Timer_Cancellation_Test.cpp +++ b/ACE/tests/Timer_Cancellation_Test.cpp @@ -19,7 +19,6 @@ class Deadlock : public ACE_Task_Base { public: - int svc () override; int handle_timeout (const ACE_Time_Value ¤t_time, @@ -55,7 +54,6 @@ Deadlock::handle_timeout (const ACE_Time_Value &, class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (Deadlock &deadlock); int handle_timeout (const ACE_Time_Value ¤t_time, diff --git a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp index 94f7f395e85f7..2ada4183a345c 100644 --- a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp +++ b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp @@ -24,7 +24,6 @@ #include "ace/OS_NS_unistd.h" - static int debug = 0; static const char *one_second_timeout = "one second timeout"; static const char *two_second_timeout = "two second timeout"; @@ -45,7 +44,6 @@ namespace class Reference_Counted_Event_Handler : public ACE_Event_Handler { public: - Reference_Counted_Event_Handler (int expected_number_of_handle_close_calls); ~Reference_Counted_Event_Handler () override; @@ -349,7 +347,6 @@ upcall_test::upcall_test (const char *timer_queue_type) class Simple_Event_Handler : public ACE_Event_Handler { public: - Simple_Event_Handler (); ~Simple_Event_Handler () override; diff --git a/ACE/tests/Token_Strategy_Test.cpp b/ACE/tests/Token_Strategy_Test.cpp index cc1401aa54090..5c1e990164dc3 100644 --- a/ACE/tests/Token_Strategy_Test.cpp +++ b/ACE/tests/Token_Strategy_Test.cpp @@ -24,13 +24,11 @@ #include "ace/Barrier.h" - #if defined (ACE_HAS_THREADS) class Token_Strategy_Test : public ACE_Task { public: - Token_Strategy_Test (ACE_Token::QUEUEING_STRATEGY strategy = ACE_Token::FIFO, int threads = 5, int invocations = 10); ~Token_Strategy_Test () override; diff --git a/ACE/tests/UPIPE_SAP_Test.cpp b/ACE/tests/UPIPE_SAP_Test.cpp index c0b5a243b73bc..b8c420529ebd4 100644 --- a/ACE/tests/UPIPE_SAP_Test.cpp +++ b/ACE/tests/UPIPE_SAP_Test.cpp @@ -20,7 +20,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_THREADS) && \ (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_HAS_WIN32_NAMED_PIPES)) diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp index b1a1b2d831baf..17088486a3273 100644 --- a/ACE/tests/Unload_libACE.cpp +++ b/ACE/tests/Unload_libACE.cpp @@ -26,10 +26,6 @@ #endif /* !ACE_VXWORKS && !__MINGW32__ && !CYGWIN32 */ #endif /* __GNUC__ */ -#if defined (__hpux) || defined (__SUNPRO_CC) -#define UNLOAD_LIBACE_TEST 1 -#endif /* (__hpux) || (__SUNPRO_CC) */ - #if defined (ACE_AS_STATIC_LIBS) #undef UNLOAD_LIBACE_TEST #endif /* ACE_AS_STATIC_LIBS */ @@ -160,9 +156,7 @@ main (int, char **) #else strcat (buf, "ACE"); #endif /* ACE_LIB_NAME */ -#if defined (__hpux) && !(defined (__ia64) && (__ia64 == 1)) - strcat (buf, ".sl"); -#elif defined (__APPLE__) +#if defined (__APPLE__) strcat (buf, ".dylib"); #else strcat (buf, ".so"); @@ -240,11 +234,9 @@ main (int, char **) #else # if defined (WIN32) && defined (ACE_USES_WCHAR) // Borrow include list from ace_wchar.h -# if defined (ACE_HAS_WINCE) -# include /**/ -# elif !defined (__BORLANDC__) +# if !defined (__BORLANDC__) # include /**/ -# endif /* ACE_HAS_WINCE || __BORLANDC__ */ +# endif /* __BORLANDC__ */ int wmain (int, wchar_t **) diff --git a/ACE/tests/Upgradable_RW_Test.cpp b/ACE/tests/Upgradable_RW_Test.cpp index e0f028307099a..d6ef8d0b60790 100644 --- a/ACE/tests/Upgradable_RW_Test.cpp +++ b/ACE/tests/Upgradable_RW_Test.cpp @@ -19,7 +19,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) // Default number of iterations. @@ -92,7 +91,6 @@ find_last () } return 0; - } // Explain usage and exit. diff --git a/ACE/tests/Upgradable_RW_Test.h b/ACE/tests/Upgradable_RW_Test.h index 24ae64d5e30b3..d6de6cbc2547e 100644 --- a/ACE/tests/Upgradable_RW_Test.h +++ b/ACE/tests/Upgradable_RW_Test.h @@ -3,9 +3,7 @@ /** * @file Upgradable_RW_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Upgradable_RW_Test.cpp. + * It is only used by Upgradable_RW_Test.cpp. * * @author Michael Kircher */ @@ -53,7 +51,7 @@ class Element { } - ACE_CString *value (void) + ACE_CString *value () { return this->item_; } @@ -74,7 +72,7 @@ typedef ACE_Double_Linked_List Linked_List; class Time_Calculation { public: - Time_Calculation (void) + Time_Calculation () : reported_times_ (0) { times_.real_time = 0; @@ -85,7 +83,7 @@ class Time_Calculation /// take the time of the thread and add it to void report_time (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time); - void print_stats (void); + void print_stats (); private: /// add the times incrementally diff --git a/ACE/tests/WFMO_Reactor_Test.cpp b/ACE/tests/WFMO_Reactor_Test.cpp index e76d831ee6d75..d1058c1d6c595 100644 --- a/ACE/tests/WFMO_Reactor_Test.cpp +++ b/ACE/tests/WFMO_Reactor_Test.cpp @@ -25,7 +25,7 @@ class Event_Handler : public ACE_Event_Handler public: Event_Handler (ACE_Reactor &reactor); - ~Event_Handler (void); + ~Event_Handler (); ACE_Pipe pipe_; }; @@ -58,7 +58,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor) ACE_TEST_ASSERT (result == 0); } -Event_Handler::~Event_Handler (void) +Event_Handler::~Event_Handler () { ACE_DEBUG ((LM_DEBUG, "Reference count in ~Event_Handler() is %d\n", @@ -68,7 +68,7 @@ Event_Handler::~Event_Handler (void) } void -test (void) +test () { int result = 0; int i = 0; diff --git a/ACE/tests/XtAthenaReactor_Test.cpp b/ACE/tests/XtAthenaReactor_Test.cpp index 7a506993e53c2..49941d2e895a0 100644 --- a/ACE/tests/XtAthenaReactor_Test.cpp +++ b/ACE/tests/XtAthenaReactor_Test.cpp @@ -200,7 +200,7 @@ class Connection_Handler : public ACE_Svc_Handlerset (addr); } -ACE_HTTP_Addr::~ACE_HTTP_Addr (void) +ACE_HTTP_Addr::~ACE_HTTP_Addr () { this->clear (); this->hostname_ = 0; @@ -278,7 +268,7 @@ ACE_HTTP_Addr::set (const ACE_HTTP_Addr &addr) } void -ACE_HTTP_Addr::clear (void) +ACE_HTTP_Addr::clear () { if (this->hostname_ != 0) ACE_OS::free (this->hostname_); @@ -531,11 +521,11 @@ ACE_HTTP_Addr::addr_to_string (ACE_TCHAR *buffer, if (flags == 0) { ACE_INET_Addr inet = this->get_inet_address (); - n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, inet.get_host_addr ()); + n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, inet.get_host_addr ()); } else { - n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->hostname_); + n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, this->hostname_); } if (this->port_number_ != ACE_DEFAULT_HTTP_PORT) @@ -545,13 +535,13 @@ ACE_HTTP_Addr::addr_to_string (ACE_TCHAR *buffer, if (this->path_ != 0) { n += ACE_OS::sprintf (buffer + n, - ACE_TEXT ("/") ACE_PRINTF_S, + ACE_TEXT ("/%") ACE_TEXT_PRIs, this->path_); } if (this->query_ != 0) { n += ACE_OS::sprintf (buffer + n, - ACE_TEXT ("?") ACE_PRINTF_S, + ACE_TEXT ("?%") ACE_TEXT_PRIs, this->query_); } return 0; @@ -565,7 +555,7 @@ ACE_HTTP_Addr::accept (ACE_URL_Addr_Visitor *visitor) // **************************************************************** -ACE_FTP_Addr::ACE_FTP_Addr (void) +ACE_FTP_Addr::ACE_FTP_Addr () : user_ (0), password_ (0), hostname_ (0), @@ -595,7 +585,7 @@ ACE_FTP_Addr::ACE_FTP_Addr (const ACE_FTP_Addr& addr) this->set (addr); } -ACE_FTP_Addr::~ACE_FTP_Addr (void) +ACE_FTP_Addr::~ACE_FTP_Addr () { this->clear (); } @@ -652,7 +642,7 @@ ACE_FTP_Addr::set (const ACE_FTP_Addr& addr) } void -ACE_FTP_Addr::clear (void) +ACE_FTP_Addr::clear () { if (this->hostname_ != 0) ACE_OS::free (this->hostname_); @@ -704,12 +694,12 @@ ACE_FTP_Addr::addr_to_string (ACE_TCHAR *buffer, if (this->user_ != 0) { - n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->user_); + n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, this->user_); } if (this->password_ != 0) { n += ACE_OS::sprintf (buffer + n, - ACE_TEXT (":") ACE_PRINTF_S, + ACE_TEXT (":%") ACE_TEXT_PRIs, this->password_); } @@ -721,16 +711,16 @@ ACE_FTP_Addr::addr_to_string (ACE_TCHAR *buffer, if (flags == 0) { ACE_INET_Addr inet = this->get_inet_address (); - n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, inet.get_host_addr ()); + n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, inet.get_host_addr ()); } else { - n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->hostname_); + n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, this->hostname_); } if (this->path_ != 0) { n += ACE_OS::sprintf (buffer + n, - ACE_TEXT ("/") ACE_PRINTF_S, + ACE_TEXT ("/%") ACE_TEXT_PRIs, this->path_); } return 0; @@ -805,7 +795,7 @@ ACE_FTP_Addr::accept (ACE_URL_Addr_Visitor* visitor) // **************************************************************** -ACE_Mailto_Addr::ACE_Mailto_Addr (void) +ACE_Mailto_Addr::ACE_Mailto_Addr () : user_ (0), hostname_ (0), headers_ (0) @@ -831,7 +821,7 @@ ACE_Mailto_Addr::ACE_Mailto_Addr (const ACE_Mailto_Addr &addr) this->set (addr); } -ACE_Mailto_Addr::~ACE_Mailto_Addr (void) +ACE_Mailto_Addr::~ACE_Mailto_Addr () { this->clear (); } @@ -877,7 +867,7 @@ ACE_Mailto_Addr::set (const ACE_Mailto_Addr &addr) } void -ACE_Mailto_Addr::clear (void) +ACE_Mailto_Addr::clear () { if (this->user_ != 0) ACE_OS::free (this->user_); @@ -915,12 +905,12 @@ ACE_Mailto_Addr::addr_to_string (ACE_TCHAR *buffer, return -1; size_t n = ACE_OS::sprintf (buffer, - ACE_TEXT ("mailto:") ACE_PRINTF_S ACE_TEXT - ("@") ACE_PRINTF_S, + ACE_TEXT ("mailto:%") ACE_TEXT_PRIs + ACE_TEXT ("@%") ACE_TEXT_PRIs, this->user_, this->hostname_); if (this->headers_ != 0) { - n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("?") ACE_PRINTF_S, + n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("?%") ACE_TEXT_PRIs, this->headers_); } diff --git a/ACE/websvcs/lib/URL_Addr.h b/ACE/websvcs/lib/URL_Addr.h index a3e2ba7ba4095..2cf9fe638ffb7 100644 --- a/ACE/websvcs/lib/URL_Addr.h +++ b/ACE/websvcs/lib/URL_Addr.h @@ -34,7 +34,7 @@ class ACE_WEBSVCS_Export ACE_URL_Addr : public ACE_Addr { public: /// Constructor. - ACE_URL_Addr (void); + ACE_URL_Addr (); /// The copy constructor. ACE_URL_Addr (const ACE_URL_Addr& address); @@ -43,7 +43,7 @@ class ACE_WEBSVCS_Export ACE_URL_Addr : public ACE_Addr ACE_URL_Addr& operator= (const ACE_URL_Addr& address); /// destructor - virtual ~ACE_URL_Addr (void); + virtual ~ACE_URL_Addr (); /// Get the original URL const ACE_TCHAR *get_url () const; @@ -124,7 +124,7 @@ class ACE_WEBSVCS_Export ACE_URL_Addr_Visitor { public: /// Destructor - virtual ~ACE_URL_Addr_Visitor (void); + virtual ~ACE_URL_Addr_Visitor (); /** * The visit methods for all the hierarchy. @@ -159,7 +159,7 @@ class ACE_WEBSVCS_Export ACE_HTTP_Addr : public ACE_URL_Addr { public: /// Constructor - ACE_HTTP_Addr (void); + ACE_HTTP_Addr (); /// Construct an HTTP URL from the host, path, query and port. ACE_HTTP_Addr (const ACE_TCHAR *host_name, @@ -183,7 +183,7 @@ class ACE_WEBSVCS_Export ACE_HTTP_Addr : public ACE_URL_Addr int set (const ACE_HTTP_Addr &addr); /// Destructor - virtual ~ACE_HTTP_Addr (void); + virtual ~ACE_HTTP_Addr (); /** * Build the INET_Address implicit in the URL, notice that we @@ -231,7 +231,7 @@ class ACE_WEBSVCS_Export ACE_HTTP_Addr : public ACE_URL_Addr size_t url_size (int flags = 0) const; /// Helper method to cleanup resources - void clear (void); + void clear (); private: /// The host:port component in the URL @@ -262,7 +262,7 @@ class ACE_WEBSVCS_Export ACE_FTP_Addr : public ACE_URL_Addr { public: /// Constructor - ACE_FTP_Addr (void); + ACE_FTP_Addr (); /// Construct an FTP URL from the host_name, the path, the username /// and the password. @@ -287,7 +287,7 @@ class ACE_WEBSVCS_Export ACE_FTP_Addr : public ACE_URL_Addr int set (const ACE_FTP_Addr &addr); /// Destructor - virtual ~ACE_FTP_Addr (void); + virtual ~ACE_FTP_Addr (); /// Get the host name component in the URL const ACE_TCHAR *get_hostname () const; @@ -318,7 +318,7 @@ class ACE_WEBSVCS_Export ACE_FTP_Addr : public ACE_URL_Addr size_t url_size (int flags = 0) const; /// Helper method to release the internal resources - void clear (void); + void clear (); private: /// The login name @@ -345,7 +345,7 @@ class ACE_WEBSVCS_Export ACE_Mailto_Addr : public ACE_URL_Addr { public: /// Constructor - ACE_Mailto_Addr (void); + ACE_Mailto_Addr (); /// Construct an FTP URL from the host, path and headers. ACE_Mailto_Addr (const ACE_TCHAR *user, @@ -367,7 +367,7 @@ class ACE_WEBSVCS_Export ACE_Mailto_Addr : public ACE_URL_Addr int set (const ACE_Mailto_Addr &addr); /// Destructor - virtual ~ACE_Mailto_Addr (void); + virtual ~ACE_Mailto_Addr (); /// Get the username component in the URL const ACE_TCHAR *get_user () const; @@ -395,7 +395,7 @@ class ACE_WEBSVCS_Export ACE_Mailto_Addr : public ACE_URL_Addr size_t url_size (int flags = 0) const; /// Helper method to cleanup resources - void clear (void); + void clear (); private: ACE_TCHAR *user_; diff --git a/ACE/websvcs/tests/Test_URL_Addr.cpp b/ACE/websvcs/tests/Test_URL_Addr.cpp index cafb934b76109..d41958f28cb8a 100644 --- a/ACE/websvcs/tests/Test_URL_Addr.cpp +++ b/ACE/websvcs/tests/Test_URL_Addr.cpp @@ -2,11 +2,10 @@ #include "ace/Log_Msg.h" - -void test_http_addr (void); -void test_ftp_addr (void); -void test_mailto_addr (void); -void test_url_addr (void); +void test_http_addr (); +void test_ftp_addr (); +void test_mailto_addr (); +void test_url_addr (); int ACE_TMAIN (int, ACE_TCHAR*[]) { @@ -43,7 +42,7 @@ int ACE_TMAIN (int, ACE_TCHAR*[]) #define URL_TEST_ARRAY \ ACE_TEXT("file:/etc/passwd") -void test_http_addr (void) +void test_http_addr () { static const ACE_TCHAR *addresses[] = { HTTP_TEST_ARRAY @@ -83,7 +82,7 @@ void test_http_addr (void) } } -void test_ftp_addr (void) +void test_ftp_addr () { static const ACE_TCHAR *addresses[] = { FTP_TEST_ARRAY @@ -119,12 +118,11 @@ void test_ftp_addr (void) "FTP[%d]\n" " \"%s\" ERROR\n", i, addresses[i])); - } } } -void test_mailto_addr (void) +void test_mailto_addr () { static const ACE_TCHAR *addresses[] = { MAILTO_TEST_ARRAY @@ -160,12 +158,11 @@ void test_mailto_addr (void) "Mailto[%d]\n" " \"%s\" ERROR\n", i, addresses[i])); - } } } -void test_url_addr (void) +void test_url_addr () { static const ACE_TCHAR *addresses[] = { HTTP_TEST_ARRAY, @@ -205,7 +202,6 @@ void test_url_addr (void) "URL[%d]\n" " \"%s\" ERROR\n", i, addresses[i])); - } } } diff --git a/TAO/ChangeLogs/TAO-3_0_10 b/TAO/ChangeLogs/TAO-3_0_10 new file mode 100644 index 0000000000000..b05718462145f --- /dev/null +++ b/TAO/ChangeLogs/TAO-3_0_10 @@ -0,0 +1,134 @@ +commit 367992d328a3fdbf3465445b1922ea9b21a04f04 +Author: Johnny Willemsen +Date: Thu Nov 17 07:58:59 2022 +0100 + + Update NEWS files for next release + + * ACE/NEWS: + * TAO/NEWS: + +commit fca859fece1cf48bc3ecbba171286a09b660f879 +Author: Johnny Willemsen +Date: Tue Nov 1 11:25:13 2022 +0100 + + Use const/override/default and some layout changes + + * ACE/ace/Process.cpp: + * ACE/ace/Process.h: + * TAO/tao/ORB_Core.cpp: + +commit 5968484ea70f045ed9c5cdb8d38602d6592b7f25 +Merge: 711fbe05e66 3d67b98a644 +Author: Johnny Willemsen +Date: Thu Oct 20 07:39:29 2022 +0200 + + Merge pull request #1970 from jwillemsen/jwi-overrirde + + Use override + +commit 3d67b98a644c748826e76a10659add89497c42b5 +Author: Johnny Willemsen +Date: Wed Oct 19 19:56:03 2022 +0200 + + Use override + + * ACE/ace/OS_NS_stropts.cpp: + * TAO/tao/PortableServer/Active_Policy_Strategies.cpp: + * TAO/tao/PortableServer/ThreadStrategy.h: + * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp: + * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h: + * TAO/tao/PortableServer/ThreadStrategyORBControl.h: + * TAO/tao/PortableServer/ThreadStrategySingle.h: + * TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h: + * TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp: + +commit f4e36f0711e03618f88594d3ee02938d0da6a3ee +Author: Niepsho <68657205+Niepsho@users.noreply.github.com> +Date: Tue Oct 18 13:56:41 2022 +0200 + + Use default + +commit e815db1b8fe83d68b037c7a61227c736166f9979 +Author: Johnny Willemsen +Date: Fri Oct 14 08:38:46 2022 +0200 + + Fixed compile error due to cleanup and made destructors default + +commit 66da37c13452cd66442bb2baaa9beadbf3c449e4 +Author: Johnny Willemsen +Date: Thu Oct 13 09:07:28 2022 +0200 + + Make use of default + +commit dca58941074b2098a9e898e73b4bcd05a3b80bcb +Author: Johnny Willemsen +Date: Thu Oct 13 08:48:56 2022 +0200 + + Fixed unused variable warnings + +commit 969d4ddf3152fe1e6cb616b284dbecf72849c494 +Author: Johnny Willemsen +Date: Thu Oct 13 08:39:56 2022 +0200 + + Fixed unused variable warnings + +commit 99f66230ce63174a10ff5acbe7c54e9c06b98065 +Author: Johnny Willemsen +Date: Wed Oct 12 09:44:26 2022 +0200 + + Layout changes + +commit 892141ae11c090cf86d1d6e8c017d2535645f69a +Author: Johnny Willemsen +Date: Wed Oct 12 09:39:00 2022 +0200 + + Layout changes + +commit 727fb1f5d2a067320c00149f7df2ecba602d9457 +Author: Johnny Willemsen +Date: Wed Oct 12 09:29:41 2022 +0200 + + Layout changes + +commit d7b7a7ce9d2f46fb6e351b844ed87e643e051f27 +Author: Johnny Willemsen +Date: Wed Oct 12 09:08:18 2022 +0200 + + Layout/return changes + +commit 26c2fbc083da279e132f5a951bc43f95b4c97843 +Author: Johnny Willemsen +Date: Wed Oct 5 15:51:19 2022 +0200 + + Use default destructors + + * TAO/tao/String_Const_Sequence_Element_T.h: + * TAO/tao/String_Sequence_Element_T.h: + * TAO/tao/UserException.cpp: + * TAO/tao/UserException.h: + +commit 4d827f7dbfef927d913e6bc20a8360b78bb07242 +Author: Johnny Willemsen +Date: Tue Oct 4 16:54:06 2022 +0200 + + Use nullptr/std::addressof/default/uniform initialization + : + * ACE/ace/OS_NS_netdb.inl: + * TAO/tao/Endpoint.h: + * TAO/tao/Endpoint.inl: + * TAO/tao/IIOP_Endpoint.cpp: + * TAO/tao/IIOP_Endpoint.h: + +commit d5987833e7a582ff1a72a059f48c5c568a603b65 +Author: Johnny Willemsen +Date: Sat Oct 1 14:39:21 2022 +0200 + + Make x.0.9 public + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * 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-3_0_11 b/TAO/ChangeLogs/TAO-3_0_11 new file mode 100644 index 0000000000000..abc11edac7555 --- /dev/null +++ b/TAO/ChangeLogs/TAO-3_0_11 @@ -0,0 +1,292 @@ +commit d9c5ee83df0e28aca1fcaaa22430c17ddd73171a +Author: Adam Mitz +Date: Fri Dec 16 17:07:33 2022 -0600 + + Updated NEWS for 7.0.11/3.0.11 + +commit ac06b99dc48c9aa4a9b3409f214d396e819ed983 +Author: Chad Elliott +Date: Thu Dec 15 09:41:37 2022 -0600 + + Only emit the require_truncation_ boolean if CDR support is enabled. + +commit b5eb7cc3715e4a458ef63d1a8175c7c901eec121 +Merge: 34a585c202d 633be2b32bd +Author: ocielliottc +Date: Thu Dec 15 06:07:46 2022 -0600 + + Merge pull request #1998 from DOCGroup/elliottc/715-additional-master + + Fix additional warnings from OpenDDS builds. + +commit 633be2b32bdb9ff00658511693d7545e34f9acb8 +Author: Chad Elliott +Date: Wed Dec 14 08:33:09 2022 -0600 + + Removed calls to ferror() as their return values were no longer used. + +commit 167bdcb15282991d199f2fdb1b2c0827187d77c3 +Author: Johnny Willemsen +Date: Wed Dec 14 11:17:51 2022 +0100 + + Document changes + + * ACE/NEWS: + * TAO/NEWS: + +commit 00ba6104ccbe84a2782d03c5a69baa431e877b59 +Author: Johnny Willemsen +Date: Wed Dec 14 11:15:59 2022 +0100 + + Add back Properties_Encoder constructor, looks MinGW doesn't like the default here + + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h: + +commit c35922f48773b120e75210dda841dfab025c5019 +Author: Johnny Willemsen +Date: Tue Dec 13 09:06:19 2022 +0100 + + Upgrade all doxygen config files + + * ACE/etc/ace.doxygen: + * ACE/etc/ace_inet.doxygen: + * ACE/etc/ace_qos.doxygen: + * ACE/etc/ace_rmcast.doxygen: + * ACE/etc/ace_ssl.doxygen: + * ACE/etc/acexml.doxygen: + * TAO/etc/tao.doxygen: + * TAO/etc/tao_anytypecode.doxygen: + * TAO/etc/tao_av.doxygen: + * TAO/etc/tao_compression.doxygen: + * TAO/etc/tao_cosevent.doxygen: + * TAO/etc/tao_cosnaming.doxygen: + * TAO/etc/tao_cosnotification.doxygen: + * TAO/etc/tao_costime.doxygen: + * TAO/etc/tao_costrader.doxygen: + * TAO/etc/tao_dynamicany.doxygen: + * TAO/etc/tao_dynamicinterface.doxygen: + * TAO/etc/tao_esf.doxygen: + * TAO/etc/tao_ifr.doxygen: + * TAO/etc/tao_implrepo.doxygen: + * TAO/etc/tao_iormanip.doxygen: + * TAO/etc/tao_iortable.doxygen: + * TAO/etc/tao_pi.doxygen: + * TAO/etc/tao_pi_server.doxygen: + * TAO/etc/tao_portablegroup.doxygen: + * TAO/etc/tao_portableserver.doxygen: + * TAO/etc/tao_rtcorba.doxygen: + * TAO/etc/tao_rtevent.doxygen: + * TAO/etc/tao_rtportableserver.doxygen: + * TAO/etc/tao_security.doxygen: + * TAO/etc/tao_smartproxies.doxygen: + * TAO/etc/tao_ssliop.doxygen: + * TAO/etc/tao_strategies.doxygen: + * TAO/etc/tao_transportcurrent.doxygen: + * TAO/etc/tao_ziop.doxygen: + +commit 96ed7f47169fa450fd2f1ec0ff701aa5df41e47d +Merge: a49c9dee83b 7d7b690e33a +Author: Johnny Willemsen +Date: Mon Dec 12 20:09:53 2022 +0100 + + Merge branch 'jwi-portablegroupcleanup' of https://github.com/jwillemsen/ATCD into jwi-portablegroupcleanup + +commit a49c9dee83b0d6029834126e8fb39cf9b04faba5 +Author: Johnny Willemsen +Date: Mon Dec 12 20:09:45 2022 +0100 + + Layout change + + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp: + +commit 780421e6430ae7d5682b0f505392c65dc1222d86 +Author: Johnny Willemsen +Date: Mon Dec 12 20:09:35 2022 +0100 + + Add missing include + + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp: + +commit 7d7b690e33ab7753eefe831d3ae1f224da18bb53 +Merge: 3ed653f53a1 cfebb9c5c61 +Author: Johnny Willemsen +Date: Mon Dec 12 19:05:05 2022 +0100 + + Merge branch 'master' into jwi-portablegroupcleanup + +commit 3ed653f53a19d234e395f68a25cb8f42f9695bad +Author: Johnny Willemsen +Date: Mon Dec 12 16:03:46 2022 +0100 + + Removed incorrect code + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h: + +commit 37a525baec16f7caaa2252394041051c949f301d +Merge: 87e4cdb2c15 7f583531526 +Author: Johnny Willemsen +Date: Mon Dec 12 16:02:27 2022 +0100 + + Fixed merge conflicts + +commit 0ddf6649d679123b281879416b46e42933b82a21 +Author: Johnny Willemsen +Date: Mon Dec 12 09:57:46 2022 +0100 + + Make use of noexcept instead of throw() + + * ACE/ace/Auto_Functor.h: + * ACE/ace/Local_Name_Space_T.cpp: + * ACE/ace/Svc_Handler.cpp: + * ACE/ace/Svc_Handler.h: + * ACE/ace/config-lite.h: + * ACE/ace/config-macros.h: + * ACE/examples/DLL/Newsweek.cpp: + * ACE/examples/DLL/Newsweek.h: + * ACE/examples/DLL/Today.cpp: + * ACE/examples/DLL/Today.h: + * ACE/examples/Shared_Malloc/test_persistence.cpp: + * ACE/tests/DLL_Test_Impl.cpp: + * ACE/tests/DLL_Test_Impl.h: + * ACE/tests/Dynamic_Test.cpp: + * TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h: + * TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h: + * TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h: + * TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h: + * TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h: + * TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h: + * TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp: + * TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h: + * TAO/tao/Asynch_Reply_Dispatcher_Base.h: + * TAO/tao/Asynch_Reply_Dispatcher_Base.inl: + * TAO/tao/Bounded_Array_Sequence_T.h: + * TAO/tao/Bounded_Basic_String_Sequence_T.h: + * TAO/tao/Bounded_Object_Reference_Sequence_T.h: + * TAO/tao/Bounded_Value_Sequence_T.h: + * TAO/tao/Generic_Sequence_T.h: + * TAO/tao/Messaging/AMH_Response_Handler.cpp: + * TAO/tao/Messaging/AMH_Response_Handler.h: + * TAO/tao/PortableServer/Servant_var.cpp: + * TAO/tao/PortableServer/Servant_var.h: + * TAO/tao/PortableServer/Servant_var.inl: + * TAO/tao/Unbounded_Array_Sequence_T.h: + * TAO/tao/Unbounded_Basic_String_Sequence_T.h: + * TAO/tao/Unbounded_Object_Reference_Sequence_T.h: + * TAO/tao/Unbounded_Octet_Sequence_T.h: + * TAO/tao/Unbounded_Value_Sequence_T.h: + * TAO/tao/Utils/Implicit_Deactivator.cpp: + * TAO/tao/Utils/Implicit_Deactivator.h: + * TAO/tao/Utils/ORB_Destroyer.cpp: + * TAO/tao/Utils/ORB_Destroyer.h: + * TAO/tao/Utils/PolicyList_Destroyer.cpp: + * TAO/tao/Utils/PolicyList_Destroyer.h: + * TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h: + * TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h: + * TAO/tests/Bug_2936_Regression/PersistentPOA.cpp: + * TAO/tests/Bug_2936_Regression/PersistentPOA.h: + * TAO/tests/Bug_3251_Regression/PersistentPoa.cpp: + * TAO/tests/Bug_3251_Regression/PersistentPoa.h: + * TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp: + * TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h: + * TAO/tests/POA/DSI/Database_i.cpp: + * TAO/tests/POA/DSI/Database_i.h: + * TAO/utils/wxNamingViewer/wxAutoDialog.h: + +commit 139feb142fbfb12dc97bd09f66dbfc4ff9755263 +Author: Johnny Willemsen +Date: Fri Nov 25 16:09:12 2022 +0100 + + Update LB_ObjectReferenceFactory.cpp + + Removed redundant empty lines + +commit 2a0c3dc2f672cff50cda70183b992f2a8e40088a +Author: Johnny Willemsen +Date: Fri Nov 25 16:08:53 2022 +0100 + + Update FT_EventService.cpp + + Fix conversion warning + +commit b0e766146110d476f86919741ca35c5ae1baa4b9 +Author: Johnny Willemsen +Date: Thu Nov 17 10:07:57 2022 +0100 + + Make x.0.10 publicly available + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: + +commit 87e4cdb2c157eb359d394c40115e0e6a91c68920 +Author: Johnny Willemsen +Date: Mon Sep 20 10:39:33 2021 +0200 + + More cleanup + + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h: + +commit 6d8af9237c8e0549e3e577dd135fa377d9481347 +Author: Johnny Willemsen +Date: Mon Sep 20 10:26:20 2021 +0200 + + Removed obsolete ipv4 code which caused warnings with ipv6 enabled, use nullptr, default, override, delete, layout changes + + * TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/README: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h: diff --git a/TAO/ChangeLogs/TAO-3_0_9 b/TAO/ChangeLogs/TAO-3_0_9 new file mode 100644 index 0000000000000..25d5cad42ea7d --- /dev/null +++ b/TAO/ChangeLogs/TAO-3_0_9 @@ -0,0 +1,588 @@ +commit a16ac15dd106967992baef21a91f73f002b2cb79 +Merge: 7b7e6532345 46bf3cb65ed +Author: Johnny Willemsen +Date: Fri Sep 23 09:20:49 2022 +0200 + + Merge pull request #1942 from knutpett/knutpett/const_accessor + + Added const accessors for AST_Decl::local_name () and UTL_String::get_string () + +commit 7b7e65323459375cda40274c9b5828b3f5aebda9 +Merge: 0b7e12778ae 2aab75d5fdd +Author: Johnny Willemsen +Date: Fri Sep 23 09:20:32 2022 +0200 + + Merge pull request #1941 from knutpett/knutpett/remove_void_part2 + + Part 2: Remove obsolescent (void) in functions with no parameters + +commit 46bf3cb65ed64842f6272fb9d571af3c8d4ead59 +Author: Knut Petter Svendsen +Date: Fri Sep 23 08:47:45 2022 +0200 + + Remove the non-const version + + This is safe since non-const functions can call const-functions. + +commit 0b7e12778ae92315cbd51c901cb8402d6bd646a7 +Merge: f980f161749 64b5a4fecb5 +Author: Adam Mitz +Date: Thu Sep 22 17:58:28 2022 -0500 + + Merge pull request #1907 from lukem/format-security + + Fix -Wformat-security issues + +commit 1aa4a63339a3990a68b5dd5f808bc3e5c33e193f +Author: Knut Petter Svendsen +Date: Thu Sep 22 16:30:31 2022 +0200 + + Added const accessors for AST_Decl::local_name () and UTL_String::get_string () + +commit 2aab75d5fddc126e8085c70fe8e1b875b75a30ef +Author: Knut Petter Svendsen +Date: Mon Sep 19 14:37:02 2022 +0200 + + Part 2: Remove obsolescent (void) in functions with no parameters + +commit f980f161749eac82843c44943e6fec229920ba9f +Merge: a3981dc07f3 90cfc149fdf +Author: Johnny Willemsen +Date: Wed Sep 21 08:38:51 2022 +0200 + + Merge pull request #1936 from jwillemsen/jwi-valuetypecdr + + Valuetype test extensions + +commit 90cfc149fdf58636ba5474b8ee5a3e60d24d7d90 +Author: Johnny Willemsen +Date: Tue Sep 20 16:39:55 2022 +0200 + + Correct project + + * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc: + +commit e47c0ac2aa640d892e02ccb05a160a82d3490e6c +Author: Johnny Willemsen +Date: Tue Sep 20 16:35:24 2022 +0200 + + Move new test IDL to seperate project + + * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace2.idl: + Added. + + * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl: + * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc: + +commit 64b5a4fecb5806522f220d63b0744ffa40bb6bcc +Merge: ccbb3639f96 9bb6d09a139 +Author: Adam Mitz +Date: Mon Sep 19 16:40:20 2022 -0500 + + Merge branch 'master' into format-security + +commit dcdc061a7e9e6446115374c404020c57577a2f62 +Author: Johnny Willemsen +Date: Mon Sep 19 14:45:51 2022 +0200 + + Use override instead of virtual + + * TAO/tao/Wait_On_LF_No_Upcall.h: + * TAO/tao/Wait_On_Leader_Follower.h: + * TAO/tao/Wait_On_Reactor.h: + * TAO/tao/Wait_On_Read.h: + +commit c43546b7c54c422c3fc6c3c8cf56d51703c1a58f +Author: Johnny Willemsen +Date: Mon Sep 19 14:44:02 2022 +0200 + + Add back virtual + + * TAO/tao/Wait_On_Leader_Follower.h: + +commit adf5bf4e71739a491b31ecec4fcfa8f82daded67 +Author: Johnny Willemsen +Date: Mon Sep 19 13:46:37 2022 +0200 + + Use default destructors + + * TAO/tao/Wait_On_LF_No_Upcall.cpp: + * TAO/tao/Wait_On_LF_No_Upcall.h: + * TAO/tao/Wait_On_Leader_Follower.cpp: + * TAO/tao/Wait_On_Leader_Follower.h: + * TAO/tao/Wait_On_Reactor.cpp: + * TAO/tao/Wait_On_Reactor.h: + * TAO/tao/Wait_On_Read.cpp: + * TAO/tao/Wait_On_Read.h: + * TAO/tao/Wait_Strategy.cpp: + * TAO/tao/Wait_Strategy.h: + +commit 417e48232eb31084b2908abf8a522531e7647ca9 +Author: Johnny Willemsen +Date: Mon Sep 19 12:41:08 2022 +0200 + + More test + + * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl: + +commit c31931d437af978c72302bb66831f729e680f325 +Author: Johnny Willemsen +Date: Mon Sep 19 12:38:40 2022 +0200 + + More test extensins + + * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl: + * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc: + +commit 55598ab199359c7daa3331520675f7a5c8e3cfe7 +Author: Johnny Willemsen +Date: Mon Sep 19 11:27:26 2022 +0200 + + Extend test, enabled cdr + + * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl: + * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc: + +commit 5e96bb28fc7572f39b63ac2aca72800c45cdb1ee +Merge: 96f0f9c1666 84f0894d8f0 +Author: Johnny Willemsen +Date: Mon Sep 19 09:55:44 2022 +0200 + + Merge pull request #1933 from jwillemsen/jwi-versionednamespacetest + + Extend test IDL + +commit 96f0f9c16668c07531ea8c60c7b912f2e7b55806 +Merge: 14610fc4e13 d7c2081760f +Author: Johnny Willemsen +Date: Mon Sep 19 09:55:26 2022 +0200 + + Merge pull request #1934 from jwillemsen/jwi-require_truncation_ + + Use uniform initialisation for require_truncation_ so tha we can generate a default constructor + +commit d7c2081760f1fed0c7e5929c35b7cc0fe9429c2e +Author: Johnny Willemsen +Date: Sun Sep 18 11:53:46 2022 +0200 + + Use uniform initialisation for require_truncation_ so tha we can generate a default constructor + + * TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp: + * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp: + +commit 84f0894d8f00fcb6e865c4dace75115eac98ac42 +Author: Johnny Willemsen +Date: Sun Sep 18 10:33:55 2022 +0200 + + Extend test IDL + + * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl: + +commit 3f1236a89ac9381be2ece19ff833f6a6b5f4ae15 +Merge: da2ab4ef14f 062f194d4b3 +Author: Johnny Willemsen +Date: Thu Sep 15 16:00:38 2022 +0200 + + Merge pull request #1930 from jwillemsen/jwi-sslcert + + Generated new certificates, old ones expired + +commit 062f194d4b339bc32dbd5705613800eb4db68960 +Author: Johnny Willemsen +Date: Thu Sep 15 16:00:04 2022 +0200 + + Generated new certificates, old ones expired + +commit bc05ebcc29b4ec7f5c7af14dad9ef6bd18883891 +Author: Johnny Willemsen +Date: Thu Sep 15 09:34:26 2022 +0200 + + Revert addressof changes, looks it broke something + + * TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + * TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp: + +commit 0a03a4b940b9bb549587d3f22eab9e66d617551c +Merge: a457e9d14d9 0615e6ef888 +Author: Johnny Willemsen +Date: Wed Sep 14 09:16:25 2022 +0200 + + Merge pull request #1926 from jwillemsen/jwi-taoidlnullptr3 + + Use nullptr, check pointers with 1, use std::addressof, reduced sloc + +commit 3da59eac098c1ef9d2c98f2079185ff35c3b6105 +Author: Knut Petter Svendsen +Date: Tue Sep 13 22:57:39 2022 +0200 + + Remove obsolescent (void) in functions with no parameters + +commit 0615e6ef888bdcbbae4324e1dcbd04a21516e0e3 +Author: Johnny Willemsen +Date: Tue Sep 13 13:39:29 2022 +0200 + + Removed empty line + + * TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp: + +commit 603ecf36e5a6142ced625b1579a3ea1d4e48bdd8 +Author: Johnny Willemsen +Date: Tue Sep 13 12:04:48 2022 +0200 + + Use nullptr, check pointers with 1, use std::addressof, reduced sloc + + * TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp: + * TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp: + * TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp: + * TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp: + +commit ccbb3639f96d55c38f96914c6c7c4bc8c8998db9 +Merge: bdc29ef27a6 fe03724176d +Author: Johnny Willemsen +Date: Mon Sep 12 09:36:12 2022 +0200 + + Merge branch 'master' into format-security + +commit fe03724176dcfd20e0f9a6e493198469242be6b6 +Merge: 41a1f3bc12f 00b403be7df +Author: Johnny Willemsen +Date: Mon Sep 12 08:32:34 2022 +0200 + + Merge pull request #1922 from knutpett/knutpett/whitespace + + Remove whitespace + +commit 00b403be7df0442405bd5e3dcc07beaa6730ddd2 +Author: Knut Petter Svendsen +Date: Sat Sep 10 12:26:57 2022 +0200 + + Fixed Redundant blank line at the end of a code block should be deleted + +commit 60987b4ba42ff6e4e6a4f4457d902a18c0c6b0a0 +Author: Knut Petter Svendsen +Date: Sat Sep 10 12:19:28 2022 +0200 + + Remove leading blank lines after opening { + +commit ab436d45dc956c1eaec31bff0c43ca3a0cb0cb66 +Author: Knut Petter Svendsen +Date: Sat Sep 10 12:14:24 2022 +0200 + + Remove trailing whitespace forgotten in previous commit + +commit c42abee7c0e81ed89bdfb47bf3a1bcb743cf256b +Author: Knut Petter Svendsen +Date: Sat Sep 10 12:08:48 2022 +0200 + + Removed extra newline before closing } + +commit 2be659384defe6b235e020f03a7d683c80a16c7e +Author: Luke Mewburn +Date: Sat Sep 10 16:30:54 2022 +1000 + + Adapt to ACE_TEXT_PRIs + + Use ACE_TEXT_PRIs instead of conditional compilation + checking !defined(ACE_WIN32) && defined(ACE_USES_WCHAR). + +commit f5e5d7759a9314053509d294a4c10827d3946034 +Author: Luke Mewburn +Date: Sat Sep 10 11:05:56 2022 +1000 + + Define ACE_TEXT_PRIs. Use to fix -Wformat-security + + Define ACE_TEXT_PRIs as "s" or "ls" depending upon the WCHAR mode. + (This is similar to the PRIxxx macros in ) + + Use ACE_TEXT("%") ACE_TEXT_PRIs instead of "%s" or even + just the raw string without a format specifier. + + Fixes issue #1906. + +commit 8bc991b1de07cdb3a4c472d0932c71bda181db34 +Author: Knut Petter Svendsen +Date: Fri Sep 9 23:19:18 2022 +0200 + + resurrect two removed virtuals + +commit 5b9eb336d9f631d62f51d7725b4f9a1df7e4c240 +Author: Johnny Willemsen +Date: Fri Sep 9 18:00:29 2022 +0200 + + Removed redunant void + : + * TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp: + +commit 9542877dc5440626262777674cc9481079d9ee0c +Author: Johnny Willemsen +Date: Fri Sep 9 17:51:09 2022 +0200 + + Make use of std::addressof and removed some redundant whitespacing + +commit 126e88aeb3f288c770f0dccde5c6314ccaa6212c +Author: Knut Petter Svendsen +Date: Fri Sep 9 15:46:54 2022 +0200 + + Replace 3 blank lines with just 2 blank lines + +commit 430d023f1d97173cfd104498f92dc4ccaa1c4135 +Author: Knut Petter Svendsen +Date: Fri Sep 9 14:31:18 2022 +0200 + + Remove extra newline after public, protected and private + +commit d75c37b54441651922e5dcfd287cbc87b1833e23 +Author: Knut Petter Svendsen +Date: Fri Sep 9 09:23:14 2022 +0200 + + Fix CodeFactor issues: blank lines + +commit f74944300c9af39d3e099aec8dff263e6d7918df +Author: Knut Petter Svendsen +Date: Fri Sep 9 11:59:29 2022 +0200 + + Fix whitespace issues found by fuzz + + Running trailing_whitespaces check + Error: ./TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h:132: found trailing whitespace + Error: ./TAO/tao/CSD_Framework/CSD_POA.h:53: found trailing whitespace + Error: ./TAO/tao/PortableServer/LifespanStrategyTransient.h:48: found trailing whitespace + Error: ./TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h:54: found trailing whitespace + Error: ./TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h:59: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:46: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:52: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:67: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:74: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:93: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:96: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:102: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:125: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:132: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h:44: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h:50: found trailing whitespace + Error: ./TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h:68: found trailing whitespace + +commit 6f72892d61032d294fe1387a36ec6e04e9efa9c2 +Author: Knut Petter Svendsen +Date: Fri Sep 9 10:38:55 2022 +0200 + + Fix trailing newline in class declarations + +commit 6d7b6be10a2c2be4fc47bdd2e285657fcc4d60fd +Author: Knut Petter Svendsen +Date: Fri Sep 9 10:31:07 2022 +0200 + + Fix more blank line issues + +commit 1bc30d9abfac4b990a8ca25f43c666f28a8d61d2 +Merge: 156da73ce08 56377d8db17 +Author: Johnny Willemsen +Date: Mon Sep 5 08:22:58 2022 +0200 + + Merge pull request #1912 from knutpett/warning_extra_semi + + Remove warnings -Wextra-semi + +commit c320b8022b5fd32b9237f1211f3f6d29c2192b21 +Author: Luke Mewburn +Date: Fri Sep 2 21:18:26 2022 +1000 + + Fix -Wformat-security issues for wchar_t + + Use %ls instead of %s when using wchar_t + + Fixes issue #1906. + +commit 56377d8db17268f480e3800b020cbd5df5c1afab +Author: Knut Petter Svendsen +Date: Tue Aug 30 10:43:31 2022 +0200 + + Fix issues found by CodeFactor: blank line + + CodeFactor reported: + Redundant blank line at the start of a code block should be deleted + +commit 18bda4f07b8a8fde245f26afe8772a4c650d0773 +Author: Knut Petter Svendsen +Date: Tue Aug 30 10:41:19 2022 +0200 + + Use default constructor + +commit c2181241c7dc3be203d4b0f231f2ab11b4f243e4 +Author: Adam Mitz +Date: Mon Aug 29 17:39:16 2022 -0500 + + fuzz script comments + +commit a020ca7ad752fffd3b20b38e2f187cc8dcf5be10 +Author: Adam Mitz +Date: Mon Aug 29 16:00:04 2022 -0500 + + Use ACE's Sync(h) traits in AST_Annotation_Appls + + - interprocess mutexes are not needed + - support threads=0 builds of tao_idl + +commit 023da962da06c7c6ab4e801d7a5861ef21ca9577 +Author: Knut Petter Svendsen +Date: Mon Aug 29 16:20:38 2022 +0200 + + Remove warnings -Wextra-semi + +commit 1c9614d34d09d39486e579c6c21b0218997739c8 +Author: Luke Mewburn +Date: Sat Aug 20 11:17:07 2022 +1000 + + Fix -Wformat-security issues + + Ensure that methods with a printf()-like format string + are invoked with a literal string instead of a string + built from possibly untrusted sources. + + Fixes issue #1906. + +commit 44c80da21fe3daed65ce0b19e47b09ba6aa3f438 +Merge: 05484cd6cd8 368e8175c5e +Author: Johnny Willemsen +Date: Wed Aug 10 14:43:23 2022 +0200 + + Merge pull request #1898 from jwillemsen/jwi-ACE_NESTED_CLASS + + Removed old comments for ACE_NESTED_CLASS + +commit 368e8175c5eea00b008b9295a4b1146ab297c771 +Author: Johnny Willemsen +Date: Wed Aug 10 09:55:22 2022 +0200 + + Removed old comments for ACE_NESTED_CLASS + + * TAO/TAO_IDL/ast/ast_type.cpp: + * TAO/TAO_IDL/be/be_interface.cpp: + * TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp: + * TAO/tests/IDL_Test/params.idl: + +commit 4a6478c41ac4b1e17cea8e0e4f4bbb6afe91269b +Author: Johnny Willemsen +Date: Wed Aug 10 08:32:51 2022 +0200 + + Use override, remove redundant whitespacing, fixed typo + + * ACE/tests/Enum_Interfaces_Test.cpp: + * TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README: + * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp: + * TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl: + +commit d799942f683eee8dafa8f81384f6a5d835ccc649 +Merge: bd92596bbc6 7ff6fc7440e +Author: Johnny Willemsen +Date: Wed Jul 20 08:13:11 2022 +0200 + + Merge pull request #1888 from jwillemsen/jwi-vcpkgv10 + + Upgrade to vcpkg v10 + +commit 4e2f7ae34d81f4ce82e6930b668785b886fb31fe +Author: Johnny Willemsen +Date: Tue Jul 19 09:32:06 2022 +0200 + + Layout changes + +commit bd92596bbc63635a2ed2131322e6c659a5420586 +Merge: b9e4a9a92a6 8f9a9f304ba +Author: Johnny Willemsen +Date: Mon Jul 18 16:27:20 2022 +0200 + + Merge pull request #1887 from jwillemsen/jwi-codesetregistry + + Minor change for codeset registry generation and removed old Id tags + +commit 8f9a9f304ba52f05f9a06c2afa16ea3f4ca0b097 +Author: Johnny Willemsen +Date: Mon Jul 18 13:22:23 2022 +0200 + + Add semicolon to generation + + * TAO/utils/catior/Catior_i.cpp: + +commit 061375f9119599cadddb96fcb1284c06e0fa4695 +Author: Johnny Willemsen +Date: Mon Jul 18 13:22:11 2022 +0200 + + Removed old Id tag + + * TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp: + +commit f94bdbc8fd6ae29e2f2b998f27fbacb03ca8f6d0 +Merge: 3ebafd71204 dae27692c88 +Author: Johnny Willemsen +Date: Fri Jul 15 13:57:34 2022 +0200 + + Merge pull request #1886 from jwillemsen/jwi-irixcleanup + + Removed some old Irix related code + +commit dae27692c8897e7f1de112b819c25fe7971ee895 +Author: Johnny Willemsen +Date: Fri Jul 15 08:04:34 2022 +0200 + + Removed some old Irix related code + + * TAO/bin/tao_orb_tests.lst: + * TAO/bin/tao_other_tests.lst: + * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp: + * TAO/tao/IIOP_Connection_Handler.cpp: + * TAO/tao/IIOP_Transport.cpp: + +commit 3ebafd712042a344dc52677e1d190c9dfcbb3c65 +Merge: b619e577177 8096d513b52 +Author: Johnny Willemsen +Date: Thu Jul 14 11:57:11 2022 +0200 + + Merge pull request #1883 from jwillemsen/jwi-localhost + + Make use of ACE_LOCALHOST and removed Tru64/Irix remaining code + +commit 8096d513b52a30164b1820eab996dd26dbe2a4b8 +Author: Johnny Willemsen +Date: Thu Jul 14 09:25:40 2022 +0200 + + Removed old code for Tru64/Irix, not supported anymore for a long time + +commit 1edc75272eb9348504ce9932af88e8870d814c30 +Author: Johnny Willemsen +Date: Wed Jul 13 15:41:16 2022 +0200 + + Removed workaround for Tru64 + + * TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc: + +commit 55e5793c7215c22c6ddf40fbcc0144a8862f76e2 +Author: Johnny Willemsen +Date: Wed Jul 13 09:25:12 2022 +0200 + + Layout changes + + * TAO/tao/Codeset/Codeset.cpp: + * TAO/tao/Codeset/Codeset_Manager_i.cpp: + * TAO/tao/Codeset/UTF8_Latin1_Factory.h: + +commit bff9af24d9cfd567a0f91d15dbab8bf729758e5a +Author: Johnny Willemsen +Date: Fri Jul 1 09:55:07 2022 +0200 + + Updated + + * ACE/docs/bczar/bczar.html: + * TAO/NEWS: diff --git a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp index 64b16d7073975..25dfe5dfa713f 100644 --- a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp +++ b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp @@ -11,12 +11,12 @@ #include "AMH_Messenger_i.h" #include // Implementation skeleton constructor -AMH_Messenger_i::AMH_Messenger_i (void) +AMH_Messenger_i::AMH_Messenger_i () { } // Implementation skeleton destructor -AMH_Messenger_i::~AMH_Messenger_i (void) +AMH_Messenger_i::~AMH_Messenger_i () { } diff --git a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h index 58fa8170f74af..5de0c49ce581f 100644 --- a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h +++ b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h @@ -21,10 +21,10 @@ class AMH_Messenger_i : public virtual POA_DevGuide::AMH_Messenger { public: //Constructor - AMH_Messenger_i (void); + AMH_Messenger_i (); //Destructor - virtual ~AMH_Messenger_i (void); + virtual ~AMH_Messenger_i (); virtual void send_message ( DevGuide::AMH_MessengerResponseHandler_ptr _tao_rh, diff --git a/TAO/DevGuideExamples/AMH/Messenger_i.cpp b/TAO/DevGuideExamples/AMH/Messenger_i.cpp index ff63085ba5123..561794f3ea999 100644 --- a/TAO/DevGuideExamples/AMH/Messenger_i.cpp +++ b/TAO/DevGuideExamples/AMH/Messenger_i.cpp @@ -11,12 +11,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/AMH/Messenger_i.h b/TAO/DevGuideExamples/AMH/Messenger_i.h index 440732375dd78..90c00311c253a 100644 --- a/TAO/DevGuideExamples/AMH/Messenger_i.h +++ b/TAO/DevGuideExamples/AMH/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc index 256f03cbbdb79..f577e2fc21794 100644 --- a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc +++ b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc @@ -16,12 +16,6 @@ project(*Client): taoclient, messaging { middleC.cpp client.cpp } - // To avoid link errors with SunCC 5.[34], put this project's - // object files (and resulting SunWS_cache directory) in a different - // location than the default. - verbatim(gnuace, macros) { - VDIR = $(if $(ARCH),$(ARCH)/).obj/AMH_AMI_Client/ - } } project(*Middle_Server): messaging, taoserver, amh { diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp index 6ce5e71297661..b9a85db840cf5 100644 --- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp +++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp @@ -10,10 +10,9 @@ Inner_callback_i::Inner_callback_i (PortableServer::POA_ptr p, } // Implementation skeleton destructor -Inner_callback_i::~Inner_callback_i (void) +Inner_callback_i::~Inner_callback_i () { std::cout << "Inner_callback_i destroying" << std::endl; - } void diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.h b/TAO/DevGuideExamples/AMH_AMI/inner_cb.h index 1c5da919e7bab..578a169a0461e 100644 --- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.h +++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.h @@ -13,7 +13,7 @@ class Inner_callback_i : public virtual POA_AMI_InnerHandler AMH_MiddleResponseHandler_ptr rh); //Destructor - virtual ~Inner_callback_i(void); + virtual ~Inner_callback_i(); virtual void answer (const char * ami_return_val); diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp index 5b1167b962272..4f484c3f6c404 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp index ad4b3224ab9d3..529d1feff1e36 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp @@ -84,7 +84,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Our own special orb->run() that knows how to callback clients while (true) { - // returns 1 as soon as it has successfully called back. if (svt->call_client()) { break; diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp index 373d2d387e07d..32aafb0e039e8 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp @@ -39,11 +39,9 @@ int Simple_i::call_client() { if (ready_for_callback_) { - ready_for_callback_ = 0; for (int times = 0; times < callback_count_; ++times) { - callback_->callback_method(); if (orb_->orb_core()->lane_resources().transport_cache().current_size() > 1) diff --git a/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp b/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp index a5a5752bec43b..4ce8f917281b3 100644 --- a/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp +++ b/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp @@ -11,12 +11,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/GettingStarted/Messenger_i.h b/TAO/DevGuideExamples/GettingStarted/Messenger_i.h index c5e1efee9085e..63b295106db16 100644 --- a/TAO/DevGuideExamples/GettingStarted/Messenger_i.h +++ b/TAO/DevGuideExamples/GettingStarted/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp index 77880838f4fd5..a92e246f1b96c 100644 --- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp +++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp @@ -2,12 +2,12 @@ #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -22,6 +22,5 @@ CORBA::Boolean Messenger_i::send_message ( CORBA::string_free(message); message = CORBA::string_dup("Thanks for the message."); return true; - } diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h index cb0454e8fdc49..edf9c1c9991a4 100644 --- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h +++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h @@ -14,17 +14,16 @@ class Messenger_i : public virtual Messenger, { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; #endif /* MESSENGERI_H_ */ diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp index a3bb99603c0ff..4e0d4f301ffe9 100644 --- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp +++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp @@ -42,7 +42,6 @@ Messenger_Locator_i::postinvoke (const PortableServer::ObjectId &, void * cookie, PortableServer::Servant servant) { - std::cout << "postinvoke called..." << std::endl; // Delete the servant as it is no longer needed. diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp index 57c1b902c7cc3..dad7a4481b4cf 100644 --- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp +++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.cpp @@ -19,12 +19,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h index 8b6d57bd407a4..adeb8fa5ee083 100644 --- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h +++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger_i.h @@ -30,10 +30,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp index 0bb8b9d3a8d08..400e8f9419936 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp @@ -43,7 +43,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv []) { try { - // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp index 0b0ab15cd8cf5..f2e1d7865b6b8 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp @@ -10,7 +10,7 @@ MessengerHandler::MessengerHandler (CORBA::ORB_ptr orb) } // Implementation skeleton destructor -MessengerHandler::~MessengerHandler (void) +MessengerHandler::~MessengerHandler () { } diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h index 951028cf9e473..aa36a1377f473 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h @@ -10,7 +10,7 @@ class MessengerHandler : public virtual POA_AMI_MessengerHandler MessengerHandler (CORBA::ORB_ptr orb); //Destructor - virtual ~MessengerHandler (void); + virtual ~MessengerHandler (); virtual void send_message ( CORBA::Boolean ami_return_val, diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp index 7fd597c9f4590..ce960aed3b034 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp @@ -20,7 +20,7 @@ Messenger_i::Messenger_i (unsigned int seconds_to_wait, } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h index 86c1412ebffa4..32dc3a7aa0d7c 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h @@ -25,7 +25,7 @@ class Messenger_i : public virtual POA_Messenger CORBA::Boolean throw_exception = 0); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, @@ -42,9 +42,7 @@ virtual CORBA::Boolean send_message ( // Force an exception to be thrown to test client-side // exception handling CORBA::Boolean throw_exception_; - }; - #endif /* MESSENGER_IMPL_H_ */ diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp index a47d0443e66da..66361fec627ec 100644 --- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp @@ -39,7 +39,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); if (parse_args (argc, argv) != 0) diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp index bd8302bd79e87..1237e79659b7b 100644 --- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp @@ -12,12 +12,12 @@ #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h index d49d63761c2ea..90c00311c253a 100644 --- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h +++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h @@ -21,17 +21,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp index a5a5752bec43b..4ce8f917281b3 100644 --- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp @@ -11,12 +11,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h index c5e1efee9085e..63b295106db16 100644 --- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp index 769f2b7c0b9b3..d86f8e03fc658 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp @@ -28,7 +28,6 @@ int parse_args (int argc, ACE_TCHAR* argv[]) "-x - call shutdown on server\n", argv[0]), -1); - } } return 0; diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp index bb4ae1a774c2e..7ee82018714a0 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp @@ -134,7 +134,6 @@ int MessengerServer::parse_args (int argc, ACE_TCHAR* argv[]) "-r - run ORB for seconds\n", argv[0]), -1); - } } return 0; diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h index 5b42492bc30fe..a28018a9ee8f1 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h @@ -15,7 +15,7 @@ class MessengerServer MessengerServer (CORBA::ORB_ptr orb); //Destructor - virtual ~MessengerServer (void); + virtual ~MessengerServer (); // parse arguments int parse_args (int argc, ACE_TCHAR* argv[]); @@ -65,10 +65,8 @@ class MessengerServer }; private: - CORBA::ORB_var orb_; ConsoleMonitor * monitor_; - }; #endif /* MESSENGERSERVER_H_ */ diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp index 6a002f1adbee9..c366adf61a8be 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp @@ -16,7 +16,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h index eca9e34381283..ad49fec836e24 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h @@ -24,7 +24,7 @@ class Messenger_i : public virtual POA_Messenger Messenger_i (CORBA::ORB_ptr orb); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, @@ -36,7 +36,6 @@ class Messenger_i : public virtual POA_Messenger private: CORBA::ORB_var orb_; - }; #endif /* MESSENGER_I_H_ */ diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp index fd6851b32b21d..6874b232e05e2 100644 --- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h index d49d63761c2ea..90c00311c253a 100644 --- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h @@ -21,17 +21,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp index b43707e72104b..745132f491610 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp @@ -14,12 +14,12 @@ #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h index d49d63761c2ea..90c00311c253a 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h @@ -21,17 +21,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp index b43707e72104b..745132f491610 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp @@ -14,12 +14,12 @@ #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h index d49d63761c2ea..90c00311c253a 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h @@ -21,17 +21,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp index 12fe3748671c4..dc1627055d031 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp @@ -2,7 +2,7 @@ #include "ClientInterceptor.h" #include -ClientInitializer::ClientInitializer (void) +ClientInitializer::ClientInitializer () { } @@ -14,7 +14,6 @@ ClientInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) void ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { - // Create and register the request interceptors. PortableInterceptor::ClientRequestInterceptor_ptr ci = PortableInterceptor::ClientRequestInterceptor::_nil (); diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h index 33c23248a43af..d43b9f57b5a6d 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h @@ -10,7 +10,7 @@ class ClientInitializer : public virtual ::CORBA::LocalObject { public: - ClientInitializer (void); + ClientInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp index e0c2bef7b5552..d111a653ff0b1 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp @@ -7,13 +7,13 @@ const CORBA::ULong service_ctx_id = 0xdeed; ClientInterceptor:: -ClientInterceptor (void) +ClientInterceptor () : myname_ ("Client_Authentication_Interceptor") { std::cout << "Calling ClientInterceptor constructor." << std::endl; } -ClientInterceptor::~ClientInterceptor (void) +ClientInterceptor::~ClientInterceptor () { } @@ -59,7 +59,6 @@ ClientInterceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, false); - } void diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h index 9d41e48ebdf37..2a2fb385a43db 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h @@ -9,9 +9,8 @@ class ClientInterceptor : public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: - ClientInterceptor (void); + ClientInterceptor (); virtual ~ClientInterceptor (); diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp index 3842ab53dc249..12ea090e3f7d3 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp @@ -11,12 +11,12 @@ #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h index 8ab4755edceb9..cf27ff521a182 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp index 056363d73fe85..25de9b5b8add8 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp @@ -17,7 +17,6 @@ void ServerInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - // Create and register the request interceptors. PortableInterceptor::ServerRequestInterceptor_ptr si = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp index 6cb15bed35106..d1f802011aabc 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp @@ -9,7 +9,7 @@ static const char* allowed_users[num_allowed_users+1] = {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0}; const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"}; -ServerInterceptor::ServerInterceptor (void) +ServerInterceptor::ServerInterceptor () : myname_ ("Server_Authentication_Interceptor") { std::cout << "Calling ServerInterceptor constructor." << std::endl; diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h index a8da1affe953a..3e8e46e14a901 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h @@ -8,7 +8,7 @@ class ServerInterceptor : public PortableInterceptor::ServerRequestInterceptor { public: - ServerInterceptor (void); + ServerInterceptor (); ~ServerInterceptor (); diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp index 5bb6f8ea7c730..ef9543c5d7512 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp @@ -2,7 +2,7 @@ #include "ClientInterceptor.h" #include -ClientInitializer::ClientInitializer (void) +ClientInitializer::ClientInitializer () { } diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h index ee05418e97da3..c9a56901d899b 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h @@ -10,7 +10,7 @@ class ClientInitializer : public virtual ::CORBA::LocalObject { public: - ClientInitializer (void); + ClientInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp index b8d9b9b3a063c..36ae3a4bf343f 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp @@ -24,7 +24,7 @@ ClientInterceptor (IOP::CodecFactory_var cf) this->codec = cf->create_codec (encoding); } -ClientInterceptor::~ClientInterceptor (void) +ClientInterceptor::~ClientInterceptor () { } @@ -84,7 +84,6 @@ ClientInterceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, false); - } void diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h index fb5cb92645576..6c711ac402451 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h @@ -10,7 +10,6 @@ class ClientInterceptor: public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (IOP::CodecFactory_var) ; diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp index 07e184ac27c10..fcc2add53e9dd 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp @@ -4,12 +4,12 @@ #include "Messenger_i.h" // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h index d481b7803f522..465d2f1a851a2 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h @@ -12,14 +12,13 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual void send_message (const CORBA::OctetSeq & user_name); - }; diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp index b8ee6b53248fb..0bc539cf374a8 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp @@ -3,7 +3,7 @@ #include "MessengerC.h" #include -ClientInitializer::ClientInitializer (void) +ClientInitializer::ClientInitializer () : slot_ (0), current_ (PortableInterceptor::Current::_nil()) { @@ -41,7 +41,7 @@ ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) } void -ClientInitializer::set_slot_data (void) +ClientInitializer::set_slot_data () { // Set the recursion flag CORBA::Any flag; diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h index 4870f1877c363..c3d497c100845 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h @@ -11,10 +11,10 @@ class ClientInitializer : public virtual ::CORBA::LocalObject { public: - ClientInitializer (void); + ClientInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); - void set_slot_data (void); + void set_slot_data (); private: PortableInterceptor::SlotId slot_; diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp index c46cca7caf895..5321a7e460f43 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp @@ -19,7 +19,7 @@ ClientInterceptor (Messenger_var theMessenger, this->slot = theSlot; } -ClientInterceptor::~ClientInterceptor (void) +ClientInterceptor::~ClientInterceptor () { } @@ -87,7 +87,6 @@ ClientInterceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) x = false; flag <<= CORBA::Any::from_boolean(x); pic->set_slot(slot,flag); - } void diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h index f3ec546e4b4c3..17440a354b402 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h @@ -11,7 +11,6 @@ class ClientInterceptor: public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (Messenger_var theMessage, PortableInterceptor::Current_ptr thePic, diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp index 7bfb4963b3256..576ff21b0fc75 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp @@ -12,12 +12,12 @@ #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -34,7 +34,7 @@ CORBA::Boolean Messenger_i::send_message ( return true; } -char * Messenger_i::get_time (void) +char * Messenger_i::get_time () { time_t thetime; struct tm * timeinfo = 0; diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h index 68e056019b75d..7a63cb2c5f4ed 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h @@ -21,17 +21,17 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message); - virtual char * get_time (void); + virtual char * get_time (); }; #endif /* MESSENGERI_H_ */ diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp index bdce4bc60299d..a6f879eb1dc74 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp @@ -9,7 +9,7 @@ static const char* allowed_users[num_allowed_users+1] = {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0}; const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"}; -ServerInterceptor::ServerInterceptor (void) +ServerInterceptor::ServerInterceptor () : myname_ ("Server_Authentication_Interceptor") { std::cout << "Calling ServerInterceptor constructor." << std::endl; diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h index a8da1affe953a..3e8e46e14a901 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h @@ -8,7 +8,7 @@ class ServerInterceptor : public PortableInterceptor::ServerRequestInterceptor { public: - ServerInterceptor (void); + ServerInterceptor (); ~ServerInterceptor (); diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp index 84dae2a1ed667..504fd1a67df72 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp @@ -1,7 +1,7 @@ #include "ClientInitializer.h" #include "ClientInterceptor.h" -ClientInitializer::ClientInitializer (void) +ClientInitializer::ClientInitializer () { } diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h index ee05418e97da3..c9a56901d899b 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h @@ -10,7 +10,7 @@ class ClientInitializer : public virtual ::CORBA::LocalObject { public: - ClientInitializer (void); + ClientInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp index 656d2383bcedd..e083f001718b2 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp @@ -20,10 +20,9 @@ ClientInterceptor (IOP::CodecFactory_var cf) // Obtain the CDR encapsulation Codec. this->codec = cf->create_codec (encoding); - } -ClientInterceptor::~ClientInterceptor (void) +ClientInterceptor::~ClientInterceptor () { } @@ -67,7 +66,6 @@ ClientInterceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, false); - } void diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h index 5bd7dd2a6d4a4..6c711ac402451 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h @@ -10,7 +10,6 @@ class ClientInterceptor: public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (IOP::CodecFactory_var) ; @@ -33,7 +32,6 @@ class ClientInterceptor: private: const char *myname_; IOP::Codec_var codec; - }; #endif diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp index cb3646a5051ec..6abb61497073d 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp @@ -4,12 +4,12 @@ #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h index 24befa12b8708..6508d56c77c1e 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h @@ -12,14 +12,13 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual void send_message (const CORBA::OctetSeq & user_name); - }; #endif /* MESSENGERI_H_ */ diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp index e59cd9bb0d59c..76e1609844566 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp @@ -21,7 +21,6 @@ ServerInterceptor::ServerInterceptor (IOP::CodecFactory_var cf) // Obtain the CDR encapsulation Codec. this->codec = cf->create_codec (encoding); - } ServerInterceptor::~ServerInterceptor () diff --git a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp index 7d22f0a9bca40..fe22d886bafda 100644 --- a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp +++ b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp @@ -96,7 +96,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) static const CORBA::Short increment = get_increment(); for(CORBA::ULong i = 0; i < get_total_lanes(); i++) { - // Set the priority to one that matches one of the lanes CORBA::Short priority = i * increment; current->the_priority(priority); diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp index 077bd43a8b274..fc686f11a34a3 100644 --- a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp +++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp @@ -2,12 +2,12 @@ #include "ace/OS_NS_time.h" #include -Logger_i::Logger_i (void) +Logger_i::Logger_i () { log_file.open("Logger.txt"); } -Logger_i::~Logger_i (void) +Logger_i::~Logger_i () { log_file.close(); } diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.h b/TAO/DevGuideExamples/SmartProxies/Logger_i.h index d23787a08e956..cacf61448fc82 100644 --- a/TAO/DevGuideExamples/SmartProxies/Logger_i.h +++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.h @@ -12,8 +12,8 @@ class Logger_i : public virtual POA_Logger { public: - Logger_i (void); - virtual ~Logger_i (void); + Logger_i (); + virtual ~Logger_i (); private: ofstream log_file; // Output file stream to which messages are logged. time_t log_time; // Needed for creating a time stamp. diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp index 32349ed7f169d..09098dc809f7c 100644 --- a/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp +++ b/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger_i.h b/TAO/DevGuideExamples/SmartProxies/Messenger_i.h index e2cd0fc892593..63ad758730fc2 100644 --- a/TAO/DevGuideExamples/SmartProxies/Messenger_i.h +++ b/TAO/DevGuideExamples/SmartProxies/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp index 35a37beb08513..f0e3d7c8312ea 100644 --- a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp +++ b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp @@ -26,7 +26,6 @@ Messenger_ptr Smart_Messenger_Proxy_Factory::create_proxy ( Messenger_ptr proxy) { - Messenger_ptr smart_proxy = 0; if (CORBA::is_nil(proxy) == 0) smart_proxy = new Smart_Messenger_Proxy(proxy, logger_.in()); diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp index aaa387072a7db..3a51587727f8c 100644 --- a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp @@ -70,9 +70,7 @@ class Person_i }; int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { - try { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); if (parse_args (argc, argv) != 0) @@ -100,7 +98,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { std::cout << "Client: Ending balance: " << b/100.0 << std::endl; orb->destroy(); - } catch(const CORBA::Exception& e) { std::cerr << e << std::endl; return 1; diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp index b5d4854dfb18e..198181714d219 100644 --- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp @@ -34,7 +34,7 @@ MessageImpl::MessageImpl } ::CORBA::ValueBase * -MessageImpl::_copy_value (void) +MessageImpl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; ACE_NEW_THROW_EX ( diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h index f762e101cf175..0c3114d373a22 100644 --- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h +++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h @@ -25,7 +25,7 @@ class MessageImpl : public virtual OBV_Message, const char* txt ); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); virtual ::Message::AddrList* getAddresses(); virtual void addAddress(const char*); diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp index 1c310744b18cb..06071e1be93db 100644 --- a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp @@ -33,7 +33,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); if (parse_args (argc, argv) != 0) @@ -50,11 +49,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { Message_var msg = new MessageImpl("Son", "Mom", "Dinner's Ready.", "Hurry home."); if (tst->send_message(msg)) { - std::cout << "Message sent successfully.\n"; msg->print(); std::cout << std::endl; - } else { std::cout << "Message refused." << std::endl; } @@ -64,7 +61,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { } orb->destroy(); - } catch(const CORBA::Exception& e) { std::cerr << e << std::endl; return 1; diff --git a/TAO/MPC/config/notify_monitor_control.mpb b/TAO/MPC/config/notify_monitor_control.mpb index 026b234b94a53..c8951b1fb6811 100644 --- a/TAO/MPC/config/notify_monitor_control.mpb +++ b/TAO/MPC/config/notify_monitor_control.mpb @@ -1,6 +1,5 @@ // -*- MPC -*- feature(notify_monitor_control): svc_utils { - avoids += wince after += TAO_Monitor CosNotification_MC CosNotification_MC_Ext libs += TAO_CosNotification_MC_Ext TAO_CosNotification_MC TAO_Monitor macros += TAO_HAS_NOTIFICATION_MONITOR_CONTROL diff --git a/TAO/NEWS b/TAO/NEWS index 4c2b32ba206fa..a65cd83348f05 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -1,6 +1,23 @@ +USER VISIBLE CHANGES BETWEEN TAO-3.0.11 and TAO-3.1.0 +===================================================== + +USER VISIBLE CHANGES BETWEEN TAO-3.0.10 and TAO-3.0.11 +====================================================== + +. Fixed some compiler warnings given by newer compilers + +. PortableGroup cleanup + +USER VISIBLE CHANGES BETWEEN TAO-3.0.9 and TAO-3.0.10 +===================================================== + +. Various cleanup and using more C++11 features + USER VISIBLE CHANGES BETWEEN TAO-3.0.8 and TAO-3.0.9 ==================================================== +. Various cleanup + USER VISIBLE CHANGES BETWEEN TAO-3.0.7 and TAO-3.0.8 ==================================================== diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM index f43f96f6aca8f..1b7187562fca8 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: 3.0.8 - ACE VERSION: 7.0.8 + TAO VERSION: 3.0.11 + ACE VERSION: 7.0.11 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 1bfc3b652ac43..1094be6199259 100644 --- a/TAO/TAO-INSTALL.html +++ b/TAO/TAO-INSTALL.html @@ -42,7 +42,7 @@

      Building and Installing TAO from a distribution

      Partially supported, i.e., infrequently tested - Solaris 9, FreeBSD, NetBSD, Windows CE, MacOSX, Linux/Alpha (RedHat, SuSE, and Debian), and AIX 5.x + FreeBSD, NetBSD, MacOSX, Linux/Alpha (RedHat, SuSE, and Debian) @@ -53,7 +53,7 @@

      Building and Installing TAO from a distribution

      Formerly Supported Platforms Embarcadero C++ Builder, Sun/C++ 5.1 through 5.4, g++ prior to 2.95.x, HP/UX 10.x, pSoS, Chorus, DEC UNIX, SCO, UnixWare, MVS, - Windows 9x/ME, Chorus, Tandem NS, OpenVMS 8.3 IA64 + Windows 9x/ME, Chorus, Tandem NS, OpenVMS 8.3 IA64, Windows CE, Solaris 9, AIX diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp index 0fbe32d065630..039e5662f2371 100644 --- a/TAO/TAO_IDL/ast/ast_argument.cpp +++ b/TAO/TAO_IDL/ast/ast_argument.cpp @@ -70,6 +70,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_argument.h" #include "ast_visitor.h" +#include "ast_type.h" + +#include "utl_err.h" + +#include "global_extern.h" // Static functions. @@ -101,6 +106,12 @@ AST_Argument::AST_Argument (Direction d, AST_Field (AST_Decl::NT_argument, ft, n), pd_direction (d) { + AST_Decl::NodeType fnt = ft->node_type (); + + if (fnt == AST_Decl::NT_except) + { + idl_global->err ()->not_a_type (ft); + } } AST_Argument::~AST_Argument () diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index e2803ef69af26..2c5ee1816c412 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -1344,7 +1344,7 @@ AST_Decl::set_name (UTL_ScopedName *n) } Identifier * -AST_Decl::local_name () +AST_Decl::local_name () const { return this->pd_local_name; } diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp index 6b09b061604fd..bacbf80714ccc 100644 --- a/TAO/TAO_IDL/ast/ast_field.cpp +++ b/TAO/TAO_IDL/ast/ast_field.cpp @@ -115,6 +115,10 @@ AST_Field::AST_Field (AST_Type *ft, idl_global->err ()->not_a_type (ft); } } + else if (fnt == AST_Decl::NT_except) + { + idl_global->err ()->not_a_type (ft); + } } // To be used when constructing a node of a subclass of AST_Field. diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp index f0e70503289d1..15c3a0594353a 100644 --- a/TAO/TAO_IDL/ast/ast_valuebox.cpp +++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp @@ -30,7 +30,6 @@ AST_ValueBox::boxed_type () const void AST_ValueBox::dump (ACE_OSTREAM_TYPE &o) { - this->dump_i (o, "valuetype "); this->local_name ()->dump (o); diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp index 1a0c3f8dc7648..8f2a04f8ffcf9 100644 --- a/TAO/TAO_IDL/be/be_array.cpp +++ b/TAO/TAO_IDL/be/be_array.cpp @@ -263,7 +263,7 @@ be_array::gen_ostream_operator (TAO_OutStream *os, AST_Expression *expr = this->dims ()[i]; // Generate a loop for each dimension. - *os << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < " + *os << "for (::CORBA::ULong i" << i << " = 0; i" << i << " < " << expr->ev ()->u.ulval << "; ++i" << i << ")" << be_idt_nl << "{" << be_idt_nl << "if (i" << i << " != 0)" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index d61acfd99b316..caa96561985fb 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1794,24 +1794,10 @@ TAO_CodeGen::end_server_template_header () *this->server_template_header_ << be_global->versioning_end (); // Insert the code to include the template source file. - *this->server_template_header_ - << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)"; *this->server_template_header_ << be_nl << "#include \"" << be_global->be_get_server_template_skeleton_fname (true) << "\""; - *this->server_template_header_ << be_nl - << "#endif /* defined REQUIRED SOURCE */"; - - // Insert the code to include the template pragma. - *this->server_template_header_ - << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)"; - *this->server_template_header_ - << be_nl << "#pragma implementation (\"" - << be_global->be_get_server_template_skeleton_fname (true) - << "\")"; - *this->server_template_header_ << be_nl - << "#endif /* defined REQUIRED PRAGMA */"; // Code to put the last #endif. *this->server_template_header_ << "\n\n"; @@ -1916,18 +1902,9 @@ int TAO_CodeGen::end_ciao_svnt_template_header () { *this->ciao_svnt_template_header_ << be_nl_2 - << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)" - << be_nl << "#include \"" - << be_global->be_get_ciao_tmpl_svnt_src_fname (true) - << "\"" << be_nl - << "#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */" - << be_nl_2 - << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)" - << be_nl << "#pragma implementation (\"" + << "#include \"" << be_global->be_get_ciao_tmpl_svnt_src_fname (true) - << "\")" - << be_nl << "#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */" - << be_nl; + << "\"" << be_nl; if (be_global->post_include () != nullptr) { @@ -2338,7 +2315,6 @@ TAO_CodeGen::gen_stub_hdr_includes () this->client_header_); - if (idl_global->abstract_iface_seen_ || idl_global->abstractbase_seen_) { // Include the AbstractBase file from the Valuetype library. @@ -2769,7 +2745,6 @@ TAO_CodeGen::gen_stub_src_includes () if (be_global->gen_amh_classes ()) { - // Necessary for the AIX compiler. this->gen_standard_include (this->client_stubs_, "ace/Auto_Ptr.h"); } @@ -3725,7 +3700,7 @@ TAO_CodeGen::make_rand_extension (char * const t) size_t const NUM_CHARS = ACE_OS::strlen (t); /// Use ACE_Time_Value::msec(ACE_UINT64&) as opposed to - /// ACE_Time_Value::msec(void) to avoid truncation. + /// ACE_Time_Value::msec() to avoid truncation. ACE_UINT64 msec; /// Use a const ACE_Time_Value to resolve ambiguity between diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp index 541792d3e0c76..3fcadb0a14c63 100644 --- a/TAO/TAO_IDL/be/be_generator.cpp +++ b/TAO/TAO_IDL/be/be_generator.cpp @@ -485,7 +485,6 @@ be_generator::create_structure (UTL_ScopedName *n, AST_StructureFwd * be_generator::create_structure_fwd (UTL_ScopedName *n) { - AST_Structure *full_defn = this->create_structure (n, false, false); diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index e079b989e51cf..2eebde2ba5c02 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -615,7 +615,6 @@ be_interface::gen_def_ctors_helper (be_interface* node, be_interface* base, TAO_OutStream *os) { - static int first = 0; if (node != base) @@ -2013,20 +2012,10 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) tao_cg->gperf_input_stream ()->file () = nullptr; // Open the temp file. -#if defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - ACE_HANDLE input = ::open (tao_cg->gperf_input_filename (), - O_RDONLY, - "shr=get,put,upd", - "ctx=rec", - "fop=dfw"); - //FUZZ: enable check_for_lack_ACE_OS -#else ACE_HANDLE input = ACE::open_temp_file ( ACE_TEXT_CHAR_TO_TCHAR (tao_cg->gperf_input_filename ()), O_RDONLY); -#endif if (input == ACE_INVALID_HANDLE) { @@ -2039,40 +2028,16 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) -1); } -#ifndef ACE_OPENVMS // Flush the output stream. Gperf also uses it as output. Ensure // current contents are written before gperf writes. ACE_OS::fflush (tao_cg->server_skeletons ()->file ()); -#endif /* !ACE_OPENVMS */ // Stdout is server skeleton. Do *not* close the file, just open // again with with WRITE + APPEND option.. After // this, remember to update the file offset to the correct location. - -#if defined (ACE_OPENVMS) - char* gperfOutput = ACE_OS::tempnam (0, "idl_"); - - if (gperfOutput == 0) - { - ACE_OS::close (input); - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("failed to allocate memory\n")), - -1); - } - - //FUZZ: disable check_for_lack_ACE_OS - ACE_HANDLE output = ::open (gperfOutput, - O_WRONLY | O_CREAT | O_EXCL, - ACE_DEFAULT_FILE_PERMS, - "shr=get,put,upd", - "ctx=rec", - "fop=dfw"); - //FUZZ: enable check_for_lack_ACE_OS -#else ACE_HANDLE output = ACE_OS::open (be_global->be_get_server_skeleton_fname (), O_WRONLY | O_APPEND); -#endif if (output == ACE_INVALID_HANDLE) { @@ -2208,49 +2173,6 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) ACE_OS::close (output); ACE_OS::close (input); -#if defined (ACE_OPENVMS) - ACE_OS::unlink (tao_cg->gperf_input_filename ()); - process_options.release_handles (); - - if (result != -1) - { - FILE* gperfOutputFile = ACE_OS::fopen (gperfOutput, "r"); - - if (gperfOutputFile == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Error:%p: Couldn't open ") - ACE_TEXT ("gperf output file\n"), - "fopen")); - result = -1; - } - else - { - FILE* out = tao_cg->server_skeletons ()->file (); - int c; - - while ((c = ACE_OS::fgetc(gperfOutputFile)) != EOF) - { - ACE_OS::fputc (c, out); - } - - if (ferror (gperfOutputFile) || ferror (out)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Error:%p: Couldn't open ") - ACE_TEXT ("gperf output file\n"), - "get/put")); - result = -1; - } - - ACE_OS::fclose (gperfOutputFile); - } - } - - ACE_OS::unlink (gperfOutput); - ACE_OS::free (gperfOutput); -#endif /* ACE_OPENVMS */ - return result; } diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index f13367ddab055..01ecb59fbdddf 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -187,7 +187,6 @@ be_union::destroy () this->be_scope::destroy (); this->be_type::destroy (); this->AST_Union::destroy (); - } // Visitor method. diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 6454a20f47a22..869ed85a16237 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -218,7 +218,6 @@ be_valuetype::determine_factory_style () ACE_TEXT ("determine_factory_style") ACE_TEXT ("bad node in this scope\n")), factory_style); - } AST_Decl::NodeType node_type = d->node_type (); @@ -279,7 +278,6 @@ be_valuetype::have_operation () ACE_TEXT ("has_operation") ACE_TEXT ("bad node in this scope\n")), 0); - } AST_Decl::NodeType nt = d->node_type(); diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp index 87b095402abe3..27bbd0f0e13e2 100644 --- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp @@ -488,7 +488,6 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, ACE_TEXT ("add_normal_reply - ") ACE_TEXT ("bad node in this scope\n")), -1); - } //be_decl *arg = dynamic_cast (d); @@ -738,7 +737,6 @@ be_visitor_amh_pre_proc::generate_name (ACE_CString &destination, } - be_operation * be_visitor_amh_pre_proc::generate_get_operation (be_attribute *node) { diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp index cc0145cd2e83f..5b37f293a4493 100644 --- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp @@ -519,7 +519,6 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) ), 0 ); - } AST_Argument *original_arg = dynamic_cast (d); @@ -653,7 +652,6 @@ be_visitor_ami_pre_proc::create_reply_handler_operation ( ACE_TEXT ("create_reply_handler_operation - ") ACE_TEXT ("bad node in this scope\n")), -1); - } AST_Argument *original_arg = dynamic_cast (d); @@ -847,7 +845,6 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node) "(%N:%l) be_visitor_scope::visit_scope - " "bad node in this scope\n"), -1); - } if (!d->ami_visit()) diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp index f8505ad354ab7..de4f218b6f74e 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp @@ -432,7 +432,6 @@ be_visitor_args_vardecl_ss::emit_common ( } - int be_visitor_args_vardecl_ss::emit_common2 (be_type *node) { diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp index 6e961b2528c3f..3390d8f91540c 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp @@ -76,8 +76,8 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) *os << "void operator<<= (" << be_idt << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "const " << node->name () << "_forany &_tao_elem" << be_uidt_nl - << ")" << be_uidt_nl + << "const " << node->name () << "_forany &_tao_elem)" << be_uidt_nl + << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Array_Impl_T<" << be_idt << be_idt_nl << node->name () << "_slice," << be_nl @@ -96,8 +96,8 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << node->name () << "_forany &_tao_elem" << be_uidt_nl - << ")" << be_uidt_nl + << node->name () << "_forany &_tao_elem)" << be_uidt_nl + << be_uidt_nl << "{" << be_idt_nl << "return" << be_idt_nl << "TAO::Any_Array_Impl_T<" << be_idt << be_idt_nl @@ -107,8 +107,8 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << "_tao_any," << be_nl << node->name () << "_forany::_tao_any_destructor," << be_nl << (td != nullptr ? td->tc_name () : node->tc_name ()) << "," << be_nl - << "_tao_elem.out ()" << be_uidt_nl - << ");" << be_uidt << be_uidt << be_uidt << be_uidt_nl + << "_tao_elem.out ());" << be_uidt + << be_uidt << be_uidt << be_uidt << be_uidt_nl << "}"; *os << be_global->anyops_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp index e2ff06ad28bba..af79385e5d5f0 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp @@ -270,7 +270,7 @@ int be_visitor_array_ch::visit_array (be_array *node) // Typedefed array. *os << storage_class.c_str() << node->nested_type_name (scope, "_slice") << " *" << be_nl; - *os << node->nested_type_name (scope, "_alloc") << " (void);" + *os << node->nested_type_name (scope, "_alloc") << " ();" << be_nl_2; *os << storage_class.c_str() << "void" << be_nl << node->nested_type_name (scope, "_free") diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp index d1d176de341d2..eccbf54150509 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -256,7 +256,7 @@ int be_visitor_array_ci::visit_array (be_array *node) if (expr->ev ()->et == AST_Expression::EV_ulong) { // Generate a loop for each dimension. - *os << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < " + *os << "for (::CORBA::ULong i" << i << " = 0; i" << i << " < " << expr->ev ()->u.ulval << "; ++i" << i << ")" << be_idt_nl << "{" << be_idt_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp index 414abf50bbbc2..b4987cd21c6d7 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp @@ -168,7 +168,7 @@ int be_visitor_array_cs::visit_array (be_array *node) if (expr->ev ()->et == AST_Expression::EV_ulong) { // Generate a loop for each dimension. - *os << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < " + *os << "for (::CORBA::ULong i" << i << " = 0; i" << i << " < " << expr->ev ()->u.ulval << "; ++i" << i << ")" << be_idt_nl << "{" << be_idt_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp index 95e43e1639826..363c7b1d0cd14 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp @@ -602,7 +602,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt) if (expr->ev ()->et == AST_Expression::EV_ulong) { // Generate a loop for each dimension. - *os << be_nl << "for ( ::CORBA::ULong i" << i + *os << be_nl << "for (::CORBA::ULong i" << i << " = 0; i" << i << " < " << expr->ev ()->u.ulval << " && _tao_marshal_flag; ++i" << i << ")" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp index 2b0c7d847eb79..014fd2f28ce09 100644 --- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp @@ -1487,7 +1487,6 @@ be_visitor_ccm_pre_proc::lookup_one_exception (const char *name, int be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node) { - UTL_Scope *s = node->defined_in (); UTL_ScopedName *consumer_name = @@ -1799,7 +1798,6 @@ be_visitor_ccm_pre_proc::compute_inheritance (be_home *node) UTL_NameList (full_name, nullptr), nullptr); - } else { diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp index b890516c0a147..71278e46fc712 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp @@ -29,7 +29,6 @@ be_visitor_component_exs::~be_visitor_component_exs () int be_visitor_component_exs::visit_component (be_component *node) { - if (node->imported ()) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp index 1e0c8462031a3..f69d3265addf6 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp @@ -110,7 +110,6 @@ be_visitor_context_ex_idl::visit_uses (be_uses *node) { os_ << IdentifierHelper::orig_sn (impl->name ()).c_str () << " get_connection_" << lname << " ();"; - } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp index 3b1355474cbae..bc19dd0ce0dbe 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp @@ -96,7 +96,6 @@ be_visitor_context_svts::visit_connector (be_connector *node) int be_visitor_context_svts::visit_uses (be_uses *node) { - ACE_CString prefix (this->ctx_->port_prefix ()); prefix += node->local_name ()->get_string (); const char *port_name = prefix.c_str (); @@ -160,7 +159,7 @@ be_visitor_context_svts::visit_publishes (be_publishes *node) << port_name << " (" << be_idt_nl << "::" << fname << "Consumer_ptr c)" << be_uidt_nl << "{" << be_idt_nl - << "if ( ::CORBA::is_nil (c))" << be_idt_nl + << "if (::CORBA::is_nil (c))" << be_idt_nl << "{" << be_idt_nl << "throw ::Components::InvalidConnection ();" << be_uidt_nl << "}" << be_uidt_nl << be_nl; @@ -284,7 +283,7 @@ be_visitor_context_svts::visit_emits (be_emits *node) << " (" << be_idt_nl << "::" << fname << "Consumer_ptr c)" << be_uidt_nl << "{" << be_idt_nl - << "if ( ::CORBA::is_nil (c))" << be_idt_nl + << "if (::CORBA::is_nil (c))" << be_idt_nl << "{" << be_idt_nl << "throw ::Components::InvalidConnection ();" << be_uidt_nl << "}" << be_uidt_nl << be_nl @@ -307,7 +306,7 @@ be_visitor_context_svts::visit_emits (be_emits *node) << "{" << be_idt_nl << "::" << fname << "Consumer_var ciao_emits_" << port_name << " =" << be_idt_nl << "this->ciao_emits_" << port_name << "_consumer_._retn ();" << be_uidt_nl << be_nl - << "if ( ::CORBA::is_nil (ciao_emits_" + << "if (::CORBA::is_nil (ciao_emits_" << port_name << ".in ()))" << be_idt_nl << "{" << be_idt_nl << "throw ::Components::NoConnection ();" << be_uidt_nl @@ -343,7 +342,7 @@ be_visitor_context_svts::gen_uses_simplex (AST_Type *obj, << port_name << " (" << be_idt_nl << "::" << fname << "_ptr c)" << be_uidt_nl << "{" << be_idt_nl - << "if ( ::CORBA::is_nil (c))" << be_idt_nl + << "if (::CORBA::is_nil (c))" << be_idt_nl << "{" << be_idt_nl << "throw ::Components::InvalidConnection ();" << be_uidt_nl << "}" << be_uidt_nl << be_nl @@ -365,7 +364,7 @@ be_visitor_context_svts::gen_uses_simplex (AST_Type *obj, << "{" << be_idt_nl << "::" << fname << "_var ciao_uses_" << port_name << " =" << be_idt_nl << "this->ciao_uses_" << port_name << "_._retn ();" << be_uidt_nl << be_nl - << "if ( ::CORBA::is_nil (ciao_uses_" + << "if (::CORBA::is_nil (ciao_uses_" << port_name << ".in ()))" << be_idt_nl << "{" << be_idt_nl << "throw ::Components::NoConnection ();" << be_uidt_nl @@ -434,7 +433,7 @@ be_visitor_context_svts::gen_uses_multiplex ( << port_name << " (" << be_idt_nl << "::" << fname << "_ptr c)" << be_uidt_nl << "{" << be_idt_nl - << "if ( ::CORBA::is_nil (c))" << be_idt_nl + << "if (::CORBA::is_nil (c))" << be_idt_nl << "{" << be_idt_nl << "throw ::Components::InvalidConnection ();" << be_uidt_nl << "}" << be_uidt_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp index 412debc236a0d..40f2d026a1ede 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp @@ -338,7 +338,6 @@ Exec_Attr_Decl_Generator::emit ( TAO_OutStream * /*os*/, be_interface * base_interface) { - // Even though this call seems unaware of CCM types, the // visitor must inherit from be_visitor_component_scope so // it will pick up attributes via porttypes. diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp index b4b34172117d8..88323b99c5545 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp @@ -215,7 +215,7 @@ be_visitor_executor_exs::visit_component (be_component *node) << "reactor = orb->orb_core ()->reactor ();" << be_uidt_nl << "}" << be_uidt << be_uidt_nl << "}" - << be_uidt_nl << "if (reactor == 0)" << be_idt_nl + << be_uidt_nl << "if (!reactor)" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::INTERNAL ();" << be_uidt_nl << "}" @@ -282,7 +282,7 @@ be_visitor_executor_exs::visit_component (be_component *node) << "this->ciao_context_ =" << be_idt_nl << global << sname << "::CCM_" << lname << "_Context::_narrow (ctx);" << be_uidt << be_nl_2 - << "if ( ::CORBA::is_nil (this->ciao_context_.in ()))" + << "if (::CORBA::is_nil (this->ciao_context_.in ()))" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::INTERNAL ();" << be_uidt_nl @@ -350,7 +350,7 @@ be_visitor_executor_exs::visit_provides (be_provides *node) << node_->local_name () << "_exec_i::get_" << port_name << " ()" << be_nl << "{" << be_idt_nl - << "if ( ::CORBA::is_nil (this->ciao_" << port_name + << "if (::CORBA::is_nil (this->ciao_" << port_name << "_.in ()))" << be_idt_nl << "{" << be_idt_nl << lname << "_exec_i *tmp {};" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp index ae755751dcb61..4dd9b33267b70 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp @@ -335,7 +335,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node) os_ << be_nl_2 << "/// Inherited from ::Components::EventConsumerBase." << be_nl << "virtual void" << be_nl - << "push_event ( ::Components::EventBase * ev);"; + << "push_event (::Components::EventBase * ev);"; os_ << be_nl_2 << "/// Get component implementation." << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp index 21fc046a951b5..34f73a86050fe 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -119,7 +119,7 @@ be_visitor_servant_svs::visit_component (be_component *node) << be_uidt_nl << "{" << be_idt_nl; - os_ << "for ( ::CORBA::ULong i = 0; i < descr.length (); ++i)" + os_ << "for (::CORBA::ULong i = 0; i < descr.length (); ++i)" << be_idt_nl << "{" << be_idt_nl << "const char * descr_name = descr[i]->name ();" @@ -664,7 +664,7 @@ be_visitor_servant_svs::gen_provides_top () << "const char * name)" << be_uidt_nl << "{" << be_idt_nl; - os_ << "if (name == 0)" << be_idt_nl + os_ << "if (!name)" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl << "}" << be_uidt << be_nl_2; @@ -674,7 +674,7 @@ be_visitor_servant_svs::gen_provides_top () << "::" << sname_str << global << "CCM_" << node_->original_local_name () << "::_duplicate (this->executor_.in ());" << be_uidt << be_nl_2; - os_ << "if ( ::CORBA::is_nil (executor.in ()))" + os_ << "if (::CORBA::is_nil (executor.in ()))" << be_idt_nl << "{"<< be_idt_nl << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl @@ -713,7 +713,7 @@ be_visitor_servant_svs::gen_publishes_top () << be_uidt_nl << "{" << be_idt_nl; - os_ << "if (publisher_name == 0)" << be_idt_nl + os_ << "if (!publisher_name)" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl << "}" << be_uidt; @@ -742,7 +742,7 @@ be_visitor_servant_svs::gen_publishes_top () << "::Components::Cookie * ck)" << be_uidt_nl << "{" << be_idt_nl; - os_ << "if (publisher_name == 0)" << be_idt_nl + os_ << "if (!publisher_name)" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl << "}" << be_uidt; @@ -819,7 +819,7 @@ be_visitor_servant_svs::gen_uses_top () << "::CORBA::Object_ptr connection)" << be_uidt_nl << "{" << be_idt_nl; - os_ << "if (name == 0)" << be_idt_nl + os_ << "if (!name)" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl << "}" << be_uidt; @@ -849,7 +849,7 @@ be_visitor_servant_svs::gen_uses_top () << (this->node_->has_uses_multiple () ? "ck" : "/* ck */") << ")" << be_uidt_nl << "{" << be_idt_nl - << "if (name == 0)" << be_idt_nl + << "if (!name)" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl << "}" << be_uidt; @@ -936,7 +936,7 @@ be_visitor_servant_svs::gen_emits_top () << be_uidt_nl << "{" << be_idt_nl; - os_ << "if (emitter_name == 0)" << be_idt_nl + os_ << "if (!emitter_name)" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl << "}" << be_uidt; @@ -964,7 +964,7 @@ be_visitor_servant_svs::gen_emits_top () << "const char * source_name)" << be_uidt_nl << "{" << be_idt_nl; - os_ << "if (source_name == 0)" << be_idt_nl + os_ << "if (!source_name)" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl << "}" << be_uidt; @@ -1265,7 +1265,7 @@ be_visitor_disconnect_block::visit_uses (be_uses *node) if (is_multiple) { - os_ << "if (ck == 0)" << be_idt_nl + os_ << "if (!ck)" << be_idt_nl << "{" << be_idt_nl << "throw ::Components::CookieRequired ();" << be_uidt_nl << "}" << be_uidt_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp index c7f28aeccf397..bf3f4090c9336 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp @@ -261,7 +261,7 @@ be_visitor_component_scope::gen_svnt_entrypoint_defn () << "_var x =" << be_idt_nl << global << sname << "::CCM_" << lname << "::_narrow (p);" << be_uidt_nl << be_nl - << "if ( ::CORBA::is_nil (x.in ()))" << be_idt_nl + << "if (::CORBA::is_nil (x.in ()))" << be_idt_nl << "{" << be_idt_nl << "return 0;" << be_uidt_nl << "}" << be_uidt_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index 03394c4b548ab..02595291cc23d 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -160,7 +160,6 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) << "};"; this->gen_exec_entrypoint_decl (); - } os_ << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp index d114738c86893..61c9585d65829 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp @@ -135,7 +135,6 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) << "}"; this->gen_exec_entrypoint_defn (); - } os_ << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp index b8a19f5ce7b0d..c3084e8c4c947 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp @@ -79,7 +79,6 @@ be_visitor_facet_ami_exh::visit_provides (be_provides *node) int be_visitor_facet_ami_exh::visit_attribute (be_attribute *node) { - be_operation get_op (node->field_type (), AST_Operation::OP_noflags, node->name (), @@ -321,7 +320,6 @@ be_visitor_facet_ami_exh::gen_facet_executor_class () sync_iface->get_insert_queue ().enqueue_tail (sync_iface); - Facet_AMI_ExecH_Op_Attr_Generator op_attr_gen (this); int status = sync_iface->traverse_inheritance_graph( @@ -337,7 +335,6 @@ be_visitor_facet_ami_exh::gen_facet_executor_class () ACE_TEXT ("::gen_facet_executor_class - ") ACE_TEXT ("traverse_inheritance_graph() on ") ACE_TEXT ("interface failed\n"))); - } } else diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp index 176da224463de..04b9540766abd 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp @@ -41,7 +41,6 @@ be_visitor_facet_ami_exs::visit_component (be_component *node) int be_visitor_facet_ami_exs::visit_provides (be_provides *node) { - this->iface_ = dynamic_cast (node->provides_type ()); @@ -70,7 +69,6 @@ be_visitor_facet_ami_exs::visit_provides (be_provides *node) int be_visitor_facet_ami_exs::visit_attribute (be_attribute *node) { - be_operation get_op (node->field_type (), AST_Operation::OP_noflags, node->name (), @@ -230,7 +228,6 @@ be_visitor_facet_ami_exs::init () else this->sync_ = false; - } int be_visitor_facet_ami_exs::gen_reply_handler_class () @@ -327,7 +324,6 @@ be_visitor_facet_ami_exs::gen_reply_handler_class () int be_visitor_facet_ami_exs::gen_facet_executor_class () { - this->for_reply_handler_ = false; const char *suffix = "_exec_i"; @@ -386,7 +382,6 @@ be_visitor_facet_ami_exs::gen_facet_executor_class () ACE_TEXT ("::gen_facet_executor_class - ") ACE_TEXT ("traverse_inheritance_graph() on ") ACE_TEXT ("interface failed\n"))); - } ACE_CString scope_str (scope_name, nullptr, false); @@ -407,7 +402,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class () << ScopeAsDecl (this->node_->defined_in ())->full_name () << "::CCM_" << this->node_->local_name () << "_Context::_narrow (ctx);" << be_uidt_nl << be_nl - << "if ( ::CORBA::is_nil (this->context_.in ()))" + << "if (::CORBA::is_nil (this->context_.in ()))" << be_idt_nl << "{" << be_idt_nl << "throw ::CORBA::INTERNAL ();" << be_uidt_nl @@ -451,7 +446,6 @@ be_visitor_facet_ami_exs::gen_facet_executor_class () int be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node) { - os_ << be_nl_2 << "void" << be_nl << this->iface_->local_name () << "_reply_handler::" @@ -537,7 +531,6 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node) int be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) { - // do not handle not sendc operations. if (ACE_OS::strstr (node->local_name()->get_string (), "sendc_")== nullptr) return 0; @@ -647,7 +640,6 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) int be_visitor_facet_ami_exs::gen_facet_executor_sync_op (be_operation *node) { - if (node->is_sendc_ami()) return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp index 291e946b486c9..14f8b8156af61 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp @@ -72,9 +72,9 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) } *os << "static " << node->local_name () - << " *_downcast ( ::CORBA::Exception *);" << be_nl + << " *_downcast (::CORBA::Exception *);" << be_nl << "static const " << node->local_name () - << " *_downcast ( ::CORBA::Exception const *);" << be_nl_2; + << " *_downcast (::CORBA::Exception const *);" << be_nl_2; *os << "static ::CORBA::Exception *_alloc ();" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index 88b7577007262..4e5559aa93501 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -177,7 +177,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Non-const downcast method. *os << node->name () << " *" << be_nl; - *os << node->name () << "::_downcast ( ::CORBA::Exception *_tao_excp)" << be_nl; + *os << node->name () << "::_downcast (::CORBA::Exception *_tao_excp)" << be_nl; *os << "{" << be_idt_nl; *os << "return dynamic_cast<" << node->local_name () << " *> (_tao_excp);" << be_uidt_nl; @@ -185,7 +185,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Const downcast method. *os << "const " << node->name () << " *" << be_nl; - *os << node->name () << "::_downcast ( ::CORBA::Exception const *_tao_excp)" + *os << node->name () << "::_downcast (::CORBA::Exception const *_tao_excp)" << be_nl; *os << "{" << be_idt_nl; *os << "return dynamic_castlocal_name () @@ -275,7 +275,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) << "TAO_AnyTypeCode_Adapter *adapter =" << be_idt_nl << "ACE_Dynamic_Service::instance (" << "\"AnyTypeCode_Adapter\");" << be_uidt_nl - << "if (adapter == 0)" << be_idt_nl + << "if (!adapter)" << be_idt_nl << "{" << be_idt_nl // FUZZ: disable check_for_ace_log_categories << "TAOLIB_ERROR_RETURN ((LM_ERROR," << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp index 6d989d0bda906..bb80dfa09482e 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp @@ -218,7 +218,7 @@ be_visitor_home_ex_idl::gen_implicit () << "Implicit" << be_nl << "{" << be_idt_nl << "::Components::EnterpriseComponent create ()" << be_idt_nl - << "raises ( ::Components::CCMException);" + << "raises (::Components::CCMException);" << be_uidt << be_uidt_nl << "};"; } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp index 805646d81b79a..263f78c05ee68 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp @@ -147,7 +147,7 @@ be_visitor_home_svs::visit_factory (be_factory *node) << "::_duplicate (this->executor_.in ());" << be_uidt << be_nl_2; - os_ << "if ( ::CORBA::is_nil (executor.in ()))" << be_idt_nl + os_ << "if (::CORBA::is_nil (executor.in ()))" << be_idt_nl << "{"<< be_idt_nl << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl << "}" << be_uidt << be_nl_2; @@ -177,7 +177,7 @@ be_visitor_home_svs::visit_factory (be_factory *node) << "_var _ciao_comp =" << be_idt_nl << global << comp_sname << "::CCM_" << comp_lname << "::_narrow (_ciao_ec.in ());" << be_uidt << be_nl_2 - << "if ( ::CORBA::is_nil (_ciao_ec.in ()))" << be_idt_nl + << "if (::CORBA::is_nil (_ciao_ec.in ()))" << be_idt_nl << "{" << be_idt_nl << "throw ::Components::CreateFailure ();" << be_uidt_nl << "}" << be_uidt << be_nl_2 @@ -249,7 +249,7 @@ be_visitor_home_svs::gen_servant_class () << be_uidt_nl << "{" << be_idt_nl; - os_ << "for ( ::CORBA::ULong i = 0; i < descr.length (); ++i)" + os_ << "for (::CORBA::ULong i = 0; i < descr.length (); ++i)" << be_idt_nl << "{" << be_idt_nl << "const char * descr_name = descr[i]->name ();" diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index 9280831728008..4dd5df87a48a9 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -296,7 +296,6 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node, ACE_TEXT ("create_response_handler_operation - ") ACE_TEXT ("bad node in this scope\n")), -1); - } AST_Argument *original_arg = diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index eab1ed7d3c820..6333aae01d4e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -99,7 +99,6 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << be_uidt << be_uidt_nl << "}"; - } void diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp index 97e173c807047..fd9383a86072b 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp @@ -122,7 +122,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "{" << be_idt_nl << node->full_name () << "_ptr _tao_objptr =" << be_idt_nl << node->full_name () << "::_duplicate (_tao_elem);" << be_uidt_nl - << "_tao_any <<= &_tao_objptr;" << be_uidt_nl + << "_tao_any <<= std::addressof(_tao_objptr);" << be_uidt_nl << "}" << be_nl_2; *os << "/// Non-copying insertion." << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp index 21130dd0ba5f1..3dca9ccc316b7 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp @@ -24,7 +24,6 @@ be_visitor_facet_svth::~be_visitor_facet_svth () int be_visitor_facet_svth::visit_interface (be_interface *node) { - if (node->imported () || node->svnt_src_facet_gen () || idl_global->ami_connector_seen_ || diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 720356509f254..b875331c9f506 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -407,7 +407,6 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node, if (d->node_type () == AST_Decl::NT_op) { - be_operation *op = dynamic_cast (d); op->set_local (node->is_local ()); ctx.state (TAO_CodeGen::TAO_OPERATION_CH); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index 4104945ae5962..b08822dc0900a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -65,7 +65,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << node->name () << "_ptr p)" << be_nl << "{" << be_idt_nl; - // Workaround for broken HP V7.4-004 on OpenVMS IA83 if (node->has_mixed_parentage ()) { *os << "::CORBA::AbstractBase_ptr abs = p;" << be_nl @@ -381,7 +380,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) if (be_global->tc_support ()) { - be_visitor_context ctx = *this->ctx_; TAO::be_visitor_objref_typecode tc_visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp index 5ec8109937676..0ea927be15eaf 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp @@ -91,7 +91,6 @@ be_visitor_interface_ih::visit_interface (be_interface *node) << be_global->impl_class_suffix () << "& " << "operator=(const " << be_global->impl_class_prefix () << namebuf << be_global->impl_class_suffix () << "&);" << be_nl_2; - } *os << "// Destructor" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp index 2379e9acf5212..37d37f6a4a229 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp @@ -24,7 +24,6 @@ be_visitor_interface_smart_proxy_cs::~be_visitor_interface_smart_proxy_cs () int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) { - if (be_global->gen_smart_proxies ()) { TAO_OutStream *os = this->ctx_->stream (); @@ -215,8 +214,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "return proxy;" << be_uidt_nl << "}" << be_uidt_nl << be_nl << "// Verify that an is available else make one." << be_nl - << "if (" - <<"this->proxy_factory_ == 0)" << be_idt_nl + << "if (!this->proxy_factory_)" << be_idt_nl << "ACE_NEW_RETURN (" << "this->proxy_factory_," << be_idt << be_idt_nl << "TAO_" << node->flat_name () diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp index c45aa7f2909ac..e28fc23849241 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -98,7 +98,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "/// do we own it" << be_nl << "::CORBA::Boolean _is_owner ();" << be_nl << "/// set the ownership" << be_nl_2 - << "void _is_owner ( ::CORBA::Boolean b);" << be_nl + << "void _is_owner (::CORBA::Boolean b);" << be_nl << "// overridden ServantBase operations" << be_nl << "PortableServer::POA_ptr _default_POA ();"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp index 1e9b2ff8f130c..156f84501230d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp @@ -80,7 +80,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) *os << "template " << be_nl << fulltiename << "::" << localtiename << " (T &t)" << be_idt_nl << ": ptr_ (std::addressof(t))," << be_idt_nl - << "poa_ ( ::PortableServer::POA::_nil ())," << be_nl + << "poa_ (::PortableServer::POA::_nil ())," << be_nl << "rel_ (false)" << be_uidt << be_uidt_nl << "{}" << be_nl_2; @@ -88,7 +88,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) << fulltiename << "::" << localtiename << " (T &t, ::PortableServer::POA_ptr poa)" << be_idt_nl << ": ptr_ (std::addressof(t))," << be_idt_nl - << "poa_ ( ::PortableServer::POA::_duplicate (poa))," << be_nl + << "poa_ (::PortableServer::POA::_duplicate (poa))," << be_nl << "rel_ (false)" << be_uidt << be_uidt_nl << "{}" << be_nl_2; @@ -96,7 +96,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) << fulltiename << "::" << localtiename << " (T *tp, ::CORBA::Boolean release)" << be_idt_nl << ": ptr_ (tp)," << be_idt_nl - << "poa_ ( ::PortableServer::POA::_nil ())," << be_nl + << "poa_ (::PortableServer::POA::_nil ())," << be_nl << "rel_ (release)" << be_uidt << be_uidt_nl << "{}" << be_nl_2; @@ -105,7 +105,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) << " (T *tp, ::PortableServer::POA_ptr poa, ::CORBA::Boolean release)" << be_idt_nl << ": ptr_ (tp)," << be_idt_nl - << "poa_ ( ::PortableServer::POA::_duplicate (poa))," << be_nl + << "poa_ (::PortableServer::POA::_duplicate (poa))," << be_nl << "rel_ (release)" << be_uidt << be_uidt_nl << "{}" << be_nl_2; @@ -154,7 +154,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) << "}" << be_nl_2; *os << "template void" << be_nl - << fulltiename << "::_is_owner ( ::CORBA::Boolean b)" << be_nl + << fulltiename << "::_is_owner (::CORBA::Boolean b)" << be_nl << "{" << be_idt_nl << "this->rel_ = b;" << be_uidt_nl << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp index 9fdb5f2cd0cdb..2546eba51b769 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp @@ -68,5 +68,4 @@ be_visitor_module_sh::visit_module (be_module *node) << node->name (); return 0; - } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp index 6c7bd3eb425c4..ded343c68364e 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -180,7 +180,6 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) } return 0; - } int diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp index f1918f568b16c..e24d7d6d397a2 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp @@ -129,7 +129,6 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation ( } - int be_visitor_operation_direct_proxy_impl_ss::gen_invoke ( be_visitor_context & /*ctx*/, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp index 9135f9dfe30a3..bb59f46d94604 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp @@ -52,8 +52,6 @@ be_visitor_operation_ch::visit_operation (be_operation *node) *os << "/// Setter for " << node->local_name() << " attribute" << be_nl << "/// @param[in] " << node->local_name() << " - New value for " << node->local_name() << " attribute" << be_nl; - - } else { diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp index f238e8996d9c4..c2587a06fafca 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp @@ -118,7 +118,7 @@ be_visitor_operation_svs::gen_op_body (be_operation *node) } os_ << be_nl_2 - << "if ( ::CORBA::is_nil (executor.in ()))" + << "if (::CORBA::is_nil (executor.in ()))" << be_idt_nl << "{"<< be_idt_nl << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp index 3a4522ffbbf43..90d8bbf65832e 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp @@ -28,7 +28,6 @@ be_visitor_operation_smart_proxy_ch::~be_visitor_operation_smart_proxy_ch () int be_visitor_operation_smart_proxy_ch::visit_operation (be_operation *node) { - if (be_global->gen_smart_proxies ()) { TAO_OutStream *os = this->ctx_->stream (); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp index 80569862e4b9e..1bfee6eed039f 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp @@ -332,7 +332,6 @@ be_visitor_operation_upcall_command_ss::gen_upcall ( } os << be_uidt_nl; - } --index; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp index a0a8a3d77977c..1d362ba307100 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp @@ -114,7 +114,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) << "::CORBA::ULong length = _tao_vector.size ();" << be_nl << "strm << length;" << be_nl_2 - << "for ( ::CORBA::ULong i = 0UL; i < length; ++i)" + << "for (::CORBA::ULong i = 0UL; i < length; ++i)" << be_idt_nl << "{" << be_idt_nl << "if (! (strm << _tao_vector[i]))" << be_idt_nl @@ -163,7 +163,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) << "return false;" << be_uidt_nl << "}" << be_uidt_nl << be_nl << "_tao_vector.resize (length);" << be_nl_2 - << "for ( ::CORBA::ULong i = 0UL; i < length; ++i)" + << "for (::CORBA::ULong i = 0UL; i < length; ++i)" << be_idt_nl << "{" << be_idt_nl << "if (! (strm >> tmp))" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 350354c8fc26f..3e280b46b43a7 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -184,7 +184,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) if (node->unbounded ()) { *os << be_nl - << node->local_name () << " ( ::CORBA::ULong max);"; + << node->local_name () << " (::CORBA::ULong max);"; } /// If we are using std::vector, we can't implement this diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index 13609f31b03f6..5994c5bef8ee2 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -205,7 +205,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) *os << be_nl_2 << "void" << be_nl - << node->name () << "::length ( ::CORBA::ULong length)" + << node->name () << "::length (::CORBA::ULong length)" << be_nl << "{" << be_idt_nl << "this->resize (length);" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp index 17ab3682ae872..3638b222ea6ed 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp @@ -25,7 +25,6 @@ TAO::be_visitor_alias_typecode::visit_typedef (be_typedef * node) return this->common (node, base, "tk_alias"); - } diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp index 8bc43ce8117c1..3455662f9f841 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp @@ -105,7 +105,7 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node, { // Should only be possible for user exceptions with no fields. os << "* const " << be_idt_nl - << fields_name.c_str () << " = 0;" << be_uidt_nl << be_uidt_nl; + << fields_name.c_str () << " = nullptr;" << be_uidt_nl << be_uidt_nl; } else { diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp index b2e2c62a754be..96a77ccb6863d 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp @@ -201,7 +201,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type ( << "// Accessor to set the discriminant." << be_nl << "ACE_INLINE" << be_nl << "void" << be_nl - << bu->name () << "::_d ( ::" << bt->name () + << bu->name () << "::_d (::" << bt->name () << " discval)" << be_nl << "{" << be_idt_nl << "this->disc_ = discval;" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp index 66b5843fc7819..c0ab0850bbf56 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp @@ -218,7 +218,7 @@ int be_visitor_union_cs::visit_union (be_union *node) << node->name () << " &u)" << be_nl; *os << "{" << be_idt_nl; // First check for self-assignment. - *os << "if (&u == this)" << be_idt_nl + *os << "if (std::addressof(u) == this)" << be_idt_nl << "{" << be_idt_nl << "return *this;" << be_uidt_nl << "}" << be_uidt_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp index 869aadd95ce39..5d8745b9630e2 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp @@ -510,7 +510,6 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type ( << "if (result)" << be_idt_nl << "{" << be_idt_nl << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());"; - } else if (pt == AST_PredefinedType::PT_pseudo) { @@ -519,7 +518,6 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type ( << "if (result)" << be_idt_nl << "{" << be_idt_nl << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());"; - } else if (pt == AST_PredefinedType::PT_value) { @@ -528,7 +526,6 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type ( << "if (result)" << be_idt_nl << "{" << be_idt_nl << "_tao_union." << f->local_name () << " (_tao_union_tmp);"; - } else if (pt == AST_PredefinedType::PT_char) { diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp index d4cdcda11a2fd..9cd5e801addb2 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp @@ -250,9 +250,9 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node) bool bt_is_defined = node->is_defined (); - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl; @@ -304,8 +304,8 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node) << "u.u_." << ub->local_name () << "_->in ()" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl - << "*this" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl; + << "*this);" << be_uidt + << be_uidt << be_uidt_nl; } *os << "}" << be_uidt << be_uidt_nl; @@ -347,9 +347,9 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd ( bool bt_is_defined = node->full_definition ()->is_defined (); - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl; @@ -401,8 +401,8 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd ( << "u.u_." << ub->local_name () << "_->in ()" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl - << "*this" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl; + << "*this);" << be_uidt + << be_uidt << be_uidt_nl; } *os << "}" << be_uidt << be_uidt_nl; @@ -460,9 +460,9 @@ be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node) TAO_OutStream *os = this->ctx_->stream (); - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl; @@ -489,8 +489,8 @@ be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node) << "this->u_." << ub->local_name () << "_," << be_nl << "OBJECT_FIELD (u.u_." << ub->local_name () << "_->in ())," << be_nl - << "*this" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl; + << "*this);" << be_uidt + << be_uidt << be_uidt_nl; } *os << "}" << be_uidt << be_uidt_nl; @@ -542,7 +542,7 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type ( // We are generating the copy constructor. *os << "ACE_NEW (" << be_idt << be_idt_nl << "this->u_." << ub->local_name () << "_," << be_nl - << "OBJECT_FIELD ( ::CORBA::Object" + << "OBJECT_FIELD (::CORBA::Object" << "::_duplicate (u.u_." << ub->local_name () << "_->in ()))" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; @@ -552,11 +552,11 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type ( // We are generating the assignment operator. *os << "ACE_NEW_RETURN (" << be_idt << be_idt_nl << "this->u_." << ub->local_name () << "_," << be_nl - << "OBJECT_FIELD ( ::CORBA::Object" + << "OBJECT_FIELD (::CORBA::Object" << "::_duplicate (u.u_." << ub->local_name () << "_->in ()))," << be_nl - << "*this" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl; + << "*this);" << be_uidt + << be_uidt << be_uidt_nl; } break; @@ -569,9 +569,9 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type ( case AST_PredefinedType::PT_any: if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR) { - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl @@ -584,9 +584,9 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type ( } else { - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl @@ -594,8 +594,8 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type ( << "this->u_." << ub->local_name () << "_," << be_nl << bt->name () << " (*u.u_." << ub->local_name () << "_)," << be_nl - << "*this" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl + << "*this);" << be_uidt + << be_uidt << be_uidt_nl << "}" << be_uidt << be_uidt_nl; } @@ -644,9 +644,9 @@ be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node) if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR) { - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl @@ -659,9 +659,9 @@ be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node) } else { - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl @@ -669,8 +669,8 @@ be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node) << "this->u_." << ub->local_name () << "_," << be_nl << bt->name () << " (*u.u_." << ub->local_name () << "_)," << be_nl - << "*this" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl + << "*this);" << be_uidt + << be_uidt << be_uidt_nl << "}" << be_uidt << be_uidt_nl; } @@ -747,9 +747,9 @@ be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node) { if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR) { - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl @@ -762,9 +762,9 @@ be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node) } else { - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl @@ -772,8 +772,8 @@ be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node) << "this->u_." << ub->local_name () << "_," << be_nl << bt->name () << " (*u.u_." << ub->local_name () << "_)," << be_nl - << "*this" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl + << "*this);" << be_uidt + << be_uidt << be_uidt_nl << "}" << be_uidt << be_uidt_nl; } } @@ -850,9 +850,9 @@ be_visitor_union_branch_public_assign_cs::visit_union (be_union *node) if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR) { - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl @@ -865,9 +865,9 @@ be_visitor_union_branch_public_assign_cs::visit_union (be_union *node) } else { - *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl + *os << "if (!u.u_." << ub->local_name () << "_)" << be_idt_nl << "{" << be_idt_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_uidt_nl + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_uidt_nl << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl @@ -875,8 +875,8 @@ be_visitor_union_branch_public_assign_cs::visit_union (be_union *node) << "this->u_." << ub->local_name () << "_," << be_nl << bt->name () << " (*u.u_." << ub->local_name () << "_)," << be_nl - << "*this" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl + << "*this);" << be_uidt + << be_uidt << be_uidt_nl << "}" << be_uidt << be_uidt_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp index 0bfe7299cb5f2..b0bc3c2e3a101 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp @@ -582,7 +582,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node) else { *os << be_nl_2 - << "void " << ub->local_name () << " ( ::CORBA::WChar *);" << be_nl; + << "void " << ub->local_name () << " (::CORBA::WChar *);" << be_nl; *os << "void " << ub->local_name () << " (const ::CORBA::WChar *);" << be_nl; *os << "void " << ub->local_name () << " (const ::CORBA::WString_var&);" diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp index 8f5706337c505..71fb2007d3e0f 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp @@ -621,7 +621,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( *os << "typedef ::CORBA::Object_var OBJECT_FIELD;" << be_nl << "ACE_NEW (" << be_idt << be_idt_nl << "this->u_." << ub->local_name () << "_," << be_nl - << "OBJECT_FIELD ( ::CORBA::Object::_duplicate (val))" + << "OBJECT_FIELD (::CORBA::Object::_duplicate (val))" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; @@ -630,7 +630,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( *os << "typedef ::CORBA::AbstractBase_var OBJECT_FIELD;" << be_nl << "ACE_NEW (" << be_idt << be_idt_nl << "this->u_." << ub->local_name () << "_," << be_nl - << "OBJECT_FIELD ( ::CORBA::AbstractBase::_duplicate (val))" + << "OBJECT_FIELD (::CORBA::AbstractBase::_duplicate (val))" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; @@ -864,7 +864,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) else { *os << bu->name () << "::" << ub->local_name () - << " ( ::CORBA::WChar *val)"; + << " (::CORBA::WChar *val)"; } *os << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp index 8f5be509a2233..b9f92332ee84e 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp @@ -169,7 +169,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node) *os << fname << "_free (this->u_." << ub->local_name () << "_);" << be_nl - << "this->u_." << ub->local_name () << "_ = 0;" << be_nl; + << "this->u_." << ub->local_name () << "_ = nullptr;" << be_nl; return 0; } @@ -216,7 +216,7 @@ be_visitor_union_branch_public_reset_cs::visit_interface (be_interface *) *os << "delete this->u_." << ub->local_name () << "_;" << be_nl << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; return 0; } @@ -243,7 +243,7 @@ be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd * *os << "delete this->u_." << ub->local_name () << "_;" << be_nl << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; return 0; } @@ -271,7 +271,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuebox ( *os << "delete this->u_." << ub->local_name () << "_;" << be_nl << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; return 0; } @@ -299,7 +299,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype ( *os << "delete this->u_." << ub->local_name () << "_;" << be_nl << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; return 0; } @@ -327,7 +327,7 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype_fwd ( *os << "delete this->u_." << ub->local_name () << "_;" << be_nl << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; return 0; } @@ -359,21 +359,21 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type ( *os << "delete this->u_." << ub->local_name () << "_;" << be_nl; *os << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; break; case AST_PredefinedType::PT_pseudo: *os << "::CORBA::release (this->u_." << ub->local_name () << "_);" << be_nl; *os << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; break; case AST_PredefinedType::PT_any: *os << "delete this->u_." << ub->local_name () << "_;" << be_nl << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; break; case AST_PredefinedType::PT_void: @@ -409,7 +409,7 @@ be_visitor_union_branch_public_reset_cs::visit_sequence ( << ub->local_name () << "_;" << be_nl << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; return 0; } @@ -446,7 +446,7 @@ be_visitor_union_branch_public_reset_cs::visit_string ( *os << ub->local_name () << "_);" << be_nl << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; return 0; } @@ -488,7 +488,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure ( << "_;" << be_nl << "this->u_." << ub->local_name () - << "_ = 0;" << be_nl; + << "_ = nullptr;" << be_nl; } return 0; @@ -548,7 +548,7 @@ be_visitor_union_branch_public_reset_cs::visit_union ( *os << "delete this->u_." << ub->local_name () << "_;" << be_nl << "this->u_." - << ub->local_name () << "_ = 0;" << be_nl; + << ub->local_name () << "_ = nullptr;" << be_nl; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp index d784d89c9a1c9..944af69fd1828 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp @@ -76,7 +76,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) << be_uidt_nl << "{" << be_idt_nl << "::CORBA::add_ref (_tao_elem);" << be_nl - << "_tao_any <<= &_tao_elem;" << be_uidt_nl + << "_tao_any <<= std::addressof(_tao_elem);" << be_uidt_nl << "}" << be_nl_2; *os << "/// Non-copying insertion." << be_nl @@ -98,8 +98,8 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) *os << "::CORBA::Boolean" << be_nl << "operator>>= (" << be_idt << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << node->full_name () << " *&_tao_elem" << be_uidt_nl - << ")" << be_uidt_nl + << node->full_name () << " *&_tao_elem)" << be_uidt + << be_uidt_nl << "{" << be_idt_nl << "return" << be_idt_nl << "TAO::Any_Impl_T<" << node->name () << ">::extract (" @@ -107,8 +107,8 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl - << "_tao_elem" << be_uidt_nl - << ");" << be_uidt << be_uidt << be_uidt_nl + << "_tao_elem);" << be_uidt + << be_uidt << be_uidt << be_uidt_nl << "}" << be_nl_2; *os << be_global->anyops_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp index 30516f8ea3dae..b5c8612f781e3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp @@ -497,7 +497,6 @@ be_visitor_valuebox_field_ch::emit_member_set (be_decl *field, *os << "void " << field->local_name () << " (" << const_arg << field_type->name () << arg_modifier << ");" << be_nl; - } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp index befadc961dc89..0251e6e9b8674 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -336,7 +336,7 @@ be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node) *os << "ACE_INLINE void" << be_nl << vb_node_->name () << "::" << field->local_name () - << " ( ::" << bt->name () << "_ptr val)" + << " (::" << bt->name () << "_ptr val)" << be_nl << "{" << be_idt_nl << "this->_pd_value->" << field->local_name () << " = ::" << bt->name() << "::_duplicate (val);" << be_uidt_nl @@ -561,7 +561,6 @@ be_visitor_valuebox_field_ci::emit_member_set (be_decl *field, << "this->_pd_value->" << field->local_name () << " = val;" << be_uidt_nl << "}" << be_nl_2; - } void diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp index 18c7a86cf410a..956ac7d7ef975 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp @@ -516,7 +516,6 @@ be_visitor_valuebox_union_member_ci::emit_member_set ( << "this->_pd_value->" << field->local_name () << " (val);" << be_uidt_nl << "}" << be_nl_2; - } void diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp index 9fde836d8b678..cb3dda8c2c93d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -68,7 +68,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) // _downcast method *os << be_nl_2 << "static " << node->local_name () << "* " - << "_downcast ( ::CORBA::ValueBase *);" << be_nl; + << "_downcast (::CORBA::ValueBase *);" << be_nl; // _copy_value method *os << "::CORBA::ValueBase * _copy_value ();" << be_nl_2; @@ -189,10 +189,10 @@ be_visitor_valuebox_ch::visit_array (be_array *node) // Overloaded subscript operators *os << "const " << node->full_name () - << "_slice & operator[] ( ::CORBA::ULong index) const;" << be_nl; + << "_slice & operator[] (::CORBA::ULong index) const;" << be_nl; *os << node->full_name () - << "_slice & operator[] ( ::CORBA::ULong index);" + << "_slice & operator[] (::CORBA::ULong index);" << be_nl_2; // Explicit conversion functions @@ -286,7 +286,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) if (node->unbounded ()) { // Public constructor with one argument of type ULong - *os << vb_node->local_name () << " ( ::CORBA::ULong max);" << be_nl; + *os << vb_node->local_name () << " (::CORBA::ULong max);" << be_nl; } // Public constructor for sequence with supplied buffer @@ -343,7 +343,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) "base type visit failed\n"), -1); } - *os << "& operator[] ( ::CORBA::ULong index);" << be_nl; + *os << "& operator[] (::CORBA::ULong index);" << be_nl; // Generate base type for sequence then remainder of operator [] *os << "const "; @@ -357,10 +357,10 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) -1); } - *os << "& operator[] ( ::CORBA::ULong index) const;" << be_nl_2 + *os << "& operator[] (::CORBA::ULong index) const;" << be_nl_2 << "::CORBA::ULong maximum () const;" << be_nl << "::CORBA::ULong length () const;" << be_nl - << "void length ( ::CORBA::ULong len);" << be_nl_2; + << "void length (::CORBA::ULong len);" << be_nl_2; // Member variable of underlying type; this->emit_boxed_member_var (node, "_var"); @@ -450,10 +450,10 @@ be_visitor_valuebox_ch::visit_string (be_string *node) // Overloaded subscript operators *os << "// Allows access and modification using a slot." << be_nl - << char_type << " & operator[] ( ::CORBA::ULong slot);" + << char_type << " & operator[] (::CORBA::ULong slot);" << be_nl_2 << "// Allows only accessing thru a slot." << be_nl - << char_type << " operator[] ( ::CORBA::ULong slot) const;" + << char_type << " operator[] (::CORBA::ULong slot) const;" << be_nl; // Member variable of underlying type; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp index 429e571b1666c..93d48a76d104e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -130,14 +130,14 @@ be_visitor_valuebox_ci::visit_array (be_array *node) // Overloaded subscript operators *os << "ACE_INLINE const " << node->full_name () << "_slice &" << be_nl - << vb_node->name () << "::operator[] ( ::CORBA::ULong index) const" + << vb_node->name () << "::operator[] (::CORBA::ULong index) const" << be_nl << "{" << be_idt_nl << "return this->_pd_value[index];" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE "<< node->full_name () << "_slice &" << be_nl - << vb_node->name () << "::operator[] ( ::CORBA::ULong index)" << be_nl + << vb_node->name () << "::operator[] (::CORBA::ULong index)" << be_nl << "{" << be_idt_nl << "return this->_pd_value[index];" << be_uidt_nl << "}" << be_nl_2; @@ -239,7 +239,7 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node) // Generate length() setter *os << "ACE_INLINE void" << be_nl - << vb_node->name () << "::length ( ::CORBA::ULong length)" << be_nl + << vb_node->name () << "::length (::CORBA::ULong length)" << be_nl << "{" << be_idt_nl << "this->_pd_value->length (length);" << be_uidt_nl << "}" << be_nl_2; @@ -371,13 +371,13 @@ be_visitor_valuebox_ci::visit_string (be_string *node) // Overloaded subscript operators *os << "ACE_INLINE " << char_type << " &" << be_nl - << vb_node->name () << "::operator[] ( ::CORBA::ULong slot)" << be_nl + << vb_node->name () << "::operator[] (::CORBA::ULong slot)" << be_nl << "{" << be_idt_nl << "return this->_pd_value[slot];" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << char_type << be_nl - << vb_node->name () << "::operator[] ( ::CORBA::ULong slot) const" << be_nl + << vb_node->name () << "::operator[] (::CORBA::ULong slot) const" << be_nl << "{" << be_idt_nl << "return this->_pd_value[slot];" << be_uidt_nl << "}" << be_nl_2; @@ -558,7 +558,6 @@ be_visitor_valuebox_ci::visit_union (be_union *node) } - int be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, const char * type_suffix, @@ -621,7 +620,6 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, << "{" << be_idt_nl << "return this->_pd_value;" << be_uidt_nl << "}" << be_nl_2; - } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp index 25c627a1d8f1b..96f252b024c4e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -81,9 +81,9 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) // The _downcast method. *os << be_nl_2 << node->name () << " *" << be_nl - << node->name () << "::_downcast ( ::CORBA::ValueBase *v)" << be_nl + << node->name () << "::_downcast (::CORBA::ValueBase *v)" << be_nl << "{" << be_idt_nl - << "return dynamic_cast< ::" << node->name () << " * > (v);" + << "return dynamic_cast<::" << node->name () << " *> (v);" << be_uidt_nl << "}" << be_nl_2; // _copy_value method @@ -238,7 +238,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) << "::CORBA::Boolean is_null_object = false;" << be_nl << "::CORBA::Boolean is_indirected = false;" << be_nl << "TAO_InputCDR indrected_strm ((size_t) 0);" << be_nl - << "if ( ::CORBA::ValueBase::_tao_validate_box_type (" << be_idt + << "if (::CORBA::ValueBase::_tao_validate_box_type (" << be_idt << be_idt << be_idt_nl << "strm, indrected_strm," << be_nl << node->local_name () << "::_tao_obv_static_repository_id ()," @@ -480,7 +480,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) { // Public constructor with one argument of type ULong *os << vb_node->name () << "::" << vb_node->local_name () - << " ( ::CORBA::ULong max)" << be_nl + << " (::CORBA::ULong max)" << be_nl << "{" << be_idt_nl << node->full_name () << "* p;" << be_nl << "ACE_NEW (" << be_idt_nl @@ -543,7 +543,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) } *os << " &" << be_nl - << vb_node->name () << "::operator[] ( ::CORBA::ULong index)" + << vb_node->name () << "::operator[] (::CORBA::ULong index)" << be_nl << "{" << be_idt_nl << "return ("; @@ -574,7 +574,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) *os << " &" << be_nl; *os << vb_node->name () - << "::operator[] ( ::CORBA::ULong index) const" << be_nl + << "::operator[] (::CORBA::ULong index) const" << be_nl << "{" << be_idt_nl; switch (bt->node_type()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp index 4c5e242540802..7bcd9e8945756 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp @@ -78,11 +78,11 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) << node->full_name () << " *_tao_copy =" << be_idt_nl << "_tao_elem ?" << be_idt_nl << node->full_name () << "::_downcast (_tao_elem->_copy_value ())" << be_nl - << ": 0;" << be_uidt << be_uidt_nl - << "_tao_any <<= &_tao_copy;" << be_uidt_nl + << ": nullptr;" << be_uidt << be_uidt_nl + << "_tao_any <<= std::addressof(_tao_copy);" << be_uidt_nl << "#else" << be_idt_nl << "::CORBA::add_ref (_tao_elem);" << be_nl - << "_tao_any <<= &_tao_elem;" << be_uidt_nl + << "_tao_any <<= std::addressof(_tao_elem);" << be_uidt_nl << "#endif" << be_uidt_nl << "}" << be_nl_2; @@ -105,8 +105,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << "::CORBA::Boolean" << be_nl << "operator>>= (" << be_idt << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << node->full_name () << " *&_tao_elem" << be_uidt_nl - << ")" << be_uidt_nl + << node->full_name () << " *&_tao_elem)" << be_uidt + << be_uidt_nl << "{" << be_idt_nl << "return" << be_idt_nl << "TAO::Any_Impl_T<" << node->name () << ">::extract (" @@ -114,8 +114,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl - << "_tao_elem" << be_uidt_nl - << ");" << be_uidt << be_uidt << be_uidt_nl + << "_tao_elem);" << be_uidt + << be_uidt << be_uidt << be_uidt_nl << "}" << be_nl_2; *os << be_global->anyops_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp index 6da083d21e5f8..fc3ff038801c3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp @@ -229,7 +229,7 @@ be_visitor_valuetype_field_ch::visit_interface (be_interface *node) TAO_INSERT_COMMENT (os); // Set method. - *os << pre_op () << "void " << ub->local_name () << " ( ::" + *os << pre_op () << "void " << ub->local_name () << " (::" << bt->name () << "_ptr" << ")" << post_op () << be_nl; // Get method. @@ -455,7 +455,7 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) case AST_PredefinedType::PT_pseudo: case AST_PredefinedType::PT_object: // Set method. - *os << pre_op () << "void " << ub->local_name () << " ( ::" + *os << pre_op () << "void " << ub->local_name () << " (::" << bt->name () << "_ptr)" << post_op () << be_nl; // Get method. @@ -616,7 +616,7 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node) else { *os << pre_op () - << "void " << ub->local_name () << " ( ::CORBA::WChar *val)" + << "void " << ub->local_name () << " (::CORBA::WChar *val)" << post_op () << be_nl; *os << pre_op () << "void " << ub->local_name () << " (const ::CORBA::WChar *val)" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp index 4718e7dea8c39..7ab3dc710ec75 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp @@ -836,7 +836,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node) } else { - *os << "::" << ub->local_name () << " ( ::CORBA::WChar *val)"; + *os << "::" << ub->local_name () << " (::CORBA::WChar *val)"; } *os << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp index c006b6c6384f1..272c249456cf9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp @@ -44,7 +44,6 @@ be_visitor_valuetype_marshal_ch::visit_valuetype (be_valuetype *node) "(%N:%l) be_visitor_scope::visit_scope - " "bad node in this scope\n"), -1); - } be_field *field = dynamic_cast (d); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index c03b411a649ff..fa78839f90e49 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -65,7 +65,6 @@ be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node) "(%N:%l) be_visitor_scope::visit_scope - " "codegen for scope failed\n"), -1); - } } @@ -843,7 +842,7 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node) << "public:" << be_idt_nl << "virtual ~" << node->local_name () << "_init ();" << be_nl; - *os << "virtual const char* tao_repository_id (void);\n" << be_nl; + *os << "virtual const char* tao_repository_id ();\n" << be_nl; *os << "// create () goes here" << be_nl; *os << be_uidt_nl << "};" << be_nl; @@ -931,7 +930,6 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node) bool be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node) { - // Just try to find a VT with concrete factory in inheritance tree. if (node == nullptr) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 12810c3aa2cb3..4d25ff32d53e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -172,7 +172,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) { // Generate the constructor and destructor and _copy_value. *os << be_nl_2 - << node->local_name () << " ( ::CORBA::Exception *ex)" << be_idt_nl + << node->local_name () << " (::CORBA::Exception *ex)" << be_idt_nl << ": exception (ex)" << be_uidt_nl << "{}" << be_nl_2 << "virtual ~" << node->local_name () << " ();" << be_nl @@ -181,7 +181,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << be_nl_2 << "static " << node->local_name () << "* " - << "_downcast ( ::CORBA::ValueBase *v);" << be_nl + << "_downcast (::CORBA::ValueBase *v);" << be_nl << be_nl << "/// TAO extensions or internals" << be_nl << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl @@ -498,7 +498,6 @@ be_visitor_valuetype_ch::gen_supported_ops (be_interface *, be_interface *base, TAO_OutStream *os) { - AST_Decl *d = nullptr; be_visitor_context ctx; ctx.stream (os); 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 49fd7f6bf7494..c00607388b782 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -87,10 +87,10 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // The _downcast method. *os << be_nl_2 << node->name () << " *" << be_nl << node->name () - << "::_downcast ( ::CORBA::ValueBase *v)" << be_nl + << "::_downcast (::CORBA::ValueBase *v)" << be_nl << "{" << be_idt_nl - << "return dynamic_cast< ::" << node->name () - << " * > (v);" << be_uidt_nl + << "return dynamic_cast<::" << node->name () + << " *> (v);" << be_uidt_nl << "}" << be_nl_2; // The _tao_obv_repository_id method. @@ -170,7 +170,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // Nothing to marshal if abstract valuetype. if (!node->is_abstract () && !is_an_amh_exception_holder) { - this->marshal_unmarshal_v (node); *os << "::CORBA::Boolean" << be_nl @@ -181,7 +180,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "return formal_type_id == reinterpret_cast (" << node->name() << "::_downcast);" << be_uidt_nl << "}" << be_nl_2; - } else if (is_an_amh_exception_holder) { @@ -198,8 +196,8 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "ACE_NEW_THROW_EX (" << be_idt_nl << "ret_val," << be_nl << node->local_name () << " ()," << be_nl - << "::CORBA::NO_MEMORY ()" << be_uidt_nl - << ");" << be_nl + << "::CORBA::NO_MEMORY ());" << be_uidt + << be_nl << "return ret_val;" << be_uidt_nl << "}" << be_nl_2; @@ -269,8 +267,8 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << "::CORBA::Boolean" << be_nl << node->name() << "::_tao_unmarshal (" << be_idt << be_idt_nl << "TAO_InputCDR &strm," << be_nl - << node->local_name () << " *&new_object" << be_uidt_nl - << ")" << be_uidt_nl + << node->local_name () << " *&new_object)" << be_uidt + << be_uidt_nl << "{" << be_idt_nl << "::CORBA::ValueBase *base {};" << be_nl << "::CORBA::Boolean is_indirected = false;" << be_nl @@ -294,7 +292,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "// Now base must point to the unmarshaled object." << be_nl << "// Align the pointer to the right subobject." << be_nl << "new_object = " << node->local_name () << "::_downcast (base);" << be_nl - << "if (0 == new_object)" << be_idt_nl + << "if (nullptr == new_object)" << be_idt_nl << "return false;" << be_uidt_nl << be_nl << "if (is_indirected)" << be_idt_nl << "new_object->_add_ref ();" << be_uidt_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp index 0059bc116e6c3..e52833958bb4b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp @@ -84,7 +84,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) // Generate _downcast method. os << be_nl_2 << "static " << node->local_name () << "_init* " - << "_downcast ( ::CORBA::ValueFactoryBase *);"; + << "_downcast (::CORBA::ValueFactoryBase *);"; if (factory_style == be_valuetype::FS_CONCRETE_FACTORY) { @@ -135,7 +135,6 @@ be_visitor_valuetype_init_ch::visit_eventtype (be_eventtype *node) int be_visitor_valuetype_init_ch::visit_factory (be_factory *node) { - TAO_OutStream& os = *(this->ctx_->stream ()); be_valuetype *vt = diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp index 891d6e3c4f5b6..38b0f4a769d09 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp @@ -84,10 +84,10 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) // The _downcast method. *os << be_nl_2 << node->name () << "_init *" << be_nl << node->name () - << "_init::_downcast ( ::CORBA::ValueFactoryBase *v)" << be_nl + << "_init::_downcast (::CORBA::ValueFactoryBase *v)" << be_nl << "{" << be_idt_nl - << "return dynamic_cast< ::" << node->name () - << "_init * > (v);" << be_uidt_nl + << "return dynamic_cast<::" << node->name () + << "_init *> (v);" << be_uidt_nl << "}"; // tao_repository_id @@ -111,8 +111,8 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl << "ret_val," << be_nl << "OBV_" << node->full_name () << "," << be_nl - << "::CORBA::NO_MEMORY ()" << be_uidt_nl - << ");" << be_uidt_nl + << "::CORBA::NO_MEMORY ());" << be_uidt + << be_uidt_nl << "return ret_val;" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp index 8ad3186a1e7dd..d051fe38e52ea 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp @@ -164,7 +164,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) *os << "OBV_"; } - *os << node->local_name () << " ();"; + *os << node->local_name () << " () = default;"; // Initializing constructor. if (node->has_member ()) @@ -237,8 +237,12 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) this->gen_pd (node); } - *os << be_nl - << "CORBA::Boolean require_truncation_;" << be_uidt_nl + if (be_global->cdr_support ()) + { + *os << be_nl + << "CORBA::Boolean require_truncation_ {false};"; + } + *os << be_uidt_nl << "};"; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp index 08b889746986d..f168a8421d4f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp @@ -42,18 +42,6 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) TAO_INSERT_COMMENT (os); - // Default constructor. - *os << node->full_obv_skel_name () << "::"; - - if (! node->is_nested ()) - { - *os << "OBV_"; - } - - *os << node->local_name () << " ()" << be_nl; - *os << ": require_truncation_ (false)" << be_nl - << "{}" << be_nl_2; - // Initializing constructor. if (node->has_member ()) { @@ -70,7 +58,6 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) this->gen_obv_init_constructor_args (node, index); *os << ")" << be_uidt << be_uidt << be_uidt_nl - << ": require_truncation_ (false)" << be_nl << "{" << be_idt; this->gen_obv_init_constructor_inits (node); @@ -117,8 +104,8 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) *os << be_uidt_nl; } *os << ")," << be_nl - << "::CORBA::NO_MEMORY ()" << be_uidt_nl - << ");" << be_nl + << "::CORBA::NO_MEMORY ());" << be_uidt + << be_nl << "return ret_val;" << be_uidt_nl << "}"; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp index f95caaf812731..d3527c7a04bbc 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp @@ -56,10 +56,10 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( *os << be_global->anyops_versioning_begin () << be_nl; *os << macro << " void" - << " operator<<= ( ::CORBA::Any &, " << node->name () + << " operator<<= (::CORBA::Any &, " << node->name () << " *); // copying" << be_nl; *os << macro << " void" - << " operator<<= ( ::CORBA::Any &, " << node->name () + << " operator<<= (::CORBA::Any &, " << node->name () << " **); // non-copying" << be_nl; *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, " diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h index 1369ca69e02be..bcbb638e7eb4f 100644 --- a/TAO/TAO_IDL/be_include/be_codegen.h +++ b/TAO/TAO_IDL/be_include/be_codegen.h @@ -35,7 +35,6 @@ class be_decl; class TAO_IDL_BE_Export TAO_CodeGen { public: - // Define all the code generation states. // The first letter C/S of the suffix stands for client/server-side // The second letter H/I/S stands for header/inline/impl file. diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index 1986da3fa731e..1dd0ca843f12f 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -92,7 +92,6 @@ struct TAO_ACE_CHECK class TAO_OutStream { public: - /// Enumerated type to indicate the stream type enum STREAM_TYPE { diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h index 7bce2c9e839f4..4ec3e99e4f77d 100644 --- a/TAO/TAO_IDL/be_include/be_sequence.h +++ b/TAO/TAO_IDL/be_include/be_sequence.h @@ -102,7 +102,6 @@ class be_sequence : public virtual AST_Sequence, virtual char *gen_name (); protected: - /// Computes the fully scoped typecode name. virtual void compute_tc_name (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h index 761859541eb25..20d1f7f46866c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h +++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h @@ -53,7 +53,6 @@ class be_visitor_arg_traits : public be_visitor_scope virtual int visit_valuebox (be_valuebox *node); private: - bool generated (be_decl *node) const; void generated (be_decl *node, bool val); diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h index d60d2ce918bfc..a59b36f581c44 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h @@ -91,7 +91,6 @@ class be_visitor_args_invoke_cs : public be_visitor_args private: int emit_common (); int emit_common2 (be_type *node); - }; #endif /* _BE_VISITOR_ARGUMENT_INVOKE_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h index 2000dcf2c52ee..b3ea3593cb457 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h @@ -89,7 +89,6 @@ class be_visitor_args_vardecl_ss : public be_visitor_args private: int emit_common (be_type *node); int emit_common2 (be_type *node); - }; #endif /* _BE_VISITOR_ARGUMENT_VARDECL_SS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h index 642e0cb8b8059..2760a45df0f64 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_array_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_array_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h index b0b1a64adfa74..37a47bca36447 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h @@ -24,13 +24,12 @@ */ class be_visitor_array_cdr_op_ci : public be_visitor_decl { - public: /// constructor be_visitor_array_cdr_op_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_array_cdr_op_ci (void); + ~be_visitor_array_cdr_op_ci (); /// visit array virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component.h b/TAO/TAO_IDL/be_include/be_visitor_component/component.h index 5e3975cb5ac16..a84e1631b0500 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component.h @@ -24,7 +24,6 @@ */ class be_visitor_component : public be_visitor_interface { - public: be_visitor_component (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h index 7aa27cfb24a3c..b4c3d0a8e79d9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_component_fwd_any_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_component_fwd_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h index 69b53aaefe09e..bcd805d6ff210 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_component_fwd_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_component_fwd_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h index 4fd3d8f6e4b20..5bd3cf696f4ae 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h @@ -24,7 +24,6 @@ */ class be_visitor_enum_any_op_cs : public be_visitor_scope { - public: /// constructor be_visitor_enum_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h index 07e4f1b9609aa..1911a2d922d0c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_enum_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_enum_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h index c3e37f0ef921d..695718f6f937c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h @@ -23,7 +23,6 @@ */ class be_visitor_enum_cdr_op_cs : public be_visitor_decl { - public: /// constructor be_visitor_enum_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h index e49da61f6f99a..be74bd2ddfa8d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_exception_any_op_ch : public be_visitor_scope { - public: be_visitor_exception_any_op_ch (be_visitor_context *ctx); ~be_visitor_exception_any_op_ch (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h index 4a252adef3d69..6a76beee988e3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h @@ -24,7 +24,6 @@ */ class be_visitor_exception_any_op_cs : public be_visitor_scope { - public: be_visitor_exception_any_op_cs (be_visitor_context *ctx); ~be_visitor_exception_any_op_cs (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h index 462beb7214be9..c87c3491f5968 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h @@ -25,7 +25,6 @@ */ class be_visitor_exception_cdr_op_ch : public be_visitor_exception { - public: be_visitor_exception_cdr_op_ch (be_visitor_context *ctx); ~be_visitor_exception_cdr_op_ch (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h index ed86886f347ce..fcada545e8a9d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h @@ -25,7 +25,6 @@ */ class be_visitor_exception_cdr_op_cs : public be_visitor_exception { - public: be_visitor_exception_cdr_op_cs (be_visitor_context *ctx); ~be_visitor_exception_cdr_op_cs (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h index e7f10cd034605..ffbc746d40d4a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h @@ -49,7 +49,6 @@ class be_visitor_exception_ctor : public be_visitor_scope private: int emit_common (be_type *node); - }; #endif /* _BE_VISITOR_EXCEPTION_CTOR_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h index c8a3e0b3a9677..eb419b9481c3f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h @@ -23,7 +23,7 @@ class be_visitor_exception_ctor : public be_visitor_scope { public: be_visitor_exception_ctor (be_visitor_context *ctx); - ~be_visitor_exception_ctor (void); + ~be_visitor_exception_ctor (); virtual int post_process (be_decl *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h index 14423fd2e606d..202a3b90b485d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h @@ -23,7 +23,6 @@ */ class be_visitor_interface_any_op_ch : public be_visitor_interface { - public: be_visitor_interface_any_op_ch (be_visitor_context *ctx); ~be_visitor_interface_any_op_ch (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h index 47ba221489f33..b26768c60fbab 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h @@ -23,7 +23,6 @@ */ class be_visitor_interface_any_op_cs : public be_visitor_interface { - public: be_visitor_interface_any_op_cs (be_visitor_context *ctx); ~be_visitor_interface_any_op_cs (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h index 478b6d191f96b..7c042a49dae68 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h @@ -25,7 +25,6 @@ */ class be_visitor_interface_cdr_op_ch : public be_visitor_interface { - public: be_visitor_interface_cdr_op_ch (be_visitor_context *ctx); ~be_visitor_interface_cdr_op_ch (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h index 79f212abee7d0..5328907432a16 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h @@ -25,7 +25,6 @@ */ class be_visitor_interface_cdr_op_cs : public be_visitor_interface { - public: be_visitor_interface_cdr_op_cs (be_visitor_context *ctx); ~be_visitor_interface_cdr_op_cs (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h index 1b10d9ab9d400..65a9763991994 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h @@ -22,7 +22,6 @@ */ class be_visitor_interface_direct_proxy_impl_sh : public be_visitor_interface { - public: // -- Ctor/Dtor Decl. -- be_visitor_interface_direct_proxy_impl_sh (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h index cf818e8a44b63..b0abe123b189a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h @@ -21,7 +21,6 @@ */ class be_visitor_interface_direct_proxy_impl_ss : public be_visitor_interface { - public: // -- Ctor/Dtor Decl. -- be_visitor_interface_direct_proxy_impl_ss (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h index dd15ff9eb80cb..dd620947a1ead 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h @@ -22,7 +22,6 @@ */ class be_visitor_interface_smart_proxy_ch : public be_visitor_interface { - public: /// constructor be_visitor_interface_smart_proxy_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h index d407b35f47716..3c8ade204f361 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h @@ -21,7 +21,6 @@ */ class be_visitor_interface_smart_proxy_cs : public be_visitor_interface { - public: /// constructor be_visitor_interface_smart_proxy_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h index 65986f495359c..6360fa8aa6f70 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_interface_fwd_any_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_interface_fwd_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h index 950f3d6914eb0..60ea369f91164 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_interface_fwd_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_interface_fwd_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h index e18ae92a0f81d..1675ce7f91c4b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h @@ -26,7 +26,6 @@ */ class be_visitor_module_any_op : public be_visitor_module { - public: /// constructor be_visitor_module_any_op (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h index c78e389a3b2b4..e3c25249dac9a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h @@ -26,7 +26,6 @@ */ class be_visitor_module_cdr_op : public be_visitor_module { - public: /// constructor be_visitor_module_cdr_op (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h index 64c12a08c6d4d..13673dc6aae50 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h @@ -24,7 +24,6 @@ */ class be_visitor_module : public be_visitor_scope { - public: be_visitor_module (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h index a3bb7bd730d59..56269d211e1ee 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h @@ -28,7 +28,6 @@ class be_visitor_amh_rh_operation_sh : public be_visitor_operation ~be_visitor_amh_rh_operation_sh (); int visit_operation (be_operation *node); - }; #endif /* AMH_RH_OPERATION_SH_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h index 09a5a3eeb52d3..7954fc9b11a1a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h @@ -31,7 +31,6 @@ class be_visitor_operation_exceptlist_ss : public be_visitor_decl { public: - /// constructor be_visitor_operation_exceptlist_ss (be_visitor_context * ctx); @@ -40,7 +39,6 @@ class be_visitor_operation_exceptlist_ss : public be_visitor_decl /// visit the operation int visit_operation (be_operation * node); - }; #endif /* _BE_VISITOR_OPERATION_EXCEPTIONLIST_SS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h index b35c5df1a1068..2afcfb6d424bd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h @@ -18,7 +18,6 @@ class be_visitor_operation_upcall_command_ss : public be_visitor_operation { public: - /// constructor be_visitor_operation_upcall_command_ss (be_visitor_context * ctx); @@ -32,10 +31,8 @@ class be_visitor_operation_upcall_command_ss char const * upcall_command_name); private: - /// Generate the upcall. int gen_upcall (be_operation * node); - }; #endif /* _BE_VISITOR_OPERATION_UPCALL_COMMAND_SS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h index 3322d73e1e397..a80082fac0c45 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h @@ -23,7 +23,6 @@ */ class be_visitor_root : public be_visitor_module { - public: be_visitor_root (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h index c1df47e39d398..63027ce26d256 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_sequence_any_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_sequence_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h index 916eaea173b30..5c1850579fa87 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h @@ -26,7 +26,6 @@ */ class be_visitor_sequence_any_op_cs : public be_visitor_decl { - public: /// constructor be_visitor_sequence_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h index e43be03ecb55e..3fec61a78c497 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h @@ -58,7 +58,6 @@ class be_visitor_sequence_buffer_type : public be_visitor_decl protected: /// helper that does the common job int visit_node (be_type *); - }; #endif /* _BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h index 7d6ee5e5b2947..0b5ef311fe349 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_sequence_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_sequence_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h index 1c10aa152cfe1..7d2e369a5c623 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h @@ -90,7 +90,6 @@ class be_visitor_sequence_cdr_op_cs : public be_visitor_decl protected: /// helper that does the common job int visit_node (be_type *); - }; #endif /* _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h index 47313216b254d..9539ebbe0560b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h @@ -59,7 +59,6 @@ class be_visitor_sequence_base : public be_visitor_decl protected: /// helper that does the common job int visit_node (be_type *); - }; /** diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h index f307404d16aff..17300ece38c3e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h @@ -26,7 +26,6 @@ */ class be_visitor_structure_cdr_op_cs : public be_visitor_structure { - public: /// constructor be_visitor_structure_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h index e3e4db8d5f4dc..ed8046910f744 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h @@ -15,7 +15,6 @@ namespace TAO { - /** * @class be_visitor_alias_typecode * @@ -27,7 +26,6 @@ namespace TAO : public be_visitor_typecode_defn { public: - /// Constructor. be_visitor_alias_typecode (be_visitor_context * ctx); @@ -48,9 +46,7 @@ namespace TAO int common (be_type * node, be_type * base, const char * tctype); - }; - } #endif /* TAO_BE_VISITOR_ALIAS_TYPECODE_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h index 42e1a55ca8957..d31418ef47b47 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h @@ -17,7 +17,6 @@ namespace TAO { - /** * @class be_visitor_enum_typecode * @@ -29,7 +28,6 @@ namespace TAO : public be_visitor_typecode_defn { public: - /// Constructor. be_visitor_enum_typecode (be_visitor_context * ctx); @@ -44,12 +42,9 @@ namespace TAO virtual int visit_enum (be_enum * node); private: - /// Generate structure field related TypeCode code. int visit_members (be_enum * node); - }; - } #endif /* TAO_BE_VISITOR_ENUM_TYPECODE_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h index 3b104a97762af..c11210fbca4c2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h @@ -15,7 +15,6 @@ namespace TAO { - /** * @class be_visitor_struct_typecode * @@ -27,7 +26,6 @@ namespace TAO : public be_visitor_typecode_defn { public: - /// Constructor. be_visitor_struct_typecode (be_visitor_context * ctx); @@ -52,7 +50,6 @@ namespace TAO virtual int visit_exception (be_exception * node); private: - /// Underlying structure/exception visitor code. /** * @note Structure/exception TypeCode generation really starts in @@ -67,7 +64,6 @@ namespace TAO int visit_members (AST_Structure * node); private: - /// @c true if the struct is recursive. /** * @note Only applies for struct TypeCodes. Exceptions cannot be @@ -78,9 +74,7 @@ namespace TAO /// @c true if this visitor is already visiting an outer scope /// struct or exception bool is_nested_; - }; - } #endif /* TAO_BE_VISITOR_STRUCT_TYPECODE_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h index 6f6ae5b285bca..ee94b2205357e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h @@ -23,7 +23,6 @@ */ class be_visitor_typecode_decl : public be_visitor_decl { - public: be_visitor_typecode_decl (be_visitor_context *ctx); ~be_visitor_typecode_decl (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h index 242f3b0c74e28..4fcfc3fb8b7ba 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h @@ -99,7 +99,6 @@ class be_visitor_typecode_defn : public be_visitor_scope void gen_end_NS_for_anon (); protected: - /// Queue to keep nodes ACE_Unbounded_Queue tc_queue_; @@ -139,7 +138,6 @@ class be_visitor_typecode_defn : public be_visitor_scope int pop (ACE_CDR::Long &); protected: - // queue related routines const QNode *queue_insert (ACE_Unbounded_Queue &, @@ -148,7 +146,6 @@ class be_visitor_typecode_defn : public be_visitor_scope const QNode *queue_lookup (ACE_Unbounded_Queue &, be_type *node); void queue_reset (ACE_Unbounded_Queue &); - }; #endif /* _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h index 1af092e18f7f4..ca7aee82983cd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h @@ -15,7 +15,6 @@ namespace TAO { - /** * @class be_visitor_union_typecode * @@ -27,7 +26,6 @@ namespace TAO : public be_visitor_typecode_defn { public: - /// Constructor. be_visitor_union_typecode (be_visitor_context * ctx); @@ -42,7 +40,6 @@ namespace TAO virtual int visit_union (be_union * node); private: - /// Generate union field TypeCode declarations, if necessary. int gen_case_typecodes (be_union * node); @@ -50,16 +47,13 @@ namespace TAO int visit_cases (be_union * node); private: - /// @c true if the union is recursive. bool is_recursive_; /// @c true if this visitor is already visiting an outer scope /// struct or exception bool is_nested_; - }; - } #endif /* TAO_BE_VISITOR_UNION_TYPECODE_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h index e618dd2970d98..7870d9ab8acef 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h @@ -15,7 +15,6 @@ namespace TAO { - /** * @class be_visitor_value_typecode * @@ -27,7 +26,6 @@ namespace TAO : public be_visitor_typecode_defn { public: - /// Constructor. be_visitor_value_typecode (be_visitor_context * ctx); @@ -42,7 +40,6 @@ namespace TAO virtual int visit_valuetype (be_valuetype * node); private: - /// Generate valuetype field TypeCode declarations, if necessary. int gen_member_typecodes (be_valuetype * node); @@ -50,16 +47,13 @@ namespace TAO int visit_members (be_valuetype * node); private: - /// @c true if the valuetype or eventtype is recursive. bool is_recursive_; /// @c true if this visitor is already visiting an outer scope /// struct or exception bool is_nested_; - }; - } #endif /* TAO_BE_VISITOR_VALUE_TYPECODE_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h index b56dc448931e3..7507c9272d311 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h @@ -27,7 +27,6 @@ */ class be_visitor_typedef_any_op_ch : public be_visitor_typedef { - public: /// constructor be_visitor_typedef_any_op_ch (be_visitor_context *ctx); @@ -55,7 +54,6 @@ class be_visitor_typedef_any_op_ch : public be_visitor_typedef /// visit a union virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_TYPEDEF_ANY_OP_CH_H_*/ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h index aa4b7381f82f2..1fd008578abc5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h @@ -27,7 +27,6 @@ */ class be_visitor_typedef_any_op_cs : public be_visitor_typedef { - public: /// constructor be_visitor_typedef_any_op_cs (be_visitor_context *ctx); @@ -55,7 +54,6 @@ class be_visitor_typedef_any_op_cs : public be_visitor_typedef /// visit a union virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_TYPEDEF_ANY_OP_CS_H_*/ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h index 087b3da6db228..9a57a7a736e64 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_typedef_cdr_op_ch : public be_visitor_typedef { - public: /// constructor be_visitor_typedef_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h index 10fc1214464f2..f78c72ae258f6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h @@ -26,7 +26,6 @@ */ class be_visitor_typedef_cdr_op_cs : public be_visitor_typedef { - public: /// constructor be_visitor_typedef_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h index d287c2a406133..bf544c41446d3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h @@ -24,7 +24,6 @@ */ class be_visitor_typedef : public be_visitor_decl { - public: /// constructor be_visitor_typedef (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h index 3426539cbde84..263bbdd53e298 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_union_any_op_ch : public be_visitor_union { - public: be_visitor_union_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h index c8983f6187463..99334d4b0bea8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h @@ -26,7 +26,6 @@ */ class be_visitor_union_any_op_cs : public be_visitor_union { - public: be_visitor_union_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h index 1ce2eca9e79ad..557847e8b9d88 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_union_cdr_op_ch : public be_visitor_union { - public: /// constructor be_visitor_union_cdr_op_ch (be_visitor_context *ctx); @@ -36,7 +35,6 @@ class be_visitor_union_cdr_op_ch : public be_visitor_union /// visit union virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_UNION_CDR_OP_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h index ecfbe0ef1a7fd..3990644f8ea53 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h @@ -26,7 +26,6 @@ */ class be_visitor_union_cdr_op_cs : public be_visitor_union { - public: /// constructor be_visitor_union_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h index 037f3e95adaa8..2b35cacd24422 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h @@ -36,7 +36,6 @@ class be_visitor_union_discriminant_cs : public be_visitor_decl /// visit an enum. Required to generate the typecode for an enum definition /// appearing side the union virtual int visit_enum (be_enum *node); - }; #endif /* _BE_VISITOR_UNION_DISCRIMINANT_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h index a70a79054488d..24920107c0019 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h @@ -33,7 +33,6 @@ class be_visitor_union_ch : public be_visitor_union /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_UNION_UNION_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h index c94dda604c1fb..6319c6b89363e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h @@ -33,7 +33,6 @@ class be_visitor_union_ci : public be_visitor_union /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_UNION_UNION_CI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h index e7de0e48a7966..de0d1a59adab1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h @@ -33,7 +33,6 @@ class be_visitor_union_cs : public be_visitor_union /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_UNION_UNION_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h index af566f934830a..4d76addd7add6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h @@ -52,7 +52,6 @@ class be_visitor_union_branch_cdr_op_ch : public be_visitor_decl /// visit union type virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h index 4159df97ac917..b740b24ed8895 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h @@ -50,7 +50,6 @@ class be_visitor_union_branch_public_assign_cs private: int emit_valuetype_common (be_type *node); - }; #endif /* _BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h index 4667b8f4801c2..ea0334aca6f05 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h @@ -49,7 +49,6 @@ class be_visitor_union_branch_public_ci : public be_visitor_decl private: int emit_valuetype_common (be_type *node); - }; #endif /* _BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h index 080cc5ae17b4b..9798cec81e2d0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_valuebox_any_op_ch : public be_visitor_valuebox { - public: /// constructor be_visitor_valuebox_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h index cd90d60834076..24e554a25c448 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h @@ -24,7 +24,6 @@ */ class be_visitor_valuebox_any_op_cs : public be_visitor_valuebox { - public: /// constructor be_visitor_valuebox_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h index 8b0036312bbf5..d520652c7c3f5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h @@ -25,7 +25,6 @@ */ class be_visitor_valuebox_cdr_op_ch : public be_visitor_valuebox { - public: /// constructor be_visitor_valuebox_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h index 37bf0fadb886e..0186d84e1f4a6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h @@ -25,7 +25,6 @@ */ class be_visitor_valuebox_cdr_op_cs : public be_visitor_valuebox { - public: /// constructor be_visitor_valuebox_cdr_op_cs (be_visitor_context *ctx); @@ -35,7 +34,6 @@ class be_visitor_valuebox_cdr_op_cs : public be_visitor_valuebox /// visit valuebox virtual int visit_valuebox (be_valuebox *node); - }; #endif /* _BE_VISITOR_VALUEBOX_CDR_OP_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h index 34fefe71189d9..e47aa9907a783 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h @@ -90,7 +90,6 @@ class be_visitor_valuebox_field_ch : public be_visitor_decl const char *const_prefix, const char *type_suffix, const char *const_method); - }; #endif /* _BE_VISITOR_VALUEBOX_FIELD_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h index a51de1e2bf30a..72990f109aaa8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h @@ -90,7 +90,6 @@ class be_visitor_valuebox_ch : public be_visitor_valuebox void emit_boxed_member_var (be_decl *node, const char * type_suffix); - }; #endif /* _BE_VISITOR_VALUEBOX_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h index 04f7d3c99f712..e2ab5f1ce567c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h @@ -62,12 +62,10 @@ class be_visitor_valuebox_cs : public be_visitor_valuebox virtual int visit_union (be_union *node); private: - /// Generate virtual destructor. void emit_destructor (); int emit_for_predef_enum (char const * marshal_arg); - }; #endif /* _BE_VISITOR_VALUEBOX_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h index 8e3bb6945de81..858f46771c4c0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_valuetype_any_op_ch : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h index 59592143bf35b..a1fe7037f1e0f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h @@ -24,7 +24,6 @@ */ class be_visitor_valuetype_any_op_cs : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h index 524ff9818ce57..8b16523072e56 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h @@ -25,7 +25,6 @@ */ class be_visitor_valuetype_cdr_op_ch : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h index a3e0a81280889..c28b7c675ee00 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h @@ -25,13 +25,12 @@ */ class be_visitor_valuetype_cdr_op_ci : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_cdr_op_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_cdr_op_ci (void); + ~be_visitor_valuetype_cdr_op_ci (); /// visit valuetype virtual int visit_valuetype (be_valuetype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h index 8edf651467437..c88acdbc12370 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h @@ -25,7 +25,6 @@ */ class be_visitor_valuetype_cdr_op_cs : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h index c85bb564e38d6..7748d1d0e2762 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h @@ -89,7 +89,6 @@ class be_visitor_valuetype_field_cdr_cs : public be_visitor_decl private: int valuetype_common (be_type *); - }; /** diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h index 4363664d7dbf6..e422fd64e29e6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h @@ -25,7 +25,6 @@ */ class be_visitor_valuetype_marshal_ch : public be_visitor_scope { - public: /// constructor be_visitor_valuetype_marshal_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h index fe09e70ad431f..3c9a80fe6009d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h @@ -25,9 +25,7 @@ */ class be_visitor_valuetype : public be_visitor_scope { - public: - /// constructor be_visitor_valuetype (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h index 9157b6c534cc8..9d8005fe94bd7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h @@ -24,7 +24,6 @@ */ class be_visitor_valuetype_init : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_init (be_visitor_context *ctx); @@ -33,7 +32,6 @@ class be_visitor_valuetype_init : public be_visitor_valuetype ~be_visitor_valuetype_init (); public: - void begin_public (); void begin_private (); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h index 1bb2b44360f20..436e47f68a8ac 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_valuetype_fwd_any_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_valuetype_fwd_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h index 0a3761bf5f204..1fdb704a7bbe1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h @@ -27,7 +27,6 @@ */ class be_visitor_valuetype_fwd_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_valuetype_fwd_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/docs/historical/README b/TAO/TAO_IDL/docs/historical/README index 700c1c1a707ee..dc4181df2fabb 100644 --- a/TAO/TAO_IDL/docs/historical/README +++ b/TAO/TAO_IDL/docs/historical/README @@ -148,7 +148,7 @@ platforms. The source distribution expects the following environment: - SunPro SparcWorks 3.x or 4.0 As preconfigured, it compiles on Solaris 2.x. It can be reconfigured to -compile on SunOS 4.x, HPUX or Apollo Domain OS. As far as is known, no use +compile on SunOS 4.x, or Apollo Domain OS. As far as is known, no use is made of Sun Make-specific features, and the Makefiles should be usable with other make programs. diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp index 00031ab9adf19..03c82030f93de 100644 --- a/TAO/TAO_IDL/driver/drv_args.cpp +++ b/TAO/TAO_IDL/driver/drv_args.cpp @@ -229,7 +229,6 @@ DRV_parse_args (long ac, char **av) )); idl_global->parse_args_exit (1); return; - } } else diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index e1638f94bb152..a26c09cce3a49 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -73,11 +73,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_err.h" #include "ace/Version.h" -#include "ace/Process_Manager.h" +#include "ace/Process.h" #include "ace/SString.h" #include "ace/Env_Value_T.h" #include "ace/ARGV.h" -#include "ace/UUID.h" #include "ace/Dirent.h" #include "ace/OS_NS_sys_stat.h" #include "ace/Truncate.h" @@ -1230,35 +1229,10 @@ DRV_pre_proc (const char *myfile) UTL_String *utl_string = nullptr; -#if defined (ACE_OPENVMS) - { - char main_abspath[MAXPATHLEN] = ""; - char trans_path[MAXPATHLEN] = ""; - char *main_fullpath = - ACE_OS::realpath (IDL_GlobalData::translateName (myfile, trans_path), - main_abspath); - - if (main_fullpath == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to construct full file pathname\n"))); - - (void) ACE_OS::unlink (tmp_ifile); - (void) ACE_OS::unlink (tmp_file); - throw Bailout (); - } - - ACE_NEW (utl_string, - UTL_String (main_fullpath, true)); - - idl_global->set_main_filename (utl_string); - } -#else ACE_NEW (utl_string, UTL_String (myfile, true)); idl_global->set_main_filename (utl_string); -#endif ACE_Auto_String_Free safety (ACE_OS::strdup (myfile)); @@ -1347,17 +1321,9 @@ DRV_pre_proc (const char *myfile) // If the following open() fails, then we're either being hit with a // symbolic link attack, or another process opened the file before // us. -#if defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - fd = ::open (t_file, O_WRONLY | O_CREAT | O_EXCL, - ACE_DEFAULT_FILE_PERMS, - "shr=get,put,upd", "ctx=rec", "fop=dfw"); - //FUZZ: enable check_for_lack_ACE_OS -#else fd = ACE_OS::open (t_file, O_WRONLY | O_CREAT | O_EXCL, ACE_DEFAULT_FILE_PERMS); -#endif if (fd == ACE_INVALID_HANDLE) { @@ -1475,11 +1441,6 @@ DRV_pre_proc (const char *myfile) // version the current process // would exit if the pre-processor // returned with error. - -#if defined (ACE_OPENVMS) - cpp_options.release_handles(); -#endif - FILE * const yyin = ACE_OS::fopen (t_file, "r"); if (yyin == nullptr) diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp index 5f791a4c82aef..8ac504dda9e78 100644 --- a/TAO/TAO_IDL/fe/fe_extern.cpp +++ b/TAO/TAO_IDL/fe/fe_extern.cpp @@ -74,7 +74,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_root.h" -#include "ace/UUID.h" +#include "ace/OS_NS_stdio.h" extern int tao_yyparse (); diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp index e8989d1529868..dd8e162edbd7f 100644 --- a/TAO/TAO_IDL/fe/fe_init.cpp +++ b/TAO/TAO_IDL/fe/fe_init.cpp @@ -63,7 +63,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ #include "ace/Env_Value_T.h" -#include "ace/UUID.h" #include "utl_scoped_name.h" #include "utl_identifier.h" diff --git a/TAO/TAO_IDL/fe/fe_utils.cpp b/TAO/TAO_IDL/fe/fe_utils.cpp index d63e3a2f8410c..1da6d96da19d2 100644 --- a/TAO/TAO_IDL/fe/fe_utils.cpp +++ b/TAO/TAO_IDL/fe/fe_utils.cpp @@ -436,7 +436,7 @@ FE_Utils::create_implied_ami_uses_stuff () int FE_Utils::path_cmp (const char *s, const char *t) { -#if defined (WIN32) || defined (ACE_OPENVMS) +#if defined (WIN32) // Since Windows has case-insensitive filenames, the preprocessor, // when searching using a provided relative path, will sometimes // capitalize the first letter of the last segment of a path name diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 7b3dbdfa9fbd6..a07db88242771 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -583,20 +583,6 @@ idl_parse_line_and_file (char *buf) } h[i] = '\0'; -#if defined (ACE_OPENVMS) - // translate this into *nix format as the OpenVMS preprocessor - // possibly produced VMS-style paths here. - char trans_path[MAXPATHLEN] = ""; - char *temp_h = IDL_GlobalData::translateName (h, trans_path); - if (temp_h) - h = temp_h; - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to construct full file pathname\n"))); - throw Bailout (); - } -#endif ACE_NEW (tmp, UTL_String (h, true)); idl_global->update_prefix (tmp->get_string ()); @@ -615,21 +601,10 @@ idl_parse_line_and_file (char *buf) if (!is_real_filename) { -#if defined (ACE_OPENVMS) - char full_path[MAXPATHLEN] = ""; - char *full_fname = ACE_OS::realpath (fname->get_string (), full_path); - // I don't see the benefit of using ->compare since this is targeted at IDL identifiers - // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really - // problematic as filenames retrieved through different mechanisms may give different - // casing. - is_main_filename = FE_Utils::path_cmp (idl_global->main_filename ()->get_string (), - full_fname) == 0; -#else is_main_filename = fname->compare (idl_global->main_filename ()) || same_file (fname->get_string (), idl_global->main_filename ()->get_string ()); -#endif } if (is_real_filename || is_main_filename) diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index d22f815b46679..3273f214299ec 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -146,8 +146,8 @@ #include void tao_yyerror (const char *); -int tao_yylex (void); -extern "C" int tao_yywrap (void); +int tao_yylex (); +extern "C" int tao_yywrap (); extern char tao_yytext[]; extern int tao_yyleng; @@ -709,7 +709,6 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; - #ifdef short # undef short #endif @@ -747,18 +746,6 @@ typedef int_least16_t yytype_int16; typedef short yytype_int16; #endif -/* Work around bug in HP-UX 11.23, which defines these macros - incorrectly for preprocessor constants. This workaround can likely - be removed in 2023, as HPE has promised support for HP-UX 11.23 - (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of - . */ -#ifdef __hpux -# undef UINT_LEAST8_MAX -# undef UINT_LEAST16_MAX -# define UINT_LEAST8_MAX 255 -# define UINT_LEAST16_MAX 65535 -#endif - #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ typedef __UINT_LEAST8_TYPE__ yytype_uint8; #elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ @@ -2446,7 +2433,6 @@ int yydebug; - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ @@ -2476,13 +2462,12 @@ int yynerrs; - /*----------. | yyparse. | `----------*/ int -yyparse (void) +yyparse () { yy_state_fast_t yystate = 0; /* Number of tokens to shift before error messages enabled. */ @@ -2514,7 +2499,6 @@ yyparse (void) YYSTYPE yyval; - #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) /* The number of symbols on the RHS of the reduced rule. @@ -10123,7 +10107,6 @@ yyparse (void) case 566: /* formal_parameter: formal_parameter_type IDENTIFIER */ #line 6685 "fe/idl.ypp" { - ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, 1); @@ -10906,7 +10889,7 @@ yyparse (void) * ??? */ int -tao_yywrap (void) +tao_yywrap () { return 1; } diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index b4759822f45ce..e5546389c916c 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -288,7 +288,7 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L || defined (__HP_aCC) +#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. @@ -543,10 +543,10 @@ 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 ); +void yypop_buffer_state (); -static void yyensure_buffer_stack ( void ); -static void yy_load_buffer_state ( void ); +static void yyensure_buffer_stack (); +static void yy_load_buffer_state (); static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); #define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) @@ -591,9 +591,9 @@ int yylineno = 1; extern char yytext[]; -static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_get_previous_state (); static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); -static int yy_get_next_buffer ( void ); +static int yy_get_next_buffer (); static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the @@ -1468,34 +1468,34 @@ 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 (); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy ( void ); +int yylex_destroy (); -int yyget_debug ( void ); +int yyget_debug (); void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra ( void ); +YY_EXTRA_TYPE yyget_extra (); void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in ( void ); +FILE *yyget_in (); void yyset_in ( FILE * _in_str ); -FILE *yyget_out ( void ); +FILE *yyget_out (); void yyset_out ( FILE * _out_str ); - int yyget_leng ( void ); + int yyget_leng (); -char *yyget_text ( void ); +char *yyget_text (); -int yyget_lineno ( void ); +int yyget_lineno (); void yyset_lineno ( int _line_number ); @@ -1505,9 +1505,9 @@ void yyset_lineno ( int _line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap ( void ); +extern "C" int yywrap (); #else -extern int yywrap ( void ); +extern int yywrap (); #endif #endif @@ -1527,9 +1527,9 @@ static int yy_flex_strlen ( const char * ); #ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput ( void ); +static int yyinput (); #else -static int input ( void ); +static int input (); #endif #endif @@ -1614,9 +1614,9 @@ static int input ( void ); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int yylex (void); +extern int yylex (); -#define YY_DECL int yylex (void) +#define YY_DECL int yylex () #endif /* !YY_DECL */ /* Code executed at the beginning of each rule, after yytext and yyleng @@ -2712,7 +2712,7 @@ ECHO; * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ -static int yy_get_next_buffer (void) +static int yy_get_next_buffer () { char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *source = (yytext_ptr); @@ -2766,7 +2766,6 @@ static int yy_get_next_buffer (void) YY_FATAL_ERROR( "input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); - } if ( num_to_read > YY_READ_BUF_SIZE ) @@ -2820,7 +2819,7 @@ static int yy_get_next_buffer (void) /* yy_get_previous_state - get the state just before the EOB char was reached */ - static yy_state_type yy_get_previous_state (void) + static yy_state_type yy_get_previous_state () { yy_state_type yy_current_state; char *yy_cp; @@ -2914,9 +2913,9 @@ static int yy_get_next_buffer (void) #ifndef YY_NO_INPUT #ifdef __cplusplus - static int yyinput (void) + static int yyinput () #else - static int input (void) + static int input () #endif { @@ -2995,7 +2994,6 @@ static int yy_get_next_buffer (void) */ void yyrestart (FILE * input_file ) { - if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = @@ -3012,7 +3010,6 @@ static int yy_get_next_buffer (void) */ 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(); @@ -3041,7 +3038,7 @@ static int yy_get_next_buffer (void) (yy_did_buffer_switch_on_eof) = 1; } -static void yy_load_buffer_state (void) +static void yy_load_buffer_state () { (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; @@ -3085,7 +3082,6 @@ static void yy_load_buffer_state (void) */ void yy_delete_buffer (YY_BUFFER_STATE b ) { - if ( ! b ) return; @@ -3189,7 +3185,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) * The next element becomes the new top. * */ -void yypop_buffer_state (void) +void yypop_buffer_state () { if (!YY_CURRENT_BUFFER) return; @@ -3208,12 +3204,11 @@ void yypop_buffer_state (void) /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void yyensure_buffer_stack (void) +static void yyensure_buffer_stack () { 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. @@ -3233,7 +3228,6 @@ static void yyensure_buffer_stack (void) } 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 */; @@ -3296,7 +3290,6 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) */ YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes( yystr, (int) strlen(yystr) ); } @@ -3369,16 +3362,15 @@ static void yynoreturn yy_fatal_error (const char* msg ) /** Get the current line number. * */ -int yyget_lineno (void) +int yyget_lineno () { - return yylineno; } /** Get the input stream. * */ -FILE *yyget_in (void) +FILE *yyget_in () { return yyin; } @@ -3386,7 +3378,7 @@ FILE *yyget_in (void) /** Get the output stream. * */ -FILE *yyget_out (void) +FILE *yyget_out () { return yyout; } @@ -3394,7 +3386,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -int yyget_leng (void) +int yyget_leng () { return yyleng; } @@ -3403,7 +3395,7 @@ int yyget_leng (void) * */ -char *yyget_text (void) +char *yyget_text () { return yytext; } @@ -3414,7 +3406,6 @@ char *yyget_text (void) */ void yyset_lineno (int _line_number ) { - yylineno = _line_number; } @@ -3434,7 +3425,7 @@ void yyset_out (FILE * _out_str ) yyout = _out_str ; } -int yyget_debug (void) +int yyget_debug () { return yy_flex_debug; } @@ -3444,7 +3435,7 @@ void yyset_debug (int _bdebug ) yy_flex_debug = _bdebug ; } -static int yy_init_globals (void) +static int yy_init_globals () { /* Initialization is the same as for the non-reentrant scanner. * This function is called from yylex_destroy(), so don't allocate here. @@ -3478,9 +3469,8 @@ static int yy_init_globals (void) } /* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) +int yylex_destroy () { - /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ yy_delete_buffer( YY_CURRENT_BUFFER ); @@ -3509,7 +3499,6 @@ int yylex_destroy (void) #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]; @@ -3534,7 +3523,6 @@ void *yyalloc (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 @@ -3656,20 +3644,6 @@ idl_parse_line_and_file (char *buf) } h[i] = '\0'; -#if defined (ACE_OPENVMS) - // translate this into *nix format as the OpenVMS preprocessor - // possibly produced VMS-style paths here. - char trans_path[MAXPATHLEN] = ""; - char *temp_h = IDL_GlobalData::translateName (h, trans_path); - if (temp_h) - h = temp_h; - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to construct full file pathname\n"))); - throw Bailout (); - } -#endif ACE_NEW (tmp, UTL_String (h, true)); idl_global->update_prefix (tmp->get_string ()); @@ -3688,21 +3662,10 @@ idl_parse_line_and_file (char *buf) if (!is_real_filename) { -#if defined (ACE_OPENVMS) - char full_path[MAXPATHLEN] = ""; - char *full_fname = ACE_OS::realpath (fname->get_string (), full_path); - // I don't see the benefit of using ->compare since this is targeted at IDL identifiers - // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really - // problematic as filenames retrieved through different mechanisms may give different - // casing. - is_main_filename = FE_Utils::path_cmp (idl_global->main_filename ()->get_string (), - full_fname) == 0; -#else is_main_filename = fname->compare (idl_global->main_filename ()) || same_file (fname->get_string (), idl_global->main_filename ()->get_string ()); -#endif } if (is_real_filename || is_main_filename) diff --git a/TAO/TAO_IDL/include/ast_annotation_decl.h b/TAO/TAO_IDL/include/ast_annotation_decl.h index 28ae96220e4b1..184d2aab6c8a4 100644 --- a/TAO/TAO_IDL/include/ast_annotation_decl.h +++ b/TAO/TAO_IDL/include/ast_annotation_decl.h @@ -13,7 +13,6 @@ class TAO_IDL_FE_Export AST_Annotation_Decl : public virtual AST_Structure { public: - AST_Annotation_Decl (UTL_ScopedName *name); virtual ~AST_Annotation_Decl (); diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index c018be50aba71..295b8906ba273 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -73,9 +73,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/SString.h" #include "ace/Vector_T.h" -// This is for AIX w/IBM C++ class Identifier; - class UTL_Scope; class UTL_String; class ast_visitor; @@ -236,7 +234,7 @@ class TAO_IDL_FE_Export AST_Decl : public virtual COMMON_Base void set_name (UTL_ScopedName *n); - Identifier *local_name (); + Identifier *local_name () const; void local_name (Identifier *id); Identifier *compute_local_name (const char *prefix, diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h index 92eb7908cc94f..70387c74934b9 100644 --- a/TAO/TAO_IDL/include/ast_extern.h +++ b/TAO/TAO_IDL/include/ast_extern.h @@ -66,7 +66,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define _AST_EXTERN_AST_EXTERN_HH - class AST_Type; class AST_Decl; diff --git a/TAO/TAO_IDL/include/fe_component_header.h b/TAO/TAO_IDL/include/fe_component_header.h index 55280e7ade428..c723d14fce4c9 100644 --- a/TAO/TAO_IDL/include/fe_component_header.h +++ b/TAO/TAO_IDL/include/fe_component_header.h @@ -15,7 +15,6 @@ class AST_Component; class FE_ComponentHeader : public FE_InterfaceHeader { public: - FE_ComponentHeader (UTL_ScopedName *n, UTL_ScopedName *base_component, UTL_NameList *supports, diff --git a/TAO/TAO_IDL/include/fe_obv_header.h b/TAO/TAO_IDL/include/fe_obv_header.h index 0dc51b911762f..876830c8e06f7 100644 --- a/TAO/TAO_IDL/include/fe_obv_header.h +++ b/TAO/TAO_IDL/include/fe_obv_header.h @@ -12,7 +12,6 @@ class AST_ValueType; class TAO_IDL_FE_Export FE_OBVHeader : public FE_InterfaceHeader { public: - FE_OBVHeader (UTL_ScopedName *n, UTL_NameList *inherits, UTL_NameList *supports, diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index 485486a60ddba..b59dec8c417c2 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -657,10 +657,6 @@ class TAO_IDL_FE_Export IDL_GlobalData // match the corresponding element on this list, if it is // non-zero. -#if defined (ACE_OPENVMS) - static char* translateName (const char* name, char *name_buf); -#endif - AST_Module *corba_module () const; void corba_module (AST_Module *m); // Accessors for the member. diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h index a70b9d0ff5d6d..4705e85be8345 100644 --- a/TAO/TAO_IDL/include/utl_list.h +++ b/TAO/TAO_IDL/include/utl_list.h @@ -120,7 +120,6 @@ class TAO_IDL_FE_Export UTL_List class TAO_IDL_FE_Export UTL_ListActiveIterator { public: - UTL_ListActiveIterator (UTL_List *s); virtual ~UTL_ListActiveIterator () {} diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index 697c03e1e08a9..e045a65400085 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -81,9 +81,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "fe_utils.h" -// This is for AIX w/IBM C++. class Identifier; - class AST_PredefinedType; class AST_Module; class AST_Template_Module_Inst; @@ -560,12 +558,6 @@ class TAO_IDL_FE_Export UTL_ScopeActiveIterator long il; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "utl_scope_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("utl_scope_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif // _UTL_SCOPE_UTL_SCOPE_HH diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h index 7b6d788df138a..de9d488445652 100644 --- a/TAO/TAO_IDL/include/utl_string.h +++ b/TAO/TAO_IDL/include/utl_string.h @@ -93,7 +93,7 @@ class TAO_IDL_FE_Export UTL_String virtual void dump (ACE_OSTREAM_TYPE &o); // Dump to the ostream. - char *get_string () {return this->p_str;} + char *get_string () const {return this->p_str;} // Get contents of utl_string. char *get_canonical_rep (); diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index 1c9a20bd53b13..0eaf4f08f27a2 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -93,23 +93,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. static long *pSeenOnce = nullptr; -#if defined (ACE_OPENVMS) -#include -char* IDL_GlobalData::translateName(const char* name, char *name_buf) -{ - char* transName = (ACE_OS::strpbrk (name, ":[") == 0 - ? (char*)name - : ::decc$translate_vms (name)); - if (transName) - { - ACE_OS::strcpy (name_buf, transName); - transName = name_buf; - } - - return (transName == 0 || ((int)transName) == -1 ) ? 0 : transName; -} -#endif - IDL_GlobalData::IDL_GlobalData () : syntax_only_ (false), parse_args_exit_ (false), diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt index a4be5366a0a06..0ad10a9efb170 100644 --- a/TAO/VERSION.txt +++ b/TAO/VERSION.txt @@ -1,4 +1,4 @@ -This is TAO version 3.0.8, released Fri Jul 01 09:15:13 CEST 2022 +This is TAO version 3.0.11, released Mon Dec 19 12:02:50 CET 2022 If you have any problems with or questions about TAO, please open a issue or discussion on the ACE_TAO github project at diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst index ea47acd20b52b..c64ad7e24d8ac 100644 --- a/TAO/bin/tao_orb_tests.lst +++ b/TAO/bin/tao_orb_tests.lst @@ -76,8 +76,8 @@ TAO/tests/Bug_1361_Regression/run_test.pl -quick : !MINIMUM !CORBA_E_COMPACT !CO TAO/tests/Bug_1476_Test/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO TAO/tests/Bug_1482_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !QUICK !LynxOS TAO/tests/Bug_1482_Regression/run_test.pl -quick : !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST QUICK !LynxOS -TAO/tests/Bug_1551_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash !QUICK -TAO/tests/Bug_1551_Regression/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash QUICK +TAO/tests/Bug_1551_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !QUICK +TAO/tests/Bug_1551_Regression/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST QUICK TAO/tests/Bug_1636_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Bug_1639_Regression/run_test.pl: !CORBA_E_MICRO TAO/tests/Bug_1676_Regression/run_test.pl: @@ -221,12 +221,12 @@ TAO/tests/RTCORBA/Collocation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/RTCORBA/Explicit_Binding/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO !ANDROID TAO/tests/RTCORBA/Linear_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !LynxOS -TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO !OpenVMS_IA64Crash +TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO TAO/tests/RTCORBA/ORB_init/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/RTCORBA/Persistent_IOR/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/RTCORBA/Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/RTCORBA/Policy_Combinations/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO !OpenVMS_IA64Crash +TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO TAO/tests/RTCORBA/Private_Connection/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !IPV6 !ACE_FOR_TAO !ANDROID TAO/tests/RTCORBA/RTMutex/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST @@ -234,7 +234,7 @@ TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_ TAO/tests/RTCORBA/Server_Protocol/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO !ANDROID TAO/tests/RTCORBA/Thread_Pool/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO TAO/tests/RTScheduling/VoidData/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/RTScheduling/Thread_Cancel/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST !OpenVMS_IA64Crash +TAO/tests/RTScheduling/Thread_Cancel/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST TAO/tests/RTScheduling/DT_Spawn/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS TAO/tests/RTScheduling/Current/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC @@ -260,7 +260,7 @@ TAO/tests/AlternateIIOP/run_test.pl: !DISABLE_ToFix_LynxOS_x86 TAO/tests/Optimized_Connection/run_test.pl: !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO TAO/tests/Cache_Growth_Test/run_test.pl: TAO/tests/Muxing/run_test.pl: !ST -TAO/tests/Muxed_GIOP_Versions/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC !OpenVMS_IA64Crash +TAO/tests/Muxed_GIOP_Versions/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC TAO/tests/MT_Client/run_test.pl: !ST TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !GIOP10 !DISABLE_BIDIR !LynxOS TAO/tests/File_IO/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO @@ -278,20 +278,20 @@ TAO/tests/Smart_Proxies/dtor/run_test.pl: TAO/tests/Stack_Recursion/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC !QUICK TAO/tests/Stack_Recursion/run_test.pl -quick : !ST !DISABLE_ToFix_LynxOS_PPC QUICK TAO/tests/Skeleton_Inheritance/run_test.pl: -TAO/tests/Faults/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash -TAO/tests/Faults/run_test_pp.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash +TAO/tests/Faults/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST +TAO/tests/Faults/run_test_pp.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/CallbackTest/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/CallbackTest/run_test_ipv6.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/CallbackTest/run_test_mixed_ip.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash -# Disabled Crash On Write on Win32, see bugzilla 959 why !LabVIEW_RT !WinCE +TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +# Disabled Crash On Write on Win32, see bugzilla 959 why !LabVIEW_RT TAO/tests/Crash_On_Write/run_test.pl: !ST !Win32 TAO/tests/Mixed_Sync_ASync_Events/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Mixed_Sync_ASync_Events/run_exclusive_rw.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/MT_NoUpcall_Client_Leader/run_test.pl: !ST !CORBA_E_MICRO !NO_MESSAGING TAO/tests/MT_NoUpcall_Connect/run_test.pl: !ST !CORBA_E_MICRO !NO_MESSAGING -TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash !QUICK -TAO/tests/Nested_Upcall_Crash/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash QUICK +TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !QUICK +TAO/tests/Nested_Upcall_Crash/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO QUICK TAO/tests/NestedUpcall/Simple/run_test.pl: !ST TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl: !ST !CORBA_E_MICRO TAO/tests/NestedUpcall/Triangle_Test/run_test.pl: !CORBA_E_MICRO @@ -342,7 +342,7 @@ TAO/tests/IORTable_Locator/run_test.pl -async_2: !MINIMUM !CORBA_E_COMPACT !CORB TAO/tests/IORTable_Locator/run_test.pl -async_3: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash +TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/Timed_Buffered_Oneways/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Time_Policy/run_test.pl: TAO/tests/Time_Policy/run_test_hr.pl: diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index f3be0eeaa571f..8f185925c99b8 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -7,34 +7,34 @@ # # NOTE: This file contains examples and other service level test for # TAO's. Please do not include regular tests here. -TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !LynxOS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS !HPUX_IA64 -TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD !Win32 !ACE_FOR_TAO !OpenVMS !CORBA_E_MICRO -TAO/performance-tests/Latency/Single_Threaded/run_test.pl -n 1000: !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/Deferred/run_test.pl: !QNX !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Throughput/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS !CORBA_E_MICRO -TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !OpenVMS !LynxOS !HPUX_IA64 -TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !Win32 !ACE_FOR_TAO !OpenVMS !LynxOS +TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !LynxOS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD !Win32 !ACE_FOR_TAO !CORBA_E_MICRO +TAO/performance-tests/Latency/Single_Threaded/run_test.pl -n 1000: !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/Deferred/run_test.pl: !QNX !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Throughput/run_test.pl: !Win32 !ACE_FOR_TAO +TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl: !Win32 !ACE_FOR_TAO !CORBA_E_MICRO +TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !LynxOS +TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !Win32 !ACE_FOR_TAO !LynxOS TAO/examples/Simple/bank/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO TAO/examples/Simple/grid/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO TAO/examples/Simple/time/run_test.pl: !NO_MESSAGING !Win32 !CORBA_E_MICRO TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC !NO_MESSAGING !Win32 TAO/examples/Quoter/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !LynxOS !ACE_FOR_TAO !HPUX_IA64 +TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !LynxOS !ACE_FOR_TAO TAO/examples/OBV/Typed_Events/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/examples/Buffered_AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO @@ -88,7 +88,7 @@ TAO/orbsvcs/tests/Event/Basic/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_ TAO/orbsvcs/tests/Event/Performance/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO TAO/orbsvcs/tests/Event/UDP/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !NO_DIOP TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 -TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO !LynxOS !HPUX_IA64 +TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl: !NO_MCAST !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl -ipv6: IPV6 !NO_MCAST !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS @@ -142,7 +142,7 @@ TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl -rm2523ol: !MINIMUM !CORBA_E_ TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO !OSX -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/manual_start/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO 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 @@ -156,17 +156,17 @@ TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: !MINIMUM !CORBA_E_COMPAC TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardalways: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardonce: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -pingexternal: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual -lockout: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -delay 20 -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -multistart: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl -kill_server: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS +TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual -lockout: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -delay 20 -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -multistart: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl -kill_server: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO !LynxOS TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO !WCHAR TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html index ff514f532bd72..7c6d234aa88de 100644 --- a/TAO/docs/Options.html +++ b/TAO/docs/Options.html @@ -1012,8 +1012,7 @@

      5. Multiple Invocation Retry Options

      Use this option to cycle through profiles when it has been detected that a connection is closed when reading a server reply and having the server possibly process the reqest more than once - is acceptable. This option currently does not work under FreeBSD, - OpenVMS, AIX, and Solaris. + is acceptable. This option currently does not work under FreeBSD. The number of retries will not exceed limit. If this option is used then -ORBForwardOnTransientLimit should also be used to avoid a TRANSIENT exception being thrown. @@ -1509,7 +1508,7 @@

      1.2. Advanced_Resource_Factory

      highly scalable replacement for the select() based reactors. The ACE_Dev_Poll_Reactor is currently only supported on - HP-UX, Solaris and Linux. Be aware that dev_poll + Linux. Be aware that dev_poll support is experimental! diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index c12076ec35c52..eaa53ba1a27d1 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -149,7 +149,7 @@

      Generated Files

      Case 1 is used by the Makefile on most machines to specify the preprocessor. Case 2 is used on Windows and platforms that need special arguments passed -to the preprocessor (MVS, HPUX, etc.). And case 3 isn't used at all, +to the preprocessor (MVS, etc.). And case 3 isn't used at all, but is included as a default case.

      Since the default preprocessor may not always work when TAO_IDL is moved to diff --git a/TAO/docs/interfacerepo/index.html b/TAO/docs/interfacerepo/index.html index 8ad637280d01e..3cd1ad69e866f 100644 --- a/TAO/docs/interfacerepo/index.html +++ b/TAO/docs/interfacerepo/index.html @@ -132,8 +132,7 @@

      Interface Repository

    • Code to support multicast discovery of the Interface Repository IOR has been added to TAO. Testing has been done using loopback on NT, -loopback on Solaris, and remotely between these two platforms in both -directions.

      • +and remotely between these two platforms in both directions.

    • Read/write locking option added to IFR service. This option should be used if the IFR service is started using a service config file that @@ -155,7 +154,7 @@

      Interface Repository

      that have been created recently.

    • IFR has been made compliant with the CORBA 2.4 version of Interface.idl. -Two new IFR object classes have been added, AbstractInterfaceDef and +Two new IFR object classes have been added, AbstractInterfaceDef and LocalInterfaceDef. Some data structures have changed, as well as the signature of some operations.

      • @@ -166,7 +165,7 @@

      Interface Repository

      it does, however, the application should have #include "tao/TypeCodeFactory_Adapter_Impl.h" or something similar in it somewhere, and also link to the TAO_TypeCodeFactory library. This will automatically load the -library if it has been compiled. Please see the example in +library if it has been compiled. Please see the example in ACE_ROOT/TAO/examples/TypeCode_Creation.

    • The CORBA::Object::_get_interface() method has been implemented. This method will @@ -204,7 +203,7 @@

      Interface Repository

      associated POAs are created at IFR startup and destroyed at shutdown).

      • -

    • IFR now supports valuetypes, components, homes and eventtypes. A test +
    • IFR now supports valuetypes, components, homes and eventtypes. A test for this support has been added in TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test.

      • diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html index 43c142707dbaf..74194ba2232ef 100644 --- a/TAO/docs/releasenotes/ec.html +++ b/TAO/docs/releasenotes/ec.html @@ -92,10 +92,6 @@

      Examples

      environment variable.

      The script start_services in $TAO_ROOT/orbsvcs/tests can help with this. -

    • -If you want real-time behavior on Solaris you may need to run these programs -as root; on the other hand, this particular example really has no priority -inversion, since only one thread runs at a time.
      • Another example is EC_Multiple, numerous examples on how to run this test can be found in the scripts located in $TAO_ROOT/orbsvcs/tests/EC_Multiple. diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html index b4d8c117dedad..d078fd545027f 100644 --- a/TAO/docs/releasenotes/index.html +++ b/TAO/docs/releasenotes/index.html @@ -339,8 +339,7 @@

      -P flag to tao_idl enables the perfect hased lookup strategy. This strategy uses GPERF, the GNU's Perfect Hash Function Generator written by Dr.Douglas C. Schmidt. -Right now, GPERF works only on Solaris. Any work on porting GPERF to other -platforms will be highly appreciated. +
    • The <<= and >>= operators for user-defined types are now generated.
      • diff --git a/TAO/docs/tutorials/Quoter/AMI/Handler_i.h b/TAO/docs/tutorials/Quoter/AMI/Handler_i.h index 1d12efe41f564..aca571691e6cf 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Handler_i.h +++ b/TAO/docs/tutorials/Quoter/AMI/Handler_i.h @@ -25,7 +25,6 @@ class Single_Query_Stock_Handler_i : public POA_Quoter::AMI_Single_Query_StockHa void price_excep (::Messaging::ExceptionHolder *); private: - int *response_count_; }; diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h index 7cf9c1ae5b9fc..40171e90be4dd 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h @@ -12,7 +12,7 @@ class Stock_Consumer : public POA_CosEventComm::PushConsumer { void connect (CosEventChanneAdmin::ConsumerAdmin_ptr consumer_admin); void push (const CORBA::Any& data); - void disconnect_push_consumer (void); + void disconnect_push_consumer (); private: }; diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp index 337409350ee00..836bdff39399e 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp @@ -41,7 +41,7 @@ Stock_Consumer::push (const CORBA::Any& data) } void -Stock_Consumer::disconnect_push_consumer (void) +Stock_Consumer::disconnect_push_consumer () { this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil (); } diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h index 8fd4162b95466..b5cb7b1d334d8 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h @@ -16,7 +16,7 @@ class Stock_Consumer : public POA_CosEventComm::PushConsumer { // Disconnect from the event channel. void push (const CORBA::Any& data); - void disconnect_push_consumer (void); + void disconnect_push_consumer (); private: CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_; diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp index 9bc325773f4a5..c7a7008f896ee 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp @@ -42,7 +42,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price) } void -Quoter_Stock_i::disconnect_push_supplier (void) +Quoter_Stock_i::disconnect_push_supplier () { // Forget about the consumer it is not there anymore this->consumer_proxy_ = diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h index fdac1364844f6..e23c712b60de0 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h @@ -19,7 +19,7 @@ class Quoter_Stock_i CORBA::Double price (); void set_price (CORBA::Double new_price); - void disconnect_push_supplier (void); + void disconnect_push_supplier (); void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin); diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h index 7a7734f739aff..6b22f03ed8de7 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h @@ -25,7 +25,6 @@ class Single_Query_Stock_Handler_i : public POA_Quoter::AMI_Single_Query_StockHa void price_excep (::Messaging::ExceptionHolder *); private: - int *response_count_; }; diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp index 5319478805d13..823553c726221 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp @@ -13,10 +13,8 @@ Quoter_Stock_Factory_Locator_i::preinvoke (const PortableServer::ObjectId &oid, const char *, void * & cookie) { - // Check to see if the object ID is valid try { - // Get the ObjectID in string format CORBA::String_var oid_str = PortableServer::ObjectId_to_string (oid); @@ -46,7 +44,6 @@ Quoter_Stock_Factory_Locator_i::postinvoke (const PortableServer::ObjectId &, void * cookie, PortableServer::Servant servant) { - // Delete the servant as it is no longer needed. PortableServer::Servant my_servant = (PortableServer::Servant) cookie; if (servant == my_servant) diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h index 5fd51694afd5b..f420f2e73929b 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h @@ -26,7 +26,6 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator private: CORBA::ORB_var orb_; - }; #endif /* STOCK_FACTORY_LOCATOR_I_H */ diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp index 746362c2a1416..eec81a988429c 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp @@ -39,4 +39,3 @@ Quoter_Stock_i::get_price_and_names (CORBA::String_out symbol, } - diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp index 8c1b17ee70e9a..36f94f34dc177 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp @@ -70,7 +70,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) std::cerr << "Warning: Invalid priority detected, defaulting to very low.\n"; priority_level = Priority_Mapping::VERY_LOW; break; - } break; diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp index dd802e0045bec..c87cb018e8a50 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp @@ -55,7 +55,7 @@ Stock_StockBroker_i::Stock_StockBroker_i (CORBA::ORB_ptr orb, } // Implementation skeleton destructor -Stock_StockBroker_i::~Stock_StockBroker_i (void) +Stock_StockBroker_i::~Stock_StockBroker_i () { } @@ -83,7 +83,7 @@ ::Stock::StockQuoter_ptr Stock_StockBroker_i::get_connection_quoter_info () } void -Stock_StockBroker_i::shutdown (void) +Stock_StockBroker_i::shutdown () { // Unsubscribe ACE_DEBUG ((LM_DEBUG, "Shutdown unsubscribing notifiers\n")); @@ -126,7 +126,7 @@ Stock_StockBrokerHome_i::Stock_StockBrokerHome_i (CORBA::ORB_ptr orb) } // Implementation skeleton destructor -Stock_StockBrokerHome_i::~Stock_StockBrokerHome_i (void) +Stock_StockBrokerHome_i::~Stock_StockBrokerHome_i () { } diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h index 2d7fd13d37db6..245e5bb3c4383 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h @@ -37,7 +37,7 @@ class Stock_StockBroker_i const char *stock_name); /// Destructor - virtual ~Stock_StockBroker_i (void); + virtual ~Stock_StockBroker_i (); /** * Return the StockNameConsumer object created by the Constructor. @@ -108,7 +108,7 @@ class Stock_StockBrokerHome_i Stock_StockBrokerHome_i (CORBA::ORB_ptr orb); /// Destructor - virtual ~Stock_StockBrokerHome_i (void); + virtual ~Stock_StockBrokerHome_i (); /** * Return the StockBroker object created by the Constructor. diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp index d5e0b70a470c3..11b281a5f22ef 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp @@ -27,7 +27,7 @@ StockDistributor_i::StockDistributor_i (RTPortableServer::POA_ptr poa) } // Implementation skeleton destructor -StockDistributor_i::~StockDistributor_i (void) +StockDistributor_i::~StockDistributor_i () { this->active_ = false; } @@ -241,12 +241,12 @@ StockDistributor_i::operator () (std::vector &stocks) } // Implementation skeleton constructor -StockQuoter_i::StockQuoter_i (void) +StockQuoter_i::StockQuoter_i () { } // Implementation skeleton destructor -StockQuoter_i::~StockQuoter_i (void) +StockQuoter_i::~StockQuoter_i () { } @@ -268,7 +268,6 @@ StockQuoter_i::get_stock_info (const char * stock_name) stock_info->last = si.last_; return stock_info._retn (); - } catch (Stock_Database::Invalid_Stock &ex) { @@ -351,7 +350,7 @@ StockDistributorHome_i::StockDistributorHome_i (CORBA::ORB_ptr orb) } // Implementation skeleton destructor -StockDistributorHome_i::~StockDistributorHome_i (void) +StockDistributorHome_i::~StockDistributorHome_i () { } @@ -408,7 +407,7 @@ StockDistributorHome_i::handle_signal (int, } void -StockDistributorHome_i::create_distributor (void) +StockDistributorHome_i::create_distributor () { // Create a new instance of the . Then // activate the under the located POA. This will cause diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h index 9d8e072b74e71..55db5024adbe0 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h @@ -43,7 +43,7 @@ class StockDistributor_i StockDistributor_i (RTPortableServer::POA_ptr poa); /// Destructor - virtual ~StockDistributor_i (void); + virtual ~StockDistributor_i (); /** * Insert StockNameConsumer object and its priority into the StockDistributor @@ -90,19 +90,19 @@ class StockDistributor_i * Set the active state of the StockDistributor object to true and create a thread * to publish the stock information to the Stock Broker clients. */ - virtual void start (void); + virtual void start (); /** * Set the active state of StockDistributor object to false. */ - virtual void stop (void); + virtual void stop (); virtual void shutdown (); /// Callback for stock database. void operator () (std::vector &stocks); - int svn (void); + int svn (); /// The map that stores the subscribed StockNameConsumer object. typedef std::map Stock_Map; diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp index 4eac82cfc3260..6a6559a1fd3a4 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp @@ -7,7 +7,7 @@ // // Stock::Priority_Mapping // -Stock::Priority_Mapping::Priority_Mapping (void) +Stock::Priority_Mapping::Priority_Mapping () : TAO_Linear_Priority_Mapping (ACE_SCHED_OTHER) { } @@ -15,7 +15,7 @@ Stock::Priority_Mapping::Priority_Mapping (void) // // ~Stock::Priority_Mapping // -Stock::Priority_Mapping::~Priority_Mapping (void) +Stock::Priority_Mapping::~Priority_Mapping () { } diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h index b114b2124d37f..ff8d218587f09 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h @@ -30,10 +30,10 @@ namespace Stock { public: /// Default constructor. - Priority_Mapping (void); + Priority_Mapping (); /// Default destructor. - virtual ~Priority_Mapping (void); + virtual ~Priority_Mapping (); /// Stock priorities. enum Priority @@ -48,7 +48,6 @@ namespace Stock /// Register mapping. static void register_mapping (CORBA::ORB_ptr orb); }; - } #endif // !defined STOCK_PRIORITYMAPPING_ diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp index 0a841e5a7d631..75b122b801de4 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp @@ -47,7 +47,7 @@ Stock_Consumer::push (const RtecEventComm::EventSet &data) } void -Stock_Consumer::disconnect_push_consumer (void) +Stock_Consumer::disconnect_push_consumer () { this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h index 670b982991262..e493fd2d1dfe3 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h @@ -18,7 +18,7 @@ class Stock_Consumer : public POA_RtecEventComm::PushConsumer { // Disconnect from the event channel. void push (const RtecEventComm::EventSet& data); - void disconnect_push_consumer (void); + void disconnect_push_consumer (); private: RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_; diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp index ebdbf22b52f4a..fc37e33116346 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp @@ -14,12 +14,12 @@ class MyTieStock:public POA_RtecEventComm::PushSupplier_tie ref_count_(0) {} public: - virtual void _add_ref (void) + virtual void _add_ref () { ++this->ref_count_; } - virtual void _remove_ref (void) + virtual void _remove_ref () { CORBA::ULong new_count = --this->ref_count_; @@ -38,7 +38,7 @@ Quoter_Stock_i::Quoter_Stock_i (const char *symbol, this->data_.price = price; } -Quoter_Stock_i::~Quoter_Stock_i (void) +Quoter_Stock_i::~Quoter_Stock_i () { if (consumer_proxy_.in ()) consumer_proxy_->disconnect_push_consumer (); @@ -90,7 +90,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price) } void -Quoter_Stock_i::disconnect_push_supplier (void) +Quoter_Stock_i::disconnect_push_supplier () { // Forget about the consumer it is not there anymore this->consumer_proxy_ = diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h index 6d4318d4b0206..b9190335beb11 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h @@ -13,14 +13,14 @@ class Quoter_Stock_i Quoter_Stock_i (const char *symbol, const char *full_name, CORBA::Double price); - ~Quoter_Stock_i (void); + ~Quoter_Stock_i (); char *symbol (); char *full_name (); CORBA::Double price (); void set_price (CORBA::Double new_price); - void disconnect_push_supplier (void); + void disconnect_push_supplier (); void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin); diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp index 590e83f26a529..731c72a293cba 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp @@ -18,7 +18,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { - // Initialze the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp index 84f390bf6a5eb..5bfc5d4e5a475 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp @@ -17,7 +17,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - // Initialze the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen index 94ebe0b4cfa43..195c2718880ec 100644 --- a/TAO/etc/tao.doxygen +++ b/TAO/etc/tao.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -933,7 +990,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -981,6 +1038,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1022,6 +1084,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1119,10 +1190,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1201,7 +1273,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1216,6 +1293,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1310,6 +1400,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1514,7 +1611,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1545,6 +1642,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1565,17 +1669,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2166,7 +2259,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2267,15 +2361,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2308,35 +2393,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2350,7 +2450,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2465,6 +2566,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2518,10 +2626,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2559,18 +2667,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2583,6 +2679,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen index 52dd22b687c4a..d32d2a8e2f2e2 100644 --- a/TAO/etc/tao_anytypecode.doxygen +++ b/TAO/etc/tao_anytypecode.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/AnyTypeCode # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2264,15 +2358,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2305,35 +2390,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2347,7 +2447,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2462,6 +2563,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2515,10 +2623,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2556,18 +2664,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2580,6 +2676,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen index 50d0ff7e4981f..13a85a70f6482 100644 --- a/TAO/etc/tao_av.doxygen +++ b/TAO/etc/tao_av.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -871,10 +917,21 @@ INPUT = TAO/orbsvcs/orbsvcs/AVStreams.idl \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -934,7 +991,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -982,6 +1039,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1023,6 +1085,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1120,10 +1191,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1202,7 +1274,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1217,6 +1294,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1311,6 +1401,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1515,7 +1612,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1546,6 +1643,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1566,17 +1670,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2167,7 +2260,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2269,15 +2363,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2310,35 +2395,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2352,7 +2452,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2467,6 +2568,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2520,10 +2628,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2561,18 +2669,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2585,6 +2681,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen index 586b192f456fe..1e10b3e865ea9 100644 --- a/TAO/etc/tao_compression.doxygen +++ b/TAO/etc/tao_compression.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/Compression # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2264,15 +2358,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2305,35 +2390,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2347,7 +2447,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2462,6 +2563,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2515,10 +2623,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2556,18 +2664,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2580,6 +2676,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen index 77d37fc7fc8f6..45635056076f9 100644 --- a/TAO/etc/tao_cosevent.doxygen +++ b/TAO/etc/tao_cosevent.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -870,10 +916,21 @@ INPUT = TAO/orbsvcs/orbsvcs/CosEventComm.idl \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -933,7 +990,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -981,6 +1038,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1022,6 +1084,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1119,10 +1190,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1201,7 +1273,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1216,6 +1293,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1310,6 +1400,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1514,7 +1611,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1545,6 +1642,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1565,17 +1669,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2166,7 +2259,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO/orbsvcs \ @@ -2270,15 +2364,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2311,35 +2396,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2353,7 +2453,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2468,6 +2569,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2521,10 +2629,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2562,18 +2670,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2586,6 +2682,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen index 40432002b7017..f8a17c3e17333 100644 --- a/TAO/etc/tao_cosnaming.doxygen +++ b/TAO/etc/tao_cosnaming.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -869,10 +915,21 @@ INPUT = TAO/orbsvcs/orbsvcs/CosNaming.idl \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -932,7 +989,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -980,6 +1037,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1021,6 +1083,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1118,10 +1189,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1200,7 +1272,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1215,6 +1292,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1309,6 +1399,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1513,7 +1610,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1544,6 +1641,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1564,17 +1668,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2165,7 +2258,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO/orbsvcs \ @@ -2267,15 +2361,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2308,35 +2393,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2350,7 +2450,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2465,6 +2566,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2518,10 +2626,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2559,18 +2667,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2583,6 +2679,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen index 325895cb65256..eacf8594c71ce 100644 --- a/TAO/etc/tao_cosnotification.doxygen +++ b/TAO/etc/tao_cosnotification.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -875,10 +921,21 @@ INPUT = TAO/orbsvcs/orbsvcs/CosNotification.idl \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -937,7 +994,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -985,6 +1042,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1026,6 +1088,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1123,10 +1194,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1205,7 +1277,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1220,6 +1297,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1314,6 +1404,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1518,7 +1615,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1549,6 +1646,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1569,17 +1673,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2170,7 +2263,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO/orbsvcs \ @@ -2275,15 +2369,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2316,35 +2401,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2358,7 +2458,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2473,6 +2574,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2526,10 +2634,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2567,18 +2675,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2591,6 +2687,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen index bb3e76e5adeea..91384316eaba3 100644 --- a/TAO/etc/tao_costime.doxygen +++ b/TAO/etc/tao_costime.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -869,10 +915,21 @@ INPUT = TAO/orbsvcs/orbsvcs/TimeService.idl \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -932,7 +989,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -980,6 +1037,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1021,6 +1083,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1118,10 +1189,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1200,7 +1272,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1215,6 +1292,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1309,6 +1399,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1513,7 +1610,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1544,6 +1641,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1564,17 +1668,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2165,7 +2258,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO/orbsvcs \ @@ -2268,15 +2362,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2309,35 +2394,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2351,7 +2451,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2466,6 +2567,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2519,10 +2627,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2560,18 +2668,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2584,6 +2680,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen index a478367463f95..00a2d338d8e1f 100644 --- a/TAO/etc/tao_costrader.doxygen +++ b/TAO/etc/tao_costrader.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -871,10 +917,21 @@ INPUT = TAO/orbsvcs/orbsvcs/CosTrading.idl \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -933,7 +990,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -981,6 +1038,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1022,6 +1084,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1119,10 +1190,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1201,7 +1273,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1216,6 +1293,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1310,6 +1400,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1514,7 +1611,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1545,6 +1642,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1565,17 +1669,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2166,7 +2259,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO/orbsvcs \ @@ -2269,15 +2363,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2310,35 +2395,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2352,7 +2452,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2467,6 +2568,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2520,10 +2628,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2561,18 +2669,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2585,6 +2681,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen index 1de069662757e..54d477038aff8 100644 --- a/TAO/etc/tao_dynamicany.doxygen +++ b/TAO/etc/tao_dynamicany.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/DynamicAny # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2264,15 +2358,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2305,35 +2390,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2347,7 +2447,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2462,6 +2563,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2515,10 +2623,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2556,18 +2664,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2580,6 +2676,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen index 7f5009c4c3583..1867e88aaad72 100644 --- a/TAO/etc/tao_dynamicinterface.doxygen +++ b/TAO/etc/tao_dynamicinterface.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/DynamicInterface # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2264,15 +2358,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2305,35 +2390,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2347,7 +2447,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2462,6 +2563,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2515,10 +2623,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2556,18 +2664,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2580,6 +2676,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen index bc3cd1cfc2e41..365f9b3ce376b 100644 --- a/TAO/etc/tao_esf.doxygen +++ b/TAO/etc/tao_esf.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/orbsvcs/orbsvcs/ESF # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -931,7 +988,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -979,6 +1036,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1020,6 +1082,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1117,10 +1188,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1199,7 +1271,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1214,6 +1291,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1308,6 +1398,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1512,7 +1609,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1543,6 +1640,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1563,17 +1667,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2164,7 +2257,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2266,15 +2360,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2307,35 +2392,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2349,7 +2449,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2464,6 +2565,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2517,10 +2625,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2558,18 +2666,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2582,6 +2678,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen index 86d8615f3abee..df2146b240dbd 100644 --- a/TAO/etc/tao_ifr.doxygen +++ b/TAO/etc/tao_ifr.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/orbsvcs/IFR_Service # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -928,7 +985,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -976,6 +1033,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1017,6 +1079,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1114,10 +1185,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1196,7 +1268,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1211,6 +1288,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1305,6 +1395,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1509,7 +1606,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1540,6 +1637,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1560,17 +1664,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2161,7 +2254,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2265,15 +2359,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2306,35 +2391,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2348,7 +2448,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2463,6 +2564,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2516,10 +2624,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2557,18 +2665,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2581,6 +2677,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen index 004970954255b..5ba00b72d4c8c 100644 --- a/TAO/etc/tao_implrepo.doxygen +++ b/TAO/etc/tao_implrepo.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/orbsvcs/ImplRepo_Service # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO/orbsvcs \ @@ -2267,15 +2361,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2308,35 +2393,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2350,7 +2450,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2465,6 +2566,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2518,10 +2626,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2559,18 +2667,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2583,6 +2679,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen index 392ad99a6ba04..5ab1cff37dc2e 100644 --- a/TAO/etc/tao_iormanip.doxygen +++ b/TAO/etc/tao_iormanip.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/IORManipulation # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2264,15 +2358,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2305,35 +2390,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2347,7 +2447,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2462,6 +2563,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2515,10 +2623,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2556,18 +2664,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2580,6 +2676,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen index e3c3f94053631..1c2dbf9120f21 100644 --- a/TAO/etc/tao_iortable.doxygen +++ b/TAO/etc/tao_iortable.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/IORTable # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2264,15 +2358,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2305,35 +2390,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2347,7 +2447,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2462,6 +2563,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2515,10 +2623,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2556,18 +2664,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2580,6 +2676,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen index 368b631b8d776..be8ecec423d40 100644 --- a/TAO/etc/tao_pi.doxygen +++ b/TAO/etc/tao_pi.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/PI # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2265,15 +2359,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2306,35 +2391,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2348,7 +2448,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2463,6 +2564,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2516,10 +2624,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2557,18 +2665,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2581,6 +2677,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen index d9f0bc63d1ed4..9994be08fa38a 100644 --- a/TAO/etc/tao_pi_server.doxygen +++ b/TAO/etc/tao_pi_server.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/PI_Server # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2265,15 +2359,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2306,35 +2391,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2348,7 +2448,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2463,6 +2564,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2516,10 +2624,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2557,18 +2665,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2581,6 +2677,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen index af11624666a07..10bd0270f2387 100644 --- a/TAO/etc/tao_portablegroup.doxygen +++ b/TAO/etc/tao_portablegroup.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -870,10 +916,21 @@ INPUT = TAO/orbsvcs/orbsvcs/miop.idl \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -932,7 +989,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -980,6 +1037,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1021,6 +1083,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1118,10 +1189,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1200,7 +1272,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1215,6 +1292,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1309,6 +1399,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1513,7 +1610,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1544,6 +1641,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1564,17 +1668,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2165,7 +2258,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO/orbsvcs \ @@ -2268,15 +2362,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2309,35 +2394,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2351,7 +2451,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2466,6 +2567,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2519,10 +2627,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2560,18 +2668,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2584,6 +2680,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen index abd833322b377..435ef74c62523 100644 --- a/TAO/etc/tao_portableserver.doxygen +++ b/TAO/etc/tao_portableserver.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/PortableServer # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2265,15 +2359,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2306,35 +2391,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2348,7 +2448,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2463,6 +2564,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2516,10 +2624,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2557,18 +2665,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2581,6 +2677,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen index 8eceb57cbdd42..433bcfabffd27 100644 --- a/TAO/etc/tao_rtcorba.doxygen +++ b/TAO/etc/tao_rtcorba.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/RTCORBA # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2265,15 +2359,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2306,35 +2391,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2348,7 +2448,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2463,6 +2564,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2516,10 +2624,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2557,18 +2665,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2581,6 +2677,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen index 391c45e229457..f108af1e2d6bd 100644 --- a/TAO/etc/tao_rtevent.doxygen +++ b/TAO/etc/tao_rtevent.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -877,10 +923,21 @@ INPUT = TAO/orbsvcs/orbsvcs/RtecEventComm.idl \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -942,7 +999,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -990,6 +1047,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1031,6 +1093,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1128,10 +1199,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1210,7 +1282,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1225,6 +1302,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1319,6 +1409,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1523,7 +1620,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1554,6 +1651,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1574,17 +1678,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2175,7 +2268,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO/orbsvcs \ @@ -2279,15 +2373,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2320,35 +2405,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2362,7 +2462,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2477,6 +2578,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2530,10 +2638,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2571,18 +2679,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2595,6 +2691,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen index cf2f4f42ea376..e48d731ade4b0 100644 --- a/TAO/etc/tao_rtportableserver.doxygen +++ b/TAO/etc/tao_rtportableserver.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/RTPortableServer # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2265,15 +2359,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2306,35 +2391,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2348,7 +2448,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2463,6 +2564,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2516,10 +2624,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2557,18 +2665,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2581,6 +2677,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen index 570bfe157ba05..e147ecfd80b3d 100644 --- a/TAO/etc/tao_security.doxygen +++ b/TAO/etc/tao_security.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -873,10 +919,21 @@ INPUT = TAO/orbsvcs/orbsvcs/Security.idl \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -936,7 +993,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -984,6 +1041,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1025,6 +1087,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1122,10 +1193,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1204,7 +1276,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1219,6 +1296,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1313,6 +1403,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1517,7 +1614,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1548,6 +1645,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1568,17 +1672,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2169,7 +2262,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2271,15 +2365,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2312,35 +2397,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2354,7 +2454,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2469,6 +2570,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2522,10 +2630,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2563,18 +2671,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2587,6 +2683,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen index 1af2227aecebd..35480366021d7 100644 --- a/TAO/etc/tao_smartproxies.doxygen +++ b/TAO/etc/tao_smartproxies.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/SmartProxies # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2264,15 +2358,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2305,35 +2390,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2347,7 +2447,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2462,6 +2563,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2515,10 +2623,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2556,18 +2664,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2580,6 +2676,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen index cc699e6b3d8b4..b56a6293e37b8 100644 --- a/TAO/etc/tao_ssliop.doxygen +++ b/TAO/etc/tao_ssliop.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -873,10 +919,21 @@ INPUT = TAO/orbsvcs/orbsvcs/Security.idl \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -936,7 +993,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -984,6 +1041,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1025,6 +1087,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1122,10 +1193,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1204,7 +1276,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1219,6 +1296,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1313,6 +1403,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1517,7 +1614,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1548,6 +1645,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1568,17 +1672,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2169,7 +2262,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2272,15 +2366,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2313,35 +2398,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2355,7 +2455,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2470,6 +2571,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2523,10 +2631,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2564,18 +2672,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2588,6 +2684,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen index cd6d48927c09a..2bf4d00423981 100644 --- a/TAO/etc/tao_strategies.doxygen +++ b/TAO/etc/tao_strategies.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/Strategies # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2269,15 +2363,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2310,35 +2395,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2352,7 +2452,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2467,6 +2568,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2520,10 +2628,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2561,18 +2669,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2585,6 +2681,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen index 03c55528aaecc..be1ed28a307ff 100644 --- a/TAO/etc/tao_transportcurrent.doxygen +++ b/TAO/etc/tao_transportcurrent.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/TransportCurrent # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2266,15 +2360,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2307,35 +2392,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2349,7 +2449,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2464,6 +2565,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2517,10 +2625,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2558,18 +2666,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2582,6 +2678,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen index 705cf1c9c1d3a..0acdc44af2a1f 100644 --- a/TAO/etc/tao_ziop.doxygen +++ b/TAO/etc/tao_ziop.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.2 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -12,6 +12,16 @@ # For lists, items can also be appended using: # TAG += value [value, ...] # Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- # Project related configuration options @@ -60,16 +70,28 @@ PROJECT_LOGO = OUTPUT_DIRECTORY = . -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this # option can be useful when feeding doxygen a huge amount of source files, where # putting all generated files in the same directory would otherwise causes -# performance problems for the file system. +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. # The default value is: NO. CREATE_SUBDIRS = NO +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# number of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII # characters to appear in the names of generated files. If set to NO, non-ASCII # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode @@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -442,7 +464,7 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use # during processing. When set to 0 doxygen will based this on the number of # cores available in the system. You can set it explicitly to a value larger # than 0 to get more control over the balance between CPU load and processing @@ -536,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -567,14 +590,15 @@ INTERNAL_DOCS = YES # filesystem is case sensitive (i.e. it supports files in the same directory # whose names only differ in casing), the option must be set to YES to properly # deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with +# are not case sensitive the option should be set to NO to properly deal with # output files written for symbols that only differ in casing, such as for two # classes, one named CLASS and the other named Class, and to also support # references to files without having to specify the exact matching casing. On # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -826,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -841,13 +873,27 @@ WARN_AS_ERROR = NO # and the warning text. Optionally the format may contain $version, which will # be replaced by the version of the file (if it could be obtained via # FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT # The default value is: $file:$line: $text. WARN_FORMAT = "$file:$line: $text" +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + # The WARN_LOGFILE tag can be used to specify a file to which warning and error # messages should be written. If left blank the output is written to standard -# error (stderr). +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). WARN_LOGFILE = @@ -868,10 +914,21 @@ INPUT = TAO/tao/ZIOP # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -930,7 +987,7 @@ EXCLUDE_PATTERNS = # (namespaces, classes, functions, etc.) that should be excluded from the # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test +# ANamespace::AClass, ANamespace::*Test # # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* @@ -978,6 +1035,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1019,6 +1081,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1116,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1198,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1213,6 +1290,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # 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 color-wheel, see @@ -1307,6 +1397,13 @@ GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + # This tag specifies a string that should uniquely identify the documentation # set bundle. This should be a reverse domain-name style string, e.g. # com.mycompany.MyDocSet. Doxygen will append .docset to the name. @@ -1511,7 +1608,7 @@ GENERATE_TREEVIEW = NO # area (value NO) or if it should extend to the full height of the window (value # YES). Setting this to YES gives a layout similar to # https://docs.readthedocs.io with more room for contents, but less room for the -# project logo, title, and description. If either GENERATOR_TREEVIEW or +# project logo, title, and description. If either GENERATE_TREEVIEW or # DISABLE_INDEX is set to NO, this option has no effect. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1542,6 +1639,13 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see # https://inkscape.org) to generate formulas as SVG images instead of PNGs for @@ -1562,17 +1666,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# 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. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -2163,7 +2256,8 @@ SEARCH_INCLUDES = YES # The INCLUDE_PATH tag can be used to specify one or more directories that # contain include files that are not input files but should be processed by the -# preprocessor. +# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of +# RECURSIVE has no effect here. # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = TAO \ @@ -2266,15 +2360,6 @@ EXTERNAL_PAGES = YES # Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram -# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to -# NO turns the diagrams off. Note that this option also works with HAVE_DOT -# disabled, but it is recommended to install and use dot, since it yields more -# powerful graphs. -# The default value is: YES. - -CLASS_DIAGRAMS = YES - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -2307,35 +2392,50 @@ HAVE_DOT = YES DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" + +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = Helvetica +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for -# each documented class showing the direct and indirect inheritance relations. -# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a +# graph for each documented class showing the direct and indirect inheritance +# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, +# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set +# to TEXT the direct and indirect inheritance relations will be shown as texts / +# links. +# Possible values are: NO, YES, TEXT and GRAPH. # The default value is: YES. -# This tag requires that the tag HAVE_DOT is set to YES. CLASS_GRAPH = YES @@ -2349,7 +2449,8 @@ CLASS_GRAPH = YES COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. +# groups, showing the direct groups dependencies. See also the chapter Grouping +# in the manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2464,6 +2565,13 @@ GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES +# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels +# of child directories generated in directory dependency graphs by dot. +# Minimum value: 1, maximum value: 25, default value: 1. +# This tag requires that the tag DIRECTORY_GRAPH is set to YES. + +DIR_GRAPH_MAX_DEPTH = 1 + # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: @@ -2517,10 +2625,10 @@ MSCFILE_DIRS = DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the -# path where java can find the plantuml.jar file. If left blank, it is assumed -# PlantUML is not used or called during a preprocessing step. Doxygen will -# generate a warning when it encounters a \startuml command in this case and -# will not generate output for the diagram. +# path where java can find the plantuml.jar file or to the filename of jar file +# to be used. If left blank, it is assumed PlantUML is not used or called during +# a preprocessing step. Doxygen will generate a warning when it encounters a +# \startuml command in this case and will not generate output for the diagram. PLANTUML_JAR_PATH = @@ -2558,18 +2666,6 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = NO - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2582,6 +2678,8 @@ DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page # explaining the meaning of the various boxes and arrows in the dot generated # graphs. +# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal +# graphical representation for inheritance and collaboration diagrams is used. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp index fa2aaabfe7fa1..3a57123dae849 100644 --- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp +++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp @@ -19,7 +19,7 @@ AMH_Servant::AMH_Servant (CORBA::ORB_ptr orb) this->reactor_ = orb->orb_core ()->reactor (); } -AMH_Servant::~AMH_Servant (void) +AMH_Servant::~AMH_Servant () { } diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.h b/TAO/examples/AMH/Sink_Server/AMH_Servant.h index 5ccffa8d0fbc6..e94e132c5d699 100644 --- a/TAO/examples/AMH/Sink_Server/AMH_Servant.h +++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.h @@ -24,7 +24,7 @@ class AMH_Servant public: AMH_Servant (CORBA::ORB_ptr orb); - virtual ~AMH_Servant (void); + virtual ~AMH_Servant (); /// parse arguments from command line for sleep time virtual int parse_args (int &argc, ACE_TCHAR **argv); diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp index 19a8ab7a5f366..c3d71b297f03e 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp @@ -18,12 +18,12 @@ Base_Server::Base_Server (int &argc, ACE_TCHAR **argv) { } -Base_Server::~Base_Server (void) +Base_Server::~Base_Server () { } int -Base_Server::parse_args (void) +Base_Server::parse_args () { // *** To get correct behaviour, set ** POSIXLY_CORECT=1 ** on Linux // systems!!! *** @@ -64,7 +64,7 @@ Base_Server::parse_args (void) } void -Base_Server::try_RT_scheduling (void) +Base_Server::try_RT_scheduling () { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -72,7 +72,7 @@ Base_Server::try_RT_scheduling (void) priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) @@ -90,7 +90,7 @@ Base_Server::try_RT_scheduling (void) } int -Base_Server::shutdown_orb_and_poa (void) +Base_Server::shutdown_orb_and_poa () { try { @@ -112,7 +112,7 @@ Base_Server::shutdown_orb_and_poa (void) } int -Base_Server::start_orb_and_poa (void) +Base_Server::start_orb_and_poa () { try { @@ -165,7 +165,7 @@ Base_Server::register_servant (AMH_Servant *servant) void -Base_Server::run_event_loop (void) +Base_Server::run_event_loop () { try { diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.h b/TAO/examples/AMH/Sink_Server/Base_Server.h index c6ea1f7465437..09b43d569ad3c 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.h +++ b/TAO/examples/AMH/Sink_Server/Base_Server.h @@ -44,25 +44,25 @@ class Base_Server // entry in the vtbl) and if, by chance, someone does delete a // derived-class though this classes ptr, we are still safe. The // short answer to your question is : I don't know. :) - virtual ~Base_Server (void); + virtual ~Base_Server (); // Just parse the command line for the output-file (-o) option. // return -1 if -o option is not present - virtual int parse_args (void); + virtual int parse_args (); /// try and schedule using FIFO - void try_RT_scheduling (void); + void try_RT_scheduling (); /// ORB inititalisation stuff - int start_orb_and_poa (void); + int start_orb_and_poa (); - int shutdown_orb_and_poa (void); + int shutdown_orb_and_poa (); /// register the servant with the poa virtual void register_servant (AMH_Servant *servant); /// orb-perform_work () abstraction - virtual void run_event_loop (void); + virtual void run_event_loop (); public: // @@ Mayur, please put inlined methods in a separate `.inl' file, @@ -71,7 +71,7 @@ class Base_Server // Mayur: A separate file for just one method? AAAGH. OK. /// Accesor method (for servants) to the initialised ORB - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); protected: int &argc_; diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.inl b/TAO/examples/AMH/Sink_Server/Base_Server.inl index 87240a2232c26..1f966fa6302ba 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.inl +++ b/TAO/examples/AMH/Sink_Server/Base_Server.inl @@ -1,7 +1,7 @@ #include "Base_Server.h" ACE_INLINE CORBA::ORB_ptr -Base_Server::orb (void) +Base_Server::orb () { return this->orb_.in(); } diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp index a04b0456469cc..2bce4d989686e 100644 --- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp +++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp @@ -15,7 +15,7 @@ Client_Task::Client_Task (int &argc, ACE_TCHAR **argv) } int -Client_Task::parse_args (void) +Client_Task::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, "k:n:O:"); int c; @@ -53,7 +53,7 @@ Client_Task::parse_args (void) } void -Client_Task::try_RT_scheduling (void) +Client_Task::try_RT_scheduling () { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -61,7 +61,7 @@ Client_Task::try_RT_scheduling (void) priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) @@ -106,7 +106,7 @@ Client_Task::narrow_servant (CORBA::ORB_ptr orb) } int -Client_Task::run_test (void) +Client_Task::run_test () { ACE_hrtime_t test_start = 0; ACE_hrtime_t test_end = 0; @@ -147,7 +147,7 @@ Client_Task::run_test (void) } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.h b/TAO/examples/AMH/Sink_Server/Client_Task.h index 1eff57f05a6be..fcfc9e8fd7ff8 100644 --- a/TAO/examples/AMH/Sink_Server/Client_Task.h +++ b/TAO/examples/AMH/Sink_Server/Client_Task.h @@ -28,13 +28,13 @@ class Client_Task : public ACE_Task_Base /// Constructor Client_Task (int &argc, ACE_TCHAR **argv); - int parse_args (void); + int parse_args (); - void try_RT_scheduling (void); + void try_RT_scheduling (); int narrow_servant (CORBA::ORB_ptr orb); - int run_test (void); + int run_test (); protected: /// The service method diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp index 33e6ccb54ab4a..b3a17de112494 100644 --- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp @@ -10,7 +10,7 @@ MT_AMH_Server::MT_AMH_Server (int &argc, ACE_TCHAR **argv) { } -MT_AMH_Server::~MT_AMH_Server (void) +MT_AMH_Server::~MT_AMH_Server () { } @@ -32,9 +32,8 @@ MT_AMH_Server::usage (const char *message) int -MT_AMH_Server::parse_args (void) +MT_AMH_Server::parse_args () { - // Let the base server parse it's argumrents first if (Base_Server::parse_args () != 1) { @@ -77,7 +76,7 @@ MT_AMH_Server::parse_args (void) } void -MT_AMH_Server::start_threads (void) +MT_AMH_Server::start_threads () { // Each of this thread runs the event loop this->activate (THR_NEW_LWP | THR_JOINABLE, this->nthreads_, 1); @@ -85,7 +84,7 @@ MT_AMH_Server::start_threads (void) } int -MT_AMH_Server::svc (void) +MT_AMH_Server::svc () { run_event_loop (); return 1; diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h index 098cc85203958..9e80fdea655b1 100644 --- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h +++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h @@ -25,19 +25,19 @@ class MT_AMH_Server public: MT_AMH_Server (int &argc, ACE_TCHAR **argv); - ~MT_AMH_Server (void); + ~MT_AMH_Server (); // print usage text void usage (const char *message); // We need to parse an extra thread_count parameter for // multi-threraded server. - int parse_args (void); + int parse_args (); - void start_threads (void); + void start_threads (); // the service method - int svc (void); + int svc (); private: int nthreads_; diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp index 738ca29e11400..a64e45258b379 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp @@ -24,22 +24,22 @@ Peer_Handler_i::request_excep ( } void -Peer_Handler_i::start (void) +Peer_Handler_i::start () { } void -Peer_Handler_i::shutdown (void) +Peer_Handler_i::shutdown () { } -Peer_i::Peer_i (void) +Peer_i::Peer_i () : reply_handler_ (this) { } -Peer_i::~Peer_i (void) +Peer_i::~Peer_i () { } @@ -91,7 +91,7 @@ Peer_i::start (const PeerSet &the_peers, } void -Peer_i::shutdown (void) +Peer_i::shutdown () { this->orb_->shutdown (false); } @@ -112,7 +112,7 @@ Peer_Task::Peer_Task (const PeerSet& the_peers, } int -Peer_Task::svc (void) +Peer_Task::svc () { for (int i = 0; i != this->iterations_; ++i) { diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h index 77c00e575888c..91e6debb5164e 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.h +++ b/TAO/examples/AMI/FL_Callback/Peer_i.h @@ -26,9 +26,9 @@ class Peer_Handler_i : public POA_AMI_PeerHandler virtual void request_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void start (void); + virtual void start (); - virtual void shutdown (void); + virtual void shutdown (); private: /// The real implementation @@ -39,10 +39,10 @@ class Peer_i : public POA_Peer { public: /// Constructor - Peer_i (void); + Peer_i (); /// Destructor - virtual ~Peer_i (void); + virtual ~Peer_i (); void init (CORBA::ORB_ptr orb, Progress_ptr progress, @@ -58,7 +58,7 @@ class Peer_i : public POA_Peer void start (const PeerSet& the_peers, CORBA::Long iterations); - void shutdown (void); + void shutdown (); private: /// The reply_handler diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h index 681573b762785..6b4643b44ede3 100644 --- a/TAO/examples/AMI/FL_Callback/Progress_i.h +++ b/TAO/examples/AMI/FL_Callback/Progress_i.h @@ -33,7 +33,7 @@ class Progress_Window : public Fl_Box CORBA::Long bind (Peer_ptr a_peer); /// Start the peers... - void start (void); + void start (); private: /// The callback method diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index 18a884e867554..ac19e3863ce5b 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -76,7 +76,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) @@ -157,7 +157,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting event loop\n")); this->orb_->run (); diff --git a/TAO/examples/Advanced/ch_12/icp.cpp b/TAO/examples/Advanced/ch_12/icp.cpp index 369d5addf5c43..25fa92c8557c5 100644 --- a/TAO/examples/Advanced/ch_12/icp.cpp +++ b/TAO/examples/Advanced/ch_12/icp.cpp @@ -127,7 +127,6 @@ vary_temp (long temp) if (ACE_OS::rand() % 2) delta = -delta; return temp + delta; - } // Function object. Locates a thermostat that is in the same room as diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp index eb1414201b547..e47116181f858 100644 --- a/TAO/examples/Advanced/ch_12/server.cpp +++ b/TAO/examples/Advanced/ch_12/server.cpp @@ -470,7 +470,6 @@ find (CCS::Controller::SearchSeq & slist) CORBA::ULong listlen = slist.length (); for (CORBA::ULong i = 0; i < listlen; i++) { - AssetMap::iterator where; // Iterator for asset set int num_found = 0; // Num matched per iteration diff --git a/TAO/examples/Advanced/ch_18/icp.cpp b/TAO/examples/Advanced/ch_18/icp.cpp index 1717861115a2f..7f22eb1e08496 100644 --- a/TAO/examples/Advanced/ch_18/icp.cpp +++ b/TAO/examples/Advanced/ch_18/icp.cpp @@ -12,7 +12,6 @@ - #include #include #include @@ -133,7 +132,6 @@ vary_temp(long temp) if (ACE_OS::rand() % 2) delta = -delta; return temp + delta; - } //---------------------------------------------------------------- diff --git a/TAO/examples/Advanced/ch_18/server.cpp b/TAO/examples/Advanced/ch_18/server.cpp index 6f3408411badc..78903c6cff0a0 100644 --- a/TAO/examples/Advanced/ch_18/server.cpp +++ b/TAO/examples/Advanced/ch_18/server.cpp @@ -259,7 +259,6 @@ Thermostat_impl::set_nominal_temp (CCS::TempType new_temp) // Now set the nominal temperature to the new value. if (ICP_set (m_anum, "nominal_temp", &new_temp) != 0) { - // If ICP_set () failed, read this thermostat's minimum // and maximum so we can initialize the BadTemp exception. CCS::Thermostat::BtData btd; @@ -423,7 +422,6 @@ create_thermostat ( assert (ICP_set (anum, "location", loc) == 0); // Set the nominal temperature. if (ICP_set (anum, "nominal_temp", &temp) != 0) { - // If ICP_set () failed, read this thermostat's minimum // and maximum so we can initialize the BadTemp exception. CCS::Thermostat::BtData btd; @@ -518,7 +516,6 @@ Controller_impl::find (CCS::Controller::SearchSeq & slist) // Loop over input list and lookup each device. CORBA::ULong listlen = slist.length (); for (CORBA::ULong i = 0; i < listlen; i++) { - AssetMap::iterator where; // Iterator for asset set int num_found = 0; // Num matched per iteration diff --git a/TAO/examples/Advanced/ch_18/server.h b/TAO/examples/Advanced/ch_18/server.h index 97b6ed266ba33..d3c9e58be7e1a 100644 --- a/TAO/examples/Advanced/ch_18/server.h +++ b/TAO/examples/Advanced/ch_18/server.h @@ -12,7 +12,6 @@ - #ifndef server_HH_ #define server_HH_ diff --git a/TAO/examples/Advanced/ch_21/icp.cpp b/TAO/examples/Advanced/ch_21/icp.cpp index 2cb291765f92c..8a66d24aba3d1 100644 --- a/TAO/examples/Advanced/ch_21/icp.cpp +++ b/TAO/examples/Advanced/ch_21/icp.cpp @@ -12,7 +12,6 @@ - #include #include #include @@ -132,7 +131,6 @@ vary_temp(long temp) if (ACE_OS::rand() % 2) delta = -delta; return temp + delta; - } //---------------------------------------------------------------- @@ -388,6 +386,3 @@ static ICP_Persist mydb("/tmp/CCS_DB"); - - - diff --git a/TAO/examples/Advanced/ch_21/icp.h b/TAO/examples/Advanced/ch_21/icp.h index 367dba07e092d..6174b4b9b17a1 100644 --- a/TAO/examples/Advanced/ch_21/icp.h +++ b/TAO/examples/Advanced/ch_21/icp.h @@ -37,5 +37,3 @@ extern "C" { - - diff --git a/TAO/examples/Advanced/ch_21/server.cpp b/TAO/examples/Advanced/ch_21/server.cpp index 4ffc422b94a6a..2c7b2208f841e 100644 --- a/TAO/examples/Advanced/ch_21/server.cpp +++ b/TAO/examples/Advanced/ch_21/server.cpp @@ -237,7 +237,6 @@ Thermostat_impl::set_nominal_temp (CCS::TempType new_temp) // Now set the nominal temperature to the new value. if (ICP_set (m_anum, "nominal_temp", &new_temp) != 0) { - // If ICP_set () failed, read this thermostat's minimum // and maximum so we can initialize the BadTemp exception. CCS::Thermostat::BtData btd; @@ -406,7 +405,6 @@ create_thermostat ( assert (ICP_set (anum, "location", loc) == 0); // Set the nominal temperature. if (ICP_set (anum, "nominal_temp", &temp) != 0) { - // If ICP_set () failed, read this thermostat's minimum // and maximum so we can initialize the BadTemp exception. CCS::Thermostat::BtData btd; @@ -510,7 +508,6 @@ find (CCS::Controller::SearchSeq & slist) // Loop over input list and lookup each device. CORBA::ULong listlen = slist.length (); for (CORBA::ULong i = 0; i < listlen; i++) { - AssetSet::iterator where; // Iterator for asset set int num_found = 0; // Num matched per iteration diff --git a/TAO/examples/Advanced/ch_21/server.h b/TAO/examples/Advanced/ch_21/server.h index f0c94184bc1b8..ed8bba2774e8f 100644 --- a/TAO/examples/Advanced/ch_21/server.h +++ b/TAO/examples/Advanced/ch_21/server.h @@ -12,7 +12,6 @@ - #ifndef server_HH_ #define server_HH_ diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp index b59b38df1c29a..2bc56efe05e65 100644 --- a/TAO/examples/Advanced/ch_3/server.cpp +++ b/TAO/examples/Advanced/ch_3/server.cpp @@ -22,7 +22,7 @@ TimeOfDay Time_impl:: -get_gmt (void) +get_gmt () { time_t time_now = ACE_OS::time (0); struct tm *time_p = ACE_OS::gmtime (&time_now); @@ -81,5 +81,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) - - diff --git a/TAO/examples/Advanced/ch_3/server.h b/TAO/examples/Advanced/ch_3/server.h index a61cc86259e25..afeefeb30c9d5 100644 --- a/TAO/examples/Advanced/ch_3/server.h +++ b/TAO/examples/Advanced/ch_3/server.h @@ -19,7 +19,7 @@ class Time_impl : public virtual POA_Time { public: - virtual TimeOfDay get_gmt (void); + virtual TimeOfDay get_gmt (); }; #endif /* server_HH_ */ diff --git a/TAO/examples/Advanced/ch_8_and_10/icp.cpp b/TAO/examples/Advanced/ch_8_and_10/icp.cpp index 4788e48ac0773..c0223f2b86c8f 100644 --- a/TAO/examples/Advanced/ch_8_and_10/icp.cpp +++ b/TAO/examples/Advanced/ch_8_and_10/icp.cpp @@ -12,7 +12,6 @@ - #include #include #include diff --git a/TAO/examples/Advanced/ch_8_and_10/server.cpp b/TAO/examples/Advanced/ch_8_and_10/server.cpp index eb7563d3760e3..8847fab5345b5 100644 --- a/TAO/examples/Advanced/ch_8_and_10/server.cpp +++ b/TAO/examples/Advanced/ch_8_and_10/server.cpp @@ -190,7 +190,6 @@ set_nominal_temp (CCS::TempType new_temp) // Now set the nominal temperature to the new value. if (ICP_set (m_anum, "nominal_temp", &new_temp) != 0) { - // If ICP_set () failed, read this thermostat's minimum // and maximum so we can initialize the BadTemp exception. CCS::Thermostat::BtData btd; @@ -336,7 +335,6 @@ find (CCS::Controller::SearchSeq & slist) // Loop over input list and look up each device. CORBA::ULong listlen = slist.length (); for (CORBA::ULong i = 0; i < listlen; i++) { - AssetMap::iterator where; // Iterator for asset map int num_found = 0; // Num matched per iteration diff --git a/TAO/examples/Advanced/ch_8_and_10/server.h b/TAO/examples/Advanced/ch_8_and_10/server.h index 45d0c88a9808f..925de61a5b222 100644 --- a/TAO/examples/Advanced/ch_8_and_10/server.h +++ b/TAO/examples/Advanced/ch_8_and_10/server.h @@ -12,7 +12,6 @@ - #ifndef server_HH_ #define server_HH_ diff --git a/TAO/examples/Borland/ChatClient.cpp b/TAO/examples/Borland/ChatClient.cpp index 996a0865fb633..a73397fcaec6b 100644 --- a/TAO/examples/Borland/ChatClient.cpp +++ b/TAO/examples/Borland/ChatClient.cpp @@ -8,13 +8,13 @@ USEFORM("ChatClientWnd.cpp", ChatClientWindow); //--------------------------------------------------------------------------- #pragma package(smart_init) -void ace_init(void) +void ace_init() { ACE::init(); } #pragma startup ace_init -void ace_fini(void) +void ace_fini() { ACE::fini(); } diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index f9142375baeea..f3412e15a68b1 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -69,7 +69,7 @@ class Reply_Handler : public POA_AMI_testHandler } //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void) + void shutdown () { } //FUZZ: enable check_for_lack_ACE_OS @@ -229,7 +229,6 @@ setup_buffering_constraints (CORBA::ORB_ptr orb) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp index 3ec9498c7091c..69c6ad2c7ef93 100644 --- a/TAO/examples/Buffered_AMI/test_i.cpp +++ b/TAO/examples/Buffered_AMI/test_i.cpp @@ -17,7 +17,7 @@ test_i::method (CORBA::ULong request_number, } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/examples/Buffered_AMI/test_i.h b/TAO/examples/Buffered_AMI/test_i.h index eadcac9b5c0f2..082c495bb58ed 100644 --- a/TAO/examples/Buffered_AMI/test_i.h +++ b/TAO/examples/Buffered_AMI/test_i.h @@ -28,7 +28,7 @@ class test_i : public POA_test void method (CORBA::ULong request_number, CORBA::ULong_out reply_number); - void shutdown (void); + void shutdown (); private: /// The ORB. diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp index ab44086182623..394ca3f9b122c 100644 --- a/TAO/examples/Buffered_Oneways/client.cpp +++ b/TAO/examples/Buffered_Oneways/client.cpp @@ -18,7 +18,6 @@ #include "ace/Read_Buffer.h" - // Name of file contains ior. static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior"); @@ -113,7 +112,6 @@ parse_args (int argc, ACE_TCHAR **argv) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp index 0956a0c58c160..5b0cd76c6b0e3 100644 --- a/TAO/examples/Buffered_Oneways/server.cpp +++ b/TAO/examples/Buffered_Oneways/server.cpp @@ -3,7 +3,6 @@ #include "ace/OS_NS_stdio.h" - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp index a35f50caa4de9..e9a575b0587f9 100644 --- a/TAO/examples/Buffered_Oneways/test_i.cpp +++ b/TAO/examples/Buffered_Oneways/test_i.cpp @@ -1,7 +1,6 @@ #include "test_i.h" - test_i::test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { @@ -16,7 +15,7 @@ test_i::method (CORBA::ULong request_number) } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/examples/Buffered_Oneways/test_i.h b/TAO/examples/Buffered_Oneways/test_i.h index 42cbe3f40a67b..7abab357bf25b 100644 --- a/TAO/examples/Buffered_Oneways/test_i.h +++ b/TAO/examples/Buffered_Oneways/test_i.h @@ -27,7 +27,7 @@ class test_i : public POA_test // = The test interface methods. void method (CORBA::ULong request_number); - void shutdown (void); + void shutdown (); private: /// The ORB. diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp index e932771d85db3..519863e3f5535 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp @@ -72,7 +72,6 @@ ClientApp::run (int argc, ACE_TCHAR* argv[]) { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - } } diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h index 137791f75c57a..3c0b73b2607c2 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h @@ -8,7 +8,6 @@ class ClientApp { public: - ClientApp(); ~ClientApp(); @@ -16,7 +15,6 @@ class ClientApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp index 07ca85edae2a0..8b42daabd9faa 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp @@ -22,7 +22,7 @@ Foo_i::~Foo_i() void -Foo_i::op1(void) +Foo_i::op1() { ++this->count_op1_; // Sleep for 10 milliseconds (10,000 microseconds) @@ -39,7 +39,7 @@ Foo_i::op2(CORBA::Long value) CORBA::Long -Foo_i::op3(void) +Foo_i::op3() { ++this->count_op3_; return this->value_; @@ -65,14 +65,14 @@ Foo_i::op4(CORBA::Long value) void -Foo_i::op5(void) +Foo_i::op5() { ++this->count_op5_; } void -Foo_i::done(void) +Foo_i::done() { unsigned num_left = --this->num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h index 9751030b8ae99..a104020458565 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h @@ -9,25 +9,23 @@ class Foo_i : public virtual POA_Foo { public: - Foo_i(unsigned num_clients); virtual ~Foo_i(); - virtual void op1(void); + virtual void op1(); virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void); + virtual CORBA::Long op3(); virtual void op4(CORBA::Long value); - virtual void op5(void); + virtual void op5(); - virtual void done(void); + virtual void done(); private: - CORBA::Long value_; unsigned num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h index f9d1517383ffe..788ddcc9c57dc 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h @@ -9,7 +9,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -17,7 +16,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp index 035329c2b1337..ef25dc055cbf8 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp @@ -86,7 +86,6 @@ ClientApp::run(int argc, ACE_TCHAR* argv[]) } - int ClientApp::parse_args(int argc, ACE_TCHAR* argv[]) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h index eb50cb27a4f32..2df9e8939d1c9 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h @@ -9,7 +9,6 @@ class ClientApp { public: - ClientApp(); ~ClientApp(); @@ -17,7 +16,6 @@ class ClientApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp index b688a1991d9b5..baf65e459b6a9 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp @@ -69,7 +69,7 @@ FooServantList::create_and_activate(PortableServer::POA_ptr poa) void -FooServantList::client_done(void) +FooServantList::client_done() { unsigned num_left = --this->num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h index efab29f418727..03e77be65a764 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h +++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h @@ -18,7 +18,7 @@ class FooServantList void create_and_activate(PortableServer::POA_ptr poa); - void client_done(void); + void client_done(); private: PortableServer::ServantBase_var* servants_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp index eca9c5e79dbde..12bf846557a37 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp @@ -20,7 +20,7 @@ Foo_i::~Foo_i() void -Foo_i::op1(void) +Foo_i::op1() { ++this->count_op1_; // Sleep for 10 milliseconds (10,000 microseconds) @@ -37,7 +37,7 @@ Foo_i::op2(CORBA::Long value) CORBA::Long -Foo_i::op3(void) +Foo_i::op3() { ++this->count_op3_; return this->value_; @@ -63,14 +63,14 @@ Foo_i::op4(CORBA::Long value) void -Foo_i::op5(void) +Foo_i::op5() { ++this->count_op5_; } void -Foo_i::done(void) +Foo_i::done() { this->mgr_->client_done(); } diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h index 4e191c54b2a3f..b8ba20b54a2d6 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h @@ -11,25 +11,23 @@ class FooServantList; class Foo_i : public virtual POA_Foo { public: - Foo_i(const ACE_TCHAR* servant_name, FooServantList* mgr); virtual ~Foo_i(); - virtual void op1(void); + virtual void op1(); virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void); + virtual CORBA::Long op3(); virtual void op4(CORBA::Long value); - virtual void op5(void); + virtual void op5(); - virtual void done(void); + virtual void done(); private: - CORBA::Long value_; unsigned count_op1_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h index 0f5b1e1a0409c..9f0be76663d6e 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h @@ -8,7 +8,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -16,7 +15,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp index 24f3ef64fa2d4..59f8533b79aa6 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp @@ -72,7 +72,6 @@ ClientApp::run (int argc, ACE_TCHAR* argv[]) { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - } } diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h index eb50cb27a4f32..2df9e8939d1c9 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h @@ -9,7 +9,6 @@ class ClientApp { public: - ClientApp(); ~ClientApp(); @@ -17,7 +16,6 @@ class ClientApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp index 5018a78c8729b..1f87afbdb21eb 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp @@ -15,7 +15,7 @@ Foo_i::~Foo_i() void -Foo_i::op1(void) +Foo_i::op1() { } @@ -28,13 +28,12 @@ Foo_i::op2(CORBA::Long value) CORBA::Long -Foo_i::op3(void) +Foo_i::op3() { return this->value_; } - void Foo_i::op4(CORBA::Long value) { @@ -43,14 +42,14 @@ Foo_i::op4(CORBA::Long value) void -Foo_i::op5(void) +Foo_i::op5() { throw FooException(); } void -Foo_i::done(void) +Foo_i::done() { unsigned num_left = --this->num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h index ea7db122e12c8..230ca09f03fa2 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h @@ -7,24 +7,22 @@ class Foo_i : public virtual POA_Foo { public: - Foo_i(unsigned num_clients); virtual ~Foo_i(); - virtual void op1(void); + virtual void op1(); virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void); + virtual CORBA::Long op3(); virtual void op4(CORBA::Long value); - virtual void op5(void); + virtual void op5(); - virtual void done(void); + virtual void done(); private: - CORBA::Long value_; unsigned num_clients_; }; diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h index 76e7619aca6e9..0c89c7606e79c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h @@ -9,7 +9,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -17,7 +16,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp index ce50c43b3e62f..099bdc5a58596 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp @@ -16,6 +16,5 @@ Callback_i::test_method ( ) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called\n")); - } diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h index 5a013fe4f8873..dca0793904f93 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h @@ -7,14 +7,12 @@ class Callback_i : public virtual POA_Callback { public: - Callback_i(); virtual ~Callback_i(); virtual void test_method ( ); - }; diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp index e3a52473c9dbd..fd06475dcffec 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp @@ -72,7 +72,6 @@ ClientTask::svc() { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - } // Two-Way calls with inout parameters. diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp index ad8d5d9c2f143..453918983b5c8 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp @@ -19,7 +19,7 @@ Foo_i::~Foo_i() void -Foo_i::op1(void) +Foo_i::op1() { ++this->count_op1_; // Sleep for 10 milliseconds (10,000 microseconds) @@ -36,7 +36,7 @@ Foo_i::op2(CORBA::Long value) CORBA::Long -Foo_i::op3(void) +Foo_i::op3() { ++this->count_op3_; return this->value_; @@ -62,7 +62,7 @@ Foo_i::op4(CORBA::Long value) void -Foo_i::op5(void) +Foo_i::op5() { ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - ENTER\n")); ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Increment counter.\n")); @@ -223,7 +223,7 @@ Foo_i::test_callback ( void -Foo_i::done(void) +Foo_i::done() { static ACE_Atomic_Op num_clients = 2; diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h index 651e3c1d1516e..eb1bd9de1eb63 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h @@ -12,19 +12,18 @@ class FooServantList; class Foo_i : public virtual POA_Foo { public: - Foo_i(const char* servant_name); virtual ~Foo_i(); - virtual void op1(void); + virtual void op1(); virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void); + virtual CORBA::Long op3(); virtual void op4(CORBA::Long value); - virtual void op5(void); + virtual void op5(); virtual CORBA::Boolean op6 ( const char * user_name, @@ -78,11 +77,10 @@ class Foo_i : public virtual POA_Foo virtual void test_callback ( ); - virtual void done(void); + virtual void done(); private: - CORBA::Long value_; unsigned count_op1_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h index fba7ea86b08bc..7cdd32318fc28 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h @@ -8,7 +8,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -16,7 +15,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp index ce50c43b3e62f..099bdc5a58596 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp @@ -16,6 +16,5 @@ Callback_i::test_method ( ) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called\n")); - } diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h index ce967dfe29b6b..dca0793904f93 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h @@ -7,7 +7,6 @@ class Callback_i : public virtual POA_Callback { public: - Callback_i(); virtual ~Callback_i(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h index 689c737157311..8eab095a92e85 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h @@ -10,7 +10,6 @@ class ClientTask; class ClientApp { public: - ClientApp(); ~ClientApp(); @@ -18,7 +17,6 @@ class ClientApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp index c64376c94039d..b2fb6013b6715 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp @@ -87,7 +87,6 @@ ClientTask::svc() { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - } // Two-Way calls with inout parameters. diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp index 00a5094793034..3a985f08026d4 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp @@ -130,7 +130,7 @@ FooServantList::create_and_activate(CORBA::ORB_ptr orb, void -FooServantList::client_done(void) +FooServantList::client_done() { unsigned num_left; @@ -158,7 +158,7 @@ FooServantList::collocated_client () const void -FooServantList::deactivate_servant (void) +FooServantList::deactivate_servant () { for (unsigned i = 0; i < this->num_servants_; i++) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h index 4a06102f735c9..e0779ed05fdad 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h @@ -12,7 +12,6 @@ class Foo_i; class FooServantList { public: - FooServantList(const ACE_TCHAR* prefix, unsigned num_servants, unsigned num_clients, @@ -24,11 +23,11 @@ class FooServantList void create_and_activate(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void client_done(void); + void client_done(); ClientTask* collocated_client () const; - void deactivate_servant (void); + void deactivate_servant (); private: Foo_i** servants_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp index 7a5925b63b9ed..227b8faa73a04 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp @@ -21,7 +21,7 @@ Foo_i::~Foo_i() void -Foo_i::op1(void) +Foo_i::op1() { ++this->count_op1_; // Sleep for 10 milliseconds (10,000 microseconds) @@ -38,7 +38,7 @@ Foo_i::op2(CORBA::Long value) CORBA::Long -Foo_i::op3(void) +Foo_i::op3() { ++this->count_op3_; @@ -70,7 +70,7 @@ Foo_i::op4(CORBA::Long value) void -Foo_i::op5(void) +Foo_i::op5() { ++this->count_op5_; throw FooException(); @@ -228,7 +228,7 @@ Foo_i::test_callback ( void -Foo_i::done(void) +Foo_i::done() { this->mgr_->client_done(); } diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h index 3e127b18a6c44..1a94077136898 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h @@ -14,15 +14,15 @@ class Foo_i : public virtual POA_Foo Foo_i(const char* servant_name, FooServantList* mgr); virtual ~Foo_i(); - virtual void op1(void); + virtual void op1(); virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void); + virtual CORBA::Long op3(); virtual void op4(CORBA::Long value); - virtual void op5(void); + virtual void op5(); virtual CORBA::Boolean op6 ( const char * user_name, @@ -63,7 +63,7 @@ class Foo_i : public virtual POA_Foo virtual void test_callback (); - virtual void done(void); + virtual void done(); void active (bool flag); diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h index 6f390f129cc9d..fe582ee5f866e 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h @@ -8,7 +8,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -16,7 +15,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp index ccfcbb7837dad..4ddf2b2a1304d 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp @@ -73,7 +73,6 @@ ClientApp::run (int argc, ACE_TCHAR* argv[]) { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - } } diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h index eb50cb27a4f32..2df9e8939d1c9 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h @@ -9,7 +9,6 @@ class ClientApp { public: - ClientApp(); ~ClientApp(); @@ -17,7 +16,6 @@ class ClientApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp index a5a2f905d7ed8..f2caf9a65fff3 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp @@ -23,7 +23,7 @@ Foo_i::~Foo_i() void -Foo_i::op1(void) +Foo_i::op1() { ++this->count_op1_; // Sleep for 10 milliseconds (10,000 microseconds) @@ -40,7 +40,7 @@ Foo_i::op2(CORBA::Long value) CORBA::Long -Foo_i::op3(void) +Foo_i::op3() { ++this->count_op3_; return this->value_; @@ -66,7 +66,7 @@ Foo_i::op4(CORBA::Long value) void -Foo_i::op5(void) +Foo_i::op5() { ++this->count_op5_; throw FooException(); @@ -74,7 +74,7 @@ Foo_i::op5(void) void -Foo_i::done(void) +Foo_i::done() { unsigned num_left = --this->num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h index 858fc65a6daf7..ef2f2f41a208f 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h @@ -7,25 +7,23 @@ class Foo_i { public: - Foo_i(unsigned num_clients); virtual ~Foo_i(); - virtual void op1(void); + virtual void op1(); virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void); + virtual CORBA::Long op3(); virtual void op4(CORBA::Long value); - virtual void op5(void); + virtual void op5(); - virtual void done(void); + virtual void done(); private: - CORBA::Long value_; unsigned num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h index f9d1517383ffe..788ddcc9c57dc 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h @@ -9,7 +9,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -17,7 +16,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index b35acf6060208..96809c6d36484 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -168,8 +168,6 @@ Consumer_Handler::via_naming_service () // the <_narrow> method. this->server_ = Notifier::_narrow (notifier_obj.in ()); - - } catch (const CORBA::Exception& ex) { @@ -185,7 +183,6 @@ Consumer_Handler::via_naming_service () int Consumer_Handler::init (int argc, ACE_TCHAR **argv) { - this->argc_ = argc; this->argv_ = argv; @@ -247,7 +244,6 @@ Consumer_Handler::init (int argc, ACE_TCHAR **argv) } else { - if (this->ior_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "%s: no ior specified\n", @@ -306,7 +302,6 @@ Consumer_Handler::run () if (this->interactive_ == 0) { - // Register with the server. this->server_->register_callback (this->stock_name_.c_str (), this->threshold_value_, @@ -322,7 +317,6 @@ Consumer_Handler::run () // Run the ORB. this->orb_->run (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp index 3819b279e7491..d88b3ad1849e9 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp @@ -60,7 +60,6 @@ Notifier_Input_Handler::init_naming_service () naming_server_->rebind (notifier_obj_name, notifier_obj.in()); - } catch (const CosNaming::NamingContext::AlreadyBound&) { diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp index 7c32b117b31e8..675bfedf1e14a 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp @@ -188,7 +188,6 @@ Notifier_i::shutdown () // Instruct the ORB to shutdown. this->orb_->shutdown (); - } bool diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index 6234826cd839c..97b4b7ae79f92 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -142,7 +142,6 @@ Supplier::send_market_status (const char *stock_name, long value) { try { - // Make the RMI. this->notifier_->market_status (stock_name, value); diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp index ef4f4883e4abb..05cb15b5bc70a 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp @@ -6,7 +6,6 @@ #include "Content_Iterator_i.h" - Content_Iterator_i::Content_Iterator_i (const char *pathname, CORBA::ULongLong file_size) : file_ (ACE_TEXT_CHAR_TO_TCHAR(pathname)), @@ -17,7 +16,7 @@ Content_Iterator_i::Content_Iterator_i (const char *pathname, // Nothing else } -Content_Iterator_i::~Content_Iterator_i (void) +Content_Iterator_i::~Content_Iterator_i () { (void) this->file_io_.close (); } @@ -102,7 +101,7 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset, } void -Content_Iterator_i::destroy (void) +Content_Iterator_i::destroy () { (void) this->file_io_.close (); @@ -122,7 +121,7 @@ Content_Iterator_i::destroy (void) } int -Content_Iterator_i::init (void) +Content_Iterator_i::init () { // Open the requested file. ACE_FILE_Connector connector; diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h index cae2d5192ea34..8224a10bf5038 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h @@ -38,12 +38,11 @@ class Content_Iterator_i : friend class Iterator_Factory_i; public: - /// Constructor Content_Iterator_i (const char *filename, CORBA::ULongLong file_size); /// Destructor - ~Content_Iterator_i (void); + ~Content_Iterator_i (); /// This operation returns the next of the file starting at /// . If there are no more bindings, false is returned. @@ -51,15 +50,13 @@ class Content_Iterator_i : Web_Server::Chunk_Type_out chunk); /// Destroy the iterator. - virtual void destroy (void); + virtual void destroy (); private: - /// Initialize the Content_Iterator. - int init (void); + int init (); private: - /// The Addr representing the requested file. ACE_FILE_Addr file_; diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h index 3e5850ceba1cf..5d405cb6a892b 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h @@ -38,7 +38,6 @@ class Content_Iterator_i; class Iterator_Factory_i : virtual public POA_Web_Server::Iterator_Factory { public: - /** * This factory method returns a that can be used * to read the associated with one ``chunk'' diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp index 3347678252520..398e56f31ae9b 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" -Iterator_Handler::Iterator_Handler (void) +Iterator_Handler::Iterator_Handler () : file_ (ACE_sap_any_cast (const ACE_FILE_Addr &)), file_io_ (), contents_ (), @@ -20,7 +20,7 @@ Iterator_Handler::Iterator_Handler (void) // Nothing else } -Iterator_Handler::~Iterator_Handler (void) +Iterator_Handler::~Iterator_Handler () { (void) this->file_io_.close (); } @@ -49,7 +49,6 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data, this->contents_->sendc_next_chunk (this->ami_handler_.in (), this->offset_); - } else { @@ -69,7 +68,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data, } } void -Iterator_Handler::destroy (void) +Iterator_Handler::destroy () { // Deactivate this reply handler. this->deactivate (); @@ -126,7 +125,7 @@ Iterator_Handler::initialize_content_iterator } void -Iterator_Handler::deactivate (void) +Iterator_Handler::deactivate () { // Get the POA used when activating the Reply Handler object. PortableServer::POA_var poa = @@ -208,7 +207,7 @@ Iterator_Handler::get_viewer (char *viewer, } int -Iterator_Handler::spawn_viewer (void) +Iterator_Handler::spawn_viewer () { char viewer[BUFSIZ]; diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h index ee4c911dd0e5d..0818d41e4a7b2 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h @@ -41,10 +41,9 @@ class Iterator_Handler friend class Iterator_Handler_Friend; public: - /// Constructor that creates a content iterator corresponding to the /// name of the file being retrieved from the web server. - Iterator_Handler (void); + Iterator_Handler (); virtual void next_chunk (CORBA::Boolean pending_data, const Web_Server::Chunk_Type & chunk); @@ -53,7 +52,7 @@ class Iterator_Handler ::Messaging::ExceptionHolder *) {} - virtual void destroy (void); + virtual void destroy (); virtual void destroy_excep ( ::Messaging::ExceptionHolder *) @@ -72,24 +71,23 @@ class Iterator_Handler private: /// Destructor (private to ensure that Iterator_Handler is allocated /// on the heap). - ~Iterator_Handler (void); + ~Iterator_Handler (); /// Initialize the Content Iterator used to retrieve the file. void initialize_content_iterator (const char *pathname, Web_Server::Iterator_Factory_ptr factory); /// Deactivate this reply handler. - void deactivate (void); + void deactivate (); /// Get the name of the viewer associated with the file being /// retrieved. int get_viewer (char *viewer, size_t length); /// Spawn an external view to display the retrieved file. - int spawn_viewer (void); + int spawn_viewer (); private: - /// The Addr corresponding to the retrieved file. ACE_FILE_Addr file_; diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp index 2688d83ebf345..643fa24c04e96 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp @@ -18,13 +18,13 @@ Callback_Handler::Callback_Handler (const char *pathname, // Nothing else } -Callback_Handler::~Callback_Handler (void) +Callback_Handler::~Callback_Handler () { // Nothing else } void -Callback_Handler::next_chunk (void) +Callback_Handler::next_chunk () { if (this->last_chunk_ == 1) { @@ -97,7 +97,7 @@ Callback_Handler::next_chunk_excep } void -Callback_Handler::run (void) +Callback_Handler::run () { // Open the file to be downloaded this->open_file (); @@ -112,7 +112,7 @@ Callback_Handler::run (void) } void -Callback_Handler::open_file (void) +Callback_Handler::open_file () { // Create a temporary file to store the retrieved data. ACE_FILE_Connector connector; @@ -128,7 +128,7 @@ Callback_Handler::open_file (void) } void -Callback_Handler::deactivate (void) +Callback_Handler::deactivate () { // Close the file that was sent to the client. (void) this->file_io_.close (); diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h index 82de8dd4bcfa2..7166c1fc5cbed 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h @@ -72,7 +72,7 @@ class Callback_Handler Web_Server::Callback_ptr callback); /// The callback for this reply handler. - virtual void next_chunk (void); + virtual void next_chunk (); virtual void next_chunk_excep (::Messaging::ExceptionHolder *); @@ -82,21 +82,20 @@ class Callback_Handler * incremented when file retrieval begins, and decremented when file * retrieval completes. */ - void run (void); + void run (); private: /// Destructor (private to ensure that Callback_Handler is allocated /// on the heap). - ~Callback_Handler (void); + ~Callback_Handler (); /// Open the file to be uploaded to the client callback. - void open_file (void); + void open_file (); /// Deactivate this reply handler. - void deactivate (void); + void deactivate (); private: - /// The Addr corresponding to the retrieved file. ACE_FILE_Addr file_; diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp index 1741f68d52e5f..8cf23b7d6e70b 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp @@ -36,7 +36,7 @@ Callback_i::Callback_i (int *request_count) (*this->request_count_)++; } -Callback_i::~Callback_i (void) +Callback_i::~Callback_i () { (void) this->file_io_.close (); } @@ -133,7 +133,7 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata) } int -Callback_i::metadata_received (void) +Callback_i::metadata_received () { ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -144,7 +144,7 @@ Callback_i::metadata_received (void) } int -Callback_i::content_received (void) +Callback_i::content_received () { ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -221,7 +221,7 @@ Callback_i::get_viewer (char *viewer, } int -Callback_i::spawn_viewer (void) +Callback_i::spawn_viewer () { char viewer[BUFSIZ]; @@ -264,7 +264,7 @@ Callback_i::spawn_viewer (void) } void -Callback_i::deactivate (void) +Callback_i::deactivate () { // Get the POA used when activating the Reply Handler object. PortableServer::POA_var poa = this->_default_POA (); diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h index b1022a1757d80..4ea944f7467e6 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h @@ -63,32 +63,29 @@ class Callback_i : void metadata (const Web_Server::Metadata_Type &metadata); private: - /// Destructor must be private to ensure that this object is /// allocated on the heap. - ~Callback_i (void); + ~Callback_i (); /// Returns one if the metadata was received, and zero otherwise. - int metadata_received (void); + int metadata_received (); /// Returns one if the entire content was received, and zero /// otherwise. - int content_received (void); + int content_received (); /// Get the name of the viewer associated with the file being /// retrieved. int get_viewer (char *viewer, size_t length); /// Spawn an external view to display the retrieved file. - int spawn_viewer (void); + int spawn_viewer (); private: - /// Deactivate this Callback servant. - void deactivate (void); + void deactivate (); private: - /// The Addr corresponding to the retrieved file. ACE_FILE_Addr file_; diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp index ad1b852321ccd..54be9932254ab 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp @@ -6,7 +6,7 @@ #include "Push_Iterator_Handler.h" #include "Callback_i.h" -Push_Iterator_Handler::Push_Iterator_Handler (void) +Push_Iterator_Handler::Push_Iterator_Handler () : callback_servant_ (0), callback_ (), ami_handler_ () @@ -14,7 +14,7 @@ Push_Iterator_Handler::Push_Iterator_Handler (void) // Nothing else } -Push_Iterator_Handler::~Push_Iterator_Handler (void) +Push_Iterator_Handler::~Push_Iterator_Handler () { // Nothing else } @@ -56,7 +56,7 @@ Push_Iterator_Handler::run (int *request_count, } void -Push_Iterator_Handler::deactivate (void) +Push_Iterator_Handler::deactivate () { // Get the POA used when activating the Reply Handler object. PortableServer::POA_var poa = this->_default_POA (); diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h index ec5f4048be8e5..5f5ba8cf76eaa 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h @@ -52,7 +52,7 @@ class Push_Iterator_Handler public: /// Constructor that creates a content iterator corresponding to the /// name of the file being retrieved from the web server. - Push_Iterator_Handler (void); + Push_Iterator_Handler (); /** * Activate and run this Reply Handler. The contents (not the @@ -65,10 +65,9 @@ class Push_Iterator_Handler Web_Server::Iterator_Factory_ptr factory); private: - /// Destructor (private to ensure that Iterator_Handler is allocated /// on the heap). - ~Push_Iterator_Handler (void); + ~Push_Iterator_Handler (); /// AMI callback that is invoked when a response from the /// corresponding server method is received. @@ -80,7 +79,7 @@ class Push_Iterator_Handler {} /// Deactivate this handler. - void deactivate (void); + void deactivate (); private: /// The servant that accepts data pushed from the content server. diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp index 83f062892147b..1b43df34587ae 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp @@ -15,7 +15,7 @@ Content_Iterator_i::Content_Iterator_i (const char *pathname, // Nothing else } -Content_Iterator_i::~Content_Iterator_i (void) +Content_Iterator_i::~Content_Iterator_i () { (void) this->file_io_.close (); } @@ -110,9 +110,8 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset, } void -Content_Iterator_i::destroy (void) +Content_Iterator_i::destroy () { - (void) this->file_io_.close (); // Get the POA used when activating the Content_Iterator object. @@ -129,7 +128,7 @@ Content_Iterator_i::destroy (void) } int -Content_Iterator_i::init (void) +Content_Iterator_i::init () { // Open the requested file. ACE_FILE_Connector connector; diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h index cae2d5192ea34..8224a10bf5038 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h @@ -38,12 +38,11 @@ class Content_Iterator_i : friend class Iterator_Factory_i; public: - /// Constructor Content_Iterator_i (const char *filename, CORBA::ULongLong file_size); /// Destructor - ~Content_Iterator_i (void); + ~Content_Iterator_i (); /// This operation returns the next of the file starting at /// . If there are no more bindings, false is returned. @@ -51,15 +50,13 @@ class Content_Iterator_i : Web_Server::Chunk_Type_out chunk); /// Destroy the iterator. - virtual void destroy (void); + virtual void destroy (); private: - /// Initialize the Content_Iterator. - int init (void); + int init (); private: - /// The Addr representing the requested file. ACE_FILE_Addr file_; diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h index 612f5b7d01856..ef8c33db1084e 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h @@ -38,9 +38,7 @@ class Content_Iterator_i; */ class Iterator_Factory_i : virtual public POA_Web_Server::Iterator_Factory { - public: - /** * This factory method returns a that can be used * to read the associated with one ``chunk'' @@ -58,7 +56,6 @@ class Iterator_Factory_i : virtual public POA_Web_Server::Iterator_Factory /// Set the type of file content in the metadata structure. int content_type (const char *filename, Web_Server::Metadata_Type_out metadata); - }; diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp index 61640350ea04d..df271e744cae5 100644 --- a/TAO/examples/Event_Comm/Consumer_Handler.cpp +++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp @@ -1,7 +1,7 @@ #include "Consumer_Handler.h" #include "tao/ORB_Core.h" -Consumer_Handler::Consumer_Handler (void) +Consumer_Handler::Consumer_Handler () : receiver_ (0), notifier_ (0), shutdowncallback (0) @@ -71,7 +71,7 @@ Consumer_Handler::init (int argc, } int -Consumer_Handler::get_notifier (void) +Consumer_Handler::get_notifier () { try { @@ -104,13 +104,13 @@ Consumer_Handler::get_notifier (void) } void -Consumer_Handler::close (void) +Consumer_Handler::close () { this->orb_->shutdown (); } void -Consumer_Handler::shutdown (void) +Consumer_Handler::shutdown () { ACE_ASSERT (this->shutdowncallback != 0); @@ -118,7 +118,7 @@ Consumer_Handler::shutdown (void) } int -Consumer_Handler::run (void) +Consumer_Handler::run () { ACE_DEBUG ((LM_DEBUG, "Running the Consumer...\n")); @@ -135,7 +135,7 @@ Consumer_Handler::run (void) } ACE_Reactor* -Consumer_Handler::reactor(void) +Consumer_Handler::reactor() { // @@ Please see if there's a way to get to the Reactor without // using the TAO_ORB_Core_instance(). @@ -143,13 +143,13 @@ Consumer_Handler::reactor(void) } Event_Comm::Consumer_ptr -Consumer_Handler::receiver (void) +Consumer_Handler::receiver () { return this->receiver_.in (); } Event_Comm::Notifier_ptr -Consumer_Handler::notifier (void) +Consumer_Handler::notifier () { return this->notifier_.in (); } diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h index afca7a3f04c58..71e5acd405dd7 100644 --- a/TAO/examples/Event_Comm/Consumer_Handler.h +++ b/TAO/examples/Event_Comm/Consumer_Handler.h @@ -32,35 +32,35 @@ class Consumer_Handler { public: /// Constructor. - Consumer_Handler (void); + Consumer_Handler (); /// Destructor. - virtual ~Consumer_Handler (void) = default; + virtual ~Consumer_Handler () = default; /// Initializes the ORB, gets the Notifier reference from the Naming /// Service, and starts the servant for the Consumer object. int init (int argc, ACE_TCHAR *argv[], ShutdownCallback *_shutdowncallback); /// runs the ORB. - int run (void); + int run (); /// shutdown the orb. - void close (void); + void close (); /// called to shutdown the consumer application. - void shutdown (void); + void shutdown (); // = Accessors - Event_Comm::Consumer *receiver (void); - Event_Comm::Notifier *notifier (void); + Event_Comm::Consumer *receiver (); + Event_Comm::Notifier *notifier (); /// returns the ORB's reactor. - ACE_Reactor *reactor (void); + ACE_Reactor *reactor (); private: /// gets the notifier reference from the naming service. /// returns 0 on success, -1 on error. - int get_notifier (void); + int get_notifier (); /// Remember our orb. CORBA::ORB_var orb_; diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp index 444f3f5a02e15..d20b3ce6fa120 100644 --- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp @@ -3,7 +3,7 @@ #include "tao/ORB_Core.h" -Consumer_Input_Handler::Consumer_Input_Handler (void) +Consumer_Input_Handler::Consumer_Input_Handler () : receiver_handler_ (0), consumer_initiated_shutdown_ (0) { @@ -11,7 +11,7 @@ Consumer_Input_Handler::Consumer_Input_Handler (void) } int -Consumer_Input_Handler::consumer_initiated_shutdown (void) +Consumer_Input_Handler::consumer_initiated_shutdown () { return this->consumer_initiated_shutdown_; } @@ -23,7 +23,7 @@ Consumer_Input_Handler::consumer_initiated_shutdown (int c) } int -Consumer_Input_Handler::close (void) +Consumer_Input_Handler::close () { ACE_DEBUG ((LM_DEBUG, "closing down Consumer::Input_Handler\n")); diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.h b/TAO/examples/Event_Comm/Consumer_Input_Handler.h index cd58c3a3f3840..b8a91aea145dd 100644 --- a/TAO/examples/Event_Comm/Consumer_Input_Handler.h +++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.h @@ -37,10 +37,10 @@ class Consumer_Input_Handler : public ACE_Event_Handler public: // Initialization and termination methods. /// Constructor. - Consumer_Input_Handler(void); + Consumer_Input_Handler(); /// Destructor. - ~Consumer_Input_Handler (void) = default; + ~Consumer_Input_Handler () = default; /// registers the input event handler. /// returns 0 on success, -1 on error. @@ -50,10 +50,10 @@ class Consumer_Input_Handler : public ACE_Event_Handler virtual int handle_input (ACE_HANDLE); /// Close down the handler. - int close (void); + int close (); /// Report whether the Consumer initiated the shutdown. - int consumer_initiated_shutdown (void); + int consumer_initiated_shutdown (); /// Indicate that the Consumer initiated the shutdown. void consumer_initiated_shutdown (int); diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp index 1f251648a07fb..befc7c1d7bca5 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.cpp +++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp @@ -12,19 +12,19 @@ class Consumer_Entry const char *filtering_criteria); // Constructor. - ~Consumer_Entry (void); + ~Consumer_Entry (); // Descriptor. // = Set/get filtering criteria. void criteria (const char *criteria); - const char *criteria (void); + const char *criteria (); // = Set/get Event_Comm::Consumer object reference. - Event_Comm::Consumer *consumer (void); + Event_Comm::Consumer *consumer (); void consumer (Event_Comm::Consumer *); // = Set/get the compiled regular expression buffer. - const char *regexp (void); + const char *regexp (); void regexp (char *); private: @@ -50,7 +50,7 @@ Consumer_Entry::criteria (const char *criteria) } const char * -Consumer_Entry::criteria (void) +Consumer_Entry::criteria () { return this->filtering_criteria_; } @@ -58,7 +58,7 @@ Consumer_Entry::criteria (void) // = Set/get Event_Comm::Consumer object reference. Event_Comm::Consumer * -Consumer_Entry::consumer (void) +Consumer_Entry::consumer () { return this->consumer_; } @@ -70,7 +70,7 @@ Consumer_Entry::consumer (Event_Comm::Consumer *consumer) } const char * -Consumer_Entry::regexp (void) +Consumer_Entry::regexp () { return this->compiled_regexp_; } @@ -121,7 +121,7 @@ Consumer_Entry::Consumer_Entry (Event_Comm::Consumer *consumer, this->consumer_ = Event_Comm::Consumer::_duplicate (this->consumer_); } -Consumer_Entry::~Consumer_Entry (void) +Consumer_Entry::~Consumer_Entry () { ACE_OS::free ((void *) this->filtering_criteria_); ACE_OS::free ((void *) this->compiled_regexp_); @@ -373,20 +373,20 @@ Notifier_i::push (const Event_Comm::Event &event) // ------------- -ShutdownCallback::~ShutdownCallback (void) +ShutdownCallback::~ShutdownCallback () { } // ------------- //FUZZ: disable check_for_lack_ACE_OS -Consumer_i::Consumer_i (void) +Consumer_i::Consumer_i () : shutdown (0) { } //FUZZ: enable check_for_lack_ACE_OS -Consumer_i::~Consumer_i (void) +Consumer_i::~Consumer_i () { } diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h index de2509e181a0b..19037ec172c70 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.h +++ b/TAO/examples/Event_Comm/Event_Comm_i.h @@ -33,10 +33,10 @@ class ShutdownCallback { public: /// Destructor. - virtual ~ShutdownCallback (void); + virtual ~ShutdownCallback (); /// This method is to be called to shutdown the application. - virtual void close (void) = 0; + virtual void close () = 0; }; /** @@ -48,10 +48,10 @@ class Consumer_i : public POA_Event_Comm::Consumer { public: /// Constructor. - Consumer_i (void); + Consumer_i (); /// Destructor. - ~Consumer_i (void); + ~Consumer_i (); /// set the ACE_Reactor to use when quitting. void set_reactor (ACE_Reactor *reactor); diff --git a/TAO/examples/Event_Comm/Notifier_Handler.h b/TAO/examples/Event_Comm/Notifier_Handler.h index f3bf37bd8810d..84d310297e704 100644 --- a/TAO/examples/Event_Comm/Notifier_Handler.h +++ b/TAO/examples/Event_Comm/Notifier_Handler.h @@ -32,29 +32,29 @@ class Notifier_Handler public: /// This constructor gets the notifier object from the Naming /// Service. - Notifier_Handler (void) = default; + Notifier_Handler () = default; /// Destructor. - virtual ~Notifier_Handler (void) = default; + virtual ~Notifier_Handler () = default; /// Initialize the client communication endpoint with server. int init (int argc, ACE_TCHAR *argv[], ShutdownCallback* _shutdowncallback); // = Accessors. - Event_Comm::Notifier *notifier (void); + Event_Comm::Notifier *notifier (); void notifier (Event_Comm::Notifier *); /// runs the ORB. - int run (void); + int run (); /// Close down the handler. - int close (void); + int close (); /// called to request application shutdown. - void shutdown (void); + void shutdown (); /// returns the ORB's reactor. - ACE_Reactor *reactor (void); + ACE_Reactor *reactor (); private: /// Remember our orb. diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp index ece19d92bfa7e..74eb3eacffeca 100644 --- a/TAO/examples/Event_Comm/Notifier_Server.cpp +++ b/TAO/examples/Event_Comm/Notifier_Server.cpp @@ -4,18 +4,18 @@ #include "tao/ORB_Core.h" // Constructor. -Notifier_Server::Notifier_Server (void) +Notifier_Server::Notifier_Server () { } // Destructor. -Notifier_Server::~Notifier_Server (void) +Notifier_Server::~Notifier_Server () { } int -Notifier_Server::close (void) +Notifier_Server::close () { try { @@ -45,7 +45,7 @@ Notifier_Server::close (void) // the object name is bound to the naming server. int -Notifier_Server::init_naming_service (void) +Notifier_Server::init_naming_service () { try { @@ -110,7 +110,7 @@ Notifier_Server::init (int argc, } int -Notifier_Server::run (void) +Notifier_Server::run () { ACE_DEBUG ((LM_DEBUG, "Running the notifier server...\n")); @@ -122,7 +122,7 @@ Notifier_Server::run (void) } ACE_Reactor * -Notifier_Server::reactor (void) +Notifier_Server::reactor () { return TAO_ORB_Core_instance ()->reactor (); } diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h index 46822e33240ce..6a1e382a98fa5 100644 --- a/TAO/examples/Event_Comm/Notifier_Server.h +++ b/TAO/examples/Event_Comm/Notifier_Server.h @@ -27,27 +27,27 @@ class Notifier_Server { public: /// Constructor. - Notifier_Server (void); + Notifier_Server (); /// Destructor. - ~Notifier_Server (void); + ~Notifier_Server (); /// Initialize the Server state. int init (int argc, ACE_TCHAR *argv[]); /// Run the orb. - int run (void); + int run (); /// Close the naming service. - int close (void); + int close (); /// Reactor accessor. - ACE_Reactor *reactor(void); + ACE_Reactor *reactor(); private: /// Initialises the name server and registers the Notifier server /// object name with the name server. - int init_naming_service (void); + int init_naming_service (); /// The ORB manager. TAO_ORB_Manager orb_manager_; diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp index cef8fb40b2cab..18265894ed88f 100644 --- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp @@ -9,14 +9,14 @@ Supplier_Input_Handler::Supplier_Input_Handler () // No-Op. } -Supplier_Input_Handler::~Supplier_Input_Handler (void) +Supplier_Input_Handler::~Supplier_Input_Handler () { ACE_DEBUG ((LM_DEBUG, "closing down Supplier_Input_Handler::~Supplier_Input_Handler\n")); } int -Supplier_Input_Handler::close (void) +Supplier_Input_Handler::close () { ACE_DEBUG ((LM_DEBUG, "closing down Supplier::Supplier_Input_Handler\n")); @@ -84,7 +84,6 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE) } - if (ACE_OS::strncmp (buf, "quit", 4) == 0) // Tell the main event loop to shutdown. this->notifier_->shutdown (); diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.h b/TAO/examples/Event_Comm/Supplier_Input_Handler.h index b18d79a4e7514..344c03f81ff91 100644 --- a/TAO/examples/Event_Comm/Supplier_Input_Handler.h +++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.h @@ -36,10 +36,10 @@ class Supplier_Input_Handler : public ACE_Event_Handler { public: /// Constructor. - Supplier_Input_Handler (void); + Supplier_Input_Handler (); /// Destructor. - ~Supplier_Input_Handler (void); + ~Supplier_Input_Handler (); /// Initialization. int initialize (Notifier_Handler *); @@ -48,7 +48,7 @@ class Supplier_Input_Handler : public ACE_Event_Handler virtual int handle_input (ACE_HANDLE); /// Close down the handler. - int close (void); + int close (); protected: /// Pointer to a that's used to inform Consumers diff --git a/TAO/examples/Event_Comm/consumer.cpp b/TAO/examples/Event_Comm/consumer.cpp index 9a9a516fde262..d368c5262db3a 100644 --- a/TAO/examples/Event_Comm/consumer.cpp +++ b/TAO/examples/Event_Comm/consumer.cpp @@ -56,7 +56,7 @@ Consumer::handle_signal (int signum, } void -Consumer::close (void) +Consumer::close () { // clean up the input handler. ih_.close (); @@ -65,7 +65,7 @@ Consumer::close (void) } int -Consumer::run (void) +Consumer::run () { // Run the 's ORB. return ch_.run (); diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp index 7596f378a0faf..6dff921e6f592 100644 --- a/TAO/examples/Event_Comm/notifier.cpp +++ b/TAO/examples/Event_Comm/notifier.cpp @@ -14,7 +14,7 @@ Notifier::handle_signal (int signum, siginfo_t *, ucontext_t *) } void -Notifier::run (void) +Notifier::run () { try { @@ -45,7 +45,7 @@ Notifier::Notifier (int argc, ACE_TCHAR *argv[]) "register_handler")); } -Notifier::~Notifier (void) +Notifier::~Notifier () { // Cleanup. this->ns_.close (); diff --git a/TAO/examples/Event_Comm/notifier.h b/TAO/examples/Event_Comm/notifier.h index 009cc015967ea..46d15aca84b58 100644 --- a/TAO/examples/Event_Comm/notifier.h +++ b/TAO/examples/Event_Comm/notifier.h @@ -20,10 +20,10 @@ class Notifier : public ACE_Event_Handler Notifier (int argc, ACE_TCHAR *argv[]); /// Destructor. - ~Notifier (void); + ~Notifier (); /// Execute the notifier. - void run (void); + void run (); private: /// Handle signals that shut us down. diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp index 79caf80f1db5a..3e99cd2a8f1e4 100644 --- a/TAO/examples/Event_Comm/supplier.cpp +++ b/TAO/examples/Event_Comm/supplier.cpp @@ -14,7 +14,7 @@ Supplier::handle_signal (int signum, siginfo_t *, ucontext_t *) } void -Supplier::run (void) +Supplier::run () { if (nh_.run () == -1) ACE_ERROR ((LM_ERROR, @@ -23,7 +23,7 @@ Supplier::run (void) } void -Supplier::close (void) +Supplier::close () { ih_.close (); nh_.close (); @@ -60,7 +60,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) try { - if (supplier.init (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", diff --git a/TAO/examples/Event_Comm/supplier.h b/TAO/examples/Event_Comm/supplier.h index a35775ec59820..feaa231c36cd5 100644 --- a/TAO/examples/Event_Comm/supplier.h +++ b/TAO/examples/Event_Comm/supplier.h @@ -19,19 +19,19 @@ class Supplier : public ACE_Event_Handler, public ShutdownCallback public: // Initialization and Termination methods. /// Constructor. - Supplier (void) = default; + Supplier () = default; /// Destructor. - ~Supplier (void) = default; + ~Supplier () = default; /// Initialization method. returns 0 on success, -1 on error. int init (int argc, ACE_TCHAR *argv[]); /// Execute the supplier. - void run (void); + void run (); /// Shutdown the application. - virtual void close (void); + virtual void close (); private: /// Handle shutdown signals. diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp index 688e14eff77ed..3250eeba1fbac 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp @@ -13,7 +13,7 @@ using namespace std; EDF_Scheduling::SchedulingParameter -EDF_Sched_Param_Policy::value (void) +EDF_Sched_Param_Policy::value () { return this->value_; } @@ -33,7 +33,6 @@ EDF_Scheduler::EDF_Scheduler (CORBA::ORB_ptr orb, ace_sched_policy_ (ace_sched_policy), ace_sched_scope_ (ace_sched_scope) { - Kokyu::DSRT_ConfigInfo config; config.impl_type_ = this->disp_impl_type_; @@ -74,12 +73,12 @@ EDF_Scheduler::EDF_Scheduler (CORBA::ORB_ptr orb, codec_ = codec_factory->create_codec (encoding); } -EDF_Scheduler::~EDF_Scheduler (void) +EDF_Scheduler::~EDF_Scheduler () { } void -EDF_Scheduler::shutdown (void) +EDF_Scheduler::shutdown () { kokyu_dispatcher_->shutdown (); DSUI_EVENT_LOG (EDF_SCHED_FAM, DISPATCHER_SHUTDOWN, 0, 0, 0); @@ -198,7 +197,6 @@ void EDF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid, const char *) { - int int_guid; ACE_OS::memcpy (&int_guid, guid.get_buffer (), @@ -332,7 +330,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, CORBA::Policy_out sched_param_out, CORBA::Policy_out /*implicit_sched_param_out*/) { - Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr; RTScheduling::Current::IdType guid; int int_guid; @@ -340,7 +337,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, DSUI_EVENT_LOG (EDF_SCHED_FAM, ENTER_SERVER_SCHED_TIME, 0, 0, 0); - #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, "(%t|%T):entered EDF_Scheduler::receive_request\n")); #endif @@ -665,7 +661,6 @@ EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) void EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) { - DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_OTHER, 0, 0, 0); //Otherwise Segmentation fault when oneway call happens. @@ -680,7 +675,7 @@ EDF_Scheduler::cancel (const RTScheduling::Current::IdType &) } CORBA::PolicyList* -EDF_Scheduler::scheduling_policies (void) +EDF_Scheduler::scheduling_policies () { throw CORBA::NO_IMPLEMENT (); } @@ -692,13 +687,13 @@ EDF_Scheduler::scheduling_policies (const CORBA::PolicyList &) } CORBA::PolicyList* -EDF_Scheduler::poa_policies (void) +EDF_Scheduler::poa_policies () { throw CORBA::NO_IMPLEMENT (); } char * -EDF_Scheduler::scheduling_discipline_name (void) +EDF_Scheduler::scheduling_discipline_name () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h index f29d4b42b5248..dfd9e9d0a0143 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h @@ -48,8 +48,7 @@ public EDF_Scheduling::SchedulingParameterPolicy, public ::CORBA::LocalObject { public: - - EDF_Scheduling::SchedulingParameter value (void); + EDF_Scheduling::SchedulingParameter value (); void value (const EDF_Scheduling::SchedulingParameter & value); @@ -62,19 +61,18 @@ public EDF_Scheduling::Scheduler, public ::CORBA::LocalObject { public: - EDF_Scheduler (CORBA::ORB_ptr orb, Kokyu::DSRT_Dispatcher_Impl_t, int ace_sched_policy, int ace_sched_scope); - ~EDF_Scheduler (void); + ~EDF_Scheduler (); virtual EDF_Scheduling::SchedulingParameterPolicy_ptr create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value); - void shutdown (void); + void shutdown (); virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, @@ -122,13 +120,13 @@ public ::CORBA::LocalObject virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void); + virtual CORBA::PolicyList * scheduling_policies (); virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void); + virtual CORBA::PolicyList * poa_policies (); - virtual char * scheduling_discipline_name (void); + virtual char * scheduling_discipline_name (); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, CORBA::Policy_ptr scheduling_parameter); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp index a78ae87523a9a..e2b8374f60121 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp @@ -20,7 +20,7 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy ( } FP_Scheduling::SegmentSchedulingParameter -FP_Segment_Sched_Param_Policy::value (void) +FP_Segment_Sched_Param_Policy::value () { return value_; } @@ -33,7 +33,7 @@ FP_Segment_Sched_Param_Policy::value ( } CORBA::Policy_ptr -FP_Segment_Sched_Param_Policy::copy (void) +FP_Segment_Sched_Param_Policy::copy () { FP_Segment_Sched_Param_Policy* tmp = 0; ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this), @@ -44,13 +44,13 @@ FP_Segment_Sched_Param_Policy::copy (void) } CORBA::PolicyType -FP_Segment_Sched_Param_Policy::policy_type (void) +FP_Segment_Sched_Param_Policy::policy_type () { return 0; } void -FP_Segment_Sched_Param_Policy::destroy (void) +FP_Segment_Sched_Param_Policy::destroy () { } @@ -64,7 +64,6 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler ( ace_sched_policy_ (ace_sched_policy), ace_sched_scope_ (ace_sched_scope) { - Kokyu::DSRT_ConfigInfo config; config.impl_type_ = this->disp_impl_type_; @@ -103,13 +102,13 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler ( codec_ = codec_factory->create_codec (encoding); } -Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void) +Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler () { // delete kokyu_dispatcher_; } void -Fixed_Priority_Scheduler::shutdown (void) +Fixed_Priority_Scheduler::shutdown () { kokyu_dispatcher_->shutdown (); ACE_DEBUG ((LM_DEBUG, "kokyu DSRT dispatcher shutdown\n")); @@ -233,7 +232,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur const char *, CORBA::Policy_ptr) { - } @@ -571,7 +569,7 @@ Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &) } CORBA::PolicyList* -Fixed_Priority_Scheduler::scheduling_policies (void) +Fixed_Priority_Scheduler::scheduling_policies () { throw CORBA::NO_IMPLEMENT (); } @@ -583,13 +581,13 @@ Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &) } CORBA::PolicyList* -Fixed_Priority_Scheduler::poa_policies (void) +Fixed_Priority_Scheduler::poa_policies () { throw CORBA::NO_IMPLEMENT (); } char * -Fixed_Priority_Scheduler::scheduling_discipline_name (void) +Fixed_Priority_Scheduler::scheduling_discipline_name () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h index 173ad5460a13d..71d2309ef353c 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h @@ -52,7 +52,7 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy, virtual CORBA::Policy_ptr copy (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); virtual void destroy (); @@ -65,15 +65,14 @@ public FP_Scheduling::FP_Scheduler, public ::CORBA::LocalObject { public: - Fixed_Priority_Scheduler (CORBA::ORB_ptr orb, Kokyu::DSRT_Dispatcher_Impl_t, int ace_sched_policy, int ace_sched_scope); - ~Fixed_Priority_Scheduler (void); + ~Fixed_Priority_Scheduler (); - void shutdown (void); + void shutdown (); virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr create_segment_scheduling_parameter ( @@ -126,13 +125,13 @@ public ::CORBA::LocalObject virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void); + virtual CORBA::PolicyList * scheduling_policies (); virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void); + virtual CORBA::PolicyList * poa_policies (); - virtual char * scheduling_discipline_name (void); + virtual char * scheduling_discipline_name (); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, CORBA::Policy_ptr scheduling_parameter); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp index e46604a305c47..2e1a8e98a6dcd 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp @@ -21,7 +21,7 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy ( } MIF_Scheduling::SchedulingParameter -MIF_Sched_Param_Policy::value (void) +MIF_Sched_Param_Policy::value () { return this->value_; } @@ -33,7 +33,7 @@ MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value) } CORBA::Policy_ptr -MIF_Sched_Param_Policy::copy (void) +MIF_Sched_Param_Policy::copy () { MIF_Sched_Param_Policy* tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -45,13 +45,13 @@ MIF_Sched_Param_Policy::copy (void) } CORBA::PolicyType -MIF_Sched_Param_Policy::policy_type (void) +MIF_Sched_Param_Policy::policy_type () { return 0; } void -MIF_Sched_Param_Policy::destroy (void) +MIF_Sched_Param_Policy::destroy () { } @@ -64,7 +64,6 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb, ace_sched_policy_ (ace_sched_policy), ace_sched_scope_ (ace_sched_scope) { - Kokyu::DSRT_ConfigInfo config; config.impl_type_ = this->disp_impl_type_; @@ -102,13 +101,13 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb, codec_ = codec_factory->create_codec (encoding); } -MIF_Scheduler::~MIF_Scheduler (void) +MIF_Scheduler::~MIF_Scheduler () { // delete kokyu_dispatcher_; } void -MIF_Scheduler::shutdown (void) +MIF_Scheduler::shutdown () { kokyu_dispatcher_->shutdown (); ACE_DEBUG ((LM_DEBUG, "kokyu DSRT dispatcher shutdown\n")); @@ -229,7 +228,6 @@ MIF_Scheduler::end_nested_scheduling_segment ( const char *, CORBA::Policy_ptr) { - } @@ -568,7 +566,7 @@ MIF_Scheduler::cancel (const RTScheduling::Current::IdType &) } CORBA::PolicyList* -MIF_Scheduler::scheduling_policies (void) +MIF_Scheduler::scheduling_policies () { throw CORBA::NO_IMPLEMENT (); } @@ -580,13 +578,13 @@ MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &) } CORBA::PolicyList* -MIF_Scheduler::poa_policies (void) +MIF_Scheduler::poa_policies () { throw CORBA::NO_IMPLEMENT (); } char * -MIF_Scheduler::scheduling_discipline_name (void) +MIF_Scheduler::scheduling_discipline_name () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h index bbd078cc7ec7c..987ae99dca67e 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h @@ -43,13 +43,13 @@ public MIF_Scheduling::SchedulingParameterPolicy, MIF_Sched_Param_Policy (); MIF_Sched_Param_Policy (const MIF_Sched_Param_Policy &rhs); - MIF_Scheduling::SchedulingParameter value (void); + MIF_Scheduling::SchedulingParameter value (); void value (const MIF_Scheduling::SchedulingParameter & value); virtual CORBA::Policy_ptr copy (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); virtual void destroy (); @@ -62,19 +62,18 @@ public MIF_Scheduling::Scheduler, public ::CORBA::LocalObject { public: - MIF_Scheduler (CORBA::ORB_ptr orb, Kokyu::DSRT_Dispatcher_Impl_t, int ace_sched_policy, int ace_sched_scope); - ~MIF_Scheduler (void); + ~MIF_Scheduler (); virtual MIF_Scheduling::SchedulingParameterPolicy_ptr create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value); - void shutdown (void); + void shutdown (); virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, @@ -122,13 +121,13 @@ public ::CORBA::LocalObject virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void); + virtual CORBA::PolicyList * scheduling_policies (); virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void); + virtual CORBA::PolicyList * poa_policies (); - virtual char * scheduling_discipline_name (void); + virtual char * scheduling_discipline_name (); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, CORBA::Policy_ptr scheduling_parameter); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp index 2972bb053250e..fe0b50123ccd5 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp @@ -21,7 +21,7 @@ MUF_Sched_Param_Policy::MUF_Sched_Param_Policy ( } MUF_Scheduling::SchedulingParameter -MUF_Sched_Param_Policy::value (void) +MUF_Sched_Param_Policy::value () { return this->value_; } @@ -33,7 +33,7 @@ MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value) } CORBA::Policy_ptr -MUF_Sched_Param_Policy::copy (void) +MUF_Sched_Param_Policy::copy () { MUF_Sched_Param_Policy* tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -45,13 +45,13 @@ MUF_Sched_Param_Policy::copy (void) } CORBA::PolicyType -MUF_Sched_Param_Policy::policy_type (void) +MUF_Sched_Param_Policy::policy_type () { return 0; } void -MUF_Sched_Param_Policy::destroy (void) +MUF_Sched_Param_Policy::destroy () { } @@ -64,7 +64,6 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb, ace_sched_policy_ (ace_sched_policy), ace_sched_scope_ (ace_sched_scope) { - Kokyu::DSRT_ConfigInfo config; config.impl_type_ = this->disp_impl_type_; @@ -103,12 +102,12 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb, codec_ = codec_factory->create_codec (encoding); } -MUF_Scheduler::~MUF_Scheduler (void) +MUF_Scheduler::~MUF_Scheduler () { } void -MUF_Scheduler::shutdown (void) +MUF_Scheduler::shutdown () { kokyu_dispatcher_->shutdown (); ACE_DEBUG ((LM_DEBUG, "kokyu DSRT dispatcher shutdown\n")); @@ -439,7 +438,6 @@ MUF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) void MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { - Kokyu::Svc_Ctxt_DSRT_QoS sc_qos; CORBA::String_var operation = ri->operation (); @@ -618,7 +616,7 @@ MUF_Scheduler::cancel (const RTScheduling::Current::IdType &) } CORBA::PolicyList* -MUF_Scheduler::scheduling_policies (void) +MUF_Scheduler::scheduling_policies () { throw CORBA::NO_IMPLEMENT (); } @@ -630,13 +628,13 @@ MUF_Scheduler::scheduling_policies (const CORBA::PolicyList &) } CORBA::PolicyList* -MUF_Scheduler::poa_policies (void) +MUF_Scheduler::poa_policies () { throw CORBA::NO_IMPLEMENT (); } char * -MUF_Scheduler::scheduling_discipline_name (void) +MUF_Scheduler::scheduling_discipline_name () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h index 1ef90070061db..d493d5d2914a9 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h @@ -59,13 +59,13 @@ public MUF_Scheduling::SchedulingParameterPolicy, MUF_Sched_Param_Policy (); MUF_Sched_Param_Policy (const MUF_Sched_Param_Policy &rhs); - MUF_Scheduling::SchedulingParameter value (void); + MUF_Scheduling::SchedulingParameter value (); void value (const MUF_Scheduling::SchedulingParameter & value); virtual CORBA::Policy_ptr copy (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); virtual void destroy (); @@ -78,19 +78,18 @@ public MUF_Scheduling::Scheduler, public ::CORBA::LocalObject { public: - MUF_Scheduler (CORBA::ORB_ptr orb, Kokyu::DSRT_Dispatcher_Impl_t, int ace_sched_policy, int ace_sched_scope); - ~MUF_Scheduler (void); + ~MUF_Scheduler (); virtual MUF_Scheduling::SchedulingParameterPolicy_ptr create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value); - void shutdown (void); + void shutdown (); virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, @@ -138,13 +137,13 @@ public ::CORBA::LocalObject virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void); + virtual CORBA::PolicyList * scheduling_policies (); virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void); + virtual CORBA::PolicyList * poa_policies (); - virtual char * scheduling_discipline_name (void); + virtual char * scheduling_discipline_name (); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, CORBA::Policy_ptr scheduling_parameter); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp index e266b41624ece..19fc90711e195 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp @@ -5,12 +5,12 @@ #include "Task_Stats.inl" #endif /* __ACE_INLINE__ */ -Base_Time::Base_Time (void) +Base_Time::Base_Time () { base_time_ = ACE_OS::gethrtime (); } -Task_Stats::Task_Stats (void) +Task_Stats::Task_Stats () : base_time_(0), end_time_ (0), max_samples_ (0), @@ -26,7 +26,7 @@ Task_Stats::Task_Stats (void) { } -Task_Stats::~Task_Stats (void) +Task_Stats::~Task_Stats () { delete[] this->thr_run_time_; delete[] this->thr_count_; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h index 841c120565fc6..cf8651bb6de4a 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h @@ -25,7 +25,7 @@ class Kokyu_DSRT_Schedulers_Export Base_Time { public: - Base_Time (void); + Base_Time (); ACE_hrtime_t base_time_; }; @@ -40,10 +40,10 @@ class Kokyu_DSRT_Schedulers_Export Task_Stats { public: /// Constructor - Task_Stats (void); + Task_Stats (); /// Destructor - ~Task_Stats (void); + ~Task_Stats (); /// Init int init (size_t max_samples); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 4ac44575a48a7..fec3e6ec1a527 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp @@ -191,7 +191,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) current = RTScheduling::Current::_narrow (object.in ()); - } Worker worker1 (orb.in (), @@ -284,7 +283,7 @@ Worker::Worker (CORBA::ORB_ptr orb, } int -Worker::svc (void) +Worker::svc () { const char * name = 0; /* diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp index 857c842cd0d5c..60dce97a3fe18 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp @@ -225,7 +225,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { ACE_Time_Value tv(120); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp index b018b6d3ff6a3..3fa1ac61ad830 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp @@ -115,7 +115,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n")); this->orb_->shutdown (false); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h index 7615f7ca6f1f2..04048f621aeb8 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h @@ -34,7 +34,7 @@ class Simple_Server_i : public POA_Simple_Server // = The Simple_Server methods. CORBA::Long test_method (CORBA::Long x); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp index c71fa10bf1169..c58eead73494e 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp @@ -191,7 +191,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) current = RTScheduling::Current::_narrow (object.in ()); - } Worker worker1 (orb.in (), server.in (), current.in (), scheduler, 10, 15); @@ -278,7 +277,7 @@ Worker::Worker (CORBA::ORB_ptr orb, } int -Worker::svc (void) +Worker::svc () { const char * name = 0; /* diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp index 810c7326f99a2..b09e5a3c5d97c 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp @@ -225,7 +225,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { ACE_Time_Value tv(120); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp index a40ae883ebf27..f5b08106a04a5 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp @@ -115,7 +115,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n")); this->orb_->shutdown (false); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h index 7615f7ca6f1f2..04048f621aeb8 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h @@ -34,7 +34,7 @@ class Simple_Server_i : public POA_Simple_Server // = The Simple_Server methods. CORBA::Long test_method (CORBA::Long x); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index 625164d092770..c550dcc65f40f 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -196,7 +196,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) current = RTScheduling::Current::_narrow (object.in ()); - } TimeBase::TimeT deadline; @@ -348,7 +347,7 @@ Worker::Worker (CORBA::ORB_ptr orb, } int -Worker::svc (void) +Worker::svc () { const char * name = 0; /* diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp index 4e2feec4fd519..e94e379de4584 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp @@ -225,7 +225,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { ACE_Time_Value tv(120); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp index a40ae883ebf27..f5b08106a04a5 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp @@ -115,7 +115,7 @@ Simple_Server_i::test_method (CORBA::Long exec_duration) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n")); this->orb_->shutdown (false); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h index 7615f7ca6f1f2..04048f621aeb8 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h @@ -34,7 +34,7 @@ class Simple_Server_i : public POA_Simple_Server // = The Simple_Server methods. CORBA::Long test_method (CORBA::Long x); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp index 208572497ab62..0b75abf340419 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing/Identity_Client.cpp @@ -16,7 +16,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" -Identity_Client::Identity_Client (void) +Identity_Client::Identity_Client () : group_factory_ior_ (0), number_of_invocations_ (5), use_random_ (0) @@ -90,7 +90,7 @@ Identity_Client::init (int argc, } int -Identity_Client::run (void) +Identity_Client::run () { ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized\n")); @@ -176,7 +176,7 @@ Identity_Client::run (void) return 0; } -Identity_Client::~Identity_Client (void) +Identity_Client::~Identity_Client () { } diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h index d5b36de150dad..5610af4904391 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.h +++ b/TAO/examples/Load_Balancing/Identity_Client.h @@ -40,18 +40,17 @@ class Identity_Client { public: - /// Default constructor. - Identity_Client (void); + Identity_Client (); /// Destructor. - ~Identity_Client (void); + ~Identity_Client (); /// Initializes , and parses commandline arguments. int init (int argc, ACE_TCHAR *argv[]); /// See TITLE. - int run (void); + int run (); private: /// Parses the commandline arguments. diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index e6def9c529532..0e0056a4bc541 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -13,7 +13,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -Identity_Server::Identity_Server (void) +Identity_Server::Identity_Server () : group_factory_ior_ (0), random_objects_ (5), rr_objects_ (5) @@ -164,7 +164,7 @@ Identity_Server::create_objects (size_t number_of_objects, } int -Identity_Server::run (void) +Identity_Server::run () { ACE_DEBUG ((LM_DEBUG, "Identity_Server: Initialized\n")); @@ -176,7 +176,7 @@ Identity_Server::run (void) return result; } -Identity_Server::~Identity_Server (void) +Identity_Server::~Identity_Server () { } diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h index 563c49a45b6cd..a065ca77cc2da 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.h +++ b/TAO/examples/Load_Balancing/Identity_Server.h @@ -34,19 +34,18 @@ class Identity_Server { public: - /// Default constructor. - Identity_Server (void); + Identity_Server (); /// Destructor. - ~Identity_Server (void); + ~Identity_Server (); /// Performs all the initializations necessary before going into the /// ORB event loop. int init (int argc, ACE_TCHAR *argv[]); /// Run the server. - int run (void); + int run (); private: /// Parses the commandline arguments. diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp index 9c9806b40caf7..5f2f897ed70d4 100644 --- a/TAO/examples/Load_Balancing/Identity_i.cpp +++ b/TAO/examples/Load_Balancing/Identity_i.cpp @@ -16,7 +16,7 @@ Identity_i::Identity_i (const char *name) { } -Identity_i::~Identity_i (void) +Identity_i::~Identity_i () { } diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h index 2eba466c8f5b2..53d7bbf57c3fe 100644 --- a/TAO/examples/Load_Balancing/Identity_i.h +++ b/TAO/examples/Load_Balancing/Identity_i.h @@ -20,18 +20,16 @@ class Identity_i : // = TITLE // This class implements Identity.idl interface. public: - /// Constructor - initializes the name of this object. Identity_i (const char *name); /// Destructor. - ~Identity_i (void); + ~Identity_i (); /// Returns the name of this object. virtual void get_name (CORBA::String_out name); private: - /// Stores the name of this object. CORBA::String_var name_; }; diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp index 841f74e914901..66c1861d93662 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp @@ -11,11 +11,11 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_time.h" -Object_Group_Factory_i::Object_Group_Factory_i (void) +Object_Group_Factory_i::Object_Group_Factory_i () { } -Object_Group_Factory_i::~Object_Group_Factory_i (void) +Object_Group_Factory_i::~Object_Group_Factory_i () { } @@ -157,13 +157,13 @@ Object_Group_Factory_i::list_groups (int random) } Load_Balancer::Group_List * -Object_Group_Factory_i::round_robin_groups (void) +Object_Group_Factory_i::round_robin_groups () { return list_groups (0); } Load_Balancer::Group_List * -Object_Group_Factory_i::random_groups (void) +Object_Group_Factory_i::random_groups () { return list_groups (1); } @@ -175,7 +175,7 @@ Object_Group_i::Object_Group_i (const char * id, { } -Object_Group_i::~Object_Group_i (void) +Object_Group_i::~Object_Group_i () { // Need to delete all the items from the member_id_list, to avoid // memory leaks. @@ -188,7 +188,7 @@ Object_Group_i::~Object_Group_i (void) } char * -Object_Group_i::id (void) +Object_Group_i::id () { return CORBA::string_dup (id_.c_str ()); } @@ -264,7 +264,7 @@ Object_Group_i::resolve_with_id (const char * id) } Load_Balancer::Member_ID_List * -Object_Group_i::members (void) +Object_Group_i::members () { Load_Balancer::Member_ID_List * list; @@ -291,7 +291,7 @@ Object_Group_i::members (void) } void -Object_Group_i::destroy (void) +Object_Group_i::destroy () { // Deregister with POA. PortableServer::POA_var poa = @@ -315,12 +315,12 @@ Random_Object_Group::Random_Object_Group (const char *id, ACE_OS::srand (static_cast (ACE_OS::time ())); } -Random_Object_Group::~Random_Object_Group (void) +Random_Object_Group::~Random_Object_Group () { } void -Random_Object_Group::destroy (void) +Random_Object_Group::destroy () { //Deregisters this with its // . @@ -330,7 +330,7 @@ Random_Object_Group::destroy (void) } CORBA::Object_ptr -Random_Object_Group::resolve (void) +Random_Object_Group::resolve () { CORBA::Object_var obj; @@ -361,12 +361,12 @@ RR_Object_Group::RR_Object_Group (const char *id, { } -RR_Object_Group::~RR_Object_Group (void) +RR_Object_Group::~RR_Object_Group () { } void -RR_Object_Group::destroy (void) +RR_Object_Group::destroy () { //Deregisters this with its // . @@ -376,7 +376,7 @@ RR_Object_Group::destroy (void) } CORBA::Object_ptr -RR_Object_Group::resolve (void) +RR_Object_Group::resolve () { CORBA::Object_var obj; diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index fd1f91d685cec..dafa78778de32 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -40,10 +40,10 @@ class Object_Group_Factory_i : // public: /// Constructor. - Object_Group_Factory_i (void); + Object_Group_Factory_i (); /// Destructor. - ~Object_Group_Factory_i (void); + ~Object_Group_Factory_i (); // = Load_Balancer::Object_Group_Factory idl methods. @@ -78,7 +78,7 @@ class Object_Group_Factory_i : * a sequence of s of all existing round robin * s created by this factory. */ - Load_Balancer::Group_List * round_robin_groups (void); + Load_Balancer::Group_List * round_robin_groups (); /** * Lists all the random s which were created @@ -86,7 +86,7 @@ class Object_Group_Factory_i : * a sequence of s of all existing random * s created by this factory. */ - Load_Balancer::Group_List * random_groups (void); + Load_Balancer::Group_List * random_groups (); // = Implementation detail methods. @@ -152,12 +152,12 @@ class Object_Group_i : public virtual POA_Load_Balancer::Object_Group Object_Group_Factory_i * my_factory); /// Destructor. - ~Object_Group_i (void); + ~Object_Group_i (); // = Load_Balancer::Object_Group idl methods. /// Get group's id. - char * id (void); + char * id (); /** * Adds a new to the . Note that each @@ -180,7 +180,7 @@ class Object_Group_i : public virtual POA_Load_Balancer::Object_Group * ``round robin.'' If the group contains no members, * exception is thrown. */ - CORBA::Object_ptr resolve (void) = 0; + CORBA::Object_ptr resolve () = 0; /** * Returns an object with the specified . If this @@ -190,7 +190,7 @@ class Object_Group_i : public virtual POA_Load_Balancer::Object_Group CORBA::Object_ptr resolve_with_id (const char * id); /// Return a sequence of s of all of its members. - Load_Balancer::Member_ID_List * members (void); + Load_Balancer::Member_ID_List * members (); /** * Cleanup the resources associated with this . @@ -198,10 +198,9 @@ class Object_Group_i : public virtual POA_Load_Balancer::Object_Group * should become available. * should no longer list this . */ - void destroy (void); + void destroy (); protected: - /// Typedefs for ease of use. typedef ACE_DLList LIST; typedef ACE_DLList_Iterator ITERATOR; @@ -249,11 +248,11 @@ class Random_Object_Group : public Object_Group_i Object_Group_Factory_i *my_factory); /// Destructor. - ~Random_Object_Group (void); + ~Random_Object_Group (); /// Returns a member object from this in accordance with /// the "random" load balancing policy. - CORBA::Object_ptr resolve (void); + CORBA::Object_ptr resolve (); /** * Cleanup the resources associated with this . @@ -261,7 +260,7 @@ class Random_Object_Group : public Object_Group_i * should become available. * should no longer list this . */ - void destroy (void); + void destroy (); }; /** @@ -273,13 +272,12 @@ class Random_Object_Group : public Object_Group_i class RR_Object_Group: public Object_Group_i { public: - /// Constructor. RR_Object_Group (const char *id, Object_Group_Factory_i *my_factory); /// Destructor. - ~RR_Object_Group (void); + ~RR_Object_Group (); /** * We need to override the implementation of from @@ -290,7 +288,7 @@ class RR_Object_Group: public Object_Group_i /// Returns a member object from this in accordance with /// the "round robin" load balancing policy. - CORBA::Object_ptr resolve (void); + CORBA::Object_ptr resolve (); /** * Cleanup the resources associated with this . @@ -298,10 +296,9 @@ class RR_Object_Group: public Object_Group_i * should become available. * should no longer list this . */ - void destroy (void); + void destroy (); private: - /// Index into the Object_Group_i::member_id_list_: keeps track of /// the member_id to return on the next invocation of . size_t next_; diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp index 0cb1fc165bac0..f6968916ddfe6 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp @@ -13,7 +13,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -Load_Balancing_Service::Load_Balancing_Service (void) +Load_Balancing_Service::Load_Balancing_Service () : ior_output_file_ (0) { } @@ -105,9 +105,8 @@ Load_Balancing_Service::init (int argc, } - int -Load_Balancing_Service::run (void) +Load_Balancing_Service::run () { ACE_DEBUG ((LM_DEBUG, "Load_Balancer: Initialized\n")); @@ -119,7 +118,7 @@ Load_Balancing_Service::run (void) return result; } -Load_Balancing_Service::~Load_Balancing_Service (void) +Load_Balancing_Service::~Load_Balancing_Service () { } diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h index db53e83d4bc00..10064e4eb3fd5 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h @@ -30,19 +30,18 @@ class Load_Balancing_Service { public: - /// Default constructor. - Load_Balancing_Service (void); + Load_Balancing_Service (); /// Destructor. - ~Load_Balancing_Service (void); + ~Load_Balancing_Service (); /// Initialize the : initializes the ORB, parses /// arguments, creates a servant ... int init (int argc, ACE_TCHAR *argv[]); /// Run the server. - int run (void); + int run (); private: /// Parses the commandline arguments. diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index 282a235b96381..76b8468619144 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp @@ -15,7 +15,7 @@ #include "ace/High_Res_Timer.h" #include "ace/Stats.h" -Identity_Client::Identity_Client (void) +Identity_Client::Identity_Client () : group_factory_ior_ (0), number_of_invocations_ (5), use_random_ (0), @@ -92,7 +92,7 @@ Identity_Client::init (int argc, ACE_TCHAR* argv[]) } int -Identity_Client::run (void) +Identity_Client::run () { // Contact the to obtain an . CORBA::ORB_var orb = orb_manager_.orb (); @@ -155,7 +155,6 @@ Identity_Client::run (void) // Record statistics. throughput.sample (now - throughput_base, now - latency_base); - } ACE_OS::printf ("*=*=*=*=Aggregated result *=*=*=*=*=\n"); @@ -208,13 +207,12 @@ Identity_Client::run (void) ACE_DEBUG ((LM_DEBUG, "Invocation %s\n", identity.in ())); - } return 0; } -Identity_Client::~Identity_Client (void) +Identity_Client::~Identity_Client () { } diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h index 88992c2dae65d..98dffd43a45f2 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h @@ -40,18 +40,17 @@ class Identity_Client { public: - /// Default constructor. - Identity_Client (void); + Identity_Client (); /// Destructor. - ~Identity_Client (void); + ~Identity_Client (); /// Initializes , and parses commandline arguments. int init (int argc, ACE_TCHAR *argv[]); /// See TITLE. - int run (void); + int run (); private: /// Parses the commandline arguments. diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index e6a4069813d42..ace0fe75317c5 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -4,7 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -Identity_Server::Identity_Server (void) +Identity_Server::Identity_Server () : group_factory_ior_ (0), random_objects_ (5), rr_objects_ (5) @@ -99,11 +99,8 @@ Identity_Server::init (int argc, } int -Identity_Server::register_groups (void) +Identity_Server::register_groups () { - - - // Contact the to create 2 // s, one random and one rr. CORBA::ORB_var orb = orb_manager_.orb (); @@ -217,12 +214,11 @@ Identity_Server::create_objects (size_t number_of_objects, // Bind the servant in the random . group->bind (member); - } } int - Identity_Server::run (void) + Identity_Server::run () { int result; @@ -231,7 +227,7 @@ int return result; } -Identity_Server::~Identity_Server (void) +Identity_Server::~Identity_Server () { } diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h index 7711e40f516f5..1ee2731d5073e 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h @@ -34,12 +34,11 @@ class Identity_Server { public: - /// Default constructor. - Identity_Server (void); + Identity_Server (); /// Destructor. - ~Identity_Server (void); + ~Identity_Server (); /// Parses the commandline arguments. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -48,15 +47,13 @@ class Identity_Server /// ORB event loop. int init (int argc, ACE_TCHAR *argv[]); - int register_groups (void); + int register_groups (); /// Run the server. - int run (void); + int run (); private: - - /** * Creates the specified number of identity objects, and registers * each one with the provided . Identity servants are diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp index 10be44939a27b..c1e8c37dd2eaf 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp @@ -18,7 +18,7 @@ Identity_i::Identity_i (const char *name, { } -Identity_i::~Identity_i (void) +Identity_i::~Identity_i () { } @@ -29,7 +29,7 @@ Identity_i::get_name (CORBA::String_out name) } PortableServer::POA_ptr -Identity_i::_default_POA (void) +Identity_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h index cf6a00086677d..d9b538bd63a89 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h @@ -20,23 +20,21 @@ class Identity_i : // = TITLE // This class implements Identity.idl interface. public: - /// Constructor - initializes the name of this object. Identity_i (const char *name, PortableServer::POA_ptr poa); /// Destructor. - ~Identity_i (void); + ~Identity_i (); /// Returns the name of this object. virtual void get_name (CORBA::String_out name); /// Method for the POA that will return the persistent POA_ptr stored /// in here.. - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: - /// Stores the name of this object. CORBA::String_var name_; diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 24294b84f8a12..787623fdf5175 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -32,13 +32,13 @@ Object_Group_Factory_i::Object_Group_Factory_i (CORBA::ORB_ptr orb, &options)); } -Object_Group_Factory_i::~Object_Group_Factory_i (void) +Object_Group_Factory_i::~Object_Group_Factory_i () { delete this->mem_pool_; } PortableServer::POA_ptr -Object_Group_Factory_i::_default_POA (void) +Object_Group_Factory_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -47,7 +47,6 @@ Object_Group_Factory_i::_default_POA (void) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_round_robin (const char * id) { - void *tmp_rr (0); if (this->mem_pool_->find (rr_name_bind, @@ -121,7 +120,6 @@ Object_Group_Factory_i::unbind_round_robin (const char * id) // Bump down the flags value --this->flags_; - } Load_Balancer::Object_Group_ptr @@ -229,7 +227,6 @@ Object_Group_Factory_i::make_group (int random, } - // As we are sure that it is not in the list go ahead and insert it if (random) ACE_NEW_THROW_EX (group_servant, @@ -285,7 +282,6 @@ Object_Group_Factory_i::make_group (int random, } - // Update the value of flags_ this->update_flags (random); @@ -295,7 +291,6 @@ Object_Group_Factory_i::make_group (int random, // dynamically allocated memory. this->mem_pool_->free ((void *) ptr); throw Load_Balancer::duplicate_group (); - } // Return. @@ -308,9 +303,6 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::resolve (const char * id) { - - - #if defined (DOORS_MEASURE_STATS) // Time the calls // Record the entry time. @@ -357,7 +349,6 @@ Object_Group_Factory_i::resolve (const char * id) ACE_TEXT ("(%N|%l) The factory does not have any references ") ACE_TEXT ("to the group that you have sought \n\n")), 0); - } } @@ -389,7 +380,6 @@ Object_Group_Factory_i::resolve (const char * id) object_group = Load_Balancer::Object_Group::_narrow (objref.in ()); - #if defined (DOORS_MEASURE_STATS) // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -448,13 +438,13 @@ Object_Group_Factory_i::list_groups (int random) } Load_Balancer::Group_List * -Object_Group_Factory_i::round_robin_groups (void) +Object_Group_Factory_i::round_robin_groups () { return list_groups (0); } Load_Balancer::Group_List * -Object_Group_Factory_i::random_groups (void) +Object_Group_Factory_i::random_groups () { return list_groups (1); } @@ -506,12 +496,11 @@ Object_Group_Factory_i::update_flags (int random) if (!random) *(this->flags_) = 3; break; - } } void -Object_Group_Factory_i::update_objects (void) +Object_Group_Factory_i::update_objects () { // Create an appropriate servant. Object_Group_i * group_servant = 0; @@ -563,7 +552,6 @@ Object_Group_i::Object_Group_i (const char * id, id_ (id), allocator_ (0) { - if (!this->allocator_) { ACE_MMAP_Memory_Pool::OPTIONS options (ACE_DEFAULT_BASE_ADDR); @@ -575,7 +563,7 @@ Object_Group_i::Object_Group_i (const char * id, } -Object_Group_i::~Object_Group_i (void) +Object_Group_i::~Object_Group_i () { // Need to delete all the items from the member_id_list, to avoid // memory leaks. @@ -591,14 +579,14 @@ Object_Group_i::~Object_Group_i (void) PortableServer::POA_ptr -Object_Group_i::_default_POA (void) +Object_Group_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } char * -Object_Group_i::id (void) +Object_Group_i::id () { return CORBA::string_dup (id_.c_str ()); } @@ -606,7 +594,6 @@ Object_Group_i::id (void) void Object_Group_i::bind (const Load_Balancer::Member & member) { - if (this->members_ == 0) { ACE_CString id = this->id (); @@ -634,7 +621,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member) { ACE_ERROR ((LM_ERROR, "Unable to bind\n")); - } } } @@ -756,7 +742,6 @@ Object_Group_i::unbind (const char * id) } - Object_Group_i::ITERATOR iter (*(this->member_id_list_)); while (ACE_OS::strcmp (id,*(iter.next ()))) @@ -780,11 +765,10 @@ Object_Group_i::resolve_with_id (const char * id) char *retn_ptr = CORBA::string_dup (ior.in ()); return retn_ptr; - } Load_Balancer::Member_ID_List * -Object_Group_i::members (void) +Object_Group_i::members () { Load_Balancer::Member_ID_List * list = 0; @@ -815,7 +799,7 @@ Object_Group_i::members (void) } void -Object_Group_i::destroy (void) +Object_Group_i::destroy () { // Deregister with POA. PortableServer::POA_var poa = @@ -828,7 +812,7 @@ Object_Group_i::destroy (void) } void -Object_Group_i::read_from_memory (void) +Object_Group_i::read_from_memory () { // Sanity check needs to be done in all the places ACE_CString id = this->id (); @@ -883,9 +867,8 @@ Random_Object_Group::Random_Object_Group (const char *id, } char * -Random_Object_Group::resolve (void) +Random_Object_Group::resolve () { - this->read_from_memory (); size_t group_size = this->members_->current_size (); @@ -919,7 +902,7 @@ RR_Object_Group::RR_Object_Group (const char *id, } char * -RR_Object_Group::resolve (void) +RR_Object_Group::resolve () { char *objref = 0; @@ -953,7 +936,6 @@ RR_Object_Group::resolve (void) void RR_Object_Group::unbind (const char *id) { - if (this->members_ == 0) { ACE_CString id = this->id (); diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index cd60a1a87f76e..76defd00883c6 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h @@ -53,12 +53,12 @@ class Object_Group_Factory_i : PortableServer::POA_ptr poa); /// Destructor. - ~Object_Group_Factory_i (void); + ~Object_Group_Factory_i (); /// Method for the POA that will return the persistent POA_ptr stored /// in here.. - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); // = Load_Balancer::Object_Group_Factory idl methods. @@ -98,7 +98,7 @@ class Object_Group_Factory_i : * a sequence of s of all existing round robin * s created by this factory. */ - Load_Balancer::Group_List * round_robin_groups (void); + Load_Balancer::Group_List * round_robin_groups (); /** * Lists all the random s which were created @@ -106,10 +106,9 @@ class Object_Group_Factory_i : * a sequence of s of all existing random * s created by this factory. */ - Load_Balancer::Group_List * random_groups (void); + Load_Balancer::Group_List * random_groups (); private: - /// Our ORB CORBA::ORB_var orb_; @@ -139,7 +138,7 @@ class Object_Group_Factory_i : /// This rolls back the status of the objects in the POA if the /// service had failed.. - void update_objects (void); + void update_objects (); /// Map containing all random s created by this factory. HASH_MAP *random_groups_; @@ -163,7 +162,6 @@ class Object_Group_Factory_i : CORBA::Short *flags_; ACE_Throughput_Stats throughput_; - }; class Object_Group_i @@ -187,16 +185,16 @@ class Object_Group_i PortableServer::POA_ptr poa); /// Destructor. - ~Object_Group_i (void); + ~Object_Group_i (); // Persistent POA // Method for the POA - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); // = Load_Balancer::Object_Group idl methods. /// Get group's id. - char * id (void); + char * id (); /** * Adds a new to the . Note that each @@ -219,7 +217,7 @@ class Object_Group_i * ``round robin.'' If the group contains no members, * exception is thrown. */ - char * resolve (void) = 0; + char * resolve () = 0; /** * Returns an object with the specified . If this @@ -229,7 +227,7 @@ class Object_Group_i char * resolve_with_id (const char * id); /// Return a sequence of s of all of its members. - Load_Balancer::Member_ID_List * members (void); + Load_Balancer::Member_ID_List * members (); /** * Cleanup the resources associated with this . @@ -237,13 +235,12 @@ class Object_Group_i * should become available. * should no longer list this . */ - void destroy (void); + void destroy (); protected: - /// This will replenish all the pointers that could have been lost /// because of failure - void read_from_memory (void); + void read_from_memory (); /// Our POA PortableServer::POA_var poa_; @@ -288,8 +285,7 @@ class Random_Object_Group : public Object_Group_i /// Returns a member object from this in accordance with /// the "random" load balancing policy. - char * resolve (void); - + char * resolve (); }; /** @@ -301,7 +297,6 @@ class Random_Object_Group : public Object_Group_i class RR_Object_Group: public Object_Group_i { public: - /// Constructor. RR_Object_Group (const char *id, PortableServer::POA_ptr poa); @@ -315,10 +310,9 @@ class RR_Object_Group: public Object_Group_i /// Returns a member object from this in accordance with /// the "round robin" load balancing policy. - char * resolve (void); + char * resolve (); private: - /// Index into the Object_Group_i::member_id_list_: keeps track of /// the member_id to return on the next invocation of . size_t next_; diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index f22a46aea6ada..f758ba108736c 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp @@ -13,7 +13,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -Load_Balancing_Service::Load_Balancing_Service (void) +Load_Balancing_Service::Load_Balancing_Service () : ior_output_file_ (0) { } @@ -135,9 +135,8 @@ Load_Balancing_Service::init (int argc, ACE_TCHAR* argv[]) } - int -Load_Balancing_Service::run (void) +Load_Balancing_Service::run () { int result; @@ -146,7 +145,7 @@ Load_Balancing_Service::run (void) return result; } -Load_Balancing_Service::~Load_Balancing_Service (void) +Load_Balancing_Service::~Load_Balancing_Service () { } diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h index e4a86a1239766..b5c84935631a4 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h @@ -30,19 +30,18 @@ class Load_Balancing_Service { public: - /// Default constructor. - Load_Balancing_Service (void); + Load_Balancing_Service (); /// Destructor. - ~Load_Balancing_Service (void); + ~Load_Balancing_Service (); /// Initialize the : initializes the ORB, parses /// arguments, creates a servant ... int init (int argc, ACE_TCHAR *argv[]); /// Run the server. - int run (void); + int run (); private: /// Parses the commandline arguments. diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp index 765a792642e97..c5157ae2c9991 100644 --- a/TAO/examples/Logging/Logger_i.cpp +++ b/TAO/examples/Logging/Logger_i.cpp @@ -6,11 +6,11 @@ #include "ace/Log_Record.h" #include "ace/os_include/os_netdb.h" -Logger_Factory_i::Logger_Factory_i (void) +Logger_Factory_i::Logger_Factory_i () { } -Logger_Factory_i::~Logger_Factory_i (void) +Logger_Factory_i::~Logger_Factory_i () { } @@ -68,7 +68,7 @@ Logger_i::Logger_i (const char *name) // Do nothing } -Logger_i::~Logger_i (void) +Logger_i::~Logger_i () { ACE_OS::free (this->name_); } diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h index 2b94f5ab54074..3bb8414a11e4f 100644 --- a/TAO/examples/Logging/Logger_i.h +++ b/TAO/examples/Logging/Logger_i.h @@ -31,7 +31,7 @@ class Logger_i : public virtual POA_Logger Logger_i (const char* name); /// destructor - virtual ~Logger_i (void); + virtual ~Logger_i (); /// Writes the to the standard output. virtual void log (const Logger::Log_Record &log_rec); @@ -82,10 +82,10 @@ class Logger_Factory_i : public virtual POA_Logger_Factory { public: /// Constructor. - Logger_Factory_i (void); + Logger_Factory_i (); /// Destructor. - ~Logger_Factory_i (void); + ~Logger_Factory_i (); /** * This function returns a logger with name . If is diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp index 01068f6bfab28..537c81cde119e 100644 --- a/TAO/examples/Logging/Logging_Service_i.cpp +++ b/TAO/examples/Logging/Logging_Service_i.cpp @@ -1,14 +1,14 @@ #include "Logging_Service_i.h" #include "tao/debug.h" -Logger_Server::Logger_Server (void) +Logger_Server::Logger_Server () :service_name_ (ACE_TEXT("LoggingService")) { // Do nothing } int -Logger_Server::parse_args (void) +Logger_Server::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:")); int c; @@ -112,7 +112,7 @@ Logger_Server::init_naming_service () } int -Logger_Server::run (void) +Logger_Server::run () { int ret = this->orb_manager_.run (); if (ret == -1) @@ -122,7 +122,7 @@ Logger_Server::run (void) return 0; } -Logger_Server::~Logger_Server (void) +Logger_Server::~Logger_Server () { // Do nothing } diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h index 72aec50c78e02..f5b07aab74f78 100644 --- a/TAO/examples/Logging/Logging_Service_i.h +++ b/TAO/examples/Logging/Logging_Service_i.h @@ -43,17 +43,17 @@ class Logger_Server { public: /// Constructor. - Logger_Server (void); + Logger_Server (); /// Destructor. - ~Logger_Server (void); + ~Logger_Server (); /// Initialize the Logger_Server state - parsing arguments and ... int init (int argc, ACE_TCHAR **argv); /// Run the ORB. - int run (void); + int run (); /// This function creates and returns a logger with the given . /// Currently, is unused. @@ -61,11 +61,11 @@ class Logger_Server private: /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// Initialises the name server and registers logger_factory with the /// name server. - int init_naming_service (void); + int init_naming_service (); /// The ORB manager. TAO_ORB_Manager orb_manager_; diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp index 83fe0565eb737..d85983cd541dd 100644 --- a/TAO/examples/Logging/Logging_Test.cpp +++ b/TAO/examples/Logging/Logging_Test.cpp @@ -13,5 +13,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; return logger_client.run (); - } diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index 865adcf7d5526..60597175a72fd 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -10,13 +10,13 @@ #include "ace/OS_NS_sys_time.h" // Constructor - Logger_Client::Logger_Client (void) + Logger_Client::Logger_Client () { // Do nothing } // Destructor -Logger_Client::~Logger_Client (void) +Logger_Client::~Logger_Client () { // Do nothing } @@ -67,11 +67,10 @@ Logger_Client::init (int argc, ACE_TCHAR *argv[]) } return 0; - } int -Logger_Client::init_naming_service (void) +Logger_Client::init_naming_service () { // Initialize the naming services if (my_name_client_.init (orb_.in ()) != 0) @@ -125,7 +124,7 @@ Logger_Client::init_naming_service (void) } int -Logger_Client::init_loggers (void) +Logger_Client::init_loggers () { // Retrieve the Logger obj ref corresponding to key1 and // key2. @@ -175,7 +174,7 @@ Logger_Client::init_loggers (void) // Execute client example code. int -Logger_Client::run (void) +Logger_Client::run () { try { @@ -262,7 +261,7 @@ Logger_Client::run (void) // Parses the command line arguments and returns an error status. int -Logger_Client::parse_args (void) +Logger_Client::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("d")); int c; diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h index 4ea1d598921ed..e151e38c9b496 100644 --- a/TAO/examples/Logging/Logging_Test_i.h +++ b/TAO/examples/Logging/Logging_Test_i.h @@ -41,20 +41,20 @@ class Logger_Client { public: /// Constructor. - Logger_Client (void); + Logger_Client (); /// Destructor. - ~Logger_Client (void); + ~Logger_Client (); /// Initialize the client communication endpoint with server. int init (int argc, ACE_TCHAR **argv); /// Execute client example code. - int run (void); + int run (); private: /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// Prepares the for logging. void init_record (Logger::Log_Record &newrec, @@ -62,10 +62,10 @@ class Logger_Client const char *msg); /// Initialises the name server and resolves the logger_factory - int init_naming_service (void); + int init_naming_service (); /// Instantiates the 2 logger member variables - int init_loggers (void); + int init_loggers (); /// Shows contents of the record (for debugging purposes). void show_record (Logger::Log_Record &newrec); diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp index 8c2475d30d249..f760acfdf4c75 100644 --- a/TAO/examples/OBV/Simple_util.cpp +++ b/TAO/examples/OBV/Simple_util.cpp @@ -13,21 +13,21 @@ // Constructor. template -Server::Server (void) +Server::Server () : ior_output_file_ (0) { } // Destructor. template -Server::~Server (void) +Server::~Server () { } // Parse the command-line arguments and set options. template int -Server::parse_args (void) +Server::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:ni:")); int c = 0; @@ -124,7 +124,7 @@ Server::init (const char *servant_name, } template int -Server::run (void) +Server::run () { // Run the main event loop for the ORB. if (this->orb_manager_.run () == -1) @@ -136,7 +136,7 @@ Server::run (void) } template int -Server::register_name (void) +Server::register_name () { return -1; } @@ -144,7 +144,7 @@ Server::register_name (void) // Constructor. template -Client::Client (void) +Client::Client () : ior_ (0) { //no-op @@ -183,7 +183,7 @@ Client::read_ior (ACE_TCHAR *filename) // Parses the command line arguments and returns an error status. template int -Client::parse_args (void) +Client::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:nk:x")); int c = 0; @@ -216,7 +216,7 @@ Client::parse_args (void) } template -Client::~Client (void) +Client::~Client () { ACE_OS::free (this->ior_); } @@ -230,7 +230,6 @@ Client::init (const char *name, this->argv_ = argv; - try { // Retrieve the ORB. @@ -259,8 +258,6 @@ Client::init (const char *name, ACE_ERROR_RETURN ((LM_ERROR, "no ior or naming options specified\n"), -1); - - } catch (const CORBA::Exception& ex) { @@ -274,9 +271,8 @@ Client::init (const char *name, template int -Client::obtain_initial_references (void) +Client::obtain_initial_references () { - return 0; } diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h index 856ed38c13b83..32bfe42a5ae94 100644 --- a/TAO/examples/OBV/Simple_util.h +++ b/TAO/examples/OBV/Simple_util.h @@ -35,10 +35,10 @@ class Server { public: /// Constructor. - Server (void); + Server (); /// Destructor. - ~Server (void); + ~Server (); /// Initialize the Server state - parsing arguments and waiting. /// interface_name is the name used to register the Servant. @@ -48,10 +48,10 @@ class Server /// After calling , this method will register the server with /// the TAO Naming Service using the servant_name passed to . - int register_name (void); + int register_name (); /// Run the orb. - int run (void); + int run (); protected: /// Servant class @@ -61,7 +61,7 @@ class Server const char *name; /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// The ORB manager - a helper class for accessing the POA and /// registering objects. @@ -94,10 +94,10 @@ class Client { public: /// Constructor. - Client (void); + Client (); /// Destructor. - ~Client (void); + ~Client (); /// Initialize the client communication endpoint with server. int init (const char *name,int argc, ACE_TCHAR *argv[]); @@ -112,14 +112,14 @@ class Client void shutdown (int); /// Initialize naming service - int obtain_initial_references (void); + int obtain_initial_references (); protected: /// Function to read the server IOR from a file. int read_ior (ACE_TCHAR *filename); /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); // TAO_Naming_Client namingClient; // helper class for getting access to Naming Service. @@ -147,14 +147,8 @@ class Client /// Flag for shutting down the server int shutdown_; - }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Simple_util.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_UTIL_H */ diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp index 008cfcda06e33..54ee02013ee19 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp @@ -77,7 +77,6 @@ Checkpoint_Client_i::run (const char *name, if (checkpoint.shutdown () == 1) checkpoint->shutdown (); - } catch (const CORBA::Exception& ex) { @@ -89,13 +88,13 @@ Checkpoint_Client_i::run (const char *name, } // Constructor. -Checkpoint_Client_i::Checkpoint_Client_i (void) +Checkpoint_Client_i::Checkpoint_Client_i () { //no-op } //Destructor. -Checkpoint_Client_i::~Checkpoint_Client_i (void) +Checkpoint_Client_i::~Checkpoint_Client_i () { //no-op } diff --git a/TAO/examples/OBV/Typed_Events/Client_i.h b/TAO/examples/OBV/Typed_Events/Client_i.h index 31663db5ee6df..0be2eeffcfac9 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.h +++ b/TAO/examples/OBV/Typed_Events/Client_i.h @@ -33,10 +33,10 @@ class Checkpoint_Client_i { public: /// Constructor - Checkpoint_Client_i (void); + Checkpoint_Client_i (); /// Destructor - virtual ~Checkpoint_Client_i (void); + virtual ~Checkpoint_Client_i (); /// Execute the methods virtual int run (const char *,int, ACE_TCHAR** ); diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp index 7ce46031ad812..a52f9f7530a19 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp @@ -17,7 +17,7 @@ Event_impl::~Event_impl () } ::CORBA::ValueBase * -Event_impl::_copy_value (void) +Event_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -25,7 +25,7 @@ Event_impl::_copy_value (void) } void -Event_impl::do_print (void) +Event_impl::do_print () { ACE_DEBUG((LM_DEBUG, "(time %d origin %d) ", (CORBA::ULong) this->time_(), @@ -38,7 +38,7 @@ Event_factory::~Event_factory () } TAO_OBV_CREATE_RETURN_TYPE (Event) -Event_factory::create_for_unmarshal (void) +Event_factory::create_for_unmarshal () { return new Event_impl; } @@ -60,7 +60,7 @@ Temperature_impl::~Temperature_impl () } ::CORBA::ValueBase * -Temperature_impl::_copy_value (void) +Temperature_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -68,7 +68,7 @@ Temperature_impl::_copy_value (void) } void -Temperature_impl::do_print (void) +Temperature_impl::do_print () { // The timestamp Event_impl::do_print (); @@ -81,7 +81,7 @@ Temperature_factory::~Temperature_factory () } TAO_OBV_CREATE_RETURN_TYPE (Temperature) -Temperature_factory::create_for_unmarshal (void) +Temperature_factory::create_for_unmarshal () { return new Temperature_impl; } @@ -103,7 +103,7 @@ Position_impl::~Position_impl () } ::CORBA::ValueBase * -Position_impl::_copy_value (void) +Position_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -111,7 +111,7 @@ Position_impl::_copy_value (void) } void -Position_impl::do_print (void) +Position_impl::do_print () { // The timestamp Event_impl::do_print (); @@ -126,7 +126,7 @@ Position_impl::do_print (void) x, y, z)); } -CORBA::Float Position_impl::x (void) +CORBA::Float Position_impl::x () { return this->xyz()[0]; } @@ -136,7 +136,7 @@ void Position_impl::x (CORBA::Float x) this->xyz()[0] = x; } -CORBA::Float Position_impl::y (void) +CORBA::Float Position_impl::y () { return this->xyz()[1]; } @@ -146,7 +146,7 @@ void Position_impl::y (CORBA::Float y) this->xyz()[1] = y; } -CORBA::Float Position_impl::z (void) +CORBA::Float Position_impl::z () { return this->xyz()[2]; } @@ -161,7 +161,7 @@ Position_factory::~Position_factory () } TAO_OBV_CREATE_RETURN_TYPE (Position) -Position_factory::create_for_unmarshal (void) +Position_factory::create_for_unmarshal () { return new Position_impl; } @@ -183,7 +183,7 @@ Log_Msg_impl::~Log_Msg_impl () } ::CORBA::ValueBase * -Log_Msg_impl::_copy_value (void) +Log_Msg_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -191,7 +191,7 @@ Log_Msg_impl::_copy_value (void) } void -Log_Msg_impl::do_print (void) +Log_Msg_impl::do_print () { // The timestamp Event_impl::do_print (); @@ -211,7 +211,7 @@ Log_Msg_factory::~Log_Msg_factory () } TAO_OBV_CREATE_RETURN_TYPE (Log_Msg) -Log_Msg_factory::create_for_unmarshal (void) +Log_Msg_factory::create_for_unmarshal () { return new Log_Msg_impl; } @@ -240,7 +240,7 @@ Event_List_Link_impl::~Event_List_Link_impl () } ::CORBA::ValueBase * -Event_List_Link_impl::_copy_value (void) +Event_List_Link_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -248,13 +248,13 @@ Event_List_Link_impl::_copy_value (void) } Event* -Event_List_Link_impl::get_event (void) +Event_List_Link_impl::get_event () { return this->my_event (); } Event_List_Link* -Event_List_Link_impl::get_next_link (void) +Event_List_Link_impl::get_next_link () { return this->next (); } @@ -270,26 +270,26 @@ Event_List_Link_factory::~Event_List_Link_factory () } TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link) -Event_List_Link_factory::create_for_unmarshal (void) +Event_List_Link_factory::create_for_unmarshal () { return new Event_List_Link_impl; } // Event_List implementation =================================== -Event_List_impl::Event_List_impl (void) +Event_List_impl::Event_List_impl () { this->first_link (0); this->last_link_cache_ = 0; } -Event_List_impl::~Event_List_impl (void) +Event_List_impl::~Event_List_impl () { // Destructor does nothing explicit, because the _var types do care. } ::CORBA::ValueBase * -Event_List_impl::_copy_value (void) +Event_List_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -337,12 +337,12 @@ Event_List_impl::store_event (Event* e) } } -Event_List_factory::~Event_List_factory (void) +Event_List_factory::~Event_List_factory () { } TAO_OBV_CREATE_RETURN_TYPE (Event_List) -Event_List_factory::create_for_unmarshal (void) +Event_List_factory::create_for_unmarshal () { return new Event_List_impl; } @@ -352,12 +352,12 @@ Event_List_Iterator::Event_List_Iterator (Event_List *list) this->init (list); } -Event_List_Iterator::Event_List_Iterator (void) +Event_List_Iterator::Event_List_Iterator () { // current_ is a _var and set itself to null. } -Event_List_Iterator::~Event_List_Iterator (void) +Event_List_Iterator::~Event_List_Iterator () { // nothing } @@ -428,7 +428,7 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl () } ::CORBA::ValueBase * -Temperature_Criterion_impl::_copy_value (void) +Temperature_Criterion_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -452,7 +452,7 @@ Temperature_Criterion_impl::is_critical (Event* e) } void -Temperature_Criterion_impl::do_print (void) +Temperature_Criterion_impl::do_print () { ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n", this->origin_id_ () )); @@ -464,7 +464,7 @@ Temperature_Criterion_factory::~Temperature_Criterion_factory () } TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) -Temperature_Criterion_factory::create_for_unmarshal (void) +Temperature_Criterion_factory::create_for_unmarshal () { return new Temperature_Criterion_impl; } @@ -487,7 +487,7 @@ Position_Criterion_impl::~Position_Criterion_impl () } ::CORBA::ValueBase * -Position_Criterion_impl::_copy_value (void) +Position_Criterion_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -529,7 +529,7 @@ Position_Criterion_factory::~Position_Criterion_factory () } TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion) -Position_Criterion_factory::create_for_unmarshal (void) +Position_Criterion_factory::create_for_unmarshal () { return new Position_Criterion_impl; } @@ -543,7 +543,7 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl () } ::CORBA::ValueBase * -Log_Msg_Criterion_impl::_copy_value (void) +Log_Msg_Criterion_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -564,7 +564,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e) } void -Log_Msg_Criterion_impl::do_print (void) +Log_Msg_Criterion_impl::do_print () { ACE_DEBUG((LM_DEBUG, "All log messages with urgency greater zero are registered.\n" )); @@ -575,7 +575,7 @@ Log_Msg_Criterion_factory::~Log_Msg_Criterion_factory () } TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion) -Log_Msg_Criterion_factory::create_for_unmarshal (void) +Log_Msg_Criterion_factory::create_for_unmarshal () { return new Log_Msg_Criterion_impl; } @@ -596,7 +596,7 @@ Criterion_List_impl::~Criterion_List_impl () } ::CORBA::ValueBase * -Criterion_List_impl::_copy_value (void) +Criterion_List_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h index 93657769e9909..3f9b7213a567b 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h @@ -48,9 +48,9 @@ class Event_impl : public virtual OBV_Event, public: Event_impl (); virtual ~Event_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); - virtual void do_print (void); + virtual void do_print (); // Implementation of the do_print () operation the valuetype should have. // All operations in valuetypes are virtual. @@ -85,7 +85,7 @@ class Event_factory : public CORBA::ValueFactoryBase virtual ~Event_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (); }; #endif /* is not defined */ @@ -119,9 +119,9 @@ class Temperature_impl : public virtual OBV_Temperature, // But it is more simple to do so here. virtual ~Temperature_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); - virtual void do_print (void); + virtual void do_print (); // Overrides Event_impl::do_print (). Note that a new declaration // in IDL in a derived class is not allowed. }; @@ -137,7 +137,7 @@ class Temperature_factory : public CORBA::ValueFactoryBase virtual ~Temperature_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal (); }; // Position implementation classes ===================================== @@ -149,17 +149,17 @@ class Position_impl : public virtual OBV_Position, Position_impl (); Position_impl (Point &p); virtual ~Position_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); - virtual CORBA::Float x (void); + virtual CORBA::Float x (); virtual void x (CORBA::Float); - virtual CORBA::Float y (void); + virtual CORBA::Float y (); virtual void y (CORBA::Float); - virtual CORBA::Float z (void); + virtual CORBA::Float z (); virtual void z (CORBA::Float); //These are the attributes - virtual void do_print (void); + virtual void do_print (); }; class Position_factory : public CORBA::ValueFactoryBase @@ -173,7 +173,7 @@ class Position_factory : public CORBA::ValueFactoryBase virtual ~Position_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Position) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Position) create_for_unmarshal (); }; // Log_Msg implementation classes ===================================== @@ -185,9 +185,9 @@ class Log_Msg_impl : public virtual OBV_Log_Msg, Log_Msg_impl (); Log_Msg_impl (CORBA::Short urgency_p, const char *message_p); virtual ~Log_Msg_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); - virtual void do_print (void); + virtual void do_print (); }; class Log_Msg_factory : public CORBA::ValueFactoryBase @@ -201,7 +201,7 @@ class Log_Msg_factory : public CORBA::ValueFactoryBase virtual ~Log_Msg_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Log_Msg) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Log_Msg) create_for_unmarshal (); }; // Event_List_Link implementation classes ===================================== @@ -220,12 +220,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link, Event_List_Link_impl (); Event_List_Link_impl (Event *e); virtual ~Event_List_Link_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); - Event *get_event (void); + Event *get_event (); private: - Event_List_Link *get_next_link (void); + Event_List_Link *get_next_link (); void attach_next_link (Event_List_Link * chain); // Attach a chain at the end. @@ -239,7 +239,7 @@ class Event_List_Link_factory : public CORBA::ValueFactoryBase virtual ~Event_List_Link_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link) create_for_unmarshal (); }; // The event list itself. ---------------------------------- @@ -252,11 +252,11 @@ class Event_List_impl : public virtual OBV_Event_List, public: Event_List_impl (); virtual ~Event_List_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); void store_event (Event* e); - Event_List_Link *get_first_link(void); + Event_List_Link *get_first_link(); // The iterator needs it. private: @@ -280,13 +280,13 @@ class Event_List_factory : public CORBA::ValueFactoryBase virtual ~Event_List_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Event_List) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Event_List) create_for_unmarshal (); }; class Event_List_Iterator { public: - Event_List_Iterator (void); + Event_List_Iterator (); Event_List_Iterator (Event_List *list); // Construct it to point to the first list link. @@ -328,11 +328,11 @@ class Temperature_Criterion_impl : Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp); virtual ~Temperature_Criterion_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); CORBA::Boolean is_critical (Event* e); - virtual void do_print (void); + virtual void do_print (); }; class Temperature_Criterion_factory : public CORBA::ValueFactoryBase @@ -341,7 +341,7 @@ class Temperature_Criterion_factory : public CORBA::ValueFactoryBase private: virtual ~Temperature_Criterion_factory (); - TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal (); }; class Position_Criterion_impl : @@ -355,11 +355,11 @@ class Position_Criterion_impl : Position *lb, Position *tr); virtual ~Position_Criterion_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); CORBA::Boolean is_critical (Event* e); - virtual void do_print (void); + virtual void do_print (); }; class Position_Criterion_factory : public CORBA::ValueFactoryBase @@ -370,7 +370,7 @@ class Position_Criterion_factory : public CORBA::ValueFactoryBase virtual ~Position_Criterion_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion) create_for_unmarshal (); }; class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion, @@ -380,11 +380,11 @@ class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion, public: Log_Msg_Criterion_impl (); virtual ~Log_Msg_Criterion_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); CORBA::Boolean is_critical (Event* e); - virtual void do_print (void); + virtual void do_print (); }; class Log_Msg_Criterion_factory : public CORBA::ValueFactoryBase @@ -395,7 +395,7 @@ class Log_Msg_Criterion_factory : public CORBA::ValueFactoryBase virtual ~Log_Msg_Criterion_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion) create_for_unmarshal (); }; class Criterion_List_impl : public virtual OBV_Criterion_List, @@ -404,7 +404,7 @@ class Criterion_List_impl : public virtual OBV_Criterion_List, public: Criterion_List_impl (); virtual ~Criterion_List_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); void store_criterion (Criterion *c); CORBA::Boolean is_critical (Event *e); diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp index 2cdd221fc7bb2..b9bf7e3de68f5 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp @@ -9,7 +9,6 @@ Criterion_List_var criterions; // Arriving events are tested against the list members. - // Set the ORB pointer, register OBV factories and init the // lists declared above. @@ -120,7 +119,6 @@ Checkpoint_i::put_event (Event *event) } - // If we want to return the event (e.g. return type is Event *) // return (DUP_REF (event)); // should be right. @@ -130,7 +128,7 @@ Checkpoint_i::put_event (Event *event) Event_List * -Checkpoint_i::get_critical_events (void) +Checkpoint_i::get_critical_events () { // The skeleton should not steal our list by decrementing // the reference counter. @@ -146,7 +144,7 @@ Checkpoint_i::get_critical_events (void) // Shutdown the server application. void -Checkpoint_i::shutdown (void) +Checkpoint_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "\nThe Checkpoint server is shutting down\n")); @@ -158,12 +156,12 @@ Checkpoint_i::shutdown (void) // Constructor. -Checkpoint_i::Checkpoint_i (void) +Checkpoint_i::Checkpoint_i () { } // Destructor. -Checkpoint_i::~Checkpoint_i (void) +Checkpoint_i::~Checkpoint_i () { } diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h index 01ee4d8fdb36d..f433bc1e1918b 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.h +++ b/TAO/examples/OBV/Typed_Events/Server_i.h @@ -21,10 +21,10 @@ class Checkpoint_i : public POA_Checkpoint { public: /// Constructor. - Checkpoint_i (void); + Checkpoint_i (); /// Destructor. - ~Checkpoint_i (void); + ~Checkpoint_i (); virtual void put_event ( Event * e @@ -34,7 +34,7 @@ class Checkpoint_i : public POA_Checkpoint ); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp index 584df60e71ea4..1989bef9b76d6 100644 --- a/TAO/examples/OBV/Typed_Events/client.cpp +++ b/TAO/examples/OBV/Typed_Events/client.cpp @@ -17,5 +17,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return -1; else return 0; - } diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp index ddc3bae71cfc7..f1f82f59e9b5e 100644 --- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp @@ -5,7 +5,7 @@ // This is the interface program that accesses the remote object // Constructor. -Grid_Client_i::Grid_Client_i (void) +Grid_Client_i::Grid_Client_i () : height_ (0), width_ (0), setx_ (0), @@ -17,7 +17,7 @@ Grid_Client_i::Grid_Client_i (void) } //Destructor. -Grid_Client_i::~Grid_Client_i (void) +Grid_Client_i::~Grid_Client_i () { //no-op } @@ -86,7 +86,6 @@ Grid_Client_i::run (const char *name, grid->set (index_, ctr, (value_ + ctr)); - } } diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.h b/TAO/examples/Persistent_Grid/Grid_Client_i.h index 615a4a50fc6a9..3a44409b07289 100644 --- a/TAO/examples/Persistent_Grid/Grid_Client_i.h +++ b/TAO/examples/Persistent_Grid/Grid_Client_i.h @@ -29,10 +29,10 @@ class Grid_Client_i { public: /// Constructor - Grid_Client_i (void); + Grid_Client_i (); /// Destructor - virtual ~Grid_Client_i (void); + virtual ~Grid_Client_i (); /// Execute the methods. virtual int run (const char *, int, ACE_TCHAR *[]); diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp index 91ed608427f17..8be57e517368d 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_i.cpp @@ -3,7 +3,7 @@ // Default constructor. -Grid_i::Grid_i (void) +Grid_i::Grid_i () : width_ (0), height_ (0), array_ (0) @@ -58,7 +58,7 @@ Grid_i::Grid_i (CORBA::Short x, // Default destructor. -Grid_i::~Grid_i (void) +Grid_i::~Grid_i () { } @@ -96,13 +96,13 @@ Grid_i::get (CORBA::Short x, // Access methods. CORBA::Short -Grid_i::width (void) +Grid_i::width () { return this->width_; } CORBA::Short -Grid_i::height (void) +Grid_i::height () { return this->height_; } @@ -142,7 +142,7 @@ Grid_i::set_pool (pool_t *pool) } // Constructor -Grid_Factory_i::Grid_Factory_i (void) +Grid_Factory_i::Grid_Factory_i () : orb_ (0), pool_name_ (0), pool_t_ (0) @@ -151,7 +151,7 @@ Grid_Factory_i::Grid_Factory_i (void) // Destructor -Grid_Factory_i::~Grid_Factory_i (void) +Grid_Factory_i::~Grid_Factory_i () { delete this->pool_t_; } @@ -207,7 +207,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o) // Shutdown. void -Grid_Factory_i::shutdown (void) +Grid_Factory_i::shutdown () { ACE_DEBUG ((LM_DEBUG, " (%P|%t) %s\n", @@ -218,7 +218,7 @@ Grid_Factory_i::shutdown (void) } void -Grid_Factory_i::cleanup (void) +Grid_Factory_i::cleanup () { const char *name = "Array"; diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h index 31a1dc8dec307..dcaa6d3aac5c0 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.h +++ b/TAO/examples/Persistent_Grid/Grid_i.h @@ -30,17 +30,17 @@ class Grid_Factory_i : public POA_Grid_Factory { public: /// Constructor. - Grid_Factory_i (void); + Grid_Factory_i (); /// Destructor. - ~Grid_Factory_i (void); + ~Grid_Factory_i (); /// This function creates and returns a . virtual Grid_ptr make_grid (CORBA::Short, CORBA::Short); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); /// Do a clean up of the memory map virtual void cleanup ( ); @@ -76,19 +76,19 @@ class Grid_i: public POA_Grid { public: /// Constructor - Grid_i (void); + Grid_i (); /// Constructor. Grid_i (CORBA::Short, CORBA::Short, pool_t *); /// Destructor - ~Grid_i (void); + ~Grid_i (); /// Returns the width of the grid - virtual CORBA::Short width (void); + virtual CORBA::Short width (); /// Returns the height of the grid - virtual CORBA::Short height (void); + virtual CORBA::Short height (); /// Sets the width of the grid. virtual void width (CORBA::Short); @@ -106,7 +106,7 @@ class Grid_i: public POA_Grid CORBA::Short); /// Destroy the grid. - virtual void destroy (void); + virtual void destroy (); /// Set a pointer to the pool void set_pool (pool_t *); diff --git a/TAO/examples/Persistent_Grid/Persistent_Client.h b/TAO/examples/Persistent_Grid/Persistent_Client.h index 32d3c55f5c97a..e8c6273196921 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Client.h +++ b/TAO/examples/Persistent_Grid/Persistent_Client.h @@ -29,10 +29,10 @@ class Persistent_Client_i { public: /// Constructor - Persistent_Client_i (void); + Persistent_Client_i (); /// Destructor - virtual ~Persistent_Client_i (void); + virtual ~Persistent_Client_i (); /// Execute the methods. virtual int run (const char *, int, ACE_TCHAR *[]); diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp index 6073083f88f8f..dd4a4e14d90bc 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp @@ -5,7 +5,7 @@ // This is the interface program that accesses the remote object // Constructor. -Persistent_Client_i::Persistent_Client_i (void) +Persistent_Client_i::Persistent_Client_i () : height_ (0), width_ (0) { @@ -13,7 +13,7 @@ Persistent_Client_i::Persistent_Client_i (void) } //Destructor. -Persistent_Client_i::~Persistent_Client_i (void) +Persistent_Client_i::~Persistent_Client_i () { //no-op } diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index d692a78648dac..90bae9293f51e 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -10,7 +10,7 @@ // Constructor. template -Server::Server (void) +Server::Server () : ior_output_file_ (0), mem_pool_name_ (0) { @@ -19,14 +19,14 @@ Server::Server (void) // Destructor. template -Server::~Server (void) +Server::~Server () { } // Parse the command-line arguments and set options. template int -Server::parse_args (void) +Server::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:m:")); int c = 0; @@ -130,7 +130,7 @@ Server::init (const char *servant_name, } template int -Server::run (void) +Server::run () { // Run the main event loop for the ORB. int ret = this->orb_manager_.run (); @@ -144,14 +144,13 @@ Server::run (void) } - ///////////////////////////////////////////////////////////////// // Client code Starts here //////////////////////////////////////////////////////////////// // Constructor. template -Client::Client (void) +Client::Client () : ior_ (0) { //no-op @@ -190,7 +189,7 @@ Client::read_ior (ACE_TCHAR *filename) // Parses the command line arguments and returns an error status. template int -Client::parse_args (void) +Client::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:k:x")); int c = 0; @@ -223,7 +222,7 @@ Client::parse_args (void) } template -Client::~Client (void) +Client::~Client () { ACE_OS::free (this->ior_); } @@ -261,8 +260,6 @@ Client::init (const char * /*name*/, ACE_ERROR_RETURN ((LM_ERROR, "no ior or naming options specified\n"), -1); - - } catch (const CORBA::Exception& ex) { @@ -276,7 +273,7 @@ Client::init (const char * /*name*/, template int -Client::shutdown (void) +Client::shutdown () { // Returns the shutdwon flag return shutdown_; diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h index 2a3c74738253d..acb0aa284db10 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.h +++ b/TAO/examples/Persistent_Grid/Simple_util.h @@ -33,10 +33,10 @@ class Server { public: /// Constructor. - Server (void); + Server (); /// Destructor. - ~Server (void); + ~Server (); /// Initialize the Server state - parsing arguments and waiting. /// interface_name is the name used to register the Servant. @@ -44,12 +44,12 @@ class Server int argc, ACE_TCHAR *argv[]); - // int register_name (void); + // int register_name (); // After calling , this method will register the server with // the TAO Naming Service using the servant_name passed to . /// Run the orb. - int run (void); + int run (); protected: /// Servant class @@ -59,7 +59,7 @@ class Server const char *name; /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// The ORB manager - a helper class for accessing the POA and /// registering objects. @@ -76,7 +76,6 @@ class Server /// The command line arguments. ACE_TCHAR **argv_; - }; @@ -96,10 +95,10 @@ class Client { public: /// Constructor. - Client (void); + Client (); /// Destructor. - ~Client (void); + ~Client (); /// Initialize the client communication endpoint with server. int init (const char *name,int argc, ACE_TCHAR *argv[]); @@ -114,14 +113,14 @@ class Client void shutdown (int); /// Initialize naming service - int obtain_initial_references (void); + int obtain_initial_references (); protected: /// Function to read the server IOR from a file. int read_ior (ACE_TCHAR *filename); /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// Remember our orb. CORBA::ORB_var orb_; @@ -145,11 +144,6 @@ class Client Var server_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Simple_util.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_UTIL_H */ diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp index a8d3ab80ead72..870292aa89303 100644 --- a/TAO/examples/Persistent_Grid/client.cpp +++ b/TAO/examples/Persistent_Grid/client.cpp @@ -14,7 +14,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return -1; else return 0; - } diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp index b0f4c2613054d..ce2b60542e821 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp @@ -20,7 +20,7 @@ UDP_PerformanceClient::UDP_PerformanceClient (CORBA::ORB_ptr orb, } //Destructor. -UDP_PerformanceClient::~UDP_PerformanceClient (void) +UDP_PerformanceClient::~UDP_PerformanceClient () { //no-op } diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h index 5a13402ce6743..ea87bd4f6d0f3 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h @@ -37,7 +37,7 @@ class UDP_PerformanceClient ACE_UINT32 burst_messages); /// Destructor - virtual ~UDP_PerformanceClient (void); + virtual ~UDP_PerformanceClient (); private: // Runs in a separate thread. diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp index 18a7e506b5d4d..5f932e4d5e98d 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp @@ -1,16 +1,15 @@ #include "UDP_i.h" - // Constructor -UDP_i::UDP_i (void) +UDP_i::UDP_i () : messages_count_ (0) , wrong_messages_count_ (0) { } // Destructor -UDP_i::~UDP_i (void) +UDP_i::~UDP_i () { } @@ -105,7 +104,7 @@ UDP_i::reset (const char * client_name) // Shutdown. void -UDP_i::shutdown (void) +UDP_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "%s\n", diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h index cfb27be63d7c8..12eab1d599d38 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h @@ -27,10 +27,10 @@ class UDP_i: public POA_UDP { public: /// Constructor - UDP_i (void); + UDP_i (); /// Destructor - ~UDP_i (void); + ~UDP_i (); virtual void setResponseHandler (UDP_ptr udpHandler); @@ -40,7 +40,7 @@ class UDP_i: public POA_UDP virtual void reset (const char * client_name); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index b16acb89b2dea..6bd848410e21c 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp @@ -10,7 +10,6 @@ //============================================================================= - #include "ace/Get_Opt.h" #include "ace/Task.h" @@ -24,7 +23,6 @@ #include "tao/Strategies/advanced_resource.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); ACE_UINT32 burst_messages = 1000; @@ -135,7 +133,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // the one calling orb->shutdown () triggering the end of the ORB // event loop. delete client; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index 379e624c0afa9..d0c1655024a0d 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -21,7 +21,6 @@ - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int orb_threads = 1; // Number of threads running inside the ORB. diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index d4caa0614dfd6..ba15981cc5bb5 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -68,7 +68,7 @@ class Client /// ctor Client (Simple_Server_ptr server, ACE_UINT32 niterations); - virtual ~Client (void) {}; + virtual ~Client () {}; /// The thread entry point. virtual int svc (); @@ -145,7 +145,7 @@ Client::Client (Simple_Server_ptr server, int -Client::svc (void) +Client::svc () { try { @@ -198,7 +198,6 @@ Client::svc (void) for (int c = 0; c < 10; ++c) server_->shutdown (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index 06757f4f51a06..3ce36a8aaba2b 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -10,7 +10,6 @@ //============================================================================= - #include "ace/Get_Opt.h" #include "test_i.h" diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp index a9c9d47744e04..3bea2eb8282ff 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp @@ -30,7 +30,7 @@ Simple_Server_i::get_number (CORBA::Long) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Simple_Server_i::shutdown\n")); diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h index 37796d06ecca2..ea18f61e54f9c 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h @@ -33,7 +33,7 @@ class Simple_Server_i : public POA_Simple_Server CORBA::Long get_number (CORBA::Long num); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp index e6c22dccfd28e..dd925c6cedc93 100644 --- a/TAO/examples/Quoter/Factory_Finder.cpp +++ b/TAO/examples/Quoter/Factory_Finder.cpp @@ -13,13 +13,13 @@ #include "Factory_Finder.h" -Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server (void) +Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server () : debug_level_ (1) { // Nothing } -Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void) +Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server () { try { @@ -146,7 +146,7 @@ Quoter_Factory_Finder_Server::init (int argc, } int -Quoter_Factory_Finder_Server::run (void) +Quoter_Factory_Finder_Server::run () { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, @@ -161,7 +161,7 @@ Quoter_Factory_Finder_Server::run (void) // Function get_options. u_int -Quoter_Factory_Finder_Server::parse_args (void) +Quoter_Factory_Finder_Server::parse_args () { ACE_Get_Opt get_opt (this->argc_, this->argv_, ACE_TEXT("?d:")); int opt; diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h index d8cedd7aae5e0..5dcb8c46ad07a 100644 --- a/TAO/examples/Quoter/Factory_Finder.h +++ b/TAO/examples/Quoter/Factory_Finder.h @@ -29,22 +29,21 @@ */ class Quoter_Factory_Finder_Server { - public: /// Default constructor - Quoter_Factory_Finder_Server (void); + Quoter_Factory_Finder_Server (); /// Destructor - ~Quoter_Factory_Finder_Server (void); + ~Quoter_Factory_Finder_Server (); /// Initialize the Quoter_Server state - parsing arguments and ... int init (int argc, ACE_TCHAR *argv[]); /// Run the orb - int run (void); + int run (); /// parse the passed parameters - u_int parse_args (void); + u_int parse_args (); private: /// instance of the ORB Manager diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp index 461ccaccd9128..c67a55c1bff2a 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.cpp +++ b/TAO/examples/Quoter/Factory_Finder_i.cpp @@ -26,7 +26,7 @@ Quoter_Factory_Finder_i::Quoter_Factory_Finder_i (int debug_level) } // Destructor. -Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void) +Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i () { // Nothing } diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h index 85c2fd52e4974..32bfe203aeb2f 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.h +++ b/TAO/examples/Quoter/Factory_Finder_i.h @@ -23,10 +23,9 @@ */ class Quoter_Factory_Finder_i : public POA_Stock::Quoter_Factory_Finder { - public: Quoter_Factory_Finder_i (int debug_level = 1); - ~Quoter_Factory_Finder_i (void); + ~Quoter_Factory_Finder_i (); /** * Returns a sequence of Factories if factories matching the diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp index c4a09c2923db7..a008cc8d16a53 100644 --- a/TAO/examples/Quoter/Generic_Factory.cpp +++ b/TAO/examples/Quoter/Generic_Factory.cpp @@ -14,13 +14,13 @@ #include "orbsvcs/LifeCycleServiceC.h" -Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server (void) +Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server () : use_LifeCycle_Service_ (0), debug_level_ (1) { } -Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void) +Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server () { try { @@ -195,7 +195,7 @@ Quoter_Generic_Factory_Server::init (int argc, } int -Quoter_Generic_Factory_Server::run (void) +Quoter_Generic_Factory_Server::run () { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, @@ -209,7 +209,7 @@ Quoter_Generic_Factory_Server::run (void) // Function get_options. u_int -Quoter_Generic_Factory_Server::parse_args (void) +Quoter_Generic_Factory_Server::parse_args () { ACE_Get_Opt get_opt (this->argc_, this->argv_, ACE_TEXT("l?d:")); int opt; diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h index 9d25e76053e22..71c994a0c1a88 100644 --- a/TAO/examples/Quoter/Generic_Factory.h +++ b/TAO/examples/Quoter/Generic_Factory.h @@ -29,23 +29,22 @@ */ class Quoter_Generic_Factory_Server { - public: /// Default constructor - Quoter_Generic_Factory_Server (void); + Quoter_Generic_Factory_Server (); /// Destructor - ~Quoter_Generic_Factory_Server (void); + ~Quoter_Generic_Factory_Server (); /// Initialize the Quoter_Server state - parsing arguments and ... int init (int argc, ACE_TCHAR *argv[]); /// Run the orb. - int run (void); + int run (); /// Parse the passed parameters. - u_int parse_args (void); + u_int parse_args (); private: /// instance of the ORB Manager diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index 5ba2333b03ce7..57165cbde26c5 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -25,7 +25,7 @@ Quoter_Generic_Factory_i::Quoter_Generic_Factory_i (int debug_level) } // Destructor. -Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void) +Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i () { } @@ -36,7 +36,6 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &) } - CosNaming::NamingContext_ptr Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key) { @@ -78,7 +77,6 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k } - CORBA::Object_ptr Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &) @@ -136,7 +134,6 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, if (this->debug_level_ > 1) ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Return an object reference to a new object.\n")); - } catch (const CORBA::Exception&) { diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h index c94997f1c8865..7515831d311e8 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.h +++ b/TAO/examples/Quoter/Generic_Factory_i.h @@ -24,10 +24,9 @@ */ class Quoter_Generic_Factory_i : public POA_Stock::Quoter_Generic_Factory { - public: Quoter_Generic_Factory_i (int debug_level = 1); - ~Quoter_Generic_Factory_i (void); + ~Quoter_Generic_Factory_i (); /// Returns true if the Generic Factory is able to forward a request /// for creating an object described by the . diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp index 7c25746e4a413..c789ac4b870db 100644 --- a/TAO/examples/Quoter/Quoter_i.cpp +++ b/TAO/examples/Quoter/Quoter_i.cpp @@ -27,7 +27,7 @@ Quoter_Factory_i::Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr) // Destructor -Quoter_Factory_i::~Quoter_Factory_i (void) +Quoter_Factory_i::~Quoter_Factory_i () { for (size_t i = 0; i < this->quoter_num_; i++) delete this->my_quoters_[i]; @@ -37,7 +37,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void) // Initialize everything in the factory -int Quoter_Factory_i::init (void) +int Quoter_Factory_i::init () { ACE_NEW_RETURN (this->my_quoters_, Quoter_i *[this->quoter_num_], @@ -104,7 +104,7 @@ Quoter_i::Quoter_i (const char *name, // Destructor -Quoter_i::~Quoter_i (void) +Quoter_i::~Quoter_i () { // Nothing } @@ -248,7 +248,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, // Removes the object. Once we shut down the ORB we can call it a day. void -Quoter_i::remove (void) +Quoter_i::remove () { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "I have been asked to shut down.\n")); diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h index 476ce8b769e3e..2539a4261f3ab 100644 --- a/TAO/examples/Quoter/Quoter_i.h +++ b/TAO/examples/Quoter/Quoter_i.h @@ -38,7 +38,7 @@ class Quoter_i: public POA_Stock::Quoter PortableServer::POA_ptr poa_ptr = 0); /// Destructor - ~Quoter_i (void); + ~Quoter_i (); /// Returns the current quote for the stock virtual CORBA::Long get_quote (const char *stock_name); @@ -54,7 +54,7 @@ class Quoter_i: public POA_Stock::Quoter const CosLifeCycle::Criteria &the_criteria); /// Removes the object. - virtual void remove (void); + virtual void remove (); private: /// This flag defines if a Generic Factory is used (0 by default) or @@ -84,10 +84,10 @@ class Quoter_Factory_i: public POA_Stock::Quoter_Factory Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr); /// Destructor. - ~Quoter_Factory_i (void); + ~Quoter_Factory_i (); /// Initialize everything in the factory - int init (void); + int init (); /// Return the quoter by the id . virtual Stock::Quoter_ptr create_quoter (const char *name); diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index d1a5c03878ba0..e5eb55e14077f 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -11,7 +11,7 @@ Quoter_Task::Quoter_Task (int argc, ACE_TCHAR **argv) } int -Quoter_Task::svc (void) +Quoter_Task::svc () { if (this->quoter_client.init (this->argc_, this->argv_) == -1) return 1; @@ -20,7 +20,7 @@ Quoter_Task::svc (void) } // Constructor. -Quoter_Client::Quoter_Client (void) +Quoter_Client::Quoter_Client () : quoter_factory_key_ (0), quoter_key_ (ACE_OS::strdup ("key0")), shutdown_ (0), @@ -34,7 +34,7 @@ Quoter_Client::Quoter_Client (void) // Parses the command line arguments and returns an error status. int -Quoter_Client::parse_args (void) +Quoter_Client::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("n:d:lx")); int opt; @@ -78,7 +78,7 @@ Quoter_Client::parse_args (void) } int -Quoter_Client::run (void) +Quoter_Client::run () { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, @@ -124,7 +124,6 @@ Quoter_Client::run (void) if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "Quoter Client: Copied object: ACE Hardware = %i\n", q)); - } catch (const CORBA::Exception& ex) { @@ -136,7 +135,7 @@ Quoter_Client::run (void) return 0; } -Quoter_Client::~Quoter_Client (void) +Quoter_Client::~Quoter_Client () { // Free resources // Close the ior files @@ -147,7 +146,7 @@ Quoter_Client::~Quoter_Client (void) } int -Quoter_Client::init_naming_service (void) +Quoter_Client::init_naming_service () { const char *exception_message = "Null Message"; diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h index 9a58d89095567..298fb1075f049 100644 --- a/TAO/examples/Quoter/client.h +++ b/TAO/examples/Quoter/client.h @@ -37,11 +37,11 @@ class Quoter_Client { public: // = Constructor and destructor. - Quoter_Client (void); - ~Quoter_Client (void); + Quoter_Client (); + ~Quoter_Client (); /// Execute client example code. - int run (void); + int run (); /// Initialize the client communication endpoint with server. int init (int argc, ACE_TCHAR **argv); @@ -51,10 +51,10 @@ class Quoter_Client CORBA::ORB_var orb_; /// Function to initialize the naming service. - int init_naming_service (void); + int init_naming_service (); /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// # of arguments on the command line. int argc_; @@ -109,7 +109,6 @@ class Quoter_Task : public ACE_Task Quoter_Client quoter_client; int argc_; ACE_TCHAR **argv_; - }; #endif /* QUOTER_CLIENT_H */ diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp index 6907e551726a9..476d2911c1743 100644 --- a/TAO/examples/Quoter/server.cpp +++ b/TAO/examples/Quoter/server.cpp @@ -12,7 +12,7 @@ #include "server.h" #include "tao/ORB_Core.h" -Quoter_Server::Quoter_Server (void) +Quoter_Server::Quoter_Server () : num_of_objs_ (1), quoter_Factory_i_ptr_ (0), debug_level_ (1) @@ -20,7 +20,7 @@ Quoter_Server::Quoter_Server (void) } int -Quoter_Server::parse_args (void) +Quoter_Server::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("d:n:")); int c; @@ -141,7 +141,7 @@ Quoter_Server::init (int argc, // and Quoter_factory object. int -Quoter_Server::init_naming_service (void) +Quoter_Server::init_naming_service () { const char *exception_message = "Null Message"; try @@ -192,7 +192,7 @@ Quoter_Server::init_naming_service (void) } int -Quoter_Server::run (void) +Quoter_Server::run () { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, @@ -203,7 +203,7 @@ Quoter_Server::run (void) return 0; } -Quoter_Server::~Quoter_Server (void) +Quoter_Server::~Quoter_Server () { try { diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h index a6d650cd0f9e2..2658f5c0e290a 100644 --- a/TAO/examples/Quoter/server.h +++ b/TAO/examples/Quoter/server.h @@ -41,26 +41,25 @@ class Quoter_Server { public: - /// Default constructor - Quoter_Server (void); + Quoter_Server (); /// Destructor - ~Quoter_Server (void); + ~Quoter_Server (); /// Initialize the Quoter_Server state - parsing arguments and ... int init (int argc, ACE_TCHAR *argv[]); /// Run the server. - int run (void); + int run (); private: /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// Initializes the name server and registers cubit factory with the /// name server. - int init_naming_service (void); + int init_naming_service (); /// Number of quoter objects we export. int num_of_objs_; diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 70f2dbdd2f55f..f20c5e9d5312f 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -26,7 +26,7 @@ extern "C" void handler (int) //***************************************************************// -Activity::Activity (void) +Activity::Activity () :builder_ (0), barrier_ (0), active_task_count_ (0), @@ -35,7 +35,7 @@ Activity::Activity (void) state_lock_ = new ACE_Lock_Adapter ; } -Activity::~Activity (void) +Activity::~Activity () { delete state_lock_; delete barrier_; @@ -48,13 +48,13 @@ Activity::builder (Builder* builder) } CORBA::ORB_ptr -Activity::orb (void) +Activity::orb () { return orb_.in (); } RTCORBA::Current_ptr -Activity::current (void) +Activity::current () { return current_.in (); } @@ -101,7 +101,7 @@ Activity::init (int& argc, ACE_TCHAR *argv []) } int -Activity::resolve_naming_service (void) +Activity::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService"); @@ -119,7 +119,7 @@ Activity::resolve_naming_service (void) } void -Activity::activate_poa_list (void) +Activity::activate_poa_list () { POA_LIST list; int count = builder_->poa_list (list); @@ -131,7 +131,7 @@ Activity::activate_poa_list (void) } void -Activity::activate_job_list (void) +Activity::activate_job_list () { JOB_LIST list; int count = builder_->job_list (list); @@ -174,12 +174,11 @@ Activity::activate_job_list (void) job_name.c_str ())); active_job_count_++; - } /* while */ } void -Activity::activate_schedule (void) +Activity::activate_schedule () { TASK_LIST list; int count = builder_->task_list (list); @@ -270,7 +269,7 @@ Activity::job_ended (Job_i* /*ended_job*/) } void -Activity::check_ifexit (void) +Activity::check_ifexit () { // All tasks have finished and all jobs have been shutdown. if (active_task_count_ == 0 && active_job_count_ == 0) diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h index 8f8ffa04ee265..34582c21a3279 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.h +++ b/TAO/examples/RTCORBA/Activity/Activity.h @@ -52,11 +52,11 @@ class Activity void run (int argc, ACE_TCHAR *argv[]); /// Resolve the naming service. - int resolve_naming_service (void); + int resolve_naming_service (); /// = Accessors - CORBA::ORB_ptr orb (void); - RTCORBA::Current_ptr current (void); + CORBA::ORB_ptr orb (); + RTCORBA::Current_ptr current (); void builder (Builder* builder); /// Returns priority if server declared model else -1 @@ -71,16 +71,16 @@ class Activity protected: /// = Activation methods. /// Activate the POA's - void activate_poa_list (void); + void activate_poa_list (); /// Activate the task list. - void activate_schedule (void); + void activate_schedule (); /// Activate the Job's - void activate_job_list (void); + void activate_job_list (); /// Check if we should process exit - void check_ifexit (void); + void check_ifexit (); /// Create a file whose name is specified in the -Started_Flag argument at startup. /// This file flags that the Activity has finished its bootstrapping step. diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp index 820c9b284f1c0..d86fabcb6973b 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.cpp +++ b/TAO/examples/RTCORBA/Activity/Builder.cpp @@ -6,7 +6,7 @@ #include "Thread_Task.h" #include "Activity.h" -Builder::Builder(void) +Builder::Builder() :poa_count_ (0), poa_list_ (0), task_count_ (0), @@ -17,7 +17,7 @@ Builder::Builder(void) ACTIVITY::instance()->builder (this); } -Builder::~Builder(void) +Builder::~Builder() { } @@ -128,7 +128,7 @@ Builder::init (int argc, ACE_TCHAR *argv[]) } int -Builder::fini (void) +Builder::fini () { // It's only a hack for proper cleanup of this badly designed test. static bool already_cleaned = false; diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h index 8b0db2a892ff3..bd184c32be1ec 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.h +++ b/TAO/examples/RTCORBA/Activity/Builder.h @@ -48,7 +48,6 @@ class Builder : public ACE_Service_Object int job_list (JOB_LIST &job_list); protected: - /// Number of POA's declared int poa_count_; diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp index 7f0ac5e8ec417..cbee3186a069e 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.cpp +++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp @@ -9,13 +9,13 @@ Job_i::Job_i () } const ACE_CString& -Job_i::name (void) +Job_i::name () { return job_name_; } const ACE_CString& -Job_i::poa (void) +Job_i::poa () { return POA_name_; } @@ -51,7 +51,7 @@ Job_i::work (CORBA::ULong work) } void -Job_i::shutdown (void) +Job_i::shutdown () { ACTIVITY::instance()->job_ended (this); } diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h index 7eda03d5f4002..f1e532d571154 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.h +++ b/TAO/examples/RTCORBA/Activity/Job_i.h @@ -24,19 +24,19 @@ class Job_i : public POA_Job { public: /// Constructor - Job_i (void); + Job_i (); /// Init the state of this object. int init (ACE_Arg_Shifter& arg_shifter); /// = Accessors - const ACE_CString& name (void); - const ACE_CString& poa (void); + const ACE_CString& name (); + const ACE_CString& poa (); /// = inteface Job method implementation. virtual void work (CORBA::ULong work); - virtual void shutdown (void); + virtual void shutdown (); protected: /// The name of this Job ACE_CString job_name_; diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp index b880c30d6f732..581993d6c7773 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp @@ -2,7 +2,7 @@ #include "tao/debug.h" #include "ace/Log_Msg.h" -POA_Holder::POA_Holder (void) +POA_Holder::POA_Holder () : priority_model_ (RTCORBA::CLIENT_PROPAGATED), server_priority_ (0) { @@ -109,7 +109,6 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter) void POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa) { - /* lanes bands priomodel @@ -159,7 +158,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ // Create a thread-pool policy. lanes_policy = rt_orb->create_threadpool_policy (threadpool_id); - } if (bands_.length () != 0) diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h index 2e8440ba57285..6e46602824b3c 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.h +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h @@ -25,7 +25,7 @@ class POA_Holder { public: /// Constructor - POA_Holder (void); + POA_Holder (); /// The arg_shifter options are read in the following manner: -POA -PriorityModel -Lanes (-Lane , )* -Bands (-Band )* int init (ACE_Arg_Shifter& arg_shifter); diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp index 4bef00b9e64cd..e03a478974bb6 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp @@ -5,7 +5,7 @@ #include "Task_Stats.h" -Periodic_Task::Periodic_Task (void) +Periodic_Task::Periodic_Task () :barrier_ (0), task_priority_ (0), period_ (0), @@ -86,7 +86,7 @@ Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter) } const char* -Periodic_Task::job (void) +Periodic_Task::job () { return name_.c_str (); } diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h index 1c2e9785e814d..05939aaa5b22b 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h @@ -32,7 +32,7 @@ class Task_Stats; class Periodic_Task : public ACE_Task { public: - Periodic_Task (void); + Periodic_Task (); ~Periodic_Task (); /// Init the state of this object. @@ -46,7 +46,7 @@ class Periodic_Task : public ACE_Task /// = Job get/set /// Returns the name of the Job exec'ed by this Task. - const char* job (void); + const char* job (); /// Sets the Job to exec. void job (Job_ptr job); diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index 9998b2bf3b707..f91efd34b7a35 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -5,7 +5,7 @@ #include "Task_Stats.inl" #endif /* __ACE_INLINE__ */ -Base_Time::Base_Time (void) +Base_Time::Base_Time () { base_time_ = ACE_OS::gethrtime (); } @@ -26,14 +26,14 @@ Task_Stats::Task_Stats (size_t max_samples) { } -Task_Stats::~Task_Stats (void) +Task_Stats::~Task_Stats () { delete[] this->time_inv_; delete[] this->time_exec_; } int -Task_Stats::init (void) +Task_Stats::init () { ACE_NEW_RETURN (this->time_inv_, ACE_UINT64[this->max_samples_], -1); ACE_NEW_RETURN (this->time_exec_, ACE_UINT64[this->max_samples_], -1); diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h index 235a40dc7c9b0..0fa872dd9e835 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.h +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h @@ -25,7 +25,7 @@ class Base_Time { public: - Base_Time (void); + Base_Time (); ACE_hrtime_t base_time_; }; @@ -43,10 +43,10 @@ class Task_Stats Task_Stats (size_t max_samples); /// Destructor - ~Task_Stats (void); + ~Task_Stats (); /// Init - int init (void); + int init (); /// Set the base time value. void base_time (ACE_hrtime_t time); diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp index 10003b602608d..d94ab040f4922 100644 --- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp +++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp @@ -9,7 +9,7 @@ #include "Task_Stats.h" #include "ace/Barrier.h" -Thread_Task::Thread_Task (void) +Thread_Task::Thread_Task () { } @@ -53,12 +53,11 @@ Thread_Task::activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *prio } int -Thread_Task::svc (void) +Thread_Task::svc () { // if debugging, dump the priority that we're actually at. if (TAO_debug_level > 0) { - // Get the priority of the current thread. RTCORBA::Priority prio = ACTIVITY::instance()->current ()->the_priority (); diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.h b/TAO/examples/RTCORBA/Activity/Thread_Task.h index 1538a8acd0ef6..27b5b9727b99b 100644 --- a/TAO/examples/RTCORBA/Activity/Thread_Task.h +++ b/TAO/examples/RTCORBA/Activity/Thread_Task.h @@ -28,13 +28,12 @@ class Thread_Task : public Periodic_Task { public: /// Constructor - Thread_Task (void); + Thread_Task (); /// Activate thread(s). virtual int activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *priority_mapping); protected: - /// task svc virtual int svc (); }; diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp index d1ee3959cec23..0d01b0bbf5b62 100644 --- a/TAO/examples/RTScheduling/DT_Creator.cpp +++ b/TAO/examples/RTScheduling/DT_Creator.cpp @@ -168,7 +168,7 @@ DT_Creator::init (int argc, ACE_TCHAR *argv []) } void -DT_Creator::register_synch_obj (void) +DT_Creator::register_synch_obj () { CosNaming::Name name (1); name.length (1); @@ -204,7 +204,6 @@ DT_Creator::register_synch_obj (void) this->naming_->resolve (name); synch_context = CosNaming::NamingContext::_narrow (object.in ()); - } ACE_CString synch_name ("Synch"); @@ -229,12 +228,11 @@ DT_Creator::register_synch_obj (void) // Register the synch object with the Synch context. synch_context->rebind (name, synch.in ()); - } int -DT_Creator::activate_root_poa (void) +DT_Creator::activate_root_poa () { CORBA::Object_var object = this->orb_->resolve_initial_references ("RootPOA"); @@ -251,7 +249,7 @@ DT_Creator::activate_root_poa (void) } void -DT_Creator::activate_poa_list (void) +DT_Creator::activate_poa_list () { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -277,9 +275,8 @@ DT_Creator::activate_poa_list (void) } void -DT_Creator::activate_job_list (void) +DT_Creator::activate_job_list () { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "DT_Creator::activate_job_list\n")); @@ -325,8 +322,6 @@ DT_Creator::activate_job_list (void) this->naming_->rebind (name.in (), server.in ()); - - } /* while */ ACE_DEBUG ((LM_DEBUG, @@ -334,7 +329,7 @@ DT_Creator::activate_job_list (void) } void -DT_Creator::activate_schedule (void) +DT_Creator::activate_schedule () { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -395,11 +390,10 @@ DT_Creator::activate_schedule (void) ACE_DEBUG ((LM_DEBUG, "Activated schedule, task count = %d\n", dt_count_)); - } int -DT_Creator::resolve_naming_service (void) +DT_Creator::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService"); @@ -494,7 +488,7 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current) } void -DT_Creator::dt_ended (void) +DT_Creator::dt_ended () { { ACE_GUARD (ACE_Lock, ace_mon, *state_lock_); @@ -509,7 +503,7 @@ DT_Creator::dt_ended (void) } void -DT_Creator::job_ended (void) +DT_Creator::job_ended () { { ACE_GUARD (ACE_Lock, ace_mon, *state_lock_); @@ -525,7 +519,7 @@ DT_Creator::job_ended (void) } void -DT_Creator::check_ifexit (void) +DT_Creator::check_ifexit () { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -577,19 +571,18 @@ DT_Creator::check_ifexit (void) } ACE_DEBUG ((LM_DEBUG, "Log File Ready\n")); - } } } } int -DT_Creator::dt_count (void) +DT_Creator::dt_count () { return dt_count_; } -DT_Creator::DT_Creator (void) +DT_Creator::DT_Creator () : dt_list_ (0), poa_list_ (0), job_list_ (0), @@ -609,7 +602,7 @@ DT_Creator::DT_Creator (void) { } -DT_Creator::~DT_Creator (void) +DT_Creator::~DT_Creator () { for (int i = 0; i < log_index; ++i) ACE_OS::free (log[i]); @@ -637,7 +630,7 @@ DT_Creator::log_msg (char* msg) } CORBA::ORB_ptr -DT_Creator::orb (void) +DT_Creator::orb () { return this->orb_.in (); } @@ -649,7 +642,7 @@ DT_Creator::orb (CORBA::ORB_ptr orb) } ACE_Time_Value* -DT_Creator::base_time (void) +DT_Creator::base_time () { return this->base_time_; } @@ -662,7 +655,7 @@ DT_Creator::base_time (ACE_Time_Value* base_time) Synch_i* -DT_Creator::synch (void) +DT_Creator::synch () { return this->synch_.in (); } diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h index 0e6ca315bffdb..90b818f2babd0 100644 --- a/TAO/examples/RTScheduling/DT_Creator.h +++ b/TAO/examples/RTScheduling/DT_Creator.h @@ -24,9 +24,9 @@ typedef Job_i **JOB_LIST; class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object { public: - DT_Creator (void); + DT_Creator (); - virtual ~DT_Creator (void); + virtual ~DT_Creator (); int init (int argc, ACE_TCHAR *argv []); @@ -34,14 +34,14 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object virtual void create_distributable_threads (RTScheduling::Current_ptr current); - void activate_poa_list (void); - void activate_job_list (void); - void activate_schedule (void); + void activate_poa_list (); + void activate_job_list (); + void activate_schedule (); virtual void yield (time_t suspend_time, Thread_Task* task) = 0; - virtual void wait (void) = 0; + virtual void wait () = 0; virtual CORBA::Policy_ptr sched_param (int importance) = 0; @@ -51,39 +51,37 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object int iter, int dist, char *job_name) = 0; - // virtual Task* task (void) = 0; + // virtual Task* task () = 0; /// Resolve the naming service. - int resolve_naming_service (void); + int resolve_naming_service (); - int dt_count (void); + int dt_count (); - void dt_ended (void); - void job_ended (void); + void dt_ended (); + void job_ended (); - void check_ifexit (void); + void check_ifexit (); void log_msg (char* msg); void orb (CORBA::ORB_ptr); - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); - ACE_Time_Value* base_time (void); + ACE_Time_Value* base_time (); void base_time (ACE_Time_Value*); - ACE_hrtime_t base_hr_time (void); + ACE_hrtime_t base_hr_time (); - virtual int total_load (void) = 0; + virtual int total_load () = 0; - Synch_i* synch (void); + Synch_i* synch (); - void register_synch_obj (void); + void register_synch_obj (); - int activate_root_poa (void); + int activate_root_poa (); protected: - - DT_LIST dt_list_; POA_LIST poa_list_; JOB_LIST job_list_; diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp index 12fbc8127a2a6..a5f47892108ad 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp @@ -2,10 +2,9 @@ #include "test.h" #include "FP_Task.h" -FP_DT_Creator::FP_DT_Creator (void) +FP_DT_Creator::FP_DT_Creator () { DT_TEST::instance ()->dt_creator (this); - } Thread_Task* @@ -46,13 +45,13 @@ FP_DT_Creator::yield (time_t suspend_time, } int -FP_DT_Creator::total_load (void) +FP_DT_Creator::total_load () { return BUFSIZ; } void -FP_DT_Creator::wait (void) +FP_DT_Creator::wait () { } diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h index a39bfc021d138..4d9f0dfcccee6 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h @@ -7,11 +7,11 @@ class FP_DT_Creator: public DT_Creator { public: - FP_DT_Creator (void); + FP_DT_Creator (); virtual CORBA::Policy_ptr sched_param (int importance); - //virtual Task* task (void); + //virtual Task* task (); virtual Thread_Task* create_thr_task (int importance, time_t start_time, int load, @@ -22,9 +22,8 @@ class FP_DT_Creator: public DT_Creator virtual void yield (time_t suspend_time, Thread_Task* task); - virtual void wait (void); - virtual int total_load (void); - + virtual void wait (); + virtual int total_load (); }; diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index 28563f1378f5b..3cd0d02ed687d 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -6,7 +6,7 @@ std::atomic server_guid_counter; RTCORBA::Priority -Segment_Sched_Param_Policy::value (void) +Segment_Sched_Param_Policy::value () { return this->value_; } @@ -18,7 +18,7 @@ Segment_Sched_Param_Policy::value (RTCORBA::Priority value) } CORBA::Policy_ptr -Segment_Sched_Param_Policy::copy (void) +Segment_Sched_Param_Policy::copy () { Segment_Sched_Param_Policy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -31,13 +31,13 @@ Segment_Sched_Param_Policy::copy (void) } CORBA::PolicyType -Segment_Sched_Param_Policy::policy_type (void) +Segment_Sched_Param_Policy::policy_type () { return 0; } void -Segment_Sched_Param_Policy::destroy (void) +Segment_Sched_Param_Policy::destroy () { } @@ -57,7 +57,7 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb) } } -Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void) +Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler () { } @@ -76,7 +76,6 @@ Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority segment_policy->value (segment_priority); return segment_policy; - } @@ -110,7 +109,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current name, sched_param, implicit_sched_param); - } void @@ -130,7 +128,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur void Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info) { - int priority; ACE_hthread_t current; ACE_Thread::self (current); @@ -152,7 +149,6 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p sizeof (size_t)); request_info->add_request_service_context (*srv_con, 0); - } void @@ -243,7 +239,7 @@ Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &) } CORBA::PolicyList* -Fixed_Priority_Scheduler::scheduling_policies (void) +Fixed_Priority_Scheduler::scheduling_policies () { return 0; } @@ -254,13 +250,13 @@ Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &) } CORBA::PolicyList* -Fixed_Priority_Scheduler::poa_policies (void) +Fixed_Priority_Scheduler::poa_policies () { return 0; } char * -Fixed_Priority_Scheduler::scheduling_discipline_name (void) +Fixed_Priority_Scheduler::scheduling_discipline_name () { return 0; } diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h index 09bb04dc53d17..0c648b8758bb0 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h @@ -10,15 +10,15 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy, public ::CORBA::LocalObject { public: - virtual RTCORBA::Priority value (void); + virtual RTCORBA::Priority value (); virtual void value (RTCORBA::Priority value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - void destroy (void); + void destroy (); private: RTCORBA::Priority value_; @@ -29,10 +29,9 @@ public FP_Scheduling::FP_Scheduler, public ::CORBA::LocalObject { public: - Fixed_Priority_Scheduler (CORBA::ORB_ptr orb); - ~Fixed_Priority_Scheduler (void); + ~Fixed_Priority_Scheduler (); virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr create_segment_scheduling_parameter (RTCORBA::Priority segment_priority); @@ -83,13 +82,13 @@ public ::CORBA::LocalObject virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void); + virtual CORBA::PolicyList * scheduling_policies (); virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void); + virtual CORBA::PolicyList * poa_policies (); - virtual char * scheduling_discipline_name (void); + virtual char * scheduling_discipline_name (); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp index 51b1787ddd9d0..812c8e5be2317 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp @@ -61,7 +61,7 @@ FP_Task::activate_task (RTScheduling::Current_ptr current, } void -FP_Task::pre_activate (void) +FP_Task::pre_activate () { CORBA::Object_var object = DT_TEST::instance ()->orb ()->resolve_initial_references ("PriorityMappingManager"); @@ -89,7 +89,7 @@ FP_Task::pre_activate (void) } int -FP_Task::perform_task (void) +FP_Task::perform_task () { static CORBA::ULong prime_number = 9619; diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h index 65912189c78d8..0a84c498a9cab 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h @@ -19,10 +19,9 @@ class FP_Task : public Thread_Task long flags, ACE_Time_Value* base_time); - virtual int perform_task (void); - - virtual void pre_activate (void); + virtual int perform_task (); + virtual void pre_activate (); }; #endif /*FP_TASK_H*/ diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index 92b8bcd424237..942ade718a1cd 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp @@ -23,7 +23,7 @@ class TestShutdown : public ACE_Event_Handler #endif } - ~TestShutdown (void) + ~TestShutdown () { #if !defined(ACE_LACKS_UNIX_SIGNALS) this->shutdown_.remove_handler (SIGTERM); @@ -46,13 +46,13 @@ class TestShutdown : public ACE_Event_Handler ACE_Sig_Handler shutdown_; }; -DT_Test::DT_Test (void) +DT_Test::DT_Test () { base_t = ACE_OS::gethrtime (); } void -DT_Test::check_supported_priorities (void) +DT_Test::check_supported_priorities () { // Check that we have sufficient priority range to run this // test, i.e., more than 1 priority level. @@ -200,21 +200,20 @@ DT_Test::dt_creator (FP_DT_Creator* dt_creator) } FP_DT_Creator* -DT_Test::dt_creator (void) +DT_Test::dt_creator () { return this->dt_creator_; } Fixed_Priority_Scheduler* -DT_Test::scheduler (void) +DT_Test::scheduler () { return this->scheduler_.in (); } int -DT_Test::activate_task (void) +DT_Test::activate_task () { - ACE_DEBUG ((LM_DEBUG, "Test Activate Task\n")); @@ -239,7 +238,7 @@ DT_Test::activate_task (void) } int -DT_Test::svc (void) +DT_Test::svc () { try { @@ -262,7 +261,7 @@ DT_Test::svc (void) } CORBA::ORB_ptr -DT_Test::orb (void) +DT_Test::orb () { return this->orb_.in (); } diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h index 34a0323310d02..9391080ff6bd4 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h @@ -15,23 +15,22 @@ class Task_Stats; class DT_Test :public ACE_Task { public: + DT_Test (); - DT_Test (void); - - void check_supported_priorities (void); + void check_supported_priorities (); int init (int argc, ACE_TCHAR *argv []); void run (int argc, ACE_TCHAR *argv []); void dt_creator (FP_DT_Creator* dt_creator); - FP_DT_Creator* dt_creator (void); + FP_DT_Creator* dt_creator (); - Fixed_Priority_Scheduler* scheduler (void); + Fixed_Priority_Scheduler* scheduler (); - int activate_task (void); + int activate_task (); - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); ACE_hrtime_t base_t; @@ -40,7 +39,6 @@ class DT_Test :public ACE_Task virtual int svc (); - private: /// = Policies long thr_sched_policy_; @@ -55,7 +53,6 @@ class DT_Test :public ACE_Task RTCORBA::RTORB_var rt_orb_; /// Reference to the root poa. PortableServer::POA_var root_poa_; - }; typedef ACE_Singleton DT_TEST; diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp index b2a518cb81ed1..f4723e88252c0 100644 --- a/TAO/examples/RTScheduling/Job_i.cpp +++ b/TAO/examples/RTScheduling/Job_i.cpp @@ -16,22 +16,21 @@ Job_i::Job_i (DT_Creator* dt_creator) // create the stat object. ACE_NEW (task_stats_, Task_Stats); task_stats_->init (100); - } -Job_i::~Job_i (void) +Job_i::~Job_i () { delete task_stats_; } const ACE_CString& -Job_i::name (void) +Job_i::name () { return job_name_; } const ACE_CString& -Job_i::poa (void) +Job_i::poa () { return POA_name_; } @@ -129,19 +128,19 @@ Job_i::post_work (int /*guid*/, } int -Job_i::guid (void) +Job_i::guid () { return this->guid_; } void -Job_i::shutdown (void) +Job_i::shutdown () { dt_creator_->job_ended (); } void -Job_i::dump_stats (void) +Job_i::dump_stats () { ACE_TCHAR fname [BUFSIZ]; ACE_OS::sprintf (fname, diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h index 68976b7d96ba1..3981b40a07675 100644 --- a/TAO/examples/RTScheduling/Job_i.h +++ b/TAO/examples/RTScheduling/Job_i.h @@ -31,14 +31,14 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job /// Constructor Job_i (DT_Creator* dt_creator); - ~Job_i (void); + ~Job_i (); /// Init the state of this object. int init (ACE_Arg_Shifter& arg_shifter); /// = Accessors - const ACE_CString& name (void); - const ACE_CString& poa (void); + const ACE_CString& name (); + const ACE_CString& poa (); /// = inteface Job method implementation. virtual void work (CORBA::ULong work, @@ -47,11 +47,11 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job virtual void post_work (int guid, int importance); - void dump_stats (void); + void dump_stats (); - virtual void shutdown (void); + virtual void shutdown (); - int guid (void); + int guid (); protected: /// The name of this Job diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp index 884f1fb2f4223..52754b1de2792 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp @@ -2,7 +2,7 @@ #include "test.h" #include "MIF_Task.h" -MIF_DT_Creator::MIF_DT_Creator (void) +MIF_DT_Creator::MIF_DT_Creator () { DT_TEST::instance ()->dt_creator (this); } @@ -49,7 +49,6 @@ MIF_DT_Creator::yield (time_t suspend_time, ACE_Time_Value now (ACE_OS::gettimeofday ()); while (((now - *base_time_) < sus_time_value) || (suspend_time == 1)) { - ACE_OS::sleep (1); CORBA::Policy_var sched_param; sched_param = this->sched_param (100); @@ -69,13 +68,13 @@ MIF_DT_Creator::yield (time_t suspend_time, } int -MIF_DT_Creator::total_load (void) +MIF_DT_Creator::total_load () { return 1000; } void -MIF_DT_Creator::wait (void) +MIF_DT_Creator::wait () { while (active_dt_count_ > 0 || active_job_count_ > 0) { diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h index f677b094f9e9e..5e2039eec7a2c 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h @@ -7,11 +7,11 @@ class MIF_DT_Creator: public DT_Creator { public: - MIF_DT_Creator (void); + MIF_DT_Creator (); virtual CORBA::Policy_ptr sched_param (int importance); - //virtual Task* task (void); + //virtual Task* task (); virtual Thread_Task* create_thr_task (int importance, time_t start_time, int load, @@ -22,8 +22,8 @@ class MIF_DT_Creator: public DT_Creator virtual void yield (time_t suspend_time, Thread_Task* task); - virtual void wait (void); - virtual int total_load (void); + virtual void wait (); + virtual int total_load (); }; ACE_STATIC_SVC_DECLARE (MIF_DT_Creator) diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp index a26d17387d14f..406ec0cccad76 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp @@ -14,7 +14,7 @@ DT::DT (TAO_SYNCH_MUTEX &lock, } void -DT::suspend (void) +DT::suspend () { eligible_ = 0; while (!eligible_) @@ -22,14 +22,14 @@ DT::suspend (void) } void -DT::resume (void) +DT::resume () { eligible_ = 1; this->dt_cond_.signal (); } CORBA::Short -Segment_Sched_Param_Policy::importance (void) +Segment_Sched_Param_Policy::importance () { return this->importance_; } @@ -41,7 +41,7 @@ Segment_Sched_Param_Policy::importance (CORBA::Short importance) } CORBA::Policy_ptr -Segment_Sched_Param_Policy::copy (void) +Segment_Sched_Param_Policy::copy () { Segment_Sched_Param_Policy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -54,13 +54,13 @@ Segment_Sched_Param_Policy::copy (void) } CORBA::PolicyType -Segment_Sched_Param_Policy::policy_type (void) +Segment_Sched_Param_Policy::policy_type () { return 0; } void -Segment_Sched_Param_Policy::destroy (void) +Segment_Sched_Param_Policy::destroy () { } @@ -88,7 +88,7 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb) } } -MIF_Scheduler::~MIF_Scheduler (void) +MIF_Scheduler::~MIF_Scheduler () { while (free_que_.message_count () > 0) { @@ -101,7 +101,7 @@ MIF_Scheduler::~MIF_Scheduler (void) } void -MIF_Scheduler::incr_thr_count (void) +MIF_Scheduler::incr_thr_count () { lock_.acquire (); wait_++; @@ -109,7 +109,7 @@ MIF_Scheduler::incr_thr_count (void) } void -MIF_Scheduler::wait (void) +MIF_Scheduler::wait () { lock_.acquire (); while (wait_ > 0) @@ -123,7 +123,7 @@ MIF_Scheduler::wait (void) } void -MIF_Scheduler::resume_main (void) +MIF_Scheduler::resume_main () { wait_--; wait_cond_.signal (); @@ -371,7 +371,6 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_ free_que_.enqueue_prio (run_dt); } lock_.release (); - } void @@ -381,7 +380,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque CORBA::Policy_out sched_param_out, CORBA::Policy_out /*implicit_sched_param*/) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "MIF_Scheduler::receive_request\n")); @@ -451,7 +449,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque void MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr) { - RTScheduling::Current::IdType_var guid = current_->id (); size_t count; @@ -672,7 +669,7 @@ MIF_Scheduler::cancel (const RTScheduling::Current::IdType &) } CORBA::PolicyList* -MIF_Scheduler::scheduling_policies (void) +MIF_Scheduler::scheduling_policies () { return 0; } @@ -683,13 +680,13 @@ MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &) } CORBA::PolicyList* -MIF_Scheduler::poa_policies (void) +MIF_Scheduler::poa_policies () { return 0; } char * -MIF_Scheduler::scheduling_discipline_name (void) +MIF_Scheduler::scheduling_discipline_name () { return 0; } diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h index ea546dc40e99a..faff34ee9e20c 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h @@ -19,8 +19,8 @@ class DT : public ACE_Message_Block DT (TAO_SYNCH_MUTEX &lock, int guid); - void suspend (void); - void resume (void); + void suspend (); + void resume (); private: TAO_SYNCH_CONDITION dt_cond_; @@ -33,15 +33,15 @@ public MIF_Scheduling::SegmentSchedulingParameterPolicy, public ::CORBA::LocalObject { public: - virtual CORBA::Short importance (void); + virtual CORBA::Short importance (); virtual void importance (CORBA::Short importance); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - void destroy (void); + void destroy (); private: CORBA::Short importance_; @@ -54,20 +54,19 @@ public MIF_Scheduling::MIF_Scheduler, public ::CORBA::LocalObject { public: - MIF_Scheduler (CORBA::ORB_ptr orb); - ~MIF_Scheduler (void); + ~MIF_Scheduler (); virtual MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr create_segment_scheduling_parameter (CORBA::Short segment_priority); - void wait (void); + void wait (); - void resume_main (void); + void resume_main (); - void incr_thr_count (void); + void incr_thr_count (); virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, @@ -115,13 +114,13 @@ public ::CORBA::LocalObject virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void); + virtual CORBA::PolicyList * scheduling_policies (); virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void); + virtual CORBA::PolicyList * poa_policies (); - virtual char * scheduling_discipline_name (void); + virtual char * scheduling_discipline_name (); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, CORBA::Policy_ptr scheduling_parameter); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp index d60b0961c979f..7e2fbd38dbf80 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp @@ -23,22 +23,21 @@ MIF_Task::MIF_Task (int importance, // create the stat object. ACE_NEW (task_stats_, Task_Stats); task_stats_->init (iter_); - } -MIF_Task::~MIF_Task (void) +MIF_Task::~MIF_Task () { delete task_stats_; } void -MIF_Task::pre_activate (void) +MIF_Task::pre_activate () { DT_TEST::instance ()->scheduler ()->incr_thr_count (); } void -MIF_Task::post_activate (void) +MIF_Task::post_activate () { DT_TEST::instance ()->scheduler ()->wait (); } @@ -49,7 +48,6 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current, long flags, ACE_Time_Value* base_time) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "MIF_Task::activate %d\n", @@ -81,11 +79,10 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current, } int -MIF_Task::perform_task (void) +MIF_Task::perform_task () { try { - ACE_TCHAR msg [BUFSIZ]; ACE_OS::sprintf (msg, ACE_TEXT("MIF_Task::perform_task ") @@ -136,7 +133,6 @@ MIF_Task::perform_task (void) while (count_down_time > ACE_Time_Value::zero) { - ACE::is_prime (prime_number, 2, prime_number / 2); @@ -146,7 +142,6 @@ MIF_Task::perform_task (void) current_->update_scheduling_segment (name, sched_param.in (), sched_param.in ()); - } } diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h index 5acb899595373..f1183757f377b 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h @@ -14,18 +14,18 @@ class MIF_Task : public Thread_Task char *job_name, DT_Creator *dt_creator); - ~MIF_Task (void); + ~MIF_Task (); virtual int activate_task (RTScheduling::Current_ptr current, CORBA::Policy_ptr sched_param, long flags, ACE_Time_Value* base_time); - virtual int perform_task (void); + virtual int perform_task (); private: - void pre_activate (void); - void post_activate (void); + void pre_activate (); + void post_activate (); }; #endif /*MIF_TASK_H*/ diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp index 612fc46bb0f1f..1fd1c748dc369 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp @@ -24,7 +24,7 @@ class TestShutdown : public ACE_Event_Handler #endif } - ~TestShutdown (void) + ~TestShutdown () { #if !defined(ACE_LACKS_UNIX_SIGNALS) this->shutdown_.remove_handler (SIGTERM); @@ -47,7 +47,7 @@ class TestShutdown : public ACE_Event_Handler ACE_Sig_Handler shutdown_; }; -DT_Test::DT_Test (void) +DT_Test::DT_Test () { } @@ -118,15 +118,14 @@ DT_Test::dt_creator (MIF_DT_Creator* dt_creator) MIF_Scheduler* -DT_Test::scheduler (void) +DT_Test::scheduler () { return this->scheduler_.in (); } /* int -DT_Test::activate_task (void) +DT_Test::activate_task () { - long flags; flags = THR_NEW_LWP | THR_JOINABLE; flags |= @@ -145,12 +144,11 @@ long flags; } int -DT_Test::svc (void) +DT_Test::svc () { try { dt_creator_->create_distributable_threads (current_.in ()); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.h b/TAO/examples/RTScheduling/MIF_Scheduler/test.h index f308c4df398e9..e009c734a6bec 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.h @@ -14,8 +14,7 @@ class Task_Stats; class DT_Test //:public ACE_Task { public: - - DT_Test (void); + DT_Test (); int init (int argc, ACE_TCHAR *argv []); @@ -23,9 +22,9 @@ class DT_Test //:public ACE_Task void dt_creator (MIF_DT_Creator* dt_creator); - MIF_Scheduler* scheduler (void); + MIF_Scheduler* scheduler (); - int activate_task (void); + int activate_task (); /* protected: */ diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp index 5049898618e0d..7ece096155e6f 100644 --- a/TAO/examples/RTScheduling/POA_Holder.cpp +++ b/TAO/examples/RTScheduling/POA_Holder.cpp @@ -5,7 +5,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Log_Msg.h" -POA_Holder::POA_Holder (void) +POA_Holder::POA_Holder () :priority_model_ (RTCORBA::CLIENT_PROPAGATED), server_priority_ (0), thread_pool_ (0) @@ -90,7 +90,6 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter) arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, "Thread Pool Initialized\n")); - } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Bands")))) { @@ -127,7 +126,6 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter) } /* while -- Band values */ ACE_DEBUG ((LM_DEBUG, "Bands Initialized\n")); - } /* if -Bands */ else // something else is showing up ... { @@ -179,7 +177,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ ACE_DEBUG ((LM_DEBUG, "Activated Lanes\n")); - } if (thread_pool_) @@ -203,8 +200,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ ACE_DEBUG ((LM_DEBUG, "Activated thread pool\n")); - - } if (bands_.length () != 0) @@ -214,7 +209,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ rt_orb->create_priority_banded_connection_policy (this->bands_); ACE_DEBUG ((LM_DEBUG, "Activated Bands\n")); - } CORBA::PolicyList poa_policy_list; diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h index 94f45bf0872b1..22fb36645b85b 100644 --- a/TAO/examples/RTScheduling/POA_Holder.h +++ b/TAO/examples/RTScheduling/POA_Holder.h @@ -28,7 +28,7 @@ class RTSCHEDTESTLIB_Export POA_Holder { public: /// Constructor - POA_Holder (void); + POA_Holder (); /// The arg_shifter options are read in the following manner: ///-POA -PriorityModel -Lanes (-Lane , )* -Bands (-Band )* diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp index 57eb4474de0d7..a072dbc2b4e39 100644 --- a/TAO/examples/RTScheduling/Starter.cpp +++ b/TAO/examples/RTScheduling/Starter.cpp @@ -12,7 +12,7 @@ Starter::Starter (CORBA::ORB_ptr orb) } void -Starter::init (void) +Starter::init () { this->resolve_synch_objs (); @@ -20,7 +20,7 @@ Starter::init (void) } void -Starter::fire (void) +Starter::fire () { ACE_Time_Value base_time = ACE_OS::gettimeofday (); for (Synchs::iterator iterator = this->synchs_.begin (); @@ -32,7 +32,7 @@ Starter::fire (void) } void -Starter::resolve_synch_objs (void) +Starter::resolve_synch_objs () { CosNaming::Name name (1); name.length (1); @@ -126,7 +126,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Starter starter (orb.in ()); starter.init (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h index 49b50d41afaf6..664dadde5f96c 100644 --- a/TAO/examples/RTScheduling/Starter.h +++ b/TAO/examples/RTScheduling/Starter.h @@ -12,19 +12,18 @@ class Starter { public: - Starter (CORBA::ORB_ptr orb); - void init (void); + void init (); - void fire (void); + void fire (); typedef ACE_Hash_Map_Manager Synchs; private: - void resolve_synch_objs (void); + void resolve_synch_objs (); void add_to_synchs (CosNaming::BindingList &binding_list); diff --git a/TAO/examples/RTScheduling/Synch_i.cpp b/TAO/examples/RTScheduling/Synch_i.cpp index 8e89b0fc637fe..466cf7cf3f26b 100644 --- a/TAO/examples/RTScheduling/Synch_i.cpp +++ b/TAO/examples/RTScheduling/Synch_i.cpp @@ -1,6 +1,6 @@ #include "Synch_i.h" -Synch_i::Synch_i (void) +Synch_i::Synch_i () { this->synched_ = 0; } @@ -15,13 +15,13 @@ Synch_i::go (CORBA::Long base_time) } int -Synch_i::synched (void) +Synch_i::synched () { return this->synched_; } ACE_Time_Value* -Synch_i::base_time (void) +Synch_i::base_time () { return &this->base_time_; } diff --git a/TAO/examples/RTScheduling/Synch_i.h b/TAO/examples/RTScheduling/Synch_i.h index f5c6a981cdea3..5ccfa567b9808 100644 --- a/TAO/examples/RTScheduling/Synch_i.h +++ b/TAO/examples/RTScheduling/Synch_i.h @@ -6,13 +6,12 @@ class SYNCH_Export Synch_i : public POA_Synch { public: - - Synch_i (void); + Synch_i (); virtual void go (CORBA::Long base_time); - int synched (void); + int synched (); - ACE_Time_Value* base_time (void); + ACE_Time_Value* base_time (); private: int synched_; diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp index 053ffaf63a286..9813c860e90d9 100644 --- a/TAO/examples/RTScheduling/Task_Stats.cpp +++ b/TAO/examples/RTScheduling/Task_Stats.cpp @@ -5,12 +5,12 @@ #include "Task_Stats.inl" #endif /* __ACE_INLINE__ */ -Base_Time::Base_Time (void) +Base_Time::Base_Time () { base_time_ = ACE_OS::gethrtime (); } -Task_Stats::Task_Stats (void) +Task_Stats::Task_Stats () : base_time_(0), end_time_ (0), max_samples_ (0), @@ -26,7 +26,7 @@ Task_Stats::Task_Stats (void) { } -Task_Stats::~Task_Stats (void) +Task_Stats::~Task_Stats () { delete[] this->thr_run_time_; delete[] this->thr_count_; diff --git a/TAO/examples/RTScheduling/Task_Stats.h b/TAO/examples/RTScheduling/Task_Stats.h index 5a556e030c492..a99faeeeaa818 100644 --- a/TAO/examples/RTScheduling/Task_Stats.h +++ b/TAO/examples/RTScheduling/Task_Stats.h @@ -27,7 +27,7 @@ class RTSCHEDTESTLIB_Export Base_Time { public: - Base_Time (void); + Base_Time (); ACE_hrtime_t base_time_; }; @@ -42,10 +42,10 @@ class RTSCHEDTESTLIB_Export Task_Stats { public: /// Constructor - Task_Stats (void); + Task_Stats (); /// Destructor - ~Task_Stats (void); + ~Task_Stats (); /// Init int init (size_t max_samples); diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp index 4c8ceb2ad23e6..d14bfe3b2e858 100644 --- a/TAO/examples/RTScheduling/Thread_Task.cpp +++ b/TAO/examples/RTScheduling/Thread_Task.cpp @@ -7,7 +7,7 @@ #include "ace/High_Res_Timer.h" #include "ace/Atomic_Op.h" -Thread_Task::Thread_Task (void) +Thread_Task::Thread_Task () : start_time_ (0), load_ (0), iter_ (0), @@ -22,7 +22,7 @@ Thread_Task::Thread_Task (void) } int -Thread_Task::svc (void) +Thread_Task::svc () { try { @@ -72,26 +72,26 @@ Thread_Task::svc (void) } int -Thread_Task::importance (void) +Thread_Task::importance () { return this->importance_; } time_t -Thread_Task::start_time (void) +Thread_Task::start_time () { return this->start_time_; } int -Thread_Task::perform_task (void) +Thread_Task::perform_task () { return 0; } const char* -Thread_Task::job (void) +Thread_Task::job () { return job_name_.in (); } @@ -103,13 +103,13 @@ Thread_Task::job (Job_ptr job) } int -Thread_Task::dist (void) +Thread_Task::dist () { return this->dist_; } void -Thread_Task::dump_stats (void) +Thread_Task::dump_stats () { ACE_TCHAR fname [BUFSIZ]; ACE_OS::sprintf (fname, diff --git a/TAO/examples/RTScheduling/Thread_Task.h b/TAO/examples/RTScheduling/Thread_Task.h index 0079d0e256ee9..cab325d8eff7d 100644 --- a/TAO/examples/RTScheduling/Thread_Task.h +++ b/TAO/examples/RTScheduling/Thread_Task.h @@ -13,30 +13,29 @@ class DT_Creator; class RTSCHEDTESTLIB_Export Thread_Task : public ACE_Task { public: - - Thread_Task (void); + Thread_Task (); virtual int activate_task (RTScheduling::Current_ptr current, CORBA::Policy_ptr sched_param, long flags, ACE_Time_Value* base_time) = 0; - virtual int perform_task (void); + virtual int perform_task (); - int importance (void); + int importance (); - time_t start_time (void); + time_t start_time (); /// = Job get/set /// Returns the name of the Job exec'ed by this Task. - const char* job (void); + const char* job (); /// Sets the Job to exec. void job (Job_ptr job); - int dist (void); + int dist (); - void dump_stats (void); + void dump_stats (); protected: /// task svc diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index b4dd8c39ef221..3958418597aa6 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -11,7 +11,7 @@ // Constructor. template -Server::Server (void) +Server::Server () : servant_ (0) , ior_output_file_ (0) , naming_ (0) @@ -26,7 +26,7 @@ Server::Server (void) // Parse the command-line arguments and set options. template int -Server::parse_args (void) +Server::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT ("do:ni:"), 1, 0, @@ -186,7 +186,7 @@ Server::init (const char *servant_name, } template int -Server::run (void) +Server::run () { // Run the main event loop for the ORB. if (this->orb_manager_.run () == -1) @@ -283,7 +283,7 @@ Client::read_ior (ACE_TCHAR *filename) // Parses the command line arguments and returns an error status. template int -Client::parse_args (void) +Client::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT ("df:nk:x"), 1, 0, @@ -387,8 +387,6 @@ Client::init (const char *name, ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("no ior or naming options specified\n")), -1); - - } catch (const CORBA::Exception& ex) { @@ -436,7 +434,7 @@ Client::obtain_initial_references (const char *name) } template int -Client::do_shutdown (void) +Client::do_shutdown () { // Returns the shutdwon flag return this->do_shutdown_; diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h index a501bdcb429f1..d78ad81de959c 100644 --- a/TAO/examples/Simple/Simple_util.h +++ b/TAO/examples/Simple/Simple_util.h @@ -114,7 +114,7 @@ class Client ServerInterface *operator-> () { return server_.in (); } /// Returns the shutdown flag. - int do_shutdown (void); + int do_shutdown (); /// Fills in the shutdwon flag. void do_shutdown (int); @@ -122,7 +122,7 @@ class Client /// Initialize naming service int obtain_initial_references (const char *name); - CORBA::ORB_ptr orb (void) + CORBA::ORB_ptr orb () { return CORBA::ORB::_duplicate (this->orb_.in ()); } @@ -132,7 +132,7 @@ class Client int read_ior (ACE_TCHAR *filename); /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// Remember our orb. CORBA::ORB_var orb_; @@ -160,11 +160,6 @@ class Client int do_shutdown_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Simple_util.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_UTIL_H */ diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp index 35010cece906c..7cd2405208e84 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.cpp +++ b/TAO/examples/Simple/bank/AccountManager_i.cpp @@ -4,13 +4,13 @@ #include "tao/Utils/ORB_Manager.h" // Constructor -AccountManager_i::AccountManager_i (void) : +AccountManager_i::AccountManager_i () : orb_manager_ (0) { } // Destructor -AccountManager_i::~AccountManager_i (void) +AccountManager_i::~AccountManager_i () { } @@ -114,7 +114,7 @@ AccountManager_i::close (Bank::Account_ptr account) } void -AccountManager_i::shutdown (void) +AccountManager_i::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n[SERVER] Process/Thread Id : (%P/%t) AccountManager_i is shutting down\n"))); diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h index b18f8c00829a7..a948759e16158 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.h +++ b/TAO/examples/Simple/bank/AccountManager_i.h @@ -45,10 +45,10 @@ class AccountManager_i : public POA_Bank::AccountManager { public: /// Constructor. - AccountManager_i (void); + AccountManager_i (); /// Destructor. - virtual ~AccountManager_i (void); + virtual ~AccountManager_i (); /// Return the Account interface with the given name from the server. /// Put the initial balance specified in the new account. @@ -59,7 +59,7 @@ class AccountManager_i : public POA_Bank::AccountManager virtual void close (Bank::Account_ptr); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp index e301f7fab9799..5b2fb3a795464 100644 --- a/TAO/examples/Simple/bank/Account_i.cpp +++ b/TAO/examples/Simple/bank/Account_i.cpp @@ -1,7 +1,7 @@ #include "Account_i.h" // Constructor -Account_i::Account_i (void) +Account_i::Account_i () { } @@ -13,7 +13,7 @@ Account_i::Account_i (const char *name, } // Destructor -Account_i::~Account_i (void) +Account_i::~Account_i () { } @@ -26,7 +26,7 @@ Account_i::orb (CORBA::ORB_ptr o) // Return the current balance on the server. CORBA::Float -Account_i::balance (void) +Account_i::balance () { return balance_; } @@ -47,7 +47,7 @@ Account_i::withdraw (CORBA::Float withdrawl) } char * -Account_i::name (void) +Account_i::name () { return CORBA::string_dup (this->name_.in ()); } diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h index bbdfa6775acc0..9e20a47f7b288 100644 --- a/TAO/examples/Simple/bank/Account_i.h +++ b/TAO/examples/Simple/bank/Account_i.h @@ -29,19 +29,19 @@ class Account_i : public POA_Bank::Account { public: /// Constructor. - Account_i (void); + Account_i (); /// Constructor. Account_i (const char *, CORBA::Float); /// Destructor. - virtual ~Account_i (void); + virtual ~Account_i (); /// Get the current balance in the account. - virtual CORBA::Float balance (void); + virtual CORBA::Float balance (); /// Get the name of the holder. - virtual char *name (void); + virtual char *name (); /// Set the name of the holder. virtual void name (const char *name); diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp index 11d6d825e9457..6192e1b171b0c 100644 --- a/TAO/examples/Simple/bank/Bank_Client_i.cpp +++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp @@ -6,13 +6,13 @@ // This is the interface program that accesses the remote object // Constructor. -Bank_Client_i::Bank_Client_i (void) +Bank_Client_i::Bank_Client_i () { //no-op } //Destructor. -Bank_Client_i::~Bank_Client_i (void) +Bank_Client_i::~Bank_Client_i () { //no-op } @@ -42,7 +42,7 @@ Bank_Client_i::run (const char *name, } int -Bank_Client_i::check_accounts (void) +Bank_Client_i::check_accounts () { try { @@ -69,9 +69,8 @@ Bank_Client_i::check_accounts (void) // This method tests whether an account with a // a same name can be opened void -Bank_Client_i::test_for_same_name (void) +Bank_Client_i::test_for_same_name () { - const char *name = "Name"; CORBA::Float initial_bal = 0.00; @@ -88,7 +87,7 @@ Bank_Client_i::test_for_same_name (void) // This method tests whether an account with different names can be opened void -Bank_Client_i::test_for_different_name (void) +Bank_Client_i::test_for_different_name () { const char *name1 = "Name1"; const char *name2 = "Name2"; @@ -109,7 +108,7 @@ Bank_Client_i::test_for_different_name (void) // This method tests the Overdraft exception. void -Bank_Client_i::test_for_overdraft (void) +Bank_Client_i::test_for_overdraft () { CORBA::Float initial_bal = 100.0; const char *name = "Name"; diff --git a/TAO/examples/Simple/bank/Bank_Client_i.h b/TAO/examples/Simple/bank/Bank_Client_i.h index 944707d5e3618..7d040afd6619f 100644 --- a/TAO/examples/Simple/bank/Bank_Client_i.h +++ b/TAO/examples/Simple/bank/Bank_Client_i.h @@ -29,29 +29,29 @@ class Bank_Client_i { public: /// Constructor - Bank_Client_i (void); + Bank_Client_i (); /// Destructor - ~Bank_Client_i (void); + ~Bank_Client_i (); /// Execute the methods. int run (const char *, int, ACE_TCHAR *[]); private: /// Method that calls all the test functions - int check_accounts (void); + int check_accounts (); /// Tests if accounts opened with different names return a different account /// reference. - void test_for_different_name (void); + void test_for_different_name (); /// Tests if accounts opened with the same name return the same /// object reference. - void test_for_same_name (void); + void test_for_same_name (); /// Tests for the Overdraft Exception when the client tries to /// withdraw more money than the current balance. - void test_for_overdraft (void); + void test_for_overdraft (); /// Instantiate the client object. Client client_; diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h index edb64d53b42e5..8ba5d447ccc57 100644 --- a/TAO/examples/Simple/chat/Broadcaster_i.h +++ b/TAO/examples/Simple/chat/Broadcaster_i.h @@ -35,10 +35,10 @@ class Broadcaster_i : public POA_Broadcaster { public: /// Constructor. - Broadcaster_i (void) = default; + Broadcaster_i () = default; /// Destructor. - virtual ~Broadcaster_i (void) = default; + virtual ~Broadcaster_i () = default; /// Saves receiver references in a list. virtual void add (Receiver_ptr receiver, diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp index f5773f4e00a7d..714bebc94c0f3 100644 --- a/TAO/examples/Simple/chat/Client_i.cpp +++ b/TAO/examples/Simple/chat/Client_i.cpp @@ -118,7 +118,7 @@ Client_i::init (int argc, ACE_TCHAR *argv[]) } int -Client_i::run (void) +Client_i::run () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n============= Simple Chat =================\n") diff --git a/TAO/examples/Simple/chat/Client_i.h b/TAO/examples/Simple/chat/Client_i.h index c9c8d33be7816..beb17fffb9d98 100644 --- a/TAO/examples/Simple/chat/Client_i.h +++ b/TAO/examples/Simple/chat/Client_i.h @@ -40,13 +40,13 @@ class Client_i : public ACE_Event_Handler { public: /// Constructor. - Client_i (void); + Client_i (); /// Initialize the client communication with the server. int init (int argc, ACE_TCHAR *argv[]); /// Start the ORB object. - int run (void); + int run (); /// Handle the user input. virtual int handle_input (ACE_HANDLE); diff --git a/TAO/examples/Simple/chat/Receiver_i.cpp b/TAO/examples/Simple/chat/Receiver_i.cpp index cfebe82f8eb3d..23aec18bea558 100644 --- a/TAO/examples/Simple/chat/Receiver_i.cpp +++ b/TAO/examples/Simple/chat/Receiver_i.cpp @@ -12,12 +12,12 @@ #include "Receiver_i.h" -Receiver_i::Receiver_i (void) +Receiver_i::Receiver_i () : orb_ (0) { } -Receiver_i::~Receiver_i (void) +Receiver_i::~Receiver_i () { } @@ -30,7 +30,7 @@ Receiver_i::message (const char *msg) } void -Receiver_i::shutdown (void) +Receiver_i::shutdown () { // Instruct the ORB to shutdown. this->orb_->shutdown (); diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h index 1f9fa39a46a30..8a552707ea880 100644 --- a/TAO/examples/Simple/chat/Receiver_i.h +++ b/TAO/examples/Simple/chat/Receiver_i.h @@ -27,10 +27,10 @@ class Receiver_i : public POA_Receiver { public: /// Constructor. - Receiver_i (void); + Receiver_i (); /// Destructor. - virtual ~Receiver_i (void); + virtual ~Receiver_i (); /// Receives a message string. virtual void message (const char *msg); @@ -40,7 +40,7 @@ class Receiver_i : public POA_Receiver * implementation should shutdown the chat client in response to * this. */ - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp index c62fb1f7bb728..6628b345992d5 100644 --- a/TAO/examples/Simple/chat/Server_i.cpp +++ b/TAO/examples/Simple/chat/Server_i.cpp @@ -24,7 +24,7 @@ Server_i::Server_i () this->broadcaster_i_ = tmp; } -Server_i::~Server_i (void) +Server_i::~Server_i () { // NO Op. } @@ -82,7 +82,7 @@ Server_i::init (int argc, } int -Server_i::run (void) +Server_i::run () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running chat server...\n"))); diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h index 232234e6726fd..b0b0a020a87f9 100644 --- a/TAO/examples/Simple/chat/Server_i.h +++ b/TAO/examples/Simple/chat/Server_i.h @@ -26,20 +26,19 @@ */ class Server_i { - public: /// Constructor. - Server_i (void); + Server_i (); /// Destructor. - ~Server_i (void); + ~Server_i (); /// Initialize the server. int init (int argc, ACE_TCHAR *argv[]); /// Run the ORB. - int run (void); + int run (); private: /// Parses the command line arguments. diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp index 136d74f224b79..c32847e6c1ca8 100644 --- a/TAO/examples/Simple/echo/Echo_i.cpp +++ b/TAO/examples/Simple/echo/Echo_i.cpp @@ -66,7 +66,7 @@ Echo_i::echo_string (const char *mesg) // Shutdown the server application. void -Echo_i::shutdown (void) +Echo_i::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nThe echo server is shutting down\n"))); diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h index 3fc17f6347ca6..88a6fee506eac 100644 --- a/TAO/examples/Simple/echo/Echo_i.h +++ b/TAO/examples/Simple/echo/Echo_i.h @@ -30,10 +30,10 @@ class Echo_i : public POA_Echo { public: /// Constructor. - Echo_i (void) = default; + Echo_i () = default; /// Destructor. - virtual ~Echo_i (void) = default; + virtual ~Echo_i () = default; /// Return the mesg string back from the server. virtual Echo::List *echo_list (const char *mesg); @@ -42,7 +42,7 @@ class Echo_i : public POA_Echo virtual char *echo_string (const char *mesg); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp index c3405df96d70e..d9f89666569c2 100644 --- a/TAO/examples/Simple/grid/Grid_Client_i.cpp +++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp @@ -7,7 +7,7 @@ // This is the interface program that accesses the remote object // Constructor. -Grid_Client_i::Grid_Client_i (void) +Grid_Client_i::Grid_Client_i () : height_ (0), width_ (0), setx_ (0), @@ -19,7 +19,7 @@ Grid_Client_i::Grid_Client_i (void) } //Destructor. -Grid_Client_i::~Grid_Client_i (void) +Grid_Client_i::~Grid_Client_i () { //no-op } diff --git a/TAO/examples/Simple/grid/Grid_Client_i.h b/TAO/examples/Simple/grid/Grid_Client_i.h index f95daa5c4c616..766f70ea17dab 100644 --- a/TAO/examples/Simple/grid/Grid_Client_i.h +++ b/TAO/examples/Simple/grid/Grid_Client_i.h @@ -29,10 +29,10 @@ class Grid_Client_i { public: /// Constructor - Grid_Client_i (void); + Grid_Client_i (); /// Destructor - ~Grid_Client_i (void); + ~Grid_Client_i (); /// Execute the methods. int run (const char *, int, ACE_TCHAR *[]); diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp index 52419e2f08ba5..6906f8585d737 100644 --- a/TAO/examples/Simple/grid/Grid_i.cpp +++ b/TAO/examples/Simple/grid/Grid_i.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- #include "Grid_i.h" -// Solaris and some Windows compilers don't have min in std namespaces +// Some Windows compilers don't have min in std namespaces // moreover on Windows 'min' is a macro, so we have to avoid using it literally. CORBA::UShort Grid_i::ushort_min (CORBA::UShort a, CORBA::UShort b) @@ -10,7 +10,7 @@ Grid_i::ushort_min (CORBA::UShort a, CORBA::UShort b) } // Default constructor. -Grid_i::Grid_i (void) +Grid_i::Grid_i () : width_ (0), height_ (0), array_ (0) @@ -28,7 +28,7 @@ Grid_i::Grid_i (CORBA::Short x, } // Default destructor. -Grid_i::~Grid_i (void) +Grid_i::~Grid_i () { } @@ -71,13 +71,13 @@ Grid_i::get (CORBA::Short x, // Access methods. CORBA::Short -Grid_i::width (void) +Grid_i::width () { return this->width_; } CORBA::Short -Grid_i::height (void) +Grid_i::height () { return this->height_; } @@ -118,7 +118,7 @@ Grid_i::height (CORBA::Short y) // Destroy the grid void -Grid_i::destroy (void) +Grid_i::destroy () { // Delete the array. ACE_Auto_Array_Ptr tmp (this->array_.release ()); @@ -150,7 +150,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o) // Shutdown. void -Grid_Factory_i::shutdown (void) +Grid_Factory_i::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Grid Factory is shutting down\n"))); @@ -160,12 +160,12 @@ Grid_Factory_i::shutdown (void) } // Constructor -Grid_Factory_i::Grid_Factory_i (void) +Grid_Factory_i::Grid_Factory_i () { } // Destructor -Grid_Factory_i::~Grid_Factory_i (void) +Grid_Factory_i::~Grid_Factory_i () { } diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h index 8b44630bf8479..fcce738f501fd 100644 --- a/TAO/examples/Simple/grid/Grid_i.h +++ b/TAO/examples/Simple/grid/Grid_i.h @@ -27,20 +27,20 @@ class Grid_i: public POA_Grid { public: /// Constructor - Grid_i (void); + Grid_i (); /// Constructor. Grid_i (CORBA::Short, CORBA::Short); /// Destructor - virtual ~Grid_i (void); + virtual ~Grid_i (); /// Returns the width of the grid - virtual CORBA::Short width (void); + virtual CORBA::Short width (); /// Returns the height of the grid - virtual CORBA::Short height (void); + virtual CORBA::Short height (); /// Sets the width of the grid. virtual void width (CORBA::Short); @@ -58,7 +58,7 @@ class Grid_i: public POA_Grid CORBA::Short); /// Destroy the grid. - virtual void destroy (void); + virtual void destroy (); private: /// Allocates array @@ -74,7 +74,7 @@ class Grid_i: public POA_Grid typedef ACE_Auto_Array_Ptr GridArray; GridArray array_; - /// Solaris and some Windows compilers don't have min in std namespaces + /// Some Windows compilers don't have min in std namespaces static CORBA::UShort ushort_min (CORBA::UShort, CORBA::UShort); }; @@ -87,17 +87,17 @@ class Grid_Factory_i : public POA_Grid_Factory { public: /// Constructor. - Grid_Factory_i (void); + Grid_Factory_i (); /// Destructor. - virtual ~Grid_Factory_i (void); + virtual ~Grid_Factory_i (); /// This function creates and returns a . virtual Grid_ptr make_grid (CORBA::Short, CORBA::Short); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp index 935af26ce7c87..d1f3f80610750 100644 --- a/TAO/examples/Simple/time-date/Time_Date.cpp +++ b/TAO/examples/Simple/time-date/Time_Date.cpp @@ -17,7 +17,7 @@ ACE_Reactor * -My_Resource_Factory::get_reactor (void) +My_Resource_Factory::get_reactor () { #if defined (ACE_HAS_THREADS) // Use whatever the default is if we've got threads. @@ -31,7 +31,7 @@ My_Resource_Factory::get_reactor (void) ACE_FACTORY_DEFINE (Alt_Resource_Factory, My_Resource_Factory) int -DLL_ORB::svc (void) +DLL_ORB::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\tRunning ORB event loop (%t)\n\n"))); @@ -111,7 +111,7 @@ DLL_ORB::init (int argc, ACE_TCHAR *argv[]) } int -DLL_ORB::fini (void) +DLL_ORB::fini () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\tFinalizing the service (%t)\n\n"))); @@ -119,7 +119,7 @@ DLL_ORB::fini (void) // return 0; } -Time_Date_Servant::Time_Date_Servant (void) +Time_Date_Servant::Time_Date_Servant () : servant_ (0) , ior_output_file_ (0) , orb_ ("") diff --git a/TAO/examples/Simple/time-date/Time_Date.h b/TAO/examples/Simple/time-date/Time_Date.h index fb63add9109fd..1e109e220918b 100644 --- a/TAO/examples/Simple/time-date/Time_Date.h +++ b/TAO/examples/Simple/time-date/Time_Date.h @@ -21,7 +21,7 @@ class Alt_Resource_Factory_Export My_Resource_Factory { public: /// Return the @c ACE_Reactor that will be utilized by the ORB. - virtual ACE_Reactor *get_reactor (void); + virtual ACE_Reactor *get_reactor (); }; ACE_FACTORY_DECLARE (Alt_Resource_Factory, My_Resource_Factory) @@ -66,7 +66,7 @@ class ACE_Svc_Export Time_Date_Servant : public ACE_Service_Object { public: /// Constructor. - Time_Date_Servant (void); + Time_Date_Servant (); /// Initialize the @c Time_Date servant. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp index 346a83df81f45..8197bff640125 100644 --- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp +++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp @@ -5,12 +5,12 @@ // This is the interface program that accesses the remote object // Constructor. -Time_Date_Client_i::Time_Date_Client_i (void) +Time_Date_Client_i::Time_Date_Client_i () { } //Destructor. -Time_Date_Client_i::~Time_Date_Client_i (void) +Time_Date_Client_i::~Time_Date_Client_i () { } diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.h b/TAO/examples/Simple/time-date/Time_Date_Client_i.h index 9a5df732376a7..65b745ae5dbdd 100644 --- a/TAO/examples/Simple/time-date/Time_Date_Client_i.h +++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.h @@ -29,10 +29,10 @@ class Time_Date_Client_i { public: /// Constructor - Time_Date_Client_i (void); + Time_Date_Client_i (); /// Destructor - virtual ~Time_Date_Client_i (void); + virtual ~Time_Date_Client_i (); /// Execute the methods. virtual int run (const char *, int, ACE_TCHAR *[]); diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp index 05d0a0858545d..d19532eb481ec 100644 --- a/TAO/examples/Simple/time-date/Time_Date_i.cpp +++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp @@ -21,7 +21,7 @@ Time_Date_i::str_date (CORBA::String_out time_date) // Shutdown. void -Time_Date_i::shutdown (void) +Time_Date_i::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Time_Date_i is shutting down\n"))); diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h index 9fccb9e978dec..1b6f7347fed90 100644 --- a/TAO/examples/Simple/time-date/Time_Date_i.h +++ b/TAO/examples/Simple/time-date/Time_Date_i.h @@ -32,7 +32,7 @@ class Time_Date_i virtual void str_date (CORBA::String_out time_date); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); /// ORB pointer. void orb (CORBA::ORB_ptr orb_ptr); diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index 43c46e20502e0..87feb97e09998 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -4,13 +4,13 @@ // This is the interface program that accesses the remote object // Constructor. -Time_Client_i::Time_Client_i (void) +Time_Client_i::Time_Client_i () { //no-op } //Destructor. -Time_Client_i::~Time_Client_i (void) +Time_Client_i::~Time_Client_i () { //no-op } @@ -27,13 +27,8 @@ Time_Client_i::run (const char *name, try { // 64-bit OS's require pointers to be aligned on an - // 8 byte boundary. 64-bit HP-UX requires a double to do this - // while a long does it for 64-bit Solaris. -#if defined (HPUX) - CORBA::Double padding = 0.0; -#else + // 8 byte boundary. CORBA::Long padding = 0; -#endif /* HPUX */ time_t timedate; ACE_UNUSED_ARG (padding); @@ -42,8 +37,6 @@ Time_Client_i::run (const char *name, timedate = static_cast (client_->current_time ()); // Print out value - // Use ACE_OS::ctime_r(), ctime() doesn't seem to work properly - // under 64-bit solaris. ACE_TCHAR ascii_timedate[64] = ACE_TEXT (""); ACE_OS::ctime_r (&timedate, ascii_timedate, 64); diff --git a/TAO/examples/Simple/time/Time_Client_i.h b/TAO/examples/Simple/time/Time_Client_i.h index a1d995efd7c87..4f5540a096403 100644 --- a/TAO/examples/Simple/time/Time_Client_i.h +++ b/TAO/examples/Simple/time/Time_Client_i.h @@ -29,10 +29,10 @@ class Time_Client_i { public: /// Constructor - Time_Client_i (void); + Time_Client_i (); /// Destructor - ~Time_Client_i (void); + ~Time_Client_i (); /// Execute the methods int run (const char *, int, ACE_TCHAR**); diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp index 65dd56da0743e..da2012edaefc9 100644 --- a/TAO/examples/Simple/time/Time_i.cpp +++ b/TAO/examples/Simple/time/Time_i.cpp @@ -2,12 +2,12 @@ #include "ace/OS_NS_time.h" // Constructor -Time_i::Time_i (void) +Time_i::Time_i () { } // Destructor -Time_i::~Time_i (void) +Time_i::~Time_i () { } @@ -20,14 +20,14 @@ Time_i::orb (CORBA::ORB_ptr o) // Return the current date/time on the server. CORBA::Long -Time_i::current_time (void) +Time_i::current_time () { return CORBA::Long (ACE_OS::time (0)); } // Shutdown. void -Time_i::shutdown (void) +Time_i::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Time_i is shutting down\n"))); diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h index a3c9556d137a0..9a990e976be3c 100644 --- a/TAO/examples/Simple/time/Time_i.h +++ b/TAO/examples/Simple/time/Time_i.h @@ -29,16 +29,16 @@ class Time_i: public POA_Time { public: /// Constructor - Time_i (void); + Time_i (); /// Destructor - virtual ~Time_i (void); + virtual ~Time_i (); /// Return the current time/date on the server - virtual CORBA::Long current_time (void); + virtual CORBA::Long current_time (); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp index 750be01de8ba6..9514648ec5263 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp @@ -54,13 +54,12 @@ DOVE_Supplier::~DOVE_Supplier () delete [] this->connection_params_list_; delete internal_DOVE_Supplier_ptr_; - } // Initialize the ORB and the connection to the Name Service int -DOVE_Supplier::init (void) +DOVE_Supplier::init () { try { @@ -206,7 +205,6 @@ DOVE_Supplier::connect (const char* MIB_name, } return 0; - } @@ -303,7 +301,6 @@ DOVE_Supplier::use_prev_connection () } - // -------------------- Internal Demo Supplier ----------------------------- DOVE_Supplier::Internal_DOVE_Supplier::Internal_DOVE_Supplier (DOVE_Supplier *impl_ptr) @@ -400,7 +397,6 @@ DOVE_Supplier::connect_Supplier () static_cast (this->current_connection_params_->pod_rt_info_.info_type)); - // Set the publications to report them to the event channel. CORBA::Short x = 0; @@ -442,7 +438,6 @@ DOVE_Supplier::connect_Supplier () } return 0; - } diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h index 3fa707d27e84d..8fb279a321d89 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h @@ -30,15 +30,14 @@ class DOVE_Supplier { public: - /// Constructor. DOVE_Supplier (); /// Destructor. - ~DOVE_Supplier (void); + ~DOVE_Supplier (); /// Initialize the ORB and the connection to the Name Service - int init (void); + int init (); /// Connect to the event service. int connect (const char * MIB_name = 0, @@ -62,7 +61,6 @@ class DOVE_Supplier void use_prev_connection (); private: - // The following Supplier is needed because DOVE_Supplier has not // inherited from PushSupplier. @@ -71,20 +69,17 @@ class DOVE_Supplier friend class DOVE_Supplier; public: - - virtual void disconnect_push_supplier (void) + virtual void disconnect_push_supplier () { } private: - Internal_DOVE_Supplier (DOVE_Supplier* impl_ptr); DOVE_Supplier* impl_ptr_; }; private: - struct Connection_Params { const char * es_name_; diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index fb2b427f32484..73eea3a075b45 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -186,7 +186,6 @@ DualEC_Supplier::init () this->naming_context_ = CosNaming::NamingContext::_narrow (namingObj_var.in ()); - } catch (const CORBA::Exception& ex) { @@ -266,7 +265,7 @@ DualEC_Supplier::init () // Private class that implements a termination servant. void -DualEC_Supplier::Terminator::shutdown (void) +DualEC_Supplier::Terminator::shutdown () { TAO_ORB_Core_instance ()->orb ()->shutdown (); } @@ -349,10 +348,8 @@ DualEC_Supplier::run_nav_thread (void *arg) if (nav_iter.done ()) nav_iter.first (); - } while (++total_sent < sup->total_messages_); - } catch (const CORBA::Exception&) { @@ -418,10 +415,8 @@ DualEC_Supplier::run_weap_thread (void *arg) if (weap_iter.done ()) weap_iter.first (); - } while (++total_sent < sup->total_messages_); - } catch (const CORBA::Exception&) { @@ -431,12 +426,11 @@ DualEC_Supplier::run_weap_thread (void *arg) } - // Create two scheduling service instances, register // them with the Naming Service. int -DualEC_Supplier::create_schedulers (void) +DualEC_Supplier::create_schedulers () { // @@TBD - look at a command line modified setting, // create either a runtime or a config scheduler for @@ -548,8 +542,6 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_lo_.quantum, this->rt_info_dummy_lo_.threads, static_cast (this->rt_info_dummy_lo_.info_type)); - - } } catch (const CORBA::Exception& ex) @@ -566,7 +558,7 @@ DualEC_Supplier::create_schedulers (void) // them with the Naming Service. int -DualEC_Supplier::create_event_channels (void) +DualEC_Supplier::create_event_channels () { try { @@ -601,7 +593,6 @@ DualEC_Supplier::create_event_channels (void) naming_context_->bind (this->channel_lo_name_, this->ec_lo_.in ()); - } catch (const CORBA::Exception& ex) { @@ -613,7 +604,7 @@ DualEC_Supplier::create_event_channels (void) } void -DualEC_Supplier::compute_schedules (void) +DualEC_Supplier::compute_schedules () { try { @@ -662,7 +653,7 @@ DualEC_Supplier::compute_schedules (void) } void -DualEC_Supplier::start_generating_events (void) +DualEC_Supplier::start_generating_events () { try { @@ -1013,7 +1004,7 @@ DualEC_Supplier::get_options (int argc, ACE_TCHAR *argv []) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); @@ -1032,7 +1023,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } - try { // Initialize ORB. diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h index e9df243f73191..cc5dc5f289ffb 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h @@ -50,29 +50,27 @@ struct Schedule_Viewer_Data class DualEC_Supplier { public: - DualEC_Supplier (int argc, ACE_TCHAR** argv); - ~DualEC_Supplier (void); + ~DualEC_Supplier (); /// Initialize: set up, resolve ORB services, /// connect the DOVE_Suppliers. - int init (void); + int init (); /// Compute schedule priorities, possibly dump /// data into runtime scheduler header files. - void compute_schedules (void); + void compute_schedules (); /// here is really something going on, /// here we deliver the messages - void start_generating_events (void); + void start_generating_events (); /// Load the scheduling information into memory void load_schedule_data (); private: - /** * @class Terminator * @@ -80,7 +78,7 @@ class DualEC_Supplier */ class Terminator : public POA_NavWeapTerminator { - void shutdown (void); + void shutdown (); }; /// Run the orb event loop. @@ -94,11 +92,11 @@ class DualEC_Supplier /// Create two scheduling service instances, registers /// them with the Naming Service. - int create_schedulers (void); + int create_schedulers (); /// Create two event service instances, registers /// them with the Naming Service. - int create_event_channels (void); + int create_event_channels (); /// Get command line options. unsigned int get_options (int argc, ACE_TCHAR *argv []); diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index 8b3f456d39c85..a4559e8963cb7 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -44,7 +44,7 @@ static int received = 0; // ************************************************************ -Demo_Consumer::Demo_Consumer (void) +Demo_Consumer::Demo_Consumer () { } @@ -123,7 +123,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, } void -Demo_Consumer::disconnect_push_consumer (void) +Demo_Consumer::disconnect_push_consumer () { ACE_DEBUG ((LM_DEBUG, "Consumer received disconnect from channel.\n")); @@ -132,7 +132,6 @@ Demo_Consumer::disconnect_push_consumer (void) void Demo_Consumer::push (const RtecEventComm::EventSet &events) { - if (events.length () == 0) { ACE_DEBUG ((LM_DEBUG, "no events\n")); @@ -194,7 +193,7 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events) } void -Demo_Consumer::shutdown (void) +Demo_Consumer::shutdown () { try { @@ -332,7 +331,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) delete demo_consumer; root_poa->destroy (true, true); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h index 5536e2fe4426e..377344095a743 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h @@ -32,7 +32,7 @@ class Demo_Consumer : public POA_RtecEventComm::PushConsumer { public: - Demo_Consumer (void); + Demo_Consumer (); /** * Uses the name server to obtain a reference to the @@ -45,7 +45,7 @@ class Demo_Consumer : public POA_RtecEventComm::PushConsumer const char *my_name); /// The channel is disconnecting. - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // = (not protected to allow short-circuiting) protected: /** @@ -57,7 +57,7 @@ class Demo_Consumer : public POA_RtecEventComm::PushConsumer protected: /// Disconnect from the Event Service. - void shutdown (void); + void shutdown (); // = Event channel adminstration references. RtecEventChannelAdmin::EventChannel_var channel_admin_; diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index 5afcf85c89c87..984e5904e7b1c 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -56,7 +56,7 @@ Event_Supplier::init () } void -Event_Supplier::start_generating_events (void) +Event_Supplier::start_generating_events () { unsigned long total_sent = 0; @@ -78,7 +78,6 @@ Event_Supplier::start_generating_events (void) do { - // Insert the event data this->insert_event_data (any, schedule_iter); @@ -330,7 +329,6 @@ Event_Supplier::insert_event_data (CORBA::Any &data, } - if (last_completion > (*sched_data)->completion_time) last_completion = 0; @@ -361,7 +359,6 @@ Event_Supplier::insert_event_data (CORBA::Any &data, } - // Function get_options. unsigned int @@ -456,7 +453,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // when done, we clean up delete event_Supplier_ptr; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h index 9b27ba8c1f6dd..a15bc247c4ada 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h @@ -42,17 +42,16 @@ struct Schedule_Viewer_Data class Event_Supplier { public: - Event_Supplier (int argc, ACE_TCHAR** argv); - ~Event_Supplier (void); + ~Event_Supplier (); /// connect the DOVE_Supplier - int init (void); + int init (); /// here is really something going on, /// here we deliver the messages - void start_generating_events (void); + void start_generating_events (); /// Load the scheduling information into memory void load_schedule_data (ACE_Unbounded_Queue &schedule_data); diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index 2f3439835405b..19c3243803f62 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -28,14 +28,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_ctype.h" -#if defined (ACE_OPENVMS) -// need this to circumvent link error on OpenVMS -// has to do with interference in template instantiations -// for the server build by previous compilation of -// components which are reused here without recompilation -ACE_Time_Value dum = ACE_Time_Value::zero; -#endif - static const char usage [] = "[[-?]\n" " [-O[RBport] ORB port number]\n" @@ -69,7 +61,7 @@ Logging_Supplier::init () } void -Logging_Supplier::start_generating_events (void) +Logging_Supplier::start_generating_events () { unsigned long total_sent = 0; @@ -91,7 +83,6 @@ Logging_Supplier::start_generating_events (void) do { - // Insert the event data this->insert_event_data (any, schedule_iter); @@ -364,7 +355,6 @@ Logging_Supplier::insert_event_data (CORBA::Any &data, } - if (last_completion > (*sched_data)->completion_time) last_completion = 0; @@ -504,7 +494,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // when done, we clean up delete event_Supplier_ptr; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h index 3ebcc0dbf10b0..dc73fa496dc58 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h @@ -43,17 +43,16 @@ struct Schedule_Viewer_Data class Logging_Supplier { public: - Logging_Supplier (int argc, ACE_TCHAR** argv); - ~Logging_Supplier (void); + ~Logging_Supplier (); /// connect the DOVE_Supplier - int init (void); + int init (); /// here is really something going on, /// here we deliver the messages - void start_generating_events (void); + void start_generating_events (); /// Load the scheduling information into memory void load_schedule_data (ACE_Unbounded_Queue &schedule_data); diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp index ba0c21c4a9397..bc39e1fb4b766 100644 --- a/TAO/examples/TypeCode_Creation/main.cpp +++ b/TAO/examples/TypeCode_Creation/main.cpp @@ -3,7 +3,6 @@ #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try @@ -94,7 +93,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "ORB-created typecode not correct!\n"), -1); - } } catch (const CORBA::Exception& ex) diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp index 276db75fa4a83..27a05cdf66651 100644 --- a/TAO/examples/ior_corbaloc/corbaname_client.cpp +++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp @@ -14,7 +14,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv []) { - try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp index 7622229242355..3a96702b496c1 100644 --- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp +++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp @@ -17,18 +17,17 @@ #include "ace/Read_Buffer.h" // Constructor -IOR_corbaloc_Client_i::IOR_corbaloc_Client_i (void) +IOR_corbaloc_Client_i::IOR_corbaloc_Client_i () { } -IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i (void) +IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i () { } int -IOR_corbaloc_Client_i::run (void) +IOR_corbaloc_Client_i::run () { - try { CosNaming::Name name (1); diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h index 383cb71e21e2e..4cd6e443d85f6 100644 --- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h +++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h @@ -28,14 +28,13 @@ */ class IOR_corbaloc_Client_i { - public: // = Constructor and destructor. - IOR_corbaloc_Client_i (void); - ~IOR_corbaloc_Client_i (void); + IOR_corbaloc_Client_i (); + ~IOR_corbaloc_Client_i (); /// Execute the client example code. - int run (void); + int run (); /// Initialize the client communication endpoint with the server. int init (int& argc, ACE_TCHAR *argv[]); diff --git a/TAO/examples/ior_corbaloc/status_i.cpp b/TAO/examples/ior_corbaloc/status_i.cpp index d9e7c972a228d..b61f035589921 100644 --- a/TAO/examples/ior_corbaloc/status_i.cpp +++ b/TAO/examples/ior_corbaloc/status_i.cpp @@ -7,7 +7,7 @@ corbaloc_Status_i::corbaloc_Status_i () } CORBA::Boolean -corbaloc_Status_i::print_status (void) +corbaloc_Status_i::print_status () { // If the server received the request from the client, return true // == 0; diff --git a/TAO/examples/ior_corbaloc/status_i.h b/TAO/examples/ior_corbaloc/status_i.h index 59438b1b708a5..dbbd61f1d74b6 100644 --- a/TAO/examples/ior_corbaloc/status_i.h +++ b/TAO/examples/ior_corbaloc/status_i.h @@ -9,7 +9,7 @@ class corbaloc_Status_i : public POA_corbaloc::Status public: corbaloc_Status_i (); - CORBA::Boolean print_status (void); + CORBA::Boolean print_status (); void set_name (const char *name) { server_name_ = name; } diff --git a/TAO/examples/mfc/MainFrm.h b/TAO/examples/mfc/MainFrm.h index 2e29e9f9c81f4..cfdeaa6c1350d 100644 --- a/TAO/examples/mfc/MainFrm.h +++ b/TAO/examples/mfc/MainFrm.h @@ -17,10 +17,8 @@ class CMainFrame : public CFrameWnd // Attributes public: - // Operations public: - // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CMainFrame) diff --git a/TAO/examples/mfc/StdAfx.cpp b/TAO/examples/mfc/StdAfx.cpp index bd1211b1c6883..f02b85711c1d9 100644 --- a/TAO/examples/mfc/StdAfx.cpp +++ b/TAO/examples/mfc/StdAfx.cpp @@ -5,4 +5,3 @@ #include "stdafx.h" - diff --git a/TAO/examples/mfc/serverDoc.h b/TAO/examples/mfc/serverDoc.h index 7abfa6f910a50..d8761b778ee21 100644 --- a/TAO/examples/mfc/serverDoc.h +++ b/TAO/examples/mfc/serverDoc.h @@ -18,10 +18,8 @@ class CServerDoc : public CDocument // Attributes public: - // Operations public: - // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CServerDoc) @@ -39,7 +37,6 @@ class CServerDoc : public CDocument #endif protected: - // Generated message map functions protected: //{{AFX_MSG(CServerDoc) diff --git a/TAO/examples/mfc/serverView.h b/TAO/examples/mfc/serverView.h index 25c5a1714bede..89f879ba3eec9 100644 --- a/TAO/examples/mfc/serverView.h +++ b/TAO/examples/mfc/serverView.h @@ -22,7 +22,6 @@ class CServerView : public CView // Operations public: - // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CServerView) @@ -44,7 +43,6 @@ class CServerView : public CView #endif protected: - // Generated message map functions protected: //{{AFX_MSG(CServerView) diff --git a/TAO/examples/mfc/w32_test_impl.cpp b/TAO/examples/mfc/w32_test_impl.cpp index eecacc3dbc44b..d6b722b20c2ba 100644 --- a/TAO/examples/mfc/w32_test_impl.cpp +++ b/TAO/examples/mfc/w32_test_impl.cpp @@ -2,11 +2,11 @@ #include "w32_test_impl.h" -W32_Test_Impl::~W32_Test_Impl (void) +W32_Test_Impl::~W32_Test_Impl () { } -W32_Test_Impl::W32_Test_Impl (void) +W32_Test_Impl::W32_Test_Impl () { blabla = 1; } diff --git a/TAO/examples/mfc/w32_test_impl.h b/TAO/examples/mfc/w32_test_impl.h index 1022be5cf40b0..386c775b1731c 100644 --- a/TAO/examples/mfc/w32_test_impl.h +++ b/TAO/examples/mfc/w32_test_impl.h @@ -6,9 +6,9 @@ class W32_Test_Impl : public POA_W32_Test_Interface { public: - ~W32_Test_Impl (void); + ~W32_Test_Impl (); - W32_Test_Impl (void); + W32_Test_Impl (); char *getresponse (CORBA::Long respnr); diff --git a/TAO/interop-tests/AnyTypeCode/tao/Client.cpp b/TAO/interop-tests/AnyTypeCode/tao/Client.cpp index c6ff430c4fbbd..903fee8cbe5ce 100644 --- a/TAO/interop-tests/AnyTypeCode/tao/Client.cpp +++ b/TAO/interop-tests/AnyTypeCode/tao/Client.cpp @@ -156,7 +156,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // struct tests try { - Demo::BaseStruct foo1; foo1.str = CORBA::string_dup("BaseStruct 1"); diff --git a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp index b0c7a59fe9c38..9d2c8faa31223 100644 --- a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp +++ b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp @@ -32,12 +32,12 @@ #include "ace/Log_Msg.h" // Implementation skeleton constructor -ATC_Test_i::ATC_Test_i (void) +ATC_Test_i::ATC_Test_i () { } // Implementation skeleton destructor -ATC_Test_i::~ATC_Test_i (void) +ATC_Test_i::~ATC_Test_i () { } @@ -166,7 +166,7 @@ ATC_Test_i::do_value (const ::CORBA::Any & a) } void -ATC_Test_i::shutdown (void) +ATC_Test_i::shutdown () { int argc = 0; ACE_TCHAR **argv = 0; diff --git a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h index c04236e94eac7..33eac69ba61bb 100644 --- a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h +++ b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h @@ -38,16 +38,15 @@ class ATC_Test_i : public virtual POA_Demo::ATC_Test { public: - ATC_Test_i (void); + ATC_Test_i (); - virtual ~ATC_Test_i (void); + virtual ~ATC_Test_i (); virtual char * do_union (const ::CORBA::Any & a); virtual char * do_struct (const ::CORBA::Any & a); virtual char * do_value (const ::CORBA::Any & a); - virtual void shutdown (void); - + virtual void shutdown (); }; diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp b/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp index 1eee84313326f..89dfd4b0c9351 100644 --- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp +++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp @@ -2,7 +2,7 @@ #include "NestedValueImpl.h" CORBA::ValueBase* -Demo_NestedValueFactory::create_for_unmarshal (void) +Demo_NestedValueFactory::create_for_unmarshal () { return new Demo_NestedValueImpl (); } diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp index 0ae211131d8e3..260dc8111c476 100644 --- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp +++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp @@ -1,15 +1,15 @@ #include "NestedValueImpl.h" -Demo_NestedValueImpl::Demo_NestedValueImpl (void) +Demo_NestedValueImpl::Demo_NestedValueImpl () { } -Demo_NestedValueImpl::~Demo_NestedValueImpl (void) +Demo_NestedValueImpl::~Demo_NestedValueImpl () { } CORBA::ValueBase* -Demo_NestedValueImpl::_copy_value (void) +Demo_NestedValueImpl::_copy_value () { Demo_NestedValueImpl *nestedValueImpl = new Demo_NestedValueImpl(); nestedValueImpl->foo1 (foo1 ()); diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h index d84a54fdedfb1..8932fb90144b8 100644 --- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h +++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h @@ -8,9 +8,9 @@ class Demo_NestedValueImpl : public virtual OBV_Demo::NestedValue, public virtual CORBA::DefaultValueRefCountBase { public: - Demo_NestedValueImpl (void); - ~Demo_NestedValueImpl (void); - virtual CORBA::ValueBase* _copy_value (void); + Demo_NestedValueImpl (); + ~Demo_NestedValueImpl (); + virtual CORBA::ValueBase* _copy_value (); }; #endif diff --git a/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h index d2f36f04d3f27..219ebf257ebcc 100644 --- a/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h +++ b/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h @@ -13,7 +13,7 @@ class Server_ORBInitializer : { public: /// Constructor - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h b/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h index 019e421002639..2235d3beb574b 100644 --- a/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h +++ b/TAO/interop-tests/CdrOutArg/orbix/server_interceptor.h @@ -10,16 +10,16 @@ class Echo_Server_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); + Echo_Server_Request_Interceptor (); // cotr. ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/interop-tests/CdrOutArg/orbix/test_i.h b/TAO/interop-tests/CdrOutArg/orbix/test_i.h index 57f5a544703d9..3562dda71cea3 100644 --- a/TAO/interop-tests/CdrOutArg/orbix/test_i.h +++ b/TAO/interop-tests/CdrOutArg/orbix/test_i.h @@ -26,7 +26,7 @@ class CDR_Out_Arg_i : public POA_Interop::CDR_Out_Arg void get_out (CORBA::Long_out arg) IT_THROW_DECL((CORBA::SystemException)); - void shutdown (void) IT_THROW_DECL((CORBA::SystemException)); + void shutdown () IT_THROW_DECL((CORBA::SystemException)); private: /// The ORB pseudo-reference (for shutdown). diff --git a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp index 1f166b93d438a..cc83c5b7e3b7b 100644 --- a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp @@ -3,7 +3,7 @@ #include "Client_ORBInitializer.h" #include "client_interceptor.h" -Client_ORBInitializer::Client_ORBInitializer (void) +Client_ORBInitializer::Client_ORBInitializer () { } @@ -17,7 +17,6 @@ void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h index e8e845f1793de..a9108fadae876 100644 --- a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h +++ b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h @@ -26,7 +26,7 @@ class Client_ORBInitializer : { public: /// Constructor - Client_ORBInitializer (void); + Client_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp index dd22dcc19d3a4..2d12efbd1f098 100644 --- a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp @@ -3,7 +3,7 @@ #include "Server_ORBInitializer.h" #include "server_interceptor.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } diff --git a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h index 9554057647d85..e3d1af0b6dfa2 100644 --- a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h +++ b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h @@ -26,7 +26,7 @@ class Server_ORBInitializer : { public: /// Constructor - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp index 45ffa3d97a6af..d23af7e6cba1b 100644 --- a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp @@ -14,18 +14,18 @@ Echo_Client_Request_Interceptor (const char *id) { } -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } @@ -39,7 +39,6 @@ void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; @@ -65,7 +64,6 @@ Echo_Client_Request_Interceptor::send_request ( #endif /*if 0*/ - // Populate target member of the ClientRequestInfo. // Make the context to send the context to the target diff --git a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h index e7b490fa09689..d3fb25ea8be63 100644 --- a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h +++ b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.h @@ -28,10 +28,10 @@ class Echo_Client_Request_Interceptor virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp index 1761e2b4f04e5..ac639a0e1c98f 100644 --- a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp @@ -8,23 +8,23 @@ const IOP::ServiceId service_id = 0xdeadbeef; const char *request_msg = "12345678"; -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor () : myname_ ("Echo_Server_Interceptor") { } -Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () { } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } @@ -32,7 +32,6 @@ void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h index 2755fd363b3f9..1659c5f607148 100644 --- a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h +++ b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.h @@ -22,16 +22,16 @@ class Echo_Server_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); + Echo_Server_Request_Interceptor (); // cotr. ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/interop-tests/CdrOutArg/tao/test_i.cpp b/TAO/interop-tests/CdrOutArg/tao/test_i.cpp index 28251a8109bc7..ab75e516797f6 100644 --- a/TAO/interop-tests/CdrOutArg/tao/test_i.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/test_i.cpp @@ -12,7 +12,7 @@ CDR_Out_Arg_i::get_out (CORBA::Long_out arg) } void -CDR_Out_Arg_i::shutdown (void) +CDR_Out_Arg_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/interop-tests/CdrOutArg/tao/test_i.h b/TAO/interop-tests/CdrOutArg/tao/test_i.h index 087c0c86fbfb9..90dfd48bda9d8 100644 --- a/TAO/interop-tests/CdrOutArg/tao/test_i.h +++ b/TAO/interop-tests/CdrOutArg/tao/test_i.h @@ -21,20 +21,16 @@ */ class CDR_Out_Arg_i : public POA_Interop::CDR_Out_Arg { - public: - CDR_Out_Arg_i (CORBA::ORB_ptr orb); void get_out (CORBA::Long_out arg); - void shutdown (void); + void shutdown (); private: - /// The ORB pseudo-reference (for shutdown). CORBA::ORB_var orb_; - }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp index 59a5b5b8ab17f..6a9597d01edee 100644 --- a/TAO/interop-tests/wchar/interop_wchar_i.cpp +++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp @@ -10,12 +10,12 @@ interop_WChar_Passer_i::interop_WChar_Passer_i (CORBA::ORB_ptr o, } // Implementation skeleton destructor -interop_WChar_Passer_i::~interop_WChar_Passer_i (void) +interop_WChar_Passer_i::~interop_WChar_Passer_i () { } char * -interop_WChar_Passer_i::orb_name (void) +interop_WChar_Passer_i::orb_name () { return CORBA::string_dup ("TAO"); } @@ -211,7 +211,7 @@ interop_WChar_Passer_i::exception_test ( CORBA::Short key) } void -interop_WChar_Passer_i::shutdown (void) +interop_WChar_Passer_i::shutdown () { this->orb_->shutdown(0); } diff --git a/TAO/interop-tests/wchar/interop_wchar_i.h b/TAO/interop-tests/wchar/interop_wchar_i.h index 50890e75163f9..83bd1198afed3 100644 --- a/TAO/interop-tests/wchar/interop_wchar_i.h +++ b/TAO/interop-tests/wchar/interop_wchar_i.h @@ -37,9 +37,9 @@ class interop_WChar_Passer_i : public virtual POA_interop::WChar_Passer interop_WChar_Passer_i (CORBA::ORB_ptr o, int verbose); //Destructor - virtual ~interop_WChar_Passer_i (void); + virtual ~interop_WChar_Passer_i (); - virtual char * orb_name (void); + virtual char * orb_name (); virtual CORBA::Boolean wchar_to_server (CORBA::WChar test, CORBA::Short key); @@ -82,12 +82,11 @@ class interop_WChar_Passer_i : public virtual POA_interop::WChar_Passer virtual void exception_test (CORBA::Short key); -virtual void shutdown (void); +virtual void shutdown (); private: CORBA::ORB_var orb_; wchar_reference ref_; - }; diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp index 6b94ed9fd3592..f855f940610dd 100644 --- a/TAO/interop-tests/wchar/server.cpp +++ b/TAO/interop-tests/wchar/server.cpp @@ -23,7 +23,6 @@ int verbose = 0; int parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:v")); int c; diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index 70e52c70f6c61..f51a46180bf59 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -23,13 +23,13 @@ // Default Constructor. -Concurrency_Service::Concurrency_Service (void) +Concurrency_Service::Concurrency_Service () : use_naming_service_ (1), ior_file_name_ (0), pid_file_name_ (0) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT("Concurrency_Service::Concurrency_Service (void)\n"))); + ACE_TEXT("Concurrency_Service::Concurrency_Service ()\n"))); } // Constructor taking command-line arguments. @@ -147,7 +147,7 @@ Concurrency_Service::init (int argc, } int -Concurrency_Service::init_naming_service (void) +Concurrency_Service::init_naming_service () { ORBSVCS_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n")); CORBA::ORB_var orb; @@ -180,7 +180,7 @@ Concurrency_Service::init_naming_service (void) // Run the ORB event loop. int -Concurrency_Service::run (void) +Concurrency_Service::run () { ORBSVCS_DEBUG ((LM_DEBUG, "Concurrency_Service::run (...)\n")); @@ -195,10 +195,10 @@ Concurrency_Service::run (void) // Destructor. -Concurrency_Service::~Concurrency_Service (void) +Concurrency_Service::~Concurrency_Service () { ORBSVCS_DEBUG ((LM_DEBUG, - "Concurrency_Service::~Concurrency_Service (void)\n")); + "Concurrency_Service::~Concurrency_Service ()\n")); } int diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h index a80045d75fa85..c630331101b03 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h @@ -39,21 +39,21 @@ class Concurrency_Service : public TAO_ORB_Manager { public: /// Default Constructor. - Concurrency_Service (void); + Concurrency_Service (); /// Constructor taking the command-line arguments. Concurrency_Service (int argc, ACE_TCHAR **argv); /// Destructor. - ~Concurrency_Service (void); + ~Concurrency_Service (); /// Initialize the Concurrency Service with the arguments. int init (int argc, ACE_TCHAR **argv); /// Run the Concurrency_Service. - int run (void); + int run (); private: /// Parses the commandline arguments. @@ -65,7 +65,7 @@ class Concurrency_Service : public TAO_ORB_Manager * the individual lock sets with the naming service. At present the * clients must keep track of the reference and pass 'by hand' */ - int init_naming_service (void); + int init_naming_service (); /// Flag to tell wheter the naming service will be used. int use_naming_service_; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp index d6e04baa4f142..625480e6fec3a 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp @@ -20,7 +20,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb, } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h index 88d3007c57586..614219cd90177 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h @@ -28,7 +28,7 @@ class Messenger_i : public virtual POA_Messenger int event_limit); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual void send_message (const char * user_name, const char * subject, @@ -38,7 +38,6 @@ class Messenger_i : public virtual POA_Messenger CORBA::ORB_var orb_; CosEventChannelAdmin::ProxyPushSupplier_var supplier_; int event_limit_; - }; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp index 33d2946cabe22..0c2e1f49dd91e 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp @@ -140,13 +140,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Supplier starting sending of events.\n"; while (1) { - consumer->push (event); ACE_Time_Value tv(0, 1000 * EVENT_DELAY_MS); orb->run(tv); if ((remote_ecname != 0) && (!gateway_initialized)) { - try { // Get the remote event channel object CORBA::Object_var obj = root_context->resolve_str (ACE_TEXT_ALWAYS_CHAR (remote_ecname)); diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp index bc04b0e8996e1..1f892b0062bd3 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp @@ -91,7 +91,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Supplier starting sending events.\n"; while (1) { - event[0].header.type++; if (event[0].header.type > MY_EVENT_END) { event[0].header.type = MY_EVENT_START; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp index 45ddebdb3a417..af651e069a4c8 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp @@ -14,7 +14,6 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb) // Override the disconnect_push_Supplier() operation. void EchoEventSupplier_i::disconnect_push_supplier() { - // Deactivate this object. CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow(obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp index e06fb21e21ff3..ffcc01d103d30 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp @@ -93,7 +93,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->destroy(); return 0; - } catch(const CORBA::Exception& exc) { diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp index b86312d42200f..7fc342c949be6 100644 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp @@ -37,7 +37,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) PortableServer::POA_ptr createPersistentPOA(PortableServer::POA_ptr root_poa, const char* poa_name) { - PortableServer::LifespanPolicy_var life = root_poa->create_lifespan_policy(PortableServer::PERSISTENT); diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp index cad9543fb1c9b..5a2521f4bf24c 100644 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h index 64dc97e274136..7e82cd7890e56 100644 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp index 51a17c26b095b..a59513010b0ab 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h index 64dc97e274136..7e82cd7890e56 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp index 5e857eefb2b73..9cd0461819fbf 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp @@ -11,13 +11,13 @@ #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { std::cout << "Hello"; } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h index 64dc97e274136..7e82cd7890e56 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp index 9436c6ad8e6c3..e474955373f23 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp @@ -46,7 +46,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp index 51a17c26b095b..a59513010b0ab 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h index 2c39b9ac146c5..63ad758730fc2 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h @@ -21,17 +21,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp index 9a758e812a6da..57bbf13048a3f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp @@ -19,7 +19,6 @@ void MessengerTask::end() int MessengerTask::svc() { - try { // Get reference to Root POA CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp index ed58ae335d9e1..787ab998278bc 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp @@ -11,12 +11,12 @@ #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h index 2c39b9ac146c5..63ad758730fc2 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h @@ -21,17 +21,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp index 4e0eb4783bfb2..3776f96228186 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h index 64dc97e274136..7e82cd7890e56 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp index f5ae4c1b6642e..a5a1587e151ff 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h index 5b85d67ecd4ad..3245e521a6296 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp index 6d05f65ede807..7a21c088df0d1 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp @@ -12,7 +12,6 @@ EventSequenceConsumer_i::push_structured_events ( const CosNotification::EventBatch& events ) { - std::cout << "events received " << std::endl; const char* value = 0; @@ -28,14 +27,12 @@ EventSequenceConsumer_i::push_structured_events ( void EventSequenceConsumer_i::disconnect_sequence_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 diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp index c47f465d14542..697d711ff8143 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp @@ -9,14 +9,12 @@ EventSequenceSupplier_i::EventSequenceSupplier_i(CORBA::ORB_ptr orb) void EventSequenceSupplier_i::disconnect_sequence_push_supplier () { - 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 diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp index 54a3ec2ab39ff..0bfc413654b02 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp @@ -67,7 +67,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } @@ -76,5 +75,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp index 9e0a217a91a4b..60153e1b1a5de 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp @@ -11,7 +11,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , supplier_(new EventSequenceSupplier_i(orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); @@ -67,7 +66,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -116,6 +115,5 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name, consumer_proxy_->push_structured_events(events); return 1; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h index 524f58f339c45..a74227a4345ae 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h @@ -31,4 +31,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp index ee8f68f6e634c..7a425646582f2 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp @@ -49,7 +49,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) messenger->send_message ("sysadmin@company.com", "OCI's Distribution of TAO", message.inout()); - } catch(const CORBA::Exception& ex) { std::cerr << "Caught a CORBA exception: " << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp index ce7ed66812686..b96c97316a53c 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp @@ -147,7 +147,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); orb->destroy (); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp index 8938018d98d73..0c917958e4602 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp @@ -82,7 +82,6 @@ ACE_TMAIN(int argc, ACE_TCHAR* argv[]) // Accept requests orb->run(); orb->destroy(); - } catch(const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp index 10a9e2836768a..4ef01eb8480d6 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp @@ -92,7 +92,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } consumer_proxy_->connect_structured_push_supplier(supplier.in()); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; @@ -102,7 +101,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -112,14 +111,12 @@ CORBA::Boolean Messenger_i::send_message ( char *& message ) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; try { - // Event Definition CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h index 4327f7e112fc2..cb3d1512f6b3b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h @@ -15,7 +15,7 @@ class Messenger_i : public virtual POA_Messenger Messenger_i (CORBA::ORB_ptr orb); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message ( const char * user_name, @@ -26,7 +26,6 @@ class Messenger_i : public virtual POA_Messenger private: CORBA::ORB_var orb_; CosNotifyChannelAdmin::StructuredProxyPushConsumer_var consumer_proxy_; - }; #endif /* MESSENGERI_H_ */ diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp index 28e2fb0562712..73572e2fd884d 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - const char *value; for (unsigned int i=0; iresolve_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 diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp index a8331596d84a8..932640f7adf5b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp index 8728eb776c4fd..d4f1ee8853a0b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp @@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } @@ -73,5 +72,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp index bdbdc2eb77af0..34156bd41a4cb 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp @@ -10,7 +10,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); @@ -75,7 +74,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) connect_structured_push_supplier (supplier.in()); } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h index 2d9c4182adb27..ce9aa7c930b3f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h @@ -9,7 +9,7 @@ class Messenger_i : public POA_Messenger public: Messenger_i (CORBA::ORB_ptr orb); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message (const char * user_name, const char * subject, @@ -25,4 +25,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp index 11cb57adaf5a5..97d8865479bff 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp @@ -15,7 +15,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp index 0208d26fc7f3e..d32ac5960fcad 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp @@ -43,10 +43,8 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) std::cout << "MessengerClient: success" << std::endl; return 0; - } - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp index ad834dd609c7b..b9acf920824da 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp @@ -88,5 +88,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp index d9fb63f56d81f..6e4bc4d8073c9 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp @@ -106,7 +106,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) s_proxy_consumer_->offer_change(added, removed); } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -115,7 +115,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, 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/OfferSubscriptions/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h index 9ccdbcc3740bc..69a75da32e93f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h @@ -8,7 +8,7 @@ class Messenger_i : public POA_Messenger { public: Messenger_i (CORBA::ORB_ptr orb); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp index a1c11e2cc82c9..0ec2cb4cc1e89 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - const char *value; for (unsigned int i=0; iresolve_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 diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp index 0c3cf2b94d5e8..f7e401db29f21 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp index f053d4af65965..7de7ea60031a5 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp @@ -88,7 +88,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -97,7 +97,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, 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/QoSProperties/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h index 2d9c4182adb27..ce9aa7c930b3f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h @@ -9,7 +9,7 @@ class Messenger_i : public POA_Messenger public: Messenger_i (CORBA::ORB_ptr orb); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message (const char * user_name, const char * subject, @@ -25,4 +25,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp index e80efb54cee93..f242d528c4388 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - std::cout << "event received " << std::endl; const char *value; @@ -27,14 +26,12 @@ StructuredEventConsumer_i::push_structured_event( 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 diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp index b11df7abb34a3..75ebbf9449a31 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp index 8728eb776c4fd..d4f1ee8853a0b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp @@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } @@ -73,5 +72,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp index d269451a068bf..569cd0b9f5732 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp @@ -105,7 +105,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h index 83115d8465c80..21d197d81a263 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h @@ -10,7 +10,7 @@ class Messenger_i : public POA_Messenger public: Messenger_i (CORBA::ORB_ptr orb); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message (const char * user_name, const char * subject, diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp index e80efb54cee93..f242d528c4388 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - std::cout << "event received " << std::endl; const char *value; @@ -27,14 +26,12 @@ StructuredEventConsumer_i::push_structured_event( 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 diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp index 263b4d03d66ae..4f5d0f097eaf4 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp index 56bb0b9cae465..a8762480edd5a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp @@ -42,7 +42,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) messenger->send_message ("person@company.com", "OCI's Distribution of TAO", message.inout()); - } catch(const CORBA::Exception& ex) { std::cerr << "Caught a CORBA exception: " << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp index 04368337c928b..0aa9ba196b181 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp @@ -130,7 +130,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); orb->destroy (); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp index 14e332e267266..6573ddbd7a816 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp @@ -75,14 +75,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) // Accept requests orb->run(); orb->destroy(); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; return 1; } return 0; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp index ea1a56d9e6680..4410caa5332bc 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp @@ -103,7 +103,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } consumer_proxy_->connect_structured_push_supplier(supplier.in()); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; @@ -113,7 +112,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -127,7 +126,6 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name, try { - // Event Definition CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h index 28e15e9d4f9f5..cb3d1512f6b3b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h @@ -15,7 +15,7 @@ class Messenger_i : public virtual POA_Messenger Messenger_i (CORBA::ORB_ptr orb); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp index b3d363c0d52ef..1218fb6a24307 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp @@ -11,7 +11,6 @@ void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event) { - const char *value; for (unsigned int i=0; iresolve_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 diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp index 8cf0e0abd3520..e75774d44833a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp index 26400a9741a39..55532bfbfa045 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_unistd.h" #include -ClientInitializer::ClientInitializer (void) +ClientInitializer::ClientInitializer () : slot_ (0), current_ (PortableInterceptor::Current::_nil()) { @@ -65,7 +65,7 @@ ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) } void -ClientInitializer::set_slot_data (void) +ClientInitializer::set_slot_data () { // Set the recursion flag CORBA::Any flag; diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h index 4870f1877c363..c3d497c100845 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h @@ -11,10 +11,10 @@ class ClientInitializer : public virtual ::CORBA::LocalObject { public: - ClientInitializer (void); + ClientInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); - void set_slot_data (void); + void set_slot_data (); private: PortableInterceptor::SlotId slot_; diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp index 6bdd7c6a1de5b..6fc2e054d63c2 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp @@ -19,7 +19,7 @@ ClientInterceptor (Messenger_var theMessenger, this->slot = theSlot; } -ClientInterceptor::~ClientInterceptor (void) +ClientInterceptor::~ClientInterceptor () { } @@ -84,7 +84,6 @@ ClientInterceptor::send_request ( // reset recursion test flag <<= 0; pic->set_slot(slot,flag); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h index f3ec546e4b4c3..17440a354b402 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h @@ -11,7 +11,6 @@ class ClientInterceptor: public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (Messenger_var theMessage, PortableInterceptor::Current_ptr thePic, diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp index 7376b2e128146..13c3a0fd154e5 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp @@ -59,7 +59,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::String_var message = CORBA::string_dup( "Hello!" ); messenger->send_message( "TAO User", "TAO Test", message.inout() ); - } catch(const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp index 4cbb4f32191df..49f716877e6d8 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp @@ -12,12 +12,12 @@ #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h index e0249baef770f..ed581d27abf5e 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, @@ -35,7 +35,6 @@ virtual CORBA::Boolean send_message ( virtual char * get_time ( ); - }; #endif /* MESSENGERI_H_ */ diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp index 5fae85e4a4223..80041289ce9e7 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp @@ -9,7 +9,7 @@ static const char* allowed_users[num_allowed_users+1] = {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0}; const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"}; -ServerInterceptor::ServerInterceptor (void) +ServerInterceptor::ServerInterceptor () : myname_ ("Server_Authentication_Interceptor") { std::cout << "Calling ServerInterceptor constructor." << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h index a8da1affe953a..3e8e46e14a901 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h @@ -8,7 +8,7 @@ class ServerInterceptor : public PortableInterceptor::ServerRequestInterceptor { public: - ServerInterceptor (void); + ServerInterceptor (); ~ServerInterceptor (); diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp index a7e2813c2d2dd..a0046a31b219d 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp @@ -66,7 +66,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp index 4358936462e57..bb3e8a4048ca5 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp @@ -37,7 +37,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); if (parse_args (argc, argv) != 0) @@ -84,7 +83,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Messenger Server is shut down!" << std::endl; std::cout << std::endl; - } catch(const CORBA::Exception& ex) { ex._tao_print_exception("Server Error: main block"); diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp index 037e494f62d03..4c71c9969b03d 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp @@ -13,7 +13,7 @@ Messenger_i::Messenger_i ( { } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h index febd241327e1a..947ce47508207 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h @@ -21,7 +21,7 @@ class Messenger_i : public virtual POA_Messenger SSLIOP::Current_ptr ssliop_current ); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp index c3a3b8d849de9..540925e5f4dec 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp @@ -120,7 +120,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp index 062708bd92041..8f2c72c48170f 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp @@ -3,12 +3,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h index 0a628dac14ee6..dced78f9cd409 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h @@ -14,17 +14,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp index cd9f4219370d7..fe9a9e53fc3d2 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp @@ -19,12 +19,12 @@ #include "MessengerI.h" // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp index ed4ef394a2f68..586ce510a098d 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h index 0a628dac14ee6..dced78f9cd409 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h @@ -14,17 +14,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h index c47878eb0fc34..da4b376c2c21d 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h @@ -21,7 +21,7 @@ class MyEvent_i kind(k); } - virtual ::CORBA::ValueBase *_copy_value (void) + virtual ::CORBA::ValueBase *_copy_value () { ::CORBA::ValueBase *ret_val = 0; ACE_NEW_THROW_EX ( diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp index ac2684ce17d73..5a51f6c45e370 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp @@ -59,7 +59,6 @@ class TestConsumer : public POA_CosEventComm::PushConsumer PortableServer::POA_ptr poa_; CORBA::ORB_ptr orb_; public: - TestConsumer(int evts, CosNotifyChannelAdmin::EventChannelFactory_ptr ecf, PortableServer::POA_ptr poa, @@ -153,11 +152,9 @@ class TestConsumer : public POA_CosEventComm::PushConsumer void disconnect_self() { } - }; int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { - int num_events = 0; try { @@ -202,7 +199,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { orb->destroy(); return 0; - } catch(const CORBA::Exception& e) { std::cerr << "Consumer: main() exception: " << e << std::endl; } catch(const std::invalid_argument& e) { diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp index a443e406eb6ea..303108b72d74e 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp @@ -76,7 +76,6 @@ class TestSupplier CORBA::ORB_ptr orb_; public: - TestSupplier(int evts, CosNotifyChannelAdmin::EventChannelFactory_ptr ecf, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) @@ -186,12 +185,10 @@ class TestSupplier }; int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { - int num_events = 0; int pay_size = 1; try { - CORBA::ORB_var orb = CORBA::ORB_init(ac, av); if (parse_args (ac, av) != 0) @@ -247,7 +244,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { orb->destroy(); return 0; - } catch(CORBA::Exception& e) { std::cerr << "Supplier: main() exception: " << e << std::endl; } catch(std::invalid_argument& e) { diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index 29726be078447..78814972504b8 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -42,7 +42,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // **************************************************************** -Event_Service::Event_Service (void) +Event_Service::Event_Service () : sched_impl_ (0), ec_impl_ (0), scheduler_type_ (ES_SCHED_NONE), @@ -51,7 +51,7 @@ Event_Service::Event_Service (void) { } -Event_Service::~Event_Service (void) +Event_Service::~Event_Service () { delete this->ec_impl_; this->ec_impl_ = 0; @@ -402,19 +402,19 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv []) RtecEventChannelAdmin::ConsumerAdmin_ptr -Event_Service::for_consumers (void) +Event_Service::for_consumers () { return this->ec_impl_->for_consumers (); } RtecEventChannelAdmin::SupplierAdmin_ptr -Event_Service::for_suppliers (void) +Event_Service::for_suppliers () { return this->ec_impl_->for_suppliers (); } void -Event_Service::destroy (void) +Event_Service::destroy () { this->ec_impl_->destroy (); this->orb_->shutdown (); diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h index bd7dbc3a5dcbe..06a95d327bbbe 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.h +++ b/TAO/orbsvcs/Event_Service/Event_Service.h @@ -31,18 +31,18 @@ class Event_Service : public POA_RtecEventChannelAdmin::EventChannel { public: - Event_Service (void); - virtual ~Event_Service (void); + Event_Service (); + virtual ~Event_Service (); /// Run the event service. int run (int argc, ACE_TCHAR* argv[]); // = The RtecEventChannelAdmin::Event_Channel methods virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void); + for_consumers (); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void); - virtual void destroy (void); + for_suppliers (); + virtual void destroy (); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr observer); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle); diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index 40368f9daef5a..179afa5da9fa6 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -248,7 +248,7 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb, ORBSVCS_DEBUG((LM_DEBUG,"Factory connected\n")); CORBA::String_var my_ior_string = orb->object_to_string(ec); - int const len = ACE_OS::strlen(my_ior_string.in()) ; + size_t const len = ACE_OS::strlen(my_ior_string.in()) ; if (stream.send_n(my_ior_string.in(), len) != len) ORBSVCS_ERROR_RETURN((LM_ERROR, "(%P|%t) IOR Transmission Error\n"), -1); diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index aeb2d6bfb1cf7..cced9d9427444 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -21,13 +21,11 @@ CORBA::Object_ptr EventChannelFactory_i::create_object ( PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id ) { - ORBSVCS_DEBUG((LM_DEBUG,"EventChannelFactory_i::create_object\n")); FILE* file = 0; char *id_str=0, *prog=0; try{ - file = ACE_OS::fopen(conf_file, "r"); if (file == 0) throw PortableGroup::NoFactory(); @@ -103,7 +101,8 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( const int ENV_BUF_LEN = 512; ACE_TCHAR buf[ENV_BUF_LEN]; server_addr.addr_to_string(buf,ENV_BUF_LEN,0); - options.setenv(ACE_TEXT("EventChannelFactoryAddr"), buf); + options.setenv(ACE_TEXT("EventChannelFactoryAddr"), + ACE_TEXT("%") ACE_TEXT_PRIs, buf); // extract the object ID from the criteria for (CORBA::ULong i = 0; i < the_criteria.length(); ++i) @@ -114,7 +113,8 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( const char* id_str = name[0].id.in(); the_criteria[i].val >>= val; if (id_str[0] != '-') // environment variable - options.setenv(ACE_TEXT_CHAR_TO_TCHAR(id_str), ACE_TEXT("%s"), val); + options.setenv(ACE_TEXT_CHAR_TO_TCHAR(id_str), + ACE_TEXT("%") ACE_TEXT_PRIs, val); else {// command line option ACE_OS::sprintf(buf, ACE_TEXT(" %s %s"), id_str, val); str += buf; @@ -124,7 +124,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( ORBSVCS_DEBUG((LM_DEBUG, "Command Line : %s\n", str.c_str())); - options.command_line(str.c_str()); + options.command_line(ACE_TEXT("%") ACE_TEXT_PRIs, str.c_str()); // Try to create a new process running date. ACE_Process new_process; diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index 3d1fb378775f9..688399a5eb1f6 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -50,7 +50,6 @@ int parse_args(int argc, ACE_TCHAR* argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try{ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); @@ -117,7 +116,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); - } catch (const CORBA::Exception& ex) { @@ -125,7 +123,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } - return 0; } diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp index 11362ff201992..6958151e8dccb 100644 --- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp +++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp @@ -9,7 +9,7 @@ #include "ace/Task.h" // Default Constructor. -TAO_FT_Naming_Service::TAO_FT_Naming_Service (void) +TAO_FT_Naming_Service::TAO_FT_Naming_Service () : time_ (0), num_threads_ (1) { @@ -50,7 +50,6 @@ TAO_FT_Naming_Service::init (int argc, ACE_TCHAR* argv[]) if (result == -1) return result; - } catch (const CORBA::Exception& ex) { @@ -124,7 +123,7 @@ class ORB_Runner : public ACE_Task_Base time_(t) {} - int svc (void) + int svc () { if (!CORBA::is_nil (orb_.in ())) { @@ -148,7 +147,7 @@ class ORB_Runner : public ACE_Task_Base }; int -TAO_FT_Naming_Service::run (void) +TAO_FT_Naming_Service::run () { ORB_Runner runner (this->orb_.in(), time_); if (this->num_threads_ == 1) @@ -170,7 +169,7 @@ TAO_FT_Naming_Service::run (void) } void -TAO_FT_Naming_Service::shutdown (void) +TAO_FT_Naming_Service::shutdown () { if (!CORBA::is_nil (orb_.in ())) { @@ -179,7 +178,7 @@ TAO_FT_Naming_Service::shutdown (void) } int -TAO_FT_Naming_Service::fini (void) +TAO_FT_Naming_Service::fini () { this->my_naming_server_.fini(); @@ -200,6 +199,6 @@ TAO_FT_Naming_Service::fini (void) } // Destructor. -TAO_FT_Naming_Service::~TAO_FT_Naming_Service (void) +TAO_FT_Naming_Service::~TAO_FT_Naming_Service () { } diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h index acd6971f46efe..d8feffc645347 100644 --- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h +++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h @@ -29,7 +29,7 @@ class TAO_FT_Naming_Service { public: /// Default Constructor. - TAO_FT_Naming_Service (void); + TAO_FT_Naming_Service (); /// Constructor taking the command-line arguments. TAO_FT_Naming_Service (int argc, ACE_TCHAR* argv[]); @@ -41,16 +41,15 @@ class TAO_FT_Naming_Service virtual int fini (); /// Run the TAO_Naming_Service. - virtual int run (void); + virtual int run (); /// Shut down the TAO_Naming_Service; you must still call fini(). - virtual void shutdown (void); + virtual void shutdown (); /// Destructor. - virtual ~TAO_FT_Naming_Service (void); + virtual ~TAO_FT_Naming_Service (); protected: - /// Parse the command line arguments to find /// the timeout period. int parse_args (int &argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h index 992d9d4a0d92e..36baa65335cf7 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h @@ -30,7 +30,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * Default fault analyzer. * @@ -38,7 +37,6 @@ namespace TAO class TAO_ReplicationManagerLib_Export FT_DefaultFaultAnalyzer : public ::TAO::FT_FaultAnalyzer { - public: /** * Default constructor. @@ -51,7 +49,6 @@ namespace TAO virtual ~FT_DefaultFaultAnalyzer (); public: - /** * Validate event type to make sure it is one we can handle. * @param event The structured fault event, as from the Fault Notifier. @@ -75,9 +72,7 @@ namespace TAO FT_DefaultFaultAnalyzer (const FT_DefaultFaultAnalyzer & rhs); /// Assignment operator. FT_DefaultFaultAnalyzer & operator = (const FT_DefaultFaultAnalyzer & rhs); - }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h index ac81edbb323df..882af564e021b 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h @@ -33,7 +33,6 @@ namespace TAO */ class TAO_ReplicationManagerLib_Export FT_FaultAnalyzer { - public: /** * Default constructor. @@ -46,7 +45,6 @@ namespace TAO virtual ~FT_FaultAnalyzer (); public: - /** * Validate event type to make sure it is one we can handle. * @param event The structured fault event, as from the Fault Notifier. @@ -74,9 +72,7 @@ namespace TAO /////////////// // Data Members private: - }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index f01bf130997c0..baa75633fb677 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -54,7 +54,6 @@ int TAO::FT_FaultConsumer::init ( FT::FaultNotifier_ptr fault_notifier, TAO::FT_FaultAnalyzer * fault_analyzer) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -114,9 +113,8 @@ int TAO::FT_FaultConsumer::init ( * - Disconnect from FT::FaultNotifier. * - Deactivate from the POA. */ -int TAO::FT_FaultConsumer::fini (void) +int TAO::FT_FaultConsumer::fini () { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -130,7 +128,6 @@ int TAO::FT_FaultConsumer::fini (void) { if (!CORBA::is_nil (this->fault_notifier_.in())) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 48cf24e59701f..cf86895b42423 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /////////////////////// // Forward declarations class FT_FaultAnalyzer; @@ -40,7 +39,6 @@ namespace TAO class TAO_ReplicationManagerLib_Export FT_FaultConsumer : public virtual POA_CosNotifyComm::StructuredPushConsumer { - ////////////////////// // non-CORBA interface @@ -76,7 +74,7 @@ namespace TAO * - Disconnect from FT::FaultNotifier. * - Deactivate from the POA. */ - int fini (void); + int fini (); /** * Accessor for a duplicate of this consumer's object reference. @@ -90,7 +88,6 @@ namespace TAO size_t notifications () const; public: - /** * @name POA_CosNotifyComm::StructuredPushConsumer Methods * @@ -98,7 +95,6 @@ namespace TAO * interface. */ //@{ - //////////////// // CORBA methods virtual void push_structured_event ( @@ -123,7 +119,6 @@ namespace TAO /////////////// // Data Members private: - /// The POA with which we are activated. PortableServer::POA_var poa_; @@ -145,9 +140,7 @@ namespace TAO ///TODO: Remove this later, it is just for testing. // Keep track of how many notifications we have received. size_t notifications_; - }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h index 1a20aad874221..8d93dc33a79f0 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h @@ -32,7 +32,6 @@ namespace TAO struct TAO_ReplicationManagerLib_Export FT_FaultEventDescriptor { public: - /// Default constructor. FT_FaultEventDescriptor (); @@ -65,9 +64,7 @@ namespace TAO /// The object group's factories. PortableGroup::FactoryInfos_var factories; - }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp index 30baef0cd4665..4893362ece5a1 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::FT_Property_Validator::FT_Property_Validator (void) +TAO::FT_Property_Validator::FT_Property_Validator () : replication_style_ (1), membership_style_ (1), consistency_style_ (1), @@ -32,7 +32,7 @@ TAO::FT_Property_Validator::FT_Property_Validator (void) } -TAO::FT_Property_Validator::~FT_Property_Validator (void) +TAO::FT_Property_Validator::~FT_Property_Validator () { } diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h index 3ed4969656530..44fa0384d5847 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h @@ -35,12 +35,11 @@ namespace TAO class FT_Property_Validator : public TAO_PG_Default_Property_Validator { public: - /// Constructor. - FT_Property_Validator (void); + FT_Property_Validator (); /// Destructor. - virtual ~FT_Property_Validator (void); + virtual ~FT_Property_Validator (); /// Validate the given properties. Throw an exception when the /// first invalid property is encountered. The remaining properties @@ -55,7 +54,6 @@ namespace TAO void validate_criteria (const PortableGroup::Properties & criteria); private: - /** * @name Pre-initialize property Names. * @@ -77,7 +75,6 @@ namespace TAO //@} }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index 270584224fd12..c9f53833ab4f7 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -81,7 +81,7 @@ TAO::FT_ReplicationManager::FT_ReplicationManager () // init must be called before using this object. } -TAO::FT_ReplicationManager::~FT_ReplicationManager (void) +TAO::FT_ReplicationManager::~FT_ReplicationManager () { // cleanup happens in fini } @@ -324,7 +324,7 @@ int TAO::FT_ReplicationManager::idle (int & result) //public -int TAO::FT_ReplicationManager::fini (void) +int TAO::FT_ReplicationManager::fini () { int result = 0; @@ -487,7 +487,6 @@ void TAO::FT_ReplicationManager::set_default_properties ( const PortableGroup::Properties & props) { - this->properties_support_.set_default_properties (props); //@@ validate properties? } @@ -543,7 +542,6 @@ TAO::FT_ReplicationManager::set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Properties & overrides) { - TAO::PG_Object_Group * group = 0; if (this->group_factory_.find_group (object_group, group)) { @@ -591,7 +589,6 @@ TAO::FT_ReplicationManager::set_primary_member ( TAO::PG_Object_Group * group = 0; if (this->group_factory_.find_group (object_group, group)) { - PortableGroup::TagGroupTaggedComponent tag_component; TAO_FT_IOGR_Property prop (tag_component); @@ -660,7 +657,6 @@ TAO::FT_ReplicationManager::add_member ( member); result = group->reference (); - } else { @@ -894,7 +890,6 @@ void TAO::FT_ReplicationManager::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id) { - PortableGroup::ObjectGroupId group_id = 0; if (factory_creation_id >>= group_id) { diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index 462c98a8168e8..6d7d99d8d2e21 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -77,7 +77,6 @@ namespace TAO class FT_ReplicationManager : public virtual POA_FT::ReplicationManager { - ////////////////////// // non-CORBA interface @@ -95,7 +94,6 @@ namespace TAO virtual ~FT_ReplicationManager (); public: - /** * Parse command line arguments. * @param argc traditional C argc @@ -115,7 +113,7 @@ namespace TAO * Prepare to exit. * @return zero for success; nonzero is process return code for failure. */ - int fini (void); + int fini (); /** * Idle-time activity. @@ -144,14 +142,12 @@ namespace TAO // CORBA interface(s) public: - /** * @name POA_FT::ReplicationManager Methods * * Methods required by the POA_FT::ReplicationManager interface. */ //@{ - /// Registers the Fault Notifier with the Replication Manager. virtual void register_fault_notifier ( FT::FaultNotifier_ptr fault_notifier); @@ -174,7 +170,6 @@ namespace TAO * Methods required by the PortableGroup::PropertyManager interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); @@ -236,7 +231,6 @@ namespace TAO * interface. */ //@{ - /// Create a member in an object group. virtual PortableGroup::ObjectGroup_ptr create_member ( PortableGroup::ObjectGroup_ptr object_group, @@ -314,7 +308,6 @@ namespace TAO * Methods required by the PortableGroup::GenericFactory interface. */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out @@ -349,7 +342,7 @@ namespace TAO /** * Write this factory's IOR to a file */ - int write_ior (void); + int write_ior (); /// Registers the Fault Notifier with the Replication Manager. void register_fault_notifier_i ( @@ -364,7 +357,6 @@ namespace TAO /////////////// // Data Members private: - /// The orb CORBA::ORB_var orb_; @@ -405,7 +397,6 @@ namespace TAO /// Quit flag. int quit_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index a5ae04091f5da..4c8faf7129414 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -366,7 +366,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( const PortableGroup::Location & location, int & object_is_primary) { - // To determine if this was a primary that faulted: // Get the TagFTGroupTaggedComponent from the IOGR and search // for the primary, using the TAO_FT_IOGR_Property helper class. @@ -669,7 +668,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if ((result == 0) && (fault_event_desc.membership_style == FT::MEMB_INF_CTRL)) { - PortableGroup::ObjectGroup_var new_object_group; result = this->remove_failed_member ( the_object_group.in(), diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h index a8e714f4ae3a8..520cfe46714ea 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h @@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /////////////////////// // Forward declarations class FT_ReplicationManager; @@ -49,7 +48,6 @@ namespace TAO class FT_ReplicationManagerFaultAnalyzer : public ::TAO::FT_DefaultFaultAnalyzer { - public: /** * Constructor. @@ -64,7 +62,6 @@ namespace TAO virtual ~FT_ReplicationManagerFaultAnalyzer (); public: - /** * Validate event type to make sure it is one we can handle. * @param event The structured fault event, as from the Fault Notifier. @@ -98,7 +95,6 @@ namespace TAO ///////////////////////// // Implementation methods protected: - /// Helper functions for fault analysis. // Extract the type id from a CORBA any. @@ -185,9 +181,7 @@ namespace TAO // Data Members private: FT_ReplicationManager * replication_manager_; - }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index b3139b404ba19..4ba0ec642ae1b 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -90,7 +90,7 @@ TAO::FT_FaultDetectorFactory_i::~FT_FaultDetectorFactory_i () //////////////////////////////////////////// // FT_FaultDetectorFactory_i private methods -void TAO::FT_FaultDetectorFactory_i::shutdown_i(void) +void TAO::FT_FaultDetectorFactory_i::shutdown_i() { // assume mutex is locked for (size_t nDetector = 0; nDetector < this->detectors_.size(); ++nDetector) @@ -103,7 +103,7 @@ void TAO::FT_FaultDetectorFactory_i::shutdown_i(void) } } -int TAO::FT_FaultDetectorFactory_i::write_ior(void) +int TAO::FT_FaultDetectorFactory_i::write_ior() { int result = -1; FILE* out = ACE_OS::fopen (this->ior_output_file_, "w"); @@ -346,7 +346,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb) return result; } -int TAO::FT_FaultDetectorFactory_i::fini (void) +int TAO::FT_FaultDetectorFactory_i::fini () { if (this->ior_output_file_ != 0) { @@ -465,7 +465,7 @@ void TAO::FT_FaultDetectorFactory_i::change_properties ( METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::change_properties); } -void TAO::FT_FaultDetectorFactory_i::shutdown (void) +void TAO::FT_FaultDetectorFactory_i::shutdown () { METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::shutdown); ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->internals_); @@ -654,7 +654,7 @@ void TAO::FT_FaultDetectorFactory_i::delete_object ( METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::delete_object); } -CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (void) +CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive () { METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::is_alive) 1; diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h index 75de43bf26df3..9f2dc08d01018 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h @@ -120,7 +120,7 @@ namespace TAO * Prepare to exit. * @return zero for success; nonzero is process return code for failure. */ - int fini (void); + int fini (); /** * Idle-time activity. @@ -154,7 +154,7 @@ namespace TAO virtual void change_properties ( const PortableGroup::Properties & property_set); - virtual void shutdown (void); + virtual void shutdown (); ///////////////////////////////////////// // CORBA interface GenericFactory methods @@ -169,7 +169,7 @@ namespace TAO ////////////////////////////////////////// // CORBA interface PullMonitorable methods - virtual CORBA::Boolean is_alive (void); + virtual CORBA::Boolean is_alive (); ///////////////////////// // Implementation methods @@ -192,7 +192,6 @@ namespace TAO /////////////// // Data Members private: - /** * Protect internal state. * Mutex should be locked by corba methods, or by diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp index 5afca4f3aacf8..40c9d52d71ce8 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp @@ -165,7 +165,6 @@ void TAO::Fault_Detector_i::notify() this->notifier_->push_structured_fault(vEvent.in()); if (TAO_debug_level > 5) { - ORBSVCS_ERROR ((LM_ERROR, "return from Fault Detector push Structured Event.\n" )); diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index 1052ea3760eb9..23698aaecda5a 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -193,13 +193,13 @@ const char * TAO::FT_FaultNotifier_i::identity () const return this->identity_.c_str(); } -PortableServer::POA_ptr TAO::FT_FaultNotifier_i::_default_POA (void) +PortableServer::POA_ptr TAO::FT_FaultNotifier_i::_default_POA () { return this->poa_.in(); } -void TAO::FT_FaultNotifier_i::_remove_ref (void) +void TAO::FT_FaultNotifier_i::_remove_ref () { notify_channel_->destroy(); @@ -209,7 +209,7 @@ void TAO::FT_FaultNotifier_i::_remove_ref (void) this->gone_ = 1; } -int TAO::FT_FaultNotifier_i::fini (void) +int TAO::FT_FaultNotifier_i::fini () { if (this->ior_output_file_ != 0) { @@ -683,7 +683,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer ( METHOD_RETURN(TAO::FT_FaultNotifier_i::disconnect_consumer); } -CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive (void) +CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive () { METHOD_RETURN(TAO::FT_FaultNotifier_i::is_alive) 1; } diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h index ecc69f45a195e..1f3634355fbae 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h @@ -69,7 +69,7 @@ namespace TAO * Prepare to exit * @return zero for success; nonzero is process return code for failure. */ - int fini (void); + int fini (); /** * Identify this fault notifier. @@ -110,13 +110,13 @@ namespace TAO ////////////////////////////////////////// // CORBA interface PullMonitorable methods - virtual CORBA::Boolean is_alive (void); + virtual CORBA::Boolean is_alive (); ///////////////////////////////////////// // Override CORBA servant virtual methods - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); - virtual void _remove_ref (void); + virtual void _remove_ref (); ///////////////////////// // Implementation methods @@ -226,7 +226,6 @@ namespace TAO * boolean: set true when CORBA is done with this object. */ int gone_; - }; } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index d51d3ad101b55..cfc41f9e38740 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -9,11 +9,11 @@ #include "tao/ORB_Core.h" #include "ace/Auto_Ptr.h" -IFR_Service::IFR_Service (void) +IFR_Service::IFR_Service () { } -IFR_Service::~IFR_Service (void) +IFR_Service::~IFR_Service () { } @@ -45,7 +45,7 @@ IFR_Service::init (int argc, } int -IFR_Service::run (void) +IFR_Service::run () { this->orb_->run (0); @@ -53,7 +53,7 @@ IFR_Service::run (void) } int -IFR_Service::fini (void) +IFR_Service::fini () { try { @@ -68,7 +68,7 @@ IFR_Service::fini (void) } void -IFR_Service::shutdown (void) +IFR_Service::shutdown () { this->orb_->shutdown (); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index 6e3d62ee10205..8a1eb7337b29c 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -28,25 +28,24 @@ class IFR_Service { public: - /// Default constructor. - IFR_Service (void); + IFR_Service (); /// Destructor - ~IFR_Service (void); + ~IFR_Service (); /// Initialize the IFR service. int init (int argc, ACE_TCHAR *argv[]); /// Shut down the IFR Service. - int fini (void); + int fini (); /// Run the IFR service. - int run (void); + int run (); /// Shutdown the Service. - void shutdown (void); + void shutdown (); protected: /// Reference to our ORB. diff --git a/TAO/orbsvcs/IFR_Service/be_extern.h b/TAO/orbsvcs/IFR_Service/be_extern.h index c28a7c0c15e06..52e3584329533 100644 --- a/TAO/orbsvcs/IFR_Service/be_extern.h +++ b/TAO/orbsvcs/IFR_Service/be_extern.h @@ -76,9 +76,9 @@ extern TAO_IFR_BE_Export BE_GlobalData *be_global; extern TAO_IFR_BE_Export int BE_init (int &, ACE_TCHAR*[]); extern TAO_IFR_BE_Export void BE_post_init (char *[], long); -extern TAO_IFR_BE_Export void BE_version (void); -extern TAO_IFR_BE_Export void BE_produce (void); -extern TAO_IFR_BE_Export void BE_cleanup (void); -extern TAO_IFR_BE_Export void BE_abort (void); +extern TAO_IFR_BE_Export void BE_version (); +extern TAO_IFR_BE_Export void BE_produce (); +extern TAO_IFR_BE_Export void BE_cleanup (); +extern TAO_IFR_BE_Export void BE_abort (); #endif /* TAO_IFR_BE_EXTERN_H */ diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp index 4e90faf42b024..89a0ed5262c48 100644 --- a/TAO/orbsvcs/IFR_Service/be_global.cpp +++ b/TAO/orbsvcs/IFR_Service/be_global.cpp @@ -18,7 +18,7 @@ TAO_IFR_BE_Export BE_GlobalData *be_global = 0; -BE_GlobalData::BE_GlobalData (void) +BE_GlobalData::BE_GlobalData () : removing_ (false), filename_ (0), enable_locking_ (false), @@ -30,7 +30,7 @@ BE_GlobalData::BE_GlobalData (void) idl_global->preserve_cpp_keywords (true); } -BE_GlobalData::~BE_GlobalData (void) +BE_GlobalData::~BE_GlobalData () { } @@ -71,13 +71,13 @@ BE_GlobalData::repository (CORBA::Repository_ptr repo) } ACE_Unbounded_Stack & -BE_GlobalData::ifr_scopes (void) +BE_GlobalData::ifr_scopes () { return this->ifr_scopes_; } void -BE_GlobalData::destroy (void) +BE_GlobalData::destroy () { } @@ -142,7 +142,7 @@ BE_GlobalData::orb_args (const ACE_CString& args) } ACE_CString -BE_GlobalData::spawn_options (void) +BE_GlobalData::spawn_options () { return this->orb_args_ + idl_global->idl_flags (); } diff --git a/TAO/orbsvcs/IFR_Service/be_global.h b/TAO/orbsvcs/IFR_Service/be_global.h index 7ad1bb1abf735..21d5e0885bc2e 100644 --- a/TAO/orbsvcs/IFR_Service/be_global.h +++ b/TAO/orbsvcs/IFR_Service/be_global.h @@ -38,10 +38,10 @@ class TAO_IFR_BE_Export BE_GlobalData // Storage of global data specific to the compiler back end // /// Constructor. - BE_GlobalData (void); + BE_GlobalData (); /// Destructor. - virtual ~BE_GlobalData (void); + virtual ~BE_GlobalData (); // Data accessors. @@ -54,10 +54,10 @@ class TAO_IFR_BE_Export BE_GlobalData CORBA::Repository_ptr repository () const; void repository (CORBA::Repository_ptr repo); - ACE_Unbounded_Stack &ifr_scopes (void); + ACE_Unbounded_Stack &ifr_scopes (); /// Cleanup function. - void destroy (void); + void destroy (); const char *filename () const; void filename (char *fname); @@ -76,7 +76,7 @@ class TAO_IFR_BE_Export BE_GlobalData /// Command line passed to ACE_Process::spawn. Different /// implementations in IDL and IFR backends. - ACE_CString spawn_options (void); + ACE_CString spawn_options (); /// Parse an argument that might affect the backend. void parse_args (long &i, char **av); diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp index 94916420226a4..6a8bea445877d 100644 --- a/TAO/orbsvcs/IFR_Service/be_init.cpp +++ b/TAO/orbsvcs/IFR_Service/be_init.cpp @@ -86,7 +86,7 @@ BE_ifr_orb_init (int &ac, ACE_TCHAR *av[]) } TAO_IFR_BE_Export void -BE_version (void) +BE_version () { ORBSVCS_DEBUG ((LM_DEBUG, "%s %s\n", diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp index 2774ca20bfb89..2e307463a6270 100644 --- a/TAO/orbsvcs/IFR_Service/be_produce.cpp +++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp @@ -77,14 +77,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // Clean up before exit, whether successful or not. TAO_IFR_BE_Export void -BE_cleanup (void) +BE_cleanup () { idl_global->destroy (); } // Abort this run of the BE. TAO_IFR_BE_Export void -BE_abort (void) +BE_abort () { ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Fatal Error - Aborting\n"))); @@ -94,7 +94,7 @@ BE_abort (void) } int -BE_ifr_repo_init (void) +BE_ifr_repo_init () { try { @@ -138,7 +138,7 @@ BE_ifr_repo_init (void) // Do the work of this BE. This is the starting point for code generation. TAO_IFR_BE_Export void -BE_produce (void) +BE_produce () { try { @@ -200,7 +200,6 @@ BE_produce (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("BE_produce")); - } // Clean up. diff --git a/TAO/orbsvcs/IFR_Service/be_util.cpp b/TAO/orbsvcs/IFR_Service/be_util.cpp index 0459215ea0b34..15e4f2b0a8505 100644 --- a/TAO/orbsvcs/IFR_Service/be_util.cpp +++ b/TAO/orbsvcs/IFR_Service/be_util.cpp @@ -24,12 +24,12 @@ be_util::prep_be_arg (char *) } void -be_util::arg_post_proc (void) +be_util::arg_post_proc () { } void -be_util::usage (void) +be_util::usage () { ORBSVCS_DEBUG (( LM_DEBUG, @@ -44,7 +44,7 @@ be_util::usage (void) } AST_Generator * -be_util::generator_init (void) +be_util::generator_init () { AST_Generator *gen = 0; ACE_NEW_RETURN (gen, diff --git a/TAO/orbsvcs/IFR_Service/be_util.h b/TAO/orbsvcs/IFR_Service/be_util.h index 6e41caf36e672..01640c194cbbf 100644 --- a/TAO/orbsvcs/IFR_Service/be_util.h +++ b/TAO/orbsvcs/IFR_Service/be_util.h @@ -26,15 +26,15 @@ class be_util /// Checks made after parsing args. static TAO_IFR_BE_Export void - arg_post_proc (void); + arg_post_proc (); /// Display usage of BE-specific options. static TAO_IFR_BE_Export void - usage (void); + usage (); /// Create an AST node generator. static TAO_IFR_BE_Export AST_Generator * - generator_init (void); + generator_init (); }; #endif // if !defined diff --git a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp index 3012c700d7610..07953dded0119 100644 --- a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp @@ -70,11 +70,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "be_extern.h" - const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024; void -DRV_init (void) +DRV_init () { // Initialize FE global data object. ACE_NEW (idl_global, diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp index 293564a0d3379..95b7fb43177ac 100644 --- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp @@ -69,7 +69,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "drv_private_ifr.h" - // Storage for file names #if !defined (NFILES) diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp index 057e05a50135c..826c5536758ec 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp @@ -61,7 +61,7 @@ ifr_adding_visitor::ifr_adding_visitor ( { } -ifr_adding_visitor::~ifr_adding_visitor (void) +ifr_adding_visitor::~ifr_adding_visitor () { } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h index 773f97a4b9d02..61cc748ff5d33 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h @@ -38,7 +38,7 @@ class ifr_adding_visitor : public ifr_visitor CORBA::Boolean in_reopened = 0, bool allow_duplicate_typedefs = false); - virtual ~ifr_adding_visitor (void); + virtual ~ifr_adding_visitor (); virtual int visit_scope (UTL_Scope *node); virtual int visit_predefined_type (AST_PredefinedType *node); diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp index 2a622afb5af52..10ce5c043da18 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp @@ -20,7 +20,7 @@ ifr_adding_visitor_exception::ifr_adding_visitor_exception ( { } -ifr_adding_visitor_exception::~ifr_adding_visitor_exception (void) +ifr_adding_visitor_exception::~ifr_adding_visitor_exception () { } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h index 45c4ceb6d74f0..abea0065cf11f 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h @@ -36,7 +36,7 @@ class ifr_adding_visitor_exception : public ifr_adding_visitor CORBA::Boolean in_reopened_); /// Destructor. - virtual ~ifr_adding_visitor_exception (void); + virtual ~ifr_adding_visitor_exception (); /// Visit a struct. virtual int visit_scope (UTL_Scope *node); @@ -65,7 +65,6 @@ class ifr_adding_visitor_exception : public ifr_adding_visitor /// Holder for the member list passed to create_struct() or /// create_exception(). CORBA::StructMemberSeq members_; - }; #endif /* TAO_IFR_ADDING_VISITOR_EXCEPTION_H */ diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp index 368763cd70b04..9411447ca73cb 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp @@ -18,7 +18,7 @@ ifr_adding_visitor_operation::ifr_adding_visitor_operation (AST_Decl *scope) { } -ifr_adding_visitor_operation::~ifr_adding_visitor_operation (void) +ifr_adding_visitor_operation::~ifr_adding_visitor_operation () { } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h index 2975da818cdda..f0984d11e0ad0 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.h @@ -35,7 +35,7 @@ class ifr_adding_visitor_operation : public ifr_adding_visitor ifr_adding_visitor_operation (AST_Decl *scope); /// Destructor. - virtual ~ifr_adding_visitor_operation (void); + virtual ~ifr_adding_visitor_operation (); /// Visit an operation. virtual int visit_operation (AST_Operation *node); diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp index 234142c65cf29..8b2bcddb29514 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp @@ -14,7 +14,7 @@ ifr_adding_visitor_structure::ifr_adding_visitor_structure (AST_Decl *scope) { } -ifr_adding_visitor_structure::~ifr_adding_visitor_structure (void) +ifr_adding_visitor_structure::~ifr_adding_visitor_structure () { } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h index 10609bf993991..0803c307aaca5 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h @@ -33,7 +33,7 @@ class ifr_adding_visitor_structure : public ifr_adding_visitor public: ifr_adding_visitor_structure (AST_Decl *scope); - virtual ~ifr_adding_visitor_structure (void); + virtual ~ifr_adding_visitor_structure (); virtual int visit_scope (UTL_Scope *node); virtual int visit_structure (AST_Structure *node); diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp index 4f7015b2fa65b..2c8e0d5e89c59 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp @@ -18,7 +18,7 @@ ifr_adding_visitor_union::ifr_adding_visitor_union (AST_Decl *scope) { } -ifr_adding_visitor_union::~ifr_adding_visitor_union (void) +ifr_adding_visitor_union::~ifr_adding_visitor_union () { } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h index 747fb2e762835..0029f754649e8 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h @@ -33,7 +33,7 @@ class ifr_adding_visitor_union : public ifr_adding_visitor public: ifr_adding_visitor_union (AST_Decl *scope); - virtual ~ifr_adding_visitor_union (void); + virtual ~ifr_adding_visitor_union (); virtual int visit_scope (UTL_Scope *node); virtual int visit_structure (AST_Structure *node); diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp index 8c9c04bb1e887..dcb44de61409e 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp @@ -4,11 +4,11 @@ #include "utl_scope.h" #include "ast_root.h" -ifr_removing_visitor::ifr_removing_visitor (void) +ifr_removing_visitor::ifr_removing_visitor () { } -ifr_removing_visitor::~ifr_removing_visitor (void) +ifr_removing_visitor::~ifr_removing_visitor () { } diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h index 9499a726cc91a..9f830bdddf213 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h +++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.h @@ -32,10 +32,10 @@ class ifr_removing_visitor : public ifr_visitor { public: /// Constructor. - ifr_removing_visitor (void); + ifr_removing_visitor (); /// Destructor. - virtual ~ifr_removing_visitor (void); + virtual ~ifr_removing_visitor (); /// Visit the scope. virtual int visit_scope (UTL_Scope *node); diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp index f7a0750d2cc09..b440b04541933 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp @@ -8,7 +8,7 @@ #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" -ifr_visitor::ifr_visitor (void) +ifr_visitor::ifr_visitor () : lock_ (0) { // Create the appropriate lock. @@ -24,7 +24,7 @@ ifr_visitor::ifr_visitor (void) } } -ifr_visitor::~ifr_visitor (void) +ifr_visitor::~ifr_visitor () { delete this->lock_; } diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_visitor.h index 99b48ca2a9992..9c43d0348a7ff 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_visitor.h +++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.h @@ -34,7 +34,7 @@ class ifr_visitor : public ast_visitor { public: - virtual ~ifr_visitor (void); + virtual ~ifr_visitor (); virtual int visit_decl (AST_Decl *d); virtual int visit_scope (UTL_Scope *node); @@ -93,7 +93,7 @@ class ifr_visitor : public ast_visitor protected: // Not abstract but we want to force subclassing anyway. - ifr_visitor (void); + ifr_visitor (); private: /// Lock. diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp index 4633fa0dfcff7..d2c30c71aaa59 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp @@ -1,6 +1,6 @@ #include "Activator_Info.h" -Activator_Info::Activator_Info (void) +Activator_Info::Activator_Info () : name ("") , token (0) , ior ("") @@ -27,7 +27,7 @@ Activator_Info::Activator_Info (const ACE_CString& aname, } void -Activator_Info::clear (void) +Activator_Info::clear () { this->name = ""; this->token = 0; @@ -36,7 +36,7 @@ Activator_Info::clear (void) } void -Activator_Info::reset_runtime (void) +Activator_Info::reset_runtime () { this->ior = ""; this->activator = ImplementationRepository::Activator::_nil (); diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h index 704e489a35473..1bf3a3c14db40 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h @@ -15,7 +15,7 @@ */ struct Activator_Info { - Activator_Info (void); + Activator_Info (); Activator_Info (const Activator_Info& other); Activator_Info (const ACE_CString& aname, @@ -24,10 +24,10 @@ struct Activator_Info ImplementationRepository::Activator_ptr act = ImplementationRepository::Activator::_nil ()); - void clear (void); + void clear (); /// Reset the connection portion - void reset_runtime(void); + void reset_runtime(); ACE_CString name; CORBA::Long token; diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp index 2023bcad32061..f23b234e7e224 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp @@ -19,7 +19,7 @@ class ImR_Activator_ORB_Runner : public ACE_Task_Base } }; -ImR_Activator_Loader::ImR_Activator_Loader (void) +ImR_Activator_Loader::ImR_Activator_Loader () { } @@ -56,7 +56,7 @@ ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[]) } int -ImR_Activator_Loader::fini (void) +ImR_Activator_Loader::fini () { ACE_ASSERT (this->runner_.get() != 0); try @@ -82,7 +82,7 @@ ImR_Activator_Loader::create_object (CORBA::ORB_ptr, } int -ImR_Activator_Loader::run (void) +ImR_Activator_Loader::run () { try { diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h index 8441aa9113d94..deb6a53607a9c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h @@ -18,7 +18,7 @@ class ImR_Activator_ORB_Runner; class Activator_Export ImR_Activator_Loader : public TAO_Object_Loader { public: - ImR_Activator_Loader(void); + ImR_Activator_Loader(); virtual int init (int argc, ACE_TCHAR *argv[]); @@ -29,7 +29,7 @@ class Activator_Export ImR_Activator_Loader : public TAO_Object_Loader ACE_TCHAR *argv[]); // Unlike other service objects, we have our own orb. - int run(void); + int run(); private: ImR_Activator_i service_; diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp index a05fe2197c80a..f52131335bcb8 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp @@ -61,7 +61,7 @@ Activator_NT_Service::handle_exception (ACE_HANDLE) * we update the report_status after init. */ int -Activator_NT_Service::svc (void) +Activator_NT_Service::svc () { ImR_Activator_i server; Activator_Options opts; @@ -89,7 +89,6 @@ Activator_NT_Service::svc (void) status = server.fini (); report_status (SERVICE_STOPPED); - } if (status != -1) return 0; diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp index 1a3ee36d37a34..2f469b6e3daf3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp @@ -223,7 +223,7 @@ Activator_Options::init (int argc, ACE_TCHAR *argv[]) } int -Activator_Options::init_from_registry (void) +Activator_Options::init_from_registry () { this->load_registry_options(); return 0; diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h index 6149c8f469d44..041d5a17718e5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h @@ -30,7 +30,6 @@ class Activator_Export Activator_Options { public: - enum SERVICE_COMMAND { SC_NONE, SC_INSTALL, @@ -97,7 +96,6 @@ class Activator_Export Activator_Options int load_registry_options (); private: - /// Our extra command line arguments ACE_CString cmdline_; diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp index a2daa136fa651..92a7caac5ede4 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp @@ -12,7 +12,7 @@ #include "orbsvcs/Log_Macros.h" #include "tao/PortableServer/Servant_Base.h" -ImR_Adapter::ImR_Adapter (void) +ImR_Adapter::ImR_Adapter () : default_servant_ (0) { } diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp index 75a1cf2ce3204..bcb9e1ea3440f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp @@ -31,7 +31,7 @@ AsyncAccessManager::AsyncAccessManager (UpdateableServerInfo &info, this->prev_pid_ = info_->pid; } -AsyncAccessManager::~AsyncAccessManager (void) +AsyncAccessManager::~AsyncAccessManager () { if (ImR_Locator_i::debug () > 4) { @@ -40,7 +40,7 @@ AsyncAccessManager::~AsyncAccessManager (void) } void -AsyncAccessManager::started_running (void) +AsyncAccessManager::started_running () { if (ImR_Locator_i::debug () > 4) { @@ -86,7 +86,7 @@ AsyncAccessManager::report (const char* operation) const } void -AsyncAccessManager::update_prev_pid (void) +AsyncAccessManager::update_prev_pid () { this->prev_pid_ = this->info_->pid; } @@ -310,7 +310,7 @@ AsyncAccessManager::notify_waiter (ImR_ResponseHandler *rh) } void -AsyncAccessManager::notify_waiters (void) +AsyncAccessManager::notify_waiters () { if (ImR_Locator_i::debug () > 4) { @@ -386,7 +386,6 @@ AsyncAccessManager::status_name (ImplementationRepository::AAM_Status s) return "UPDATE_FAILED"; case ImplementationRepository::AAM_ACTIVE_TERMINATE: return "ACTIVE_TERMINATE"; - } return ""; } @@ -444,7 +443,7 @@ AsyncAccessManager::activator_replied_start_running (bool success, int pid) } void -AsyncAccessManager::shutdown_initiated (void) +AsyncAccessManager::shutdown_initiated () { if (ImR_Locator_i::debug () > 4) { @@ -461,7 +460,7 @@ AsyncAccessManager::shutdown_initiated (void) } void -AsyncAccessManager::server_is_shutting_down (void) +AsyncAccessManager::server_is_shutting_down () { if (ImR_Locator_i::debug () > 4) { @@ -590,7 +589,7 @@ AsyncAccessManager::notify_child_death (int pid) } void -AsyncAccessManager::listener_disconnected (void) +AsyncAccessManager::listener_disconnected () { if (ImR_Locator_i::debug () > 4) { @@ -706,7 +705,7 @@ AsyncAccessManager::ping_replied (LiveStatus server) } bool -AsyncAccessManager::send_start_request (void) +AsyncAccessManager::send_start_request () { if (ImR_Locator_i::debug () > 4) { @@ -804,7 +803,7 @@ AsyncAccessManager::send_start_request (void) } AsyncAccessManager * -AsyncAccessManager::_add_ref (void) +AsyncAccessManager::_add_ref () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0); ++this->refcount_; @@ -813,7 +812,7 @@ AsyncAccessManager::_add_ref (void) } void -AsyncAccessManager::_remove_ref (void) +AsyncAccessManager::_remove_ref () { int count = 0; { @@ -836,12 +835,12 @@ ActivatorReceiver::ActivatorReceiver (AsyncAccessManager *aam, { } -ActivatorReceiver::~ActivatorReceiver (void) +ActivatorReceiver::~ActivatorReceiver () { } void -ActivatorReceiver::start_server (void) +ActivatorReceiver::start_server () { if (ImR_Locator_i::debug () > 4) { @@ -899,7 +898,7 @@ ActivatorReceiver::start_server_excep (Messaging::ExceptionHolder *holder) } void -ActivatorReceiver::shutdown (void) +ActivatorReceiver::shutdown () { } @@ -947,7 +946,7 @@ AccessLiveListener::AccessLiveListener (const char *server, { } -AccessLiveListener::~AccessLiveListener (void) +AccessLiveListener::~AccessLiveListener () { if (!this->aam_.is_nil()) { @@ -956,7 +955,7 @@ AccessLiveListener::~AccessLiveListener (void) } bool -AccessLiveListener::start (void) +AccessLiveListener::start () { bool const started = this->per_client_ ? this->pinger_.add_per_client_listener (this, srv_ref_.in()) : diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h index dc2d5716bf6a5..b9e0828d0008f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h @@ -54,9 +54,9 @@ class Locator_Export AsyncAccessManager AsyncAccessManager (UpdateableServerInfo &info, ImR_Locator_i &locator); - ~AsyncAccessManager (void); + ~AsyncAccessManager (); - void started_running (void); + void started_running (); bool is_terminating () const; bool is_running () const; @@ -70,26 +70,26 @@ class Locator_Export AsyncAccessManager void activator_replied_start_running (bool success, int pid); void server_is_running (const char *partial_ior, ImplementationRepository::ServerObject_ptr ref); - void server_is_shutting_down (void); - void shutdown_initiated (void); + void server_is_shutting_down (); + void shutdown_initiated (); bool notify_child_death (int pid); void ping_replied (LiveStatus server); - void listener_disconnected (void); + void listener_disconnected (); - AsyncAccessManager *_add_ref (void); - void _remove_ref (void); + AsyncAccessManager *_add_ref (); + void _remove_ref (); static const char *status_name (ImplementationRepository::AAM_Status s); static bool is_final (ImplementationRepository::AAM_Status s); - void update_prev_pid (void); + void update_prev_pid (); private: void report (const char* operation) const; void final_state (bool active = true); void notify_waiter (ImR_ResponseHandler *rh); - void notify_waiters (void); + void notify_waiters (); void status (ImplementationRepository::AAM_Status s); void update_status (ImplementationRepository::AAM_Status s); - bool send_start_request (void); + bool send_start_request (); UpdateableServerInfo info_; bool manual_start_; @@ -125,12 +125,12 @@ class ActivatorReceiver : public: ActivatorReceiver (AsyncAccessManager *aam, PortableServer::POA_ptr poa); - virtual ~ActivatorReceiver (void); + virtual ~ActivatorReceiver (); - void start_server (void); + void start_server (); void start_server_excep (Messaging::ExceptionHolder * excep_holder); - void shutdown (void); + void shutdown (); void shutdown_excep (Messaging::ExceptionHolder * excep_holder); void kill_server (CORBA::Boolean); @@ -155,8 +155,8 @@ class AccessLiveListener : public LiveListener AsyncAccessManager *aam, LiveCheck &pinger); - virtual ~AccessLiveListener (void); - bool start (void); + virtual ~AccessLiveListener (); + bool start (); bool status_changed (LiveStatus status); diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp index 0934f68f1942d..3c6db946c54e7 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp @@ -25,7 +25,7 @@ AsyncListManager::AsyncListManager (const Locator_Repository *repo, { } -AsyncListManager::~AsyncListManager (void) +AsyncListManager::~AsyncListManager () { if (ImR_Locator_i::debug() > 4) { @@ -36,13 +36,13 @@ AsyncListManager::~AsyncListManager (void) } PortableServer::POA_ptr -AsyncListManager::poa (void) +AsyncListManager::poa () { return PortableServer::POA::_duplicate (this->poa_.in()); } void -AsyncListManager::init_list (void) +AsyncListManager::init_list () { CORBA::ULong const len = static_cast (this->repo_->servers ().current_size ()); @@ -146,7 +146,7 @@ AsyncListManager::make_iterator (ImplementationRepository::ServerInformationIter } void -AsyncListManager::final_state (void) +AsyncListManager::final_state () { if (ImR_Locator_i::debug() > 4) { @@ -313,14 +313,14 @@ AsyncListManager::ping_replied (CORBA::ULong index, LiveStatus status, int pid) } AsyncListManager * -AsyncListManager::_add_ref (void) +AsyncListManager::_add_ref () { ++this->refcount_; return this; } void -AsyncListManager::_remove_ref (void) +AsyncListManager::_remove_ref () { int const count = --this->refcount_; @@ -348,12 +348,12 @@ ListLiveListener::ListLiveListener (const char *server, { } -ListLiveListener::~ListLiveListener (void) +ListLiveListener::~ListLiveListener () { } bool -ListLiveListener::start (void) +ListLiveListener::start () { bool const rtn = this->pinger_.add_poll_listener (this); this->started_ = true; @@ -361,13 +361,13 @@ ListLiveListener::start (void) } LiveStatus -ListLiveListener::status (void) +ListLiveListener::status () { return this->status_; } void -ListLiveListener::cancel (void) +ListLiveListener::cancel () { this->pinger_.remove_listener (this); } diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h index 6fe0271458d48..4879ac15547ee 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h @@ -43,9 +43,9 @@ class AsyncListManager PortableServer::POA_ptr poa, LiveCheck *pinger); - ~AsyncListManager (void); + ~AsyncListManager (); - PortableServer::POA_ptr poa (void); + PortableServer::POA_ptr poa (); void list (ImplementationRepository::AMH_AdministrationResponseHandler_ptr _tao_rh, CORBA::ULong count); @@ -55,15 +55,15 @@ class AsyncListManager bool evaluate_status (CORBA::ULong index, LiveStatus status, int pid); void ping_replied (CORBA::ULong index, LiveStatus status, int pid); - AsyncListManager *_add_ref (void); - void _remove_ref (void); + AsyncListManager *_add_ref (); + void _remove_ref (); private: - void init_list (void); + void init_list (); void list_i (CORBA::ULong start, CORBA::ULong count); bool make_iterator (ImplementationRepository::ServerInformationIterator_out si, CORBA::ULong start); - void final_state (void); + void final_state (); const Locator_Repository *repo_; PortableServer::POA_var poa_; @@ -90,10 +90,10 @@ class ListLiveListener : public LiveListener AsyncListManager *owner, LiveCheck &pinger); - virtual ~ListLiveListener (void); - bool start (void); - void cancel (void); - LiveStatus status (void); + virtual ~ListLiveListener (); + bool start (); + void cancel (); + LiveStatus status (); bool status_changed (LiveStatus status); private: diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index 60976e69dc617..06fb67403097a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -32,7 +32,7 @@ ImR_DSI_Forwarder::ImR_DSI_Forwarder (ImR_Locator_i& imr_impl) { } -ImR_DSI_Forwarder::~ImR_DSI_Forwarder (void) +ImR_DSI_Forwarder::~ImR_DSI_Forwarder () { } @@ -171,7 +171,7 @@ ImR_DSI_ResponseHandler::ImR_DSI_ResponseHandler (const char *key, { } -ImR_DSI_ResponseHandler::~ImR_DSI_ResponseHandler (void) +ImR_DSI_ResponseHandler::~ImR_DSI_ResponseHandler () { } diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h index 23e81669c28ee..44fd1feb694a5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h @@ -55,7 +55,7 @@ class ImR_DSI_ResponseHandler : public ImR_ResponseHandler CORBA::ORB_ptr orb, TAO_AMH_DSI_Response_Handler_ptr resp); - virtual ~ImR_DSI_ResponseHandler (void); + virtual ~ImR_DSI_ResponseHandler (); void send_ior (const char *pior); void send_exception (CORBA::Exception *ex); @@ -85,7 +85,7 @@ class Locator_Export ImR_DSI_Forwarder : public virtual TAO_DynamicImplementatio { public: ImR_DSI_Forwarder (ImR_Locator_i& imr_impl); - virtual ~ImR_DSI_Forwarder (void); + virtual ~ImR_DSI_Forwarder (); virtual void _dispatch (TAO_ServerRequest& request, TAO::Portable_Server::Servant_Upcall *context); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp index 43c20f68948f3..679908d3e351f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp @@ -84,7 +84,7 @@ ACE_NT_SERVICE_DEFINE (service, Activator_NT_Service, IMR_ACTIVATOR_SERVICE_NAME #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ int -run_service (void) +run_service () { #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index ab2e06d5c0f74..4b281396eb303 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -71,7 +71,7 @@ Watchdog::stop() } #endif /* ACE_WIN32 */ -ImR_Activator_i::ImR_Activator_i (void) +ImR_Activator_i::ImR_Activator_i () : registration_token_(0) , debug_(0) , notify_imr_ (false) @@ -279,7 +279,7 @@ ImR_Activator_i::init (Activator_Options& opts) } int -ImR_Activator_i::fini (void) +ImR_Activator_i::fini () { try { @@ -335,20 +335,20 @@ ImR_Activator_i::fini (void) } int -ImR_Activator_i::run (void) +ImR_Activator_i::run () { this->orb_->run (); return 0; } void -ImR_Activator_i::shutdown (void) +ImR_Activator_i::shutdown () { this->shutdown (false); } bool -ImR_Activator_i::in_upcall (void) +ImR_Activator_i::in_upcall () { try { @@ -537,7 +537,7 @@ ImR_Activator_i::start_server(const char* name, 1, cmdline_buf_len + 1, this->env_buf_len_, this->max_env_vars_); - proc_opts.command_line (ACE_TEXT_CHAR_TO_TCHAR(cmdline)); + proc_opts.command_line (ACE_TEXT("%") ACE_TEXT_PRIs, ACE_TEXT_CHAR_TO_TCHAR(cmdline)); proc_opts.working_directory (dir); // Win32 does not support the CLOSE_ON_EXEC semantics for sockets // the way unix does, so in order to avoid having the child process @@ -564,13 +564,13 @@ ImR_Activator_i::start_server(const char* name, { CORBA::String_var ior = orb_->object_to_string (locator_.in ()); proc_opts.setenv (ACE_TEXT ("ImplRepoServiceIOR"), - ACE_TEXT_CHAR_TO_TCHAR (ior.in ())); + ACE_TEXT("%") ACE_TEXT_PRIs, ACE_TEXT_CHAR_TO_TCHAR (ior.in ())); } for (CORBA::ULong i = 0; i < env.length (); ++i) { proc_opts.setenv (ACE_TEXT_CHAR_TO_TCHAR (env[i].name.in ()), - ACE_TEXT_CHAR_TO_TCHAR (env[i].value.in ())); + ACE_TEXT("%") ACE_TEXT_PRIs, ACE_TEXT_CHAR_TO_TCHAR (env[i].value.in ())); } pid = this->process_mgr_.spawn (proc_opts, this); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h index 86d8c7b604c4a..f3ecb416bd7c2 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h @@ -85,7 +85,7 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac public: friend class Active_Pid_Setter; - ImR_Activator_i (void); + ImR_Activator_i (); void start_server (const char* name, const char* cmdline, @@ -96,18 +96,18 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac CORBA::Boolean still_alive (CORBA::Long pid); - void shutdown(void); + void shutdown(); /// Initialize the Server state - parsing arguments and waiting. int init (Activator_Options& opts); /// Cleans up any state created by init*. - int fini (void); + int fini (); int handle_timeout (const ACE_Time_Value &, const void *tok); /// Runs the orb. - int run (void); + int run (); /// Shutdown the orb. void shutdown (bool signaled); @@ -124,7 +124,7 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac bool still_running_i (const char *name, pid_t& pid); - bool in_upcall (void); + bool in_upcall (); private: typedef ACE_Unbounded_Set UniqueServerList; diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp index 770eba4371275..fdcda8a7ddd3a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp @@ -82,7 +82,7 @@ ACE_NT_SERVICE_DEFINE (service, Locator_NT_Service, IMR_LOCATOR_SERVICE_NAME); #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ int -run_service (void) +run_service () { #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index d9cf14c4a7df1..2e435ddae6f00 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -29,7 +29,6 @@ static const ACE_Time_Value DEFAULT_SHUTDOWN_TIMEOUT (0, 5000 * 1000); static PortableServer::POA_ptr createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name) { - PortableServer::LifespanPolicy_var life = root_poa->create_lifespan_policy (PortableServer::PERSISTENT); @@ -53,7 +52,7 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name) { int ImR_Locator_i::debug_ = 0; -ImR_Locator_i::ImR_Locator_i (void) +ImR_Locator_i::ImR_Locator_i () : dsi_forwarder_ (*this) , ins_locator_ (0) , aam_active_ () @@ -70,7 +69,7 @@ ImR_Locator_i::ImR_Locator_i (void) ins_locator_ = locator; } -ImR_Locator_i::~ImR_Locator_i (void) +ImR_Locator_i::~ImR_Locator_i () { } @@ -238,7 +237,7 @@ ImR_Locator_i::init (Options& opts) } int -ImR_Locator_i::run (void) +ImR_Locator_i::run () { if (debug_ > 0) { @@ -360,7 +359,7 @@ ImR_Locator_i::opts () const } int -ImR_Locator_i::fini (void) +ImR_Locator_i::fini () { try { @@ -1540,7 +1539,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info) } void -ImR_Locator_i::auto_start_servers (void) +ImR_Locator_i::auto_start_servers () { if (this->repository_->servers ().current_size () == 0) return; @@ -1630,8 +1629,6 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info) this->opts_->ping_external (), sip->server.in(), sip->pid); - - } catch (const CORBA::Exception& ) { @@ -1660,13 +1657,13 @@ ImR_Locator_i::debug () } LiveCheck& -ImR_Locator_i::pinger (void) +ImR_Locator_i::pinger () { return this->pinger_; } PortableServer::POA_ptr -ImR_Locator_i::root_poa (void) +ImR_Locator_i::root_poa () { return PortableServer::POA::_duplicate (this->root_poa_.in()); } @@ -1772,7 +1769,7 @@ SyncListener::~SyncListener () } bool -SyncListener::is_alive (void) +SyncListener::is_alive () { this->callback_ = true; while (!this->got_it_) @@ -1810,7 +1807,7 @@ ImR_SyncResponseHandler::ImR_SyncResponseHandler (const char *objkey, CORBA::ORB { } -ImR_SyncResponseHandler::~ImR_SyncResponseHandler (void) +ImR_SyncResponseHandler::~ImR_SyncResponseHandler () { } @@ -1829,7 +1826,7 @@ ImR_SyncResponseHandler::send_exception (CORBA::Exception *ex) } char * -ImR_SyncResponseHandler::wait_for_result (void) +ImR_SyncResponseHandler::wait_for_result () { while (this->result_.in() == 0 && this->excep_ == 0) { @@ -1861,7 +1858,7 @@ ImR_Loc_ResponseHandler::ImR_Loc_ResponseHandler { } -ImR_Loc_ResponseHandler::~ImR_Loc_ResponseHandler (void) +ImR_Loc_ResponseHandler::~ImR_Loc_ResponseHandler () { } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h index abc250a2aa196..da3bc7db9407d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h @@ -38,7 +38,7 @@ class Locator_Export ImR_Locator_i : public: ImR_Locator_i(); - ~ImR_Locator_i (void); + ~ImR_Locator_i (); /// Initialize the service, creating its own orb, poa, etc. int init (Options& opts); @@ -47,13 +47,13 @@ class Locator_Export ImR_Locator_i : int init_with_orb (CORBA::ORB_ptr orb); //, Options& opts); /// Cleans up any state created by init*. - int fini (void); + int fini (); /// Run using the orb reference created during init() - int run (void); + int run (); /// Called by the signal handler to notify of shutdown request - void signal_shutdown (void); + void signal_shutdown (); /// Shutdown the orb. void shutdown (bool wait_for_completion); @@ -61,7 +61,7 @@ class Locator_Export ImR_Locator_i : /// Access the options const Options *opts () const; - static int debug (void); + static int debug (); // Note : See the IDL for descriptions of the operations. // Activator->Locator @@ -160,8 +160,8 @@ class Locator_Export ImR_Locator_i : // interfaces to aid with collaboration - LiveCheck &pinger (void); - PortableServer::POA_ptr root_poa (void); + LiveCheck &pinger (); + PortableServer::POA_ptr root_poa (); Activator_Info_Ptr get_activator (const ACE_CString& name); void remove_server_i (const Server_Info_Ptr &si); @@ -192,7 +192,7 @@ class Locator_Export ImR_Locator_i : void connect_activator (Activator_Info& info); - void auto_start_servers (void); + void auto_start_servers (); void connect_server (UpdateableServerInfo& info); @@ -258,7 +258,7 @@ class SyncListener : public LiveListener virtual ~SyncListener (); - bool is_alive (void); + bool is_alive (); bool status_changed (LiveStatus status); @@ -281,12 +281,12 @@ class ImR_SyncResponseHandler : public ImR_ResponseHandler { public: ImR_SyncResponseHandler (const char *key, CORBA::ORB_ptr orb); - virtual ~ImR_SyncResponseHandler (void); + virtual ~ImR_SyncResponseHandler (); virtual void send_ior (const char *pior); virtual void send_exception (CORBA::Exception *ex); - char *wait_for_result (void); + char *wait_for_result (); private: CORBA::String_var result_; @@ -320,7 +320,7 @@ class ImR_Loc_ResponseHandler : public ImR_ResponseHandler ImplementationRepository::AMH_AdministrationResponseHandler_ptr rh); ImR_Loc_ResponseHandler (Loc_Operation_Id opid, ImplementationRepository::AMH_AdministrationExtResponseHandler_ptr rh); - virtual ~ImR_Loc_ResponseHandler (void); + virtual ~ImR_Loc_ResponseHandler (); virtual void send_ior (const char *pior); virtual void send_exception (CORBA::Exception *ex); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp index cd1ca30234647..ef3bc15ab6e5e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp @@ -12,7 +12,7 @@ ImR_ResponseHandler::ImR_ResponseHandler () { } -ImR_ResponseHandler::~ImR_ResponseHandler (void) +ImR_ResponseHandler::~ImR_ResponseHandler () { } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h index bc8ea58d0a8f0..0e327f880f000 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h @@ -26,8 +26,8 @@ class ImR_ResponseHandler { public: - ImR_ResponseHandler (void); - virtual ~ImR_ResponseHandler (void); + ImR_ResponseHandler (); + virtual ~ImR_ResponseHandler (); // Dummy implementations used for internal operations virtual void send_ior (const char *pior); diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h index 959adb90b4519..d606a97858f83 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h @@ -22,7 +22,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ - class ImR_AsyncIterator : public POA_ImplementationRepository::AMH_ServerInformationIterator { diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index a9684eabc9925..22be5392ce123 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -16,7 +16,7 @@ LiveListener::LiveListener (const char *server) { } -LiveListener::~LiveListener (void) +LiveListener::~LiveListener () { } @@ -27,7 +27,7 @@ LiveListener::server () const } LiveListener * -LiveListener::_add_ref (void) +LiveListener::_add_ref () { int const refcount = ++this->refcount_; if (ImR_Locator_i::debug () > 5) @@ -40,7 +40,7 @@ LiveListener::_add_ref (void) } void -LiveListener::_remove_ref (void) +LiveListener::_remove_ref () { int const count = --this->refcount_; if (ImR_Locator_i::debug () > 5) @@ -102,7 +102,7 @@ LiveEntry::reping_available () const } int -LiveEntry::next_reping (void) +LiveEntry::next_reping () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, -1); return this->reping_available() ? LiveEntry::reping_msec_[this->repings_++] : -1; @@ -146,7 +146,7 @@ LiveEntry::LiveEntry (LiveCheck *owner, } } -LiveEntry::~LiveEntry (void) +LiveEntry::~LiveEntry () { if (this->callback_.in () != 0) { @@ -159,7 +159,7 @@ LiveEntry::~LiveEntry (void) } void -LiveEntry::release_callback (void) +LiveEntry::release_callback () { this->callback_ = 0; } @@ -195,7 +195,7 @@ LiveEntry::remove_listener (LiveListener *ll) } void -LiveEntry::reset_status (void) +LiveEntry::reset_status () { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); if ( this->liveliness_ == LS_ALIVE || @@ -238,14 +238,13 @@ LiveEntry::status () const } void -LiveEntry::update_listeners (void) +LiveEntry::update_listeners () { Listen_Set remove; for (Listen_Set::ITERATOR i(this->listeners_); !i.done(); i.advance ()) { - if ((*i)->status_changed (this->liveliness_)) { remove.insert (*i); @@ -495,12 +494,12 @@ PingReceiver::PingReceiver (LiveEntry *entry, PortableServer::POA_ptr poa) { } -PingReceiver::~PingReceiver (void) +PingReceiver::~PingReceiver () { } void -PingReceiver::cancel (void) +PingReceiver::cancel () { if (ImR_Locator_i::debug () > 4) { @@ -532,7 +531,7 @@ PingReceiver::cancel (void) } void -PingReceiver::ping (void) +PingReceiver::ping () { if (this->entry_ != 0) { @@ -633,7 +632,7 @@ LC_TimeoutGuard::LC_TimeoutGuard (LiveCheck *owner, LC_token_type token) owner_->enter_handle_timeout (); } -LC_TimeoutGuard::~LC_TimeoutGuard (void) +LC_TimeoutGuard::~LC_TimeoutGuard () { owner_->exit_handle_timeout (); @@ -703,7 +702,7 @@ LiveCheck::LiveCheck () { } -LiveCheck::~LiveCheck (void) +LiveCheck::~LiveCheck () { for (LiveEntryMap::iterator em (this->entry_map_); !em.done(); em++) { @@ -720,19 +719,19 @@ LiveCheck::~LiveCheck (void) } void -LiveCheck::enter_handle_timeout (void) +LiveCheck::enter_handle_timeout () { ++this->handle_timeout_busy_; } void -LiveCheck::exit_handle_timeout (void) +LiveCheck::exit_handle_timeout () { --this->handle_timeout_busy_; } bool -LiveCheck::in_handle_timeout (void) +LiveCheck::in_handle_timeout () { return this->handle_timeout_busy_ != 0; } @@ -750,7 +749,7 @@ LiveCheck::init (CORBA::ORB_ptr orb, } void -LiveCheck::shutdown (void) +LiveCheck::shutdown () { this->running_ = false; this->reactor()->cancel_timer (this); @@ -969,7 +968,7 @@ LiveCheck::remove_server (const char *server, int pid) } void -LiveCheck::remove_deferred_servers (void) +LiveCheck::remove_deferred_servers () { if (!this->removed_entries_.is_empty ()) { diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h index 610b942a4ed43..a61ec95536369 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h @@ -76,7 +76,7 @@ class Locator_Export LiveListener /// look up a listener entry in the LiveCheck map. LiveListener (const char *server); - virtual ~LiveListener (void); + virtual ~LiveListener (); /// called by the asynch ping receiver when a reply or an exception /// is received. Returns true if finished listening @@ -85,8 +85,8 @@ class Locator_Export LiveListener /// Accessor for the server name. Used by the LiveCheck to associate a listener const char *server () const; - LiveListener *_add_ref (void); - void _remove_ref (void); + LiveListener *_add_ref (); + void _remove_ref (); protected: ACE_CString server_; @@ -116,25 +116,25 @@ class Locator_Export LiveEntry bool may_ping, ImplementationRepository::ServerObject_ptr ref, int pid); - ~LiveEntry (void); + ~LiveEntry (); - void release_callback (void); + void release_callback (); void add_listener (LiveListener *ll); void remove_listener (LiveListener *ll); LiveStatus status () const; void status (LiveStatus l); - void reset_status (void); + void reset_status (); /// the current state value as text static const char *status_name (LiveStatus s); - void update_listeners (void); + void update_listeners (); bool validate_ping (bool &want_reping, ACE_Time_Value &next); void do_ping (PortableServer::POA_ptr poa); const ACE_Time_Value &next_check () const; static void set_reping_limit (int max); bool reping_available () const; - int next_reping (void); + int next_reping (); void max_retry_msec (int max); const char *server_name () const; void set_pid (int pid); @@ -176,14 +176,14 @@ class Locator_Export PingReceiver : { public: PingReceiver (LiveEntry * entry, PortableServer::POA_ptr poa); - virtual ~PingReceiver (void); + virtual ~PingReceiver (); /// Called by the entry if it is no longer interested in the result of /// a ping. - void cancel (void); + void cancel (); /// Called when an anticipated ping reply is received - void ping (void); + void ping (); /// Called when an anticipated ping raises an exception void ping_excep (Messaging::ExceptionHolder * excep_holder); @@ -222,7 +222,7 @@ class Locator_Export LC_TimeoutGuard /// Releases the flag. If the LiveCheck received any requests for an immediate /// or deferred ping during this time, schedule it now. - ~LC_TimeoutGuard (void); + ~LC_TimeoutGuard (); /// Returns true if the in handle timeout in the owner was already set. bool blocked () const; @@ -250,11 +250,11 @@ class Locator_Export LiveCheck : public ACE_Event_Handler friend class LC_TimeoutGuard; LiveCheck (); - ~LiveCheck (void); + ~LiveCheck (); void init (CORBA::ORB_ptr orb, const ACE_Time_Value &interval); - void shutdown (void); + void shutdown (); int handle_timeout (const ACE_Time_Value ¤t_time, const void *act = 0); bool has_server (const char *server); @@ -275,10 +275,10 @@ class Locator_Export LiveCheck : public ACE_Event_Handler const ACE_Time_Value &ping_interval () const; private: - void enter_handle_timeout (void); - void exit_handle_timeout (void); - bool in_handle_timeout (void); - void remove_deferred_servers (void); + void enter_handle_timeout (); + void exit_handle_timeout (); + bool in_handle_timeout (); + void remove_deferred_servers (); typedef ACE_Hash_Map_Manager_Exrunner_.get () != 0); try @@ -76,7 +76,7 @@ ImR_Locator_Loader::create_object (CORBA::ORB_ptr, } int -ImR_Locator_Loader::run(void) +ImR_Locator_Loader::run() { try { diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h index 8bcd258b37fdc..76f39081061f9 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h @@ -28,7 +28,7 @@ class Locator_Export ImR_Locator_Loader : public TAO_Object_Loader ACE_TCHAR *argv[]); // Unlike other service objects, we have our own orb. - int run(void); + int run(); private: ImR_Locator_i service_; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp index 0ba84a23c445e..53ea42e249582 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp @@ -57,7 +57,7 @@ Locator_NT_Service::handle_exception (ACE_HANDLE) * We do almost the same thing as we do in run_standalone () */ int -Locator_NT_Service::svc (void) +Locator_NT_Service::svc () { ImR_Locator_i server; Options opts; @@ -85,7 +85,6 @@ Locator_NT_Service::svc (void) status = server.fini (); report_status (SERVICE_STOPPED); - } if (status != -1) return 0; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index ae17ac4ad0aff..282c8f2324ab9 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -359,7 +359,7 @@ Options::init (int argc, ACE_TCHAR *argv[]) } int -Options::init_from_registry (void) +Options::init_from_registry () { this->load_registry_options (); return 0; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h index ce0cb52bef6e6..7e6856b668037 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h @@ -34,7 +34,6 @@ class LiveCheck; class Locator_Export Options { public: - enum SERVICE_COMMAND { SC_NONE, SC_INSTALL, diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp index 2c41bddea4095..29b7d010aaf8f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp @@ -26,7 +26,7 @@ Locator_Repository::~Locator_Repository () } void -Locator_Repository::shutdown (void) +Locator_Repository::shutdown () { // default impl - no op } @@ -127,7 +127,7 @@ Locator_Repository::report_ior (PortableServer::POA_ptr ) } int -Locator_Repository::recover_ior (void) +Locator_Repository::recover_ior () { if (this->registered_) { @@ -592,7 +592,6 @@ Locator_Repository::link_peers (Server_Info_Ptr base, this->persistent_update (base, true); return 0; - } // ------------------------------------------------------------------------------------- @@ -645,7 +644,7 @@ Locator_Repository::remove_activator (const ACE_CString& name) } Locator_Repository::SIMap& -Locator_Repository::servers (void) +Locator_Repository::servers () { return server_infos_; } @@ -657,7 +656,7 @@ Locator_Repository::servers () const } Locator_Repository::AIMap& -Locator_Repository::activators (void) +Locator_Repository::activators () { return activator_infos_; } diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h index 45dd43ffbffb9..f32a1f7d1ac35 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h @@ -59,7 +59,7 @@ class Locator_Repository virtual ~Locator_Repository(); - virtual void shutdown (void); + virtual void shutdown (); int unregister_if_address_reused (const ACE_CString& fqname, const char* partial_ior, @@ -113,10 +113,10 @@ class Locator_Repository int remove_activator (const ACE_CString& name); /// Returns the internal hash map containing the server information. - SIMap& servers(void); + SIMap& servers(); const SIMap& servers() const; /// Returns the internal hash map containing the activator information. - AIMap& activators(void); + AIMap& activators(); const AIMap& activators() const; /// Indicate the persistence mode for the repository @@ -143,7 +143,7 @@ class Locator_Repository /// perform sync of repo with backing store /// defaults to no-op, only shared backing stores /// need to sync - virtual int sync_load (void); + virtual int sync_load (); /// perform server persistent update virtual int persistent_update (const Server_Info_Ptr& info, bool add) = 0; @@ -155,7 +155,7 @@ class Locator_Repository virtual int persistent_remove (const ACE_CString& name, bool activator) = 0; /// recover the ImR Locator's IOR from the persisted file - virtual int recover_ior (void); + virtual int recover_ior (); int setup_multicast (ACE_Reactor* reactor, const char* imr_ior); void teardown_multicast (); diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp index aeb716fbab3b1..e14f60fd7f47d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp @@ -83,7 +83,7 @@ Replicator::~Replicator() } void -Replicator::init_orb (void) +Replicator::init_orb () { int argc = 6; ACE_TCHAR *argv[8]; @@ -119,19 +119,19 @@ Replicator::init_orb (void) } char * -Replicator::ior (void) +Replicator::ior () { return this->orb_->object_to_string (this->me_.in ()); } bool -Replicator::peer_available (void) +Replicator::peer_available () { return !CORBA::is_nil (this->peer_.in ()); } void -Replicator::stop (void) +Replicator::stop () { if (this->reactor_ == 0) { @@ -141,7 +141,7 @@ Replicator::stop (void) } int -Replicator::svc (void) +Replicator::svc () { if (this->reactor_ == 0) { @@ -325,7 +325,6 @@ Replicator::send_entity (ImplementationRepository::UpdateInfo &info) int Replicator::send_registration (char *&imr_ior) { - if (this->debug_ > 1) { ORBSVCS_DEBUG((LM_INFO, diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.h b/TAO/orbsvcs/ImplRepo_Service/Replicator.h index b08775cb800a4..905dec776833d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Replicator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.h @@ -77,22 +77,22 @@ class Replicator : public ACE_Task_Base Replicator (Shared_Backing_Store &repo, const Options& opts); - virtual ~Replicator(void); + virtual ~Replicator(); virtual int svc (); virtual int handle_exception (ACE_HANDLE ); - void stop (void); + void stop (); void send_access_state (const char *name, ImplementationRepository::AAM_Status state); void send_entity (ImplementationRepository::UpdateInfo &info); - void init_orb (void); + void init_orb (); bool init_peer (const ACE_CString &filename ); int send_registration (char *&ior ); - bool peer_available (void); - char * ior (void); + bool peer_available (); + char * ior (); private: Replica_var me_; diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp index 254fbf91d31f3..08713c61c5d39 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp @@ -1,6 +1,6 @@ #include "Server_Info.h" -Server_Info::Server_Info (void) +Server_Info::Server_Info () { this->clear (); } @@ -99,7 +99,7 @@ Server_Info::Server_Info (const ACE_CString& serverId, } Server_Info * -Server_Info::active_info (void) +Server_Info::active_info () { return this->alt_info_.null() ? this : this->alt_info_.get(); } @@ -152,7 +152,7 @@ Server_Info::is_running () const } bool -Server_Info::start_allowed (void) +Server_Info::start_allowed () { Server_Info *active = this->active_info (); bool allowed = active->start_count_ < active->start_limit_; @@ -277,7 +277,7 @@ Server_Info::createImRServerInfo () const } void -Server_Info::clear (void) +Server_Info::clear () { server_id = ""; poa_name = ""; @@ -301,7 +301,7 @@ Server_Info::clear (void) } void -Server_Info::reset_runtime (void) +Server_Info::reset_runtime () { this->partial_ior = ""; Server_Info *startup = this->active_info (); diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h index 069b876429389..5132dfa14472a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h +++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h @@ -28,7 +28,7 @@ typedef ACE_Strong_Bound_Ptr Server_Info_Ptr; */ struct Server_Info { - Server_Info (void); + Server_Info (); Server_Info (const Server_Info & other); Server_Info (const ACE_CString& fqname, @@ -49,13 +49,13 @@ struct Server_Info Server_Info & operator= (const Server_Info& other); - void clear (void); + void clear (); /// Convert to the corba type void setImRInfo (ImplementationRepository::ServerInformation* info) const; ImplementationRepository::ServerInformation* createImRServerInfo() const; - void reset_runtime (void); + void reset_runtime (); bool is_server (const char *name) const; bool has_peer (const char *name) const; @@ -63,7 +63,7 @@ struct Server_Info ImplementationRepository::ActivationMode mode () const; bool is_running () const; - bool start_allowed (void); + bool start_allowed (); void started (bool success); // transform the supplied limit to always be at least 1 @@ -74,7 +74,7 @@ struct Server_Info const char *sior, ImplementationRepository::ServerObject_ptr svrobj); - Server_Info *active_info (void); + Server_Info *active_info (); const Server_Info *active_info () const; const char * ping_id () const; diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp index 8f06171529d1a..29b71f9529ac5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp @@ -23,7 +23,7 @@ namespace { class Lockable_File { public: - Lockable_File (void) + Lockable_File () : file_lock_ (), file_ (0), flags_ (0), @@ -46,12 +46,12 @@ namespace { init_fl(file, flags, unlink_in_destructor); } - ~Lockable_File (void) + ~Lockable_File () { release (); } - void release (void) + void release () { if (this->file_ != 0) { @@ -61,7 +61,7 @@ namespace { this->locked_ = false; } - FILE* get_file (void) + FILE* get_file () { lock (); @@ -103,7 +103,7 @@ namespace { #endif } - void close_file (void) + void close_file () { if (this->file_ == 0) return; @@ -120,7 +120,7 @@ namespace { #endif } - void lock (void) + void lock () { #if !defined (ACE_WIN32) if (this->locked_) @@ -248,7 +248,7 @@ Shared_Backing_Store::~Shared_Backing_Store() } void -Shared_Backing_Store::shutdown (void) +Shared_Backing_Store::shutdown () { this->replicator_.stop (); this->replicator_.wait (); @@ -536,7 +536,7 @@ Shared_Backing_Store::repo_mode() const } int -Shared_Backing_Store::connect_replicas (void) +Shared_Backing_Store::connect_replicas () { ACE_CString replica_ior_file = this->replica_ior_filename (true); bool was_running = this->replicator_.init_peer (replica_ior_file); @@ -895,7 +895,6 @@ Shared_Backing_Store::locator_service_ior (const char* peer_ior) const char* const combined_ior = this->orb_->object_to_string(locator_service.in ()); return combined_ior; - } void @@ -1028,7 +1027,7 @@ Shared_Backing_Store::Update_Handler::handle_exception (ACE_HANDLE) } void -Shared_Backing_Store::process_updates (void) +Shared_Backing_Store::process_updates () { // ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->sync_lock_); this->notified_ = false; diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h index f4c6ecc082e72..4b75bac1916bc 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h @@ -67,7 +67,7 @@ class Shared_Backing_Store : public XML_Backing_Store virtual ~Shared_Backing_Store(); - virtual void shutdown (void); + virtual void shutdown (); /// indicate the persistence mode for the repository virtual const ACE_TCHAR* repo_mode() const; @@ -109,7 +109,7 @@ class Shared_Backing_Store : public XML_Backing_Store void gen_ior (char*& ft_imr_ior); void updates_available (const ImplementationRepository::UpdateInfoSeq& info, bool missed); - void process_updates (void); + void process_updates (); protected: /// perform shared backing store specific initialization @@ -136,7 +136,7 @@ class Shared_Backing_Store : public XML_Backing_Store /// this ImR Locator's IOR char* locator_service_ior(const char* peer_ior) const; - int connect_replicas (void); + int connect_replicas (); private: /// map management helper functions @@ -288,7 +288,6 @@ class Shared_Backing_Store : public XML_Backing_Store Update_Handler (Shared_Backing_Store *owner) : owner_ (owner) {} int handle_exception (ACE_HANDLE); } update_handler_; - }; #endif /* SHARED_BACKING_STORE_H */ diff --git a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h index daf9eb94551da..11c23c8db8002 100644 --- a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h +++ b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h @@ -44,10 +44,10 @@ class UpdateableServerInfo UpdateableServerInfo(UpdateableServerInfo& other ); /// Destructor (updates repo if needed) - ~UpdateableServerInfo(void); + ~UpdateableServerInfo(); /// Explicitly update repo if needed - void update_repo(void); + void update_repo(); /// Update remote access state void notify_remote_access (ImplementationRepository::AAM_Status state); diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h index 8a32729905407..a7da1bb208240 100644 --- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h +++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h @@ -44,7 +44,7 @@ class XML_Backing_Store : public Locator_Repository CORBA::ORB_ptr orb, bool suppress_erase = false); - virtual ~XML_Backing_Store (void); + virtual ~XML_Backing_Store (); /// indicate the XML filename as the persistence mode for the repository virtual const ACE_TCHAR* repo_mode () const; diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index c3019685522a5..2a55ef99a9a1d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -12,7 +12,7 @@ #include "ace/os_include/os_netdb.h" #include "ace/OS_NS_unistd.h" -TAO_IMR_i::TAO_IMR_i (void) +TAO_IMR_i::TAO_IMR_i () : argc_ (0), argv_ (0), orb_ (), @@ -22,7 +22,7 @@ TAO_IMR_i::TAO_IMR_i (void) // Nothing } -TAO_IMR_i::~TAO_IMR_i (void) +TAO_IMR_i::~TAO_IMR_i () { } @@ -92,7 +92,7 @@ TAO_IMR_i::init (int argc, ACE_TCHAR **argv) // Go through and figure out which operation we should do. int -TAO_IMR_i::parse_args (void) +TAO_IMR_i::parse_args () { // Make sure one command was given if (this->argc_ < 2) @@ -121,7 +121,7 @@ TAO_IMR_i::parse_args (void) // Print out information about all operations. void -TAO_IMR_i::print_usage (void) +TAO_IMR_i::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Usage: tao_imr [options] command [command-arguments]\n" " where [options] are ORB options\n" @@ -263,7 +263,7 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn ORBSVCS_DEBUG ((LM_DEBUG, "\n")); } -TAO_IMR_Op_List::TAO_IMR_Op_List (void) +TAO_IMR_Op_List::TAO_IMR_Op_List () : verbose_server_information_ (0) , list_only_active_servers_ (0) , how_many_ (0) @@ -287,7 +287,7 @@ TAO_IMR_Op_Register::TAO_IMR_Op_Register (bool is_add) } void -TAO_IMR_Op_Activate::print_usage (void) +TAO_IMR_Op_Activate::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Starts a server using its registered Activator.\n\n" @@ -334,7 +334,7 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv) } void -TAO_IMR_Op_Autostart::print_usage (void) +TAO_IMR_Op_Autostart::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Usage: tao_imr [options] autostart\n" " where [options] are ORB options\n" @@ -366,7 +366,7 @@ TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv) } void -TAO_IMR_Op_IOR::print_usage (void) +TAO_IMR_Op_IOR::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Creates an IOR for a server that is registered with the IMR and uses\n" "the InterOperable Naming Service. Please see the documentation for\n" @@ -423,7 +423,7 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv) } void -TAO_IMR_Op_Kill::print_usage (void) +TAO_IMR_Op_Kill::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Sends a signal to the designated process\n\n" @@ -478,7 +478,7 @@ TAO_IMR_Op_Kill::parse (int argc, ACE_TCHAR **argv) } void -TAO_IMR_Op_Link::print_usage (void) +TAO_IMR_Op_Link::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Links multiple POAs to a single executable\n" "\n" @@ -548,7 +548,7 @@ TAO_IMR_Op_Link::parse (int argc, ACE_TCHAR **argv) } void -TAO_IMR_Op_List::print_usage (void) +TAO_IMR_Op_List::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Lists all or one of the servers in the Implementation Repository\n" "\n" @@ -608,7 +608,7 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv) } void -TAO_IMR_Op_Remove::print_usage (void) +TAO_IMR_Op_Remove::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Removes a server entry\n" "\n" @@ -662,7 +662,7 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv) } void -TAO_IMR_Op_Shutdown::print_usage (void) +TAO_IMR_Op_Shutdown::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Shuts down a server\n\n" @@ -714,7 +714,7 @@ TAO_IMR_Op_ShutdownRepo::TAO_IMR_Op_ShutdownRepo() } void -TAO_IMR_Op_ShutdownRepo::print_usage (void) +TAO_IMR_Op_ShutdownRepo::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Shuts down the ImR\n" "\n" @@ -775,7 +775,7 @@ TAO_IMR_Op_Register::addenv (ACE_TCHAR *opt) } void -TAO_IMR_Op_Register::print_usage (void) +TAO_IMR_Op_Register::print_usage () { ORBSVCS_ERROR ((LM_ERROR, "Adds/Updates a server entry\n\n" @@ -876,7 +876,7 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv) int -TAO_IMR_Op_Activate::run (void) +TAO_IMR_Op_Activate::run () { ACE_ASSERT(! CORBA::is_nil(imr_)); try @@ -927,7 +927,7 @@ TAO_IMR_Op_Activate::run (void) } int -TAO_IMR_Op_Autostart::run (void) +TAO_IMR_Op_Autostart::run () { ACE_ASSERT(! CORBA::is_nil (imr_)); @@ -967,7 +967,7 @@ TAO_IMR_Op_Autostart::run (void) } int -TAO_IMR_Op_IOR::run (void) +TAO_IMR_Op_IOR::run () { ACE_ASSERT (! CORBA::is_nil(imr_)); @@ -1055,7 +1055,7 @@ TAO_IMR_Op_IOR::run (void) } int -TAO_IMR_Op_Kill::run (void) +TAO_IMR_Op_Kill::run () { ACE_ASSERT (! CORBA::is_nil(imr_)); @@ -1104,7 +1104,7 @@ TAO_IMR_Op_Kill::run (void) } int -TAO_IMR_Op_Link::run (void) +TAO_IMR_Op_Link::run () { ACE_ASSERT (! CORBA::is_nil(imr_)); @@ -1148,7 +1148,7 @@ TAO_IMR_Op_Link::run (void) int -TAO_IMR_Op_List::run (void) +TAO_IMR_Op_List::run () { ACE_ASSERT (! CORBA::is_nil(imr_)); @@ -1220,7 +1220,7 @@ TAO_IMR_Op_List::run (void) } int -TAO_IMR_Op_Remove::run (void) +TAO_IMR_Op_Remove::run () { ACE_ASSERT (! CORBA::is_nil(imr_)); @@ -1274,7 +1274,7 @@ TAO_IMR_Op_Remove::run (void) } int -TAO_IMR_Op_Shutdown::run (void) +TAO_IMR_Op_Shutdown::run () { ACE_ASSERT (! CORBA::is_nil(imr_)); @@ -1318,7 +1318,7 @@ TAO_IMR_Op_Shutdown::run (void) } int -TAO_IMR_Op_ShutdownRepo::run (void) +TAO_IMR_Op_ShutdownRepo::run () { ACE_ASSERT(! CORBA::is_nil(imr_)); @@ -1343,7 +1343,7 @@ TAO_IMR_Op_ShutdownRepo::run (void) } int -TAO_IMR_Op_Register::run (void) +TAO_IMR_Op_Register::run () { ACE_ASSERT (! CORBA::is_nil(imr_)); diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h index acdcc91038070..f24b40bdb0618 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h @@ -30,23 +30,22 @@ class TAO_IMR_Op; class TAO_IMR_i { public: - // = Constructor and destructor. - TAO_IMR_i (void); - ~TAO_IMR_i (void); + TAO_IMR_i (); + ~TAO_IMR_i (); /// Execute client code. - int run (void); + int run (); /// Initialize the client communication endpoint with server. int init (int argc, ACE_TCHAR **argv); private: /// Print out information about all operations. - void print_usage (void); + void print_usage (); /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// # of arguments on the command line. int argc_; @@ -90,19 +89,19 @@ class TAO_IMR_Op static TAO_IMR_Op *make_op (const ACE_TCHAR *op_name); /// Destructor. - virtual ~TAO_IMR_Op (void); + virtual ~TAO_IMR_Op (); /// Parse arguments. virtual int parse (int argc, ACE_TCHAR **argv) = 0; /// Do the work. - virtual int run (void) = 0; + virtual int run () = 0; /// Sets the implrepo locator pointer void set_imr (ImplementationRepository::Administration_ptr imr); protected: - TAO_IMR_Op (void) : imr_ (0), quiet_ (false) {} + TAO_IMR_Op () : imr_ (0), quiet_ (false) {} // = Helper methods @@ -126,11 +125,11 @@ class TAO_IMR_Op_Activate : public TAO_IMR_Op { public: virtual int parse (int argc, ACE_TCHAR **argv); - virtual int run (void); + virtual int run (); protected: /// Prints a message about the usage - void print_usage (void); + void print_usage (); /// POA server name. ACE_CString server_name_; @@ -148,11 +147,11 @@ class TAO_IMR_Op_Autostart : public TAO_IMR_Op { public: virtual int parse (int argc, ACE_TCHAR **argv); - virtual int run (void); + virtual int run (); protected: /// Prints a message about the usage - void print_usage (void); + void print_usage (); }; @@ -168,11 +167,11 @@ class TAO_IMR_Op_IOR : public TAO_IMR_Op { public: virtual int parse (int argc, ACE_TCHAR **argv); - virtual int run (void); + virtual int run (); protected: /// Prints a message about the usage - void print_usage (void); + void print_usage (); /// POA server name. ACE_CString server_name_; @@ -193,11 +192,11 @@ class TAO_IMR_Op_Kill : public TAO_IMR_Op { public: virtual int parse (int argc, ACE_TCHAR **argv); - virtual int run (void); + virtual int run (); protected: /// Prints a message about the usage - void print_usage (void); + void print_usage (); ACE_CString server_name_; int signum_; @@ -215,11 +214,11 @@ class TAO_IMR_Op_Link : public TAO_IMR_Op { public: virtual int parse (int argc, ACE_TCHAR **argv); - virtual int run (void); + virtual int run (); protected: /// Prints a message about the usage - void print_usage (void); + void print_usage (); ACE_CString server_name_; @@ -227,7 +226,6 @@ class TAO_IMR_Op_Link : public TAO_IMR_Op }; - /** * @class TAO_IMR_Op_List * @@ -239,14 +237,14 @@ class TAO_IMR_Op_Link : public TAO_IMR_Op class TAO_IMR_Op_List : public TAO_IMR_Op { public: - TAO_IMR_Op_List (void); + TAO_IMR_Op_List (); virtual int parse (int argc, ACE_TCHAR **argv); - virtual int run (void); + virtual int run (); protected: /// Prints a message about the usage - void print_usage (void); + void print_usage (); /// POA server name. ACE_CString server_name_; @@ -280,11 +278,11 @@ class TAO_IMR_Op_Remove : public TAO_IMR_Op { public: virtual int parse (int argc, ACE_TCHAR **argv); - virtual int run (void); + virtual int run (); protected: /// Prints a message about the usage - void print_usage (void); + void print_usage (); ACE_CString server_name_; bool force_; @@ -303,11 +301,11 @@ class TAO_IMR_Op_Shutdown : public TAO_IMR_Op { public: virtual int parse (int argc, ACE_TCHAR **argv); - virtual int run (void); + virtual int run (); protected: /// Prints a message about the usage - void print_usage (void); + void print_usage (); ACE_CString server_name_; }; @@ -320,10 +318,10 @@ class TAO_IMR_Op_ShutdownRepo : public TAO_IMR_Op public: TAO_IMR_Op_ShutdownRepo(); virtual int parse (int argc, ACE_TCHAR **argv); - virtual int run (void); + virtual int run (); protected: - void print_usage (void); + void print_usage (); bool activators_; }; @@ -342,10 +340,9 @@ class TAO_IMR_Op_Register : public TAO_IMR_Op TAO_IMR_Op_Register(bool is_add); virtual int parse (int argc, ACE_TCHAR **argv); - virtual int run (void); + virtual int run (); protected: - /// Enables pre-registration checks bool is_add_; @@ -353,7 +350,7 @@ class TAO_IMR_Op_Register : public TAO_IMR_Op void addenv (ACE_TCHAR *opt); /// Prints a message about the usage. - void print_usage (void); + void print_usage (); /// POA server name. ACE_CString server_name_; diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp index ecc9e69a0f2f5..65c02ac3e62f8 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp @@ -14,7 +14,6 @@ #include "ace/OS_NS_string.h" - Criteria_Evaluator::Criteria_Evaluator (const CosLifeCycle::Criteria &criteria) : criteria_ (criteria) { @@ -25,7 +24,7 @@ Criteria_Evaluator::~Criteria_Evaluator () } const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * -Criteria_Evaluator::getInitialization (void) +Criteria_Evaluator::getInitialization () { const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *sequence_ptr = 0; @@ -42,7 +41,7 @@ Criteria_Evaluator::getInitialization (void) } char * -Criteria_Evaluator::getFilter (void) +Criteria_Evaluator::getFilter () { const char* string; CORBA::Any value; diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h index be0dd75e3f537..0a58031a21046 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h @@ -22,18 +22,18 @@ class Criteria_Evaluator// : public LifeCycleService::Criteria_Evaluator { public: Criteria_Evaluator (const CosLifeCycle::Criteria &criteria); - ~Criteria_Evaluator (void); + ~Criteria_Evaluator (); - const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (void); + const LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (); - char * getFilter (void); + char * getFilter (); - LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (void) + LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation () { return 0; } - char * getPreferences (void) + char * getPreferences () { return 0; } @@ -50,4 +50,3 @@ class Criteria_Evaluator// : public LifeCycleService::Criteria_Evaluator - diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp index f9daa66dd22bb..d0585c8048345 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp @@ -136,7 +136,6 @@ Factory_Trader::_cxx_export (const char * name, register_ptr->_cxx_export (CORBA::Object::_duplicate (object_ptr), CORBA::string_dup("GenericFactory"), propertySeq); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp index afa7e326beac4..0bd674008d490 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp @@ -16,12 +16,12 @@ #include "ace/Argv_Type_Converter.h" #include "ace/OS_main.h" -Life_Cycle_Service_Server::Life_Cycle_Service_Server (void) +Life_Cycle_Service_Server::Life_Cycle_Service_Server () : debug_level_ (1) { } -Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void) +Life_Cycle_Service_Server::~Life_Cycle_Service_Server () { try { @@ -126,7 +126,7 @@ Life_Cycle_Service_Server::init (int argc, int -Life_Cycle_Service_Server::run (void) +Life_Cycle_Service_Server::run () { if (this->debug_level_ >= 1) ORBSVCS_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h index d85b29f524962..8255eb62173a1 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h @@ -29,20 +29,19 @@ */ class Life_Cycle_Service_Server { - public: /// Default constructor - Life_Cycle_Service_Server (void); + Life_Cycle_Service_Server (); /// Destructor - ~Life_Cycle_Service_Server (void); + ~Life_Cycle_Service_Server (); /// Initialize the Server state - parsing arguments and ... int init (int argc, ACE_TCHAR *argv[]); /// Run the orb. - int run (void); + int run (); /// Parse the passed parameters. u_int parse_args (int argc, diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp index 358ca85d90cb5..68746b2477579 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp @@ -25,7 +25,7 @@ Life_Cycle_Service_i::Life_Cycle_Service_i (int debug_level) } // Destructor. -Life_Cycle_Service_i::~Life_Cycle_Service_i (void) +Life_Cycle_Service_i::~Life_Cycle_Service_i () { } diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h index b81dbb945b7d3..5ed3bbd2edf90 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h @@ -24,10 +24,9 @@ */ class Life_Cycle_Service_i : public POA_LifeCycleService::Life_Cycle_Service { - public: Life_Cycle_Service_i (int debug_level = 1); - ~Life_Cycle_Service_i (void); + ~Life_Cycle_Service_i (); /// Returns true if the Generic Factory is able to forward a request /// for creating an object described by the . @@ -62,5 +61,3 @@ class Life_Cycle_Service_i : public POA_LifeCycleService::Life_Cycle_Service - - diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h index b205c0b392dd2..73e57c89fa848 100644 --- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h +++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h @@ -32,7 +32,6 @@ class TAO_LB_Monitor_Signal_Handler : public TAO_LB_Signal_Handler { public: - /// Constructor. TAO_LB_Monitor_Signal_Handler ( CORBA::ORB_ptr orb, @@ -41,19 +40,16 @@ class TAO_LB_Monitor_Signal_Handler : public TAO_LB_Signal_Handler const PortableGroup::Location & location); protected: - /// Template method that initiates the cleanup process. virtual int perform_cleanup (int signum); private: - /// Reference to the LoadManager with which the LoadMonitor is /// registered. CosLoadBalancing::LoadManager_var load_manager_; /// Reference to the location the LoadMonitor resides at. const PortableGroup::Location & location_; - }; diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp index be03640c14d9d..16b2419b72817 100644 --- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp @@ -19,7 +19,7 @@ TAO_LB_Signal_Handler::TAO_LB_Signal_Handler (CORBA::ORB_ptr orb, } int -TAO_LB_Signal_Handler::svc (void) +TAO_LB_Signal_Handler::svc () { // This method is only invoked when performing synchronous signal // handling. diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp index d8094afeb0cdd..ef83acee478a9 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp @@ -6,7 +6,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -Basic_Logging_Service::Basic_Logging_Service (void) +Basic_Logging_Service::Basic_Logging_Service () : service_name_ ("BasicLogFactory"), ior_file_name_ (0), pid_file_name_ (0), @@ -16,7 +16,7 @@ Basic_Logging_Service::Basic_Logging_Service (void) // No-Op. } -Basic_Logging_Service::~Basic_Logging_Service (void) +Basic_Logging_Service::~Basic_Logging_Service () { // No-Op. } @@ -159,7 +159,7 @@ Basic_Logging_Service::init (int argc, ACE_TCHAR *argv[]) } void -Basic_Logging_Service::resolve_naming_service (void) +Basic_Logging_Service::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService"); @@ -173,7 +173,7 @@ Basic_Logging_Service::resolve_naming_service (void) } int -Basic_Logging_Service::run (void) +Basic_Logging_Service::run () { if (this->nthreads_ > 0) { @@ -190,7 +190,7 @@ Basic_Logging_Service::run (void) } int -Basic_Logging_Service::svc (void) +Basic_Logging_Service::svc () { try { @@ -205,7 +205,7 @@ Basic_Logging_Service::svc (void) } void -Basic_Logging_Service::shutdown (void) +Basic_Logging_Service::shutdown () { if (this->bind_to_naming_service_) { diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h index baa266ec49f32..554ba9e1e974c 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h @@ -29,21 +29,21 @@ class Basic_Logging_Service // Implementation of the Telecom Log Service public: - Basic_Logging_Service (void); + Basic_Logging_Service (); // Constructor. - virtual ~Basic_Logging_Service (void); + virtual ~Basic_Logging_Service (); // Destructor. int init (int argc, ACE_TCHAR *argv[]); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. - int run (void); + int run (); // Run the Telecom Log Service. // Returns 0 on success, -1 on error. - void shutdown (void); + void shutdown (); // Shutdown the Telecom Log Service. // Returns 0 on success, -1 on error. @@ -54,7 +54,7 @@ class Basic_Logging_Service int parse_args (int argc, ACE_TCHAR *argv []); // Parses the command line arguments. - void resolve_naming_service (void); + void resolve_naming_service (); // Resolve the naming service. int svc (); diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp index 3a12a0d0a5d07..e0bbec59fdf16 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp @@ -7,7 +7,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -Event_Logging_Service::Event_Logging_Service (void) +Event_Logging_Service::Event_Logging_Service () : service_name_ ("EventLogFactory"), ior_file_name_ (0), pid_file_name_ (0), @@ -17,7 +17,7 @@ Event_Logging_Service::Event_Logging_Service (void) // No-Op. } -Event_Logging_Service::~Event_Logging_Service (void) +Event_Logging_Service::~Event_Logging_Service () { // No-Op. } @@ -163,7 +163,7 @@ Event_Logging_Service::init (int argc, ACE_TCHAR *argv[]) } void -Event_Logging_Service::resolve_naming_service (void) +Event_Logging_Service::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService"); @@ -177,7 +177,7 @@ Event_Logging_Service::resolve_naming_service (void) } int -Event_Logging_Service::run (void) +Event_Logging_Service::run () { if (this->nthreads_ > 0) { @@ -194,7 +194,7 @@ Event_Logging_Service::run (void) } int -Event_Logging_Service::svc (void) +Event_Logging_Service::svc () { try { @@ -209,7 +209,7 @@ Event_Logging_Service::svc (void) } void -Event_Logging_Service::shutdown (void) +Event_Logging_Service::shutdown () { if (this->bind_to_naming_service_) { diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h index 59b245511bb10..6d669a5e97d1a 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h @@ -30,21 +30,21 @@ class Event_Logging_Service // Implementation of the Telecom Log Service public: - Event_Logging_Service (void); + Event_Logging_Service (); // Constructor. - virtual ~Event_Logging_Service (void); + virtual ~Event_Logging_Service (); // Destructor. int init (int argc, ACE_TCHAR *argv[]); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. - int run (void); + int run (); // Run the Telecom Log Service. // Returns 0 on success, -1 on error. - void shutdown (void); + void shutdown (); // Shutdown the Telecom Log Service. // Returns 0 on success, -1 on error. @@ -55,7 +55,7 @@ class Event_Logging_Service int parse_args (int argc, ACE_TCHAR *argv []); // Parses the command line arguments. - void resolve_naming_service (void); + void resolve_naming_service (); // Resolve the naming service. int svc (); diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index 09df44ccbbf93..f8e8e963fe59a 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -7,7 +7,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -Notify_Logging_Service::Notify_Logging_Service (void) +Notify_Logging_Service::Notify_Logging_Service () : service_name_ (NOTIFY_KEY), ior_file_name_ (0), pid_file_name_ (0), @@ -17,7 +17,7 @@ Notify_Logging_Service::Notify_Logging_Service (void) // No-Op. } -Notify_Logging_Service::~Notify_Logging_Service (void) +Notify_Logging_Service::~Notify_Logging_Service () { // No-Op. } @@ -185,7 +185,7 @@ Notify_Logging_Service::init (int argc, ACE_TCHAR *argv[]) } void -Notify_Logging_Service::resolve_naming_service (void) +Notify_Logging_Service::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService"); @@ -199,7 +199,7 @@ Notify_Logging_Service::resolve_naming_service (void) } int -Notify_Logging_Service::run (void) +Notify_Logging_Service::run () { if (this->nthreads_ > 0) { @@ -216,7 +216,7 @@ Notify_Logging_Service::run (void) } int -Notify_Logging_Service::svc (void) +Notify_Logging_Service::svc () { try { @@ -231,7 +231,7 @@ Notify_Logging_Service::svc (void) } void -Notify_Logging_Service::shutdown (void) +Notify_Logging_Service::shutdown () { if (this->bind_to_naming_service_) { diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h index ae5dfaecfeed0..edcf537a82b0b 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h @@ -34,21 +34,21 @@ class Notify_Logging_Service // Implementation of the Telecom Log Service public: - Notify_Logging_Service (void); + Notify_Logging_Service (); // Constructor. - virtual ~Notify_Logging_Service (void); + virtual ~Notify_Logging_Service (); // Destructor. int init (int argc, ACE_TCHAR *argv[]); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. - int run (void); + int run (); // Run the Telecom Log Service. // Returns 0 on success, -1 on error. - void shutdown (void); + void shutdown (); // Shutdown the Telecom Service. // Returns 0 on success, -1 on error. @@ -59,7 +59,7 @@ class Notify_Logging_Service int parse_args (int argc, ACE_TCHAR *argv[]); // Parses the command line arguments. - void resolve_naming_service (void); + void resolve_naming_service (); // Resolve the naming service. int svc (); diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp index c2c6b65e1de6d..29afb015fddb9 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -RTEvent_Logging_Service::RTEvent_Logging_Service (void) +RTEvent_Logging_Service::RTEvent_Logging_Service () : service_name_ ("RTEventLogFactory"), ior_file_name_ (0), pid_file_name_ (0), @@ -15,7 +15,7 @@ RTEvent_Logging_Service::RTEvent_Logging_Service (void) // No-Op. } -RTEvent_Logging_Service::~RTEvent_Logging_Service (void) +RTEvent_Logging_Service::~RTEvent_Logging_Service () { // No-Op. } @@ -169,7 +169,7 @@ RTEvent_Logging_Service::init (int argc, ACE_TCHAR* argv[]) } void -RTEvent_Logging_Service::resolve_naming_service (void) +RTEvent_Logging_Service::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService"); @@ -183,7 +183,7 @@ RTEvent_Logging_Service::resolve_naming_service (void) } int -RTEvent_Logging_Service::run (void) +RTEvent_Logging_Service::run () { if (this->nthreads_ > 0) { @@ -200,7 +200,7 @@ RTEvent_Logging_Service::run (void) } int -RTEvent_Logging_Service::svc (void) +RTEvent_Logging_Service::svc () { try { @@ -215,7 +215,7 @@ RTEvent_Logging_Service::svc (void) } void -RTEvent_Logging_Service::shutdown (void) +RTEvent_Logging_Service::shutdown () { if (this->bind_to_naming_service_) { diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h index daefddca2c0e7..c8f37af597331 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h @@ -28,20 +28,20 @@ class RTEvent_Logging_Service // Implementation of the Telecom Log Service public: - RTEvent_Logging_Service (void); + RTEvent_Logging_Service (); // Constructor. - virtual ~RTEvent_Logging_Service (void); + virtual ~RTEvent_Logging_Service (); // Destructor. int init (int argc, ACE_TCHAR* argv[]); // Initializes the Telecom Log Service. - int run (void); + int run (); // Run the Telecom Log Service. // Returns 0 on success, -1 on error. - void shutdown (void); + void shutdown (); // Shutdown the Telecom Log Service. // Returns 0 on success, -1 on error. @@ -52,7 +52,7 @@ class RTEvent_Logging_Service int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line args - void resolve_naming_service (void); + void resolve_naming_service (); // Resolve the naming service. int svc (); diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index fe908ddb630ca..7cf4bbb158363 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -43,15 +43,15 @@ ACE_TMAIN(int, ACE_TCHAR *[]) class Options { public: - Options (void); - ~Options (void); + Options (); + ~Options (); int run (int argc, ACE_TCHAR *argv[]); private: void parse_args (int argc, ACE_TCHAR *argv[]); - void print_usage_and_die (void); + void print_usage_and_die (); private: ACE_TCHAR progname[128]; @@ -70,7 +70,7 @@ class Options typedef ACE_Singleton OPTIONS; -Options::Options (void) +Options::Options () : opt_setargs (0), opt_args (0), opt_install (0), @@ -86,13 +86,13 @@ Options::Options (void) ACE::init (); } -Options::~Options (void) +Options::~Options () { ACE::fini (); } void -Options::print_usage_and_die (void) +Options::print_usage_and_die () { ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT("Usage: %s") diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp index 1887780411ec0..1a5e27cd68d2c 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -26,7 +26,7 @@ AutoFinalizer::~AutoFinalizer () } -TAO_NT_Naming_Service::TAO_NT_Naming_Service (void) +TAO_NT_Naming_Service::TAO_NT_Naming_Service () : argc_ (0), argc_save_ (0), argv_ (0), @@ -34,7 +34,7 @@ TAO_NT_Naming_Service::TAO_NT_Naming_Service (void) { } -TAO_NT_Naming_Service::~TAO_NT_Naming_Service (void) +TAO_NT_Naming_Service::~TAO_NT_Naming_Service () { if (argv_save_) { @@ -181,7 +181,6 @@ TAO_NT_Naming_Service::arg_manip (char *args, DWORD arglen, bool query) } RegCloseKey (hkey); - } int @@ -243,7 +242,7 @@ TAO_NT_Naming_Service::init (int argc, } int -TAO_NT_Naming_Service::svc (void) +TAO_NT_Naming_Service::svc () { TAO_Naming_Service naming_service; diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h index cfdfb3e55fed8..c90b1ccc4ac47 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h @@ -33,8 +33,8 @@ class TAO_NT_Naming_Service : public ACE_NT_Service public: typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX; - TAO_NT_Naming_Service (void); - virtual ~TAO_NT_Naming_Service (void); + TAO_NT_Naming_Service (); + virtual ~TAO_NT_Naming_Service (); /// We override because it handles stop requests /// privately. @@ -71,7 +71,6 @@ class TAO_NT_Naming_Service : public ACE_NT_Service friend class ACE_Singleton; friend class AutoFinalizer; - }; /** @@ -81,7 +80,6 @@ class TAO_NT_Naming_Service : public ACE_NT_Service */ class AutoFinalizer { - public: AutoFinalizer (TAO_NT_Naming_Service &service); ~AutoFinalizer (); @@ -91,7 +89,6 @@ class AutoFinalizer }; - typedef ACE_Singleton SERVICE; #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp index ece6aeb0e1cb6..bbda4aa95c8de 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp @@ -8,7 +8,7 @@ #include "ace/Task.h" // Default Constructor. -TAO_Naming_Service::TAO_Naming_Service (void) +TAO_Naming_Service::TAO_Naming_Service () : time_ (0), num_threads_ (1) { @@ -49,7 +49,6 @@ TAO_Naming_Service::init (int argc, ACE_TCHAR* argv[]) if (result == -1) return result; - } catch (const CORBA::Exception& ex) { @@ -123,7 +122,7 @@ class ORB_Runner : public ACE_Task_Base time_(t) {} - int svc (void) + int svc () { if (!CORBA::is_nil (orb_.in ())) { @@ -147,7 +146,7 @@ class ORB_Runner : public ACE_Task_Base }; int -TAO_Naming_Service::run (void) +TAO_Naming_Service::run () { ORB_Runner runner (this->orb_.in(), time_); if (this->num_threads_ == 1) @@ -169,7 +168,7 @@ TAO_Naming_Service::run (void) } void -TAO_Naming_Service::shutdown (void) +TAO_Naming_Service::shutdown () { if (!CORBA::is_nil (orb_.in ())) { @@ -178,7 +177,7 @@ TAO_Naming_Service::shutdown (void) } int -TAO_Naming_Service::fini (void) +TAO_Naming_Service::fini () { this->my_naming_server_.fini(); @@ -199,6 +198,6 @@ TAO_Naming_Service::fini (void) } // Destructor. -TAO_Naming_Service::~TAO_Naming_Service (void) +TAO_Naming_Service::~TAO_Naming_Service () { } diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h index dfcf77754ce62..858145e7a6f63 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h @@ -33,7 +33,7 @@ class TAO_Naming_Service { public: /// Default Constructor. - TAO_Naming_Service (void); + TAO_Naming_Service (); /// Constructor taking the command-line arguments. TAO_Naming_Service (int argc, ACE_TCHAR* argv[]); @@ -45,16 +45,15 @@ class TAO_Naming_Service virtual int fini (); /// Run the TAO_Naming_Service. - virtual int run (void); + virtual int run (); /// Shut down the TAO_Naming_Service; you must still call fini(). - virtual void shutdown (void); + virtual void shutdown (); /// Destructor. - virtual ~TAO_Naming_Service (void); + virtual ~TAO_Naming_Service (); protected: - /// Parse the command line arguments to find /// the timeout period. int parse_args (int &argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp index 54391be46d0b4..3dafb41d56a1f 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp @@ -49,14 +49,14 @@ ACE_TMAIN(int, ACE_TCHAR *[]) class Options { public: - Options (void); - ~Options (void); + Options (); + ~Options (); int run (int argc, ACE_TCHAR *argv[]); private: void parse_args (int argc, ACE_TCHAR *argv[]); - void print_usage_and_die (void); + void print_usage_and_die (); private: ACE_TCHAR progname[128]; @@ -75,7 +75,7 @@ class Options typedef ACE_Singleton OPTIONS; -Options::Options (void) +Options::Options () : opt_setargs (0), opt_args (0), opt_install (0), @@ -91,13 +91,13 @@ Options::Options (void) ACE::init (); } -Options::~Options (void) +Options::~Options () { ACE::fini (); } void -Options::print_usage_and_die (void) +Options::print_usage_and_die () { ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("Usage: %s") diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp index a561076517fac..3e1b4adbd72ef 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp @@ -14,7 +14,7 @@ #define TAO_NOTIFY_SERVICE_OPTS_NAME ACE_TEXT ("TaoNotifyServiceOptions") #define TAO_SERVICE_PARAM_COUNT ACE_TEXT ("TaoServiceParameterCount") -TAO_NT_Notify_Service::TAO_NT_Notify_Service (void) +TAO_NT_Notify_Service::TAO_NT_Notify_Service () : argc_ (0), argc_save_ (0), argv_ (0), @@ -22,7 +22,7 @@ TAO_NT_Notify_Service::TAO_NT_Notify_Service (void) { } -TAO_NT_Notify_Service::~TAO_NT_Notify_Service (void) +TAO_NT_Notify_Service::~TAO_NT_Notify_Service () { if (argv_save_) { @@ -149,7 +149,6 @@ TAO_NT_Notify_Service::arg_manip (char *args, DWORD arglen, bool query) } RegCloseKey (hkey); - } int @@ -239,7 +238,7 @@ TAO_NT_Notify_Service::init (int argc, } int -TAO_NT_Notify_Service::svc (void) +TAO_NT_Notify_Service::svc () { TAO_Notify_Service_Driver notify_service; diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h index 1548b5606ec77..f99ef75518215 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h @@ -34,8 +34,8 @@ class TAO_NT_Notify_Service : public ACE_NT_Service public: typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX; - TAO_NT_Notify_Service (void); - virtual ~TAO_NT_Notify_Service (void); + TAO_NT_Notify_Service (); + virtual ~TAO_NT_Notify_Service (); /// We override because it handles stop requests /// privately. diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index f46860dbcec88..03fb45de211bc 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -31,7 +31,7 @@ #include "ace/Argv_Type_Converter.h" #include "ace/Logging_Strategy.h" -TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void) +TAO_Notify_Service_Driver::TAO_Notify_Service_Driver () : notify_service_ (0) , bootstrap_ (false) , use_name_svc_ (true) @@ -47,7 +47,7 @@ TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void) { } -TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void) +TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver () { } @@ -335,7 +335,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) } int -TAO_Notify_Service_Driver::resolve_naming_service (void) +TAO_Notify_Service_Driver::resolve_naming_service () { try { @@ -366,7 +366,7 @@ TAO_Notify_Service_Driver::resolve_naming_service (void) } int -TAO_Notify_Service_Driver::run (void) +TAO_Notify_Service_Driver::run () { if (TAO_debug_level > 0 ) ORBSVCS_DEBUG ((LM_DEBUG, @@ -388,7 +388,7 @@ TAO_Notify_Service_Driver::run (void) } int -TAO_Notify_Service_Driver::fini (void) +TAO_Notify_Service_Driver::fini () { /// Release all the _vars as the ORB about to go away. CosNotifyChannelAdmin::EventChannelFactory_var factory = @@ -689,7 +689,7 @@ LoggingWorker::start () } int -LoggingWorker::svc (void) +LoggingWorker::svc () { if (TAO_debug_level > 0) { @@ -719,7 +719,7 @@ LoggingWorker::end () } } -Worker::Worker (void) +Worker::Worker () { } @@ -730,7 +730,7 @@ Worker::orb (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { #if 0 // ACE_Thread::getprio() fails on systems that do not support thread diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h index 486fdbd1e3f05..bcc90d11e4549 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h @@ -57,7 +57,7 @@ class Worker : public ACE_Task_Base { public: /// ctor - Worker (void); + Worker (); void orb (CORBA::ORB_ptr orb); @@ -82,10 +82,10 @@ friend class LoggingWorker; public: /// Constructor. - TAO_Notify_Service_Driver (void); + TAO_Notify_Service_Driver (); /// Destructor. - virtual ~TAO_Notify_Service_Driver (void); + virtual ~TAO_Notify_Service_Driver (); /// Initializes the Service. /// Returns 0 on success, -1 on error. @@ -93,7 +93,7 @@ friend class LoggingWorker; /// run the Service. /// Returns 0 on success, -1 on error. - int run (void); + int run (); /// Shutdown the Service. /// Returns 0 on success, -1 on error. @@ -112,7 +112,7 @@ friend class LoggingWorker; TAO_Notify_Service* notify_service_; /// Resolve the naming service. - int resolve_naming_service (void); + int resolve_naming_service (); /// Parses the command line arguments. int parse_args (int argc, ACE_TCHAR *argv []); diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index 90e27bb45efb9..b268cab6d8d94 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -9,7 +9,7 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" -TAO_Scheduling_Service::TAO_Scheduling_Service (void) +TAO_Scheduling_Service::TAO_Scheduling_Service () : scheduler_impl_ (0), service_name_ ("ScheduleService"), scheduler_type_ (CONFIG) @@ -25,7 +25,7 @@ TAO_Scheduling_Service::TAO_Scheduling_Service (int argc, ACE_TCHAR* argv[]) this->init (argc, argv); } -TAO_Scheduling_Service::~TAO_Scheduling_Service (void) +TAO_Scheduling_Service::~TAO_Scheduling_Service () { } @@ -143,7 +143,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) // Runs the TAO_Scheduling_Service. int -TAO_Scheduling_Service::run (void) +TAO_Scheduling_Service::run () { // Run the ORB manager. return this->orb_manager_.run (); diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h index 69c5f56df75f1..0b19983505fc2 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h @@ -37,7 +37,7 @@ class TAO_Scheduling_Service { public: /// Default Constructor. - TAO_Scheduling_Service (void); + TAO_Scheduling_Service (); /// Constructor taking the command-line arguments. TAO_Scheduling_Service (int argc, ACE_TCHAR* argv[]); @@ -46,10 +46,10 @@ class TAO_Scheduling_Service int init (int argc, ACE_TCHAR* argv[]); /// Run the TAO_Scheduling_Service. - int run (void); + int run (); /// Destructor. - ~TAO_Scheduling_Service (void); + ~TAO_Scheduling_Service (); private: typedef ACE_Config_Scheduler CONFIG_SCHED_TYPE; diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index f40c0085859f5..48ed6b7a58c23 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -11,7 +11,7 @@ #include "ace/os_include/os_netdb.h" // Constructor. -Clerk_i::Clerk_i (void) +Clerk_i::Clerk_i () : ior_output_file_ (0), timer_value_ (3), timer_value_usecs_ (0), @@ -21,7 +21,7 @@ Clerk_i::Clerk_i (void) } // Destructor. -Clerk_i::~Clerk_i (void) +Clerk_i::~Clerk_i () { } @@ -161,7 +161,7 @@ Clerk_i::parse_args (int argc, // The iterator returned from this is used to get the next n IORs. int -Clerk_i::get_first_IOR (void) +Clerk_i::get_first_IOR () { try { @@ -248,7 +248,6 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, { while (iter->next_one (binding.out ())) { - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Getting IOR of the server: %C\n\n"), binding->binding_name[0].id.in ())); @@ -291,11 +290,10 @@ Clerk_i::init_naming_service () // Create an instance of the clerk with appropriate parameters. int -Clerk_i::create_clerk (void) +Clerk_i::create_clerk () { try { - // Create a new clerk object. Pass it the timer value, the set // of server IORs and the no. of servers. ACE_NEW_RETURN (this->time_service_clerk_impl_, @@ -342,7 +340,7 @@ Clerk_i::create_clerk (void) // Clerk:. int -Clerk_i::register_clerk (void) +Clerk_i::register_clerk () { try { @@ -378,7 +376,6 @@ Clerk_i::register_clerk (void) this->naming_client_->rebind (clerk_name, this->time_service_clerk_.in ()); - } catch (const CORBA::Exception& ex) { @@ -440,7 +437,6 @@ Clerk_i::init (int argc, // first IOR. if (this->get_first_IOR () != 0) return -1; - } // Create an instance of the Clerk. @@ -469,7 +465,7 @@ Clerk_i::init (int argc, } int -Clerk_i::run (void) +Clerk_i::run () { try { diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h index a811aff45c7d9..24bab371fbf87 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.h +++ b/TAO/orbsvcs/Time_Service/Clerk_i.h @@ -30,7 +30,6 @@ class Clerk_i { public: - enum { // Pre-allocate slots for this many servers. The capacity grows on // demand. @@ -38,10 +37,10 @@ class Clerk_i }; /// Constructor. - Clerk_i (void); + Clerk_i (); /// Destructor. - ~Clerk_i (void); + ~Clerk_i (); /// Set of available Time servers. typedef ACE_Array_Base IORS; @@ -51,14 +50,13 @@ class Clerk_i ACE_TCHAR *argv[]); /// Run the orb. - int run (void); + int run (); private: /// Insert a server in the internal data structure (servers_). void insert_server (CosTime::TimeService_ptr server); private: - /// Read the server IORs from a file instead of using a naming /// service. int read_ior (const ACE_TCHAR* filename); @@ -78,18 +76,18 @@ class Clerk_i int init_naming_service (); /// Create an instance of the clerk to use. - int create_clerk (void); + int create_clerk (); /// Bind the clerk in the appropriate context in the Naming Service. - int register_clerk (void); + int register_clerk (); /// Initialise the Interface Repository and register the clerk /// implementation with it. - int init_IR (void); + int init_IR (); /// Get the reference to the server naming context and the first /// server IOR. - int get_first_IOR (void); + int get_first_IOR (); /// Iterate over the given server context to get the rest of the /// server IORs. diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index ef6c3b7aa7ee6..c93028b2db6df 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -9,13 +9,13 @@ #include "ace/os_include/os_netdb.h" // Constructor. -Server_i::Server_i (void) +Server_i::Server_i () : ior_output_file_ (0) { } // Destructor. -Server_i::~Server_i (void) +Server_i::~Server_i () { } @@ -72,11 +72,10 @@ Server_i::init_naming_service () // Print the IOR of the registered server on the console and in a file. int -Server_i::create_server (void) +Server_i::create_server () { try { - // Create a new server object. ACE_NEW_RETURN (this->time_service_server_impl_, TAO_Time_Service_Server, @@ -134,7 +133,7 @@ Server_i::create_server (void) // 'Server:'. int -Server_i::register_server (void) +Server_i::register_server () { try { @@ -229,7 +228,6 @@ Server_i::init (int argc, // Register the server object with the Naming Service. this->register_server (); - } catch (const CORBA::Exception& ex) { @@ -244,7 +242,7 @@ Server_i::init (int argc, // Run the event loop for ORB. int -Server_i::run (void) +Server_i::run () { int retval = this->orb_manager_.run (); diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h index a2d898301fbf1..5a967d6314842 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.h +++ b/TAO/orbsvcs/Time_Service/Server_i.h @@ -31,33 +31,32 @@ class Server_i { public: /// Constructor. - Server_i (void); + Server_i (); /// Destructor. - ~Server_i (void); + ~Server_i (); /// Initialize the Server state. int init (int argc, ACE_TCHAR *argv[]); /// Run the orb. - int run (void); + int run (); /// Initialises the name client. int init_naming_service (); /// Create the time server object. - int create_server (void); + int create_server (); /// Register the time server object with the Naming Service. - int register_server (void); + int register_server (); /// Parse the commandline arguments. int parse_args (int argc, ACE_TCHAR* argv[]); private: - /// My orb. CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp index dcd98386e8e14..b5b4906cfc89e 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp @@ -3,7 +3,6 @@ #include "ace/OS_main.h" - // This is the main driver program for the Time Service clerk. int diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp index 5adc3578fb14e..3b3b460b7f42a 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp @@ -3,7 +3,6 @@ #include "ace/OS_main.h" - // This is the main driver program for the Time Service server. int diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp index ca1753912392c..06f3f6b3dee4f 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp @@ -11,13 +11,11 @@ Trading_Shutdown::Trading_Shutdown (Trading_Service& trader) ACE_TEXT("%p\n"), ACE_TEXT("register_handler"))); -#ifndef ACE_HAS_WINCE if (this->shutdown_.register_handler (SIGTERM, this) == -1) ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("register_handler"))); -#endif // ACE_HAS_WINCE } int diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp index 8d725db960805..0cbcf2c4d0fd3 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp @@ -13,26 +13,26 @@ class FactoryClient public: // Initialization and termination methods - FactoryClient (void); + FactoryClient (); // constructor. - virtual ~FactoryClient (void); + virtual ~FactoryClient (); // destructor. void init_ORB (int argc, ACE_TCHAR *argv []); // Initializes the ORB. - void resolve_naming_service (void); + void resolve_naming_service (); // Try to get hold of a running naming service. - void resolve_factory (void); + void resolve_factory (); // Try to resolve the factory from the Naming service. CosEventChannelFactory::ChannelFactory_ptr - create_factory (void); + create_factory (); // Create a local Factory and also set the . - virtual void run_test (void); + virtual void run_test (); // Runs a couple of tests to check if the factory behaves correctly. protected: @@ -67,14 +67,14 @@ class FactoryClient // flag to indicate if the naming service should be used. }; -FactoryClient::FactoryClient (void) +FactoryClient::FactoryClient () :factory_name_ ("CosEC_Factory"), use_naming_service (0) { // No-Op. } -FactoryClient::~FactoryClient (void) +FactoryClient::~FactoryClient () { // No-Op. } @@ -86,7 +86,7 @@ FactoryClient::init_ORB (int argc, ACE_TCHAR *argv []) } void -FactoryClient::resolve_naming_service (void) +FactoryClient::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService"); @@ -102,7 +102,7 @@ FactoryClient::resolve_naming_service (void) } void -FactoryClient::resolve_factory (void) +FactoryClient::resolve_factory () { ACE_ASSERT (this->use_naming_service == 1); @@ -118,7 +118,7 @@ FactoryClient::resolve_factory (void) } CosEventChannelFactory::ChannelFactory_ptr -FactoryClient::create_factory (void) +FactoryClient::create_factory () { throw CORBA::UNKNOWN (); } @@ -223,7 +223,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel) */ void -FactoryClient::run_test (void) +FactoryClient::run_test () { ACE_ASSERT (!CORBA::is_nil (this->factory_.in ())); diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp index 74021f65fb5fc..e5793987ef21e 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp @@ -131,7 +131,7 @@ FactoryDriver::start (int argc, ACE_TCHAR *argv []) } int -FactoryDriver::stop (void) +FactoryDriver::stop () { orb_->shutdown (); return 0; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp index 7c9e7e02414bd..9a189b121f717 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Get_Opt.h" -RtEC_Based_CosEC::RtEC_Based_CosEC (void) +RtEC_Based_CosEC::RtEC_Based_CosEC () : service_name (ACE_TEXT("CosEventService")), rt_service_name (ACE_TEXT("EventService")), remote_rtec_ (0) @@ -10,7 +10,7 @@ RtEC_Based_CosEC::RtEC_Based_CosEC (void) // No-Op. } -RtEC_Based_CosEC::~RtEC_Based_CosEC (void) +RtEC_Based_CosEC::~RtEC_Based_CosEC () { // No-Op. } @@ -132,7 +132,7 @@ RtEC_Based_CosEC::startup (int argc, ACE_TCHAR *argv[]) } POA_RtecEventChannelAdmin::EventChannel_ptr -RtEC_Based_CosEC::create_rtec (void) +RtEC_Based_CosEC::create_rtec () { // see if the user wants a local RtEC.. if (this->remote_rtec_ == 0) @@ -142,7 +142,7 @@ RtEC_Based_CosEC::create_rtec (void) } void -RtEC_Based_CosEC::activate_rtec (void) +RtEC_Based_CosEC::activate_rtec () { // see if the user wants to use a local RtEC.. if (this->remote_rtec_ == 0) @@ -162,7 +162,7 @@ RtEC_Based_CosEC::activate_rtec (void) } void -RtEC_Based_CosEC::deactivate_rtec (void) +RtEC_Based_CosEC::deactivate_rtec () { // Check if the local rtec is to be deactivated. if (this->remote_rtec_ == 0) @@ -172,7 +172,7 @@ RtEC_Based_CosEC::deactivate_rtec (void) } void -RtEC_Based_CosEC::locate_rtec (void) +RtEC_Based_CosEC::locate_rtec () { CosNaming::Name ref_name (1); ref_name.length (1); @@ -187,7 +187,7 @@ RtEC_Based_CosEC::locate_rtec (void) } void -RtEC_Based_CosEC::resolve_naming_service (void) +RtEC_Based_CosEC::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService"); @@ -201,7 +201,7 @@ RtEC_Based_CosEC::resolve_naming_service (void) } int -RtEC_Based_CosEC::run (void) +RtEC_Based_CosEC::run () { ACE_DEBUG ((LM_DEBUG, "%s: Running the CosEventService\n", __FILE__)); try @@ -217,7 +217,7 @@ RtEC_Based_CosEC::run (void) } void -RtEC_Based_CosEC::shutdown (void) +RtEC_Based_CosEC::shutdown () { // Deactivate. this->deactivate (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h index b0317154a245b..874bf09022069 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h @@ -32,10 +32,10 @@ class RtEC_Based_CosEC : public CosEC_ServantBase { public: /// Constructor. - RtEC_Based_CosEC (void); + RtEC_Based_CosEC (); /// Destructor. - virtual ~RtEC_Based_CosEC (void); + virtual ~RtEC_Based_CosEC (); /// Parses the command line arguments. int parse_args (int argc, ACE_TCHAR *argv []); @@ -46,32 +46,32 @@ class RtEC_Based_CosEC : public CosEC_ServantBase /// run the COS Event Service. /// Returns 0 on success, -1 on error. - int run (void); + int run (); /// Shutdown the COS Event Service. /// Returns 0 on success, -1 on error. - void shutdown (void); + void shutdown (); protected: // = Methods from CosEC_ServantBase /// Create a local rtec. virtual POA_RtecEventChannelAdmin::EventChannel_ptr - create_rtec (void); + create_rtec (); /// Activates the rtec. - virtual void activate_rtec (void); + virtual void activate_rtec (); /// Deactivates the rtec. - virtual void deactivate_rtec (void); + virtual void deactivate_rtec (); /// initialize the ORB. void init_ORB (int& argc, ACE_TCHAR *argv []); /// Resolve the naming service. - void resolve_naming_service (void); + void resolve_naming_service (); /// Locate a rtec. - void locate_rtec (void); + void locate_rtec (); // = Data members /// The name we use to register with the Naming Service. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp index 49a0415e4918b..fa54c53ca5725 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp @@ -1,7 +1,7 @@ #include "ConsumerAdmin_i.h" #include -TAO_CosEC_ConsumerAdmin_i::TAO_CosEC_ConsumerAdmin_i (void) +TAO_CosEC_ConsumerAdmin_i::TAO_CosEC_ConsumerAdmin_i () : qos_ (), rtec_consumeradmin_ (RtecEventChannelAdmin::ConsumerAdmin::_nil ()) { @@ -18,7 +18,7 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void) +TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier () { CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil = CosEventChannelAdmin::ProxyPushSupplier::_nil (); @@ -45,7 +45,7 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void) } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (void) +TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier () { // TODO: implement this. return CosEventChannelAdmin::ProxyPullSupplier::_nil (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h index f84f4654d4f8d..623b6fb256732 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h @@ -31,7 +31,7 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ConsumerAdmin_i : // RtecEventChannelAdmin::ConsumerAdmin. public: /// Constructor. - TAO_CosEC_ConsumerAdmin_i (void); + TAO_CosEC_ConsumerAdmin_i (); /// Destructor. ~TAO_CosEC_ConsumerAdmin_i () = default; @@ -41,11 +41,11 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ConsumerAdmin_i : /// Returns a new ProxyPushSupplier_ptr. virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier(void); + obtain_push_supplier(); /// Returns a new ProxyPullSupplier_ptr. virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier(void); + obtain_pull_supplier(); private: /// The ConsumerQOS specified by the user of this class. 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 71fbff1ea65c1..b95e8c9fcce56 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp @@ -6,7 +6,7 @@ #include "ace/Auto_Ptr.h" #include -CosEC_ServantBase::CosEC_ServantBase (void) +CosEC_ServantBase::CosEC_ServantBase () :poa_ (PortableServer::POA::_nil ()), rtec_servant_ (0), cosec_servant_ (0), @@ -44,7 +44,7 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa, } int -CosEC_ServantBase::activate (void) +CosEC_ServantBase::activate () { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ())); @@ -102,7 +102,7 @@ CosEC_ServantBase::activate (const char* servant_id) } void -CosEC_ServantBase::activate_rtec (void) +CosEC_ServantBase::activate_rtec () { // Activate the Rtec PortableServer::ObjectId_var oid = @@ -118,7 +118,7 @@ CosEC_ServantBase::activate_rtec (void) } int -CosEC_ServantBase::activate_cosec (void) +CosEC_ServantBase::activate_cosec () { // Initialize the CosEC servant. RtecBase::handle_t supp_handle = 0; @@ -160,7 +160,7 @@ CosEC_ServantBase::activate_cosec (void) } void -CosEC_ServantBase::deactivate (void) +CosEC_ServantBase::deactivate () { // Deactivate all those we control... this->deactivate_rtec (); @@ -176,7 +176,7 @@ CosEC_ServantBase::deactivate (void) } void -CosEC_ServantBase::deactivate_rtec (void) +CosEC_ServantBase::deactivate_rtec () { // Deactivate the rtec. PortableServer::ObjectId_var oid = @@ -187,7 +187,7 @@ CosEC_ServantBase::deactivate_rtec (void) } void -CosEC_ServantBase::deactivate_cosec (void) +CosEC_ServantBase::deactivate_cosec () { // Deactivate the cosec. PortableServer::ObjectId_var oid = @@ -198,19 +198,19 @@ CosEC_ServantBase::deactivate_cosec (void) } CosEventChannelAdmin::ConsumerAdmin_ptr -CosEC_ServantBase::for_consumers (void) +CosEC_ServantBase::for_consumers () { return this->cosec_->for_consumers (); } CosEventChannelAdmin::SupplierAdmin_ptr -CosEC_ServantBase::for_suppliers (void) +CosEC_ServantBase::for_suppliers () { return this->cosec_->for_suppliers (); } void -CosEC_ServantBase::destroy (void) +CosEC_ServantBase::destroy () { // Deactivate all the contained servants and ourselves. // The poa will "destroy" the ref counted servants. @@ -219,7 +219,7 @@ CosEC_ServantBase::destroy (void) } POA_RtecEventChannelAdmin::EventChannel_ptr -CosEC_ServantBase::create_rtec (void) +CosEC_ServantBase::create_rtec () { // Create the RtEC servant. TAO_EC_Event_Channel_Attributes attr (this->poa_.in (), @@ -233,7 +233,7 @@ CosEC_ServantBase::create_rtec (void) } TAO_CosEC_EventChannel_i* -CosEC_ServantBase::create_cosec (void) +CosEC_ServantBase::create_cosec () { // Create the CosEC servant. TAO_CosEC_EventChannel_i* _cosec_servant; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h index f3e359d79341c..0faed4b7f51a4 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h @@ -34,7 +34,7 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase : // Clients can derive from this class and create servants. public: /// Constructor. - CosEC_ServantBase (void); + CosEC_ServantBase (); /// Destructor. virtual ~CosEC_ServantBase () = default; @@ -52,45 +52,45 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase : ACE_TCHAR *source_type_pairs); /// Activates the CosEC with and friends with the - int activate (void); + int activate (); /// If the servant_id is not nil then it is used to supply the object id /// for servant. int activate (const char* servant_id); /// Deactivates the CosEC and friends with the POA. - void deactivate (void); + void deactivate (); // = POA_CosEventChannelAdmin::EventChannel methods. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void); + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (); - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void); + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (); /// Destroys this Event Channel object. - virtual void destroy (void); + virtual void destroy (); protected: // = RtEC creation, activation and deactivation methods. /// Create a local rtec. virtual POA_RtecEventChannelAdmin::EventChannel_ptr - create_rtec (void); + create_rtec (); /// Activates the rtec. - virtual void activate_rtec (void); + virtual void activate_rtec (); /// Deactivates the rtec. - virtual void deactivate_rtec (void); + virtual void deactivate_rtec (); // = CosEC creation, activation and deactivation methods. /// Create a local cosec. TAO_CosEC_EventChannel_i* - create_cosec (void); + create_cosec (); /// Activates the cosec. - int activate_cosec (void); + int activate_cosec (); /// Deactivates the cosec. - void deactivate_cosec (void); + void deactivate_cosec (); /// Initialize the SupplierQOS Factory. void init_SupplierQOS (RtecBase::handle_t supp_handle, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp index 126eed592a093..a9bd639f1c118 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp @@ -1,7 +1,7 @@ #include "EventChannel_i.h" #include -TAO_CosEC_EventChannel_i::TAO_CosEC_EventChannel_i (void) +TAO_CosEC_EventChannel_i::TAO_CosEC_EventChannel_i () : consumer_admin_ (0), supplier_admin_ (0), consumeradmin_ (CosEventChannelAdmin::ConsumerAdmin::_nil ()), @@ -78,7 +78,7 @@ TAO_CosEC_EventChannel_i::for_suppliers () } void -TAO_CosEC_EventChannel_i::destroy (void) +TAO_CosEC_EventChannel_i::destroy () { // Deactivate the CosEventChannel PortableServer::POA_var poa = @@ -93,7 +93,7 @@ TAO_CosEC_EventChannel_i::destroy (void) } void -TAO_CosEC_EventChannel_i::shutdown (void) +TAO_CosEC_EventChannel_i::shutdown () { this->destroy (); } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h index 683f878d464c3..f6924763a8947 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h @@ -49,17 +49,17 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_EventChannel_i : /// The for_consumers method will return the same ConsumerAdmin_ptr /// everytime its called. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void); + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (); /// The for_suppliers method will return the same SupplierAdmin_ptr /// everytime its called. - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void); + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (); /// Destroys this Event Channel object. - virtual void destroy (void); + virtual void destroy (); /// destroys this Event Channel object and s this object. - void shutdown (void); + void shutdown (); private: /// ConsumerAdmin servant object. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp index 0adcb289b6266..5c70464417d63 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp @@ -53,7 +53,7 @@ TAO_CosEC_PushSupplierWrapper::TAO_CosEC_PushSupplierWrapper } void -TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (void) +TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier () { this->supplier_->disconnect_push_supplier (); @@ -78,7 +78,7 @@ TAO_CosEC_ProxyPushConsumer_i::TAO_CosEC_ProxyPushConsumer_i (const RtecEventCha { } -TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void) +TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i () { } @@ -119,7 +119,7 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data) } void -TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void) +TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer () { this->proxypushconsumer_->disconnect_push_consumer (); @@ -161,7 +161,7 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier } int -TAO_CosEC_ProxyPushConsumer_i::connected (void) +TAO_CosEC_ProxyPushConsumer_i::connected () { return this->wrapper_ == 0 ? 0 : 1; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h index 73b04c479e56e..17149cf23edb8 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h @@ -44,13 +44,13 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ProxyPushConsumer_i : RtecEventChannelAdmin::ProxyPushConsumer_ptr proxypushconsumer); /// Destructor. - ~TAO_CosEC_ProxyPushConsumer_i (void); + ~TAO_CosEC_ProxyPushConsumer_i (); /// Suppliers call this method to pass data to connected consumers. virtual void push (const CORBA::Any &data); /// Disconnects the supplier from the event communication. - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); /// Connects a push supplier. virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier); @@ -58,7 +58,7 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ProxyPushConsumer_i : private: /// Returns 0 if a push_supplier is already connected to this /// ProxyPushConsumer, otherwise it returns a 1. - int connected (void); + int connected (); /// The SupplierQOS specified by the user of this class. const RtecEventChannelAdmin::SupplierQOS &qos_; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp index 7528c70dfe37f..2ec39fed7a65b 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp @@ -68,7 +68,7 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set) } void -TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (void) +TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer () { // Deactivate the supplier proxy. this->consumer_->disconnect_push_consumer (); @@ -95,7 +95,7 @@ TAO_CosEC_ProxyPushSupplier_i::TAO_CosEC_ProxyPushSupplier_i } void -TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void) +TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier () { this->pps_->disconnect_push_supplier (); @@ -142,7 +142,7 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer } int -TAO_CosEC_ProxyPushSupplier_i::connected (void) +TAO_CosEC_ProxyPushSupplier_i::connected () { return this->wrapper_ == 0 ? 0 : 1; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h index 245f4f3c4495e..1f711ec2a26ac 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h @@ -40,7 +40,7 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ProxyPushSupplier_i : ~TAO_CosEC_ProxyPushSupplier_i () = default; /// Ends the event communication and disposes this object. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); /// Connects the to the Event Channel. virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer); @@ -48,7 +48,7 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ProxyPushSupplier_i : private: /// Returns 0 if a push_consumer is already connected to this /// ProxyPushSupplier, otherwise it returns a 1. - int connected (void); + int connected (); /// The ConsumerQOS specified by the user of this class. const RtecEventChannelAdmin::ConsumerQOS &qos_; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp index 9de4ca109e652..54b80aa496f33 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp @@ -1,7 +1,7 @@ #include "SupplierAdmin_i.h" #include -TAO_CosEC_SupplierAdmin_i::TAO_CosEC_SupplierAdmin_i (void) +TAO_CosEC_SupplierAdmin_i::TAO_CosEC_SupplierAdmin_i () : qos_ (), rtec_supplieradmin_ (RtecEventChannelAdmin::SupplierAdmin::_nil ()) { @@ -18,7 +18,7 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void) +TAO_CosEC_SupplierAdmin_i::obtain_push_consumer () { CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil = CosEventChannelAdmin::ProxyPushConsumer::_nil (); @@ -46,7 +46,7 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void) } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (void) +TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer () { // TODO: implement this. return CosEventChannelAdmin::ProxyPullConsumer::_nil (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h index d3c7c3c763a63..79bffa8634ed4 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h @@ -44,7 +44,7 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_SupplierAdmin_i : virtual CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (); /// Returns a new ProxyPullConsumer_ptr. - virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer(void); + virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer(); private: /// The SupplierQOS specified by the user of this class. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp index 959aa21e667cf..0a45c2d7aa46c 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp @@ -29,12 +29,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 0; } -Basic::Basic (void) +Basic::Basic () { // No-Op. } -Basic::~Basic (void) +Basic::~Basic () { // No-Op. } @@ -69,7 +69,7 @@ Basic::init_ORB (int argc, ACE_TCHAR *argv []) } void -Basic::init_CosEC (void) +Basic::init_CosEC () { CosEC_ServantBase *ec = 0; @@ -97,7 +97,7 @@ Basic::init_CosEC (void) } void -Basic::run (void) +Basic::run () { // Create an Any type to pass to the Cos EC. CORBA::Any any; @@ -124,7 +124,7 @@ Basic::run (void) } void -Basic::shutdown (void) +Basic::shutdown () { this->supplier_.close (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h index 996a8b8c51311..dea78bf07daf6 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h @@ -29,10 +29,10 @@ class Basic { public: /// Constructor. - Basic (void); + Basic (); /// Destructor. - ~Basic (void); + ~Basic (); /// Starts up an ORB and the CosEC. /// Returns 0 on success, -1 on error. @@ -40,10 +40,10 @@ class Basic /// Connects a consumer and a supplier to the CosEC and sends 1 event /// across. - void run (void); + void run (); /// Closes down the CosEC. - void shutdown (void); + void shutdown (); private: /// initializes the ORB. @@ -52,7 +52,7 @@ class Basic /// initializes the COS EC. /// Returns 0 on success, -1 on error. - void init_CosEC (void); + void init_CosEC (); /// The ORB that we use. CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp index 435888329b551..1b29689291689 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp @@ -13,7 +13,7 @@ Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel, } void -Consumer::close (void) +Consumer::close () { this->disconnect (); @@ -22,7 +22,7 @@ Consumer::close (void) } void -Consumer::connect (void) +Consumer::connect () { if (CORBA::is_nil (this->consumer_admin_.in ())) return; @@ -37,7 +37,7 @@ Consumer::connect (void) } void -Consumer::disconnect (void) +Consumer::disconnect () { if (CORBA::is_nil (this->supplier_proxy_.in ()) || CORBA::is_nil (this->consumer_admin_.in ())) @@ -59,7 +59,7 @@ Consumer::push (const CORBA::Any &) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { // Deactivate this object. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h index 44a3c05f4a4a3..f859e513cc542 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h @@ -29,27 +29,26 @@ */ class Consumer : public POA_CosEventComm::PushConsumer { - public: /// This method connects the consumer to the EC. void open (CosEventChannelAdmin::EventChannel_ptr event_channel, CORBA::ORB_ptr orb); /// Disconnect from the EC. - void close (void); + void close (); /// Connect the Consumer to the EventChannel. - void connect (void); + void connect (); /// Disconnect from the supplier, but do not forget about it or close /// it. - void disconnect (void); + void disconnect (); /// push the event to the consumer. virtual void push (const CORBA::Any &data); /// disconnect the consumer from the EC. - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: /// The orb that we as using. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp index 0a5b0f9bb3529..404425e3277af 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp @@ -10,7 +10,7 @@ Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel) } void -Supplier::close (void) +Supplier::close () { this->disconnect (); @@ -19,7 +19,7 @@ Supplier::close (void) } void -Supplier::connect (void) +Supplier::connect () { if (CORBA::is_nil (this->supplier_admin_.in ())) return; @@ -33,7 +33,7 @@ Supplier::connect (void) } void -Supplier::disconnect (void) +Supplier::disconnect () { if (CORBA::is_nil (this->consumer_proxy_.in ()) || CORBA::is_nil (this->supplier_admin_.in ())) @@ -52,7 +52,7 @@ Supplier::send_event (const CORBA::Any & data) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { // Deactivate this object. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h index 0a99793afa0da..1bbd4b933088c 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h @@ -34,18 +34,18 @@ class Supplier : public POA_CosEventComm::PushSupplier void open (CosEventChannelAdmin::EventChannel_ptr event_channel); /// Disconnect from the EC. - void close (void); + void close (); - void connect (void); + void connect (); /// Disconnect from the EC, but do not forget about it or close it. - void disconnect (void); + void disconnect (); /// Send one event. void send_event (const CORBA::Any &data); /// The POA_CosEventComm::PushSupplier method. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: /// We talk to the EC using this proxy. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp index c0f1633dd9eed..f296fa5f1e978 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp @@ -50,7 +50,7 @@ Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel) } void -Consumer::close (void) +Consumer::close () { this->disconnect (); @@ -59,7 +59,7 @@ Consumer::close (void) } void -Consumer::connect (void) +Consumer::connect () { if (CORBA::is_nil (this->consumer_admin_.in ())) return; @@ -74,7 +74,7 @@ Consumer::connect (void) } void -Consumer::disconnect (void) +Consumer::disconnect () { if (CORBA::is_nil (this->supplier_proxy_.in ()) || CORBA::is_nil (this->consumer_admin_.in ())) @@ -113,7 +113,7 @@ Consumer::push (const CORBA::Any &) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { // Deactivate this object. @@ -127,7 +127,7 @@ Consumer::disconnect_push_consumer (void) } int -Consumer::init_Consumer (void) +Consumer::init_Consumer () { try { @@ -137,7 +137,7 @@ Consumer::init_Consumer (void) } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("Exception in Consumer::connect (void)\n"); + ex._tao_print_exception ("Exception in Consumer::connect ()\n"); return -1; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h index 3d35dbae5e833..69fa5a4e84a3c 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h @@ -30,33 +30,32 @@ */ class Consumer : public POA_CosEventComm::PushConsumer, public Multiple { - public: // = Initializatiopn and termination methods. /// Constructor. Consumer (); /// Initialize the Consumer. - int init_Consumer (void); + int init_Consumer (); /// This method connects the consumer to the EC. void open (CosEventChannelAdmin::EventChannel_ptr event_channel); /// Disconnect from the EC. - void close (void); + void close (); /// Connect the Consumer to the EventChannel. - void connect (void); + void connect (); /// Disconnect from the supplier, but do not forget about it or close /// it. - void disconnect (void); + void disconnect (); /// push the event to the consumer. virtual void push (const CORBA::Any &data); /// disconnect the consumer from the EC. - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // = CosEC_Multiple methods. /// Parse the command line options. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp index bf465408a0e5e..979b3b52344ed 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp @@ -1,6 +1,6 @@ #include "Multiple.h" -Multiple::Multiple (void) +Multiple::Multiple () : cos_ec_ (CosEventChannelAdmin::EventChannel::_nil ()), service_name_ (ACE_TEXT ("CosEventService")), orb_ (CORBA::ORB::_nil ()) @@ -9,7 +9,7 @@ Multiple::Multiple (void) } -Multiple::~Multiple (void) +Multiple::~Multiple () { // No-Op. } @@ -67,7 +67,7 @@ Multiple::init_ORB (int argc, ACE_TCHAR *argv []) } int -Multiple::init_CosEC (void) +Multiple::init_CosEC () { try { @@ -102,7 +102,7 @@ Multiple::init_CosEC (void) } int -Multiple::runORB (void) +Multiple::runORB () { try { @@ -117,7 +117,7 @@ Multiple::runORB (void) } void -Multiple::shutdown (void) +Multiple::shutdown () { if (!this->orb_->_nil ()) this->orb_->shutdown (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h index 233c0abd0e104..5f3f24a25b34a 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h @@ -30,20 +30,20 @@ class Multiple // via the Cos Event Service. public: /// Constructor. - Multiple (void); + Multiple (); /// Destructor. - virtual ~Multiple (void); + virtual ~Multiple (); /// Calls parse_args, Starts up an ORB, gets hold of the Event Service. /// Returns 0 on success, -1 on error. int init (int argc, ACE_TCHAR *argv[]); /// Calls the ORB's method. - int runORB (void); + int runORB (); /// Closes down the ORB and exits. - void shutdown (void); + void shutdown (); protected: /// Parse the command line arguments. @@ -62,7 +62,7 @@ class Multiple /// initializes the COS EC. /// Returns 0 on success, -1 on error. - int init_CosEC (void); + int init_CosEC (); /// The ORB that we use. CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp index 66dd5961a0133..934564a51f124 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp @@ -49,7 +49,7 @@ Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel) } void -Supplier::close (void) +Supplier::close () { this->disconnect (); @@ -58,7 +58,7 @@ Supplier::close (void) } void -Supplier::connect (void) +Supplier::connect () { if (CORBA::is_nil (this->supplier_admin_.in ())) return; @@ -72,7 +72,7 @@ Supplier::connect (void) } void -Supplier::disconnect (void) +Supplier::disconnect () { if (CORBA::is_nil (this->consumer_proxy_.in ()) || CORBA::is_nil (this->supplier_admin_.in ())) @@ -91,7 +91,7 @@ Supplier::send_event (const CORBA::Any & data) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { // Deactivate this object. @@ -105,7 +105,7 @@ Supplier::disconnect_push_supplier (void) } void -Supplier::run (void) +Supplier::run () { try { diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h index f737bd6ce0f9a..d20e5dc00cbad 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h @@ -38,21 +38,21 @@ class Supplier : public POA_CosEventComm::PushSupplier, void open (CosEventChannelAdmin::EventChannel_ptr event_channel); /// Disconnect from the EC. - void close (void); + void close (); - void connect (void); + void connect (); /// Disconnect from the EC, but do not forget about it or close it. - void disconnect (void); + void disconnect (); /// Send one event. void send_event (const CORBA::Any &data); /// The POA_CosEventComm::PushSupplier method. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); /// Sends the events to the EC. - void run (void); + void run (); // = Multiple methods. /// Parses the command line arguments. diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index 42242a6b8db0a..a3b3097121aeb 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -40,7 +40,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -Consumer::Consumer (void) +Consumer::Consumer () : event_count_ (0) { } @@ -122,7 +122,7 @@ Consumer::push (const CORBA::Any &) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h index 68d6eef38d8f6..687e07bd847ac 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h @@ -28,7 +28,7 @@ class Consumer : public POA_CosEventComm::PushConsumer { public: /// Constructor - Consumer (void); + Consumer (); /// Run the test int run (int argc, ACE_TCHAR* argv[]); @@ -37,7 +37,7 @@ class Consumer : public POA_CosEventComm::PushConsumer /// The skeleton methods. virtual void push (const CORBA::Any &event); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: /// Keep track of the number of events received. diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index b23bcc5216e46..72f499c239829 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -Supplier::Supplier (void) +Supplier::Supplier () { } @@ -121,7 +121,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { } diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h index 897ef6acbd7e3..fc32ef5452912 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h @@ -28,7 +28,7 @@ class Supplier : public POA_CosEventComm::PushSupplier { public: /// Constructor - Supplier (void); + Supplier (); /// Run the test int run (int argc, ACE_TCHAR* argv[]); @@ -36,7 +36,7 @@ class Supplier : public POA_CosEventComm::PushSupplier // = The CosEventComm::PushSupplier methods /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: }; diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index d7d41e6a63497..355a325c1b0df 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // ORB initialization... diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp index d9c931e8164b8..15775983533e6 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp @@ -8,7 +8,7 @@ Country_i::Country_i (CORBA::ORB_ptr orb) : } // Implementation skeleton destructor -Country_i::~Country_i (void) +Country_i::~Country_i () { } @@ -22,7 +22,7 @@ void Country_i::update_population (const char * country, } CORBA::Object_ptr -Country_i::get_typed_consumer (void) +Country_i::get_typed_consumer () { //Add your implementation here @@ -42,7 +42,7 @@ Country_i::push (const CORBA::Any & /* data */) } void -Country_i::disconnect_push_consumer (void) +Country_i::disconnect_push_consumer () { //Add your implementation here diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h index 8a06018ff1270..a52b2201d6389 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h @@ -16,16 +16,16 @@ class Country_i : public virtual POA_Country Country_i (CORBA::ORB_ptr orb); //Destructor - virtual ~Country_i (void); + virtual ~Country_i (); virtual void update_population (const char * country, CORBA::Long population); - virtual CORBA::Object_ptr get_typed_consumer (void); + virtual CORBA::Object_ptr get_typed_consumer (); virtual void push (const CORBA::Any & data); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: /// The ORB diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp index 4a6b0e23017ca..ef01d16308b53 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -3,11 +3,9 @@ #include "CountryC.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // ORB initialization boiler plate... @@ -69,4 +67,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } - diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h index 6582df0c2d70e..165f126b4f77a 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h @@ -11,7 +11,6 @@ class ORB_Initializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index f2fbc5e6f7f6e..94cfb90c9adb7 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -63,7 +63,6 @@ associate_state (CORBA::ORB_ptr orb, CORBA::Any const& state) pic->set_slot (state_slot_id (), state); - } catch (const CORBA::Exception& ex) { @@ -466,7 +465,7 @@ namespace char* -ReplicaController::name (void) +ReplicaController::name () { return CORBA::string_dup ("ReplicaController"); } @@ -484,7 +483,7 @@ ReplicaController::send_other ( } void -ReplicaController::destroy (void) +ReplicaController::destroy () { } @@ -492,7 +491,6 @@ void ReplicaController::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) { - } void diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h index 5aa00ad9d8d2f..1d6b81b6ac790 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h @@ -74,7 +74,6 @@ class ReplicaController resolve_poa (PortableInterceptor::AdapterName const& name); private: - class RecordId { public: diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp index 051e09989a5c2..a13dffdb18439 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp @@ -119,7 +119,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "IOR%d: %s\n",cntr, ior->c_str ())); iors [cntr] = orb->string_to_object (ior->c_str()); - } ACE_DEBUG ((LM_DEBUG, "Prepare to merge IORs.\n")); @@ -127,7 +126,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) object = iorm->merge_iors (iors); - FT::TagFTGroupTaggedComponent ft_tag_component; // Property values diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp index 5e200d12f7b5c..93e4428250ed0 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp @@ -8,7 +8,7 @@ Manager_i::Manager_i (long retryCount) { } -Manager_i::~Manager_i (void) +Manager_i::~Manager_i () { } diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h index b182492277110..934de961ae093 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h @@ -14,7 +14,7 @@ class Manager_i public: Manager_i (long retryCount); - virtual ~Manager_i (void); + virtual ~Manager_i (); virtual CORBA::Long registerServer (); @@ -23,7 +23,6 @@ class Manager_i virtual CORBA::Long endRetry (); private: - long server_instance_; long retry_count_; long retry_attempt_; diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp index d57009c00f7d3..2beba55339bee 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.cpp @@ -10,7 +10,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb, long instance) { } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h index e81bf6810481e..ebeaf37715210 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h @@ -14,7 +14,7 @@ class Messenger_i public: Messenger_i (CORBA::ORB_ptr orb, long instance); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Long send_message ( diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp index 28543b33482bb..e9e5ff59a935c 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp @@ -134,7 +134,6 @@ void TestClient::run() this->wait(); ACE_DEBUG((LM_DEBUG, "* Client ended.\n")); - } // Read in the stringified object references into an array diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp index 995ef08cb47d6..147fb42f0e855 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp @@ -37,7 +37,6 @@ class SvcConf int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - ACE_Service_Config config; config.open (argc, argv); @@ -70,7 +69,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa->destroy(1, 1); orb->destroy(); - } catch (const CORBA::Exception& e) { e._tao_print_exception ("Combined Service:"); } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp index 048c040e03b4d..6fcabe26717e6 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp @@ -59,7 +59,7 @@ class DynServer_ORB_Runner : public ACE_Task_Base } }; -DynServer_Loader::DynServer_Loader(void) +DynServer_Loader::DynServer_Loader() { } @@ -67,7 +67,6 @@ int DynServer_Loader::init (int argc, ACE_TCHAR* argv[]) { try { - orb_ = ORB_init(argc, argv, "DynServer"); Object_var obj = orb_->resolve_initial_references("RootPOA"); @@ -110,7 +109,6 @@ DynServer_Loader::init (int argc, ACE_TCHAR* argv[]) runner_->activate(); ACE_DEBUG((LM_DEBUG, "dynserver: running.\n")); - } catch (Exception& e) { e._tao_print_exception ("DynServer::init()"); } @@ -118,11 +116,10 @@ DynServer_Loader::init (int argc, ACE_TCHAR* argv[]) } int -DynServer_Loader::fini (void) +DynServer_Loader::fini () { ACE_ASSERT(runner_.get() != 0); try { - ACE_DEBUG((LM_DEBUG, "dynserver: shutting down.\n")); runner_->end(); @@ -134,7 +131,6 @@ DynServer_Loader::fini (void) ACE_DEBUG((LM_DEBUG, "dynserver: shut down successfully.\n")); return 0; - } catch (Exception& e) { e._tao_print_exception ("DynServer::fini()"); } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h index 031f401980dfe..6591ba81d09b6 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h @@ -15,7 +15,7 @@ class DynServer_Export DynServer { int n_; public: - DynServer(void); + DynServer(); virtual ~DynServer(); virtual CORBA::Long get(); }; diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp index 985e5be155775..6fe2b8a3ed5c9 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp @@ -23,7 +23,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { - ORB_var orb = ORB_init (argc, argv); Object_var obj = orb->resolve_initial_references ("Test"); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp index e890ce2cc254f..93a0105808b2a 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp @@ -15,12 +15,12 @@ using namespace PortableServer; class test_i : public virtual POA_test { int n_; public: - test_i (void) : n_(0) + test_i () : n_(0) { } - virtual ~test_i (void) { + virtual ~test_i () { } - virtual CORBA::Long get (void) + virtual CORBA::Long get () { ACE_DEBUG((LM_DEBUG, "dynserver: get() %d\n", ++n_)); return n_; @@ -83,7 +83,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { root_poa->destroy(1, 1); orb->destroy(); - } catch (const CORBA::Exception& e) { e._tao_print_exception ("TestServer::init()"); } diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp index fcbfaa73162a1..5d82cab4250fd 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp @@ -6,7 +6,7 @@ #include "orbsvcs/CosLoadBalancingC.h" #include "tao/ORB_Constants.h" -ORBInitializer::ORBInitializer (void) +ORBInitializer::ORBInitializer () : load_alert_ (), interceptor_ (0) { @@ -22,7 +22,6 @@ void ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - ACE_NEW_THROW_EX (this->interceptor_, ServerRequestInterceptor, CORBA::NO_MEMORY ( @@ -53,7 +52,7 @@ ORBInitializer::post_init ( TAO_LB_LoadAlert & -ORBInitializer::load_alert (void) +ORBInitializer::load_alert () { return this->load_alert_; } diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp index 041ddf9fbd849..e004a72cedbe7 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp @@ -21,12 +21,12 @@ RPS_Monitor::RPS_Monitor (ServerRequestInterceptor * interceptor) this->location_[0].kind = CORBA::string_dup ("UUID"); } -RPS_Monitor::~RPS_Monitor (void) +RPS_Monitor::~RPS_Monitor () { } CosLoadBalancing::Location * -RPS_Monitor::the_location (void) +RPS_Monitor::the_location () { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -41,7 +41,7 @@ RPS_Monitor::the_location (void) } CosLoadBalancing::LoadList * -RPS_Monitor::loads (void) +RPS_Monitor::loads () { const ACE_Time_Value current_time = ACE_OS::gettimeofday (); diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h index 009117f7ac1e3..a51f978e87825 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h @@ -33,7 +33,6 @@ class RPS_Monitor : public virtual POA_CosLoadBalancing::LoadMonitor { public: - /// Constructor RPS_Monitor (ServerRequestInterceptor * interceptor); @@ -43,7 +42,6 @@ class RPS_Monitor * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. @@ -62,16 +60,14 @@ class RPS_Monitor //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management through * reference counting. */ - ~RPS_Monitor (void); + ~RPS_Monitor (); private: - /// The name of the location at which this LoadMonitor resides. CosLoadBalancing::Location location_; diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp index 2af202455c513..05012b1fb7455 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp @@ -1,22 +1,22 @@ #include "ServerRequestInterceptor.h" -ServerRequestInterceptor::ServerRequestInterceptor (void) +ServerRequestInterceptor::ServerRequestInterceptor () : request_count_ (0) { } -ServerRequestInterceptor::~ServerRequestInterceptor (void) +ServerRequestInterceptor::~ServerRequestInterceptor () { } char * -ServerRequestInterceptor::name (void) +ServerRequestInterceptor::name () { return CORBA::string_dup ("ServerRequestInterceptor"); } void -ServerRequestInterceptor::destroy (void) +ServerRequestInterceptor::destroy () { } @@ -52,7 +52,7 @@ ServerRequestInterceptor::send_other ( } CORBA::Long -ServerRequestInterceptor::request_count (void) +ServerRequestInterceptor::request_count () { const CORBA::Long r = this->request_count_.value (); this->request_count_ = 0; diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h index 94e2e8b64039a..70e212dfda8d7 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h +++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h @@ -48,7 +48,7 @@ class ServerRequestInterceptor { public: /// Constructor. - ServerRequestInterceptor (void); + ServerRequestInterceptor (); /** * @name Methods Required by the ServerRequestInterceptor @@ -58,9 +58,9 @@ class ServerRequestInterceptor * ServerRequestInterceptors. */ //@{ - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri); @@ -78,7 +78,7 @@ class ServerRequestInterceptor PortableInterceptor::ServerRequestInfo_ptr ri); //@} - CORBA::Long request_count (void); + CORBA::Long request_count (); protected: /// Destructor. @@ -86,7 +86,7 @@ class ServerRequestInterceptor * Protected destructor to enforce correct memory management via * reference counting. */ - ~ServerRequestInterceptor (void); + ~ServerRequestInterceptor (); private: /// The number of requests that have arrived on the server. diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp index d5b9fcb84b95f..b224ca9342a06 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp @@ -23,7 +23,7 @@ StockFactory::get_stock (const char *symbol) } void -StockFactory::shutdown (void) +StockFactory::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h index 17f030929c9da..7cdf0431a686e 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h +++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h @@ -13,7 +13,7 @@ class StockFactory Test::Stock_ptr get_stock (const char *symbol); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp index 4902f70300f3b..6c2c98331c16a 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp @@ -9,8 +9,7 @@ #define QUERY_LANG "TCL" - -TLS_Client::TLS_Client (void) +TLS_Client::TLS_Client () { // No-Op. } @@ -36,7 +35,7 @@ TLS_Client::init_ORB (int argc, } void -TLS_Client::resolve_naming_service (void) +TLS_Client::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME); @@ -50,7 +49,7 @@ TLS_Client::resolve_naming_service (void) } void -TLS_Client::resolve_TLS_Basic_factory (void) +TLS_Client::resolve_TLS_Basic_factory () { CosNaming::Name name (1); name.length (1); @@ -64,7 +63,7 @@ TLS_Client::resolve_TLS_Basic_factory (void) } void -TLS_Client::run_tests (void) +TLS_Client::run_tests () { ACE_ASSERT (!CORBA::is_nil (this->basic_log_factory_.in ())); diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h index 729b414a5a1db..054366ebebc75 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h @@ -23,23 +23,23 @@ class TLS_Client // = DESCRIPTION // This client demonstates how to use the log service. public: - TLS_Client (void); + TLS_Client (); ~TLS_Client (); void init (int argc, ACE_TCHAR *argv []); // Init the Client. - void run_tests (void); + void run_tests (); // Run the tests.. protected: void init_ORB (int argc, ACE_TCHAR *argv []); // Initializes the ORB. - void resolve_naming_service (void); + void resolve_naming_service (); // Try to get hold of a running naming service. - void resolve_TLS_Basic_factory (void); + void resolve_TLS_Basic_factory (); // Try to resolve the TLS factory from the Naming service. // = Data Members @@ -53,6 +53,5 @@ class TLS_Client // The basic log factory from the Log Service. - }; #endif /* TLS_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index bc3aa1ea8ea3b..5e639f2bec29b 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -15,7 +15,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // **************************************************************** -Consumer::Consumer (void) +Consumer::Consumer () : event_count_ (0) { } @@ -90,17 +90,15 @@ Consumer::run (int argc, ACE_TCHAR* argv[]) void Consumer::push (const CORBA::Any &) { - this->event_count_ ++; ACE_DEBUG ((LM_DEBUG, "Consumer (%P|%t): %d log generated events received\n", this->event_count_)); - } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h index 1117e907a81ed..1453e5331c921 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h @@ -31,7 +31,7 @@ class Consumer : public POA_CosEventComm::PushConsumer // This class is a consumer of log generated events. // public: - Consumer (void); + Consumer (); // Constructor int run (int argc, ACE_TCHAR* argv[]); @@ -41,11 +41,10 @@ class Consumer : public POA_CosEventComm::PushConsumer virtual void push (const CORBA::Any &event); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // The skeleton methods. private: - // = Data Members CORBA::ULong event_count_; // Keep track of the number of events received. @@ -62,7 +61,6 @@ class Consumer : public POA_CosEventComm::PushConsumer CosEventChannelAdmin::ProxyPushSupplier_var supplier_; // The proxy that we are connected to. - }; #endif /* EVENT_CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index 80d40ebf3670a..7b09a500702b4 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -19,7 +19,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // **************************************************************** -Supplier::Supplier (void) +Supplier::Supplier () { } @@ -165,7 +165,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) // Destroy the POA poa->destroy (1, 0); - } catch (const CORBA::Exception& ex) { @@ -176,7 +175,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { } diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h index 4296b533ac7e7..e1639955cd790 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h @@ -30,7 +30,7 @@ class Supplier : public POA_CosEventComm::PushSupplier // This class is a supplier of events. // public: - Supplier (void); + Supplier (); // Constructor int run (int argc, ACE_TCHAR* argv[]); @@ -38,11 +38,10 @@ class Supplier : public POA_CosEventComm::PushSupplier // = The CosEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); // The skeleton methods. private: - // = Data Members CORBA::ORB_var orb_; // The ORB that we use. @@ -55,7 +54,6 @@ class Supplier : public POA_CosEventComm::PushSupplier CosEventChannelAdmin::ProxyPushConsumer_var consumer_; // The proxy that we are connected to. - }; #endif /* EVENT_SUPPLIER_H */ diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp index 72636dce08952..d3353b80412f8 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp @@ -23,7 +23,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // **************************************************************** -Consumer::Consumer (void) +Consumer::Consumer () : event_count_ (0) { } @@ -121,7 +121,7 @@ Consumer::push (const CORBA::Any &event) void Consumer::disconnect_push_consumer - (void) + () { this->proxy_supplier_-> disconnect_push_supplier(); diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index 4357cc56362c0..36e09083f1429 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -34,7 +34,7 @@ class Consumer // This class is a consumer of log generated events. // public: - Consumer (void); + Consumer (); // Constructor int run (int argc, ACE_TCHAR* argv[]); @@ -71,8 +71,6 @@ class Consumer DsNotifyLogAdmin::NotifyLogFactory_var notify_log_factory_; CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_; - - }; #endif /* NOTIFY_CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 7040112fe63b4..15ab44f822403 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -22,13 +22,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // **************************************************************** -Supplier::Supplier (void) +Supplier::Supplier () { } Supplier::~Supplier () { - } int @@ -41,7 +40,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) CORBA::ORB_init (argc, argv); - CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME); @@ -221,7 +219,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval)); this->notify_log_->destroy(); - } catch (const CORBA::Exception& ex) { @@ -232,7 +229,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) } -Filter_StructuredPushSupplier::Filter_StructuredPushSupplier (void) +Filter_StructuredPushSupplier::Filter_StructuredPushSupplier () { } @@ -261,7 +258,7 @@ Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr } void -Filter_StructuredPushSupplier::disconnect (void) +Filter_StructuredPushSupplier::disconnect () { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); @@ -287,7 +284,7 @@ Filter_StructuredPushSupplier::send_event void Filter_StructuredPushSupplier::disconnect_structured_push_supplier - (void) + () { // No-Op. } diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index f2557c33a1728..438ee6784ad4f 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -34,7 +34,7 @@ class Supplier // This class is a supplier of events. // public: - Supplier (void); + Supplier (); // Constructor ~Supplier (); @@ -44,7 +44,6 @@ class Supplier // Run the test private: - // = Data Members CORBA::ORB_var orb_; // The ORB that we use. @@ -72,14 +71,14 @@ class Filter_StructuredPushSupplier // Supplier for the filter example. // public: - Filter_StructuredPushSupplier (void); + Filter_StructuredPushSupplier (); // Constructor. void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin); // Connect the Supplier to the EventChannel. // Creates a new proxy supplier and connects to it. - void disconnect (void); + void disconnect (); // Disconnect from the supplier. virtual void send_event (const CosNotification::StructuredEvent& event); diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index 19e3a04b71865..f1384c7fd4e2d 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -16,7 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // **************************************************************** -Consumer::Consumer (void) +Consumer::Consumer () : event_count_ (0) { } @@ -137,7 +137,7 @@ Consumer::push (const RtecEventComm::EventSet& events) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h index acaba8da10d52..a49c0dae275c7 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h @@ -32,7 +32,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer // It simply registers for one event type. // public: - Consumer (void); + Consumer (); // Constructor int run (int argc, ACE_TCHAR* argv[]); @@ -41,7 +41,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer // = The RtecEventComm::PushConsumer methods virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // The skeleton methods. private: @@ -60,7 +60,6 @@ class Consumer : public POA_RtecEventComm::PushConsumer RtecEventChannelAdmin::ProxyPushSupplier_var supplier_; // The proxy that we are connected to. - }; #endif /* RTEVENT_CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index b7e4f09ed2540..8800ef9a19e47 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -17,12 +17,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Supplier supplier; return supplier.run (argc, argv); - } // **************************************************************** -Supplier::Supplier (void) +Supplier::Supplier () { } @@ -93,7 +92,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) - // create a log.. ACE_DEBUG ((LM_DEBUG, @@ -212,8 +210,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) // Destroy the POA poa->destroy (1, 0); - - } catch (const CORBA::Exception& ex) { @@ -224,7 +220,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { } diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h index 426e5225dcaa0..4b48fd774a28e 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h @@ -31,7 +31,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier // It simply publishes one event type. // public: - Supplier (void); + Supplier (); // Constructor int run (int argc, ACE_TCHAR* argv[]); @@ -39,11 +39,10 @@ class Supplier : public POA_RtecEventComm::PushSupplier // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); // The skeleton methods. private: - // = Data Members CosNaming::NamingContext_var naming_context_; // Handle to the name service. diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index 627d28c99e107..315227f0860ef 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -173,7 +173,7 @@ class Agent : public POA_CosNotifyComm::StructuredPushConsumer virtual void - disconnect_structured_push_consumer (void) + disconnect_structured_push_consumer () { // We don't care. } @@ -190,7 +190,6 @@ class Agent : public POA_CosNotifyComm::StructuredPushConsumer ProxyID supplier_id_; StructuredProxyPushSupplier_var supplier_; - }; int diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp index 7055c096e6fef..93d46418516f0 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp @@ -238,7 +238,7 @@ push_structured_event (StructuredEvent const& e) void -Gate::disconnect_structured_push_consumer (void) +Gate::disconnect_structured_push_consumer () { // We don't care. } diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h index 8444f2f6a12a5..049662855bddb 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h @@ -58,7 +58,7 @@ class Gate_Export Gate : public POA_CosNotifyComm::StructuredPushConsumer virtual void - disconnect_structured_push_consumer (void); + disconnect_structured_push_consumer (); private: ACE_thread_t thread_; diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index ea341893d7bab..4150d641a7cd5 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -13,7 +13,7 @@ ACE_Atomic_Op g_result_count = 0; -FilterClient::FilterClient (void) +FilterClient::FilterClient () :done_ (0) { g_result_count = 0; @@ -47,7 +47,7 @@ FilterClient::init (int argc, ACE_TCHAR *argv []) } void -FilterClient::run (void) +FilterClient::run () { send_events (); @@ -60,7 +60,7 @@ FilterClient::run (void) } void -FilterClient::done (void) +FilterClient::done () { this->done_ = 1; } @@ -89,7 +89,7 @@ FilterClient::init_ORB (int argc, ACE_TCHAR *argv []) } void -FilterClient::resolve_naming_service (void) +FilterClient::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME); @@ -103,7 +103,7 @@ FilterClient::resolve_naming_service (void) } void -FilterClient::resolve_Notify_factory (void) +FilterClient::resolve_Notify_factory () { CosNaming::Name name (1); name.length (1); @@ -117,7 +117,7 @@ FilterClient::resolve_Notify_factory (void) } void -FilterClient::create_EC (void) +FilterClient::create_EC () { CosNotifyChannelAdmin::ChannelID id; @@ -129,7 +129,7 @@ FilterClient::create_EC (void) } void -FilterClient::create_supplieradmin (void) +FilterClient::create_supplieradmin () { CosNotifyChannelAdmin::AdminID adminid = 0; @@ -161,7 +161,7 @@ FilterClient::create_supplieradmin (void) } void -FilterClient:: create_consumeradmin (void) +FilterClient:: create_consumeradmin () { CosNotifyChannelAdmin::AdminID adminid = 0; @@ -196,7 +196,7 @@ FilterClient:: create_consumeradmin (void) } void -FilterClient::create_consumers (void) +FilterClient::create_consumers () { // startup the first consumer. ACE_NEW_THROW_EX (consumer_1, @@ -214,7 +214,7 @@ FilterClient::create_consumers (void) } void -FilterClient::create_suppliers (void) +FilterClient::create_suppliers () { // startup the first supplier ACE_NEW_THROW_EX (supplier_1, @@ -232,7 +232,7 @@ FilterClient::create_suppliers (void) } void -FilterClient::send_events (void) +FilterClient::send_events () { // operations: CosNotification::StructuredEvent event; @@ -294,7 +294,7 @@ Filter_StructuredPushConsumer::Filter_StructuredPushConsumer (FilterClient* filt { } -Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void) +Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer () { } @@ -321,7 +321,7 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr } void -Filter_StructuredPushConsumer::disconnect (void) +Filter_StructuredPushConsumer::disconnect () { this->proxy_supplier_-> disconnect_structured_push_supplier(); @@ -360,7 +360,7 @@ Filter_StructuredPushConsumer::push_structured_event void Filter_StructuredPushConsumer::disconnect_structured_push_consumer - (void) + () { // No-Op. } @@ -398,7 +398,7 @@ Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr } void -Filter_StructuredPushSupplier::disconnect (void) +Filter_StructuredPushSupplier::disconnect () { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); @@ -428,7 +428,7 @@ Filter_StructuredPushSupplier::send_event void Filter_StructuredPushSupplier::disconnect_structured_push_supplier - (void) + () { // No-Op. } diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 35637d29aa866..09e4f29ec9faa 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -31,10 +31,9 @@ class Filter_StructuredPushSupplier; */ class FilterClient { - public: /// Constructor - FilterClient (void); + FilterClient (); /// Destructor ~FilterClient (); @@ -43,38 +42,38 @@ class FilterClient void init (int argc, ACE_TCHAR *argv []); /// Run the demo. - void run (void); + void run (); /// Consumer calls done, We're done. - void done (void); + void done (); protected: /// Initializes the ORB. void init_ORB (int argc, ACE_TCHAR *argv []); /// Try to get hold of a running naming service. - void resolve_naming_service (void); + void resolve_naming_service (); /// Try to resolve the Notify factory from the Naming service. - void resolve_Notify_factory (void); + void resolve_Notify_factory (); /// Create an EC. - void create_EC (void); + void create_EC (); /// Create the Supplier Admin. - void create_supplieradmin(void); + void create_supplieradmin(); /// Create the Consumer Admin. - void create_consumeradmin (void); + void create_consumeradmin (); /// Create and initialize the consumers. - void create_consumers (void); + void create_consumers (); /// create and initialize the suppliers. - void create_suppliers (void); + void create_suppliers (); /// send the events. - void send_events (void); + void send_events (); // = Data Members /// Reference to the root poa. @@ -143,7 +142,7 @@ class Filter_StructuredPushConsumer void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); /// Disconnect from the supplier. - virtual void disconnect (void); + virtual void disconnect (); protected: // = Data members @@ -162,7 +161,7 @@ class Filter_StructuredPushConsumer // = Methods /// Destructor - virtual ~Filter_StructuredPushConsumer (void); + virtual ~Filter_StructuredPushConsumer (); // = NotifyPublish method virtual void offer_change ( @@ -196,7 +195,7 @@ class Filter_StructuredPushSupplier void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin); /// Disconnect from the supplier. - void disconnect (void); + void disconnect (); /// Send one event. virtual void send_event (const CosNotification::StructuredEvent& event); diff --git a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl index cf6a58430cfba..f264f8cd1d247 100755 --- a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl @@ -20,8 +20,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $flt = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; -PerlACE::check_privilege_group(); - $nsiorfile = "naming.ior"; $nfsiorfile = "notify.ior"; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp index 275d6fa001b24..bd3d67a94b737 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp @@ -5,7 +5,7 @@ TAO_Notify_Lanes_Consumer::TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& or { } -TAO_Notify_Lanes_Consumer::~TAO_Notify_Lanes_Consumer (void) +TAO_Notify_Lanes_Consumer::~TAO_Notify_Lanes_Consumer () { } @@ -20,19 +20,19 @@ TAO_Notify_Lanes_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelA } PortableServer::POA_ptr -TAO_Notify_Lanes_Consumer::_default_POA (void) +TAO_Notify_Lanes_Consumer::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_Notify_Lanes_Consumer::run (void) +TAO_Notify_Lanes_Consumer::run () { // Nothing to do. } void -TAO_Notify_Lanes_Consumer::connect (void) +TAO_Notify_Lanes_Consumer::connect () { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var objref = this->_this (); @@ -63,7 +63,7 @@ TAO_Notify_Lanes_Consumer::connect (void) } void -TAO_Notify_Lanes_Consumer::disconnect (void) +TAO_Notify_Lanes_Consumer::disconnect () { this->proxy_supplier_->disconnect_structured_push_supplier(); } @@ -120,7 +120,7 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu } void -TAO_Notify_Lanes_Consumer::deactivate (void) +TAO_Notify_Lanes_Consumer::deactivate () { PortableServer::POA_var poa (this->_default_POA ()); @@ -130,7 +130,7 @@ TAO_Notify_Lanes_Consumer::deactivate (void) } void -TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (void) +TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer () { this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h index 6945eb99a2478..df77a3785642c 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h @@ -33,7 +33,7 @@ class TAO_Notify_Lanes_Consumer void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type); /// Run - void run (void); + void run (); protected: // = Data members @@ -58,20 +58,20 @@ class TAO_Notify_Lanes_Consumer // = Methods /// Destructor - virtual ~TAO_Notify_Lanes_Consumer (void); + virtual ~TAO_Notify_Lanes_Consumer (); // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); /// Connect the Consumer to the EventChannel. /// Creates a new proxy supplier and connects to it. - void connect (void); + void connect (); /// Disconnect the supplier. - void disconnect (void); + void disconnect (); /// Deactivate. - void deactivate (void); + void deactivate (); // = NotifyPublish method virtual void offer_change ( diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 285db7c8a01f2..e2139f642c03d 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_Lanes_Consumer_Client::TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) , lane_priority_ (0) @@ -53,7 +52,7 @@ TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) } void -TAO_Notify_Lanes_Consumer_Client::initialize (void) +TAO_Notify_Lanes_Consumer_Client::initialize () { ACE_DEBUG ((LM_DEBUG, "(%P, %t)Initializing Consumer Client with lane priority = %d, event type = (%s)\n" , this->lane_priority_, this->event_type_.c_str ())); @@ -99,7 +98,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (void) } PortableServer::POA_ptr -TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void) +TAO_Notify_Lanes_Consumer_Client::create_rt_poa () { PortableServer::POA_var rt_poa; @@ -161,13 +160,13 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void) } void -TAO_Notify_Lanes_Consumer_Client::run (void) +TAO_Notify_Lanes_Consumer_Client::run () { this->consumer_->run (); } int -TAO_Notify_Lanes_Consumer_Client::svc (void) +TAO_Notify_Lanes_Consumer_Client::svc () { try { @@ -181,7 +180,6 @@ TAO_Notify_Lanes_Consumer_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h index 8ca203d982ca8..2d22ab6f10212 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h @@ -34,10 +34,10 @@ class TAO_Notify_Lanes_Consumer_Client : public ACE_Task_Base ~TAO_Notify_Lanes_Consumer_Client (); /// Init - void initialize (void); + void initialize (); /// Run - void run (void); + void run (); /// Parse Args int parse_args (int argc, ACE_TCHAR *argv[]); @@ -47,7 +47,7 @@ class TAO_Notify_Lanes_Consumer_Client : public ACE_Task_Base protected: /// Create an RT POA with a single lane at the specified RT Priority. - PortableServer::POA_ptr create_rt_poa (void); + PortableServer::POA_ptr create_rt_poa (); /// ORB Objects. TAO_Notify_ORB_Objects orb_objects_; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp index 687fa6053ea93..84e33b4c6aaea 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp @@ -1,8 +1,7 @@ #include "ORB_Objects.h" - -TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void) +TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects () { } @@ -36,7 +35,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects () } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_ORB_Objects::notify_factory (void) +TAO_Notify_ORB_Objects::notify_factory () { CosNotifyChannelAdmin::EventChannelFactory_var ecf; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h index c40609915fa64..132f3bd1c232a 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h @@ -24,7 +24,7 @@ class TAO_Notify_ORB_Objects { public: /// Constructor - TAO_Notify_ORB_Objects (void); + TAO_Notify_ORB_Objects (); /// Destructor ~TAO_Notify_ORB_Objects (); @@ -33,7 +33,7 @@ class TAO_Notify_ORB_Objects void init (CORBA::ORB_var& orb); /// Resolve Notification - CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void); + CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (); ///= Public Data CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp index d27314e6c6b35..0806cfadc71a4 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp @@ -1,7 +1,6 @@ #include "ORB_Run_Task.h" - TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) { @@ -12,7 +11,7 @@ TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task () } int -TAO_Notify_ORB_Run_Task::svc (void) +TAO_Notify_ORB_Run_Task::svc () { try { diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp index 3651c9fd1efde..c5f549bc3706e 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp @@ -1,7 +1,6 @@ #include "Supplier.h" - #include "tao/ORB_Core.h" TAO_Notify_Lanes_Supplier::TAO_Notify_Lanes_Supplier (TAO_Notify_ORB_Objects& orb_objects) @@ -28,7 +27,7 @@ TAO_Notify_Lanes_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin } void -TAO_Notify_Lanes_Supplier::run (void) +TAO_Notify_Lanes_Supplier::run () { // The Priority at which we send the first event to the first consumer. RTCORBA::Priority priority = 1; @@ -93,7 +92,7 @@ TAO_Notify_Lanes_Supplier::run (void) } void -TAO_Notify_Lanes_Supplier::connect (void) +TAO_Notify_Lanes_Supplier::connect () { // Activate the supplier object. CosNotifyComm::StructuredPushSupplier_var objref = this->_this (); @@ -116,7 +115,7 @@ TAO_Notify_Lanes_Supplier::connect (void) } void -TAO_Notify_Lanes_Supplier::disconnect (void) +TAO_Notify_Lanes_Supplier::disconnect () { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); @@ -124,7 +123,7 @@ TAO_Notify_Lanes_Supplier::disconnect (void) } void -TAO_Notify_Lanes_Supplier::deactivate (void) +TAO_Notify_Lanes_Supplier::deactivate () { PortableServer::POA_var poa (this->_default_POA ()); @@ -156,7 +155,7 @@ TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& e } void -TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (void) +TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier () { this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h index 1f4dceb6a0b9c..bf0746c0b804a 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h @@ -32,20 +32,20 @@ class TAO_Notify_Lanes_Supplier void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int count); /// Run - void run (void); + void run (); protected: // = Protected Methods /// Connect the Supplier to the EventChannel. /// Creates a new proxy consumer and connects to it. - void connect (void); + void connect (); /// Disconnect the supplier. - void disconnect (void); + void disconnect (); /// Deactivate. - void deactivate (void); + void deactivate (); /// Send one event. virtual void send_event (const CosNotification::StructuredEvent& event); @@ -59,7 +59,7 @@ class TAO_Notify_Lanes_Supplier const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier (void); + virtual void disconnect_structured_push_supplier (); /// = Data members /// ORB Objects. diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index 32865fcd20c83..c823ef82e81bb 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_Lanes_Supplier_Client::TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) ,supplier_ (0) @@ -59,7 +58,7 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) } void -TAO_Notify_Lanes_Supplier_Client::initialize (void) +TAO_Notify_Lanes_Supplier_Client::initialize () { PortableServer::POAManager_var poa_manager = this->orb_objects_.root_poa_->the_POAManager (); @@ -84,7 +83,7 @@ TAO_Notify_Lanes_Supplier_Client::initialize (void) } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_Lanes_Supplier_Client::create_ec (void) +TAO_Notify_Lanes_Supplier_Client::create_ec () { CosNotifyChannelAdmin::EventChannel_var ec; @@ -145,7 +144,7 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (void) } void -TAO_Notify_Lanes_Supplier_Client::run (void) +TAO_Notify_Lanes_Supplier_Client::run () { /// First, signal that the supplier is ready. this->write_ior (); @@ -154,7 +153,7 @@ TAO_Notify_Lanes_Supplier_Client::run (void) } void -TAO_Notify_Lanes_Supplier_Client::write_ior (void) +TAO_Notify_Lanes_Supplier_Client::write_ior () { CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (); @@ -174,7 +173,7 @@ TAO_Notify_Lanes_Supplier_Client::write_ior (void) } int -TAO_Notify_Lanes_Supplier_Client::svc (void) +TAO_Notify_Lanes_Supplier_Client::svc () { try { @@ -187,7 +186,6 @@ TAO_Notify_Lanes_Supplier_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h index c10aa42d931d7..229ce52a686b9 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h @@ -31,10 +31,10 @@ class TAO_Notify_Lanes_Supplier_Client : public ACE_Task_Base ~TAO_Notify_Lanes_Supplier_Client (); /// Init - void initialize (void); + void initialize (); /// Run - void run (void); + void run (); /// Parse Args int parse_args (int argc, ACE_TCHAR *argv[]); @@ -44,10 +44,10 @@ class TAO_Notify_Lanes_Supplier_Client : public ACE_Task_Base protected: /// Create an EC - CosNotifyChannelAdmin::EventChannel_ptr create_ec (void); + CosNotifyChannelAdmin::EventChannel_ptr create_ec (); /// Write ior to file. - void write_ior (void); + void write_ior (); /// ORB Objects. TAO_Notify_ORB_Objects orb_objects_; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl index 85cb5a8d1f27c..1fbdf0eefd2c3 100755 --- a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl @@ -22,8 +22,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; my $con2 = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n"; -PerlACE::check_privilege_group(); - # Lanes Example # diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index a6f96cbe249a7..1d749a9ada636 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -16,7 +16,7 @@ ACE_Atomic_Op g_result_count = 0; // we wait for 4 events. -Subscribe::Subscribe (void) +Subscribe::Subscribe () : done_ (0) { // No-Op. @@ -42,7 +42,7 @@ Subscribe::init (int argc, ACE_TCHAR *argv []) } void -Subscribe::run (void) +Subscribe::run () { this->send_events (); @@ -55,7 +55,7 @@ Subscribe::run (void) } void -Subscribe::done (void) +Subscribe::done () { this->done_ = 1; } @@ -84,7 +84,7 @@ Subscribe::init_ORB (int argc, ACE_TCHAR *argv []) } void -Subscribe::resolve_naming_service (void) +Subscribe::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME); @@ -98,7 +98,7 @@ Subscribe::resolve_naming_service (void) } void -Subscribe::resolve_Notify_factory (void) +Subscribe::resolve_Notify_factory () { CosNaming::Name name (1); name.length (1); @@ -112,7 +112,7 @@ Subscribe::resolve_Notify_factory (void) } void -Subscribe::create_EC (void) +Subscribe::create_EC () { CosNotifyChannelAdmin::ChannelID id; @@ -124,7 +124,7 @@ Subscribe::create_EC (void) } void -Subscribe::create_supplieradmin (void) +Subscribe::create_supplieradmin () { CosNotifyChannelAdmin::AdminID adminid; @@ -135,7 +135,7 @@ Subscribe::create_supplieradmin (void) } void -Subscribe:: create_consumeradmin (void) +Subscribe:: create_consumeradmin () { CosNotifyChannelAdmin::AdminID adminid; @@ -146,7 +146,7 @@ Subscribe:: create_consumeradmin (void) } void -Subscribe::create_consumers (void) +Subscribe::create_consumers () { consumer_1_ = new Subscribe_StructuredPushConsumer (this); consumer_1_->connect (this->consumer_admin_.in ()); @@ -156,7 +156,7 @@ Subscribe::create_consumers (void) } void -Subscribe::create_suppliers (void) +Subscribe::create_suppliers () { supplier_1_ = new Subscribe_StructuredPushSupplier (); supplier_1_->connect (this->supplier_admin_.in ()); @@ -166,7 +166,7 @@ Subscribe::create_suppliers (void) } void -Subscribe::send_events (void) +Subscribe::send_events () { // Setup the CA to receive event_type : "domain_A", "Type_a" CosNotification::EventTypeSeq added(1); @@ -288,7 +288,7 @@ Subscribe_StructuredPushConsumer::connect } void -Subscribe_StructuredPushConsumer::disconnect (void) +Subscribe_StructuredPushConsumer::disconnect () { this->proxy_supplier_-> disconnect_structured_push_supplier(); @@ -329,25 +329,24 @@ Subscribe_StructuredPushConsumer::push_structured_event if (++g_result_count == EVENT_COUNT) subscribe_->done (); - } void Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer - (void) + () { // No-Op. } CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr -Subscribe_StructuredPushConsumer::get_proxy_supplier (void) +Subscribe_StructuredPushConsumer::get_proxy_supplier () { return proxy_supplier_.in (); } /*****************************************************************/ -Subscribe_StructuredPushSupplier::Subscribe_StructuredPushSupplier (void) +Subscribe_StructuredPushSupplier::Subscribe_StructuredPushSupplier () { } @@ -377,7 +376,7 @@ Subscribe_StructuredPushSupplier::connect } void -Subscribe_StructuredPushSupplier::disconnect (void) +Subscribe_StructuredPushSupplier::disconnect () { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); @@ -403,7 +402,7 @@ Subscribe_StructuredPushSupplier::send_event void Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier - (void) + () { // No-Op. } diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index e6294322038a7..fd6466c78caa1 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -30,45 +30,45 @@ class Subscribe_StructuredPushSupplier; class Subscribe { public: - Subscribe (void); + Subscribe (); ~Subscribe (); /// Init the Client. void init (int argc, ACE_TCHAR *argv []); /// Run the demo. - void run (void); + void run (); /// Called when all events we are waiting for have occurred. - void done (void); + void done (); protected: /// Initializes the ORB. void init_ORB (int argc, ACE_TCHAR *argv []); /// Try to get hold of a running naming service. - void resolve_naming_service (void); + void resolve_naming_service (); /// Try to resolve the Notify factory from the Naming service. - void resolve_Notify_factory (void); + void resolve_Notify_factory (); /// Create an EC. - void create_EC (void); + void create_EC (); /// Create the Supplier Admin. - void create_supplieradmin(void); + void create_supplieradmin(); /// Create the Consumer Admin. - void create_consumeradmin (void); + void create_consumeradmin (); /// Create and initialize the consumers. - void create_consumers (void); + void create_consumers (); /// create and initialize the suppliers. - void create_suppliers (void); + void create_suppliers (); /// send the events. - void send_events (void); + void send_events (); // = Data Members /// Reference to the root poa. @@ -130,10 +130,10 @@ class Subscribe_StructuredPushConsumer void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); /// Disconnect from the supplier. - virtual void disconnect (void); + virtual void disconnect (); /// Accessor for the Proxy that we're connected to. - CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void); + CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (); // public data member for evaluating the results of subscription. CosNotification::EventTypeSeq expected_subscription_; @@ -150,7 +150,7 @@ class Subscribe_StructuredPushConsumer // = Methods /// Destructor - virtual ~Subscribe_StructuredPushConsumer (void); + virtual ~Subscribe_StructuredPushConsumer (); // = NotifyPublish method virtual void offer_change ( @@ -177,14 +177,14 @@ class Subscribe_StructuredPushSupplier // public: /// Constructor. - Subscribe_StructuredPushSupplier (void); + Subscribe_StructuredPushSupplier (); /// Connect the Supplier to the EventChannel. /// Creates a new proxy consumer and connects to it. void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin); /// Disconnect from the supplier. - void disconnect (void); + void disconnect (); /// Send one event. virtual void send_event (const CosNotification::StructuredEvent& event); diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl index 7e04939283e4b..499b6f1efb226 100755 --- a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl @@ -20,8 +20,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $sub = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp index 93d29935e5e2c..ab02d46ca9ff4 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp @@ -18,7 +18,7 @@ TAO_Notify_ThreadPool_Consumer::TAO_Notify_ThreadPool_Consumer (TAO_Notify_ORB_O { } -TAO_Notify_ThreadPool_Consumer::~TAO_Notify_ThreadPool_Consumer (void) +TAO_Notify_ThreadPool_Consumer::~TAO_Notify_ThreadPool_Consumer () { } @@ -38,19 +38,19 @@ TAO_Notify_ThreadPool_Consumer::init (PortableServer::POA_var& poa, CosNotifyCha } PortableServer::POA_ptr -TAO_Notify_ThreadPool_Consumer::_default_POA (void) +TAO_Notify_ThreadPool_Consumer::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_Notify_ThreadPool_Consumer::run (void) +TAO_Notify_ThreadPool_Consumer::run () { // Nothing to do. } void -TAO_Notify_ThreadPool_Consumer::connect (void) +TAO_Notify_ThreadPool_Consumer::connect () { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var objref = this->_this (); @@ -111,7 +111,7 @@ TAO_Notify_ThreadPool_Consumer::connect (void) } void -TAO_Notify_ThreadPool_Consumer::disconnect (void) +TAO_Notify_ThreadPool_Consumer::disconnect () { this->proxy_supplier_->disconnect_structured_push_supplier(); } @@ -158,7 +158,7 @@ TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::St } void -TAO_Notify_ThreadPool_Consumer::dump_throughput (void) +TAO_Notify_ThreadPool_Consumer::dump_throughput () { ACE_High_Res_Timer::global_scale_factor_type gsf = ACE_High_Res_Timer::global_scale_factor (); @@ -171,7 +171,7 @@ TAO_Notify_ThreadPool_Consumer::dump_throughput (void) } void -TAO_Notify_ThreadPool_Consumer::deactivate (void) +TAO_Notify_ThreadPool_Consumer::deactivate () { PortableServer::POA_var poa (this->_default_POA ()); @@ -181,7 +181,7 @@ TAO_Notify_ThreadPool_Consumer::deactivate (void) } void -TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (void) +TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer () { this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h index 131c4b81deb05..673e4faf48073 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h @@ -34,28 +34,28 @@ class TAO_Notify_ThreadPool_Consumer void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, int proxy_supplier_thread_count, int max_events, long delay); /// Run - void run (void); + void run (); /// Print the consumer throughput - void dump_throughput (void); + void dump_throughput (); protected: // = Methods /// Destructor - virtual ~TAO_Notify_ThreadPool_Consumer (void); + virtual ~TAO_Notify_ThreadPool_Consumer (); /// Connect the Consumer to the EventChannel. /// Creates a new proxy supplier and connects to it. - void connect (void); + void connect (); /// Disconnect the supplier. - void disconnect (void); + void disconnect (); /// Deactivate. - void deactivate (void); + void deactivate (); // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); // = NotifyPublish method virtual void offer_change ( diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index d34251bb9b78f..850a331191bc0 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_ThreadPool_Consumer_Client::TAO_Notify_ThreadPool_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) , consumer_ (0) @@ -61,7 +60,7 @@ TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) } void -TAO_Notify_ThreadPool_Consumer_Client::_init (void) +TAO_Notify_ThreadPool_Consumer_Client::_init () { PortableServer::POAManager_var poa_manager = this->orb_objects_.root_poa_->the_POAManager (); @@ -104,7 +103,7 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (void) } PortableServer::POA_ptr -TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void) +TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa () { PortableServer::POA_var rt_poa; @@ -159,19 +158,19 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void) } void -TAO_Notify_ThreadPool_Consumer_Client::run (void) +TAO_Notify_ThreadPool_Consumer_Client::run () { this->consumer_->run (); } void -TAO_Notify_ThreadPool_Consumer_Client::dump_stats (void) +TAO_Notify_ThreadPool_Consumer_Client::dump_stats () { this->consumer_->dump_throughput (); } int -TAO_Notify_ThreadPool_Consumer_Client::svc (void) +TAO_Notify_ThreadPool_Consumer_Client::svc () { try { @@ -185,7 +184,6 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h index 492ca513a76fb..f5dc2ff31dbce 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h @@ -32,10 +32,10 @@ class TAO_Notify_ThreadPool_Consumer_Client : public ACE_Task_Base ~TAO_Notify_ThreadPool_Consumer_Client (); /// Init - void _init (void); + void _init (); /// Run - void run (void); + void run (); /// Parse Args int parse_args (int argc, ACE_TCHAR *argv[]); @@ -44,11 +44,11 @@ class TAO_Notify_ThreadPool_Consumer_Client : public ACE_Task_Base virtual int svc (); /// Dump stats. - void dump_stats (void); + void dump_stats (); protected: /// Create an RT POA with a single threadpool. - PortableServer::POA_ptr create_rt_poa (void); + PortableServer::POA_ptr create_rt_poa (); /// ORB Objects. TAO_Notify_ORB_Objects orb_objects_; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp index 687fa6053ea93..84e33b4c6aaea 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp @@ -1,8 +1,7 @@ #include "ORB_Objects.h" - -TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void) +TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects () { } @@ -36,7 +35,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects () } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_ORB_Objects::notify_factory (void) +TAO_Notify_ORB_Objects::notify_factory () { CosNotifyChannelAdmin::EventChannelFactory_var ecf; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h index 4c501ec1f3f77..ca94c2e89378a 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h @@ -23,7 +23,7 @@ class TAO_Notify_ORB_Objects { public: /// Constructor - TAO_Notify_ORB_Objects (void); + TAO_Notify_ORB_Objects (); /// Destructor ~TAO_Notify_ORB_Objects (); @@ -32,7 +32,7 @@ class TAO_Notify_ORB_Objects void init (CORBA::ORB_var& orb); /// Resolve Notification - CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void); + CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (); ///= Public Data CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp index d27314e6c6b35..0806cfadc71a4 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp @@ -1,7 +1,6 @@ #include "ORB_Run_Task.h" - TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) { @@ -12,7 +11,7 @@ TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task () } int -TAO_Notify_ORB_Run_Task::svc (void) +TAO_Notify_ORB_Run_Task::svc () { try { diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp index af8bf93d61b01..ec24428c2df93 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp @@ -1,7 +1,6 @@ #include "Supplier.h" - #include "tao/ORB_Core.h" TAO_Notify_ThreadPool_Supplier::TAO_Notify_ThreadPool_Supplier (TAO_Notify_ORB_Objects& orb_objects) @@ -33,7 +32,7 @@ TAO_Notify_ThreadPool_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& } void -TAO_Notify_ThreadPool_Supplier::run (void) +TAO_Notify_ThreadPool_Supplier::run () { { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); @@ -69,7 +68,7 @@ TAO_Notify_ThreadPool_Supplier::run (void) } void -TAO_Notify_ThreadPool_Supplier::connect (void) +TAO_Notify_ThreadPool_Supplier::connect () { // Activate the supplier object. CosNotifyComm::StructuredPushSupplier_var objref = this->_this (); @@ -117,7 +116,7 @@ TAO_Notify_ThreadPool_Supplier::connect (void) } void -TAO_Notify_ThreadPool_Supplier::disconnect (void) +TAO_Notify_ThreadPool_Supplier::disconnect () { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); @@ -125,7 +124,7 @@ TAO_Notify_ThreadPool_Supplier::disconnect (void) } void -TAO_Notify_ThreadPool_Supplier::deactivate (void) +TAO_Notify_ThreadPool_Supplier::deactivate () { PortableServer::POA_var poa (this->_default_POA ()); @@ -166,7 +165,7 @@ TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEve } void -TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (void) +TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier () { this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h index 06bb8d8502ce7..5b263d76ae1a7 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h @@ -34,20 +34,20 @@ class TAO_Notify_ThreadPool_Supplier int proxy_consumer_thread_count); /// Run - void run (void); + void run (); protected: // = Protected Methods /// Connect the Supplier to the EventChannel. /// Creates a new proxy consumer and connects to it. - void connect (void); + void connect (); /// Disconnect the supplier. - void disconnect (void); + void disconnect (); /// Deactivate. - void deactivate (void); + void deactivate (); /// Send one event. virtual void send_event (const CosNotification::StructuredEvent& event); @@ -61,7 +61,7 @@ class TAO_Notify_ThreadPool_Supplier const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier (void); + virtual void disconnect_structured_push_supplier (); /// = Data members /// ORB Objects. diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index 8fe87a8af5e3b..2bccc8f164c3f 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -76,7 +76,7 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) } void -TAO_Notify_ThreadPool_Supplier_Client::_init (void) +TAO_Notify_ThreadPool_Supplier_Client::_init () { PortableServer::POAManager_var poa_manager = this->orb_objects_.root_poa_->the_POAManager (); @@ -101,7 +101,7 @@ TAO_Notify_ThreadPool_Supplier_Client::_init (void) } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_ThreadPool_Supplier_Client::create_ec (void) +TAO_Notify_ThreadPool_Supplier_Client::create_ec () { CosNotifyChannelAdmin::EventChannel_var ec; @@ -141,7 +141,7 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (void) } void -TAO_Notify_ThreadPool_Supplier_Client::run (void) +TAO_Notify_ThreadPool_Supplier_Client::run () { /// First, signal that the supplier is ready. this->write_ior (); @@ -150,7 +150,7 @@ TAO_Notify_ThreadPool_Supplier_Client::run (void) } void -TAO_Notify_ThreadPool_Supplier_Client::write_ior (void) +TAO_Notify_ThreadPool_Supplier_Client::write_ior () { CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (); @@ -170,7 +170,7 @@ TAO_Notify_ThreadPool_Supplier_Client::write_ior (void) } int -TAO_Notify_ThreadPool_Supplier_Client::svc (void) +TAO_Notify_ThreadPool_Supplier_Client::svc () { try { @@ -183,7 +183,6 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h index a8124b09e5cf6..d94d8462b3f98 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h @@ -30,10 +30,10 @@ class TAO_Notify_ThreadPool_Supplier_Client : public ACE_Task_Base ~TAO_Notify_ThreadPool_Supplier_Client (); /// Init - void _init (void); + void _init (); /// Run - void run (void); + void run (); /// Parse Args int parse_args (int argc, ACE_TCHAR *argv[]); @@ -43,10 +43,10 @@ class TAO_Notify_ThreadPool_Supplier_Client : public ACE_Task_Base protected: /// Create an EC - CosNotifyChannelAdmin::EventChannel_ptr create_ec (void); + CosNotifyChannelAdmin::EventChannel_ptr create_ec (); /// Write ior to file. - void write_ior (void); + void write_ior (); /// ORB Objects. TAO_Notify_ORB_Objects orb_objects_; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl index f88a7aab724b4..65e370099e1c8 100755 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl @@ -22,8 +22,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; my $con2 = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n"; -PerlACE::check_privilege_group(); - # ThreadPool Example # diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp index d313390481f60..69ddc038a5d28 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp +++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp @@ -11,7 +11,7 @@ Gateway_ObjRef_Factory ( } ::CORBA::ValueBase * -Gateway_ObjRef_Factory::_copy_value (void) +Gateway_ObjRef_Factory::_copy_value () { Gateway_ObjRef_Factory *ret_val= 0; ACE_NEW_THROW_EX ( diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h index 3a3889856dfdc..8f62819a96abf 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h @@ -14,12 +14,11 @@ class Gateway_ObjRef_Factory public virtual OBV_ORT::ObjectReferenceFactory { public: - Gateway_ObjRef_Factory ( Gateway::Object_Factory_ptr gateway_object_factory, PortableInterceptor::ObjectReferenceFactory *old_factory); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); virtual CORBA::Object_ptr make_object ( const char *repository_id, diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h index 081dee4ed1482..b375ea65a254d 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h @@ -34,7 +34,6 @@ class Gateway_i PortableServer::POA_ptr poa); private: - CORBA::ORB_ptr orb_; PortableServer::Current_ptr poa_current_; diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h index 80aaf03d7749d..fce4a82e0df8a 100644 --- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h +++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h @@ -21,7 +21,6 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory { public: - /// Constructor Object_Factory_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr gateway_poa); @@ -31,7 +30,6 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory CORBA::Object_ptr gatewayed_object); private: - CORBA::ORB_ptr orb_; PortableServer::POA_ptr gateway_poa_; }; diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp index 49a2906ce8142..b4c593691545d 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp @@ -7,20 +7,20 @@ Server_IORInterceptor (Gateway::Object_Factory_ptr factory) { } -Server_IORInterceptor::~Server_IORInterceptor (void) +Server_IORInterceptor::~Server_IORInterceptor () { CORBA::release (this->gateway_object_factory_); } char * -Server_IORInterceptor::name (void) +Server_IORInterceptor::name () { return CORBA::string_dup ("Server_IORInterceptor"); } void -Server_IORInterceptor::destroy (void) +Server_IORInterceptor::destroy () { CORBA::release (this->gateway_object_factory_); this->gateway_object_factory_ = Gateway::Object_Factory::_nil (); diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h index 47774c8921ecb..d36f2c0a3ed53 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h @@ -22,7 +22,6 @@ class Server_IORInterceptor public virtual ::CORBA::LocalObject { public: - Server_IORInterceptor (Gateway::Object_Factory_ptr gateway_object_factory); /** @@ -34,10 +33,10 @@ class Server_IORInterceptor */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (void); + virtual char * name (); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (void); + virtual void destroy (); /// Add the tagged components to the IOR. virtual void establish_components ( @@ -57,13 +56,10 @@ class Server_IORInterceptor //@} protected: - - ~Server_IORInterceptor (void); + ~Server_IORInterceptor (); private: - Gateway::Object_Factory_ptr gateway_object_factory_; - }; #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h index 1832257174a84..e5b4d27023006 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h @@ -20,7 +20,6 @@ class Server_IORInterceptor_ORBInitializer public virtual ::CORBA::LocalObject { public: - //@{ /// The pre-initialization hook. virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -28,7 +27,6 @@ class Server_IORInterceptor_ORBInitializer /// The post-initialization hook. virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} - }; #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h index 730542b0aa4e1..b3bfb5c2d5f36 100644 --- a/TAO/orbsvcs/examples/ORT/sum_server_i.h +++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h @@ -21,14 +21,12 @@ class sum_server_i : public virtual POA_ORT::sum_server { public: - /// Constructor sum_server_i (); /// add variables method CORBA::Long add_variables (CORBA::Long a, CORBA::Long b); - }; #endif /* SUM_SERVER_I_H */ diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 305d0d1fdf618..810c5adae153d 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -21,7 +21,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -Consumer::Consumer (void) +Consumer::Consumer () : event_count_ (0) { } @@ -142,7 +142,7 @@ Consumer::push (const RtecEventComm::EventSet& events) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h index afa68222030bb..b64b43bee56a7 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h @@ -27,7 +27,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer { public: /// Constructor - Consumer (void); + Consumer (); /// Run the test int run (int argc, ACE_TCHAR* argv[]); @@ -36,7 +36,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer // The skeleton methods. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp index 46beee5031105..e4dfe0a4bd26b 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -19,7 +19,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -EC::EC (void) +EC::EC () { } diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h index b9f326327bcb6..5648f124f3a2a 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h @@ -25,7 +25,7 @@ class EC { public: /// Constructor - EC (void); + EC (); /// Run the test int run (int argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index 1e5908baf66f3..c36aafa4ee10b 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -20,7 +20,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -Gateway::Gateway (void) +Gateway::Gateway () { } diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h index 8e20335978997..52944979ec5d7 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h @@ -24,7 +24,7 @@ class Gateway { public: /// Constructor - Gateway (void); + Gateway (); /// Run the test int run (int argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index 71007b6620f13..bda7a4bfbdf2c 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -22,7 +22,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -Supplier::Supplier (void) +Supplier::Supplier () { } @@ -137,7 +137,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { } diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h index b20a42d89b09e..0b71d3a186d2e 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h @@ -26,7 +26,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier { public: /// Constructor - Supplier (void); + Supplier (); /// Run the test int run (int argc, ACE_TCHAR* argv[]); @@ -34,7 +34,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier // = The RtecEventComm::PushSupplier methods /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp index 6affe0ce442dd..a126ffcde827b 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp @@ -1,8 +1,7 @@ #include "Consumer.h" - -Consumer::Consumer (void) +Consumer::Consumer () { } @@ -21,7 +20,7 @@ Consumer::push (const RtecEventComm::EventSet& events) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { } diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h index eca442d1128f5..f11eb11cf76be 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h @@ -34,13 +34,13 @@ class Consumer : public POA_RtecEventComm::PushConsumer { public: /// Constructor - Consumer (void); + Consumer (); // = The RtecEventComm::PushConsumer methods /// The skeleton methods. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); }; #endif /* CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index d5294b91becc8..5032ec9520ab3 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -20,7 +20,6 @@ #include "ace/Thread.h" - namespace { int config_run = 0; diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp index a08693a781d12..451f7ccfe9320 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp @@ -4,7 +4,6 @@ #include "orbsvcs/RtecEventCommC.h" - Supplier::Supplier (RtecEventComm::EventSourceID id, const RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy) :id_ (id), @@ -13,7 +12,7 @@ Supplier::Supplier (RtecEventComm::EventSourceID id, } void -Supplier::timeout_occurred (void) +Supplier::timeout_occurred () { RtecEventComm::EventSet event (1); if (id_ == 1) @@ -35,7 +34,7 @@ Supplier::timeout_occurred (void) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { } @@ -59,7 +58,7 @@ Timeout_Consumer::push (const RtecEventComm::EventSet& events) } void -Timeout_Consumer::disconnect_push_consumer (void) +Timeout_Consumer::disconnect_push_consumer () { } diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h index 521175465fbe8..1a34a69e9810f 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h @@ -41,9 +41,9 @@ class Supplier : public POA_RtecEventComm::PushSupplier // = The RtecEventComm::PushSupplier methods /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); - void timeout_occurred (void); + void timeout_occurred (); private: RtecEventComm::EventSourceID id_; @@ -69,7 +69,7 @@ class Timeout_Consumer : public POA_RtecEventComm::PushConsumer /// The skeleton methods. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: Supplier *supplier_impl_; diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp index 0fca147dffc91..241296a0526c0 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -Consumer::Consumer (void) +Consumer::Consumer () : event_count_ (0) { } @@ -36,7 +36,7 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin) } void -Consumer::disconnect (void) +Consumer::disconnect () { try { @@ -79,7 +79,7 @@ Consumer::push (const RtecEventComm::EventSet& events) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h index a48d9c507cee9..8e9bdcfa1b899 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h @@ -30,19 +30,19 @@ class Consumer : public POA_RtecEventComm::PushConsumer { public: /// Constructor - Consumer (void); + Consumer (); /// Connect to the Event Channel void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); /// Disconnect from the event channel - void disconnect (void); + void disconnect (); // = The RtecEventComm::PushConsumer methods /// The skeleton methods. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: /// Keep track of the number of events received. diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp index 819a6caf61a55..bfd1976c7bb5f 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -Supplier::Supplier (void) +Supplier::Supplier () { } @@ -30,7 +30,7 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin) } void -Supplier::disconnect (void) +Supplier::disconnect () { // Disconnect from the EC try @@ -49,7 +49,7 @@ Supplier::disconnect (void) } void -Supplier::perform_push (void) +Supplier::perform_push () { try { @@ -69,7 +69,7 @@ Supplier::perform_push (void) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h index 242d7385234a2..795a05aab743e 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h @@ -31,21 +31,21 @@ class Supplier : public POA_RtecEventComm::PushSupplier { public: /// Constructor - Supplier (void); + Supplier (); /// Connect to the event channel void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin); /// Disconnect from the event channel - void disconnect (void); + void disconnect (); /// Push a single event - void perform_push (void); + void perform_push (); // = The RtecEventComm::PushSupplier methods /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: /// The proxy diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp index 4554ad6bafff4..b342a399e8ef9 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp @@ -1,6 +1,6 @@ #include "Consumer.h" -Consumer::Consumer (void) +Consumer::Consumer () { } @@ -19,7 +19,7 @@ Consumer::push (const RtecEventComm::EventSet& events) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h index eca442d1128f5..f11eb11cf76be 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h @@ -34,13 +34,13 @@ class Consumer : public POA_RtecEventComm::PushConsumer { public: /// Constructor - Consumer (void); + Consumer (); // = The RtecEventComm::PushConsumer methods /// The skeleton methods. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); }; #endif /* CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 09820b9d704a0..3afa9f99684ca 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -15,7 +15,6 @@ #include "ace/OS_NS_unistd.h" - int config_run = 0; int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp index 3a97402ca8e13..98a01e57a2212 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp @@ -1,11 +1,11 @@ #include "Supplier.h" -Supplier::Supplier (void) +Supplier::Supplier () { } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h index 278934efb6dfb..a689ef39bb732 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h @@ -34,12 +34,12 @@ class Supplier : public POA_RtecEventComm::PushSupplier { public: /// Constructor - Supplier (void); + Supplier (); // = The RtecEventComm::PushSupplier methods /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: }; diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index 02db0dc75ae61..127158fa9959d 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -13,7 +13,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -Consumer::Consumer (void) +Consumer::Consumer () : event_count_ (0) { } @@ -126,7 +126,7 @@ Consumer::push (const RtecEventComm::EventSet& events) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h index 71f9300fb1631..dc91368f8ea05 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h @@ -29,7 +29,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer { public: /// Constructor - Consumer (void); + Consumer (); /// Run the test int run (int argc, ACE_TCHAR* argv[]); @@ -38,7 +38,7 @@ class Consumer : public POA_RtecEventComm::PushConsumer /// The skeleton methods. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: /// Keep track of the number of events received. diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 9c7b5324b234c..08e8e17ce41e5 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -14,7 +14,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -Supplier::Supplier (void) +Supplier::Supplier () { } @@ -116,7 +116,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { } diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h index a1e9d9443030f..53fc07c714569 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h @@ -29,7 +29,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier { public: /// Constructor - Supplier (void); + Supplier (); /// Run the test int run (int argc, ACE_TCHAR* argv[]); @@ -37,7 +37,7 @@ class Supplier : public POA_RtecEventComm::PushSupplier // = The RtecEventComm::PushSupplier methods /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: }; diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp index 50bb40a03a03d..ff983ba8c7041 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp @@ -8,9 +8,8 @@ static int authorize_1 = 1; static int authorize_2 = 1; CORBA::Boolean -SLevel1_Server_i::authorize_level1 (void) +SLevel1_Server_i::authorize_level1 () { - /// Get a reference to the SecurityCurrent object. CORBA::Object_var obj = orb->resolve_initial_references ("SecurityCurrent"); @@ -102,7 +101,7 @@ SLevel1_Server_i::authorize_level1 (void) CORBA::Boolean -SLevel1_Server_i::authorize_level2 (void) +SLevel1_Server_i::authorize_level2 () { /// If the owner of this invocation is authorized to invoke this /// method, return 0 else return 1. diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h index e5c1b8615fd89..e43d145381c0c 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h @@ -20,13 +20,12 @@ class SLevel1_Server_i : public POA_SLevel1_Server SLevel1_Server_i (); /// - CORBA::Boolean authorize_level1 (void); + CORBA::Boolean authorize_level1 (); - CORBA::Boolean authorize_level2 (void); + CORBA::Boolean authorize_level2 (); static int authorized_1; static int authorized_2; - }; #endif /* TAO_SLEVEL1_TEST_I_H */ diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index 66f5acd3b42fe..5e292c2697277 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -1,7 +1,6 @@ #include "SLevel1_TestC.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index 07c950987efe7..00090f0dbf68f 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -49,7 +49,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (true, true); - } catch (const CORBA::SytemException& ) { diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index ab977303dedd4..68a578d17cce7 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -3,7 +3,6 @@ #include "testC.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 9b9f82aab2c40..326958271d908 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_unistd.h" - const ACE_TCHAR *ior_output_file = 0; int diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp index 8f06732eb5c3d..db443ce522713 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - void Simple_Server_i::send_line (const char *line) { @@ -13,7 +12,7 @@ Simple_Server_i::send_line (const char *line) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h index fb2e86350c960..3391e218fca37 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h @@ -29,7 +29,7 @@ class Simple_Server_i : public POA_Simple_Server // = The Simple_Server methods. void send_line (const char *line); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index baafac905421e..9d85332a732b0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -739,7 +739,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, ex._tao_print_exception ( "producer_check: not a producer"); - } } } @@ -834,9 +833,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->sep_b_.in (), the_qos, the_flows); - - - } // This is the light profile, call connect() else if (!CORBA::is_nil (this->vdev_a_.in ()) && !CORBA::is_nil (this->vdev_b_.in ())) @@ -1006,7 +1002,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, FlowEndPoint_Map_Entry *a_feps_entry, *b_feps_entry; try { - for (;a_feps_iterator.next (a_feps_entry) != 0; a_feps_iterator.advance ()) { @@ -1393,7 +1388,6 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName, Peer_Info *info; try { - for (this->peer_list_iterator_.first (); (info = this->peer_list_iterator_.next ()) != 0; this->peer_list_iterator_.advance ()) @@ -1480,7 +1474,6 @@ TAO_Base_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &) CORBA::Boolean TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &) { - while (!this->is_protocol_object_set ()) TAO_AV_CORE::instance ()->orb ()->perform_work (); return 1; @@ -1763,7 +1756,6 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec) if (flow_spec.length () > 0) { - for (u_int i=0;iforward_flow_spec_set.end (); @@ -2004,7 +1996,6 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec) TAO_AV_CORE::instance()->remove_connector(entry->flowname()); TAO_AV_CORE::instance()->remove_connector(control_flowname.c_str()); entry->protocol_object ()->destroy (); - } } } @@ -2131,7 +2122,6 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, ORBSVCS_ERROR_RETURN ((LM_ERROR, "Modifying QoS Failed\n"), -1); - } } return 0; @@ -2152,7 +2142,6 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, return 0; return 1; - } // Sets the list of protocols this streamendpoint can understand. @@ -2537,7 +2526,6 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, } else { - switch (forward_entry->direction ()) { case TAO_FlowSpec_Entry::TAO_AV_DIR_IN: @@ -2608,9 +2596,7 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep const AVStreams::flowSpec & /* theSpec */) { - throw AVStreams::notSupported (); - } TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A () @@ -3303,7 +3289,6 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj) CORBA::Object_ptr TAO_MMDevice::get_fdev (const char *flow_name) { - ACE_CString fdev_name_key (flow_name); AVStreams::FDev_var fdev_entry; if (this->fdev_map_.find (fdev_name_key, fdev_entry) == 0) @@ -3572,7 +3557,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, { try { - AVStreams::FlowProducer_ptr flow_producer = AVStreams::FlowProducer::_duplicate (producer); AVStreams::FlowConsumer_ptr flow_consumer = @@ -3786,7 +3770,6 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, // flow_producer, // this->fp_name_.inout () //); - } if (CORBA::is_nil (this->mcastconfigif_.in ())) ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_FlowConnection::add_consumer: first add a producer and then a consumer\n"), 0); @@ -3922,7 +3905,6 @@ TAO_FlowEndPoint::destroy () AVStreams::StreamEndPoint_ptr TAO_FlowEndPoint::related_sep () { - return AVStreams::StreamEndPoint::_duplicate (this->related_sep_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index c900543091785..3ae3c6adc8e79 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -51,17 +51,14 @@ typedef ACE_Hash_Map_Entry Flow_Handler_Map_E typedef ACE_Hash_Map_Iterator Flow_Handler_Map_Iterator; - class TAO_AV_Export AV_Null_MediaCtrl : public virtual POA_Null_MediaCtrl { public: - AV_Null_MediaCtrl (void); + AV_Null_MediaCtrl (); protected: - - virtual ~AV_Null_MediaCtrl (void); - + virtual ~AV_Null_MediaCtrl (); }; /** @@ -73,10 +70,9 @@ class TAO_AV_Export TAO_Basic_StreamCtrl : public virtual POA_AVStreams::Basic_StreamCtrl, public virtual TAO_PropertySet { - public: /// Default Constructor - TAO_Basic_StreamCtrl (void); + TAO_Basic_StreamCtrl (); /// Stop the transfer of data of the stream /// Empty the_spec means apply operation to all flows @@ -117,9 +113,8 @@ class TAO_AV_Export TAO_Basic_StreamCtrl CORBA::Object_ptr flow_connection); protected: - /// Destructor. - virtual ~TAO_Basic_StreamCtrl (void); + virtual ~TAO_Basic_StreamCtrl (); /// The Virtual Devices for this stream @@ -156,7 +151,7 @@ class TAO_AV_Export MMDevice_Map_Hash_Key { public: /// default constructor. - MMDevice_Map_Hash_Key (void); + MMDevice_Map_Hash_Key (); /// constructor. MMDevice_Map_Hash_Key (AVStreams::MMDevice_ptr mmdevice); @@ -165,7 +160,7 @@ class TAO_AV_Export MMDevice_Map_Hash_Key MMDevice_Map_Hash_Key (const MMDevice_Map_Hash_Key&); /// destructor. - ~MMDevice_Map_Hash_Key (void); + ~MMDevice_Map_Hash_Key (); /// operator== needed by ACE_Hash_Map_Manager. bool operator == (const MMDevice_Map_Hash_Key &hash_key) const; @@ -192,14 +187,12 @@ class TAO_AV_Export TAO_StreamCtrl : public virtual POA_AVStreams::StreamCtrl, public virtual TAO_Basic_StreamCtrl { - public: - /// Default Constructor - TAO_StreamCtrl (void); + TAO_StreamCtrl (); /// virtual destructor. - virtual ~TAO_StreamCtrl (void); + virtual ~TAO_StreamCtrl (); /// Stop the transfer of data of the stream /// Empty the_spec means apply operation to all flows @@ -246,7 +239,7 @@ class TAO_AV_Export TAO_StreamCtrl const AVStreams::flowSpec &the_spec); /// unbind the stream. Same effect as Basic_StreamCtrl::destroy () - virtual void unbind (void); + virtual void unbind (); virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev, AVStreams::StreamEndPoint_out sep); @@ -257,7 +250,6 @@ class TAO_AV_Export TAO_StreamCtrl const AVStreams::flowSpec &the_spec); protected: - struct MMDevice_Map_Entry { AVStreams::StreamEndPoint_var sep_; @@ -282,7 +274,6 @@ class TAO_AV_Export TAO_MCastConfigIf public virtual TAO_PropertySet { public: - enum Peer_Interface {VDEV = 0, FLOWENDPOINT=1}; struct Peer_Info { @@ -294,10 +285,10 @@ class TAO_AV_Export TAO_MCastConfigIf }; /// Default constructor. - TAO_MCastConfigIf (void); + TAO_MCastConfigIf (); /// Dtor - ~TAO_MCastConfigIf (void); + ~TAO_MCastConfigIf (); virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer, AVStreams::streamQoS & the_qos, @@ -336,7 +327,7 @@ class TAO_AV_Export TAO_AV_QoS { public: /// constructor. - TAO_AV_QoS (void); + TAO_AV_QoS (); /// constructor taking a stream qos parameter. TAO_AV_QoS (AVStreams::streamQoS &stream_qos); @@ -380,17 +371,16 @@ class TAO_AV_Flow_Handler; class TAO_AV_Export TAO_Base_StreamEndPoint :public virtual TAO_PropertySet { - // @@Naga: Rename this class to TAO_Base_EndPoint since both stream and flowendpoints derive from it. public: - TAO_Base_StreamEndPoint (void); - virtual ~TAO_Base_StreamEndPoint (void); + TAO_Base_StreamEndPoint (); + virtual ~TAO_Base_StreamEndPoint (); /// called when streamendpoint is instantiated - virtual int handle_open (void); + virtual int handle_open (); /// called when streamendpoint is being destructed - virtual int handle_close (void); + virtual int handle_close (); /// Application needs to define this virtual int handle_stop (const AVStreams::flowSpec &the_spec); @@ -425,13 +415,12 @@ class TAO_AV_Export TAO_Base_StreamEndPoint virtual void set_control_flow_handler (const char *flowname, TAO_AV_Flow_Handler *handler); - TAO_AV_QoS &qos (void); + TAO_AV_QoS &qos (); - void protocol_object_set (void); - int is_protocol_object_set (void); + void protocol_object_set (); + int is_protocol_object_set (); protected: - TAO_AV_QoS qos_; Flow_Handler_Map flow_handler_map_; Flow_Handler_Map control_flow_handler_map_; @@ -453,10 +442,9 @@ class TAO_AV_Export TAO_StreamEndPoint : public virtual POA_AVStreams::StreamEndPoint, public virtual TAO_Base_StreamEndPoint { - public: /// Constructor - TAO_StreamEndPoint (void); + TAO_StreamEndPoint (); /// Stop the stream. Empty the_spec means, for all the flows virtual void stop (const AVStreams::flowSpec &the_spec); @@ -517,7 +505,7 @@ class TAO_AV_Export TAO_StreamEndPoint virtual void set_source_id (CORBA::Long source_id); /// Destructor - virtual ~TAO_StreamEndPoint (void); + virtual ~TAO_StreamEndPoint (); CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, AVStreams::flowSpec &the_spec); @@ -579,10 +567,9 @@ class TAO_AV_Export TAO_StreamEndPoint_A : public virtual POA_AVStreams::StreamEndPoint_A, public virtual TAO_StreamEndPoint { - public: /// Constructor - TAO_StreamEndPoint_A (void); + TAO_StreamEndPoint_A (); /// Used for ATM-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, @@ -598,8 +585,7 @@ class TAO_AV_Export TAO_StreamEndPoint_A : const AVStreams::flowSpec &theSpec); /// Destructor - virtual ~TAO_StreamEndPoint_A (void); - + virtual ~TAO_StreamEndPoint_A (); }; // For backward compatibility. @@ -618,14 +604,14 @@ class TAO_AV_Export TAO_StreamEndPoint_B : // The "B" side of a streamendpoint public: /// Constructor - TAO_StreamEndPoint_B (void); + TAO_StreamEndPoint_B (); /// Used for internet-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, AVStreams::flowSpec &the_spec); /// Destructor - virtual ~TAO_StreamEndPoint_B (void); + virtual ~TAO_StreamEndPoint_B (); }; /** @@ -637,10 +623,9 @@ class TAO_AV_Export TAO_VDev :public virtual TAO_PropertySet, public virtual POA_AVStreams::VDev { - public: /// Default Constructor - TAO_VDev (void); + TAO_VDev (); /// Called to tell the vdev who the streamctrl, peer vdev is virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl, @@ -672,7 +657,7 @@ class TAO_AV_Export TAO_VDev protected: /// Destructor for a servant should be protected or private. /// Use _remove_ref() to delete this servant. - virtual ~TAO_VDev (void); + virtual ~TAO_VDev (); /// hook called after set_peer is done to set the media ctrl of the peer vdev. virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl); @@ -697,9 +682,7 @@ class TAO_AV_Export TAO_MMDevice :public virtual POA_AVStreams::MMDevice, public virtual TAO_PropertySet { - public: - /// Constructor enum MMDevice_Type {MMDEVICE_A = 0,MMDEVICE_B = 1}; TAO_MMDevice (TAO_AV_Endpoint_Strategy *endpoint_strategy_); @@ -755,14 +738,13 @@ class TAO_AV_Export TAO_MMDevice virtual void remove_fdev (const char *flow_name); /// Destructor - virtual ~TAO_MMDevice (void); + virtual ~TAO_MMDevice (); protected: /// Helper method to implement add_fdev() char* add_fdev_i (AVStreams::FDev_ptr fdev); protected: - TAO_AV_Endpoint_Strategy *endpoint_strategy_; /// Count of the number of flows in this MMDevice , used to @@ -798,19 +780,18 @@ class TAO_AV_Export TAO_FlowConnection : public virtual POA_AVStreams::FlowConnection, public virtual TAO_PropertySet { - public: /// default constructor. - TAO_FlowConnection (void); + TAO_FlowConnection (); /// stop this flow. - virtual void stop (void); + virtual void stop (); /// start this flow. - virtual void start (void); + virtual void start (); /// destroy this flow. - virtual void destroy (void); + virtual void destroy (); /// modify the QoS for this flow. virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos); @@ -834,7 +815,7 @@ class TAO_AV_Export TAO_FlowConnection AVStreams::QoS & the_qos); /// disconnect this flow connection. - virtual CORBA::Boolean disconnect (void); + virtual CORBA::Boolean disconnect (); /// adds the producer to this flow connection. virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer, @@ -880,11 +861,9 @@ class TAO_AV_Export TAO_FlowEndPoint : public virtual POA_AVStreams::FlowEndPoint, public virtual TAO_Base_StreamEndPoint { - public: - ///default constructor. - TAO_FlowEndPoint (void); + TAO_FlowEndPoint (); TAO_FlowEndPoint (const char *flowname, AVStreams::protocolSpec &protocols, @@ -903,24 +882,24 @@ class TAO_AV_Export TAO_FlowEndPoint : TAO_AV_Protocol_Object *object); /// lock the flow endpoint for a particular flow. - virtual CORBA::Boolean lock (void); + virtual CORBA::Boolean lock (); /// unlock the flow endpoint for subsequent use. - virtual void unlock (void); + virtual void unlock (); /// destroy this flow. - virtual void destroy (void); + virtual void destroy (); /// get method for the related streamendpoint under which this /// flowendpoint is. - virtual AVStreams::StreamEndPoint_ptr related_sep(void); + virtual AVStreams::StreamEndPoint_ptr related_sep(); /// set method for the related streamendpoint under which this /// flowendpoint is. virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep); - virtual AVStreams::FlowConnection_ptr related_flow_connection(void); + virtual AVStreams::FlowConnection_ptr related_flow_connection(); // accessor for the related flow connection attribute. @@ -928,7 +907,7 @@ class TAO_AV_Export TAO_FlowEndPoint : virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection); /// returns the other flowendpoint to which this is connected. - virtual AVStreams::FlowEndPoint_ptr get_connected_fep (void); + virtual AVStreams::FlowEndPoint_ptr get_connected_fep (); //// use the specified flow protocol. virtual CORBA::Boolean use_flow_protocol (const char * fp_name, @@ -1031,7 +1010,7 @@ class TAO_AV_Export TAO_FlowProducer: { public: /// default constructor - TAO_FlowProducer (void); + TAO_FlowProducer (); TAO_FlowProducer (const char *flowname, AVStreams::protocolSpec protocols, @@ -1047,10 +1026,10 @@ class TAO_AV_Export TAO_FlowProducer: virtual char * get_rev_channel (const char * pcol_name); /// stop this flow, to be overridden by the application. - virtual void stop (void); + virtual void stop (); /// start this flow, to be overridden by the application. - virtual void start (void); + virtual void start (); virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, @@ -1068,7 +1047,6 @@ class TAO_AV_Export TAO_FlowProducer: const char * use_flow_protocol); - /// sets the public key to be used for encryption of the data. virtual void set_key (const AVStreams::key & the_key); diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl index fb5072ec91d41..978c26126d39e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_AV_QoS & -TAO_Base_StreamEndPoint::qos (void) +TAO_Base_StreamEndPoint::qos () { return this->qos_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 0c5f67b726041..e81502930805f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -530,7 +530,6 @@ TAO_AV_Core::init_reverse_flows (TAO_Base_StreamEndPoint *endpoint, int result = -1; switch (direction) { - case TAO_AV_Core::TAO_AV_ENDPOINT_A: { result = this->connector_registry_->open (endpoint, @@ -565,10 +564,8 @@ TAO_AV_Core::get_flow_spec_entry (TAO_AV_FlowSpecSet &flow_spec_set, TAO_AV_Acceptor* TAO_AV_Core::get_acceptor (const char *flowname) { - try { - TAO_AV_AcceptorSetItor acceptor = this->acceptor_registry_->begin (); TAO_AV_AcceptorSetItor end = @@ -590,10 +587,8 @@ TAO_AV_Core::get_acceptor (const char *flowname) int TAO_AV_Core::remove_acceptor (const char *flowname) { - try { - TAO_AV_AcceptorSetItor acceptor = this->acceptor_registry_->begin (); TAO_AV_AcceptorSetItor end = diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index 4fea5b533cf17..d717322ee5d57 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -87,15 +87,15 @@ class TAO_AV_Export TAO_AV_Core }; /// Default constructor. - TAO_AV_Core (void); + TAO_AV_Core (); /// Destructor. - ~TAO_AV_Core (void); + ~TAO_AV_Core (); int init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - int run (void); - int stop_run (void); + int run (); + int stop_run (); int init_forward_flows (TAO_Base_StreamEndPoint *endpoint, TAO_AV_FlowSpecSet &flow_spec_set, EndPoint direction, @@ -104,33 +104,33 @@ class TAO_AV_Export TAO_AV_Core TAO_AV_FlowSpecSet &forward_flow_spec_set, TAO_AV_FlowSpecSet &reverse_flow_spec_set, EndPoint direction); - int init_transport_factories (void); - int init_flow_protocol_factories (void); + int init_transport_factories (); + int init_flow_protocol_factories (); - int load_default_transport_factories (void); - int load_default_flow_protocol_factories (void); + int load_default_transport_factories (); + int load_default_flow_protocol_factories (); /// = Get the acceptor registry TAO_AV_Acceptor *get_acceptor (const char *flowname); TAO_AV_Connector *get_connector (const char *flowname); int remove_acceptor (const char *flowname); int remove_connector (const char *flowname); - TAO_AV_Connector_Registry *connector_registry (void); + TAO_AV_Connector_Registry *connector_registry (); TAO_FlowSpec_Entry *get_flow_spec_entry (TAO_AV_FlowSpecSet &flow_spec_set, const char *flowname); - TAO_AV_Acceptor_Registry *acceptor_registry (void); + TAO_AV_Acceptor_Registry *acceptor_registry (); // = Get the protocol factories /// = Set/get the . TAO_AV_Flow_Protocol_Factory *get_flow_protocol_factory(const char *flow_protocol); TAO_AV_Transport_Factory *get_transport_factory(const char *transport_protocol); - TAO_AV_Flow_ProtocolFactorySet *flow_protocol_factories (void); - TAO_AV_TransportFactorySet *transport_factories (void); + TAO_AV_Flow_ProtocolFactorySet *flow_protocol_factories (); + TAO_AV_TransportFactorySet *transport_factories (); void reactor (ACE_Reactor *r); - ACE_Reactor *reactor (void); - CORBA::ORB_ptr orb (void); + ACE_Reactor *reactor (); + CORBA::ORB_ptr orb (); void orb (CORBA::ORB_ptr orb_); - PortableServer::POA_ptr poa (void); + PortableServer::POA_ptr poa (); void poa (PortableServer::POA_ptr poa_); static int deactivate_servant (PortableServer::Servant servant); diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index ed0f32ee71afd..ce63260d5ae77 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -259,7 +259,6 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); return 0; - } // Gets the stream endpoint object reference from the naming service diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index 77caf7696f18f..aad83b4c60060 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -39,10 +39,10 @@ class TAO_AV_Export TAO_AV_Endpoint_Strategy { public: /// Constructor - TAO_AV_Endpoint_Strategy (void); + TAO_AV_Endpoint_Strategy (); /// Destructor - virtual ~TAO_AV_Endpoint_Strategy (void); + virtual ~TAO_AV_Endpoint_Strategy (); /// Called by the MMDevice, when it needs to create an A type endpoint virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, @@ -78,26 +78,26 @@ class TAO_AV_Export TAO_AV_Endpoint_Process_Strategy TAO_AV_Endpoint_Process_Strategy (ACE_Process_Options *process_options); /// Destructor. - virtual ~TAO_AV_Endpoint_Process_Strategy (void); + virtual ~TAO_AV_Endpoint_Process_Strategy (); /// creates a new child process, and waits on a semaphore /// until the child process has finished creating the endpoints - virtual int activate (void); + virtual int activate (); protected: /// Bind to the naming service - virtual int bind_to_naming_service (void); + virtual int bind_to_naming_service (); /** * Get the object reference for the newly created stream * endpoint (which will be in the child process) * Subclasses will define the functionality for this */ - virtual int get_stream_endpoint (void) = 0; + virtual int get_stream_endpoint () = 0; /// Get the Vdev object reference for the newly created /// endpoint - virtual int get_vdev (void); + virtual int get_vdev (); /// Naming context CosNaming::NamingContext_var naming_context_; @@ -127,7 +127,7 @@ class TAO_AV_Export TAO_AV_Endpoint_Process_Strategy_A TAO_AV_Endpoint_Process_Strategy_A (ACE_Process_Options *process_options); /// Destructor. - virtual ~TAO_AV_Endpoint_Process_Strategy_A (void); + virtual ~TAO_AV_Endpoint_Process_Strategy_A (); protected: /// Creates an "A" type stream endpoint, and a vdev @@ -135,7 +135,7 @@ class TAO_AV_Export TAO_AV_Endpoint_Process_Strategy_A AVStreams::VDev_ptr &vdev); /// Gets the "A" type stream endpoint from the child process - virtual int get_stream_endpoint (void); + virtual int get_stream_endpoint (); }; // ---------------------------------------------------------------------- @@ -152,7 +152,7 @@ class TAO_AV_Export TAO_AV_Endpoint_Process_Strategy_B TAO_AV_Endpoint_Process_Strategy_B (ACE_Process_Options *process_options); /// Destructor. - virtual ~TAO_AV_Endpoint_Process_Strategy_B (void); + virtual ~TAO_AV_Endpoint_Process_Strategy_B (); protected: /// Creates a "B" type stream endpoint, and a vdev diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index bbe3cfc91084c..f1679c2ad4fea 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -17,14 +17,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ---------------------------------------------------------------------- template -TAO_AV_Endpoint_Reactive_Strategy ::TAO_AV_Endpoint_Reactive_Strategy (void) +TAO_AV_Endpoint_Reactive_Strategy ::TAO_AV_Endpoint_Reactive_Strategy () : stream_endpoint_a_servant_(0), stream_endpoint_b_servant_(0), vdev_servant_(0), media_ctrl_servant_(0) { } template -TAO_AV_Endpoint_Reactive_Strategy ::~TAO_AV_Endpoint_Reactive_Strategy (void) +TAO_AV_Endpoint_Reactive_Strategy ::~TAO_AV_Endpoint_Reactive_Strategy () { // Do not allow exceptions to escape from the destructor try @@ -58,7 +58,7 @@ TAO_AV_Endpoint_Reactive_Strategy ::~TAO_ // Create, activate the objects with the POA template int -TAO_AV_Endpoint_Reactive_Strategy ::activate (void) +TAO_AV_Endpoint_Reactive_Strategy ::activate () { try { @@ -84,7 +84,6 @@ template char * TAO_AV_Endpoint_Reactive_Strategy ::activate_with_poa (PortableServer::Servant servant) { - PortableServer::ObjectId_var id = this->poa_->activate_object (servant); @@ -101,7 +100,7 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ // Activate VDev into the POA template int -TAO_AV_Endpoint_Reactive_Strategy ::activate_vdev (void) +TAO_AV_Endpoint_Reactive_Strategy ::activate_vdev () { try { @@ -132,7 +131,7 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ // Activate the media_controller template int -TAO_AV_Endpoint_Reactive_Strategy ::activate_mediactrl (void) +TAO_AV_Endpoint_Reactive_Strategy ::activate_mediactrl () { try { @@ -150,7 +149,6 @@ TAO_AV_Endpoint_Reactive_Strategy ::activ this->vdev_->define_property ("Related_MediaCtrl", anyval); - } catch (const CORBA::Exception& ex) { @@ -203,14 +201,14 @@ TAO_AV_Endpoint_Reactive_Strategy::make_m //Constructor template -TAO_AV_Endpoint_Reactive_Strategy_A ::TAO_AV_Endpoint_Reactive_Strategy_A (void) +TAO_AV_Endpoint_Reactive_Strategy_A ::TAO_AV_Endpoint_Reactive_Strategy_A () { } // Destructor template -TAO_AV_Endpoint_Reactive_Strategy_A ::~TAO_AV_Endpoint_Reactive_Strategy_A (void) +TAO_AV_Endpoint_Reactive_Strategy_A ::~TAO_AV_Endpoint_Reactive_Strategy_A () { } @@ -239,17 +237,15 @@ TAO_AV_Endpoint_Reactive_Strategy_A::crea stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); return 0; - } // Put the stream_endpoint into the POA template int -TAO_AV_Endpoint_Reactive_Strategy_A ::activate_stream_endpoint (void) +TAO_AV_Endpoint_Reactive_Strategy_A ::activate_stream_endpoint () { try { - // Use the bridge method if (this->make_stream_endpoint (this->stream_endpoint_a_servant_) == -1) return -1; @@ -273,13 +269,13 @@ TAO_AV_Endpoint_Reactive_Strategy_A ::act // Constructor template -TAO_AV_Endpoint_Reactive_Strategy_B ::TAO_AV_Endpoint_Reactive_Strategy_B (void) +TAO_AV_Endpoint_Reactive_Strategy_B ::TAO_AV_Endpoint_Reactive_Strategy_B () { } // Destructor template -TAO_AV_Endpoint_Reactive_Strategy_B ::~TAO_AV_Endpoint_Reactive_Strategy_B (void) +TAO_AV_Endpoint_Reactive_Strategy_B ::~TAO_AV_Endpoint_Reactive_Strategy_B () { } @@ -296,7 +292,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B ::ini // Activate stream_endpoint template int -TAO_AV_Endpoint_Reactive_Strategy_B ::activate_stream_endpoint (void) +TAO_AV_Endpoint_Reactive_Strategy_B ::activate_stream_endpoint () { try { @@ -397,7 +393,6 @@ template char * TAO_AV_Child_Process ::activate_with_poa (PortableServer::Servant servant) { - PortableServer::ObjectId_var id = this->poa_->activate_object (servant); @@ -458,7 +453,7 @@ TAO_AV_Child_Process ::activate_objects // Bind to the namingservice template int -TAO_AV_Child_Process ::bind_to_naming_service (void) +TAO_AV_Child_Process ::bind_to_naming_service () { try { @@ -484,7 +479,7 @@ TAO_AV_Child_Process ::bind_to_naming_se // register the vdev with the naming service template int -TAO_AV_Child_Process ::register_vdev (void) +TAO_AV_Child_Process ::register_vdev () { try { @@ -592,7 +587,7 @@ TAO_AV_Child_Process ::release_semapho // register the stream_endpoint with the naming service template int -TAO_AV_Child_Process ::register_stream_endpoint (void) +TAO_AV_Child_Process ::register_stream_endpoint () { CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil (); try @@ -657,7 +652,7 @@ TAO_AV_Child_Process::make_mediactrl (T_M template int -TAO_AV_Child_Process::unbind_names (void) +TAO_AV_Child_Process::unbind_names () { // Remove the names from the naming service try diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index a16bcc74b66cf..a5c3b9f757e71 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -35,16 +35,16 @@ class TAO_AV_Endpoint_Reactive_Strategy virtual ~TAO_AV_Endpoint_Reactive_Strategy (); /// creates and activates the streamendpoint, vdev, and mediacontrol - virtual int activate (void); + virtual int activate (); /// activates the stream_endpoint with the POA - virtual int activate_stream_endpoint (void) = 0; + virtual int activate_stream_endpoint () = 0; /// activates the vdev with the POA - virtual int activate_vdev (void); + virtual int activate_vdev (); /// activates the media controller with the POA - virtual int activate_mediactrl (void); + virtual int activate_mediactrl (); /// Bridge method to create a vdev, a la Acceptor. Applications /// can override this @@ -86,17 +86,17 @@ class TAO_AV_Endpoint_Reactive_Strategy_A : public TAO_AV_Endpoint_Reactive_Strategy { public: - TAO_AV_Endpoint_Reactive_Strategy_A (void); + TAO_AV_Endpoint_Reactive_Strategy_A (); /// Constructor int init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); /// Destructor. - virtual ~TAO_AV_Endpoint_Reactive_Strategy_A (void); + virtual ~TAO_AV_Endpoint_Reactive_Strategy_A (); /// Overrides the base class stream_endpoint activator, to activate /// an "A" type endpoint - virtual int activate_stream_endpoint (void); + virtual int activate_stream_endpoint (); /// Called by the MMDevice, when it needs to create an A type endpoint virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, @@ -168,16 +168,16 @@ class TAO_AV_Child_Process char* activate_with_poa (PortableServer::Servant servant); /// Removes the vdev and streamendpoint names from the naming service. - int unbind_names (void); + int unbind_names (); /// Binds to the naming service - int bind_to_naming_service (void); + int bind_to_naming_service (); /// Registers vdev with the naming service - int register_vdev (void); + int register_vdev (); /// Registers stream_endpoint with the naming service - int register_stream_endpoint (void); + int register_stream_endpoint (); /// Releases the semaphore on which the parent is waiting on int release_semaphore (); @@ -227,7 +227,6 @@ class TAO_AV_Child_Process CORBA::ORB_ptr orb_; PortableServer::POA_ptr poa_; - }; // ---------------------------------------------------------------------- @@ -241,10 +240,10 @@ class TAO_AV_Child_Process_A { public: /// Constructor. - TAO_AV_Child_Process_A (void); + TAO_AV_Child_Process_A (); /// Destructor. - virtual ~TAO_AV_Child_Process_A (void); + virtual ~TAO_AV_Child_Process_A (); }; // ---------------------------------------------------------------------- @@ -259,21 +258,15 @@ class TAO_AV_Child_Process_B { public: /// Constructor. - TAO_AV_Child_Process_B (void); + TAO_AV_Child_Process_B (); /// Destructor. - virtual ~TAO_AV_Child_Process_B (void); + virtual ~TAO_AV_Child_Process_B (); }; TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/AV/Endpoint_Strategy_T.cpp" -#endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Endpoint_Strategy_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_AV_ENDPOINT_STRATEGY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp index f0b511711d203..5654b7b8a07e5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp @@ -3,12 +3,11 @@ #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) - TAO_BEGIN_VERSIONED_NAMESPACE_DECL const iovec Fill_ACE_QoS::iov_ = {0,0}; -Fill_ACE_QoS::Fill_ACE_QoS (void) +Fill_ACE_QoS::Fill_ACE_QoS () { ACE_NEW (this->default_traffic_, ACE_Flow_Spec (ACE_QOS_NOT_SPECIFIED, @@ -24,7 +23,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void) } // destructor. -Fill_ACE_QoS::~Fill_ACE_QoS (void) +Fill_ACE_QoS::~Fill_ACE_QoS () {} int @@ -63,7 +62,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos, } Fill_ACE_QoS::FLOW_SPEC_HASH_MAP& -Fill_ACE_QoS::map (void) +Fill_ACE_QoS::map () { return this->flow_spec_map_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h index 6e4165f5b43b7..90e6286b7905f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h @@ -40,10 +40,10 @@ class Fill_ACE_QoS //Initialization and termination methods. /// constructor. - Fill_ACE_QoS (void); + Fill_ACE_QoS (); /// destructor. - ~Fill_ACE_QoS (void); + ~Fill_ACE_QoS (); /// To be used by receivers. Fills the receiver qos and sets the /// sender qos to NO_TRAFFIC. @@ -62,7 +62,7 @@ class Fill_ACE_QoS ACE_Flow_Spec *sender_flow_spec); /// Returns the hash map of flowspecs indexed by flowspec name. - FLOW_SPEC_HASH_MAP& map (void); + FLOW_SPEC_HASH_MAP& map (); private: // The Service Provider is currently set to NULL for all ACE_QoS. diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index ee6a19ed0eba4..b9bec6fe64cac 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -596,7 +596,6 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) ORBSVCS_DEBUG ((LM_DEBUG, "Peer Address %s\n", buf)); - } if (tokenizer [TAO_AV_FLOW_PROTOCOL] != 0) @@ -736,7 +735,6 @@ TAO_Forward_FlowSpec_Entry::entry_to_string () //inet_addr->get_host_name (address, BUFSIZ); //cstring += ACE_OS::itoa (address, BUFSIZ, inet_addr->get_port_number ()); - } break; default: @@ -982,7 +980,6 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string () char port_str[10]; ACE_OS::sprintf(port_str, "%u", control_port); address_str += port_str; - } this->entry_ = this->flowname_; diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index d0ff485c6f4cc..2ce728f632461 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -79,7 +79,7 @@ class TAO_AV_Export TAO_FlowSpec_Entry }; /// default constructor. - TAO_FlowSpec_Entry (void); + TAO_FlowSpec_Entry (); /// constructor to construct an entry from the arguments. TAO_FlowSpec_Entry (const char *flowname, @@ -102,12 +102,12 @@ class TAO_AV_Export TAO_FlowSpec_Entry virtual int parse (const char* flowSpec_entry) = 0; /// virtual destructor. - virtual ~TAO_FlowSpec_Entry (void); + virtual ~TAO_FlowSpec_Entry (); /// accessor to the direction. - int direction (void); + int direction (); - virtual Role role (void) = 0; + virtual Role role () = 0; void role (Role role); /// accessor to string version of direction . const char * direction_str () const; @@ -119,9 +119,9 @@ class TAO_AV_Export TAO_FlowSpec_Entry void flow_protocol_str (const char *flow_protocol_str); /// accessor to address of the carrier protocol. - //ACE_Addr *fwd_address (void); - ACE_Addr *address (void); - ACE_Addr *control_address (void); + //ACE_Addr *fwd_address (); + ACE_Addr *address (); + ACE_Addr *control_address (); void address (ACE_Addr *address, bool cleanup = false); void control_address (ACE_Addr *address); @@ -130,7 +130,7 @@ class TAO_AV_Export TAO_FlowSpec_Entry // const char * peer_address_str () const; /// accessor to carrier protocol i.e TCP,UDP,RTP/UDP. - TAO_AV_Core::Protocol carrier_protocol (void); + TAO_AV_Core::Protocol carrier_protocol (); /// accessor to string version of carrier protocol. const char * carrier_protocol_str () const; @@ -142,41 +142,41 @@ class TAO_AV_Export TAO_FlowSpec_Entry const char *flowname () const; /// converts the entry to a string. - virtual const char *entry_to_string (void) = 0; + virtual const char *entry_to_string () = 0; int set_peer_addr (ACE_Addr *peer_addr); - ACE_Addr *get_peer_addr (void); + ACE_Addr *get_peer_addr (); int set_peer_control_addr (ACE_Addr *peer_control_addr); - ACE_Addr *get_peer_control_addr (void); + ACE_Addr *get_peer_control_addr (); int set_local_sec_addr (char** local_sec_addr, int size); - char** get_local_sec_addr (void); - int num_local_sec_addrs (void); + char** get_local_sec_addr (); + int num_local_sec_addrs (); int set_peer_sec_addr (char** peer_sec_addr, int size); - char** get_peer_sec_addr (void); - int num_peer_sec_addrs (void); + char** get_peer_sec_addr (); + int num_peer_sec_addrs (); int set_local_addr (ACE_Addr *local_addr); - ACE_Addr *get_local_addr (void); - char *get_local_addr_str (void); + ACE_Addr *get_local_addr (); + char *get_local_addr_str (); int set_local_control_addr (ACE_Addr *local_control_addr); - ACE_Addr *get_local_control_addr (void); - char *get_local_control_addr_str (void); + ACE_Addr *get_local_control_addr (); + char *get_local_control_addr_str (); - TAO_AV_Transport *transport (void); + TAO_AV_Transport *transport (); void transport (TAO_AV_Transport *transport); - TAO_AV_Transport *control_transport (void); + TAO_AV_Transport *control_transport (); void control_transport (TAO_AV_Transport *control_transport); - TAO_AV_Flow_Handler* handler (void); + TAO_AV_Flow_Handler* handler (); void handler (TAO_AV_Flow_Handler *handler); - TAO_AV_Flow_Handler* control_handler (void); + TAO_AV_Flow_Handler* control_handler (); void control_handler (TAO_AV_Flow_Handler *control_handler); - TAO_AV_Protocol_Object* protocol_object (void); + TAO_AV_Protocol_Object* protocol_object (); void protocol_object (TAO_AV_Protocol_Object *object); - TAO_AV_Protocol_Object* control_protocol_object (void); + TAO_AV_Protocol_Object* control_protocol_object (); void control_protocol_object (TAO_AV_Protocol_Object *object); /// sets the address for this flow. @@ -184,7 +184,7 @@ class TAO_AV_Export TAO_FlowSpec_Entry TAO_AV_Core::Flow_Component flow_component); /// returns true for a multicast address. - int is_multicast (void); + int is_multicast (); protected: /// parses the flow protocol string with tokens separated by : @@ -194,7 +194,7 @@ class TAO_AV_Export TAO_FlowSpec_Entry int set_direction (const char *direction_string); /// sets the protocol_ enum from the carrier_protocol_ string. - int set_protocol (void); + int set_protocol (); /// Addr information for the carrier protocol. ACE_Addr *address_; @@ -268,7 +268,7 @@ class TAO_AV_Export TAO_Forward_FlowSpec_Entry TAO_AV_PEER_ADDR = 5}; /// default constructor. - TAO_Forward_FlowSpec_Entry (void); + TAO_Forward_FlowSpec_Entry (); /// constructor to construct an entry from the arguments. TAO_Forward_FlowSpec_Entry (const char *flowname, @@ -285,12 +285,12 @@ class TAO_AV_Export TAO_Forward_FlowSpec_Entry const char *flow_protocol, const char *address); - virtual ~TAO_Forward_FlowSpec_Entry (void); + virtual ~TAO_Forward_FlowSpec_Entry (); /// converts the entry to a string. - virtual const char *entry_to_string (void); + virtual const char *entry_to_string (); - virtual Role role (void); + virtual Role role (); /// construct the entry from a string specified by the flowSpec grammar. virtual int parse (const char* flowSpec_entry); @@ -311,7 +311,7 @@ class TAO_AV_Export TAO_Reverse_FlowSpec_Entry TAO_AV_FORMAT = 4}; // default constructor. - TAO_Reverse_FlowSpec_Entry (void); + TAO_Reverse_FlowSpec_Entry (); // constructor to construct an entry from the arguments. TAO_Reverse_FlowSpec_Entry (const char *flowname, @@ -329,12 +329,12 @@ class TAO_AV_Export TAO_Reverse_FlowSpec_Entry const char *flow_protocol, const char *address); - virtual ~TAO_Reverse_FlowSpec_Entry (void); + virtual ~TAO_Reverse_FlowSpec_Entry (); /// converts the entry to a string. - virtual const char *entry_to_string (void); + virtual const char *entry_to_string (); - virtual Role role (void); + virtual Role role (); /// construct the entry from a string specified by the flowSpec grammar. virtual int parse (const char* flowSpec_entry); diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl index 85c5e0b0e43fe..acd5d7a5ebbac 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl @@ -39,7 +39,7 @@ TAO_FlowSpec_Entry::parse_flow_protocol_string (const char *flow_string) ACE_INLINE int -TAO_FlowSpec_Entry::direction (void) +TAO_FlowSpec_Entry::direction () { return this->direction_; } @@ -67,7 +67,7 @@ TAO_FlowSpec_Entry::flow_protocol_str (const char *str) ACE_INLINE TAO_AV_Core::Protocol -TAO_FlowSpec_Entry::carrier_protocol (void) +TAO_FlowSpec_Entry::carrier_protocol () { return this->protocol_; } @@ -81,7 +81,7 @@ TAO_FlowSpec_Entry::carrier_protocol_str () const ACE_INLINE ACE_Addr * -TAO_FlowSpec_Entry::address (void) +TAO_FlowSpec_Entry::address () { return this->address_; } @@ -99,7 +99,7 @@ TAO_FlowSpec_Entry::address (ACE_Addr *addr, bool cleanup) ACE_INLINE ACE_Addr * -TAO_FlowSpec_Entry::control_address (void) +TAO_FlowSpec_Entry::control_address () { return this->control_address_; } @@ -150,7 +150,7 @@ TAO_FlowSpec_Entry::set_peer_addr (ACE_Addr *peer_addr) ACE_INLINE ACE_Addr * -TAO_FlowSpec_Entry::get_peer_addr (void) +TAO_FlowSpec_Entry::get_peer_addr () { return this->peer_addr_; } @@ -173,14 +173,14 @@ TAO_FlowSpec_Entry::set_local_control_addr (ACE_Addr *local_addr) ACE_INLINE ACE_Addr* -TAO_FlowSpec_Entry::get_local_addr (void) +TAO_FlowSpec_Entry::get_local_addr () { return this->local_addr_; } ACE_INLINE ACE_Addr* -TAO_FlowSpec_Entry::get_local_control_addr (void) +TAO_FlowSpec_Entry::get_local_control_addr () { return this->local_control_addr_; } @@ -197,14 +197,14 @@ TAO_FlowSpec_Entry::set_local_sec_addr (char** local_sec_addr, ACE_INLINE char** -TAO_FlowSpec_Entry::get_local_sec_addr (void) +TAO_FlowSpec_Entry::get_local_sec_addr () { return this->local_sec_addr_; } ACE_INLINE int -TAO_FlowSpec_Entry::num_local_sec_addrs (void) +TAO_FlowSpec_Entry::num_local_sec_addrs () { return this->num_local_sec_addrs_; } @@ -221,21 +221,21 @@ TAO_FlowSpec_Entry::set_peer_sec_addr (char** peer_sec_addr, ACE_INLINE char** -TAO_FlowSpec_Entry::get_peer_sec_addr (void) +TAO_FlowSpec_Entry::get_peer_sec_addr () { return this->peer_sec_addr_; } ACE_INLINE int -TAO_FlowSpec_Entry::num_peer_sec_addrs (void) +TAO_FlowSpec_Entry::num_peer_sec_addrs () { return this->num_peer_sec_addrs_; } ACE_INLINE TAO_AV_Transport* -TAO_FlowSpec_Entry::transport (void) +TAO_FlowSpec_Entry::transport () { return this->transport_; } @@ -249,7 +249,7 @@ TAO_FlowSpec_Entry::transport (TAO_AV_Transport *transport) ACE_INLINE TAO_AV_Transport* -TAO_FlowSpec_Entry::control_transport (void) +TAO_FlowSpec_Entry::control_transport () { return this->control_transport_; } @@ -263,14 +263,14 @@ TAO_FlowSpec_Entry::control_transport (TAO_AV_Transport *control_transport) ACE_INLINE TAO_AV_Flow_Handler * -TAO_FlowSpec_Entry::handler (void) +TAO_FlowSpec_Entry::handler () { return this->handler_; } ACE_INLINE TAO_AV_Flow_Handler * -TAO_FlowSpec_Entry::control_handler (void) +TAO_FlowSpec_Entry::control_handler () { return this->control_handler_; } @@ -305,7 +305,7 @@ TAO_FlowSpec_Entry::control_handler (TAO_AV_Flow_Handler *handler) ACE_INLINE TAO_AV_Protocol_Object* -TAO_FlowSpec_Entry::protocol_object (void) +TAO_FlowSpec_Entry::protocol_object () { return this->protocol_object_; } @@ -319,7 +319,7 @@ TAO_FlowSpec_Entry::protocol_object (TAO_AV_Protocol_Object *object) ACE_INLINE TAO_AV_Protocol_Object* -TAO_FlowSpec_Entry::control_protocol_object (void) +TAO_FlowSpec_Entry::control_protocol_object () { return this->control_protocol_object_; } @@ -333,7 +333,7 @@ TAO_FlowSpec_Entry::control_protocol_object (TAO_AV_Protocol_Object *object) ACE_INLINE int -TAO_FlowSpec_Entry::is_multicast (void) +TAO_FlowSpec_Entry::is_multicast () { return this->is_multicast_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index b1feb2a127015..127bbe6fccceb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // default constructor template -TAO_FDev::TAO_FDev (void) +TAO_FDev::TAO_FDev () { } @@ -35,14 +35,14 @@ TAO_FDev::TAO_FDev (const char *flowname) } template -TAO_FDev::~TAO_FDev (void) +TAO_FDev::~TAO_FDev () { //no-op } template const char * -TAO_FDev::flowname (void) +TAO_FDev::flowname () { return this->flowname_.in (); } diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index f2a0fc87f9ce0..75c5700756207 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -91,13 +91,7 @@ class TAO_FDev : TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/AV/Flows_T.cpp" -#endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Flows_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_AV_FLOWS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 8848fffcf474a..57dfc5fc1e476 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -167,7 +167,6 @@ TAO_AV_UDP_MCast_Transport::send (const char *buf, // if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"to %s\n",addr)); return this->handler_->get_mcast_socket ()->send (buf, len); - } ssize_t @@ -178,7 +177,6 @@ TAO_AV_UDP_MCast_Transport::send (const iovec *iov, return this->handler_->get_mcast_socket ()->send (iov, iovcnt, 0); - } int diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h index 0639f3cb4cbe3..624b37f9a8a6b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.h +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h @@ -30,23 +30,22 @@ class TAO_AV_UDP_MCast_Flow_Handler; class TAO_AV_UDP_MCast_Transport :public TAO_AV_Transport { - public: - TAO_AV_UDP_MCast_Transport (void); + TAO_AV_UDP_MCast_Transport (); TAO_AV_UDP_MCast_Transport (TAO_AV_UDP_MCast_Flow_Handler *handler); - virtual ~TAO_AV_UDP_MCast_Transport (void); + virtual ~TAO_AV_UDP_MCast_Transport (); virtual int open (ACE_Addr *address); - virtual int close (void); + virtual int close (); - virtual int mtu (void); + virtual int mtu (); /// Write the complete Message_Block chain to the connection. - virtual ACE_Addr *get_peer_addr (void); - virtual ACE_Addr *get_local_addr (void); + virtual ACE_Addr *get_peer_addr (); + virtual ACE_Addr *get_local_addr (); virtual ssize_t send (const ACE_Message_Block *mblk, ACE_Time_Value *s = 0); @@ -90,13 +89,13 @@ class TAO_AV_UDP_MCast_Flow_Handler public virtual ACE_Event_Handler { public: - TAO_AV_UDP_MCast_Flow_Handler (void); - virtual ~TAO_AV_UDP_MCast_Flow_Handler (void); + TAO_AV_UDP_MCast_Flow_Handler (); + virtual ~TAO_AV_UDP_MCast_Flow_Handler (); virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); ACE_SOCK_Dgram_Mcast *get_mcast_socket () const; - virtual ACE_Event_Handler* event_handler (void){ return this; } + virtual ACE_Event_Handler* event_handler () { return this; } void set_peer_addr (ACE_INET_Addr *peer_addr); protected: ACE_INET_Addr *peer_addr_; diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp index b05af92024746..b32d61a25396f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -118,7 +118,7 @@ TAO_AV_Callback::get_policies () } // TAO_AV_Transport* -// TAO_AV_Callback::transport (void) +// TAO_AV_Callback::transport () // { // return this->transport_; // } diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index f1b1793347a66..75f26d55e1b4c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -53,7 +53,7 @@ class TAO_AV_Export TAO_AV_Policy { public: TAO_AV_Policy (CORBA::ULong type); - CORBA::ULong type (void); + CORBA::ULong type (); protected: CORBA::ULong type_; }; @@ -62,7 +62,7 @@ class TAO_AV_Export TAO_AV_SSRC_Policy : public TAO_AV_Policy { public: TAO_AV_SSRC_Policy (CORBA::ULong ssrc = 0); - CORBA::ULong value (void); + CORBA::ULong value (); void value (CORBA::ULong ssrc); protected: CORBA::ULong ssrc_; @@ -72,7 +72,7 @@ class TAO_AV_Export TAO_AV_Payload_Type_Policy : public TAO_AV_Policy { public: TAO_AV_Payload_Type_Policy (int payload_type = -1); - int value (void); + int value (); void value (int pt); protected: int payload_type_; @@ -81,8 +81,8 @@ class TAO_AV_Export TAO_AV_Payload_Type_Policy : public TAO_AV_Policy class TAO_AV_Export TAO_AV_RTCP_Sdes_Policy : public TAO_AV_Policy { public: - TAO_AV_RTCP_Sdes_Policy (void); - TAO_AV_RTCP_Sdes &value (void); + TAO_AV_RTCP_Sdes_Policy (); + TAO_AV_RTCP_Sdes &value (); void value (const TAO_AV_RTCP_Sdes& sdes_val); protected: TAO_AV_RTCP_Sdes sdes_; @@ -91,8 +91,8 @@ class TAO_AV_Export TAO_AV_RTCP_Sdes_Policy : public TAO_AV_Policy class TAO_AV_Export TAO_AV_SFP_Credit_Policy : public TAO_AV_Policy { public: - TAO_AV_SFP_Credit_Policy (void); - int value (void); + TAO_AV_SFP_Credit_Policy (); + int value (); void value (int val); protected: int value_; @@ -113,23 +113,23 @@ class TAO_AV_Flow_Handler; class TAO_AV_Export TAO_AV_Callback { public: - TAO_AV_Callback (void); - virtual ~TAO_AV_Callback (void); + TAO_AV_Callback (); + virtual ~TAO_AV_Callback (); /// Called for opening the callback. int open (TAO_AV_Protocol_Object *object, TAO_AV_Flow_Handler *handler); /// Called during Streamctrl->start. - virtual int handle_start (void); + virtual int handle_start (); /// Called during Streamctrl->stop. - virtual int handle_stop (void); + virtual int handle_stop (); /// Called during timeout for Flow Producers. virtual int handle_timeout (void *arg); - virtual int schedule_timer (void); + virtual int schedule_timer (); virtual int receive_frame (ACE_Message_Block *frame, TAO_AV_frame_info *frame_info = 0, @@ -142,7 +142,7 @@ class TAO_AV_Export TAO_AV_Callback const ACE_Addr &address = ACE_Addr::sap_any); /// Called during Streamctrl->destroy i.e tear_down of the stream - virtual int handle_destroy (void); + virtual int handle_destroy (); /** * Called to get the timeout. If tv is 0 then the framework stop @@ -153,10 +153,10 @@ class TAO_AV_Export TAO_AV_Callback void *&arg); /// Accessor to protocol object. - TAO_AV_Protocol_Object *protocol_object (void); + TAO_AV_Protocol_Object *protocol_object (); /// get the policies for the protocol object. - virtual TAO_AV_PolicyList get_policies (void); + virtual TAO_AV_PolicyList get_policies (); protected: TAO_AV_Protocol_Object *protocol_object_; TAO_AV_Flow_Handler *handler_; diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.inl b/TAO/orbsvcs/orbsvcs/AV/Policy.inl index 5479335589179..2f8157e7c037e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.inl +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL //-------------------------------------------------- ACE_INLINE CORBA::ULong -TAO_AV_Policy::type (void) +TAO_AV_Policy::type () { return this->type_; } @@ -16,7 +16,7 @@ TAO_AV_Policy::type (void) //-------------------------------------------------- ACE_INLINE CORBA::ULong -TAO_AV_SSRC_Policy::value (void) +TAO_AV_SSRC_Policy::value () { return this->ssrc_; } @@ -38,7 +38,7 @@ TAO_AV_Payload_Type_Policy::value (int pt) } ACE_INLINE int -TAO_AV_Payload_Type_Policy::value (void) +TAO_AV_Payload_Type_Policy::value () { return this->payload_type_; } @@ -46,7 +46,7 @@ TAO_AV_Payload_Type_Policy::value (void) // TAO_AV_RTCP_Sdes_Policy ACE_INLINE TAO_AV_RTCP_Sdes & -TAO_AV_RTCP_Sdes_Policy::value (void) +TAO_AV_RTCP_Sdes_Policy::value () { return this->sdes_; } @@ -70,7 +70,7 @@ TAO_AV_SFP_Credit_Policy::value (int credit) ACE_INLINE int -TAO_AV_SFP_Credit_Policy::value (void) +TAO_AV_SFP_Credit_Policy::value () { return this->value_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h index e672e21cc4f30..5ae2158e849f9 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h @@ -27,19 +27,19 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_AV_Export TAO_AV_Protocol_Object { public: - TAO_AV_Protocol_Object (void); + TAO_AV_Protocol_Object (); /// constructor. TAO_AV_Protocol_Object (TAO_AV_Callback *callback, TAO_AV_Transport *transport); /// Destructor - virtual ~TAO_AV_Protocol_Object (void); + virtual ~TAO_AV_Protocol_Object (); virtual int open (TAO_AV_Callback *callback, TAO_AV_Transport *transport); - virtual int handle_input (void) = 0; + virtual int handle_input () = 0; /// Called on a control object. virtual int handle_control_input (ACE_Message_Block *control_frame, @@ -47,11 +47,11 @@ class TAO_AV_Export TAO_AV_Protocol_Object /// set/get policies. virtual int set_policies (const TAO_AV_PolicyList &policy_list); - virtual TAO_AV_PolicyList get_policies (void); + virtual TAO_AV_PolicyList get_policies (); /// start/stop the flow. - virtual int start (void); - virtual int stop (void); + virtual int start (); + virtual int stop (); /// send a data frame. virtual int send_frame (ACE_Message_Block *frame, @@ -67,8 +67,8 @@ class TAO_AV_Export TAO_AV_Protocol_Object /// end the stream. virtual void control_object (TAO_AV_Protocol_Object *object); - virtual int destroy (void) = 0; - TAO_AV_Transport *transport (void); + virtual int destroy () = 0; + TAO_AV_Transport *transport (); protected: TAO_AV_Transport *transport_; TAO_AV_PolicyList policy_list_; @@ -83,15 +83,15 @@ class TAO_AV_Export TAO_AV_Flow_Protocol_Factory : public ACE_Service_Object { public: /// Initialization hook. - TAO_AV_Flow_Protocol_Factory (void); - virtual ~TAO_AV_Flow_Protocol_Factory (void); + TAO_AV_Flow_Protocol_Factory (); + virtual ~TAO_AV_Flow_Protocol_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, TAO_AV_Flow_Handler *handler, TAO_AV_Transport *transport); - virtual const char *control_flow_factory (void); + virtual const char *control_flow_factory (); int ref_count; }; diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 4d3a2c5dc312f..cddbdbc372566 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -37,12 +37,11 @@ FillQoSParams (ACE_QoS_Params &qos_params, return 0; } -TAO_AV_UDP_QoS_Session_Helper::TAO_AV_UDP_QoS_Session_Helper (void) +TAO_AV_UDP_QoS_Session_Helper::TAO_AV_UDP_QoS_Session_Helper () { - } -TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper (void) +TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper () { } @@ -81,7 +80,6 @@ TAO_AV_UDP_QoS_Session_Helper::set_qos (ACE_Flow_Spec &ace_flow_spec, if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "Filled up the Receiver QoS parameters\n")); - } ACE_QoS_Manager qos_manager = handler->get_socket ()->qos_manager (); @@ -180,22 +178,21 @@ TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_sessio -1); return 0; - } -TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void) +TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler () { ACE_NEW (this->transport_, TAO_AV_UDP_QoS_Transport (this)); } -TAO_AV_UDP_QoS_Flow_Handler::~TAO_AV_UDP_QoS_Flow_Handler (void) +TAO_AV_UDP_QoS_Flow_Handler::~TAO_AV_UDP_QoS_Flow_Handler () { delete this->transport_; } TAO_AV_Transport * -TAO_AV_UDP_QoS_Flow_Handler::transport (void) +TAO_AV_UDP_QoS_Flow_Handler::transport () { return this->transport_; } @@ -319,7 +316,6 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec, int TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) { - if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n")); @@ -487,7 +483,6 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, int TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) { - if (TAO_debug_level > 0) { ACE_TCHAR buf [BUFSIZ]; @@ -510,7 +505,6 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) { - TAO_AV_UDP_QoS_Session_Helper helper; this->qos_session_ = helper.open_qos_session (this, @@ -557,7 +551,7 @@ TAO_AV_UDP_QoS_Flow_Handler::get_handle () const // TAO_AV_UDP_Transport //------------------------------------------------------------ -TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport (void) +TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport () :handler_ (0) { } @@ -568,7 +562,7 @@ TAO_AV_UDP_QoS_Transport::TAO_AV_UDP_QoS_Transport (TAO_AV_UDP_QoS_Flow_Handler { } -TAO_AV_UDP_QoS_Transport::~TAO_AV_UDP_QoS_Transport (void) +TAO_AV_UDP_QoS_Transport::~TAO_AV_UDP_QoS_Transport () { } @@ -586,19 +580,19 @@ TAO_AV_UDP_QoS_Transport::open (ACE_Addr * /*address*/) } int -TAO_AV_UDP_QoS_Transport::close (void) +TAO_AV_UDP_QoS_Transport::close () { return 0; } int -TAO_AV_UDP_QoS_Transport::mtu (void) +TAO_AV_UDP_QoS_Transport::mtu () { return ACE_MAX_DGRAM_SIZE; } ACE_Addr* -TAO_AV_UDP_QoS_Transport::get_peer_addr (void) +TAO_AV_UDP_QoS_Transport::get_peer_addr () { return &this->peer_addr_; } @@ -778,11 +772,11 @@ TAO_AV_UDP_QoS_Transport::recv (iovec *iov, // TAO_AV_UDP_Acceptor //------------------------------------------------------------ -TAO_AV_UDP_QoS_Acceptor::TAO_AV_UDP_QoS_Acceptor (void) +TAO_AV_UDP_QoS_Acceptor::TAO_AV_UDP_QoS_Acceptor () { } -TAO_AV_UDP_QoS_Acceptor::~TAO_AV_UDP_QoS_Acceptor (void) +TAO_AV_UDP_QoS_Acceptor::~TAO_AV_UDP_QoS_Acceptor () { } @@ -920,7 +914,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) { - TAO_AV_UDP_QoS_Session_Helper helper; int result = handler->get_socket ()->open (*inet_addr, @@ -983,7 +976,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) if (qos_available == 0) { - ACE_Flow_Spec *ace_flow_spec = 0; ACE_NEW_RETURN (ace_flow_spec, ACE_Flow_Spec, @@ -1002,7 +994,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) } else { - int result = handler->get_socket ()->open (*inet_addr, qos_params, AF_INET, @@ -1066,11 +1057,10 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) this->entry_->handler (flow_handler); return 0; - } int -TAO_AV_UDP_QoS_Acceptor::close (void) +TAO_AV_UDP_QoS_Acceptor::close () { return 0; } @@ -1078,11 +1068,11 @@ TAO_AV_UDP_QoS_Acceptor::close (void) //------------------------------------------------------------ // TAO_AV_UDP_Connector //------------------------------------------------------------ -TAO_AV_UDP_QoS_Connector::TAO_AV_UDP_QoS_Connector (void) +TAO_AV_UDP_QoS_Connector::TAO_AV_UDP_QoS_Connector () { } -TAO_AV_UDP_QoS_Connector::~TAO_AV_UDP_QoS_Connector (void) +TAO_AV_UDP_QoS_Connector::~TAO_AV_UDP_QoS_Connector () { } @@ -1226,7 +1216,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, session_addr->set (local_addr->get_port_number (), local_addr->get_host_name ()); - } else { @@ -1271,7 +1260,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, -1); this->qos_session_->source_addr (src_addr); - } handler->qos_session (this->qos_session_); @@ -1285,7 +1273,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, qos); if (qos_available == 0) { - ACE_Flow_Spec* ace_flow_spec; ACE_NEW_RETURN (ace_flow_spec, ACE_Flow_Spec, @@ -1382,7 +1369,7 @@ TAO_AV_UDP_QoS_Connector::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *han } int -TAO_AV_UDP_QoS_Connector::close (void) +TAO_AV_UDP_QoS_Connector::close () { return 0; } @@ -1391,14 +1378,14 @@ TAO_AV_UDP_QoS_Connector::close (void) // TAO_AV_UDP_Protocol_Factory //------------------------------------------------------------ -TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory (void) +TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n")); } -TAO_AV_UDP_QoS_Factory::~TAO_AV_UDP_QoS_Factory (void) +TAO_AV_UDP_QoS_Factory::~TAO_AV_UDP_QoS_Factory () { } @@ -1415,7 +1402,7 @@ TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string) } TAO_AV_Acceptor* -TAO_AV_UDP_QoS_Factory::make_acceptor (void) +TAO_AV_UDP_QoS_Factory::make_acceptor () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, @@ -1429,7 +1416,7 @@ TAO_AV_UDP_QoS_Factory::make_acceptor (void) } TAO_AV_Connector* -TAO_AV_UDP_QoS_Factory::make_connector (void) +TAO_AV_UDP_QoS_Factory::make_connector () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, @@ -1453,14 +1440,14 @@ TAO_AV_UDP_QoS_Factory::init (int /* argc */, //------------------------------------------------------------ // TAO_AV_UDP_Flow_Factory //------------------------------------------------------------ -TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory (void) +TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n")); } -TAO_AV_UDP_QoS_Flow_Factory::~TAO_AV_UDP_QoS_Flow_Factory (void) +TAO_AV_UDP_QoS_Flow_Factory::~TAO_AV_UDP_QoS_Flow_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index 2b2cd75f0d05c..f8aabc16a9083 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -30,13 +30,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory { public: - TAO_AV_UDP_QoS_Factory (void); - virtual ~TAO_AV_UDP_QoS_Factory (void); + TAO_AV_UDP_QoS_Factory (); + virtual ~TAO_AV_UDP_QoS_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); /// Initialization hook. virtual int match_protocol (const char *protocol_string); - virtual TAO_AV_Acceptor *make_acceptor (void); - virtual TAO_AV_Connector *make_connector (void); + virtual TAO_AV_Acceptor *make_acceptor (); + virtual TAO_AV_Connector *make_connector (); }; class TAO_AV_UDP_QoS_Flow_Handler; @@ -52,19 +52,19 @@ class TAO_AV_UDP_QoS_Transport :public TAO_AV_Transport { public: - TAO_AV_UDP_QoS_Transport (void); + TAO_AV_UDP_QoS_Transport (); TAO_AV_UDP_QoS_Transport (TAO_AV_UDP_QoS_Flow_Handler *handler); - virtual ~TAO_AV_UDP_QoS_Transport (void); + virtual ~TAO_AV_UDP_QoS_Transport (); virtual int open (ACE_Addr *addr); - virtual int close (void); + virtual int close (); - virtual int mtu (void); + virtual int mtu (); - virtual ACE_Addr *get_peer_addr (void); + virtual ACE_Addr *get_peer_addr (); virtual int set_remote_address (const ACE_INET_Addr &address); @@ -112,10 +112,10 @@ class TAO_AV_UDP_QoS_Flow_Handler /** * Destructor */ - TAO_AV_UDP_QoS_Flow_Handler (void); - ~TAO_AV_UDP_QoS_Flow_Handler (void); + TAO_AV_UDP_QoS_Flow_Handler (); + ~TAO_AV_UDP_QoS_Flow_Handler (); int open (ACE_Addr &address); - virtual TAO_AV_Transport *transport (void); + virtual TAO_AV_Transport *transport (); virtual int set_remote_address (ACE_Addr *address); virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); @@ -124,9 +124,9 @@ class TAO_AV_UDP_QoS_Flow_Handler /// Handles a QoS event. Right now, just /// prints a message. virtual int handle_qos (ACE_HANDLE fd); - ACE_SOCK_Dgram_Mcast_QoS *get_socket (void); - virtual ACE_Event_Handler* event_handler (void){ return this; } - virtual ACE_QoS_Session* qos_session (void); + ACE_SOCK_Dgram_Mcast_QoS *get_socket (); + virtual ACE_Event_Handler* event_handler () { return this; } + virtual ACE_QoS_Session* qos_session (); virtual void qos_session (ACE_QoS_Session *qos_session); int translate (ACE_Flow_Spec *ace_flow_spec, @@ -137,13 +137,13 @@ class TAO_AV_UDP_QoS_Flow_Handler void negotiator (AVStreams::Negotiator_ptr); void endpoint (TAO_Base_StreamEndPoint *endpoint); - TAO_Base_StreamEndPoint* endpoint (void); + TAO_Base_StreamEndPoint* endpoint (); void flowspec_entry (TAO_FlowSpec_Entry *entry); - TAO_FlowSpec_Entry* flowspec_entry (void); + TAO_FlowSpec_Entry* flowspec_entry (); void av_core (TAO_AV_Core *avcore); - TAO_AV_Core* av_core (void); + TAO_AV_Core* av_core (); protected: TAO_AV_Core *av_core_; @@ -159,8 +159,8 @@ class TAO_AV_UDP_QoS_Acceptor :public TAO_AV_Acceptor { public: - TAO_AV_UDP_QoS_Acceptor (void); - virtual ~TAO_AV_UDP_QoS_Acceptor (void); + TAO_AV_UDP_QoS_Acceptor (); + virtual ~TAO_AV_UDP_QoS_Acceptor (); virtual int open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_FlowSpec_Entry *entry, @@ -177,7 +177,7 @@ class TAO_AV_UDP_QoS_Acceptor virtual int open_i (ACE_INET_Addr *address); - virtual int close (void); + virtual int close (); virtual int activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler); @@ -195,8 +195,8 @@ class TAO_AV_UDP_QoS_Connector :public TAO_AV_Connector { public: - TAO_AV_UDP_QoS_Connector (void); - ~TAO_AV_UDP_QoS_Connector (void); + TAO_AV_UDP_QoS_Connector (); + ~TAO_AV_UDP_QoS_Connector (); virtual int open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_AV_Flow_Protocol_Factory *factory); @@ -206,7 +206,7 @@ class TAO_AV_UDP_QoS_Connector TAO_AV_Core::Flow_Component flow_comp = TAO_AV_Core::TAO_AV_DATA); virtual int activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler); - virtual int close (void); + virtual int close (); int translate (CosPropertyService::Properties &qos_params, ACE_Flow_Spec *ace_flow_spec); @@ -226,10 +226,10 @@ class TAO_AV_UDP_QoS_Connector // TAO_AV_UDP_Object (TAO_AV_Callback *callback, // TAO_AV_Transport *transport = 0); -// virtual ~TAO_AV_UDP_Object (void); +// virtual ~TAO_AV_UDP_Object (); // // Dtor -// virtual int handle_input (void); +// virtual int handle_input (); // virtual int send_frame (ACE_Message_Block *frame, // TAO_AV_frame_info *frame_info = 0); @@ -239,7 +239,7 @@ class TAO_AV_UDP_QoS_Connector // int iovcnt, // TAO_AV_frame_info *frame_info = 0); -// virtual int destroy (void); +// virtual int destroy (); // // end the stream. // private: @@ -250,8 +250,8 @@ class TAO_AV_UDP_QoS_Connector class TAO_AV_UDP_QoS_Flow_Factory : public TAO_AV_Flow_Protocol_Factory { public: - TAO_AV_UDP_QoS_Flow_Factory (void); - virtual ~TAO_AV_UDP_QoS_Flow_Factory (void); + TAO_AV_UDP_QoS_Flow_Factory (); + virtual ~TAO_AV_UDP_QoS_Flow_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); /// Initialization hook. virtual int match_protocol (const char *flow_string); @@ -267,8 +267,8 @@ class TAO_AV_UDP_QoS_Flow_Factory : public TAO_AV_Flow_Protocol_Factory class TAO_AV_UDP_QoS_Session_Helper { public: - TAO_AV_UDP_QoS_Session_Helper (void); - ~TAO_AV_UDP_QoS_Session_Helper (void); + TAO_AV_UDP_QoS_Session_Helper (); + ~TAO_AV_UDP_QoS_Session_Helper (); /// Open a QoS Session with the specified address ACE_QoS_Session* open_qos_session (TAO_AV_UDP_QoS_Flow_Handler *handler, diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl index 2961bdac0d5c0..eae0a699a6d93 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_SOCK_Dgram_Mcast_QoS * -TAO_AV_UDP_QoS_Flow_Handler::get_socket (void) +TAO_AV_UDP_QoS_Flow_Handler::get_socket () { return &this->qos_sock_dgram_; } @@ -22,7 +22,7 @@ TAO_AV_UDP_QoS_Flow_Handler::open (ACE_Addr &address) } ACE_INLINE ACE_QoS_Session* -TAO_AV_UDP_QoS_Flow_Handler::qos_session (void) +TAO_AV_UDP_QoS_Flow_Handler::qos_session () { return this->qos_session_; } @@ -46,7 +46,7 @@ TAO_AV_UDP_QoS_Flow_Handler::endpoint (TAO_Base_StreamEndPoint *endpoint) } ACE_INLINE TAO_Base_StreamEndPoint * -TAO_AV_UDP_QoS_Flow_Handler::endpoint (void) +TAO_AV_UDP_QoS_Flow_Handler::endpoint () { return this->endpoint_; } @@ -58,7 +58,7 @@ TAO_AV_UDP_QoS_Flow_Handler::flowspec_entry (TAO_FlowSpec_Entry *entry) } ACE_INLINE TAO_FlowSpec_Entry * -TAO_AV_UDP_QoS_Flow_Handler::flowspec_entry (void) +TAO_AV_UDP_QoS_Flow_Handler::flowspec_entry () { return this->entry_; } @@ -70,7 +70,7 @@ TAO_AV_UDP_QoS_Flow_Handler::av_core (TAO_AV_Core *avcore) } ACE_INLINE TAO_AV_Core * -TAO_AV_UDP_QoS_Flow_Handler::av_core (void) +TAO_AV_UDP_QoS_Flow_Handler::av_core () { return this->av_core_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index feb571fe88605..7fad90c6c9211 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -177,7 +177,6 @@ TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, } first_rtcp_packet = 0; - } if (more != 0) @@ -330,7 +329,6 @@ TAO_AV_RTCP::rtcp_interval (int members, } - // TAO_AV_RTCP_Flow_Factory TAO_AV_RTCP_Flow_Factory::TAO_AV_RTCP_Flow_Factory () { @@ -437,7 +435,6 @@ TAO_AV_RTCP_Object::TAO_AV_RTCP_Object (TAO_AV_Callback *client_cb, { rtcp_cb = &this->rtcp_cb_; this->client_cb_ = client_cb; - } TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object () diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 24d3b48a5099b..c9ed999f8a585 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -114,8 +114,8 @@ class TAO_AV_Export TAO_AV_RTCP_Flow_Factory :public TAO_AV_Flow_Protocol_Factory { public: - TAO_AV_RTCP_Flow_Factory (void); - virtual ~TAO_AV_RTCP_Flow_Factory (void); + TAO_AV_RTCP_Flow_Factory (); + virtual ~TAO_AV_RTCP_Flow_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, @@ -134,16 +134,16 @@ class TAO_AV_Export TAO_AV_RTCP_Callback : public TAO_AV_Callback { public: /// RTCP callback. - TAO_AV_RTCP_Callback (void); + TAO_AV_RTCP_Callback (); /// virtual destructor. - virtual ~TAO_AV_RTCP_Callback (void); + virtual ~TAO_AV_RTCP_Callback (); /// Called during Streamctrl->start. - virtual int handle_start (void); + virtual int handle_start (); /// Called during Streamctrl->stop. - virtual int handle_stop (void); + virtual int handle_stop (); /// Called during timeout for Flow Producers. virtual int handle_timeout (void *arg); @@ -159,7 +159,7 @@ class TAO_AV_Export TAO_AV_RTCP_Callback : public TAO_AV_Callback /// Called during Streamctrl->destroy i.e tear_down of the stream /// @@coryan:Call it handle_destroy or handle_close. - virtual int handle_destroy (void); + virtual int handle_destroy (); /// Called to get the timeout. If tv is 0 then the framework stop /// calling this. @@ -168,7 +168,7 @@ class TAO_AV_Export TAO_AV_RTCP_Callback : public TAO_AV_Callback int send_report(int bye); void schedule (int ms); - TAO_AV_RTP_State *state (void); + TAO_AV_RTP_State *state (); void ts_offset (ACE_UINT32 offset); protected: @@ -199,9 +199,9 @@ class TAO_AV_Export TAO_AV_RTCP_Object TAO_AV_Transport *transport = 0); /// Destructor - virtual ~TAO_AV_RTCP_Object (void); + virtual ~TAO_AV_RTCP_Object (); - virtual int handle_input (void); + virtual int handle_input (); virtual int handle_control_input (ACE_Message_Block *frame, const ACE_Addr &peer_address); virtual int handle_control_output (ACE_Message_Block *frame); @@ -210,8 +210,8 @@ class TAO_AV_Export TAO_AV_RTCP_Object virtual int set_policies (const TAO_AV_PolicyList &policy_list); /// start/stop the flow. - virtual int start (void); - virtual int stop (void); + virtual int start (); + virtual int stop (); /// send a data frame. virtual int send_frame (ACE_Message_Block *frame, @@ -226,10 +226,10 @@ class TAO_AV_Export TAO_AV_RTCP_Object size_t len); /// end the stream. - virtual int destroy (void); + virtual int destroy (); void ssrc (ACE_UINT32 ssrc) {this->ssrc_ = ssrc; } - ACE_UINT32 ssrc (void) { return this->ssrc_; } + ACE_UINT32 ssrc () { return this->ssrc_; } void ts_offset (ACE_UINT32 ts_offset); diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h index c19c7fe86cd24..fffb2dc60fb91 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h @@ -40,13 +40,13 @@ class RTCP_Channel_In const ACE_Addr *peer_addr); /// Takes statistics of incoming RTP traffic and creates a receiver report block. - RR_Block *getRRBlock(void); + RR_Block *getRRBlock(); /// Returns the delay since last sender report. - ACE_UINT32 dlsr (void); + ACE_UINT32 dlsr (); /// Returns the last sender report timestamp. - ACE_UINT32 lsr (void); + ACE_UINT32 lsr (); /// Updates channel information with incoming sender report. int updateStatistics(RTCP_SR_Packet *sr); @@ -55,14 +55,14 @@ class RTCP_Channel_In int updateStatistics(RTCP_RR_Packet *rr); /// Returns 1 if data has been sent since the last report, 0 if not. - int sender (void) { return this->data_since_last_report_; } + int sender () { return this->data_since_last_report_; } /// Returns 1 if this is an active source, 0 if not. - int active (void) { return this->active_; } + int active () { return this->active_; } private: /// Don't want default constructor. - RTCP_Channel_In(void); + RTCP_Channel_In(); /// Don't want copy constructor. RTCP_Channel_In(const RTCP_Channel_In &ch); @@ -166,31 +166,31 @@ class RTCP_Channel_Out { public: /// Constructor. - RTCP_Channel_Out(void); + RTCP_Channel_Out(); /// Destructor. - ~RTCP_Channel_Out(void); + ~RTCP_Channel_Out(); /// Update the channel statistics each time an RTP packet is sent. void updateStatistics (RTP_Packet *pkt); /// Returns the timestamp of the last RTP packet sent. - ACE_UINT32 timestamp (void); + ACE_UINT32 timestamp (); /// Returns the number of packets sent. - ACE_UINT32 packets_sent (void); + ACE_UINT32 packets_sent (); /// Returns the number of octets sent. - ACE_UINT32 octets_sent (void); + ACE_UINT32 octets_sent (); /// Sets the canonical name of the source. void cname (const char *cname) { this->cname_ = cname; } /// Returns the canonical name of the source. - const char *cname (void) { return this->cname_.c_str(); } + const char *cname () { return this->cname_.c_str(); } /// Returns whether or not this source is active. - char active (void); + char active (); private: /// Holds the canonical name for this channel. diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 9423eef309a98..f346476b93931 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -66,7 +66,6 @@ RTCP_Packet::is_valid (char is_first) } return 1; - } /* @@ -143,7 +142,6 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(char* buffer, int *len) index++; ACE_OS::memcpy(this->reason_, &buffer[index], this->reason_length_); index+=this->reason_length_; - } else this->reason_length_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h index 4fe56cc5b308d..e12627729dabb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h @@ -43,7 +43,7 @@ class RTCP_Packet { public: /// Constructor for outgoing RTCP packets. - RTCP_Packet(void); + RTCP_Packet(); /// Constructor for incoming RTCP packets. RTCP_Packet(char *buffer); @@ -56,7 +56,7 @@ class RTCP_Packet /// Returns the size of the packet. /// Defined in child class. - virtual unsigned int packet_size(void) = 0; + virtual unsigned int packet_size() = 0; /// Checks the validity of an RTCP packet. RTCP packets can be sent /// together in a compound packet and is_first indicates the first packet @@ -72,7 +72,7 @@ class RTCP_Packet /// Used to create the byte representation of the RTCP packet. /// Defined in child class. - virtual void build_packet(void) = 0; + virtual void build_packet() = 0; }; /** @@ -95,10 +95,10 @@ class RTCP_BYE_Packet : public RTCP_Packet int *len); /// Destructor. - virtual ~RTCP_BYE_Packet (void); + virtual ~RTCP_BYE_Packet (); /// Returns the size of the packet in bytes. - unsigned int packet_size (void); + unsigned int packet_size (); /// Returns a pointer to a local list of synchronization source ids that are /// leaving the session. @@ -106,10 +106,10 @@ class RTCP_BYE_Packet : public RTCP_Packet unsigned char &length); /// Returns the reason for leaving the session. - const char *reason (void); + const char *reason (); /// Prints the contents of the packet. - void dump (void); + void dump (); private: /// Used to create the byte representation of the RTCP packet. @@ -180,20 +180,20 @@ class RTCP_RR_Packet : public RTCP_Packet RTCP_RR_Packet (ACE_UINT32 ssrc, RR_Block *blocks); /// Destructor. - virtual ~RTCP_RR_Packet (void); + virtual ~RTCP_RR_Packet (); /// Returns the size of the packet in bytes. - unsigned int packet_size(void); + unsigned int packet_size(); /// Returns the synchronization source id of the source sending this packet. - ACE_INT32 ssrc (void) { return this->ssrc_; } + ACE_INT32 ssrc () { return this->ssrc_; } /// Prints the contents of the packet. - void dump (void); + void dump (); private: /// Used to create the byte representation of the RTCP packet. - void build_packet(void); + void build_packet(); /// The synchronization source id of the sender of this report. ACE_UINT32 ssrc_; @@ -278,10 +278,10 @@ class RTCP_SDES_Packet : public RTCP_Packet RTCP_SDES_Packet(char* buffer, int *len); /// Constructor for outgoing SDES packets. - RTCP_SDES_Packet(void); + RTCP_SDES_Packet(); /// Destructor. - virtual ~RTCP_SDES_Packet(void); + virtual ~RTCP_SDES_Packet(); /// This will add a standard item of type and length for the ssrc specified. /// When the first item for a ssrc is added, a chunk is created. Subsequent @@ -303,19 +303,19 @@ class RTCP_SDES_Packet : public RTCP_Packet const char *data); /// Returns the size of the packet in bytes. - unsigned int packet_size(void); + unsigned int packet_size(); /// Prints the contents of the packet. - void dump (void); + void dump (); /// This returns the synchronization source id for this packet. This assumes /// that this source is only receiving messages from end systems (i.e. only /// one source id per SDES) - ACE_UINT32 ssrc (void) { return this->chunk_->ssrc_; } + ACE_UINT32 ssrc () { return this->chunk_->ssrc_; } private: /// Used to create the byte representation of the RTCP packet. - void build_packet(void); + void build_packet(); /// Add a chunk to the packet. void add_chunk(ACE_UINT32 ssrc); @@ -354,26 +354,26 @@ class RTCP_SR_Packet : public RTCP_Packet RR_Block *rrBlocks); /// Destructor - virtual ~RTCP_SR_Packet(void); + virtual ~RTCP_SR_Packet(); /// Returns the size of the packet in bytes. - unsigned int packet_size(void); + unsigned int packet_size(); /// Returns the synchronization source id for the sender of this packet. - ACE_UINT32 ssrc (void) { return this->ssrc_; } + ACE_UINT32 ssrc () { return this->ssrc_; } /// Returns the most significant word of the NTP timestamp. - ACE_UINT32 ntp_ts_msw (void) { return this->ntp_ts_msw_; } + ACE_UINT32 ntp_ts_msw () { return this->ntp_ts_msw_; } /// Returns the least significant word of the NTP timestamp. - ACE_UINT32 ntp_ts_lsw (void) { return this->ntp_ts_lsw_; } + ACE_UINT32 ntp_ts_lsw () { return this->ntp_ts_lsw_; } /// Prints the contents of the packet. - void dump (void); + void dump (); private: /// Used to create the byte representation of the RTCP packet. - void build_packet(void); + void build_packet(); /// The synchronization source id of the sender generating this report. ACE_UINT32 ssrc_; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index ea8d3821ac7e9..52355672fa4de 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -239,7 +239,6 @@ class TAO_AV_Export TAO_AV_RTP unsigned char ebit; ACE_UINT16 blkno; }; - }; /** @@ -268,50 +267,50 @@ class RTP_Packet ACE_UINT16 dataSize); /// Destructor - ~RTP_Packet(void); + ~RTP_Packet(); /// Returns the size of the RTP packet in bytes. - ACE_UINT16 packet_size(void); + ACE_UINT16 packet_size(); /// Returns the size of the payload in bytes. - ACE_UINT16 payload_size(void); + ACE_UINT16 payload_size(); /// Populates the passed in frame_info. void get_frame_info (TAO_AV_frame_info *frame_info); /// Returns 1 if packet is valid and 0 if not. - int is_valid (void); + int is_valid (); /// Returns the RTP version of the packet. - unsigned int ver (void); + unsigned int ver (); /// Returns 1 if the padding bit is set, 0 if not. - unsigned int pad (void); + unsigned int pad (); /// Returns 1 if the header extension bit is set, 0 if not. - unsigned int ext (void); + unsigned int ext (); /// Returns the number of bytes in the header extension or 0 if no extension. - unsigned int ext_bytes (void); + unsigned int ext_bytes (); /// Returns the contributing source count. /// This should only be non-zero for mixers. - unsigned int cc (void); + unsigned int cc (); /// Returns 1 if the marker bit is set, 0 if not. - unsigned int mrk (void); + unsigned int mrk (); /// Returns the payload type of the packet. - unsigned int pt (void); + unsigned int pt (); /// Returns the sequence number of the packet. - ACE_UINT16 sn (void); + ACE_UINT16 sn (); /// Returns the timestamp of the packet. - ACE_UINT32 ts (void); + ACE_UINT32 ts (); /// Returns the synchronization source id of the packet. - ACE_UINT32 ssrc (void); + ACE_UINT32 ssrc (); /// Returns a pointer to the local contributing source list and its length. /// This should be empty except for mixers. @@ -358,11 +357,11 @@ class TAO_AV_Export TAO_AV_RTP_Object : public TAO_AV_Protocol_Object TAO_AV_RTP_Object (TAO_AV_Callback *callback, TAO_AV_Transport *transport); - virtual ~TAO_AV_RTP_Object (void); + virtual ~TAO_AV_RTP_Object (); - virtual int start (void); - virtual int stop (void); - virtual int handle_input (void); + virtual int start (); + virtual int stop (); + virtual int handle_input (); virtual int send_frame (ACE_Message_Block *frame, TAO_AV_frame_info *frame_info = 0); @@ -373,7 +372,7 @@ class TAO_AV_Export TAO_AV_RTP_Object : public TAO_AV_Protocol_Object virtual int send_frame (const char*buf, size_t len); - virtual int destroy (void); + virtual int destroy (); virtual int set_policies (const TAO_AV_PolicyList &policy_list); virtual void control_object (TAO_AV_Protocol_Object *object); @@ -391,7 +390,6 @@ class TAO_AV_Export TAO_AV_RTP_Object : public TAO_AV_Protocol_Object }; - /** * @class TAO_AV_RTP_Flow_Factory * @brief @@ -400,15 +398,15 @@ class TAO_AV_Export TAO_AV_RTP_Flow_Factory : public TAO_AV_Flow_Protocol_Factor { public: /// Initialization hook. - TAO_AV_RTP_Flow_Factory (void); - virtual ~TAO_AV_RTP_Flow_Factory (void); + TAO_AV_RTP_Flow_Factory (); + virtual ~TAO_AV_RTP_Flow_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, TAO_AV_Flow_Handler *handler, TAO_AV_Transport *transport); - virtual const char*control_flow_factory (void); + virtual const char*control_flow_factory (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h index 374aa83731f28..4aebea969d3a1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h @@ -35,14 +35,12 @@ class TAO_AV_Export TAO_AV_Resource_Factory : public ACE_Service_Object { public: - /** * @name Service Configurator Hooks */ //@{ /// Dynamic linking hook virtual int init (int argc, ACE_TCHAR *argv[]) = 0; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp index d70ef01bb09d0..1a7cc09f55cf0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_AV_SCTP_SEQ_Transport //------------------------------------------------------------ -TAO_AV_SCTP_SEQ_Transport::TAO_AV_SCTP_SEQ_Transport (void) +TAO_AV_SCTP_SEQ_Transport::TAO_AV_SCTP_SEQ_Transport () :handler_ (0) { } @@ -24,7 +24,7 @@ TAO_AV_SCTP_SEQ_Transport::TAO_AV_SCTP_SEQ_Transport (TAO_AV_SCTP_SEQ_Flow_Handl { } -TAO_AV_SCTP_SEQ_Transport::~TAO_AV_SCTP_SEQ_Transport (void) +TAO_AV_SCTP_SEQ_Transport::~TAO_AV_SCTP_SEQ_Transport () { } @@ -35,19 +35,19 @@ TAO_AV_SCTP_SEQ_Transport::open (ACE_Addr * /*address*/) } int -TAO_AV_SCTP_SEQ_Transport::close (void) +TAO_AV_SCTP_SEQ_Transport::close () { return 0; } int -TAO_AV_SCTP_SEQ_Transport::mtu (void) +TAO_AV_SCTP_SEQ_Transport::mtu () { return 0; } ACE_Addr* -TAO_AV_SCTP_SEQ_Transport::get_peer_addr (void) +TAO_AV_SCTP_SEQ_Transport::get_peer_addr () { return 0; } @@ -221,11 +221,11 @@ TAO_AV_SCTP_SEQ_Base_Acceptor::make_svc_handler (TAO_AV_SCTP_SEQ_Flow_Handler *& // TAO_AV_SCTP_SEQ_Acceptor //------------------------------------------------------------ -TAO_AV_SCTP_SEQ_Acceptor::TAO_AV_SCTP_SEQ_Acceptor (void) +TAO_AV_SCTP_SEQ_Acceptor::TAO_AV_SCTP_SEQ_Acceptor () { } -TAO_AV_SCTP_SEQ_Acceptor::~TAO_AV_SCTP_SEQ_Acceptor (void) +TAO_AV_SCTP_SEQ_Acceptor::~TAO_AV_SCTP_SEQ_Acceptor () { } @@ -354,7 +354,7 @@ TAO_AV_SCTP_SEQ_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, int -TAO_AV_SCTP_SEQ_Acceptor::close (void) +TAO_AV_SCTP_SEQ_Acceptor::close () { return 0; } @@ -404,11 +404,11 @@ TAO_AV_SCTP_SEQ_Base_Connector::connector_connect (TAO_AV_SCTP_SEQ_Flow_Handler //------------------------------------------------------------ // TAO_AV_SCTP_SEQ_Connector //------------------------------------------------------------ -TAO_AV_SCTP_SEQ_Connector::TAO_AV_SCTP_SEQ_Connector (void) +TAO_AV_SCTP_SEQ_Connector::TAO_AV_SCTP_SEQ_Connector () { } -TAO_AV_SCTP_SEQ_Connector::~TAO_AV_SCTP_SEQ_Connector (void) +TAO_AV_SCTP_SEQ_Connector::~TAO_AV_SCTP_SEQ_Connector () { } @@ -566,7 +566,7 @@ TAO_AV_SCTP_SEQ_Connector::connect (TAO_FlowSpec_Entry *entry, } int -TAO_AV_SCTP_SEQ_Connector::close (void) +TAO_AV_SCTP_SEQ_Connector::close () { return 0; } @@ -576,11 +576,11 @@ TAO_AV_SCTP_SEQ_Connector::close (void) //------------------------------------------------------------ -TAO_AV_SCTP_SEQ_Factory::TAO_AV_SCTP_SEQ_Factory (void) +TAO_AV_SCTP_SEQ_Factory::TAO_AV_SCTP_SEQ_Factory () { } -TAO_AV_SCTP_SEQ_Factory::~TAO_AV_SCTP_SEQ_Factory (void) +TAO_AV_SCTP_SEQ_Factory::~TAO_AV_SCTP_SEQ_Factory () { } @@ -594,7 +594,7 @@ TAO_AV_SCTP_SEQ_Factory::match_protocol (const char *protocol_string) } TAO_AV_Acceptor* -TAO_AV_SCTP_SEQ_Factory::make_acceptor (void) +TAO_AV_SCTP_SEQ_Factory::make_acceptor () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Factory::make_acceptor\n")); @@ -606,7 +606,7 @@ TAO_AV_SCTP_SEQ_Factory::make_acceptor (void) } TAO_AV_Connector* -TAO_AV_SCTP_SEQ_Factory::make_connector (void) +TAO_AV_SCTP_SEQ_Factory::make_connector () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Factory::make_connector\n")); @@ -621,7 +621,6 @@ TAO_AV_SCTP_SEQ_Factory::make_connector (void) int TAO_AV_SCTP_SEQ_Factory::init (int, ACE_TCHAR *[]) { - return 0; } @@ -630,7 +629,7 @@ TAO_AV_SCTP_SEQ_Factory::init (int, ACE_TCHAR *[]) //------------------------------------------------------------ int -TAO_AV_SCTP_SEQ_Object::handle_input (void) +TAO_AV_SCTP_SEQ_Object::handle_input () { int n = this->transport_->recv (this->frame_.rd_ptr (), this->frame_.size ()); @@ -676,12 +675,12 @@ TAO_AV_SCTP_SEQ_Object::TAO_AV_SCTP_SEQ_Object (TAO_AV_Callback *callback, this->frame_.size (BUFSIZ); } -TAO_AV_SCTP_SEQ_Object::~TAO_AV_SCTP_SEQ_Object (void) +TAO_AV_SCTP_SEQ_Object::~TAO_AV_SCTP_SEQ_Object () { // No-op } int -TAO_AV_SCTP_SEQ_Object::destroy (void) +TAO_AV_SCTP_SEQ_Object::destroy () { this->callback_->handle_destroy (); delete this; @@ -699,13 +698,13 @@ TAO_AV_SCTP_SEQ_Flow_Handler::TAO_AV_SCTP_SEQ_Flow_Handler (TAO_AV_Callback * /* TAO_AV_SCTP_SEQ_Transport (this)); } -TAO_AV_SCTP_SEQ_Flow_Handler::~TAO_AV_SCTP_SEQ_Flow_Handler (void) +TAO_AV_SCTP_SEQ_Flow_Handler::~TAO_AV_SCTP_SEQ_Flow_Handler () { delete this->transport_; } TAO_AV_Transport * -TAO_AV_SCTP_SEQ_Flow_Handler::transport (void) +TAO_AV_SCTP_SEQ_Flow_Handler::transport () { return this->transport_; } @@ -727,7 +726,6 @@ TAO_AV_SCTP_SEQ_Flow_Handler::change_qos (AVStreams::QoS qos) int dscp_flag=0; for(i=0; i < qos.QoSParams.length(); i++) { - if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0) { qos.QoSParams[i].property_value >>= dscp; @@ -849,11 +847,11 @@ TAO_AV_SCTP_SEQ_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, //------------------------------------------------------------ // TAO_AV_SCTP_SEQ_Flow_Factory //------------------------------------------------------------ -TAO_AV_SCTP_SEQ_Flow_Factory::TAO_AV_SCTP_SEQ_Flow_Factory (void) +TAO_AV_SCTP_SEQ_Flow_Factory::TAO_AV_SCTP_SEQ_Flow_Factory () { } -TAO_AV_SCTP_SEQ_Flow_Factory::~TAO_AV_SCTP_SEQ_Flow_Factory (void) +TAO_AV_SCTP_SEQ_Flow_Factory::~TAO_AV_SCTP_SEQ_Flow_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h index 17ca39012f562..bde2dbdf45109 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h @@ -44,12 +44,12 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Factory : public TAO_AV_Transport_Factory { public: /// Initialization hook. - TAO_AV_SCTP_SEQ_Factory (void); - virtual ~TAO_AV_SCTP_SEQ_Factory (void); + TAO_AV_SCTP_SEQ_Factory (); + virtual ~TAO_AV_SCTP_SEQ_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); - virtual TAO_AV_Acceptor *make_acceptor (void); - virtual TAO_AV_Connector *make_connector (void); + virtual TAO_AV_Acceptor *make_acceptor (); + virtual TAO_AV_Connector *make_connector (); }; class TAO_AV_SCTP_SEQ_Flow_Handler; @@ -63,18 +63,18 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Transport :public TAO_AV_Transport { public: - TAO_AV_SCTP_SEQ_Transport (void); + TAO_AV_SCTP_SEQ_Transport (); TAO_AV_SCTP_SEQ_Transport (TAO_AV_SCTP_SEQ_Flow_Handler *handler); - virtual ~TAO_AV_SCTP_SEQ_Transport (void); + virtual ~TAO_AV_SCTP_SEQ_Transport (); virtual int open (ACE_Addr *addr); - virtual int close (void); + virtual int close (); - virtual int mtu (void); + virtual int mtu (); - virtual ACE_Addr *get_peer_addr (void); + virtual ACE_Addr *get_peer_addr (); /// Write the complete Message_Block chain to the connection. virtual ssize_t send (const ACE_Message_Block *mblk, @@ -106,7 +106,7 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Transport int iovcnt, ACE_Time_Value *s = 0); - TAO_AV_SCTP_SEQ_Flow_Handler *handler (void) { return this->handler_; } + TAO_AV_SCTP_SEQ_Flow_Handler *handler () { return this->handler_; } protected: TAO_AV_SCTP_SEQ_Flow_Handler *handler_; @@ -123,12 +123,12 @@ class TAO_AV_SCTP_SEQ_Flow_Handler { public: TAO_AV_SCTP_SEQ_Flow_Handler (TAO_AV_Callback *callback = 0); - virtual ~TAO_AV_SCTP_SEQ_Flow_Handler (void); - virtual TAO_AV_Transport *transport (void); + virtual ~TAO_AV_SCTP_SEQ_Flow_Handler (); + virtual TAO_AV_Transport *transport (); virtual int open (void * = 0); virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); - virtual ACE_Event_Handler* event_handler (void){ return this; } + virtual ACE_Event_Handler* event_handler () { return this; } /// Change the QoS virtual int change_qos (AVStreams::QoS); @@ -163,8 +163,8 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Acceptor :public TAO_AV_Acceptor { public: - TAO_AV_SCTP_SEQ_Acceptor (void); - virtual ~TAO_AV_SCTP_SEQ_Acceptor (void); + TAO_AV_SCTP_SEQ_Acceptor (); + virtual ~TAO_AV_SCTP_SEQ_Acceptor (); virtual int open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_FlowSpec_Entry *entry, @@ -179,7 +179,7 @@ class TAO_AV_Export TAO_AV_SCTP_SEQ_Acceptor TAO_AV_Core::Flow_Component flow_comp = TAO_AV_Core::TAO_AV_DATA); - virtual int close (void); + virtual int close (); virtual int make_svc_handler (TAO_AV_SCTP_SEQ_Flow_Handler *&handler); protected: @@ -217,8 +217,8 @@ class TAO_AV_SCTP_SEQ_Base_Connector : public ACE_Connector acceptors_.insert (acceptor); entry->protocol_object ()->control_object (entry->control_protocol_object ()); - } else ORBSVCS_ERROR_RETURN ((LM_ERROR, @@ -386,7 +384,6 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, if (control_flow_factory_name != 0) { - TAO_AV_Flow_Protocol_Factory *control_flow_factory = av_core->get_flow_protocol_factory (control_flow_factory_name); diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index c414a81dbb670..e9eba73347ce1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -49,10 +49,10 @@ class TAO_AV_Export TAO_AV_Transport_Item /// Return a reference to the character representation of the Transport /// factories name. - const ACE_CString &name (void); + const ACE_CString &name (); /// Return a pointer to the Transport factory. - TAO_AV_Transport_Factory *factory (void); + TAO_AV_Transport_Factory *factory (); /// Set the factory pointer's valus. void factory (TAO_AV_Transport_Factory *factory); @@ -80,10 +80,10 @@ class TAO_AV_Export TAO_AV_Flow_Protocol_Item /// return a reference to the character representation of the Flow_Protocol /// factories name. - const ACE_CString &name (void); + const ACE_CString &name (); /// return a pointer to the Flow_Protocol factory. - TAO_AV_Flow_Protocol_Factory *factory (void); + TAO_AV_Flow_Protocol_Factory *factory (); /// set the factory pointer's valus. void factory (TAO_AV_Flow_Protocol_Factory *factory); @@ -104,22 +104,22 @@ class TAO_AV_Export TAO_AV_Flow_Handler { public: /// Constructor. - TAO_AV_Flow_Handler (void); + TAO_AV_Flow_Handler (); - virtual ~TAO_AV_Flow_Handler (void); + virtual ~TAO_AV_Flow_Handler (); /// Start/stop the flow handler. virtual int start (TAO_FlowSpec_Entry::Role role); virtual int stop (TAO_FlowSpec_Entry::Role role); /// Schedule timer. Uses the get_timeout method on the callback. - virtual int schedule_timer (void); - virtual int cancel_timer (void); + virtual int schedule_timer (); + virtual int cancel_timer (); /// get the transport. - TAO_AV_Transport *transport (void); + TAO_AV_Transport *transport (); /// set/get protocol_object. - TAO_AV_Protocol_Object* protocol_object (void); + TAO_AV_Protocol_Object* protocol_object (); void protocol_object (TAO_AV_Protocol_Object *protocol_object); /// set the callback. @@ -132,7 +132,7 @@ class TAO_AV_Export TAO_AV_Flow_Handler virtual int set_remote_address (ACE_Addr *address); /// get the underlying event handler. To be overridden by the derived clases. - virtual ACE_Event_Handler* event_handler (void) = 0; + virtual ACE_Event_Handler* event_handler () = 0; virtual int change_qos (AVStreams::QoS); @@ -155,18 +155,18 @@ class TAO_AV_Export TAO_AV_Flow_Handler class TAO_AV_Export TAO_AV_Transport { public: - TAO_AV_Transport (void); + TAO_AV_Transport (); - virtual ~TAO_AV_Transport (void); + virtual ~TAO_AV_Transport (); virtual int open (ACE_Addr *address) = 0; - virtual int close (void) = 0; + virtual int close () = 0; /// Write the complete Message_Block chain to the connection. - virtual int mtu (void) = 0; - virtual ACE_Addr *get_peer_addr (void) = 0; - virtual ACE_Addr *get_local_addr (void); + virtual int mtu () = 0; + virtual ACE_Addr *get_peer_addr () = 0; + virtual ACE_Addr *get_local_addr (); virtual ssize_t send (const ACE_Message_Block *mblk, ACE_Time_Value *s = 0) = 0; @@ -208,8 +208,8 @@ class TAO_FlowSpec_Entry; class TAO_AV_Export TAO_AV_Acceptor { public: - TAO_AV_Acceptor (void); - virtual ~TAO_AV_Acceptor (void); + TAO_AV_Acceptor (); + virtual ~TAO_AV_Acceptor (); virtual int open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_FlowSpec_Entry *entry, @@ -223,7 +223,7 @@ class TAO_AV_Export TAO_AV_Acceptor TAO_AV_Core::Flow_Component flow_comp) = 0; const char *flowname (); - virtual int close (void) = 0; + virtual int close () = 0; protected: ACE_CString flowname_; TAO_AV_Core *av_core_; @@ -237,9 +237,9 @@ class TAO_AV_Export TAO_AV_Acceptor class TAO_AV_Export TAO_AV_Connector { public: - TAO_AV_Connector (void); - virtual ~TAO_AV_Connector (void); - const char *flowname (void); + TAO_AV_Connector (); + virtual ~TAO_AV_Connector (); + const char *flowname (); virtual int open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, @@ -249,7 +249,7 @@ class TAO_AV_Export TAO_AV_Connector TAO_AV_Transport *&transport, TAO_AV_Core::Flow_Component flow_component) = 0; - virtual int close (void) = 0; + virtual int close () = 0; protected: ACE_CString flowname_; }; @@ -270,15 +270,15 @@ class TAO_AV_Export TAO_AV_Connector_Registry * TAO_AV_Connector *get_connector (TAO_AV_Core::Protocol protocol); * Return the connector bridges */ - TAO_AV_Connector_Registry (void); - ~TAO_AV_Connector_Registry (void); + TAO_AV_Connector_Registry (); + ~TAO_AV_Connector_Registry (); int open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_AV_FlowSpecSet &flow_spec_set); int close (TAO_AV_Connector *connector); - int close_all (void); - TAO_AV_ConnectorSetItor begin (void); - TAO_AV_ConnectorSetItor end (void); + int close_all (); + TAO_AV_ConnectorSetItor begin (); + TAO_AV_ConnectorSetItor end (); protected: TAO_AV_ConnectorSet connectors_; }; @@ -293,15 +293,15 @@ typedef ACE_Unbounded_Set_Iterator TAO_AV_AcceptorSetItor; class TAO_AV_Export TAO_AV_Acceptor_Registry { public: - TAO_AV_Acceptor_Registry (void); - ~TAO_AV_Acceptor_Registry (void); + TAO_AV_Acceptor_Registry (); + ~TAO_AV_Acceptor_Registry (); int open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_AV_FlowSpecSet &flow_spec_set); int close (TAO_AV_Acceptor *acceptor); - int close_all (void); - TAO_AV_AcceptorSetItor begin (void); - TAO_AV_AcceptorSetItor end (void); + int close_all (); + TAO_AV_AcceptorSetItor begin (); + TAO_AV_AcceptorSetItor end (); protected: int open_default (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, @@ -317,12 +317,12 @@ class TAO_AV_Export TAO_AV_Transport_Factory : public ACE_Service_Object { public: /// Initialization hook. - TAO_AV_Transport_Factory (void); - virtual ~TAO_AV_Transport_Factory (void); + TAO_AV_Transport_Factory (); + virtual ~TAO_AV_Transport_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); - virtual TAO_AV_Acceptor *make_acceptor (void); - virtual TAO_AV_Connector *make_connector (void); + virtual TAO_AV_Acceptor *make_acceptor (); + virtual TAO_AV_Connector *make_connector (); int ref_count; }; diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.inl b/TAO/orbsvcs/orbsvcs/AV/Transport.inl index 7c78c72c1f882..3deba20196bfd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.inl +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.inl @@ -6,14 +6,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL //------------------------------------------------------------ ACE_INLINE const ACE_CString & -TAO_AV_Transport_Item::name (void) +TAO_AV_Transport_Item::name () { return this->name_; } ACE_INLINE TAO_AV_Transport_Factory * -TAO_AV_Transport_Item::factory (void) +TAO_AV_Transport_Item::factory () { return this->factory_; } @@ -31,14 +31,14 @@ TAO_AV_Transport_Item::factory (TAO_AV_Transport_Factory *factory) //------------------------------------------------------------ ACE_INLINE const ACE_CString & -TAO_AV_Flow_Protocol_Item::name (void) +TAO_AV_Flow_Protocol_Item::name () { return this->name_; } ACE_INLINE TAO_AV_Flow_Protocol_Factory * -TAO_AV_Flow_Protocol_Item::factory (void) +TAO_AV_Flow_Protocol_Item::factory () { return this->factory_; } @@ -56,14 +56,14 @@ TAO_AV_Flow_Protocol_Item::factory (TAO_AV_Flow_Protocol_Factory *factory) ACE_INLINE TAO_AV_ConnectorSetItor -TAO_AV_Connector_Registry::begin (void) +TAO_AV_Connector_Registry::begin () { return this->connectors_.begin (); } ACE_INLINE TAO_AV_ConnectorSetItor -TAO_AV_Connector_Registry::end (void) +TAO_AV_Connector_Registry::end () { return this->connectors_.end (); } @@ -73,14 +73,14 @@ TAO_AV_Connector_Registry::end (void) //------------------------------------------------------------ ACE_INLINE TAO_AV_AcceptorSetItor -TAO_AV_Acceptor_Registry::begin (void) +TAO_AV_Acceptor_Registry::begin () { return this->acceptors_.begin (); } ACE_INLINE TAO_AV_AcceptorSetItor -TAO_AV_Acceptor_Registry::end (void) +TAO_AV_Acceptor_Registry::end () { return this->acceptors_.end (); } @@ -90,7 +90,7 @@ TAO_AV_Acceptor_Registry::end (void) //------------------------------------------------------------ ACE_INLINE const char * -TAO_AV_Acceptor::flowname (void) +TAO_AV_Acceptor::flowname () { return this->flowname_.c_str (); } @@ -100,7 +100,7 @@ TAO_AV_Acceptor::flowname (void) //------------------------------------------------------------ ACE_INLINE const char * -TAO_AV_Connector::flowname (void) +TAO_AV_Connector::flowname () { return this->flowname_.c_str (); } diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index d320d327028e1..2f19adac8bc8b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -94,7 +94,6 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) int dscp_flag=0; for(i=0; i < qos.QoSParams.length(); i++) { - if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0) { qos.QoSParams[i].property_value >>= dscp; @@ -280,7 +279,6 @@ TAO_AV_UDP_Transport::send (const iovec *iov, return this->handler_->get_socket ()->send ((const iovec *) iov, iovcnt, this->peer_addr_); - } ssize_t @@ -678,7 +676,6 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, control_inet_addr = dynamic_cast (entry->control_address ()) ; else { - if (local_addr != 0) { ACE_TCHAR buf [BUFSIZ]; diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index 7b482492ebc93..75dd1aa07220b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -28,12 +28,12 @@ class TAO_AV_Export TAO_AV_UDP_Factory : public TAO_AV_Transport_Factory { public: /// Initialization hook. - TAO_AV_UDP_Factory (void); - virtual ~TAO_AV_UDP_Factory (void); + TAO_AV_UDP_Factory (); + virtual ~TAO_AV_UDP_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); - virtual TAO_AV_Acceptor *make_acceptor (void); - virtual TAO_AV_Connector *make_connector (void); + virtual TAO_AV_Acceptor *make_acceptor (); + virtual TAO_AV_Connector *make_connector (); }; class TAO_AV_UDP_Flow_Handler; @@ -46,20 +46,19 @@ class TAO_AV_UDP_Flow_Handler; class TAO_AV_Export TAO_AV_UDP_Transport :public TAO_AV_Transport { - public: - TAO_AV_UDP_Transport (void); + TAO_AV_UDP_Transport (); TAO_AV_UDP_Transport (TAO_AV_UDP_Flow_Handler *handler); - virtual ~TAO_AV_UDP_Transport (void); + virtual ~TAO_AV_UDP_Transport (); virtual int open (ACE_Addr *addr); - virtual int close (void); + virtual int close (); - virtual int mtu (void); + virtual int mtu (); - virtual ACE_Addr *get_peer_addr (void); + virtual ACE_Addr *get_peer_addr (); virtual int set_remote_address (const ACE_INET_Addr &address); @@ -93,7 +92,7 @@ class TAO_AV_Export TAO_AV_UDP_Transport int iovcnt, ACE_Time_Value *s = 0); - TAO_AV_UDP_Flow_Handler *handler (void) { return this->handler_; } + TAO_AV_UDP_Flow_Handler *handler () { return this->handler_; } protected: TAO_AV_UDP_Flow_Handler *handler_; @@ -112,17 +111,17 @@ class TAO_AV_Export TAO_AV_UDP_Flow_Handler public: ///Ctor /// Dtor - TAO_AV_UDP_Flow_Handler (void); - virtual ~TAO_AV_UDP_Flow_Handler (void); + TAO_AV_UDP_Flow_Handler (); + virtual ~TAO_AV_UDP_Flow_Handler (); int open (ACE_Addr &address); - int close (void); - virtual TAO_AV_Transport *transport (void); + int close (); + virtual TAO_AV_Transport *transport (); virtual int set_remote_address (ACE_Addr *address); virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); const ACE_SOCK_Dgram *get_socket () const; - virtual ACE_Event_Handler* event_handler (void){ return this; } + virtual ACE_Event_Handler* event_handler () { return this; } /// Change the QoS virtual int change_qos (AVStreams::QoS); @@ -140,8 +139,8 @@ class TAO_AV_Export TAO_AV_UDP_Acceptor :public TAO_AV_Acceptor { public: - TAO_AV_UDP_Acceptor (void); - virtual ~TAO_AV_UDP_Acceptor (void); + TAO_AV_UDP_Acceptor (); + virtual ~TAO_AV_UDP_Acceptor (); virtual int open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_FlowSpec_Entry *entry, @@ -158,7 +157,7 @@ class TAO_AV_Export TAO_AV_UDP_Acceptor virtual int open_i (ACE_INET_Addr *address, int is_default_open); - virtual int close (void); + virtual int close (); virtual int activate_svc_handler (TAO_AV_Flow_Handler *handler); protected: @@ -178,8 +177,8 @@ class TAO_AV_Export TAO_AV_UDP_Connector :public TAO_AV_Connector { public: - TAO_AV_UDP_Connector (void); - ~TAO_AV_UDP_Connector (void); + TAO_AV_UDP_Connector (); + ~TAO_AV_UDP_Connector (); virtual int open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_AV_Flow_Protocol_Factory *factory); @@ -189,7 +188,7 @@ class TAO_AV_Export TAO_AV_UDP_Connector TAO_AV_Core::Flow_Component flow_comp = TAO_AV_Core::TAO_AV_DATA); virtual int activate_svc_handler (TAO_AV_Flow_Handler *handler); - virtual int close (void); + virtual int close (); protected: ACE_INET_Addr *control_inet_address_; bool delete_control_inet_address_; @@ -198,7 +197,6 @@ class TAO_AV_Export TAO_AV_UDP_Connector TAO_FlowSpec_Entry *entry_; TAO_AV_Flow_Protocol_Factory *flow_protocol_factory_; TAO_AV_Core::Flow_Component flow_component_; - }; /** @@ -233,9 +231,9 @@ class TAO_AV_Export TAO_AV_UDP_Object : public TAO_AV_Protocol_Object TAO_AV_Transport *transport = 0); /// Dtor - virtual ~TAO_AV_UDP_Object (void); + virtual ~TAO_AV_UDP_Object (); - virtual int handle_input (void); + virtual int handle_input (); /// send a data frame. virtual int send_frame (ACE_Message_Block *frame, @@ -249,7 +247,7 @@ class TAO_AV_Export TAO_AV_UDP_Object : public TAO_AV_Protocol_Object size_t len); /// end the stream. - virtual int destroy (void); + virtual int destroy (); private: /// Pre-allocated memory to receive the data... @@ -264,8 +262,8 @@ class TAO_AV_Export TAO_AV_UDP_Flow_Factory : public TAO_AV_Flow_Protocol_Factor { public: /// Initialization hook. - TAO_AV_UDP_Flow_Factory (void); - virtual ~TAO_AV_UDP_Flow_Factory (void); + TAO_AV_UDP_Flow_Factory (); + virtual ~TAO_AV_UDP_Flow_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.inl b/TAO/orbsvcs/orbsvcs/AV/UDP.inl index d1d330728fb34..1f88305680376 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.inl +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.inl @@ -21,7 +21,7 @@ TAO_AV_UDP_Flow_Handler::open (ACE_Addr &address) ACE_INLINE int -TAO_AV_UDP_Flow_Handler::close (void) +TAO_AV_UDP_Flow_Handler::close () { return this->sock_dgram_.close (); } diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 77b9e1542a718..ddba84bfa49c6 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -649,7 +649,6 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport, return -1; } return 1; - } int @@ -1093,7 +1092,6 @@ TAO_SFP_Object::set_policies (const TAO_AV_PolicyList& policies) policy = policies[i]; switch (policies[i]->type ()) { - case TAO_AV_SFP_CREDIT_POLICY: { TAO_AV_SFP_Credit_Policy *credit_policy = @@ -1270,7 +1268,6 @@ TAO_AV_SFP_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, break; case TAO_FlowSpec_Entry::TAO_AV_CONSUMER: { - ACE_NEW_RETURN (object, TAO_SFP_Consumer_Object (callback, transport, diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index c3023b5f10176..ea45cc9a3dacb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_SFP_Fragment_Node { public: - TAO_SFP_Fragment_Node (void) : data_ (0) {} + TAO_SFP_Fragment_Node () : data_ (0) {} flowProtocol::fragment fragment_info_; ACE_Message_Block *data_; friend bool operator< (const TAO_SFP_Fragment_Node& left, @@ -56,7 +56,7 @@ class TAO_SFP_Fragment_Node class TAO_SFP_Fragment_Table_Entry { public: - TAO_SFP_Fragment_Table_Entry (void) + TAO_SFP_Fragment_Table_Entry () :last_received_ (0), num_fragments_ (0) {} @@ -138,7 +138,7 @@ class TAO_AV_Export TAO_SFP_Base START_RECEIVED }; - TAO_SFP_Base (void); + TAO_SFP_Base (); static CORBA::Boolean start_frame (CORBA::Octet flags, flowProtocol::MsgType type, TAO_OutputCDR &msg); @@ -217,10 +217,10 @@ class TAO_AV_Export TAO_SFP_Object : public TAO_AV_Protocol_Object TAO_AV_Transport *transport); // We should add a sfp options parameter. - virtual ~TAO_SFP_Object (void); + virtual ~TAO_SFP_Object (); // Dtor - virtual int handle_input (void) = 0; + virtual int handle_input () = 0; virtual int send_frame (ACE_Message_Block *frame, TAO_AV_frame_info *frame_info = 0); @@ -231,7 +231,7 @@ class TAO_AV_Export TAO_SFP_Object : public TAO_AV_Protocol_Object virtual int send_frame (const char*buf, size_t len); - virtual int destroy (void); + virtual int destroy (); virtual int set_policies (const TAO_AV_PolicyList &policies); protected: @@ -256,7 +256,7 @@ class TAO_AV_Export TAO_SFP_Producer_Object : public TAO_SFP_Object TAO_SFP_Producer_Object (TAO_AV_Callback *callback, TAO_AV_Transport *transport, const char *flow_options); - virtual int handle_input (void); + virtual int handle_input (); protected: CORBA::ULong credit_sequence_num_; }; @@ -271,7 +271,7 @@ class TAO_AV_Export TAO_SFP_Consumer_Object : public TAO_SFP_Object TAO_SFP_Consumer_Object (TAO_AV_Callback *callback, TAO_AV_Transport *transport, ACE_CString& flow_options); - virtual int handle_input (void); + virtual int handle_input (); }; /** @@ -281,8 +281,8 @@ class TAO_AV_Export TAO_SFP_Consumer_Object : public TAO_SFP_Object class TAO_AV_Export TAO_AV_SFP_Factory : public TAO_AV_Flow_Protocol_Factory { public: - TAO_AV_SFP_Factory (void); - virtual ~TAO_AV_SFP_Factory (void); + TAO_AV_SFP_Factory (); + virtual ~TAO_AV_SFP_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); // Initialization hook. virtual int match_protocol (const char *flow_string); diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index cc2cd295b7990..cc226f585c0d2 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -18,7 +18,6 @@ ACE_PushConsumer_Adapter::push (const RtecEventComm::EventSet& events) template void ACE_PushConsumer_Adapter::disconnect_push_consumer () { - target_->disconnect_push_consumer (); } diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index 9f2baab57a900..16018fe81ab55 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -76,13 +76,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Channel_Clients_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Channel_Clients_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Channel_Clients_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_CHANNEL_CLIENTS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index 5dfc74f87ac23..136e2727a04db 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -48,23 +48,23 @@ class TAO_Concurrency_Serv_Export CC_Lock { public: /// Creates the lock with mode = intention_read (weakest) - CC_Lock (void); + CC_Lock (); /// Creates the lock with the desired mode CC_Lock (CosConcurrencyControl::lock_mode mode); /// Deletes the lock - ~CC_Lock (void); + ~CC_Lock (); /// Acquires this lock. Blocks until lock is obtained - void lock (void); + void lock (); /// Tries to acquire this lock. If it is not possible to acquire the /// lock, false is returned - CORBA::Boolean try_lock (void); + CORBA::Boolean try_lock (); /// Releases this lock. - void unlock (void); + void unlock (); /// Changes the mode of this lock. void change_mode (CosConcurrencyControl::lock_mode new_mode); @@ -79,16 +79,16 @@ class TAO_Concurrency_Serv_Export CC_Lock CORBA::Boolean Compatible (CosConcurrencyControl::lock_mode mode); /// Returns the mode of the lock. - CosConcurrencyControl::lock_mode GetMode (void); + CosConcurrencyControl::lock_mode GetMode (); /// Returns the number of times this lock have been locked - int GetLocksHeld(void); + int GetLocksHeld(); /// Decrements the number of locks held in this mode. Used by change_mode. - void DecLocksHeld(void); + void DecLocksHeld(); /// Dumps the state of the object to stdout - void dump(void); + void dump(); protected: /// Holds the lock's mode. @@ -116,23 +116,23 @@ class TAO_Concurrency_Serv_Export CC_LockModeIterator { public: /// Default constructor - CC_LockModeIterator(void); + CC_LockModeIterator(); /// Destructor - ~CC_LockModeIterator(void); + ~CC_LockModeIterator(); /// Reset the iterator to the first element - void First(void); + void First(); /// Advance the iterator to the next element /// Throws exception if out of range - void Next(void); + void Next(); /// Returns true if the iterator has reached the last element - CORBA::Boolean IsDone(void); + CORBA::Boolean IsDone(); /// Get the current element - CosConcurrencyControl::lock_mode GetLockMode(void); + CosConcurrencyControl::lock_mode GetLockMode(); private: CosConcurrencyControl::lock_mode current_; diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 99d6a1b442e27..5fbb84bab359d 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -24,7 +24,7 @@ CC_LockSet::CC_LockSet () } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("CC_LockSet::CC_LockSet (void)"); + ex._tao_print_exception ("CC_LockSet::CC_LockSet ()"); } } diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index 139e389bf017b..6e2d6de6bb1b4 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -76,14 +76,14 @@ class TAO_Concurrency_Serv_Export CC_LockSet : public POA_CosConcurrencyControl { public: /// Default constructor - CC_LockSet (void); + CC_LockSet (); /// Constructor used if create_related is used to create the lock /// set. CC_LockSet (CosConcurrencyControl::LockSet_ptr related); /// Destructor. - ~CC_LockSet (void); + ~CC_LockSet (); // = CosConcurrencyControl methods /// Acquires this lock. Blocks until lock is obtained @@ -102,7 +102,7 @@ class TAO_Concurrency_Serv_Export CC_LockSet : public POA_CosConcurrencyControl // = Debugging methods /// Dump the state of the object to stdout - void dump (void); + void dump (); private: /// Converts the CORBA specification's lock mode to the internal @@ -111,7 +111,7 @@ class TAO_Concurrency_Serv_Export CC_LockSet : public POA_CosConcurrencyControl /// Initiatlizes the lock set array and acquires the initial /// semaphore. - void Init (void); + void Init (); /// Returns true if the held lock and the requested lock are compatible CORBA::Boolean compatible (CC_LockModeEnum mr); diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index 03a2175adb942..247cc2bf86670 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -11,7 +11,6 @@ #include "orbsvcs/Concurrency/CC_LockSet.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index 8690633dff933..4c032f823de6d 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -37,10 +37,10 @@ class TAO_Concurrency_Serv_Export CC_LockSetFactory { public: /// Default constructor. - CC_LockSetFactory (void); + CC_LockSetFactory (); /// Destructor. - ~CC_LockSetFactory (void); + ~CC_LockSetFactory (); virtual CosConcurrencyControl::LockSet_ptr create (); diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index 74555ec8ed7bc..d192342a8cbd2 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -15,7 +15,6 @@ #include "ace/Dynamic_Service.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Concurrency_Loader::TAO_Concurrency_Loader () diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index 693e026a7a2dc..4d14f2e112a62 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -30,12 +30,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Concurrency_Serv_Export TAO_Concurrency_Loader : public TAO_Object_Loader { public: - /// Constructor - TAO_Concurrency_Loader (void); + TAO_Concurrency_Loader (); /// Destructor - ~TAO_Concurrency_Loader (void); + ~TAO_Concurrency_Loader (); /// Called by the Service Configurator framework to initialize the /// Event Service. Defined in diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h index 2338e119ff0df..b71e392b93059 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h @@ -39,7 +39,7 @@ class TAO_Concurrency_Serv_Export TAO_Concurrency_Server { public: ///Default constructor. - TAO_Concurrency_Server (void); + TAO_Concurrency_Server (); /// Takes the POA under which to register the Concurrency Service /// implementation object. @@ -47,17 +47,17 @@ class TAO_Concurrency_Serv_Export TAO_Concurrency_Server PortableServer::POA_ptr poa); /// Destructor. - ~TAO_Concurrency_Server (void); + ~TAO_Concurrency_Server (); /// Initialize the concurrency server under the given ORB and POA. CORBA::Object_ptr init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); /// Cleanup resources. - int fini (void); + int fini (); /// Get the lock set factory. - CC_LockSetFactory *GetLockSetFactory (void); + CC_LockSetFactory *GetLockSetFactory (); private: /// This is the lock set factory activated under the POA. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 96ce57e6d30a2..aca1ebd36103d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -57,7 +57,7 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel* event_channel); /// Destructor... - virtual ~TAO_CEC_ConsumerAdmin (void); + virtual ~TAO_CEC_ConsumerAdmin (); /// For each elements call work()>. void for_each (TAO_ESF_Worker *worker); @@ -77,16 +77,16 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin /// The event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (void); + virtual void shutdown (); // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void); + obtain_push_supplier (); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (void); + obtain_pull_supplier (); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); private: /// The Event Channel we belong to @@ -100,7 +100,6 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin /// Implement the pull side of this class TAO_ESF_Proxy_Admin pull_admin_; - }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index e21474a5230be..10e7c9015f4dc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -48,15 +48,15 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerControl { public: /// Constructor - TAO_CEC_ConsumerControl (void); + TAO_CEC_ConsumerControl (); /// Destructor - virtual ~TAO_CEC_ConsumerControl (void); + virtual ~TAO_CEC_ConsumerControl (); /// Activate any internal threads or timers used to poll the state of /// the consumers - virtual int activate (void); - virtual int shutdown (void); + virtual int activate (); + virtual int shutdown (); /** * When pushing an event to the consumer a CORBA::OBJECT_NOT_EXIST diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index 84403d50e75cc..071686cf93f91 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -43,14 +43,14 @@ class TAO_Event_Serv_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory { public: /// Constructor - TAO_CEC_Default_Factory (void); + TAO_CEC_Default_Factory (); /// destructor... - virtual ~TAO_CEC_Default_Factory (void); + virtual ~TAO_CEC_Default_Factory (); /// Helper function to register the default factory into the service /// configurator. - static int init_svcs (void); + static int init_svcs (); // = The Service_Object entry points virtual int init (int argc, ACE_TCHAR* argv[]); @@ -110,9 +110,9 @@ class TAO_Event_Serv_Export TAO_CEC_Default_Factory : public TAO_CEC_Factory destroy_proxy_pull_supplier_collection ( TAO_CEC_ProxyPullSupplier_Collection*); - virtual ACE_Lock* create_consumer_lock (void); + virtual ACE_Lock* create_consumer_lock (); virtual void destroy_consumer_lock (ACE_Lock*); - virtual ACE_Lock* create_supplier_lock (void); + virtual ACE_Lock* create_supplier_lock (); virtual void destroy_supplier_lock (ACE_Lock*); virtual TAO_CEC_ConsumerControl* diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl index c33f0c7672f87..41321de685140 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) +TAO_CEC_Default_Factory::TAO_CEC_Default_Factory () : dispatching_ (TAO_CEC_DEFAULT_DISPATCHING), pulling_strategy_ (TAO_CEC_DEFAULT_PULLING_STRATEGY), consumer_collection_ (TAO_CEC_DEFAULT_CONSUMER_COLLECTION), diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 2a92dd1fde74f..f0c04bb8599d3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -44,18 +44,18 @@ class TAO_Event_Serv_Export TAO_CEC_Dispatching { public: /// destructor... - virtual ~TAO_CEC_Dispatching (void); + virtual ~TAO_CEC_Dispatching (); /// Initialize all the data structures, activate any internal threads, /// etc. - virtual void activate (void) = 0; + virtual void activate () = 0; /** * Deactivate any internal threads and cleanup internal data * structures, it should only return once the threads have finished * their jobs. */ - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; /// The consumer represented by @a proxy should receive @a event. virtual void push (TAO_CEC_ProxyPushSupplier *proxy, @@ -85,11 +85,11 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_Dispatching : public TAO_CEC_Dispat public: /// The scheduler is used to find the range of priorities and similar /// info. - TAO_CEC_Reactive_Dispatching (void); + TAO_CEC_Reactive_Dispatching (); // = The CEC_Dispatching methods. - virtual void activate (void); - virtual void shutdown (void); + virtual void activate (); + virtual void shutdown (); virtual void push (TAO_CEC_ProxyPushSupplier *proxy, const CORBA::Any &event); virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index 5561bbca02639..d4a609cf86e33 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -78,10 +78,10 @@ class TAO_Event_Serv_Export TAO_CEC_Dispatch_Command : public ACE_Message_Block ACE_Allocator *mb_allocator = 0); /// Destructor - virtual ~TAO_CEC_Dispatch_Command (void); + virtual ~TAO_CEC_Dispatch_Command (); /// Command callback - virtual int execute (void) = 0; + virtual int execute () = 0; }; // **************************************************************** @@ -93,7 +93,7 @@ class TAO_Event_Serv_Export TAO_CEC_Shutdown_Task_Command : public TAO_CEC_Dispa TAO_CEC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0); /// Command callback - virtual int execute (void); + virtual int execute (); }; // **************************************************************** @@ -108,10 +108,10 @@ class TAO_Event_Serv_Export TAO_CEC_Push_Command : public TAO_CEC_Dispatch_Comma ACE_Allocator *mb_allocator); /// Destructor - virtual ~TAO_CEC_Push_Command (void); + virtual ~TAO_CEC_Push_Command (); /// Command callback - virtual int execute (void); + virtual int execute (); private: /// The proxy @@ -134,10 +134,10 @@ class TAO_Event_Serv_Export TAO_CEC_Invoke_Command : public TAO_CEC_Dispatch_Com ACE_Allocator *mb_allocator); /// Destructor - virtual ~TAO_CEC_Invoke_Command (void); + virtual ~TAO_CEC_Invoke_Command (); /// Command callback - virtual int execute (void); + virtual int execute (); private: /// The proxy diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h index 6227b5136457a..b59e5cf186b5a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h @@ -29,14 +29,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CEC_DynamicImplementationServer : public TAO_DynamicImplementation { public: - /// Constructor TAO_CEC_DynamicImplementationServer (PortableServer::POA_ptr poa, TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer, TAO_CEC_TypedEventChannel *typed_event_channel); /// Destructor - virtual ~TAO_CEC_DynamicImplementationServer (void); + virtual ~TAO_CEC_DynamicImplementationServer (); // = The DynamicImplementation methods. virtual void invoke (CORBA::ServerRequest_ptr request); @@ -45,7 +44,7 @@ class TAO_CEC_DynamicImplementationServer : public TAO_DynamicImplementation const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa); - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); /// Handles the _is_a call virtual void is_a (CORBA::ServerRequest_ptr request); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 90304ed1fd1b3..2692e29434f65 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -126,15 +126,15 @@ class TAO_Event_Serv_Export TAO_CEC_EventChannel : public POA_CosEventChannelAdm int own_factory = 0); /// destructor - virtual ~TAO_CEC_EventChannel (void); + virtual ~TAO_CEC_EventChannel (); /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (void); + virtual void activate (); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (void); + virtual void shutdown (); /// Access the dispatching module.... TAO_CEC_Dispatching* dispatching () const; @@ -183,14 +183,14 @@ class TAO_Event_Serv_Export TAO_CEC_EventChannel : public POA_CosEventChannelAdm void destroy_proxy_collection (TAO_CEC_ProxyPullConsumer_Collection*); /// Access the supplier and consumer POAs from the factory. - PortableServer::POA_ptr supplier_poa (void); - PortableServer::POA_ptr consumer_poa (void); + PortableServer::POA_ptr supplier_poa (); + PortableServer::POA_ptr consumer_poa (); /// Locking strategies for the ProxyPushConsumer and /// ProxyPushSupplier objects - ACE_Lock* create_consumer_lock (void); + ACE_Lock* create_consumer_lock (); void destroy_consumer_lock (ACE_Lock*); - ACE_Lock* create_supplier_lock (void); + ACE_Lock* create_supplier_lock (); void destroy_supplier_lock (ACE_Lock*); /// Used to inform the EC that a Consumer has connected or @@ -228,17 +228,17 @@ class TAO_Event_Serv_Export TAO_CEC_EventChannel : public POA_CosEventChannelAdm /// The default implementation is: /// this->consumer_admin ()->_this (env); virtual CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void); + for_consumers (); /// The default implementation is: /// this->supplier_admin ()->_this (env); virtual CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void); + for_suppliers (); /// Commit suicide. - virtual void destroy (void); + virtual void destroy (); - ServantRetryMap& get_servant_retry_map (void); + ServantRetryMap& get_servant_retry_map (); /// Forwarded to the factory CORBA::Policy_ptr diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl index 1de0e16e264f6..1a8aaae29caa0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl @@ -140,19 +140,19 @@ TAO_CEC_EventChannel::destroy_proxy_collection (TAO_CEC_ProxyPullSupplier_Collec } ACE_INLINE PortableServer::POA_ptr -TAO_CEC_EventChannel::supplier_poa (void) +TAO_CEC_EventChannel::supplier_poa () { return PortableServer::POA::_duplicate (this->supplier_poa_.in ()); } ACE_INLINE PortableServer::POA_ptr -TAO_CEC_EventChannel::consumer_poa (void) +TAO_CEC_EventChannel::consumer_poa () { return PortableServer::POA::_duplicate (this->consumer_poa_.in ()); } ACE_INLINE ACE_Lock* -TAO_CEC_EventChannel::create_consumer_lock (void) +TAO_CEC_EventChannel::create_consumer_lock () { return this->factory_->create_consumer_lock (); } @@ -164,7 +164,7 @@ TAO_CEC_EventChannel::destroy_consumer_lock (ACE_Lock* x) } ACE_INLINE ACE_Lock* -TAO_CEC_EventChannel::create_supplier_lock (void) +TAO_CEC_EventChannel::create_supplier_lock () { return this->factory_->create_supplier_lock (); } @@ -194,7 +194,7 @@ TAO_CEC_EventChannel::disconnect_callbacks () const } ACE_INLINE TAO_CEC_EventChannel::ServantRetryMap& -TAO_CEC_EventChannel::get_servant_retry_map (void) +TAO_CEC_EventChannel::get_servant_retry_map () { return this->retry_map_; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index f4019a5c167f7..c28e087296003 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -38,10 +38,10 @@ class TAO_Event_Serv_Export TAO_CEC_Event_Loader : public TAO_Object_Loader { public: /// Constructor - TAO_CEC_Event_Loader (void); + TAO_CEC_Event_Loader (); /// Destructor - ~TAO_CEC_Event_Loader (void); + ~TAO_CEC_Event_Loader (); //@{ /** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index 27cdd6becc992..f91be9f4b5aab 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -83,7 +83,7 @@ class TAO_Event_Serv_Export TAO_CEC_Factory : public ACE_Service_Object { public: /// destructor... - virtual ~TAO_CEC_Factory (void); + virtual ~TAO_CEC_Factory (); /// Create and destroy the dispatching module. virtual TAO_CEC_Dispatching* @@ -199,9 +199,9 @@ class TAO_Event_Serv_Export TAO_CEC_Factory : public ACE_Service_Object /// Create and destroy the locking strategies for both /// ProxyPushConsumers and ProxyPushSuppliers - virtual ACE_Lock* create_consumer_lock (void) = 0; + virtual ACE_Lock* create_consumer_lock () = 0; virtual void destroy_consumer_lock (ACE_Lock*) = 0; - virtual ACE_Lock* create_supplier_lock (void) = 0; + virtual ACE_Lock* create_supplier_lock () = 0; virtual void destroy_supplier_lock (ACE_Lock*) = 0; /// The ConsumerControl and SupplierControl strategies are used to diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index 8d8e725998d43..af65ca8e51d3d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -46,8 +46,8 @@ class TAO_Event_Serv_Export TAO_CEC_MT_Dispatching : public TAO_CEC_Dispatching int force_activate); // = The EC_Dispatching methods. - virtual void activate (void); - virtual void shutdown (void); + virtual void activate (); + virtual void shutdown (); virtual void push (TAO_CEC_ProxyPushSupplier* proxy, const CORBA::Any & event); virtual void push_nocopy (TAO_CEC_ProxyPushSupplier* proxy, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index aeea3d822b8bc..e172324f8b5ac 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -52,14 +52,14 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChann const ACE_Time_Value &timeout); /// destructor... - virtual ~TAO_CEC_ProxyPullConsumer (void); + virtual ~TAO_CEC_ProxyPullConsumer (); /// Activate in the POA virtual void activate ( CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void); + virtual void deactivate (); /// Return 0 if no supplier is connected... CORBA::Boolean is_connected () const; @@ -70,7 +70,7 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChann /// Pulls from the supplier, verifies that it is connected. CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event); - CORBA::Any* pull_from_supplier (void); + CORBA::Any* pull_from_supplier (); /** * Invoke the _non_existent() pseudo-operation on the supplier. If @@ -80,21 +80,21 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChann CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected); /// The event channel is shutting down - virtual void shutdown (void); + virtual void shutdown (); /// Increment and decrement the reference count. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcnt (); + CORBA::ULong _decr_refcnt (); // = The CosEventChannelAdmin::ProxyPullConsumer methods... virtual void connect_pull_supplier ( CosEventComm::PullSupplier_ptr pull_supplier); - virtual void disconnect_pull_consumer (void); + virtual void disconnect_pull_consumer (); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (void); - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual PortableServer::POA_ptr _default_POA (); + virtual void _add_ref (); + virtual void _remove_ref (); protected: /// Set the supplier, used by some implementations to change the @@ -106,7 +106,7 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChann CORBA::Boolean is_connected_i () const; /// Release the supplier - void cleanup_i (void); + void cleanup_i (); /// Assigns the parameter to both supplier_ and nopolicy_supplier_, and /// applies policies (when appropriate) to supplier_. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 2660286b37003..6d63db1de8338 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -59,14 +59,14 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChann const ACE_Time_Value &timeout); /// destructor... - virtual ~TAO_CEC_ProxyPullSupplier (void); + virtual ~TAO_CEC_ProxyPullSupplier (); /// Activate in the POA virtual void activate ( CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void); + virtual void deactivate (); /// Return 0 if no consumer is connected... CORBA::Boolean is_connected () const; @@ -80,7 +80,7 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChann CosEventComm::PullConsumer_ptr consumer () const; /// The event channel is shutting down - virtual void shutdown (void); + virtual void shutdown (); /** * Invoke the _non_existent() pseudo-operation on the consumer. If @@ -95,18 +95,18 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChann // = The CosEventChannelAdmin::ProxyPullSupplier methods... virtual void connect_pull_consumer ( CosEventComm::PullConsumer_ptr pull_consumer); - virtual CORBA::Any * pull (void); + virtual CORBA::Any * pull (); virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event); - virtual void disconnect_pull_supplier (void); + virtual void disconnect_pull_supplier (); /// Increment and decrement the reference count. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcnt (); + CORBA::ULong _decr_refcnt (); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (void); - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual PortableServer::POA_ptr _default_POA (); + virtual void _add_ref (); + virtual void _remove_ref (); protected: /// Set the consumer, used by some implementations to change the @@ -118,7 +118,7 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChann CORBA::Boolean is_connected_i () const; /// Release the child and the consumer - void cleanup_i (void); + void cleanup_i (); /// Assigns the parameter to both consumer_ and nopolicy_consumer_, and /// applies policies (when appropriate) to consumer_. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 5bbf33df9f326..0239d91fb73ba 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -54,14 +54,14 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer const ACE_Time_Value &timeout); /// destructor... - virtual ~TAO_CEC_ProxyPushConsumer (void); + virtual ~TAO_CEC_ProxyPushConsumer (); /// Activate in the POA virtual void activate ( CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void); + virtual void deactivate (); /// Return false if no supplier is connected... CORBA::Boolean is_connected () const; @@ -78,22 +78,22 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected); /// The event channel is shutting down - virtual void shutdown (void); + virtual void shutdown (); /// Increment and decrement the reference count. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcnt (); + CORBA::ULong _decr_refcnt (); // = The CosEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier); virtual void push (const CORBA::Any& event); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (void); - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual PortableServer::POA_ptr _default_POA (); + virtual void _add_ref (); + virtual void _remove_ref (); protected: /// Set the supplier, used by some implementations to change the @@ -108,7 +108,7 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer CORBA::Boolean is_connected_i () const; /// Release the supplier - void cleanup_i (void); + void cleanup_i (); /// Assigns the parameter to both supplier_ and nopolicy_supplier_, and /// applies policies (when appropriate) to supplier_. @@ -164,7 +164,7 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPushConsumer_Guard TAO_CEC_ProxyPushConsumer *proxy); /// Destructor - ~TAO_CEC_ProxyPushConsumer_Guard (void); + ~TAO_CEC_ProxyPushConsumer_Guard (); /// Returns true if the reference count successfully acquired bool locked () const; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 0e5bc198acbc1..c7117ca75b4d4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -232,7 +232,6 @@ TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event) this->typed_event_channel_, this); { - ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); if (!this->is_connected_i ()) @@ -329,7 +328,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( throw CORBA::BAD_PARAM (); { - #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) // Check if we have a typed event channel if (this->is_typed_ec () ) @@ -379,7 +377,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( this->typed_event_channel_->reconnected (this); } return; - } this->typed_consumer_ = apply_policy (local_typed_consumer.in () ); @@ -391,7 +388,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( // Notify the event channel... this->typed_event_channel_->connected (this); - } /* this->is_typed_ec */ else { @@ -405,7 +401,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( } { - ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index b7fec15b0b836..838b92d8ef176 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -70,14 +70,14 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChann #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ /// destructor... - virtual ~TAO_CEC_ProxyPushSupplier (void); + virtual ~TAO_CEC_ProxyPushSupplier (); /// Activate in the POA virtual void activate ( CosEventChannelAdmin::ProxyPushSupplier_ptr &); /// Deactivate from the POA - virtual void deactivate (void); + virtual void deactivate (); /// Return 0 if no consumer is connected... CORBA::Boolean is_connected () const; @@ -91,7 +91,7 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChann CosEventComm::PushConsumer_ptr consumer () const; /// The event channel is shutting down - virtual void shutdown (void); + virtual void shutdown (); /// Internal methods to push an event to each consumer. virtual void push (const CORBA::Any &event); @@ -119,16 +119,16 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChann // = The CosEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer); - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); /// Increment and decrement the reference count. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcnt (); + CORBA::ULong _decr_refcnt (); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (void); - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual PortableServer::POA_ptr _default_POA (); + virtual void _add_ref (); + virtual void _remove_ref (); protected: /// Set the consumer, used by some implementations to change the @@ -144,7 +144,7 @@ class TAO_Event_Serv_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChann CORBA::Boolean is_connected_i () const; /// Release the child and the consumer - void cleanup_i (void); + void cleanup_i (); #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) CORBA::Boolean is_typed_ec () const; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index 5b0e9843feb35..90b37c27cadf3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -39,18 +39,18 @@ class TAO_Event_Serv_Export TAO_CEC_Pulling_Strategy { public: /// destructor... - virtual ~TAO_CEC_Pulling_Strategy (void); + virtual ~TAO_CEC_Pulling_Strategy (); /// Initialize all the data structures, activate any internal threads, /// etc. - virtual void activate (void) = 0; + virtual void activate () = 0; /** * Deactivate any internal threads and cleanup internal data * structures, it should only return once the threads have finished * their jobs. */ - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; #if 0 /// Some strategies may want to keep track of connected consumers. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index ab8852c1d3c78..13bd60f92eb1c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -161,7 +161,6 @@ void TAO_CEC_Reactive_ConsumerControl::successful_transmission ( PortableServer::ServantBase* proxy) { - #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) if (this->typed_event_channel_) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index 88a17ffeb224e..958e8a544e7ef 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -99,15 +99,15 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_ConsumerControl #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ /// destructor... - virtual ~TAO_CEC_Reactive_ConsumerControl (void); + virtual ~TAO_CEC_Reactive_ConsumerControl (); /// Receive the timeout from the adapter void handle_timeout (const ACE_Time_Value &tv, const void* arg); // = Documented in TAO_CEC_ConsumerControl - virtual int activate (void); - virtual int shutdown (void); + virtual int activate (); + virtual int shutdown (); virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy); virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy); virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy, @@ -125,7 +125,7 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_ConsumerControl private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_consumers (void); + void query_consumers (); private: /// The polling rate diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index 3253d29db2aa9..e8deaffa0635e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -85,8 +85,8 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_Pulling_Strategy : public TAO_CEC_P const void* arg); // = The CEC_Pulling_Strategy methods. - virtual void activate (void); - virtual void shutdown (void); + virtual void activate (); + virtual void shutdown (); private: /// The Adapter for the reactor events diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index cabd907629cea..6df5666491a9f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -97,15 +97,15 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_SupplierControl #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ /// destructor... - virtual ~TAO_CEC_Reactive_SupplierControl (void); + virtual ~TAO_CEC_Reactive_SupplierControl (); /// Receive the timeout from the adapter void handle_timeout (const ACE_Time_Value &tv, const void* arg); // = Documented in TAO_CEC_SupplierControl - virtual int activate (void); - virtual int shutdown (void); + virtual int activate (); + virtual int shutdown (); virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy); #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy); @@ -126,7 +126,7 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_SupplierControl private: /// Check if the suppliers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_suppliers (void); + void query_suppliers (); private: /// The polling rate diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 9441c9087add9..d81786b72636d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -57,7 +57,7 @@ class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel* event_channel); /// destructor... - virtual ~TAO_CEC_SupplierAdmin (void); + virtual ~TAO_CEC_SupplierAdmin (); /// For each elements call work()>. void for_each (TAO_ESF_Worker *worker); @@ -75,16 +75,16 @@ class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin /// The event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (void); + virtual void shutdown (); /// The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void); + obtain_push_consumer (); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (void); + obtain_pull_consumer (); /// The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); private: /// The Event Channel we belong to diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 33ddb1892b47a..1302fd25c2192 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -57,15 +57,15 @@ class TAO_Event_Serv_Export TAO_CEC_SupplierControl { public: /// Constructor - TAO_CEC_SupplierControl (void); + TAO_CEC_SupplierControl (); /// destructor... - virtual ~TAO_CEC_SupplierControl (void); + virtual ~TAO_CEC_SupplierControl (); /// Activate any internal threads or timers used to poll the state of /// the suppliers - virtual int activate (void); - virtual int shutdown (void); + virtual int activate (); + virtual int shutdown (); /** * Invoked by helper classes when they detect that a supplier does diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index fa7a864fef81e..cbc61e407fee2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -36,12 +36,11 @@ class TAO_Event_Serv_Export TAO_CEC_TypedConsumerAdmin : public POA_CosTypedEventChannelAdmin::TypedConsumerAdmin { public: - // Constructor TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChannel* typed_event_channel); // Destructor - virtual ~TAO_CEC_TypedConsumerAdmin (void); + virtual ~TAO_CEC_TypedConsumerAdmin (); /// For each elements call work()>. void for_each (TAO_ESF_Worker *worker); @@ -57,7 +56,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedConsumerAdmin /// The typed event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (void); + virtual void shutdown (); // = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr @@ -67,13 +66,13 @@ class TAO_Event_Serv_Export TAO_CEC_TypedConsumerAdmin // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void); + obtain_push_supplier (); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (void); + obtain_pull_supplier (); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); private: /// The Event Channel we belong to diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h index df5816d460877..7a47f2ea313f6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h @@ -41,7 +41,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedEvent { public: /// constructors... - TAO_CEC_TypedEvent (void); + TAO_CEC_TypedEvent (); TAO_CEC_TypedEvent (CORBA::NVList_ptr list, const char * operation); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl index f5897f1f12455..6abb9bf56e8a7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_CEC_TypedEvent::TAO_CEC_TypedEvent (void) +TAO_CEC_TypedEvent::TAO_CEC_TypedEvent () { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index b7b171e9427c6..d282d632f1919 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -502,7 +502,6 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper for (CORBA::ULong param=0; paramnum_params_; param++) { - CORBA::Any any_1; any_1._tao_set_typecode(oper_params->parameters_[param].type_.in ()); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index 43c7cbd5c528a..7ffac9043a0e2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -136,15 +136,15 @@ class TAO_Event_Serv_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTy int own_factory = 0); /// Destructor - virtual ~TAO_CEC_TypedEventChannel (void); + virtual ~TAO_CEC_TypedEventChannel (); /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (void); + virtual void activate (); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (void); + virtual void shutdown (); /// Access the dispatching module.... TAO_CEC_Dispatching* dispatching () const; @@ -181,14 +181,14 @@ class TAO_Event_Serv_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTy void destroy_proxy_collection (TAO_CEC_TypedProxyPushConsumer_Collection*); /// Access the supplier and consumer POAs from the factory. - PortableServer::POA_ptr typed_supplier_poa (void); - PortableServer::POA_ptr typed_consumer_poa (void); + PortableServer::POA_ptr typed_supplier_poa (); + PortableServer::POA_ptr typed_consumer_poa (); /// Locking strategies for the ProxyPushConsumer and /// ProxyPushSupplier objects - ACE_Lock* create_consumer_lock (void); + ACE_Lock* create_consumer_lock (); void destroy_consumer_lock (ACE_Lock*); - ACE_Lock* create_supplier_lock (void); + ACE_Lock* create_supplier_lock (); void destroy_supplier_lock (ACE_Lock*); /// Used to inform the EC that a Consumer has connected or @@ -245,14 +245,14 @@ class TAO_Event_Serv_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTy // = The CosTypedEventChannelAdmin::TypedEventChannel methods... virtual ::CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr - for_consumers (void); + for_consumers (); virtual ::CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr - for_suppliers (void); + for_suppliers (); - virtual void destroy (void); + virtual void destroy (); - ServantRetryMap& get_servant_retry_map (void); + ServantRetryMap& get_servant_retry_map (); /// Forwarded to the factory CORBA::Policy_ptr @@ -266,7 +266,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedEventChannel : public virtual POA_CosTy int insert_into_ifr_cache (const char *operation, TAO_CEC_Operation_Params *parameters); /// Function clears the IFR cache - int clear_ifr_cache (void); + int clear_ifr_cache (); private: /// The POAs used to activate "supplier-side" and "consumer-side" @@ -339,10 +339,10 @@ class TAO_Event_Serv_Export TAO_CEC_Param { public: /// Constructor - TAO_CEC_Param (void); + TAO_CEC_Param (); /// Destructor - ~TAO_CEC_Param (void); + ~TAO_CEC_Param (); private: /// Only the TypedEventChannel can read the private fields. @@ -359,7 +359,7 @@ class TAO_Event_Serv_Export TAO_CEC_Operation_Params /// constructor TAO_CEC_Operation_Params (CORBA::ULong num_params); /// destructor - ~TAO_CEC_Operation_Params (void); + ~TAO_CEC_Operation_Params (); private: /// Only the TypedEventChannel can read the private fields. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl index b7e5dc7e0fde8..61be2f67742e2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl @@ -99,19 +99,19 @@ TAO_CEC_TypedEventChannel::destroy_proxy_collection (TAO_CEC_TypedProxyPushConsu } ACE_INLINE PortableServer::POA_ptr -TAO_CEC_TypedEventChannel::typed_supplier_poa (void) +TAO_CEC_TypedEventChannel::typed_supplier_poa () { return PortableServer::POA::_duplicate (this->typed_supplier_poa_.in ()); } ACE_INLINE PortableServer::POA_ptr -TAO_CEC_TypedEventChannel::typed_consumer_poa (void) +TAO_CEC_TypedEventChannel::typed_consumer_poa () { return PortableServer::POA::_duplicate (this->typed_consumer_poa_.in ()); } ACE_INLINE ACE_Lock* -TAO_CEC_TypedEventChannel::create_consumer_lock (void) +TAO_CEC_TypedEventChannel::create_consumer_lock () { return this->factory_->create_consumer_lock (); } @@ -123,7 +123,7 @@ TAO_CEC_TypedEventChannel::destroy_consumer_lock (ACE_Lock* x) } ACE_INLINE ACE_Lock* -TAO_CEC_TypedEventChannel::create_supplier_lock (void) +TAO_CEC_TypedEventChannel::create_supplier_lock () { return this->factory_->create_supplier_lock (); } @@ -171,18 +171,18 @@ TAO_CEC_TypedEventChannel::number_of_base_interfaces () const } ACE_INLINE TAO_CEC_TypedEventChannel::ServantRetryMap& -TAO_CEC_TypedEventChannel::get_servant_retry_map (void) +TAO_CEC_TypedEventChannel::get_servant_retry_map () { return this->retry_map_; } ACE_INLINE -TAO_CEC_Param::TAO_CEC_Param (void) +TAO_CEC_Param::TAO_CEC_Param () { } ACE_INLINE -TAO_CEC_Param::~TAO_CEC_Param (void) +TAO_CEC_Param::~TAO_CEC_Param () { } @@ -194,7 +194,7 @@ TAO_CEC_Operation_Params::TAO_CEC_Operation_Params (CORBA::ULong num_params) } ACE_INLINE -TAO_CEC_Operation_Params::~TAO_CEC_Operation_Params (void) +TAO_CEC_Operation_Params::~TAO_CEC_Operation_Params () { delete [] parameters_; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 016cb1c681c4f..d9fc5c8adca27 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -43,14 +43,14 @@ class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer const ACE_Time_Value &timeout); /// Destructor - virtual ~TAO_CEC_TypedProxyPushConsumer (void); + virtual ~TAO_CEC_TypedProxyPushConsumer (); /// Activate in the POA virtual void activate ( CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void); + virtual void deactivate (); /** * Invoke the _non_existent() pseudo-operation on the supplier. If @@ -60,11 +60,11 @@ class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected); /// The event channel is shutting down - virtual void shutdown (void); + virtual void shutdown (); /// Increment and decrement the reference count. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcnt (); + CORBA::ULong _decr_refcnt (); // = The CosEventChannelAdmin::ProxyPushConsumer methods (abstract overloads)... virtual void connect_push_supplier ( @@ -74,15 +74,15 @@ class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer virtual void invoke (const TAO_CEC_TypedEvent& typed_event); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)... - virtual CORBA::Object_ptr get_typed_consumer (void); + virtual CORBA::Object_ptr get_typed_consumer (); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (void); - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual PortableServer::POA_ptr _default_POA (); + virtual void _add_ref (); + virtual void _remove_ref (); protected: /// The guard needs access to the following protected methods. @@ -92,7 +92,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer CORBA::Boolean is_connected_i () const; /// Release the supplier - void cleanup_i (void); + void cleanup_i (); /// Assigns the parameter to both supplier_ and nopolicy_supplier_, and /// applies policies (when appropriate) to supplier_. @@ -156,7 +156,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer_Guard TAO_CEC_TypedProxyPushConsumer *proxy); /// Destructor - ~TAO_CEC_TypedProxyPushConsumer_Guard (void); + ~TAO_CEC_TypedProxyPushConsumer_Guard (); /// Returns 1 if the reference count successfully acquired int locked () const; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index 3fd23168cfebb..c15b44ebe1798 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -39,7 +39,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedSupplierAdmin TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChannel* event_channel); /// Destructor - virtual ~TAO_CEC_TypedSupplierAdmin (void); + virtual ~TAO_CEC_TypedSupplierAdmin (); /// For each elements call work()>. void for_each (TAO_ESF_Worker *worker); @@ -51,7 +51,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedSupplierAdmin /// The typed event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (void); + virtual void shutdown (); // = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods... virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr @@ -62,13 +62,13 @@ class TAO_Event_Serv_Export TAO_CEC_TypedSupplierAdmin // = The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void); + obtain_push_consumer (); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (void); + obtain_pull_consumer (); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); private: /// The Event Channel we belong to diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp index be736a7c572b7..50b35d37d89db 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp @@ -10,49 +10,49 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -int TAO_ESF_Busy_Lock_Adapter::remove (void) +int TAO_ESF_Busy_Lock_Adapter::remove () { return 0; } template -int TAO_ESF_Busy_Lock_Adapter::acquire (void) +int TAO_ESF_Busy_Lock_Adapter::acquire () { return this->adaptee_->busy (); } template -int TAO_ESF_Busy_Lock_Adapter::tryacquire (void) +int TAO_ESF_Busy_Lock_Adapter::tryacquire () { return this->adaptee_->busy (); } template -int TAO_ESF_Busy_Lock_Adapter::release (void) +int TAO_ESF_Busy_Lock_Adapter::release () { return this->adaptee_->idle (); } template -int TAO_ESF_Busy_Lock_Adapter::acquire_read (void) +int TAO_ESF_Busy_Lock_Adapter::acquire_read () { return this->adaptee_->busy (); } template -int TAO_ESF_Busy_Lock_Adapter::acquire_write (void) +int TAO_ESF_Busy_Lock_Adapter::acquire_write () { return this->adaptee_->busy (); } template -int TAO_ESF_Busy_Lock_Adapter::tryacquire_read (void) +int TAO_ESF_Busy_Lock_Adapter::tryacquire_read () { return this->adaptee_->busy (); } template -int TAO_ESF_Busy_Lock_Adapter::tryacquire_write (void) +int TAO_ESF_Busy_Lock_Adapter::tryacquire_write () { return this->adaptee_->busy (); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h index b7cc48b1a540c..5b194529aebf2 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h @@ -69,12 +69,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Busy_Lock.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Busy_Lock.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Busy_Lock.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_BUSY_LOCK_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp index 62fdae62ef7a2..3009b5ec52651 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template TAO_ESF_Copy_On_Read:: - TAO_ESF_Copy_On_Read (void) + TAO_ESF_Copy_On_Read () { } @@ -101,7 +101,7 @@ TAO_ESF_Copy_On_Read:: } template void -TAO_ESF_Copy_On_Read::shutdown (void) +TAO_ESF_Copy_On_Read::shutdown () { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h index 36578eb57e51c..9849d2ebc72de 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -52,16 +52,8 @@ class TAO_ESF_Copy_On_Read : public TAO_ESF_Proxy_Collection ACE_LOCK lock_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Copy_On_Read.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Copy_On_Read.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_COPY_ON_READ_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp index fd1535e5e4c59..0978a668656d0 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -11,14 +11,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template CORBA::ULong -TAO_ESF_Copy_On_Write_Collection::_incr_refcnt (void) +TAO_ESF_Copy_On_Write_Collection::_incr_refcnt () { // LOCKING: no locking is required, the caller grabs the mutex. return this->refcount_++; } template CORBA::ULong -TAO_ESF_Copy_On_Write_Collection::_decr_refcnt (void) +TAO_ESF_Copy_On_Write_Collection::_decr_refcnt () { // LOCKING: no locking is required, the caller grabs the mutex. { @@ -41,7 +41,7 @@ TAO_ESF_Copy_On_Write_Collection::_decr_refcnt (void) template TAO_ESF_Copy_On_Write:: - TAO_ESF_Copy_On_Write (void) + TAO_ESF_Copy_On_Write () : pending_writes_ (0), writing_ (0), cond_ (mutex_) @@ -51,7 +51,7 @@ TAO_ESF_Copy_On_Write:: template TAO_ESF_Copy_On_Write:: - ~TAO_ESF_Copy_On_Write (void) + ~TAO_ESF_Copy_On_Write () { ACE_GUARD (ACE_SYNCH_MUTEX_T, ace_mon, this->mutex_); @@ -119,7 +119,7 @@ TAO_ESF_Copy_On_Write:: } template void -TAO_ESF_Copy_On_Write::shutdown (void) +TAO_ESF_Copy_On_Write::shutdown () { // We need to perform a copy to follow the protocol. Write_Guard ace_mon (this->mutex_, @@ -175,7 +175,7 @@ TAO_ESF_Copy_On_Write_Write_Guard:: template TAO_ESF_Copy_On_Write_Write_Guard:: - ~TAO_ESF_Copy_On_Write_Write_Guard (void) + ~TAO_ESF_Copy_On_Write_Write_Guard () { Collection *tmp = 0; { diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h index dddaf15ebc8fc..cb866075cbbbe 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h @@ -159,20 +159,12 @@ class TAO_ESF_Copy_On_Write : public TAO_ESF_Proxy_Collection Collection *collection_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Copy_On_Write.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Copy_On_Write.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Copy_On_Write.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_COPY_ON_WRITE_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl index 39f67a9b21fc0..0a14eefb4479c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_INLINE TAO_ESF_Copy_On_Write_Collection:: - TAO_ESF_Copy_On_Write_Collection (void) + TAO_ESF_Copy_On_Write_Collection () : refcount_ (1) { } @@ -24,7 +24,7 @@ TAO_ESF_Copy_On_Write_Read_Guard:: template ACE_INLINE TAO_ESF_Copy_On_Write_Read_Guard:: - ~TAO_ESF_Copy_On_Write_Read_Guard (void) + ~TAO_ESF_Copy_On_Write_Read_Guard () { if (this->collection != 0) { diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp index b1dcefda33e31..d6d4918ceca65 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp @@ -55,7 +55,6 @@ TAO_ESF_Delayed_Changes:: for (ITERATOR i = this->collection_.begin (); i != end; ++i) { worker->work (*i); - } } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h index c3e9f8e40d0bf..6ff53f19d5cfc 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -132,20 +132,12 @@ class TAO_ESF_Delayed_Changes : public TAO_ESF_Proxy_Collection ACE_Unbounded_Queue command_queue_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Delayed_Changes.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Delayed_Changes.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Delayed_Changes.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_DELAYED_CHANGES_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h index 7add098ca4050..5c9b3ca2867f5 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h @@ -168,20 +168,12 @@ class TAO_ESF_Shutdown_Command : public ACE_Command_Base Target *target_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Delayed_Command.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Delayed_Command.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Delayed_Command.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_DELAYED_COMMAND_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h index 5f46da59d2aad..6928604f89ef9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h @@ -43,20 +43,12 @@ class TAO_ESF_Immediate_Changes : public TAO_ESF_Proxy_Collection ACE_LOCK lock_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Immediate_Changes.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Immediate_Changes.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Immediate_Changes.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_IMMEDIATE_CHANGES_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp index 56ddea2d0a400..a84699fa475f8 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp @@ -14,7 +14,7 @@ TAO_ESF_Peer_Admin:: template TAO_ESF_Peer_Admin:: - ~TAO_ESF_Peer_Admin (void) + ~TAO_ESF_Peer_Admin () { } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index eb2b2fbc5837e..f0608f20666f1 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -39,17 +39,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * the PROXY interface must implement: * * @verbatim - * void connected (PEER *peer) throw (); - * void reconnected (PEER *peer) throw (); - * void disconnected (PEER *peer) throw (); + * void connected (PEER *peer) noexcept; + * void reconnected (PEER *peer) noexcept; + * void disconnected (PEER *peer) noexcept; * @endverbatim * * Similarly, the PEER interface must implement: * * @verbatim - * void connected (PROXY *proxy) throw (); - * void reconnected (PROXY *proxy) throw (); - * void disconnected (PROXY *proxy) throw (); + * void connected (PROXY *proxy) noexcept; + * void reconnected (PROXY *proxy) noexcept; + * void disconnected (PROXY *proxy) noexcept; * @endverbatim */ template @@ -85,16 +85,8 @@ class TAO_ESF_Peer_Admin : public TAO_ESF_Proxy_Admin PEER* peer_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Peer_Workers.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Peer_Workers.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Peer_Workers.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PEER_WORKERS_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp index 47dc3e6d917b6..ee2b608dbda61 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp @@ -19,14 +19,14 @@ TAO_ESF_Proxy_Admin:: template TAO_ESF_Proxy_Admin:: - ~TAO_ESF_Proxy_Admin (void) + ~TAO_ESF_Proxy_Admin () { this->event_channel_->destroy_proxy_collection (this->collection_); } template INTERFACE* TAO_ESF_Proxy_Admin:: - obtain (void) + obtain () { PROXY* proxy; this->event_channel_->create_proxy (proxy); @@ -44,7 +44,7 @@ TAO_ESF_Proxy_Admin:: } template void -TAO_ESF_Proxy_Admin::shutdown (void) +TAO_ESF_Proxy_Admin::shutdown () { TAO_ESF_Shutdown_Proxy worker; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index ceb4b3ab3f3d9..7d9bb87b97cc9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -55,7 +55,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * /// activate the proxy and return the object reference * PROXY::_ptr_type - * PROXY::activate (void) throw (); + * PROXY::activate () noexcept; * @endverbatim */ template @@ -135,20 +135,12 @@ class TAO_ESF_RefCountedRef COUNTED *counted_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Proxy_Admin.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_Admin.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Proxy_Admin.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PROXY_ADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp index 64154fe08063c..5377484a4bac9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // **************************************************************** template -TAO_ESF_Proxy_Collection::~TAO_ESF_Proxy_Collection (void) +TAO_ESF_Proxy_Collection::~TAO_ESF_Proxy_Collection () { } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index b486e13f02f95..bda7ef874703b 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -154,17 +154,9 @@ class TAO_ESF_Proxy_Collection virtual void shutdown () = 0; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_Collection.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Proxy_Collection.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_ESF_PROXY_COLLECTION_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp index ff57ce85e4eb8..22783936d1963 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_ESF_Proxy_List::TAO_ESF_Proxy_List (void) +TAO_ESF_Proxy_List::TAO_ESF_Proxy_List () { } @@ -72,7 +72,7 @@ TAO_ESF_Proxy_List::disconnected (PROXY *proxy) } template void -TAO_ESF_Proxy_List::shutdown (void) +TAO_ESF_Proxy_List::shutdown () { Iterator end = this->impl_.end (); for (Iterator i = this->impl_.begin (); i != end; ++i) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h index fbd79d670a74c..af45c7b9d177d 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -74,12 +74,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Proxy_List.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_List.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Proxy_List.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PROXY_LIST_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl index 34c682b59a6af..8b83bc94e073a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_INLINE ACE_Unbounded_Set_Iterator -TAO_ESF_Proxy_List::begin (void) +TAO_ESF_Proxy_List::begin () { return this->impl_.begin (); } template ACE_INLINE ACE_Unbounded_Set_Iterator -TAO_ESF_Proxy_List::end (void) +TAO_ESF_Proxy_List::end () { return this->impl_.end (); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp index 462e0542d1bfa..cae70aec58619 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_ESF_Proxy_RB_Tree::TAO_ESF_Proxy_RB_Tree (void) +TAO_ESF_Proxy_RB_Tree::TAO_ESF_Proxy_RB_Tree () { } @@ -70,7 +70,7 @@ TAO_ESF_Proxy_RB_Tree::disconnected (PROXY *proxy) } template void -TAO_ESF_Proxy_RB_Tree::shutdown (void) +TAO_ESF_Proxy_RB_Tree::shutdown () { Iterator end = this->impl_.end (); for (Iterator i = this->impl_.begin (); i != end; ++i) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h index 089f7caaf714c..b15fd7d612b39 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -101,12 +101,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Proxy_RB_Tree.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PROXY_RB_TREE_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl index a5cf13695a907..69291d2080019 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl @@ -23,7 +23,7 @@ TAO_ESF_Proxy_RB_Tree_Iterator::operator != ( } template ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator& -TAO_ESF_Proxy_RB_Tree_Iterator::operator++ (void) +TAO_ESF_Proxy_RB_Tree_Iterator::operator++ () { ++this->impl_; return *this; @@ -38,7 +38,7 @@ TAO_ESF_Proxy_RB_Tree_Iterator::operator++ (int) } template ACE_INLINE PROXY* -TAO_ESF_Proxy_RB_Tree_Iterator::operator *(void) +TAO_ESF_Proxy_RB_Tree_Iterator::operator *() { return (*this->impl_).key (); } @@ -46,13 +46,13 @@ TAO_ESF_Proxy_RB_Tree_Iterator::operator *(void) // **************************************************************** template ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator -TAO_ESF_Proxy_RB_Tree::begin (void) +TAO_ESF_Proxy_RB_Tree::begin () { return Iterator (this->impl_.begin ()); } template ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator -TAO_ESF_Proxy_RB_Tree::end (void) +TAO_ESF_Proxy_RB_Tree::end () { return Iterator (this->impl_.end ()); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp index 5ee83f5becda3..c8674165ac5c5 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_ESF_Proxy_RefCount_Guard::~TAO_ESF_Proxy_RefCount_Guard (void) +TAO_ESF_Proxy_RefCount_Guard::~TAO_ESF_Proxy_RefCount_Guard () { // Checking for 0 is safe, once the variable reaches 0 the value // will stay there. diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h index 0b4607fe62b4e..4000763686ffd 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h @@ -66,12 +66,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Proxy_RefCount_Guard.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PROXY_REFCOUNT_GUARD_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp index a60a7f0258362..f69967a17092c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp @@ -8,5 +8,4 @@ #endif /* __ACE_INLINE__ */ - #endif /* TAO_ESF_REFCOUNT_GUARD_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h index 61873a0de55e8..01cd5c88987ba 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h @@ -54,12 +54,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_RefCount_Guard.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_RefCount_Guard.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_RefCount_Guard.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_REFCOUNT_GUARD_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl index 590b187dae966..d62013e40c0d7 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl @@ -11,7 +11,7 @@ TAO_ESF_RefCount_Guard:: template ACE_INLINE TAO_ESF_RefCount_Guard:: - ~TAO_ESF_RefCount_Guard (void) + ~TAO_ESF_RefCount_Guard () { --this->refcount_; } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h index efea73b2dccb1..a97b81a846af7 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h @@ -38,12 +38,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Shutdown_Proxy.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Shutdown_Proxy.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Shutdown_Proxy.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_SHUTDOWN_PROXY_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp index bf44a389032a8..21341d128023d 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_ESF_Worker::~TAO_ESF_Worker (void) +TAO_ESF_Worker::~TAO_ESF_Worker () { } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h index fe8b04411b801..21c922af92890 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h @@ -53,12 +53,6 @@ class TAO_ESF_Worker TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Worker.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Worker.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_WORKER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h index c44cadd0a8626..f1ceb4aa5b658 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h @@ -39,7 +39,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTEvent_Serv_Export TAO_ECG_Handler_Shutdown { public: - // Define virtual destructor to make sure we can delete derived // objects through a pointer to TAO_ECG_Handler_Shutdown. virtual ~TAO_ECG_Handler_Shutdown (); @@ -57,7 +56,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Handler_Shutdown class TAO_RTEvent_Serv_Export TAO_ECG_Dgram_Handler { public: - virtual ~TAO_ECG_Dgram_Handler (); virtual int handle_input (ACE_SOCK_Dgram& dgram) = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index d0bfcaf73f8ad..5115cfd085cd3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -28,7 +28,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base : public virtual POA_RtecUDPAdmin::AddrServer { public: - virtual int init (const char *arg) = 0; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h index 199834e90fcd5..bf0363145acb8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h @@ -86,7 +86,6 @@ class TAO_ECG_UDP_Request_Entry char* fragment_buffer (CORBA::ULong fragment_offset); private: - TAO_ECG_UDP_Request_Entry (const TAO_ECG_UDP_Request_Entry & rhs); TAO_ECG_UDP_Request_Entry& operator= (const TAO_ECG_UDP_Request_Entry & rhs); @@ -176,7 +175,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_CDR_Message_Receiver static TAO_ECG_UDP_Request_Entry Request_Completed_; private: - enum { ECG_DEFAULT_MAX_FRAGMENTED_REQUESTS = 1024, ECG_DEFAULT_FRAGMENTED_REQUESTS_MIN_PURGE_COUNT = 32 @@ -190,7 +188,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_CDR_Message_Receiver ACE_Null_Mutex> Request_Map; private: - /// Returns 1 on success, 0 if has already been /// received or is below current request range, and -1 on error. int mark_received (const ACE_INET_Addr &from, @@ -208,7 +205,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_CDR_Message_Receiver Request_Map::ENTRY* get_source_entry (const ACE_INET_Addr &from); private: - /// Ignore any events coming from this IP address. TAO_ECG_Refcounted_Endpoint ignore_from_; @@ -257,7 +253,6 @@ struct TAO_ECG_CDR_Message_Receiver::Mcast_Header class TAO_ECG_CDR_Message_Receiver::Requests { public: - Requests (); ~Requests (); @@ -274,7 +269,6 @@ class TAO_ECG_CDR_Message_Receiver::Requests TAO_ECG_UDP_Request_Entry ** get_request (CORBA::ULong request_id); private: - /// Delete any outstanding requests with ids in the range /// [, ] from and /// and reset their slots. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl index ac3b70296dad0..0d595ebf4e250 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_ECG_CDR_Message_Receiver::Requests::Requests (void) +TAO_ECG_CDR_Message_Receiver::Requests::Requests () : fragmented_requests_ (0) , size_ (0) , id_range_low_ (0) @@ -27,7 +27,7 @@ TAO_ECG_CDR_Message_Receiver::TAO_ECG_CDR_Message_Receiver (CORBA::Boolean crc) } ACE_INLINE -TAO_ECG_CDR_Message_Receiver::~TAO_ECG_CDR_Message_Receiver (void) +TAO_ECG_CDR_Message_Receiver::~TAO_ECG_CDR_Message_Receiver () { this->shutdown (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index a218fb7f0d5d8..b07c2c26bc352 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void @@ -171,7 +170,6 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, } // ACE_ASSERT (total_length == fragment_offset); // ACE_ASSERT (fragment_id == fragment_count); - } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h index d9ce3dd8bbb4e..c06a668793ccd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h @@ -73,7 +73,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTEvent_Serv_Export TAO_ECG_CDR_Message_Sender { public: - enum { ECG_HEADER_SIZE = 32, ECG_MIN_MTU = 32 + 8, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl index c941146ebac07..9197c1c7d42e7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl @@ -12,7 +12,7 @@ TAO_ECG_CDR_Message_Sender::TAO_ECG_CDR_Message_Sender (CORBA::Boolean crc) } ACE_INLINE void -TAO_ECG_CDR_Message_Sender::shutdown (void) +TAO_ECG_CDR_Message_Sender::shutdown () { // Release the endpoint. TAO_ECG_Refcounted_Endpoint empty_endpoint_rptr; @@ -20,7 +20,7 @@ TAO_ECG_CDR_Message_Sender::shutdown (void) } ACE_INLINE ACE_SOCK_Dgram& -TAO_ECG_CDR_Message_Sender::dgram (void) +TAO_ECG_CDR_Message_Sender::dgram () { ACE_ASSERT (this->endpoint_rptr_.get ()); return this->endpoint_rptr_->dgram (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index 5bb96c44b7bf1..7b911e886bbc2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -46,7 +46,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Complex_Address_Server : public virtual POA_RtecUDPAdmin::AddrServer { public: - /// Create a new TAO_ECG_Complex_Address_Server object. /* * (Constructor access is restricted to insure that all @@ -75,7 +74,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Complex_Address_Server : void dump_content (); protected: - /// Constructor (protected). Clients can create new /// TAO_ECG_Complex_Address_Server objects using the static create() /// method. @@ -84,7 +82,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Complex_Address_Server : TAO_ECG_Complex_Address_Server (int is_source_mapping = 1); private: - /// Helper. Given key and mcast address in string form, add them to /// the mapping. int add_entry (const char * key, const char * mcast_addr); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp index 9c513ff2b7792..925b755b3b70c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/ECG_ConsumerEC_Control.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control () diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 8c36dc6b44cb4..59d7574876883 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -13,7 +13,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index 8afc54396104f..881df9b925bd1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -51,7 +51,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_EH : public TAO_ECG_Handler_Shutdown { public: - /// Initialization and termination methods. //@{ /** @@ -97,7 +96,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_EH : virtual int handle_input (ACE_HANDLE fd); private: - /** * @class Observer * @@ -211,7 +209,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_EH : void execute (); private: - RtecEventChannelAdmin::Observer_Handle handle_; RtecEventChannelAdmin::EventChannel_var ec_; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl index 332d4f0d46563..7e6de94975c9e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ECG_Mcast_EH:: -Observer_Disconnect_Command::Observer_Disconnect_Command (void) +Observer_Disconnect_Command::Observer_Disconnect_Command () : handle_ () , ec_ () { @@ -42,7 +42,7 @@ Observer_Disconnect_Command::operator= ( ACE_INLINE void TAO_ECG_Mcast_EH:: -Observer_Disconnect_Command::execute (void) +Observer_Disconnect_Command::execute () { if (CORBA::is_nil (this->ec_.in ())) // We are not connected. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h index a34a07843f843..dddb8ab6772f3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h @@ -125,7 +125,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_Gateway : public ACE_Service_Object { public: - /// The Service_Object entry points. //@{ virtual int init (int argc, ACE_TCHAR* argv[]); @@ -219,7 +218,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_Gateway RtecEventChannelAdmin::EventChannel_ptr ec); private: - /// Helpers. //@{ /// Check that arguments to run() are not nil. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl index 1b18f69c41470..240421f040505 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void) +TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway () : service_type_ (TAO_ECG_DEFAULT_SERVICE) , handler_type_ (TAO_ECG_DEFAULT_HANDLER) , address_server_type_ (TAO_ECG_DEFAULT_ADDRESS_SERVER) @@ -17,7 +17,7 @@ TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void) } ACE_INLINE -TAO_ECG_Mcast_Gateway::Attributes::Attributes (void) +TAO_ECG_Mcast_Gateway::Attributes::Attributes () : address_server_type (TAO_ECG_DEFAULT_ADDRESS_SERVER) , handler_type (TAO_ECG_DEFAULT_HANDLER) , service_type (TAO_ECG_DEFAULT_SERVICE) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index 04b881ae6038c..fd3a321051dda 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -7,7 +7,6 @@ #include "ace/Reactor.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Reactive_ConsumerEC_Control:: @@ -175,7 +174,6 @@ TAO_ECG_Reactive_ConsumerEC_Control::event_channel_not_exist ( gateway->cleanup_consumer_ec (); gateway->cleanup_consumer_proxies (); - } catch (const CORBA::Exception& ex) { @@ -195,7 +193,6 @@ TAO_ECG_Reactive_ConsumerEC_Control::system_exception ( gateway->cleanup_consumer_ec (); gateway->cleanup_consumer_proxies (); - } catch (const CORBA::Exception&) { diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 018b710de0968..bdba1aba31a73 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -5,7 +5,6 @@ #include "ace/Reactor.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Reconnect_ConsumerEC_Control:: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index 267cea8f0c988..c79bf55092541 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -28,7 +28,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Address_Server : public virtual POA_RtecUDPAdmin::AddrServer { public: - /// Create a new TAO_ECG_Simple_Address_Server object. /// (Constructor access is restricted to insure that all /// TAO_ECG_Simple_Address_Server objects are heap-allocated.) @@ -46,7 +45,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Address_Server : RtecUDPAdmin::UDP_Address_out addr6); protected: - /// Constructor (protected). Clients can create new /// TAO_ECG_Simple_Address_Server objects using the static create() /// method. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl index 833ca1df6bb7c..41e0a41a76846 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableServer::Servant_var -TAO_ECG_Simple_Address_Server::create (void) +TAO_ECG_Simple_Address_Server::create () { PortableServer::Servant_var s; ACE_NEW_RETURN (s, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h index 69c5ac5315008..5281a8e75a680 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h @@ -38,7 +38,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Mcast_EH , public TAO_ECG_Handler_Shutdown { public: - /// Initialization and termination methods. //@{ /// Constructor. @@ -70,7 +69,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Mcast_EH virtual int handle_input (ACE_HANDLE fd); private: - // Socket on which we listen for messages. ACE_SOCK_Dgram_Mcast dgram_; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index 49ff6f35ecf37..36d9075a0fd7b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -8,7 +8,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h index 0d865c992c51f..a5a194fd14d8d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h @@ -43,7 +43,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_EH : , public TAO_ECG_Handler_Shutdown { public: - /// Initialization and termination methods. //@{ /// Constructor. @@ -81,7 +80,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_EH : ACE_SOCK_Dgram &dgram (); private: - /// The datagram used to receive the data. ACE_SOCK_Dgram dgram_; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl index 43231a83b016c..c2dce190a8643 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_SOCK_Dgram& -TAO_ECG_UDP_EH::dgram (void) +TAO_ECG_UDP_EH::dgram () { return this->dgram_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index 6f238efb3c16c..1a8404f7906f1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -8,7 +8,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint () diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl index 331d9ac2bdfce..51ec31d56c329 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (void) +TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint () : request_id_generator_ (static_cast (ACE_OS::time (0))), port_number_ (0), if_count_ (0), @@ -22,13 +22,13 @@ TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (const TAO_ECG_UDP_Out_Endpoi } ACE_INLINE ACE_SOCK_Dgram& -TAO_ECG_UDP_Out_Endpoint::dgram (void) +TAO_ECG_UDP_Out_Endpoint::dgram () { return this->dgram_; } ACE_INLINE CORBA::ULong -TAO_ECG_UDP_Out_Endpoint::next_request_id (void) +TAO_ECG_UDP_Out_Endpoint::next_request_id () { return this->request_id_generator_++; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 68532c6b4b0cf..0a0abc3db9c13 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -84,7 +84,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver_Disconnect_Command void execute (); private: - RtecEventChannelAdmin::ProxyPushConsumer_var proxy_; }; @@ -104,10 +103,8 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver : , public virtual TAO_ECG_Dgram_Handler { public: - /// Initialization and termination methods. //@{ - /// Create a new TAO_ECG_UDP_Receiver object. /// (Constructor access is restricted to insure that all /// TAO_ECG_UDP_Receiver objects are heap-allocated.) @@ -186,13 +183,11 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver : virtual int handle_input (ACE_SOCK_Dgram& dgram); protected: - /// Constructor (protected). Clients can create new /// TAO_ECG_UDP_Receiver objects using the static create() method. TAO_ECG_UDP_Receiver (CORBA::Boolean perform_crc = false); private: - /// Helpers for the connect() method. //@{ // Establishes connection to the Event Channel for the first time. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl index 6b6aec4d55c52..6f112ad9d8c11 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ECG_UDP_Receiver_Disconnect_Command:: -TAO_ECG_UDP_Receiver_Disconnect_Command (void) +TAO_ECG_UDP_Receiver_Disconnect_Command () : proxy_ () { } @@ -41,7 +41,7 @@ TAO_ECG_UDP_Receiver_Disconnect_Command::operator= ( ACE_INLINE void TAO_ECG_UDP_Receiver_Disconnect_Command:: -execute (void) +execute () { if (CORBA::is_nil (this->proxy_.in ())) // We are not connected. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 67f29c6fc1432..63d5482588f7a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -83,7 +83,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender_Disconnect_Command void execute (); private: - RtecEventChannelAdmin::ProxyPushSupplier_var proxy_; }; @@ -101,10 +100,8 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender : public TAO_EC_Deactivated_Object { public: - /// Initialization and termination methods. //@{ - /// Create a new TAO_ECG_UDP_Sender object. /// (Constructor access is restricted to insure that all /// TAO_ECG_UDP_Sender objects are heap-allocated.) @@ -175,13 +172,11 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender : //@} protected: - /// Constructor (protected). Clients can create new /// TAO_ECG_UDP_Sender objects using the static create() method. TAO_ECG_UDP_Sender (CORBA::Boolean crc = 0); private: - /// Helpers for the connect() method. //@{ // Establishes connection to the Event Channel for the first time. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl index e800afa98bb2b..d8d47b0bf0322 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl @@ -44,7 +44,7 @@ TAO_ECG_UDP_Sender::get_local_addr (ACE_INET_Addr& addr) ACE_INLINE TAO_ECG_UDP_Sender_Disconnect_Command:: -TAO_ECG_UDP_Sender_Disconnect_Command (void) +TAO_ECG_UDP_Sender_Disconnect_Command () : proxy_ () { } @@ -77,7 +77,7 @@ TAO_ECG_UDP_Sender_Disconnect_Command::operator= ( } ACE_INLINE void -TAO_ECG_UDP_Sender_Disconnect_Command::execute (void) +TAO_ECG_UDP_Sender_Disconnect_Command::execute () { if (CORBA::is_nil (this->proxy_.in ())) // We are not connected. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 5409f0b440697..b5f8d353c3d1d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -158,10 +158,6 @@ TAO_EC_Basic_Factory::destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy* x TAO_EC_ProxyPushConsumer_Collection* TAO_EC_Basic_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Channel_Base *) { -#if defined (__SUNPRO_CC) - // This typedef is a workaround for a SunCC 4.2 bug - typedef TAO_ESF_Proxy_List::Iterator TAO_EC_Consumer_List_Iterator; -#endif return new TAO_ESF_Delayed_Changes, TAO_ESF_Proxy_List::Iterator, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp index 4a3430d6980b3..6cbc48c698901 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp @@ -10,49 +10,49 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -int TAO_EC_Busy_Lock_Adapter::remove (void) +int TAO_EC_Busy_Lock_Adapter::remove () { return 0; } template -int TAO_EC_Busy_Lock_Adapter::acquire (void) +int TAO_EC_Busy_Lock_Adapter::acquire () { return this->adaptee_->busy (); } template -int TAO_EC_Busy_Lock_Adapter::tryacquire (void) +int TAO_EC_Busy_Lock_Adapter::tryacquire () { return this->adaptee_->busy (); } template -int TAO_EC_Busy_Lock_Adapter::release (void) +int TAO_EC_Busy_Lock_Adapter::release () { return this->adaptee_->idle (); } template -int TAO_EC_Busy_Lock_Adapter::acquire_read (void) +int TAO_EC_Busy_Lock_Adapter::acquire_read () { return this->adaptee_->busy (); } template -int TAO_EC_Busy_Lock_Adapter::acquire_write (void) +int TAO_EC_Busy_Lock_Adapter::acquire_write () { return this->adaptee_->busy (); } template -int TAO_EC_Busy_Lock_Adapter::tryacquire_read (void) +int TAO_EC_Busy_Lock_Adapter::tryacquire_read () { return this->adaptee_->busy (); } template -int TAO_EC_Busy_Lock_Adapter::tryacquire_write (void) +int TAO_EC_Busy_Lock_Adapter::tryacquire_write () { return this->adaptee_->busy (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h index 49921468ef9b6..e6b26cbb72e05 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h @@ -35,14 +35,14 @@ class TAO_EC_Busy_Lock_Adapter // = The ACE_Lock methods, please check $ACE_ROOT/ace/Synch.h for // details. - int remove (void); - int acquire (void); - int tryacquire (void); - int release (void); - int acquire_read (void); - int acquire_write (void); - int tryacquire_read (void); - int tryacquire_write (void); + int remove (); + int acquire (); + int tryacquire (); + int release (); + int acquire_read (); + int acquire_write (); + int tryacquire_read (); + int tryacquire_write (); private: Adaptee* adaptee_; @@ -54,13 +54,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Event/EC_Busy_Lock.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Event/EC_Busy_Lock.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("EC_Busy_Lock.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_EC_BUSY_LOCK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp index 3f3b8254f54aa..f6253758efa94 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_EC_Channel_Destroyer_Functor::operator() ( - TAO_EC_Event_Channel_Base * event_channel) throw () + TAO_EC_Event_Channel_Base * event_channel) noexcept { try { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h index b3d44ceb03884..3be79f75b7df8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h @@ -24,7 +24,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Channel_Destroyer_Functor typedef TAO_EC_Event_Channel_Base * argument; /// Destroy @c event_channel - void operator() (TAO_EC_Event_Channel_Base * event_channel) throw (); + void operator() (TAO_EC_Event_Channel_Base * event_channel) noexcept; }; /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl index e6a6308afea3b..af798e51a7dc7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Default_Factory::TAO_EC_Default_Factory (void) +TAO_EC_Default_Factory::TAO_EC_Default_Factory () : dispatching_ (TAO_EC_DEFAULT_DISPATCHING), filtering_ (TAO_EC_DEFAULT_CONSUMER_FILTER), supplier_filtering_ (TAO_EC_DEFAULT_SUPPLIER_FILTER), diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h index 4230f1a637017..3f555a24f203c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h @@ -37,7 +37,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushConsumer : public TAO_EC_ProxyPushConsumer { public: - /// Constructor... TAO_EC_Default_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel); @@ -60,7 +59,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushConsumer : virtual void _remove_ref (); private: - virtual PortableServer::ObjectId object_id (); }; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h index df5589db1f6cb..334928d75b6ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h @@ -34,7 +34,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier public TAO_EC_ProxyPushSupplier { public: - /// Constructor... TAO_EC_Default_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection); @@ -58,7 +57,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier virtual void _remove_ref (); private: - virtual PortableServer::ObjectId object_id (); }; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index fac5d0fd1623c..c9701bf5525ff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -96,7 +96,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Queue : public ACE_Message_Queue class TAO_RTEvent_Serv_Export TAO_EC_Dispatching_Task : public ACE_Task { public: - #ifdef ACE_WIN32_VC14 // Work around for Connect #2869042 Bugzilla #4215 TAO_EC_Dispatching_Task (ACE_Thread_Manager *thr_manager, TAO_EC_Queue_Full_Service_Object *queue_full_service_object = 0); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl index d412117261fee..0a705bed27459 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Filter::TAO_EC_Filter (void) +TAO_EC_Filter::TAO_EC_Filter () : parent_ (0) { } @@ -33,7 +33,7 @@ TAO_EC_Filter::matches (const RtecEventComm::EventHeader& rhs, // **************************************************************** ACE_INLINE -TAO_EC_Null_Filter::TAO_EC_Null_Filter (void) +TAO_EC_Null_Filter::TAO_EC_Null_Filter () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index 931b66be2568f..6d4f6ca041aba 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -49,7 +49,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Filter_Builder virtual TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos) const = 0; - }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl index 6a2b2f859fb8c..5001b5772cf0d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Null_Filter_Builder::TAO_EC_Null_Filter_Builder (void) +TAO_EC_Null_Filter_Builder::TAO_EC_Null_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h index 8ea47da59ffaa..91bd7ac2925a7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h @@ -233,7 +233,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Gateway_IIOP : public TAO_EC_Gateway /// proxy push consumer, if 0, we only use one proxy push consumer (the /// default) for all source ids. int use_consumer_proxy_map_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index 4f8cf9d0039ce..c1f296e3dc520 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -30,8 +30,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTSchedEvent_Export TAO_EC_Gateway_Sched : public TAO_EC_Gateway_IIOP { public: - TAO_EC_Gateway_Sched (void); - ~TAO_EC_Gateway_Sched (void); + TAO_EC_Gateway_Sched (); + ~TAO_EC_Gateway_Sched (); /** * To do its job this class requires to know the local and remote diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index df321abb0ab29..168d5f1c7f503 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -174,7 +174,6 @@ TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command() int TAO_EC_Kokyu_Push_Command::execute () { - try { //ORBSVCS_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h index 14657975f0649..d2b903dcaae36 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h @@ -60,8 +60,8 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Dispatching : public TAO_EC_Dispatchi int sched_scope); // = The EC_Dispatching methods. - virtual void activate (void); - virtual void shutdown (void); + virtual void activate (); + virtual void shutdown (); virtual void push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, @@ -74,7 +74,7 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Dispatching : public TAO_EC_Dispatchi private: ACE_Allocator *allocator_; - void setup_lanes (void); + void setup_lanes (); /// The dispatcher Kokyu::Dispatcher_Auto_Ptr dispatcher_; @@ -96,12 +96,11 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Shutdown_Command : public Kokyu::Disp TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator *allocator); /// Command callback - virtual int execute (void); + virtual int execute (); protected: //Protected so can't be put on stack; must be dynamically allocated - virtual ~TAO_EC_Kokyu_Shutdown_Command (void); - + virtual ~TAO_EC_Kokyu_Shutdown_Command (); }; // **************************************************************** @@ -116,11 +115,11 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Push_Command : public Kokyu::Dispatch ACE_Allocator* allocator); /// Command callback - virtual int execute (void); + virtual int execute (); protected: //Protected so can't be put on stack; must be dynamically allocated - virtual ~TAO_EC_Kokyu_Push_Command (void); + virtual ~TAO_EC_Kokyu_Push_Command (); private: /// The proxy diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h index 11dc877cd2a6b..3ce04b0af21db 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h @@ -34,14 +34,14 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Factory : public TAO_EC_Default_Facto { public: /// Constructor - TAO_EC_Kokyu_Factory (void); + TAO_EC_Kokyu_Factory (); /// Helper function to register the Kokyu factory into the service /// configurator. - static int init_svcs (void); + static int init_svcs (); /// destructor... - virtual ~TAO_EC_Kokyu_Factory (void); + virtual ~TAO_EC_Kokyu_Factory (); // = The Service_Object entry points virtual int init (int argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl index 99852966866f5..5e9ec37bbff11 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory (void) +TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory () : TAO_EC_Default_Factory (), disp_sched_policy_ (ACE_SCHED_FIFO), disp_sched_scope_ (ACE_SCOPE_THREAD) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h index d630ec559f230..a7dae43136553 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h @@ -56,7 +56,7 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Filter : public TAO_EC_Filter RtecScheduler::Info_Type_t info_type); /// Destructor - virtual ~TAO_EC_Kokyu_Filter (void); + virtual ~TAO_EC_Kokyu_Filter (); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. @@ -71,7 +71,7 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Filter : public TAO_EC_Filter TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); + virtual void clear (); virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, @@ -83,7 +83,7 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Filter : public TAO_EC_Filter TAO_EC_Kokyu_Filter& operator= (const TAO_EC_Kokyu_Filter&); /// Initialize our RT_Info handle and dependencies - void init_rt_info (void); + void init_rt_info (); /// Compute a new qos_info to push up. void compute_qos_info (TAO_EC_QOS_Info& qos_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h index 7824e07cfa3e3..a2191c9ab15d5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h @@ -45,7 +45,7 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Filter_Builder : public TAO_EC_Filter TAO_EC_Kokyu_Filter_Builder (TAO_EC_Event_Channel_Base* ec); /// destructor... - virtual ~TAO_EC_Kokyu_Filter_Builder (void); + virtual ~TAO_EC_Kokyu_Filter_Builder (); // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h index 74dfe4af919a5..b850ebd6723af 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h @@ -42,7 +42,7 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Scheduling : public TAO_EC_Scheduling TAO_EC_Kokyu_Scheduling (RtecScheduler::Scheduler_ptr scheduler); /// Destructor - virtual ~TAO_EC_Kokyu_Scheduling (void); + virtual ~TAO_EC_Kokyu_Scheduling (); virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, @@ -56,7 +56,7 @@ class TAO_RTKokyuEvent_Export TAO_EC_Kokyu_Scheduling : public TAO_EC_Scheduling TAO_EC_Kokyu_Scheduling& operator= (const TAO_EC_Kokyu_Scheduling&); /// Initialize our RT_Info handle and dependencies - void init_rt_info (void); + void init_rt_info (); private: /// The scheduler we are going to use diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h index f95099e6ab0f7..c97ba05367f86 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h @@ -81,7 +81,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Object_Deactivator PortableServer::POA_var poa () const; private: - /// Disallow. //@{ TAO_EC_Object_Deactivator (const TAO_EC_Object_Deactivator &rhs); @@ -119,13 +118,11 @@ class TAO_RTEvent_Serv_Export TAO_EC_Object_Deactivator class TAO_RTEvent_Serv_Export TAO_EC_Deactivated_Object { public: - /// Set deactivation state to that specified by the @a deactivator /// argument. void set_deactivator (TAO_EC_Object_Deactivator & deactivator); protected: - TAO_EC_Deactivated_Object (); ~TAO_EC_Deactivated_Object (); @@ -158,7 +155,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_ORB_Holder void init (CORBA::ORB_var orb_var); private: - /// Disallow. //@{ TAO_EC_ORB_Holder & operator= (const TAO_EC_ORB_Holder &rhs); @@ -194,7 +190,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Holder void init (RtecEventChannelAdmin::EventChannel_var ec_var); private: - /// Disallow. //@{ TAO_EC_Event_Channel_Holder & operator= (const TAO_EC_Event_Channel_Holder &rhs); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl index f37cc2d6a4bf8..3b11819fdf538 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator (void) +TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator () : poa_ () , id_ () , deactivate_ (0) @@ -20,7 +20,7 @@ TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator ( } ACE_INLINE void -TAO_EC_Object_Deactivator::deactivate (void) +TAO_EC_Object_Deactivator::deactivate () { if (this->deactivate_ && !CORBA::is_nil (this->poa_.in ())) { @@ -37,7 +37,7 @@ TAO_EC_Object_Deactivator::deactivate (void) } ACE_INLINE -TAO_EC_Object_Deactivator::~TAO_EC_Object_Deactivator (void) +TAO_EC_Object_Deactivator::~TAO_EC_Object_Deactivator () { this->deactivate (); } @@ -49,13 +49,13 @@ TAO_EC_Object_Deactivator::poa () const } ACE_INLINE void -TAO_EC_Object_Deactivator::allow_deactivation (void) +TAO_EC_Object_Deactivator::allow_deactivation () { this->deactivate_ = 1; } ACE_INLINE void -TAO_EC_Object_Deactivator::disallow_deactivation (void) +TAO_EC_Object_Deactivator::disallow_deactivation () { this->deactivate_ = 0; } @@ -84,13 +84,13 @@ TAO_EC_Object_Deactivator::set_values (TAO_EC_Object_Deactivator & deactivator) // **************************************************************** ACE_INLINE -TAO_EC_Deactivated_Object::TAO_EC_Deactivated_Object (void) +TAO_EC_Deactivated_Object::TAO_EC_Deactivated_Object () : deactivator_ () { } ACE_INLINE -TAO_EC_Deactivated_Object::~TAO_EC_Deactivated_Object (void) +TAO_EC_Deactivated_Object::~TAO_EC_Deactivated_Object () { // Prevent automatic deactivation in deactivator's destructor. this->deactivator_.disallow_deactivation (); @@ -106,13 +106,13 @@ TAO_EC_Deactivated_Object::set_deactivator ( // **************************************************************** ACE_INLINE -TAO_EC_ORB_Holder::TAO_EC_ORB_Holder (void) +TAO_EC_ORB_Holder::TAO_EC_ORB_Holder () : orb_ () { } ACE_INLINE -TAO_EC_ORB_Holder::~TAO_EC_ORB_Holder (void) +TAO_EC_ORB_Holder::~TAO_EC_ORB_Holder () { if (!CORBA::is_nil (this->orb_.in ())) { @@ -136,13 +136,13 @@ TAO_EC_ORB_Holder::init (CORBA::ORB_var orb_var) // **************************************************************** ACE_INLINE -TAO_EC_Event_Channel_Holder::TAO_EC_Event_Channel_Holder (void) +TAO_EC_Event_Channel_Holder::TAO_EC_Event_Channel_Holder () : ec_ () { } ACE_INLINE -TAO_EC_Event_Channel_Holder::~TAO_EC_Event_Channel_Holder (void) +TAO_EC_Event_Channel_Holder::~TAO_EC_Event_Channel_Holder () { if (!CORBA::is_nil (this->ec_.in ())) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index 6b2ff5f2ae44f..5f8ab69c0feb5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -45,7 +45,7 @@ void activate (T & obj_ref, * * Template argument requirements: * - * Has void execute (void); method which + * Has void execute (); method which * can throw ONLY CORBA exceptions. * Has default and copy constructors. */ @@ -82,7 +82,6 @@ class TAO_EC_Shutdown_Command void execute (); private: - T target_; }; @@ -92,12 +91,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Event/EC_Lifetime_Utils_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Event/EC_Lifetime_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("EC_Lifetime_Utils_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* EC_LIFETIME_UTILS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl index 4b85ab2aaae61..adfe4237b0eca 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_INLINE -TAO_EC_Auto_Command::TAO_EC_Auto_Command (void) +TAO_EC_Auto_Command::TAO_EC_Auto_Command () : command_ () , allow_command_ (false) { @@ -19,7 +19,7 @@ TAO_EC_Auto_Command::TAO_EC_Auto_Command (const T & command) template ACE_INLINE -TAO_EC_Auto_Command::~TAO_EC_Auto_Command (void) +TAO_EC_Auto_Command::~TAO_EC_Auto_Command () { this->execute (); } @@ -46,7 +46,7 @@ TAO_EC_Auto_Command::set_command (TAO_EC_Auto_Command & auto_command) template ACE_INLINE void -TAO_EC_Auto_Command::execute (void) +TAO_EC_Auto_Command::execute () { if (this->allow_command_) { @@ -65,14 +65,14 @@ TAO_EC_Auto_Command::execute (void) template ACE_INLINE void -TAO_EC_Auto_Command::allow_command (void) +TAO_EC_Auto_Command::allow_command () { this->allow_command_ = true; } template ACE_INLINE void -TAO_EC_Auto_Command::disallow_command (void) +TAO_EC_Auto_Command::disallow_command () { this->allow_command_ = false; } @@ -82,7 +82,7 @@ TAO_EC_Auto_Command::disallow_command (void) template ACE_INLINE -TAO_EC_Shutdown_Command::TAO_EC_Shutdown_Command (void) +TAO_EC_Shutdown_Command::TAO_EC_Shutdown_Command () : target_ () { } @@ -96,7 +96,7 @@ TAO_EC_Shutdown_Command::TAO_EC_Shutdown_Command (T target) template ACE_INLINE void -TAO_EC_Shutdown_Command::execute (void) +TAO_EC_Shutdown_Command::execute () { if (this->target_.in ()) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index 0aabbbc08bc30..615034df663ef 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -3,7 +3,6 @@ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index 249dbb9e7ee29..f323262abe06e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Masked_Type_Filter.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Masked_Type_Filter:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index a64fc8b06f1fa..573a860d45543 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Negation_Filter.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 8bc8ff7eab46e..284b0d7d7482a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -18,7 +18,6 @@ #include "tao/ORB_Core.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Null_Factory::TAO_EC_Null_Factory () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp index 141c3bd9b3bf0..a5bf9bac80084 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -7,7 +7,6 @@ #endif /* __ACE_INLINE__ */ - void TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl index c30de3be660d7..22a28750a7201 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl @@ -2,14 +2,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy (void) +TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy () { } // **************************************************************** ACE_INLINE -TAO_EC_Basic_ObserverStrategy::Observer_Entry::Observer_Entry (void) +TAO_EC_Basic_ObserverStrategy::Observer_Entry::Observer_Entry () : handle (0) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 74b29ea94cf96..446b3e72b5f8c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Per_Supplier_Filter:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 9aa1306d3b442..4ef991a850fd5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 1908203fd0b87..8afced46cacef 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -10,7 +10,6 @@ #include "ace/Sched_Params.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index e610319f21ff2..8e6c990492438 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -55,8 +55,8 @@ class TAO_RTSchedEvent_Export TAO_EC_Priority_Dispatching : public TAO_EC_Dispat TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base* ec); // = The EC_Dispatching methods. - virtual void activate (void); - virtual void shutdown (void); + virtual void activate (); + virtual void shutdown (); virtual void push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 7f8bae66487df..a0667e99cd9a1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index 206852bcafcbd..2b9c3de427232 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -41,7 +41,7 @@ class TAO_RTSchedEvent_Export TAO_EC_Priority_Scheduling : public TAO_EC_Schedul TAO_EC_Priority_Scheduling (RtecScheduler::Scheduler_ptr scheduler); /// Destructor - virtual ~TAO_EC_Priority_Scheduling (void); + virtual ~TAO_EC_Priority_Scheduling (); virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, @@ -55,7 +55,7 @@ class TAO_RTSchedEvent_Export TAO_EC_Priority_Scheduling : public TAO_EC_Schedul TAO_EC_Priority_Scheduling& operator= (const TAO_EC_Priority_Scheduling&); /// Initialize our RT_Info handle and dependencies - void init_rt_info (void); + void init_rt_info (); private: /// The scheduler we are going to use diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 68c2c3cb5d8d6..f5636f24b7a9d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -128,7 +128,7 @@ TAO_EC_ProxyPushSupplier::cleanup_i () } void -TAO_EC_ProxyPushSupplier::deactivate () throw () +TAO_EC_ProxyPushSupplier::deactivate () noexcept { try { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 65e699545b2e1..9cd3b7ac0a5ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -69,7 +69,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_ProxyPushSupplier : public TAO_EC_Filter RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) = 0; /// Deactivate from the POA - virtual void deactivate () throw (); + virtual void deactivate () noexcept; /// Disconnect this from virtual void disconnect_push_supplier () = 0; @@ -186,7 +186,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_ProxyPushSupplier : public TAO_EC_Filter /// Validate the connection to consumer on connect int consumer_validate_connection_; private: - /// Template method hooks. virtual void refcount_zero_hook (); virtual void pre_dispatch_hook (RtecEventComm::EventSet&); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl index 72b948b752f3d..06c05097c76eb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -TAO_EC_ProxyPushSupplier::suspend_connection_i (void) +TAO_EC_ProxyPushSupplier::suspend_connection_i () { this->suspended_ = 1; } ACE_INLINE void -TAO_EC_ProxyPushSupplier::suspend_connection_locked (void) +TAO_EC_ProxyPushSupplier::suspend_connection_locked () { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -19,13 +19,13 @@ TAO_EC_ProxyPushSupplier::suspend_connection_locked (void) } ACE_INLINE void -TAO_EC_ProxyPushSupplier::resume_connection_i (void) +TAO_EC_ProxyPushSupplier::resume_connection_i () { this->suspended_ = 0; } ACE_INLINE void -TAO_EC_ProxyPushSupplier::resume_connection_locked (void) +TAO_EC_ProxyPushSupplier::resume_connection_locked () { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp index 8c5b302c91792..0f6ee7e7b58a0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() ( - RtecEventComm::PushSupplier_ptr supplier) throw () + RtecEventComm::PushSupplier_ptr supplier) noexcept { try { @@ -23,7 +23,7 @@ TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() ( void TAO_EC_Consumer_Proxy_Disconnect_Functor::operator() ( - RtecEventComm::PushConsumer_ptr consumer) throw () + RtecEventComm::PushConsumer_ptr consumer) noexcept { try { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h index bee04b5b3c740..4a5b4f7d90b97 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h @@ -24,7 +24,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Supplier_Proxy_Disconnect_Functor typedef RtecEventComm::PushSupplier_ptr argument; /// Disconnect from @c supplier - void operator() (RtecEventComm::PushSupplier_ptr supplier) throw (); + void operator() (RtecEventComm::PushSupplier_ptr supplier) noexcept; }; /** @@ -39,7 +39,6 @@ typedef ACE_Utils::Auto_Functor< TAO_EC_Supplier_Proxy_Disconnector; - /** * @struct TAO_EC_Consumer_Proxy_Disconnect_Functor * @@ -50,7 +49,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Consumer_Proxy_Disconnect_Functor typedef RtecEventComm::PushConsumer_ptr argument; /// Disconnect from @c consumer - void operator() (RtecEventComm::PushConsumer_ptr consumer) throw (); + void operator() (RtecEventComm::PushConsumer_ptr consumer) noexcept; }; /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl index e1ee9410d4b62..f75178c929aa0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_QOS_Info::TAO_EC_QOS_Info (void) +TAO_EC_QOS_Info::TAO_EC_QOS_Info () : rt_info (-1), preemption_priority (0), timer_id_ (-1) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index 07ecf59d97cb9..64a79b50eff24 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -2,7 +2,6 @@ #include "tao/RTCORBA/Priority_Mapping.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_RTCORBA_Dispatching:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h index efb1073bf29e5..5c09eb5787105 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h @@ -40,11 +40,11 @@ class TAO_RTCORBAEvent_Export TAO_EC_RTCORBA_Dispatching : public TAO_EC_Dispatc RTCORBA::Current_ptr current); /// Destructor - ~TAO_EC_RTCORBA_Dispatching (void); + ~TAO_EC_RTCORBA_Dispatching (); // = The EC_Dispatching methods. - virtual void activate (void); - virtual void shutdown (void); + virtual void activate (); + virtual void shutdown (); virtual void push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index 8c0d8d3723a14..4d12df4083eb3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -4,7 +4,6 @@ #include "tao/RTCORBA/Priority_Mapping_Manager.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_RTCORBA_Factory:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h index d643250f73529..492ccc63240c2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h @@ -41,7 +41,7 @@ class TAO_RTCORBAEvent_Export TAO_EC_RTCORBA_Factory : public TAO_EC_Factory const RTCORBA::ThreadpoolLanes &lanes); /// destructor... - virtual ~TAO_EC_RTCORBA_Factory (void); + virtual ~TAO_EC_RTCORBA_Factory (); // Decorated methods... virtual int init (int argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 585b4a0e10e66..662a83b1532b7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Reactive_ConsumerControl:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp index 1a2dee5f5d912..0148937adc8b8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp @@ -2,7 +2,6 @@ #include "orbsvcs/Event/EC_ProxySupplier.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index b76dc2aa4e713..a4edbf59e4354 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Reactive_SupplierControl:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index edc5a380c27d3..2404a9287d6a2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -15,7 +15,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h index c2968bd282143..7174244826be9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h @@ -33,10 +33,10 @@ class TAO_RTSchedEvent_Export TAO_EC_Sched_Factory : public TAO_EC_Default_Facto { public: /// Constructor - TAO_EC_Sched_Factory (void); + TAO_EC_Sched_Factory (); /// destructor... - virtual ~TAO_EC_Sched_Factory (void); + virtual ~TAO_EC_Sched_Factory (); // = The Service_Object entry points virtual int init (int argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl index 707e9dbd4e2c3..7c4c07c27b283 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Sched_Factory::TAO_EC_Sched_Factory (void) +TAO_EC_Sched_Factory::TAO_EC_Sched_Factory () : TAO_EC_Default_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 99a0693f1f7de..749f4fabdd49e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -3,7 +3,6 @@ #include "orbsvcs/Log_Macros.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Sched_Filter:: @@ -208,7 +207,6 @@ TAO_EC_Sched_Filter::init_rt_info () ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), this->name_.c_str ())); - } #endif /* 0 */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index 83731da39465b..1998c4a2daa00 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -56,7 +56,7 @@ class TAO_RTSchedEvent_Export TAO_EC_Sched_Filter : public TAO_EC_Filter RtecScheduler::Info_Type_t info_type); /// Destructor - virtual ~TAO_EC_Sched_Filter (void); + virtual ~TAO_EC_Sched_Filter (); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. @@ -71,7 +71,7 @@ class TAO_RTSchedEvent_Export TAO_EC_Sched_Filter : public TAO_EC_Filter TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); + virtual void clear (); virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, @@ -83,7 +83,7 @@ class TAO_RTSchedEvent_Export TAO_EC_Sched_Filter : public TAO_EC_Filter TAO_EC_Sched_Filter& operator= (const TAO_EC_Sched_Filter&); /// Initialize our RT_Info handle and dependencies - void init_rt_info (void); + void init_rt_info (); /// Compute a new qos_info to push up. void compute_qos_info (TAO_EC_QOS_Info& qos_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 3df2fa9f38675..ca4940982e9c5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -14,7 +14,6 @@ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h index 110a2cbee860f..63a08561ba728 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h @@ -45,7 +45,7 @@ class TAO_RTSchedEvent_Export TAO_EC_Sched_Filter_Builder : public TAO_EC_Filter TAO_EC_Sched_Filter_Builder (TAO_EC_Event_Channel_Base* ec); /// destructor... - virtual ~TAO_EC_Sched_Filter_Builder (void); + virtual ~TAO_EC_Sched_Filter_Builder (); // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp index ea13e8047b400..778c2086f3981 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp @@ -2,7 +2,6 @@ #include "orbsvcs/Event/EC_QOS_Info.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index 6216f869b2c2f..731897ae5aa34 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -59,7 +59,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Scheduling_Strategy virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter) = 0; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index e31589276a410..dc6f1409a96ed 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -7,7 +7,6 @@ #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index 5519b5b9022a7..c91a5ce03f595 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_SupplierControl.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_SupplierControl::TAO_EC_SupplierControl () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index 46ea1b4e70e9d..6efc05751f23d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -7,7 +7,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp index 446058b3f4576..ab0001257513d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index 52af0795fc300..827973d288f1f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_strings.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL unsigned long TAO_EC_TPC_debug_level; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp index a08142d98ab76..fc4299bf109e1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp @@ -7,7 +7,6 @@ #include "ace/Sched_Params.h" - #define TETFSF(flag) { #flag, flag } TAO_EC_Thread_Flags::Supported_Flag TAO_EC_Thread_Flags::supported_flags_[] = { #if defined (ACE_HAS_THREADS) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h index 81f87cf51b51e..185e3182d64fd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h @@ -90,7 +90,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Thread_Flags long default_priority () const; - struct Supported_Flag { const char* n; /// Flag name, e.g., THR_NEW_LWP diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl index 9b8c73a7755dd..6686bfd24367c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter (void) +TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index 1ec13c1e230cc..713dc5e93f7d6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -7,7 +7,6 @@ #include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug - // **************************************************************** TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index 56ec593b2ead4..15e693cfc8567 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Type_Filter.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header) diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 3768edc213e64..444d5e710c3c4 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -215,7 +215,6 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q buf, qos.publications[i].dependency_info.number_of_calls)); } ORBSVCS_DEBUG ((LM_DEBUG, "}\n")); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.inl b/TAO/orbsvcs/orbsvcs/Event_Utilities.inl index 23ec7c5559d13..a6267b2977423 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.inl +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.inl @@ -46,7 +46,7 @@ ACE_ConsumerQOS_Factory::insert_bitmasked_value (CORBA::ULong source_mask, } ACE_INLINE int -ACE_ConsumerQOS_Factory::insert_null_terminator (void) +ACE_ConsumerQOS_Factory::insert_null_terminator () { RtecEventChannelAdmin::Dependency dependency; if (this->event_initializer_ != 0) @@ -121,13 +121,13 @@ ACE_ConsumerQOS_Factory::insert_act (RtecEventComm::EventData act) } ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS& -ACE_ConsumerQOS_Factory::get_ConsumerQOS (void) +ACE_ConsumerQOS_Factory::get_ConsumerQOS () { return qos_; } ACE_INLINE -ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& (void) +ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& () { return qos_; } @@ -135,13 +135,13 @@ ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& (voi // ************************************************************ ACE_INLINE const RtecEventChannelAdmin::SupplierQOS& -ACE_SupplierQOS_Factory::get_SupplierQOS (void) +ACE_SupplierQOS_Factory::get_SupplierQOS () { return qos_; } ACE_INLINE -ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& (void) +ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& () { return qos_; } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h index e07bb62982e5d..029d297772d0f 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h @@ -36,13 +36,11 @@ class TAO_FT_ClientORBInitializer , public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register FTCORBA policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 697bfb25d956a..1c03d5c3e2b2b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -10,7 +10,6 @@ TAO_FT_ClientPolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val) { - if (type == FT::REQUEST_DURATION_POLICY) return TAO_FT_Request_Duration_Policy::create (val); else if (type == FT::HEARTBEAT_POLICY) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h index 77af6b0532ab0..23c63bfb18e56 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h @@ -39,7 +39,6 @@ class TAO_FT_ClientPolicyFactory , public ::CORBA::LocalObject { public: - virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value); }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index f320334385535..26f075f4eb251 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -11,7 +11,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TimeBase::TimeT diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index 379bc6d240b25..4067c0f52369e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h @@ -45,7 +45,6 @@ class TAO_FT_Request_Duration_Policy public ::CORBA::LocalObject { public: - /// Constructor. TAO_FT_Request_Duration_Policy (const TimeBase::TimeT& relative_expiry); @@ -60,7 +59,7 @@ class TAO_FT_Request_Duration_Policy virtual TAO_FT_Request_Duration_Policy *clone () const; // = The FT::RequestDurationPolicy methods - virtual TimeBase::TimeT request_duration_policy_value (void); + virtual TimeBase::TimeT request_duration_policy_value (); virtual CORBA::PolicyType policy_type (); @@ -90,7 +89,6 @@ class TAO_FT_Heart_Beat_Policy public ::CORBA::LocalObject { public: - /// Constructor. TAO_FT_Heart_Beat_Policy (const CORBA::Boolean boolean, const TimeBase::TimeT &interval, @@ -107,7 +105,7 @@ class TAO_FT_Heart_Beat_Policy virtual TAO_FT_Heart_Beat_Policy *clone () const; // = The FT::HeartBeatPolicy methods - virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void); + virtual FT::HeartbeatPolicyValue heartbeat_policy_value (); virtual CORBA::PolicyType policy_type (); @@ -120,7 +118,6 @@ class TAO_FT_Heart_Beat_Policy const TimeBase::TimeT &timebase); private: - // The attributes /// indicates whether heartbeating is enabled or not. CORBA::Boolean heartbeat_; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index 51faf3010a7c3..44d849d394b29 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -33,7 +33,6 @@ namespace TAO // Would be nice to have runtime option. ACE_NEW (this->lock_, ACE_Lock_Adapter); - } FT_ClientRequest_Interceptor::~FT_ClientRequest_Interceptor () @@ -269,7 +268,6 @@ namespace TAO } // Add this context to the service context list. ri->add_request_service_context (sc, 0); - } catch (const CORBA::Exception&) { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h index 7545b9f3f2f2b..aadb44617cf72 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h @@ -70,14 +70,13 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - - FT_ClientRequest_Interceptor (void); + FT_ClientRequest_Interceptor (); /// Canonical name of the interceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); @@ -92,11 +91,9 @@ namespace TAO void ft_send_extended_sc (CORBA::Boolean send); protected: - - ~FT_ClientRequest_Interceptor (void); + ~FT_ClientRequest_Interceptor (); private: - void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri, IOP::TaggedComponent* tp); @@ -105,7 +102,6 @@ namespace TAO TimeBase::TimeT request_expiration_time (CORBA::Policy *policy); private: - /// Name of the interceptor const char *name_; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h index 5ae348298680f..943e53fa019c6 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h @@ -39,13 +39,12 @@ class TAO_Service_Callbacks; */ class TAO_FT_ClientORB_Export TAO_FT_ClientService_Activate : public TAO_Services_Activate { - public: /// Constructor - TAO_FT_ClientService_Activate (void); + TAO_FT_ClientService_Activate (); /// The destructor - virtual ~TAO_FT_ClientService_Activate (void); + virtual ~TAO_FT_ClientService_Activate (); /** * Create and activate the service callbacks into the orb. @@ -55,7 +54,7 @@ class TAO_FT_ClientORB_Export TAO_FT_ClientService_Activate : public TAO_Service virtual TAO_Service_Callbacks *activate_services (TAO_ORB_Core *orb); /// Used to force the initialization. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h index c940fcd66a27a..fb87f562364c6 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h @@ -41,19 +41,17 @@ class TAO_FT_ClientORB_Export TAO_FT_Endpoint_Selector_Factory : public TAO_Endpoint_Selector_Factory { public: - /// Constructor. - TAO_FT_Endpoint_Selector_Factory (void); + TAO_FT_Endpoint_Selector_Factory (); /// Destructor. - virtual ~TAO_FT_Endpoint_Selector_Factory (void); + virtual ~TAO_FT_Endpoint_Selector_Factory (); /// Get an Invocation's endpoint selection strategy and /// initialize the endpoint selection state instance. virtual TAO_Invocation_Endpoint_Selector *get_selector (); private: - /// The possible endpoint selector strategies that can be /// returned by this factory TAO_FT_Invocation_Endpoint_Selector *ft_endpoint_selector_; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index fd5333e870bb7..2875d17ab8342 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -64,7 +64,6 @@ TAO_FT_IOGR_Property::set_property ( // Success return 1; - } @@ -83,7 +82,6 @@ CORBA::Object_ptr TAO_FT_IOGR_Property::get_primary ( CORBA::Object_ptr ior) { - TAO_Profile *pfile = this->get_primary_profile (ior); @@ -139,7 +137,6 @@ TAO_FT_IOGR_Property::get_primary ( stub = safe_stub.release (); return new_obj._retn (); - } @@ -275,7 +272,6 @@ TAO_FT_IOGR_Property::encode_properties ( i != 0; i = i->cont ()) { - ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); buf += i->length (); } @@ -339,7 +335,6 @@ TAO_FT_IOGR_Property::get_tagged_component ( i < mprofile.profile_count (); i++) { - // Get the Tagged Components const TAO_Tagged_Components &pfile_tagged = mprofile.get_profile (i)->tagged_components (); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index 2030c2ce1e5bf..d3e6fdf8935c9 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -53,14 +53,13 @@ class TAO_FT_ORB_Utils_Export TAO_FT_IOGR_Property public virtual ::CORBA::LocalObject { public: - /// Our Constructor TAO_FT_IOGR_Property (FT::TagFTGroupTaggedComponent &ft_group); - TAO_FT_IOGR_Property (void); + TAO_FT_IOGR_Property (); /// Destructor - ~TAO_FT_IOGR_Property (void); + ~TAO_FT_IOGR_Property (); /// Set the property for the IOGR virtual CORBA::Boolean set_property ( @@ -92,7 +91,6 @@ class TAO_FT_ORB_Utils_Export TAO_FT_IOGR_Property FT::TagFTGroupTaggedComponent &ft_group) const; private: - /// An helper function that gets the primary profile from the TAO_Profile *get_primary_profile (CORBA::Object_ptr ior); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl index 2c4dfc673ce63..26839c1ca0e70 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl @@ -10,13 +10,13 @@ TAO_FT_IOGR_Property::TAO_FT_IOGR_Property ( } ACE_INLINE -TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (void) +TAO_FT_IOGR_Property::TAO_FT_IOGR_Property () :ft_group_tagged_component_ (0) { } ACE_INLINE -TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property (void) +TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h index 13abc9d8c9c8a..6682090883487 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h @@ -44,13 +44,12 @@ class TAO_Profile; class TAO_FT_ClientORB_Export TAO_FT_Invocation_Endpoint_Selector : public TAO_Default_Endpoint_Selector { - public: /// Constructor. - TAO_FT_Invocation_Endpoint_Selector (void); + TAO_FT_Invocation_Endpoint_Selector (); /// Destructor. - virtual ~TAO_FT_Invocation_Endpoint_Selector (void); + virtual ~TAO_FT_Invocation_Endpoint_Selector (); /// Implementation for FT. Please refer to /// $TAO_ROOT/tao/Invocation_Endpoint_Selectors.h for details of @@ -77,8 +76,6 @@ class TAO_FT_ClientORB_Export TAO_FT_Invocation_Endpoint_Selector : /// Helper method that checks whether the profile is a primary or /// not. bool check_profile_for_primary (TAO_Profile *); - - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h index d01446d25ab02..47b9b4adb03d3 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h @@ -37,13 +37,11 @@ class TAO_FT_ORBInitializer , public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register FTCORBA policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h index e6e78f463cfe5..fa88107faefd4 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h @@ -29,19 +29,16 @@ class TAO_FT_ServerORBInitializer , public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register FTCORBA policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); /// Register the necessary interceptors. void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index 39bfddf8c5374..599125a580255 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -11,7 +11,6 @@ TAO_FT_ServerPolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val) { - if (type == FT::HEARTBEAT_ENABLED_POLICY) return TAO_FT_Heart_Beat_Enabled_Policy::create (val); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h index 8955540c4d32f..f11eb4fc675c1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h @@ -39,7 +39,6 @@ class TAO_FT_ServerPolicyFactory , public ::CORBA::LocalObject { public: - virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value); }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp index 195f5c2bdce46..813e82221fabb 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index 8c6351a747586..a63ae4c0db035 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h @@ -33,7 +33,6 @@ class TAO_FT_Heart_Beat_Enabled_Policy , public ::CORBA::LocalObject { public: - /// Constructor. TAO_FT_Heart_Beat_Enabled_Policy (const CORBA::Boolean boolean); @@ -59,7 +58,6 @@ class TAO_FT_Heart_Beat_Enabled_Policy virtual void destroy (); private: - /// indicates whether heartbeating is enabled or not. CORBA::Boolean heartbeat_enabled_value_; }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h index 9b9b73dcc7be0..998229a9e3a0b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h @@ -50,12 +50,11 @@ namespace TAO , public virtual ::CORBA::LocalObject { public: - /// Constructor. - FT_ServerRequest_Interceptor (void); + FT_ServerRequest_Interceptor (); /// Destructor. - ~FT_ServerRequest_Interceptor (void); + ~FT_ServerRequest_Interceptor (); /** * @name Methods Required by the Server Request Interceptor @@ -67,9 +66,9 @@ namespace TAO */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri); @@ -87,14 +86,12 @@ namespace TAO PortableInterceptor::ServerRequestInfo_ptr ri); //@} private: - void check_iogr_version (const IOP::ServiceContext &svc); void update_iogr ( PortableInterceptor::ServerRequestInfo_ptr ri); private: - CORBA::ULong object_group_ref_version_; CORBA::Boolean is_primary_; @@ -103,7 +100,6 @@ namespace TAO CORBA::ORB_var orb_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h index b6b3ed984b7c3..14c9d4e103f1c 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h @@ -37,17 +37,15 @@ class TAO_Service_Callbacks; class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate : public ACE_Service_Object { - public: /// Constructor - TAO_FT_ServerService_Activate (void); + TAO_FT_ServerService_Activate (); /// The destructor - virtual ~TAO_FT_ServerService_Activate (void); + virtual ~TAO_FT_ServerService_Activate (); /// Used to force the initialization. - static int Initializer (void); - + static int Initializer (); }; static int diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp index 3b584bae7fbd8..b5ffc6489bff2 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp @@ -10,11 +10,11 @@ static bool initialized = false; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Service_Activate::TAO_FT_Service_Activate (void) +TAO_FT_Service_Activate::TAO_FT_Service_Activate () { } -TAO_FT_Service_Activate::~TAO_FT_Service_Activate (void) +TAO_FT_Service_Activate::~TAO_FT_Service_Activate () { } @@ -34,7 +34,7 @@ TAO_FT_Service_Activate::activate_services (TAO_ORB_Core *orb_core) int -TAO_FT_Service_Activate::Initializer (void) +TAO_FT_Service_Activate::Initializer () { if (initialized == false) { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 2e87871cfb0e3..9133eee20a7a8 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -82,7 +82,6 @@ TAO_FT_Service_Callbacks::object_is_nil (CORBA::Object_ptr obj) // If it reaches here then it should be nill return true; - } TAO_Service_Callbacks::Profile_Equivalence diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index 12ab8f07bca5f..ff12b16364ad7 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -45,7 +45,7 @@ class TAO_FT_ClientORB_Export TAO_FT_Service_Callbacks : public TAO_Service_Call TAO_FT_Service_Callbacks (TAO_ORB_Core *); /// Dtor - virtual ~TAO_FT_Service_Callbacks (void); + virtual ~TAO_FT_Service_Callbacks (); /// Select the profile from MProfile as the needs of the services /// may be. Return the profile in @a pfile @@ -83,15 +83,13 @@ class TAO_FT_ClientORB_Export TAO_FT_Service_Callbacks : public TAO_Service_Call IOP::ServiceContextList &clist, TAO_Profile *profile); - static TimeBase::TimeT now (void); + static TimeBase::TimeT now (); private: - /// Check whether the right flags are available so that we can issue a /// restart. CORBA::Boolean restart_policy_check (IOP::ServiceContextList &service_list, const TAO_Profile *profile); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h index fadd913af8065..700e13be529d4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h @@ -45,9 +45,9 @@ class FTRT_ClientORB_Interceptor virtual ~FTRT_ClientORB_Interceptor (); /// Canonical name of the interceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h index b3b7c97a97a0a..23f28cdca78d3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h @@ -29,15 +29,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; namespace TAO_FTRT { - class TAO_FTRT_Export FTRT_ClientORB_Loader : public ACE_Service_Object { public: /// Constructor. - FTRT_ClientORB_Loader (void); + FTRT_ClientORB_Loader (); /// Destructor. - virtual ~FTRT_ClientORB_Loader (void); + virtual ~FTRT_ClientORB_Loader (); /// Initialize the TransactionDepth loader hooks. virtual int init (int argc, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h index 9ffd20d4a1704..b18e86faabf57 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h @@ -42,9 +42,9 @@ class AMI_Primary_Replication_Strategy : public Replication_Strategy const FtRtecEventChannelAdmin::ObjectId& oid); virtual void add_member(const FTRT::ManagerInfo & info, CORBA::ULong object_group_ref_version); - virtual int acquire_read (void); - virtual int acquire_write (void); - virtual int release (void); + virtual int acquire_read (); + virtual int acquire_write (); + virtual int release (); PortableServer::POA_ptr poa() { return poa_.in(); } CORBA::ORB_ptr orb() { return orb_.in();} private: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h index 4fd7c56358bab..798630154328b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h @@ -43,9 +43,9 @@ class AMI_Replication_Strategy : public Replication_Strategy CORBA::ULong object_group_ref_version); virtual Replication_Strategy* make_primary_strategy(); - virtual int acquire_read (void); - virtual int acquire_write (void); - virtual int release (void); + virtual int acquire_read (); + virtual int acquire_write (); + virtual int release (); private: bool mt_; }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h index ce33c43dcefa1..040c75ff3b213 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h @@ -33,7 +33,7 @@ class Basic_Replication_Strategy : public Replication_Strategy Basic_Replication_Strategy(bool mt); ~Basic_Replication_Strategy(); - virtual void check_validity(void); + virtual void check_validity(); virtual void replicate_request(const FTRT::State& state, RollbackOperation rollback, @@ -41,9 +41,9 @@ class Basic_Replication_Strategy : public Replication_Strategy virtual void add_member(const FTRT::ManagerInfo & info, CORBA::ULong object_group_ref_version); - virtual int acquire_read (void); - virtual int acquire_write (void); - virtual int release (void); + virtual int acquire_read (); + virtual int acquire_write (); + virtual int release (); private: FTRT::SequenceNumber sequence_num_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp index cf79e91b2a7c9..9972e1140e427 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp @@ -7,7 +7,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template int ConnectionAcceptHandler::open (void * acceptor) { - ACE_TRACE("ConnectionAcceptHandler::open\n"); ACE_INET_Addr addr; @@ -30,7 +29,7 @@ int ConnectionAcceptHandler::open (void * acceptor) } template -void ConnectionAcceptHandler::destroy (void) +void ConnectionAcceptHandler::destroy () { // Remove ourselves from the reactor reactor_->remove_handler diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h index cf3b2612c9f8d..3dc26fcd92455 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h @@ -26,10 +26,9 @@ class ConnectionAcceptHandler : public ACE_Svc_Handler connect_push_supplier(push_supplier, qos); - } void diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index 11214925e1cee..700dae638477d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -26,8 +26,6 @@ class TAO_FTRTEC_Export TAO_FTEC_Event_Channel : public POA_FtRtecEventChannelAdmin::EventChannel { public: - - TAO_FTEC_Event_Channel(CORBA::ORB_var orb, PortableServer::POA_var poa); @@ -62,12 +60,12 @@ class TAO_FTRTEC_Export TAO_FTEC_Event_Channel /// RtecEventChannelAdmin::EventChannel Interface virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void); + for_consumers (); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void); + for_suppliers (); - virtual void destroy (void); + virtual void destroy (); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr observer); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 1a346c323855d..b36fce844bfbe 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -187,7 +187,6 @@ TAO_FTEC_Event_Channel_Impl::TAO_FTEC_Event_Channel_Impl( CORBA::Object::_duplicate (attributes.scheduler); this->create_strategies (); - } TAO_FTEC_Event_Channel_Impl::~TAO_FTEC_Event_Channel_Impl() @@ -210,7 +209,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( const FtRtecEventComm::ObjectId& supplier_admin_oid, const FtRtecEventComm::ObjectId& consumer_admin_oid) { - iogr_maker_.init(orb.in()); TAO_EC_Event_Channel_Base::activate(); @@ -221,7 +219,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( } - // = The RtecEventChannelAdmin::EventChannel methods... /// The default implementation is: /// this->consumer_admin ()->_this (); @@ -414,7 +411,6 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s) } (update_table[op->param._d()])(this, *op); - } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h index ce4067245ddaa..6df055746ff20 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -46,11 +46,11 @@ class TAO_FTEC_Event_Channel_Impl : public TAO_EC_Event_Channel_Base // = The RtecEventChannelAdmin::EventChannel methods... virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void); + for_consumers (); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void); + for_suppliers (); void get_state (FtRtecEventChannelAdmin::EventChannelState & s); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h index 2af1bb605842d..df517e027b185 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h @@ -23,7 +23,7 @@ class TAO_FTEC_Basic_Factory : public TAO_EC_Default_Factory { public: /// Constructor - TAO_FTEC_Basic_Factory (void); + TAO_FTEC_Basic_Factory (); virtual TAO_EC_ConsumerAdmin* create_consumer_admin (TAO_EC_Event_Channel_Base*); virtual TAO_EC_SupplierAdmin* diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index 7d74d1cd4fc24..f7ea13c4b6835 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -16,7 +16,6 @@ void FTEC_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - Request_Context_Repository().allocate_slots(info); PortableInterceptor::ClientRequestInterceptor_var client_interceptor; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index a2715144718d9..a3e7005a4258e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -38,7 +38,7 @@ class TAO_FTEC_ProxyPushConsumer : public TAO_EC_Default_ProxyPushConsumer virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); const FtRtecEventChannelAdmin::ObjectId& id() const; void get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index c962ed0542ae9..9f10f46185cde 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -26,7 +26,6 @@ void TAO_FTEC_ProxyPushSupplier::activate ( RtecEventChannelAdmin::ProxyPushSupplier_ptr &result) { - result = RtecEventChannelAdmin::ProxyPushSupplier::_nil(); try{ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index 9e90fabda7e29..3f628c1aef31b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -38,9 +38,9 @@ class TAO_FTEC_ProxyPushSupplier : public TAO_EC_Default_ProxyPushSupplier virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos); - virtual void disconnect_push_supplier (void); - virtual void suspend_connection (void); - virtual void resume_connection (void); + virtual void disconnect_push_supplier (); + virtual void suspend_connection (); + virtual void resume_connection (); const FtRtecEventChannelAdmin::ObjectId& id() const; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h index ec5d82947ef13..e6903983dfafc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -57,12 +57,12 @@ class TAO_FTEC_SupplierAdmin TAO_FTEC_SupplierAdmin (TAO_EC_Event_Channel_Base* event_channel); /// destructor... - virtual ~TAO_FTEC_SupplierAdmin (void); + virtual ~TAO_FTEC_SupplierAdmin (); // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void); + obtain_push_consumer (); void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj); }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h index 6b2201c1c7de9..ee21cd18f3668 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -36,7 +36,6 @@ class FT_ProxyAdmin_Base CORBA::Object_var reference() const; protected: - PortableServer::ServantBase* servant_; /// Store the default POA. PortableServer::POA_var poa_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp index a2734de491101..61c8466e3cae6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp @@ -38,7 +38,7 @@ FT_ProxyAdmin::obtain_proxy ( template typename FT_ProxyAdmin::ProxyInterface_ptr -FT_ProxyAdmin::obtain_proxy (void) +FT_ProxyAdmin::obtain_proxy () { CORBA::Any_var any = Request_Context_Repository().get_cached_result(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h index 321a9cf12ec2a..8d1444c473e0f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h @@ -31,7 +31,7 @@ class FT_ProxyAdmin : public FT_ProxyAdmin_Base FT_ProxyAdmin(EC_PROXY_ADMIN* admin, PortableServer::POA_var poa); - ProxyInterface_ptr obtain_proxy (void); + ProxyInterface_ptr obtain_proxy (); /// this is used for updating the state void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op); @@ -44,12 +44,6 @@ class FT_ProxyAdmin : public FT_ProxyAdmin_Base TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("FT_ProxyAdmin_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h index a7e4893d49e7b..533295d0a346e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h @@ -42,7 +42,6 @@ class Fault_Detector virtual int parse_conf(int argc, ACE_TCHAR** argv); protected: - class ReactorTask : public ACE_Task_Base { public: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h index 916e7c5082089..10f9477d1c88a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h @@ -35,12 +35,6 @@ class Fault_Detector_T : public Fault_Detector TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Fault_Detector_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 7a7ea02de09f4..376a16b40048d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -122,7 +122,6 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c } - void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { IOP::ServiceContext_var service_context; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h index 7c710ced244d0..9cc00e07e80df 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h @@ -26,9 +26,9 @@ class ForwardCtrlServerInterceptor ForwardCtrlServerInterceptor(); ~ForwardCtrlServerInterceptor(); - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index aa5763720ebca..9cb1ef8e12c67 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -33,7 +33,6 @@ CachedRequestTable::update(const ACE_CString& client_id, } - CORBA::Any CachedRequestTable::get_result(const ACE_CString& client_id) { @@ -97,7 +96,6 @@ retrieve_ft_request_context( if ((cdr >> ft_request_service_context) == 0) throw CORBA::BAD_PARAM (); - } FTRT::TransactionDepth @@ -227,7 +225,6 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn Request_Context_Repository().set_ft_request_service_context(ri, service_context); try{ - FTRT::TransactionDepth transaction_depth = get_transaction_depth_context(ri); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h index 3d239d3d4f47a..b114e41ded6d7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -52,9 +52,9 @@ class FtEventServiceInterceptor : ~FtEventServiceInterceptor(); static FtEventServiceInterceptor* instance(); - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 4e757109620da..b9355cbcd7287 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -15,7 +15,6 @@ GroupInfoPublisherBase::GroupInfoPublisherBase() } - void GroupInfoPublisherBase::subscribe(TAO_FTEC_Become_Primary_Listener* listener) { @@ -46,7 +45,6 @@ GroupInfoPublisherBase::successor() const } - const GroupInfoPublisherBase::BackupList& GroupInfoPublisherBase::backups() const { @@ -54,7 +52,6 @@ GroupInfoPublisherBase::backups() const } - GroupInfoPublisherBase::Info* GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, int my_position, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index f3cc27ee85ede..cda7e49566edf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -164,7 +164,6 @@ IOGR_Maker::copy_ft_group_component(CORBA::Object_ptr ior) if (pfile_tagged.get_component (tagged_components) == 1) { - // Grab the object group version // @@ NOTE: This involves an allocation and a dellocation. This is // really bad. @@ -234,7 +233,6 @@ IOGR_Maker::set_tag_components( iorm_->set_property (&prop, merged); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index b1ea8b8744ee5..cf10ef2f7c544 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTRTEC { - namespace { Identification_Service* service; const char oid[] = "\xF8\xB3\xB1\xFE\xAC\xC6\x07\x11\x02\x0C\x02\x50\xEB\x05\x77\xD0"; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h index 8835c3a1bce7a..278683fe287b5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h @@ -25,15 +25,15 @@ class ObjectGroupManagerHandler virtual void start_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void create_group (void); + virtual void create_group (); virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void add_member (void); + virtual void add_member (); virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void set_state (void); + virtual void set_state (); virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder); private: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h index 962232eeb7c8a..b541ee3dd8675 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h @@ -43,7 +43,7 @@ namespace FTRTEC /** * Used for checking if the incoming replication message is out of sequence. */ - void check_validity(void); + void check_validity(); typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation) (const FtRtecEventChannelAdmin::ObjectId&); @@ -64,9 +64,9 @@ namespace FTRTEC void add_member(const FTRT::ManagerInfo & info, CORBA::ULong object_group_ref_version); - int acquire_read (void); - int acquire_write (void); - int release (void); + int acquire_read (); + int acquire_write (); + int release (); int threads() const; }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h index eb3548f077072..ac2b5d0143122 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h @@ -35,7 +35,7 @@ class Replication_Strategy * used for basic replication strategy. It throws FTRT::OutOfSequence when the * incoming request is not valid. */ - virtual void check_validity(void); + virtual void check_validity(); typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation) (const FtRtecEventChannelAdmin::ObjectId&); @@ -60,10 +60,9 @@ class Replication_Strategy virtual Replication_Strategy* make_primary_strategy(); - virtual int acquire_read (void)=0; - virtual int acquire_write (void)=0; - virtual int release (void)=0; - + virtual int acquire_read () = 0; + virtual int acquire_write () = 0; + virtual int release () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index f146aa999f0dc..6308a9fb6ed06 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -104,7 +104,6 @@ Request_Context_Repository::get_object_id( CORBA::Any_var a = ri->get_slot(object_id_slot); return ::get_object_id(a); - } void @@ -235,7 +234,6 @@ Request_Context_Repository::get_transaction_depth( FTRT::TransactionDepth result=0; a >>= result; return result; - } FTRT::TransactionDepth @@ -249,7 +247,6 @@ Request_Context_Repository::get_transaction_depth() FTRT::TransactionDepth result=0; a >>= result; return result; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h index 9bd5e7faa23c7..6fbf24ee38ebd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h @@ -45,7 +45,6 @@ namespace PortableInterceptor class Request_Context_Repository { public: - void init(CORBA::ORB_ptr orb); /** @@ -57,14 +56,14 @@ class Request_Context_Repository void generate_object_id(FtRtecEventChannelAdmin::ObjectId& object_id); void set_object_id(const FtRtecEventChannelAdmin::ObjectId& object_id); - FtRtecEventChannelAdmin::ObjectId_var get_object_id(void); + FtRtecEventChannelAdmin::ObjectId_var get_object_id(); FtRtecEventChannelAdmin::ObjectId_var get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri); void set_cached_result(PortableInterceptor::ServerRequestInfo_ptr ri, const CORBA::Any& result); - CORBA::Any_ptr get_cached_result(void); + CORBA::Any_ptr get_cached_result(); bool is_executed_request(); void set_sequence_number(PortableInterceptor::ServerRequestInfo_ptr ri, @@ -73,7 +72,7 @@ class Request_Context_Repository void set_sequence_number(FTRT::SequenceNumber); FTRT::SequenceNumber get_sequence_number(PortableInterceptor::ClientRequestInfo_ptr ri); - FTRT::SequenceNumber get_sequence_number(void); + FTRT::SequenceNumber get_sequence_number(); void set_ft_request_service_context( PortableInterceptor::ServerRequestInfo_ptr ri, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h index 569bc0bd46341..554426a370112 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h @@ -44,10 +44,10 @@ class TAO_Set_Update_Interceptor virtual ~TAO_Set_Update_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index c62bf2a1164c1..6321701e45994 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -31,7 +31,6 @@ FTRT::AMI_UpdateableHandler_ptr UpdateableHandler::activate( } - void UpdateableHandler::dispatch(UpdateableHandler::Handler handler) { PortableServer::Current_var current = diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index f4dbc0c53133c..36488e0bbc650 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h @@ -32,16 +32,16 @@ namespace TAO_FTRTEC (PortableServer::POA_ptr poa); RtecEventChannelAdmin::EventChannel_ptr - _this(void); + _this(); //= The RtecEventChannelAdmin::EventChannel methods virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void); + for_consumers (); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void); + for_suppliers (); - virtual void destroy (void); + virtual void destroy (); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr observer); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl index ac9edd8cd7acf..2be05a261b61d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr - FTEC_Gateway::_this(void) + FTEC_Gateway::_this() { PortableServer::POA_var poa = _default_POA(); return activate(poa.in()); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp index 56f1375fc9ba1..96234bbe0888d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { - unsigned int Log::log_level_; #ifndef NDEBUG diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h index 9c88345705f96..44a5b6a5803c9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h @@ -18,7 +18,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { - /** * A utility class for logging messages. */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h index 08e4776a87556..7cc9fb79285be 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h @@ -43,13 +43,13 @@ class ScopeGuardImplBase ~ScopeGuardImplBase() { } - ScopeGuardImplBase(const ScopeGuardImplBase& other) throw() + ScopeGuardImplBase(const ScopeGuardImplBase& other) noexcept : dismissed_(other.dismissed_) { other.Dismiss(); } template - static void SafeExecute(J& j) throw() + static void SafeExecute(J& j) noexcept { if (!j.dismissed_) try @@ -63,10 +63,10 @@ class ScopeGuardImplBase mutable bool dismissed_; public: - ScopeGuardImplBase() throw() : dismissed_(false) + ScopeGuardImplBase() noexcept : dismissed_(false) { } - void Dismiss() const throw() + void Dismiss() const noexcept { dismissed_ = true; } @@ -82,7 +82,7 @@ class ScopeGuardImpl0 : public ScopeGuardImplBase { return ScopeGuardImpl0(fun); } - ~ScopeGuardImpl0() throw() + ~ScopeGuardImpl0() noexcept { SafeExecute(*this); } @@ -111,7 +111,7 @@ class ScopeGuardImpl1 : public ScopeGuardImplBase { return ScopeGuardImpl1(fun, p1); } - ~ScopeGuardImpl1() throw() + ~ScopeGuardImpl1() noexcept { SafeExecute(*this); } @@ -141,7 +141,7 @@ class ScopeGuardImpl2: public ScopeGuardImplBase { return ScopeGuardImpl2(fun, p1, p2); } - ~ScopeGuardImpl2() throw() + ~ScopeGuardImpl2() noexcept { SafeExecute(*this); } @@ -172,7 +172,7 @@ class ScopeGuardImpl3 : public ScopeGuardImplBase { return ScopeGuardImpl3(fun, p1, p2, p3); } - ~ScopeGuardImpl3() throw() + ~ScopeGuardImpl3() noexcept { SafeExecute(*this); } @@ -206,7 +206,7 @@ class ObjScopeGuardImpl0 : public ScopeGuardImplBase { return ObjScopeGuardImpl0(obj, memFun); } - ~ObjScopeGuardImpl0() throw() + ~ObjScopeGuardImpl0() noexcept { SafeExecute(*this); } @@ -235,7 +235,7 @@ class ObjScopeGuardImpl1 : public ScopeGuardImplBase { return ObjScopeGuardImpl1(obj, memFun, p1); } - ~ObjScopeGuardImpl1() throw() + ~ObjScopeGuardImpl1() noexcept { SafeExecute(*this); } @@ -265,7 +265,7 @@ class ObjScopeGuardImpl2 : public ScopeGuardImplBase { return ObjScopeGuardImpl2(obj, memFun, p1, p2); } - ~ObjScopeGuardImpl2() throw() + ~ObjScopeGuardImpl2() noexcept { SafeExecute(*this); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp index 8e717c8681434..a34987a965d59 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp @@ -11,7 +11,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FtRt { - static union { struct diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index 56e8a2fb68c68..92fd68061397c 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -456,7 +456,6 @@ TAO::HTIOP::Acceptor::open_default (TAO_ORB_Core *orb_core, ACE_Auto_Array_Ptr guard (htid); this->addrs_[0] = ACE_TEXT_ALWAYS_CHAR (htid); return 0; - } // Check for multiple network interfaces. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h index 8065b6d832ab6..4bd24ee4777f4 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h @@ -48,7 +48,6 @@ namespace TAO { namespace HTIOP { - // TAO HTIOP_Acceptor concrete call definition /** @@ -67,14 +66,14 @@ namespace TAO int is_inside); /// Destructor. - ~Acceptor (void); + ~Acceptor (); /// @@ Helper method for the implementation repository, should go /// away const ACE::HTBP::Addr& address () const; /// Returns the array of endpoints in this acceptor - const ACE::HTBP::Addr *endpoints (void); + const ACE::HTBP::Addr *endpoints (); typedef TAO_Strategy_Acceptor BASE_ACCEPTOR; typedef Creation_Strategy CREATION_STRATEGY; @@ -98,7 +97,7 @@ namespace TAO int version_minor, const char *options = 0); - virtual int close (void); + virtual int close (); virtual int create_profile (const TAO::ObjectKey &object_key, TAO_MProfile &mprofile, @@ -106,7 +105,7 @@ namespace TAO virtual int is_collocated (const TAO_Endpoint *endpoint); - virtual CORBA::ULong endpoint_count (void); + virtual CORBA::ULong endpoint_count (); virtual int object_key (IOP::TaggedProfile &profile, TAO::ObjectKey &key); @@ -131,7 +130,6 @@ namespace TAO char *&host); protected: - /** * Implement the common part of the open*() methods. This method is * virtual to allow a derived class implementation to be invoked @@ -172,7 +170,6 @@ namespace TAO protected: - /// Array of ACE::HTBP::Addr instances, each one corresponding to a /// given network interface. ACE::HTBP::Addr *addrs_; @@ -206,7 +203,6 @@ namespace TAO TAO_ORB_Core *orb_core_; private: - /// the concrete acceptor, as a pointer to it's base class. BASE_ACCEPTOR base_acceptor_; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl index 66763452d71af..f35d706a1ba49 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl @@ -15,7 +15,7 @@ TAO::HTIOP::Acceptor::address () const } ACE_INLINE const ACE::HTBP::Addr * -TAO::HTIOP::Acceptor::endpoints (void) +TAO::HTIOP::Acceptor::endpoints () { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h index d1a51e63f526f..e63b7c30acc5b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h @@ -102,19 +102,12 @@ namespace TAO /// Pointer to the ORB Core. TAO_ORB_Core *orb_core_; }; - } } TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTIOP_Acceptor_Impl.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* HTIOP_AccePTOR_IMPL_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h index 057d7ebe60966..0f10f16345e6a 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h @@ -34,7 +34,6 @@ namespace TAO { namespace HTIOP { - /** * @class Completion_Handler * @@ -52,7 +51,6 @@ namespace TAO class HTIOP_Export Completion_Handler : public COMPLETION_BASE { - public: Completion_Handler (ACE_Thread_Manager* t = 0); /// Constructor. @@ -60,7 +58,7 @@ namespace TAO CORBA::Boolean = false); /// Destructor. - ~Completion_Handler (void); + ~Completion_Handler (); /// Called by the when the handler is completely /// connected. Argument is unused. @@ -71,7 +69,7 @@ namespace TAO */ virtual int handle_input (ACE_HANDLE); - virtual int resume_handler (void); + virtual int resume_handler (); virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); //@} diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index de51d760b7ec3..6fd2aad59b2ba 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -94,7 +94,6 @@ TAO::HTIOP::Connection_Handler::open (void*) if (local_addr.is_ip_equal (remote_addr) && local_addr.get_port_number () == remote_addr.get_port_number ()) { - if (TAO_debug_level > 0) { ACE_TCHAR remote_as_string[MAXHOSTNAMELEN + 16]; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h index e887ac9480129..8922faf363ad6 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h @@ -33,7 +33,6 @@ namespace TAO { namespace HTIOP { - /** * @class HTIOP_Connection_Handler * @@ -47,16 +46,14 @@ namespace TAO class HTIOP_Export Connection_Handler : public SVC_HANDLER, public TAO_Connection_Handler { - public: - Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. - ~Connection_Handler (void); + ~Connection_Handler (); /// Called by the when the handler is completely /// connected. Argument is unused. @@ -88,8 +85,8 @@ namespace TAO //@{ /** @name Event Handler overloads */ - virtual int resume_handler (void); - virtual int close_connection (void); + virtual int resume_handler (); + virtual int close_connection (); virtual int handle_input (ACE_HANDLE); virtual int handle_output (ACE_HANDLE); virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); @@ -97,7 +94,7 @@ namespace TAO //@} /// Add ourselves to Cache. - int add_transport_to_cache (void); + int add_transport_to_cache (); /// Process the int process_listen_point_list (::HTIOP::ListenPointList &listen_list); @@ -113,7 +110,7 @@ namespace TAO /** * @name TAO_Connection Handler overloads */ - virtual int release_os_resources (void); + virtual int release_os_resources (); virtual int handle_write_ready (const ACE_Time_Value *timeout); //@} diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index abe63a4762033..653d2051a8158 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -115,7 +115,6 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *, TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout) { - /** * \par * Connector is used only in the processes inside the firewall @@ -311,7 +310,6 @@ TAO::HTIOP::Connector::cancel_svc_handler ( return 0; return -1; - } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h index 1e9bfc1fcb759..4c11caf7fa0cd 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h @@ -72,7 +72,7 @@ namespace TAO Connector (ACE::HTBP::Environment *ht_env); /// Destructor. - ~Connector (void); + ~Connector (); /// @} @@ -81,7 +81,7 @@ namespace TAO /// Transport_Connector.h /// {@ int open (TAO_ORB_Core *orb_core); - int close (void); + int close (); TAO_Profile *create_profile (TAO_InputCDR& cdr); @@ -91,7 +91,6 @@ namespace TAO /// @} protected: - // = The TAO_Connector methods, please check the documentation on // Transport_Connector.h int set_validate_endpoint (TAO_Endpoint *ep); @@ -103,7 +102,7 @@ namespace TAO /// More TAO_Connector methods, please check the documentation on /// Transport_Connector.h - virtual TAO_Profile *make_profile (void); + virtual TAO_Profile *make_profile (); /// Cancel the passed cvs handler from the connector /// Its not clear what it means to cancel in HTIOP, since there's no @@ -111,7 +110,6 @@ namespace TAO virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); private: - /// Return the remote endpoint, a helper function Endpoint *remote_endpoint (TAO_Endpoint *ep); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp index 110885ef92e32..ad085c8718484 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp @@ -15,7 +15,6 @@ Connect_Creation_Strategy (ACE_Thread_Manager* t, orb_core_ (orb_core), arg_ (arg) { - } template int diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h index 7369d51747d1a..e55025ea730d7 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h @@ -33,7 +33,6 @@ namespace TAO { namespace HTIOP { - /** * @class HTIOP_Connect_Creation_Strategy * @@ -102,13 +101,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTIOP_Connector_Impl.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*HTIOP_CONNECTOR_IMPL_H*/ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h index 507990b5ffd67..dfb459d35d768 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h @@ -32,7 +32,6 @@ namespace TAO { namespace HTIOP { - class Connection_Handler; /** @@ -45,12 +44,11 @@ namespace TAO class HTIOP_Export Endpoint : public TAO_Endpoint { public: - friend class Profile; friend class TAO_SSLIOP_Profile; /// Default constructor. - Endpoint (void); + Endpoint (); /// Constructor. This is the most efficient constructor since it /// does not require any address resolution processing. @@ -69,24 +67,24 @@ namespace TAO const char *htid); /// Destructor. - ~Endpoint (void); + ~Endpoint (); // = Implementation of abstract TAO_Endpoint methods. See // Endpoint.h for their documentation. - virtual TAO_Endpoint *next (void); + virtual TAO_Endpoint *next (); virtual int addr_to_string (char *buffer, size_t length); - virtual void reset_hint (void); + virtual void reset_hint (); /// Makes a copy of - virtual TAO_Endpoint *duplicate (void); + virtual TAO_Endpoint *duplicate (); /// Return true if this endpoint is equivalent to @a other_endpoint. Two /// endpoints are equivalent if their port and host are the same. CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint); /// Return a hash value for this object. - CORBA::ULong hash (void); + CORBA::ULong hash (); // Allocates memory and returns a copy of @@ -117,11 +115,10 @@ namespace TAO /// This object maintains ownership of this string. const char *htid (const char *h); - //Connection_Handler *&hint (void); + //Connection_Handler *&hint (); // Access to our . private: - /// Helper method for setting INET_Addr. int set (const ACE::HTBP::Addr &addr, int use_dotted_decimal_addresses); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h index 473fded98724b..8111e75da0c81 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h @@ -38,12 +38,11 @@ namespace TAO { namespace HTIOP { - class HTIOP_Export Protocol_Factory : public TAO_Protocol_Factory { public: - Protocol_Factory (void); - virtual ~Protocol_Factory (void); + Protocol_Factory (); + virtual ~Protocol_Factory (); // = Service Configurator hooks. /// Dynamic linking hook @@ -60,8 +59,8 @@ namespace TAO virtual char options_delimiter () const; // = Check Protocol_Factory.h for a description of these methods. - virtual TAO_Acceptor *make_acceptor (void); - virtual TAO_Connector *make_connector (void); + virtual TAO_Acceptor *make_acceptor (); + virtual TAO_Connector *make_connector (); virtual int requires_explicit_endpoint () const; private: diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 624829ef98d11..a70b23bbf4ba5 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -85,7 +85,6 @@ TAO::HTIOP::Profile::~Profile () int TAO::HTIOP::Profile::decode_profile (TAO_InputCDR& cdr) { - // Decode host and port into the . if (cdr.read_string (this->endpoint_.host_.out ()) == 0 || cdr.read_ushort (this->endpoint_.port_) == 0 @@ -316,7 +315,6 @@ TAO::HTIOP::Profile::to_string () const } - const char * TAO::HTIOP::Profile::prefix () { diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h index 86f83a5222efc..4fe2f1cb8e8fb 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h @@ -35,7 +35,6 @@ namespace TAO { namespace HTIOP { - // TAO HTIOP_Profile concrete Profile definitions /** * @class HTIOP_Profile @@ -54,7 +53,7 @@ namespace TAO virtual char object_key_delimiter () const; /// Return the char string prefix. - static const char *prefix (void); + static const char *prefix (); /// Profile constructor, same as above except the object_key has /// already been marshaled. @@ -77,7 +76,7 @@ namespace TAO Profile (TAO_ORB_Core *orb_core); /// Destructor is to be called only through <_decr_refcnt>. - ~Profile (void); + ~Profile (); /** * Return a string representation for this profile. @@ -93,10 +92,10 @@ namespace TAO * encapsulation of a sequence of structs, each representing a * single endpoint. Data format is specified in iiop_endpoins.pidl. */ - virtual int encode_endpoints (void); + virtual int encode_endpoints (); /// Return pointer to the head of this profile's endpoints list. - virtual TAO_Endpoint *endpoint (void); + virtual TAO_Endpoint *endpoint (); /// Return how many endpoints this profile contains. virtual CORBA::ULong endpoint_count () const; @@ -112,16 +111,14 @@ namespace TAO virtual CORBA::ULong hash (CORBA::ULong max); protected: - /// Template methods. Please see Profile.h for the documentation. virtual int decode_profile (TAO_InputCDR &cdr); - virtual int decode_endpoints (void); + virtual int decode_endpoints (); virtual void parse_string_i (const char *string); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); protected: - /** * Head of this profile's list of endpoints. This endpoint is not * dynamically allocated because a profile always contains at least diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 296db0bad2364..b70102efeff7f 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -76,7 +76,6 @@ TAO::HTIOP::Transport::recv (char *buf, TAO_debug_level > 4 && errno != ETIME) { - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO::HTIOP::Transport[%d]::recv_i, ") ACE_TEXT ("read failure - %m"), @@ -304,7 +303,6 @@ TAO::HTIOP::Transport::get_listen_point (::HTIOP::ListenPointList &lp_list, if (local_addr.get_port_number() != 0) { - // Note: Looks like there is no point in sending the list of // endpoints on interfaces on which this connection has not // been established. If this is wrong, please correct me. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h index 90944576a3a14..647a19e5ea3a4 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h @@ -59,25 +59,22 @@ namespace TAO class HTIOP_Export Transport : public TAO_Transport { public: - /// Constructor. Transport (Connection_Handler *handler, TAO_ORB_Core *orb_core); /// Default destructor. - ~Transport (void); + ~Transport (); protected: - /** @name Overridden Template Methods * * Please check the documentation in "tao/Transport.h" for more * details. */ //@{ - - virtual ACE_Event_Handler * event_handler_i (void); - virtual TAO_Connection_Handler * invalidate_event_handler_i (void); + virtual ACE_Event_Handler * event_handler_i (); + virtual TAO_Connection_Handler * invalidate_event_handler_i (); virtual ssize_t send (iovec *iov, int iovcnt, size_t &bytes_transferred, @@ -87,7 +84,7 @@ namespace TAO size_t len, const ACE_Time_Value *s = 0); - virtual int register_handler (void); + virtual int register_handler (); public: @@ -108,12 +105,11 @@ namespace TAO virtual int tear_listen_point_list (TAO_InputCDR &cdr); - virtual TAO_Connection_Handler * connection_handler_i (void); + virtual TAO_Connection_Handler * connection_handler_i (); //@} private: - /// Set the Bidirectional context info in the service context list void set_bidir_context_info (TAO_Operation_Details &opdetails); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h index 592f64f9d89e7..d229c3442a3c1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h @@ -40,7 +40,7 @@ class TAO_IFRService_Export TAO_AbstractInterfaceDef_i TAO_AbstractInterfaceDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_AbstractInterfaceDef_i (void); + virtual ~TAO_AbstractInterfaceDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind ( diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h index 8c4da3ce878a8..2a0338413c877 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h @@ -39,7 +39,7 @@ class TAO_IFRService_Export TAO_AliasDef_i : public virtual TAO_TypedefDef_i TAO_AliasDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_AliasDef_i (void); + virtual ~TAO_AliasDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h index a653c33250241..bfaa2f3261d18 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h @@ -41,7 +41,7 @@ class TAO_IFRService_Export TAO_ArrayDef_i : public virtual TAO_IDLType_i TAO_ArrayDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ArrayDef_i (void); + virtual ~TAO_ArrayDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h index bbb11c6e549e9..12e6029905ed8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h @@ -43,7 +43,7 @@ class TAO_IFRService_Export TAO_AttributeDef_i : public virtual TAO_Contained_i TAO_AttributeDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_AttributeDef_i (void); + virtual ~TAO_AttributeDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h index 1ee5a6dbb2966..580edb1b0c01e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h @@ -42,7 +42,7 @@ class TAO_IFRService_Export TAO_ComponentContainer_i public: TAO_ComponentContainer_i (TAO_Repository_i *repo); - virtual ~TAO_ComponentContainer_i (void); + virtual ~TAO_ComponentContainer_i (); virtual CORBA::ComponentIR::ComponentDef_ptr create_component ( const char *id, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h index f7b5e715e7a73..1a3d97d2c5f92 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h @@ -43,7 +43,7 @@ class TAO_IFRService_Export TAO_ComponentDef_i TAO_ComponentDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ComponentDef_i (void); + virtual ~TAO_ComponentDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); @@ -158,4 +158,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_COMPONENTDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h index 3a75280788139..8a68ae611c97c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h @@ -41,7 +41,7 @@ class TAO_IFRService_Export TAO_ComponentModuleDef_i TAO_ComponentModuleDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ComponentModuleDef_i (void); + virtual ~TAO_ComponentModuleDef_i (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h index c07c568432258..5608424d62b9d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h @@ -60,11 +60,11 @@ class TAO_IFRService_Export TAO_ComponentRepository_i ACE_Configuration *config); /// Destructor. - virtual ~TAO_ComponentRepository_i (void); + virtual ~TAO_ComponentRepository_i (); /// We create a default servant servant for each IR Object /// type and its corresponding POA. - virtual int create_servants_and_poas (void); + virtual int create_servants_and_poas (); /// Return one of our servants for internal use. virtual TAO_IDLType_i *select_idltype (CORBA::DefinitionKind def_kind) const; @@ -75,7 +75,6 @@ class TAO_IFRService_Export TAO_ComponentRepository_i virtual PortableServer::POA_ptr select_poa (CORBA::DefinitionKind def_kind) const; protected: - #ifdef CONCRETE_IR_OBJECT_TYPES #undef CONCRETE_IR_OBJECT_TYPES #endif diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h index 5268dffa24ae4..93d592e3e2370 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h @@ -42,32 +42,32 @@ class TAO_IFRService_Export TAO_ConstantDef_i : public virtual TAO_Contained_i TAO_ConstantDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ConstantDef_i (void); + virtual ~TAO_ConstantDef_i (); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind (void); + virtual CORBA::DefinitionKind def_kind (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe (void); + virtual CORBA::Contained::Description *describe (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe_i (void); + virtual CORBA::Contained::Description *describe_i (); - virtual CORBA::TypeCode_ptr type (void); + virtual CORBA::TypeCode_ptr type (); - CORBA::TypeCode_ptr type_i (void); + CORBA::TypeCode_ptr type_i (); - virtual CORBA::IDLType_ptr type_def (void); + virtual CORBA::IDLType_ptr type_def (); - CORBA::IDLType_ptr type_def_i (void); + CORBA::IDLType_ptr type_def_i (); virtual void type_def (CORBA::IDLType_ptr type_def); void type_def_i (CORBA::IDLType_ptr type_def); - virtual CORBA::Any *value (void); + virtual CORBA::Any *value (); - CORBA::Any *value_i (void); + CORBA::Any *value_i (); virtual void value (const CORBA::Any &value); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h index 1fc8dee5386bb..53b46eafed5f6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h @@ -41,10 +41,10 @@ class TAO_IFRService_Export TAO_ConsumesDef_i TAO_ConsumesDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ConsumesDef_i (void); + virtual ~TAO_ConsumesDef_i (); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind (void); + virtual CORBA::DefinitionKind def_kind (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h index d3c07d80c0803..85dc614ab9fc7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h @@ -44,7 +44,7 @@ class TAO_IFRService_Export TAO_Contained_i : public virtual TAO_IRObject_i TAO_Contained_i (TAO_Repository_i *repo); /// Destructor. - virtual ~TAO_Contained_i (void); + virtual ~TAO_Contained_i (); /// Remove the repository entry. virtual void destroy (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h index 52bdaaba2be25..8277b00c6f08f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h @@ -50,7 +50,7 @@ class TAO_IFRService_Export TAO_Container_i : public virtual TAO_IRObject_i TAO_Container_i (TAO_Repository_i *repo); /// Destructor. - virtual ~TAO_Container_i (void); + virtual ~TAO_Container_i (); /// Remove our contents. virtual void destroy (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h index f083df51766e6..cbf271df231fe 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h @@ -41,7 +41,7 @@ class TAO_IFRService_Export TAO_EmitsDef_i TAO_EmitsDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_EmitsDef_i (void); + virtual ~TAO_EmitsDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h index 191eb294328c2..e3e5abaf48e29 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h @@ -39,20 +39,20 @@ class TAO_IFRService_Export TAO_EnumDef_i : public virtual TAO_TypedefDef_i TAO_EnumDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_EnumDef_i (void); + virtual ~TAO_EnumDef_i (); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind (void); + virtual CORBA::DefinitionKind def_kind (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type (void); + virtual CORBA::TypeCode_ptr type (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type_i (void); + virtual CORBA::TypeCode_ptr type_i (); - virtual CORBA::EnumMemberSeq *members (void); + virtual CORBA::EnumMemberSeq *members (); - CORBA::EnumMemberSeq *members_i (void); + CORBA::EnumMemberSeq *members_i (); virtual void members (const CORBA::EnumMemberSeq &members); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h index a26db003ccfd6..4df1ebfb03904 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h @@ -44,7 +44,7 @@ class TAO_IFRService_Export TAO_EventDef_i : public virtual TAO_ExtValueDef_i TAO_EventDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_EventDef_i (void); + virtual ~TAO_EventDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h index ac4e23933d086..41922082a7e33 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h @@ -43,11 +43,11 @@ class TAO_IFRService_Export TAO_EventPortDef_i TAO_EventPortDef_i (TAO_Repository_i *repo); //// Destructor - virtual ~TAO_EventPortDef_i (void); + virtual ~TAO_EventPortDef_i (); - virtual CORBA::ComponentIR::EventDef_ptr event (void); + virtual CORBA::ComponentIR::EventDef_ptr event (); - CORBA::ComponentIR::EventDef_ptr event_i (void); + CORBA::ComponentIR::EventDef_ptr event_i (); virtual void event (CORBA::ComponentIR::EventDef_ptr event); @@ -61,15 +61,15 @@ class TAO_IFRService_Export TAO_EventPortDef_i /// implemented here. /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe (void); + virtual CORBA::Contained::Description *describe (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe_i (void); + virtual CORBA::Contained::Description *describe_i (); private: /// Dummy method so we can consolidate derived class methods /// in this 'abstract' base class. - virtual CORBA::DefinitionKind def_kind (void); + virtual CORBA::DefinitionKind def_kind (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h index 8ec38e961f6ac..f9558682b20df 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h @@ -41,7 +41,7 @@ class TAO_IFRService_Export TAO_ExceptionDef_i : public virtual TAO_Contained_i, TAO_ExceptionDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ExceptionDef_i (void); + virtual ~TAO_ExceptionDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h index 22cfa105ce614..f62d6660d9250 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h @@ -44,9 +44,9 @@ class TAO_IFRService_Export TAO_ExtAbstractInterfaceDef_i TAO_ExtAbstractInterfaceDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ExtAbstractInterfaceDef_i (void); + virtual ~TAO_ExtAbstractInterfaceDef_i (); - virtual void destroy (void); + virtual void destroy (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h index 2472d2ce82198..979310f36e402 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h @@ -40,19 +40,19 @@ class TAO_IFRService_Export TAO_ExtAttributeDef_i TAO_ExtAttributeDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ExtAttributeDef_i (void); + virtual ~TAO_ExtAttributeDef_i (); - virtual CORBA::ExcDescriptionSeq *get_exceptions (void); + virtual CORBA::ExcDescriptionSeq *get_exceptions (); - CORBA::ExcDescriptionSeq *get_exceptions_i (void); + CORBA::ExcDescriptionSeq *get_exceptions_i (); virtual void get_exceptions (const CORBA::ExcDescriptionSeq &get_exceptions); void get_exceptions_i (const CORBA::ExcDescriptionSeq &get_exceptions); - virtual CORBA::ExcDescriptionSeq *set_exceptions (void); + virtual CORBA::ExcDescriptionSeq *set_exceptions (); - CORBA::ExcDescriptionSeq *set_exceptions_i (void); + CORBA::ExcDescriptionSeq *set_exceptions_i (); virtual void set_exceptions ( const CORBA::ExcDescriptionSeq &set_exceptions); @@ -60,9 +60,9 @@ class TAO_IFRService_Export TAO_ExtAttributeDef_i void set_exceptions_i ( const CORBA::ExcDescriptionSeq &set_exceptions); - virtual CORBA::ExtAttributeDescription *describe_attribute (void); + virtual CORBA::ExtAttributeDescription *describe_attribute (); - CORBA::ExtAttributeDescription *describe_attribute_i (void); + CORBA::ExtAttributeDescription *describe_attribute_i (); // Utility function that fills sequence elements for a // ComponentDescription. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h index 9469e0c632769..92348b91375d0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h @@ -47,7 +47,7 @@ class TAO_IFRService_Export TAO_ExtInterfaceDef_i TAO_ExtInterfaceDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ExtInterfaceDef_i (void); + virtual ~TAO_ExtInterfaceDef_i (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h index 813fea9382e19..28001d8b8969a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h @@ -46,7 +46,7 @@ class TAO_IFRService_Export TAO_ExtLocalInterfaceDef_i TAO_ExtLocalInterfaceDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ExtLocalInterfaceDef_i (void); + virtual ~TAO_ExtLocalInterfaceDef_i (); virtual void destroy (); }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h index a1f381abbe5f7..f647c198a61ea 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h @@ -44,7 +44,7 @@ class TAO_IFRService_Export TAO_ExtValueDef_i : public virtual TAO_ValueDef_i TAO_ExtValueDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ExtValueDef_i (void); + virtual ~TAO_ExtValueDef_i (); virtual CORBA::ExtInitializerSeq *ext_initializers (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h index 39dfd6aaaf255..c2b5c2ee8b170 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h @@ -43,7 +43,7 @@ class TAO_IFRService_Export TAO_FactoryDef_i : public virtual TAO_OperationDef_i TAO_FactoryDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_FactoryDef_i (void); + virtual ~TAO_FactoryDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind ( ); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h index f6296e13b0772..4223e06b11619 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h @@ -44,7 +44,7 @@ class TAO_IFRService_Export TAO_FinderDef_i : public virtual TAO_OperationDef_i TAO_FinderDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_FinderDef_i (void); + virtual ~TAO_FinderDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h index af08c6e6d21cf..ada6a483f7ef5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h @@ -43,7 +43,7 @@ class TAO_IFRService_Export TAO_FixedDef_i : public virtual TAO_IDLType_i TAO_FixedDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_FixedDef_i (void); + virtual ~TAO_FixedDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h index 62ac705efae76..57def2880f655 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h @@ -46,39 +46,39 @@ class TAO_IFRService_Export TAO_HomeDef_i TAO_HomeDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_HomeDef_i (void); + virtual ~TAO_HomeDef_i (); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind (void); + virtual CORBA::DefinitionKind def_kind (); /// Remove the repository entry. - virtual void destroy (void); + virtual void destroy (); - virtual void destroy_i (void); + virtual void destroy_i (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe (void); + virtual CORBA::Contained::Description *describe (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe_i (void); + virtual CORBA::Contained::Description *describe_i (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type (void); + virtual CORBA::TypeCode_ptr type (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type_i (void); + virtual CORBA::TypeCode_ptr type_i (); - virtual CORBA::ComponentIR::HomeDef_ptr base_home (void); + virtual CORBA::ComponentIR::HomeDef_ptr base_home (); - CORBA::ComponentIR::HomeDef_ptr base_home_i (void); + CORBA::ComponentIR::HomeDef_ptr base_home_i (); virtual void base_home (CORBA::ComponentIR::HomeDef_ptr base_home); void base_home_i (CORBA::ComponentIR::HomeDef_ptr base_home); - virtual CORBA::InterfaceDefSeq *supported_interfaces (void); + virtual CORBA::InterfaceDefSeq *supported_interfaces (); - CORBA::InterfaceDefSeq *supported_interfaces_i (void); + CORBA::InterfaceDefSeq *supported_interfaces_i (); virtual void supported_interfaces ( const CORBA::InterfaceDefSeq &supported_interfaces); @@ -86,9 +86,9 @@ class TAO_IFRService_Export TAO_HomeDef_i void supported_interfaces_i ( const CORBA::InterfaceDefSeq &supported_interfaces); - virtual CORBA::ComponentIR::ComponentDef_ptr managed_component (void); + virtual CORBA::ComponentIR::ComponentDef_ptr managed_component (); - CORBA::ComponentIR::ComponentDef_ptr managed_component_i (void); + CORBA::ComponentIR::ComponentDef_ptr managed_component_i (); virtual void managed_component ( CORBA::ComponentIR::ComponentDef_ptr managed_component); @@ -96,9 +96,9 @@ class TAO_IFRService_Export TAO_HomeDef_i void managed_component_i ( CORBA::ComponentIR::ComponentDef_ptr managed_component); - virtual CORBA::ValueDef_ptr primary_key (void); + virtual CORBA::ValueDef_ptr primary_key (); - CORBA::ValueDef_ptr primary_key_i (void); + CORBA::ValueDef_ptr primary_key_i (); virtual void primary_key (CORBA::ValueDef_ptr primary_key); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h index 85d58bb7496fe..dc01b97941c81 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h @@ -46,7 +46,7 @@ class TAO_IFRService_Export TAO_IDLType_i : public virtual TAO_IRObject_i TAO_IDLType_i (TAO_Repository_i *repo); /// Destructor. - virtual ~TAO_IDLType_i (void); + virtual ~TAO_IDLType_i (); /// Defined in concrete classes. virtual CORBA::TypeCode_ptr type () = 0; /// Defined in concrete classes. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h index de362c0991a14..44dd965e51a0d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h @@ -30,12 +30,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_IFRService_Export TAO_IFR_Service_Loader : public TAO_Object_Loader { public: - // Constructor - TAO_IFR_Service_Loader (void); + TAO_IFR_Service_Loader (); // Destructor - ~TAO_IFR_Service_Loader (void); + ~TAO_IFR_Service_Loader (); // Called by the Service Configurator framework to initialize the // Event Service. Defined in @@ -51,17 +50,14 @@ class TAO_IFRService_Export TAO_IFR_Service_Loader : public TAO_Object_Loader int argc, ACE_TCHAR *argv[]); - protected: TAO_IFR_Server ifr_server_; // Instance of the TAO_IFR_Server private: - // Disallowing copying/assignment. TAO_IFR_Service_Loader (const TAO_IFR_Service_Loader &); TAO_IFR_Service_Loader & operator= (const TAO_IFR_Service_Loader &); - }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index b43dd6ac43adc..2f7aa6950e48d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -39,7 +39,7 @@ class TAO_Contained_i; class TAO_IFRService_Export TAO_IFR_Server { public: - TAO_IFR_Server (void); + TAO_IFR_Server (); /// Initialize the IFR Service with the command line arguments and /// the ORB. @@ -56,25 +56,24 @@ class TAO_IFRService_Export TAO_IFR_Server int use_multicast_server = 0); /// Destroy the child POA created in init_with_poa(). - int fini (void); + int fini (); /// Destructor. - ~TAO_IFR_Server (void); + ~TAO_IFR_Server (); protected: - /// Two persistent POAs, one using a servant locator. - int create_poa (void); + int create_poa (); /// Open an ACE_Configuration of the appropriate type. - int open_config (void); + int open_config (); /// Create and initialize the repository. - int create_repository (void); + int create_repository (); /// Enable the Interface Repository to answer multicast requests /// for its IOR. - int init_multicast_server (void); + int init_multicast_server (); /// Reference to our ORB. CORBA::ORB_var orb_; @@ -98,9 +97,9 @@ class TAO_IFRService_Export TAO_IFR_Server class TAO_IFR_Service_Utils { public: - TAO_IFR_Service_Utils (void); + TAO_IFR_Service_Utils (); - ~TAO_IFR_Service_Utils (void); + ~TAO_IFR_Service_Utils (); typedef int (*name_clash_checker)(const char *); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h index 4c00273e01e98..0a43a56355d2c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h @@ -107,9 +107,7 @@ class TAO_Port_Utils TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/IFRService/IFR_Service_Utils_T.cpp" -#endif /* defined REQUIRED SOURCE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h index 9fd8d8213c667..36288e8fdbb79 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h @@ -50,7 +50,7 @@ class TAO_IFRService_Export TAO_IRObject_i : public POA_CORBA::IRObject TAO_IRObject_i (TAO_Repository_i *repo); /// Destructor. - virtual ~TAO_IRObject_i (void); + virtual ~TAO_IRObject_i (); virtual CORBA::DefinitionKind def_kind (); @@ -65,7 +65,7 @@ class TAO_IFRService_Export TAO_IRObject_i : public POA_CORBA::IRObject protected: /// Set our key from the object ID via POACurrent. - void update_key (void); + void update_key (); protected: /// Pointer to the repository we were constructed from. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h index c92ad55b94b58..50f7046b23493 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h @@ -42,14 +42,14 @@ class TAO_IFRService_Export TAO_InterfaceAttrExtension_i TAO_InterfaceAttrExtension_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_InterfaceAttrExtension_i (void); + virtual ~TAO_InterfaceAttrExtension_i (); virtual CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * - describe_ext_interface (void); + describe_ext_interface (); CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * - describe_ext_interface_i (void); + describe_ext_interface_i (); virtual CORBA::ExtAttributeDef_ptr create_ext_attribute ( const char *id, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h index 07e5ee7645102..e9e0722422b74 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h @@ -47,30 +47,30 @@ class TAO_IFRService_Export TAO_InterfaceDef_i TAO_InterfaceDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_InterfaceDef_i (void); + virtual ~TAO_InterfaceDef_i (); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind (void); + virtual CORBA::DefinitionKind def_kind (); - virtual void destroy (void); + virtual void destroy (); - virtual void destroy_i (void); + virtual void destroy_i (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe (void); + virtual CORBA::Contained::Description *describe (); /// From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe_i (void); + virtual CORBA::Contained::Description *describe_i (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type (void); + virtual CORBA::TypeCode_ptr type (); /// From IDLType_i's pure virtual function. - virtual CORBA::TypeCode_ptr type_i (void); + virtual CORBA::TypeCode_ptr type_i (); - virtual CORBA::InterfaceDefSeq *base_interfaces (void); + virtual CORBA::InterfaceDefSeq *base_interfaces (); - CORBA::InterfaceDefSeq *base_interfaces_i (void); + CORBA::InterfaceDefSeq *base_interfaces_i (); virtual void base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces); @@ -82,7 +82,7 @@ class TAO_IFRService_Export TAO_InterfaceDef_i virtual CORBA::InterfaceDef::FullInterfaceDescription *describe_interface (); - CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i (void); + CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i (); virtual CORBA::AttributeDef_ptr create_attribute ( const char *id, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h index 6c9761888dee2..7f65fdc93d0ee 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h @@ -43,10 +43,10 @@ class TAO_IFRService_Export TAO_LocalInterfaceDef_i : public virtual TAO_Interfa TAO_LocalInterfaceDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_LocalInterfaceDef_i (void); + virtual ~TAO_LocalInterfaceDef_i (); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind (void); + virtual CORBA::DefinitionKind def_kind (); virtual CORBA::Boolean is_a (const char *interface_id); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h index d00eee8118053..42a2e0e7c338d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h @@ -46,7 +46,7 @@ class TAO_IFRService_Export TAO_ModuleDef_i TAO_ModuleDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ModuleDef_i (void); + virtual ~TAO_ModuleDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h index ed999dd23138c..29c266b4c7e4e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h @@ -39,7 +39,7 @@ class TAO_IFRService_Export TAO_NativeDef_i : public virtual TAO_TypedefDef_i TAO_NativeDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_NativeDef_i (void); + virtual ~TAO_NativeDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h index 4d21225569373..4122ecd1ba72a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h @@ -44,7 +44,7 @@ class TAO_IFRService_Export TAO_OperationDef_i : public virtual TAO_Contained_i TAO_OperationDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_OperationDef_i (void); + virtual ~TAO_OperationDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); @@ -104,7 +104,7 @@ class TAO_IFRService_Export TAO_OperationDef_i : public virtual TAO_Contained_i void make_description (CORBA::OperationDescription &desc); - CORBA::TypeCode_ptr type_i (void); + CORBA::TypeCode_ptr type_i (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h index 4fcd2a8a564f6..7f02e77681ae9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h @@ -43,7 +43,7 @@ class TAO_IFRService_Export TAO_PrimitiveDef_i : public virtual TAO_IDLType_i TAO_PrimitiveDef_i (TAO_Repository_i *repo); /// Destructor. - virtual ~TAO_PrimitiveDef_i (void); + virtual ~TAO_PrimitiveDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h index 322ed19661aa7..57b239b6db50c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h @@ -42,7 +42,7 @@ class TAO_IFRService_Export TAO_ProvidesDef_i : public virtual TAO_Contained_i TAO_ProvidesDef_i (TAO_Repository_i *repoy); /// Destructor - virtual ~TAO_ProvidesDef_i (void); + virtual ~TAO_ProvidesDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h index a7c90886f9335..dcd0989947923 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h @@ -40,7 +40,7 @@ class TAO_IFRService_Export TAO_PublishesDef_i TAO_PublishesDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_PublishesDef_i (void); + virtual ~TAO_PublishesDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 074abf69614f9..d194744b79a3f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -595,7 +595,6 @@ TAO_Repository_i::create_sections () this->config_->set_integer_value (key, "pkind", i); - } } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index f9b5317e35ac3..ea198eb3f082d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -76,7 +76,7 @@ class TAO_IFRService_Export TAO_Repository_i : public virtual TAO_Container_i PortableServer::POA_ptr poa, ACE_Configuration *config); - virtual ~TAO_Repository_i (void); + virtual ~TAO_Repository_i (); /// Accessor for the readonly attribute. virtual CORBA::DefinitionKind def_kind (); @@ -134,10 +134,10 @@ class TAO_IFRService_Export TAO_Repository_i : public virtual TAO_Container_i /// We create a default servant servant for each IR Object /// type and its corresponding POA. - virtual int create_servants_and_poas (void); + virtual int create_servants_and_poas (); /// Create the top-level ACE_Configuration sections. - int create_sections (void); + int create_sections (); /// Return one of our servants for internal use. virtual TAO_IDLType_i *select_idltype ( @@ -200,7 +200,7 @@ class TAO_IFRService_Export TAO_Repository_i : public virtual TAO_Container_i * destroy() method of the last thing to be destroyed * by the test code. */ - void shutdown (void); + void shutdown (); protected: /// Reference to our ORB. @@ -306,7 +306,6 @@ class TAO_IFRService_Export TAO_Repository_i : public virtual TAO_Container_i /// Return the number of entries in the CORBA::PrimitiveKind enum. u_int num_pkinds () const; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h index a444fecd5e9cb..7ada0df65d63b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h @@ -43,7 +43,7 @@ class TAO_IFRService_Export TAO_SequenceDef_i : public virtual TAO_IDLType_i TAO_SequenceDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_SequenceDef_i (void); + virtual ~TAO_SequenceDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h index f6f3f9547cd89..1c279a30a75f0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h @@ -44,7 +44,7 @@ class TAO_IFRService_Export TAO_StringDef_i : public virtual TAO_IDLType_i TAO_StringDef_i (TAO_Repository_i *repoy); /// Destructor. - virtual ~TAO_StringDef_i (void); + virtual ~TAO_StringDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h index 3f5c7bdd8656a..bea3e3844692e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h @@ -44,7 +44,7 @@ class TAO_IFRService_Export TAO_StructDef_i : public virtual TAO_TypedefDef_i, TAO_StructDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_StructDef_i (void); + virtual ~TAO_StructDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h index c1de5d76f7e3b..597911628621f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h @@ -45,7 +45,7 @@ class TAO_IFRService_Export TAO_TypedefDef_i : public virtual TAO_Contained_i, TAO_TypedefDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_TypedefDef_i (void); + virtual ~TAO_TypedefDef_i (); /// From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h index 8361d3005316d..6905e05831052 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h @@ -41,7 +41,7 @@ class TAO_IFRService_Export TAO_UnionDef_i : public virtual TAO_TypedefDef_i, TAO_UnionDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_UnionDef_i (void); + virtual ~TAO_UnionDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h index 7b3947e2196a4..0ed3020fac6f3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h @@ -43,7 +43,7 @@ class TAO_IFRService_Export TAO_UsesDef_i : public virtual TAO_Contained_i TAO_UsesDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_UsesDef_i (void); + virtual ~TAO_UsesDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h index 3bfb1ad0be00a..df2a4089f5515 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h @@ -40,7 +40,7 @@ class TAO_IFRService_Export TAO_ValueBoxDef_i : public virtual TAO_TypedefDef_i TAO_ValueBoxDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ValueBoxDef_i (void); + virtual ~TAO_ValueBoxDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h index 55941ca3b18e1..86f155f465c28 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h @@ -46,7 +46,7 @@ class TAO_IFRService_Export TAO_ValueDef_i : public virtual TAO_Container_i, TAO_ValueDef_i (TAO_Repository_i *repo); /// Destructor - virtual ~TAO_ValueDef_i (void); + virtual ~TAO_ValueDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h index 76b2f62b9ceab..92e031318bfd1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h @@ -43,7 +43,7 @@ class TAO_IFRService_Export TAO_ValueMemberDef_i : public virtual TAO_Contained_ TAO_ValueMemberDef_i (TAO_Repository_i *repoy); /// Destructor - virtual ~TAO_ValueMemberDef_i (void); + virtual ~TAO_ValueMemberDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h index 0e41a13bb3ee4..2755a5ec32539 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h @@ -44,7 +44,7 @@ class TAO_IFRService_Export TAO_WstringDef_i : public virtual TAO_IDLType_i TAO_WstringDef_i (TAO_Repository_i *repo); /// Destructor. - virtual ~TAO_WstringDef_i (void); + virtual ~TAO_WstringDef_i (); /// Return our definition kind. virtual CORBA::DefinitionKind def_kind (); diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h index b077f2c05efa3..bb42f9e451dbb 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h @@ -45,7 +45,7 @@ class TAO_Svc_Utils_Export TAO_IOR_Multicast : public ACE_Event_Handler { public: /// Constructor. - TAO_IOR_Multicast (void); + TAO_IOR_Multicast (); /// Constructor taking the ior of the service. TAO_IOR_Multicast (const char *ior, @@ -66,7 +66,7 @@ class TAO_Svc_Utils_Export TAO_IOR_Multicast : public ACE_Event_Handler TAO_Service_ID service_id); /// Destructor. - virtual ~TAO_IOR_Multicast (void); + virtual ~TAO_IOR_Multicast (); /// Callback when input is received on the handle. virtual int handle_input (ACE_HANDLE n); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index a0cebd7da5a2e..05a518b049cdc 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -107,7 +107,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads () load = ((system_ll - idle_ll) * 100 / system_ll) / sys_info.dwNumberOfProcessors; } -#elif defined (ACE_LINUX) || defined (sun) +#elif defined (ACE_LINUX) // Only bother getting the load average over the last minute. // @@ -196,28 +196,9 @@ TAO_LB_CPU_Load_Average_Monitor::loads () } else throw CORBA::TRANSIENT (); // Correct exception? - -#elif defined (__hpux) - - struct pst_dynamic psd; - - if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) - { - const long & num_processors = psd.psd_proc_cnt; - - ACE_ASSERT (num_processors > 0); - - if (num_processors > 0) - load = psd.psd_avg_1_min / num_processors; - else - throw CORBA::TRANSIENT (); // Correct exception? - } - else - throw CORBA::TRANSIENT (); // Correct exception? - #endif -#if defined (ACE_LINUX) || defined (sun) || defined (__hpux) || defined(__NetBSD__) || defined (__APPLE__) +#if defined (ACE_LINUX) || defined(__NetBSD__) || defined (__APPLE__) CosLoadBalancing::LoadList * tmp = 0; ACE_NEW_THROW_EX (tmp, CosLoadBalancing::LoadList (1), @@ -241,7 +222,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads () ACE_UNUSED_ARG (load); throw CORBA::NO_IMPLEMENT (); -#endif /* linux || sun || __hpux || __NetBSD__ || __APPLE__ */ +#endif /* linux || __NetBSD__ || __APPLE__ */ } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index 144f7c2c62c6a..fe2d1fe8b7fe8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -41,7 +41,6 @@ class TAO_LoadBalancing_Export TAO_LB_CPU_Load_Average_Monitor : public virtual POA_CosLoadBalancing::LoadMonitor { public: - /// Constructor /** * If no location is supplied the hostname or IP address is used by @@ -56,7 +55,6 @@ class TAO_LoadBalancing_Export TAO_LB_CPU_Load_Average_Monitor * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. @@ -75,19 +73,16 @@ class TAO_LoadBalancing_Export TAO_LB_CPU_Load_Average_Monitor //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management through * reference counting. */ - ~TAO_LB_CPU_Load_Average_Monitor (void); + ~TAO_LB_CPU_Load_Average_Monitor (); private: - /// The name of the location at which this LoadMonitor resides. CosLoadBalancing::Location location_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index 4dc1ecb2214a1..d991ba3551434 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -124,7 +124,7 @@ TAO_LB_CPU_Utilization_Monitor::loads () { CORBA::Float load = 0; -#if defined (ACE_LINUX) || defined (sun) +#if defined (ACE_LINUX) double load_double = calc_cpu_loading (); load = load_double; @@ -153,7 +153,7 @@ TAO_LB_CPU_Utilization_Monitor::loads () ACE_UNUSED_ARG (load); throw CORBA::NO_IMPLEMENT (); -#endif /* linux || sun */ +#endif /* linux */ } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index 3b74793496019..ecc76293e8729 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -38,7 +38,6 @@ class TAO_LoadBalancing_Export TAO_LB_CPU_Utilization_Monitor : public virtual POA_CosLoadBalancing::LoadMonitor { public: - /// Constructor /** * If no location is supplied the hostname or IP address is used by @@ -53,7 +52,6 @@ class TAO_LoadBalancing_Export TAO_LB_CPU_Utilization_Monitor * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. @@ -72,19 +70,16 @@ class TAO_LoadBalancing_Export TAO_LB_CPU_Utilization_Monitor //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management through * reference counting. */ - ~TAO_LB_CPU_Utilization_Monitor (void); + ~TAO_LB_CPU_Utilization_Monitor (); private: - /// The name of the location at which this LoadMonitor resides. CosLoadBalancing::Location location_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h index 1786f209790a5..a9dbb38b52530 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h @@ -48,7 +48,7 @@ class TAO_LoadBalancing_Export TAO_LB_ClientComponent protected: /// Register the LB_ClientComponent's ORBInitializer. - int register_orb_initializer (void); + int register_orb_initializer (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h index 1c26fd1104db3..d8993eab02c9c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h @@ -55,7 +55,6 @@ class TAO_LB_ClientRequestInterceptor public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the Client Request Interceptor * Interface @@ -66,9 +65,9 @@ class TAO_LB_ClientRequestInterceptor */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri); @@ -85,7 +84,6 @@ class TAO_LB_ClientRequestInterceptor virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri); //@} - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h index 1212d11d11d81..e1f9c2874fb91 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h @@ -40,7 +40,6 @@ class TAO_LoadBalancing_Export TAO_LB_Component : public ACE_Service_Object { public: - /// Initializes object when dynamic linking occurs. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -48,12 +47,10 @@ class TAO_LoadBalancing_Export TAO_LB_Component virtual int fini (); protected: - /// Register the LB_Component's ORBInitializer. int register_orb_initializer (const CORBA::StringSeq & object_groups, const CORBA::StringSeq & repository_ids, const char * location); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index a82d675db16d0..00d4a388a4130 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -68,10 +68,10 @@ class TAO_LB_IORInterceptor */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (void); + virtual char * name (); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (void); + virtual void destroy (); /// Add the tagged components to the IOR. virtual void establish_components ( @@ -92,7 +92,7 @@ class TAO_LB_IORInterceptor private: /// Create and register the LoadAlert object with the LoadManager. - void register_load_alert (void); + void register_load_alert (); private: /// List of stringified object group references. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 91e605558ebd6..6efd82a4aa6c6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -417,7 +417,6 @@ TAO_LB_LeastLoaded::get_location ( // ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ PREVIOUS LOCATION\n")); // else // ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ CURRENT LOCATION\n")); - } else { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 9dd963d85499a..e536d120e14b4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -84,7 +84,7 @@ class TAO_LB_LeastLoaded * Methods required by the CosLoadBalancing::Strategy interface. */ //@{ - virtual char * name (void); + virtual char * name (); virtual CosLoadBalancing::Properties * get_properties (); @@ -113,7 +113,7 @@ class TAO_LB_LeastLoaded protected: /// Destructor. - ~TAO_LB_LeastLoaded (void); + ~TAO_LB_LeastLoaded (); /// Retrieve the least loaded location from the given list of /// locations. @@ -138,7 +138,6 @@ class TAO_LB_LeastLoaded CORBA::Float & value); private: - /// This servant's default POA. PortableServer::POA_var poa_; @@ -158,7 +157,6 @@ class TAO_LB_LeastLoaded * Cached LeastLoaded load balancing strategy property values. */ //@{ - /// The critical load threshold. /** * Load rebalancing/shedding will occur if loads at a given location @@ -190,7 +188,6 @@ class TAO_LB_LeastLoaded CORBA::Float per_balance_load_; //@} - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index b95446f33dbbb..703189fe58d87 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -29,7 +29,7 @@ class TAO_LoadBalancing_Export TAO_LB_LoadAlert { public: /// Constructor. - TAO_LB_LoadAlert (void); + TAO_LB_LoadAlert (); /** * @name CosLoadBalancing::LoadAlert Methods @@ -37,13 +37,12 @@ class TAO_LoadBalancing_Export TAO_LB_LoadAlert * Methods required by the CosLoadBalancing::LoadAlert interface. */ //@{ - /// Forward requests back to the load manager via the object group /// reference. - virtual void enable_alert (void); + virtual void enable_alert (); /// Stop forwarding requests, and begin accepting them again. - virtual void disable_alert (void); + virtual void disable_alert (); //@} @@ -52,13 +51,12 @@ class TAO_LoadBalancing_Export TAO_LB_LoadAlert CORBA::Boolean alerted () const; // protected: - /// Destructor. /** * Protected destructor to enforce correct memory management via * reference counting. */ - virtual ~TAO_LB_LoadAlert (void); + virtual ~TAO_LB_LoadAlert (); private: /// Has this LoadAlert servant been alerted of a high load condition diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h index 4dec5ef704431..bec4e72c38cab 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h @@ -34,7 +34,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL struct TAO_LB_LoadAlertInfo { /// Constructor. - TAO_LB_LoadAlertInfo (void); + TAO_LB_LoadAlertInfo (); /// Reference to the LoadAlert object. CosLoadBalancing::LoadAlert_var load_alert; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h index a35561a416b05..3be5fba75031d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h @@ -40,18 +40,18 @@ class TAO_LB_LoadAlert_Handler : public virtual POA_CosLoadBalancing::AMI_LoadAlertHandler { public: - virtual void enable_alert (void); + virtual void enable_alert (); virtual void enable_alert_excep (::Messaging::ExceptionHolder *); - virtual void disable_alert (void); + virtual void disable_alert (); virtual void disable_alert_excep (::Messaging::ExceptionHolder *); protected: /// Protected destructor to enforce propery memory management /// through reference counting. - ~TAO_LB_LoadAlert_Handler (void); + ~TAO_LB_LoadAlert_Handler (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 65b656bdee43b..de0490e2baccb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -305,7 +305,6 @@ TAO_LB_LoadAverage::analyze_loads ( */ load_manager->enable_alert (loc); - } } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index a714607aedab9..ef1054058694f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -57,7 +57,6 @@ class TAO_LB_LoadAverage : public virtual POA_CosLoadBalancing::Strategy { public: - /// Constructor. TAO_LB_LoadAverage (PortableServer::POA_ptr poa); @@ -67,7 +66,7 @@ class TAO_LB_LoadAverage * Methods required by the CosLoadBalancing::Strategy interface. */ //@{ - virtual char * name (void); + virtual char * name (); virtual CosLoadBalancing::Properties * get_properties (); @@ -96,9 +95,8 @@ class TAO_LB_LoadAverage void init (const PortableGroup::Properties & props); protected: - /// Destructor. - ~TAO_LB_LoadAverage (void); + ~TAO_LB_LoadAverage (); /// Return the effective load. CORBA::Float effective_load (CORBA::Float previous_load, @@ -117,7 +115,6 @@ class TAO_LB_LoadAverage CORBA::Float & value); private: - /// This servant's default POA. PortableServer::POA_var poa_; @@ -137,7 +134,6 @@ class TAO_LB_LoadAverage * Cached LoadAverage load balancing strategy property values. */ //@{ - /// CORBA::Float tolerance_; @@ -150,7 +146,6 @@ class TAO_LB_LoadAverage //@} CosLoadBalancing::LoadList current_loads_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index b5fb4e0a12f89..cd167477d9470 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -1062,7 +1062,6 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info) } else if (ACE_OS::strcmp (info->name.in (), "LoadMinimum") == 0) { - if (info->props.length () == 0) { { @@ -1104,7 +1103,6 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info) } else if (ACE_OS::strcmp (info->name.in (), "LoadAverage") == 0) { - if (info->props.length () == 0) { { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index c49ca438234e3..0cbbbbc399bf4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -42,7 +42,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager public ACE_Task_Base { public: - /// Constructor. TAO_LB_LoadManager (int ping_timeout, int ping_interval); @@ -55,7 +54,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager * Methods required by the CosLoadBalancing::LoadManager interface. */ //@{ - /// For the PUSH load monitoring style. virtual void push_loads (const PortableGroup::Location & the_location, const CosLoadBalancing::LoadList & loads); @@ -108,7 +106,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager * Methods required by the PortableGroup::PropertyManager interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); @@ -168,7 +165,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager * interface. */ //@{ - /// Create a member using the load balancer ObjectGroupManager, and /// add the created object to the ObjectGroup. virtual PortableGroup::ObjectGroup_ptr create_member ( @@ -228,7 +224,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager * Methods required by the PortableGroup::GenericFactory interface. */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out @@ -263,7 +258,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager CORBA::Object_ptr next_member (const PortableServer::ObjectId & oid); public: - /// Initialize the load balancer. This will cause a child POA to be /// created with the appropriate policies to support ServantLocators /// (i.e. for the MemberLocator). @@ -272,16 +266,14 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager PortableServer::POA_ptr root_poa); protected: - /// Destructor. /** * Destructor is protected to enforce correct memory management * through reference counting. */ - ~TAO_LB_LoadManager (void); + ~TAO_LB_LoadManager (); private: - /// Extract the value of the InitialNumberReplicas property from /// the_criteria. int get_initial_number_replicas ( @@ -315,7 +307,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager const CosLoadBalancing::StrategyInfo * info); private: - CORBA::ORB_var orb_; /// Reactor used when pulling loads from registered load monitors. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 3f09e937742fd..da1c32d6dbb1f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -311,7 +311,6 @@ TAO_LB_LoadMinimum::analyze_loads ( } else { - CORBA::Float percent_diff = (tmp[j].value / min_load) - 1; @@ -408,7 +407,6 @@ TAO_LB_LoadMinimum::get_location ( */ if (load.value < min_load) { - if (i > 0 && !ACE::is_equal (load.value, 0.0f)) { /* @@ -469,7 +467,6 @@ TAO_LB_LoadMinimum::get_location ( // ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ PREVIOUS LOCATION\n")); // else // ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ CURRENT LOCATION\n")); - } else { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index a95028fa71ec7..7e5c3d24ebc37 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -85,7 +85,7 @@ class TAO_LB_LoadMinimum * Methods required by the CosLoadBalancing::Strategy interface. */ //@{ - virtual char * name (void); + virtual char * name (); virtual CosLoadBalancing::Properties * get_properties (); @@ -114,7 +114,7 @@ class TAO_LB_LoadMinimum protected: /// Destructor. - ~TAO_LB_LoadMinimum (void); + ~TAO_LB_LoadMinimum (); /// Retrieve the least loaded location from the given list of /// locations. @@ -158,7 +158,6 @@ class TAO_LB_LoadMinimum * Cached LoadMinimum load balancing strategy property values. */ //@{ - /// CORBA::Float tolerance_; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h index 773554be4ad01..fe2a5bb6bbd08 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h @@ -41,7 +41,6 @@ class TAO_LB_MemberLocator public virtual ::CORBA::LocalObject { public: - /// Constructor TAO_LB_MemberLocator (TAO_LB_LoadManager * load_balancer); @@ -52,7 +51,6 @@ class TAO_LB_MemberLocator * interface. */ //@{ - /// Clients requests are forwarded via the /// PortableServer::ForwardRequest exception thrown in this method. virtual PortableServer::Servant preinvoke ( @@ -72,10 +70,8 @@ class TAO_LB_MemberLocator //@} private: - /// The load balancer/manager implementation. TAO_LB_LoadManager * load_manager_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h index d99c2b309264a..2d1e544e496b3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h @@ -53,7 +53,6 @@ class TAO_LB_ORBInitializer public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO_LB_ORBInitializer (const CORBA::StringSeq & object_groups, const CORBA::StringSeq & repository_ids, @@ -72,7 +71,6 @@ class TAO_LB_ORBInitializer //@} private: - /// List of stringified object group references. const CORBA::StringSeq object_groups_; @@ -90,7 +88,6 @@ class TAO_LB_ORBInitializer * used out of convencience. */ TAO_LB_LoadAlert load_alert_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index 31b974fd655ed..1585ccb22fa2a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -58,8 +58,6 @@ TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory () { // No need to call CORBA::remove_ref() on this->old_orf_. It is a // "_var" object, meaning that will be done automatically. - - if (!CORBA::is_nil (this->lm_.in ())) { const CORBA::ULong len = this->fcids_.size (); @@ -132,7 +130,6 @@ TAO_LB_ObjectReferenceFactory::make_object ( "TAO_LB_ObjectReferenceFactory::""make_object"); throw CORBA::BAD_INV_ORDER (); - } catch (const PortableGroup::ObjectNotAdded& ex) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h index 88168ce7e6ef1..2d2d522a8ce9a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h @@ -58,7 +58,7 @@ class TAO_LB_ObjectReferenceFactory CORBA::ORB_ptr orb, CosLoadBalancing::LoadManager_ptr lm); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); /** * @name PortableInterceptor::ObjectReferenceFactory Methods @@ -88,7 +88,7 @@ class TAO_LB_ObjectReferenceFactory * Protected destructor to enforce proper memory management via * reference counting. */ - ~TAO_LB_ObjectReferenceFactory (void); + ~TAO_LB_ObjectReferenceFactory (); /// Retrieve the object group reference for objects with the given /// RepositoryId. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h index 5bcb61e123587..088e39ddff342 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h @@ -41,9 +41,8 @@ class TAO_LB_LoadManager; class TAO_LB_Pull_Handler : public ACE_Event_Handler { public: - /// Constructor - TAO_LB_Pull_Handler (void); + TAO_LB_Pull_Handler (); /// Receive the timeout event. virtual int handle_timeout (const ACE_Time_Value ¤t_time, @@ -54,14 +53,12 @@ class TAO_LB_Pull_Handler : public ACE_Event_Handler TAO_LB_LoadManager * load_manager); private: - /// The table that contains all load monitors registered with the /// load balancer. TAO_LB_MonitorMap * monitor_map_; /// Pointer to the LoadManager servant. TAO_LB_LoadManager * load_manager_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index 12dc31cc68bad..58347a989c5bf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -11,7 +11,7 @@ static pthread_once_t tao_lb_once_control = PTHREAD_ONCE_INIT; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -extern "C" void tao_lb_random_init_routine (void) +extern "C" void tao_lb_random_init_routine () { ACE_OS::srand (static_cast (ACE_OS::time ())); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h index 3ed1d705db3b2..ccc507c06fbf9 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h @@ -35,7 +35,6 @@ class TAO_LB_Random : public virtual POA_CosLoadBalancing::Strategy { public: - /// Constructor. /** * Seeds the OS' random number generator. @@ -48,7 +47,7 @@ class TAO_LB_Random * Methods required by the CosLoadBalancing::Strategy interface. */ //@{ - virtual char * name (void); + virtual char * name (); virtual CosLoadBalancing::Properties * get_properties (); @@ -85,13 +84,11 @@ class TAO_LB_Random * If supported by the platform, initialization code will only run * once for a given process. */ - static void init (void); + static void init (); private: - /// This servant's default POA. PortableServer::POA_var poa_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h index cc3b966efb53d..9099508075e07 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h @@ -40,7 +40,6 @@ class TAO_LB_RoundRobin : public virtual POA_CosLoadBalancing::Strategy { public: - /// Constructor. TAO_LB_RoundRobin (PortableServer::POA_ptr poa); @@ -50,7 +49,7 @@ class TAO_LB_RoundRobin * Methods required by the CosLoadBalancing::Strategy interface. */ //@{ - virtual char * name (void); + virtual char * name (); virtual CosLoadBalancing::Properties * get_properties (); @@ -76,12 +75,10 @@ class TAO_LB_RoundRobin ); protected: - /// Destructor - ~TAO_LB_RoundRobin (void); + ~TAO_LB_RoundRobin (); private: - /// Keep a copy of location list for verify if the list is changed /// in next next_member() call. void copy_locations (PortableGroup::Locations_var& locations); @@ -107,7 +104,6 @@ class TAO_LB_RoundRobin /// Locations list retrieved in last next_member() call. ACE_Vector last_locations_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h index a3ad143d70b85..e51b7e4612157 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h @@ -60,9 +60,9 @@ class TAO_LoadBalancing_Export TAO_LB_ServerRequestInterceptor * ServerRequestInterceptors. */ //@{ - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri); @@ -86,7 +86,7 @@ class TAO_LoadBalancing_Export TAO_LB_ServerRequestInterceptor * Protected destructor to enforce correct memory management via * reference counting. */ - ~TAO_LB_ServerRequestInterceptor (void); + ~TAO_LB_ServerRequestInterceptor (); private: TAO_LB_LoadAlert & load_alert_; diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index e6efc1c2dfa52..66ce21238bade 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -46,7 +46,6 @@ class TAO_Log_Serv_Export TAO_BasicLogFactory_i : public TAO_LogMgr_i { public: - //= Initialization and termination code. /// Constructor. diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index b0b30c1bf4b6c..7db2db3649d52 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -34,7 +34,6 @@ TAO_BasicLog_i::copy (DsLogAdmin::LogId &id) this->copy_attributes (log.in ()); return log._retn (); - } DsLogAdmin::Log_ptr @@ -50,7 +49,6 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id) this->copy_attributes (log.in ()); return log._retn (); - } void diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 9c523b70323cc..5e8f0cbf381f9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -50,7 +50,6 @@ class TAO_Log_Serv_Export TAO_BasicLog_i : public POA_DsLogAdmin::BasicLog { public: - /// Constructor. TAO_BasicLog_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, @@ -65,19 +64,17 @@ class TAO_Log_Serv_Export TAO_BasicLog_i : virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id); /// Destroy the log object and all contained records. - void destroy (void); + void destroy (); protected: - /// Destructor. /** * Protected destructor to enforce proper memory management through * reference counting. */ - ~TAO_BasicLog_i (void); + ~TAO_BasicLog_i (); private: - /// POA. PortableServer::POA_var poa_; }; diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h index 86e3df16529bd..e6a88ae9fb85e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h @@ -57,14 +57,14 @@ class TAO_Event_LogConsumer : public virtual POA_CosEventComm::PushConsumer TAO_Event_LogConsumer (TAO_EventLog_i *log); /// Destructor. - ~TAO_Event_LogConsumer (void); + ~TAO_Event_LogConsumer (); /// Connect to EventLog. void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); private: /// Disconnect from EventLog. - void disconnect_push_consumer (void); + void disconnect_push_consumer (); /// This method will call TAO_Log_i::log() to write /// the event to the Log. diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h index abceed0cea751..e64ea0128b88e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h @@ -50,11 +50,10 @@ class TAO_EventLog_Serv_Export TAO_EventLogFactory_i : { public: - //= Initialization and termination code. /// Constructor. - TAO_EventLogFactory_i (void); + TAO_EventLogFactory_i (); /// Destructor. ~TAO_EventLogFactory_i (); @@ -83,9 +82,9 @@ class TAO_EventLog_Serv_Export TAO_EventLogFactory_i : const DsLogAdmin::CapacityAlarmThresholdList & thresholds); // = Implementation of the CosEventChannelAdmin::ConsumerAdmin methods. - CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void); + CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (); - CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void); + CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (); protected: virtual CORBA::RepositoryId create_repositoryid (); diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index 0a8c449c8751d..83dc3d1491217 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -49,10 +49,10 @@ class TAO_EventLog_Serv_Export TAO_EventLogNotification : TAO_EventLogNotification (CosEventChannelAdmin::EventChannel_ptr); /// Destructor. - ~TAO_EventLogNotification (void); + ~TAO_EventLogNotification (); /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); protected: /// Used to connect this PushSupplier to the EventChannel diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 6ede219f2e608..1f386f9b1c57b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -17,7 +17,6 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb, poa_(PortableServer::POA::_duplicate(poa)), log_poa_(PortableServer::POA::_duplicate(log_poa)) { - // Create an instance of the event channel. TAO_CEC_EventChannel_Attributes attr (this->poa_.in(), this->poa_.in()); @@ -48,7 +47,6 @@ TAO_EventLog_i::copy (DsLogAdmin::LogId &id) this->copy_attributes (log.in ()); return log._retn (); - } DsLogAdmin::Log_ptr @@ -64,7 +62,6 @@ TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id) this->copy_attributes (log.in ()); return log._retn (); - } diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index cd0a25b6d27a6..54c1b6c0b6624 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -73,21 +73,20 @@ class TAO_EventLog_i : /// Destroy the log object and all contained records. void - destroy (void); + destroy (); /// Activate the EventLog. void - activate (void); + activate (); // = The CosEventChannelAdmin::EventChannel interface methods. CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void); + for_consumers (); CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void); + for_suppliers (); protected: - /// Destructor /** * Protected destructor to enforce proper memory management through @@ -96,7 +95,6 @@ class TAO_EventLog_i : ~TAO_EventLog_i (); private: - /// The Event Channel that the log uses. TAO_CEC_EventChannel *event_channel_; diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h index 52daecf8ba0ff..6592d43e014d7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h @@ -52,7 +52,7 @@ class TAO_Log_Serv_Export TAO_Hash_Iterator_i CORBA::ULong max_rec_list_len); /// Destructor. - virtual ~TAO_Hash_Iterator_i (void); + virtual ~TAO_Hash_Iterator_i (); /// Gets a list of LogRecords. virtual DsLogAdmin::RecordList* get (CORBA::ULong position, diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index 93c5607b08d42..dde3268fe83ec 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -627,7 +627,6 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci } - DsLogAdmin::ForwardingState TAO_Hash_LogRecordStore::get_forwarding_state () const { diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h index 620ffc0f3fbc3..c9fd471bb60b8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h @@ -68,13 +68,13 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore const DsLogAdmin::CapacityAlarmThresholdList* thresholds); /// Destructor. - virtual ~TAO_Hash_LogRecordStore (void); + virtual ~TAO_Hash_LogRecordStore (); /// Initialization. - virtual int open (void); + virtual int open (); /// Close the record store. - virtual int close (void); + virtual int close (); // = Log Parameters @@ -135,7 +135,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore virtual void set_max_size (CORBA::ULongLong size); /// Get the weekly scheduling parameters - virtual DsLogAdmin::WeekMask* get_week_mask (void); + virtual DsLogAdmin::WeekMask* get_week_mask (); /// Set the weekly scheduling parameters. virtual void set_week_mask (const DsLogAdmin::WeekMask & masks); @@ -143,20 +143,20 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore // = LogRecordStore status methods /// Gets the current size of the log data. - virtual CORBA::ULongLong get_current_size (void); + virtual CORBA::ULongLong get_current_size (); /// Get the number of records in the log right now. - virtual CORBA::ULongLong get_n_records (void); + virtual CORBA::ULongLong get_n_records (); // = LogRecordStore gauge /// Gets the current value of the "gauge" that measures the total /// size of the records written to the log. - virtual CORBA::ULongLong get_gauge(void); + virtual CORBA::ULongLong get_gauge(); /// Resets the "gauge" to 0 - virtual void reset_gauge(void); + virtual void reset_gauge(); // = Record logging, retrieval, update and removal methods. @@ -165,7 +165,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore virtual int log (const DsLogAdmin::LogRecord &rec); /// Deletes "old" records from the store. - virtual int purge_old_records (void); + virtual int purge_old_records (); /// Set single record attributes. virtual void @@ -186,7 +186,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Ensure changes have been flushed to persistent media /// Returns 0 on success, -1 on failure. - virtual int flush (void); + virtual int flush (); /// Returns all records in the log that match the given constraint /// . @@ -214,7 +214,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore virtual CORBA::ULong delete_records_by_id (const DsLogAdmin::RecordIdList & ids); - virtual CORBA::ULong remove_old_records (void); + virtual CORBA::ULong remove_old_records (); /// Read-Write Lock virtual ACE_SYNCH_RW_MUTEX& lock(); diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h index a5b15400e2534..bf0c9028696d9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h @@ -49,11 +49,11 @@ class TAO_Log_Serv_Export TAO_Hash_LogStore /// Lists all logs created by the log factory. virtual DsLogAdmin::LogList * - list_logs (void); + list_logs (); /// Lists all log ids. virtual DsLogAdmin::LogIdList * - list_logs_by_id (void); + list_logs_by_id (); /// Returns a reference to the log with the supplied id. virtual DsLogAdmin::Log_ptr diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index 7e4882d8d0b6d..063318f6f5d98 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -48,14 +48,14 @@ class TAO_Log_Serv_Export TAO_Iterator_i TAO_Iterator_i (PortableServer::POA_ptr poa, ACE_Reactor* reactor); /// Destructor. - virtual ~TAO_Iterator_i (void); + virtual ~TAO_Iterator_i (); /// Gets a list of LogRecords. virtual DsLogAdmin::RecordList* get (CORBA::ULong position, CORBA::ULong how_many) = 0; /// This destroys the iterator. - virtual void destroy (void); + virtual void destroy (); protected: /// POA diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index cd3f112fe4fb6..fe3e5e8df33c5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -47,11 +47,11 @@ class TAO_Log_Serv_Export TAO_LogMgr_i /// Lists all log object references. DsLogAdmin::LogList * - list_logs (void); + list_logs (); /// Lists all log ids. DsLogAdmin::LogIdList * - list_logs_by_id (void); + list_logs_by_id (); /// Returns a reference to the log with the supplied id. DsLogAdmin::Log_ptr diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 44054f369744f..463f267f3eee2 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -17,7 +17,6 @@ TAO_LogNotification::~TAO_LogNotification () void TAO_LogNotification::object_creation (DsLogAdmin::LogId id) { - CORBA::Any any; DsLogNotification::ObjectCreation event; diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index a1d439676bb02..0f0979fad6072 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -37,14 +37,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Log_Serv_Export TAO_LogNotification { - public: - /// Constructor. - TAO_LogNotification (void); + TAO_LogNotification (); /// Destructor. - virtual ~TAO_LogNotification (void); + virtual ~TAO_LogNotification (); /// Event generated when a new log is created. void object_creation (DsLogAdmin::LogId id); diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index b942044cf4a1b..0390c50b5ed22 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -37,13 +37,13 @@ class TAO_Log_Serv_Export TAO_LogRecordStore { public: /// Destructor. - virtual ~TAO_LogRecordStore (void); + virtual ~TAO_LogRecordStore (); /// Initialization. - virtual int open (void) = 0; + virtual int open () = 0; /// Close the record store. - virtual int close (void) = 0; + virtual int close () = 0; // = Log Parameters @@ -113,7 +113,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Get the weekly scheduling parameters virtual DsLogAdmin::WeekMask* - get_week_mask (void) = 0; + get_week_mask () = 0; /// Set the weekly scheduling parameters. virtual void @@ -124,11 +124,11 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Gets the current size of the log data. virtual CORBA::ULongLong - get_current_size (void) = 0; + get_current_size () = 0; /// Get the number of records in the log right now. virtual CORBA::ULongLong - get_n_records (void) = 0; + get_n_records () = 0; // = LogRecordStore gauge @@ -136,11 +136,11 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Gets the current value of the "gauge" that measures the total /// size of the records written to the log. virtual CORBA::ULongLong - get_gauge(void) = 0; + get_gauge() = 0; /// Resets the "gauge" to 0 virtual void - reset_gauge(void) = 0; + reset_gauge() = 0; // = Record logging, retrieval, update and removal methods. @@ -152,7 +152,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Deletes "old" records from the store. virtual int - purge_old_records (void) = 0; + purge_old_records () = 0; /// Set single record attributes. virtual void @@ -174,7 +174,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Ensure changes have been flushed to persistent media /// Returns 0 on success, -1 on failure virtual int - flush (void) = 0; + flush () = 0; /// Returns all records in the log that match the given constraint @@ -207,14 +207,14 @@ class TAO_Log_Serv_Export TAO_LogRecordStore virtual CORBA::ULong - remove_old_records (void) = 0; + remove_old_records () = 0; /// Read-Write Lock virtual ACE_SYNCH_RW_MUTEX& lock() = 0; protected: /// Constructor. - TAO_LogRecordStore (void); + TAO_LogRecordStore (); private: diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h index 62abf1d6d8b08..6a512fc412af4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h @@ -35,11 +35,11 @@ class TAO_Log_Serv_Export TAO_LogStore /// Lists all logs created by the log factory. virtual DsLogAdmin::LogList * - list_logs (void) = 0; + list_logs () = 0; /// Lists all log ids. virtual DsLogAdmin::LogIdList * - list_logs_by_id (void) = 0; + list_logs_by_id () = 0; /// Returns a reference to the log with the supplied id. virtual DsLogAdmin::Log_ptr diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index d6be09630032f..ea7cccc354784 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -46,7 +46,7 @@ class TAO_Log_Serv_Export TAO_Log_Constraint_Interpreter : TAO_Log_Constraint_Interpreter (const char* constraints); /// Destructor. - ~TAO_Log_Constraint_Interpreter (void); + ~TAO_Log_Constraint_Interpreter (); /// Returns true if the constraint is evaluated successfully by /// the evaluator. diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index c5485ab12912a..1f1475a2f9fab 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -694,7 +694,6 @@ int TAO_Log_Constraint_Visitor::visit_binary_expr ( ETCL_Binary_Expr *binary_expr) { - // Evaluate the constraint int bin_op_type = binary_expr->type (); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h index b1a15532092be..6057d5822b92c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -47,7 +47,6 @@ class TAO_Log_Serv_Export TAO_Log_Constraint_Visitor : public ETCL_Constraint_Visitor { public: - /// Constructor. TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 2acd71188338d..35adee9ef1a54 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -46,9 +46,7 @@ class TAO_LogMgr_i; */ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log { - public: - /// Constructor. TAO_Log_i (CORBA::ORB_ptr orb, TAO_LogMgr_i& logmgr_i, @@ -60,7 +58,7 @@ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log ~TAO_Log_i (); /// Initlialize the Log. - void init (void); + void init (); /** * @name DsLogAdmin::Log Methods @@ -69,21 +67,21 @@ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log */ //@{ /// Return the factory of the log. - DsLogAdmin::LogMgr_ptr my_factory (void); + DsLogAdmin::LogMgr_ptr my_factory (); /// Return the id of the log. - DsLogAdmin::LogId id (void); + DsLogAdmin::LogId id (); /// Get the list of the QoS properties supported by the log. DsLogAdmin::QoSList* - get_log_qos (void); + get_log_qos (); /// Set the list of the QoS properties supported by the log. void set_log_qos (const DsLogAdmin::QoSList & qos); /// Get the record life in seconds (0 infinite). CORBA::ULong - get_max_record_life (void); + get_max_record_life (); /// Set the record life in seconds (0 infinite). void @@ -91,7 +89,7 @@ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log /// Get the maximum size in octets. CORBA::ULongLong - get_max_size (void); + get_max_size (); /// Set the maximum size in octets. void @@ -99,15 +97,15 @@ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log /// Get the current size of the log in octets. CORBA::ULongLong - get_current_size (void); + get_current_size (); /// Return the number of records in the log. CORBA::ULongLong - get_n_records (void); + get_n_records (); /// Get the action to be taken when the log reaches its maximum size. DsLogAdmin::LogFullActionType - get_log_full_action (void); + get_log_full_action (); /// Set the action to be taken when the log reaches its maximum size. void @@ -115,7 +113,7 @@ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log /// Get the administrative state of the log. DsLogAdmin::AdministrativeState - get_administrative_state (void); + get_administrative_state (); /// Set the administrative state of the log. void @@ -126,7 +124,7 @@ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log /// @@@ Of course! get_forwarding_state() is virtual in the base /// class dictated by the IDL! -Ossama virtual DsLogAdmin::ForwardingState - get_forwarding_state (void); + get_forwarding_state (); /// Set the forwarding state of the log. /// @@ Note: is it ok to make this method virtual? @@ -135,11 +133,11 @@ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log /// Get the operational state of the log. DsLogAdmin::OperationalState - get_operational_state (void); + get_operational_state (); /// Get the log duration DsLogAdmin::TimeInterval - get_interval (void); + get_interval (); /// Set the log duration. void @@ -147,11 +145,11 @@ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log /// Get the availability status DsLogAdmin::AvailabilityStatus - get_availability_status (void); + get_availability_status (); /// Get the capacity alarm threshold DsLogAdmin::CapacityAlarmThresholdList* - get_capacity_alarm_thresholds (void); + get_capacity_alarm_thresholds (); /** * Set the capacity alarm threshold. Threshold values represent @@ -167,7 +165,7 @@ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log /// Get the weekly scheduling parameters DsLogAdmin::WeekMask* - get_week_mask (void); + get_week_mask (); /// Set the weekly scheduling parameters. void @@ -231,30 +229,30 @@ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log /// Causes all pending events to be written to storage. Raises /// DsLogAdmin::UnsupportedQos void - flush (void); + flush (); //@} /// Remove records that have exceeded max_record_life_. - void remove_old_records (void); + void remove_old_records (); protected: /// Get the availability status /// @note must be called with locks held DsLogAdmin::AvailabilityStatus - get_availability_status_i (void); + get_availability_status_i (); /// Tells if the Log is scheduled to run now. /// @note must be called with locks held - CORBA::Boolean scheduled (void); + CORBA::Boolean scheduled (); /// Copy the attributes of the log being passed. void copy_attributes (DsLogAdmin::Log_ptr log); /// Check if threshold reached. - void check_capacity_alarm_threshold (void); + void check_capacity_alarm_threshold (); /// Reset capacity alarm threshold. - void reset_capacity_alarm_threshold (void); + void reset_capacity_alarm_threshold (); /// Check that valid threshold values have been given. static CORBA::Boolean validate_capacity_alarm_thresholds ( diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 9d46942ca6939..ef709e6d6c99f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -34,7 +34,6 @@ TAO_Notify_LogConsumer::connect ( ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_any_push_consumer (objref.in ()); - } void diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index 5ec6e83e3b36a..06360e8cd5c57 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -58,11 +58,11 @@ class TAO_Notify_LogConsumer : void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); /// Disconnect from NotifyLog. - virtual void disconnect (void); + virtual void disconnect (); protected: /// Destructor. - virtual ~TAO_Notify_LogConsumer (void); + virtual ~TAO_Notify_LogConsumer (); // = NotifyPublish method virtual void offer_change ( @@ -73,7 +73,7 @@ class TAO_Notify_LogConsumer : // = PushSupplier methods virtual void push (const CORBA::Any & event); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); /// ProxyPushSupplier used to connect to NotifyLog. CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_; diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 2b444c1a68b85..cdf78e7637ed5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -12,7 +12,6 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i () TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf) : notify_factory_ (ecf) { - CosNotifyChannelAdmin::ChannelID id; CosNotifyChannelAdmin::AdminID adminID = 0; CosNotification::QoSProperties initial_qos; @@ -256,7 +255,6 @@ TAO_NotifyLogFactory_i::obtain_push_supplier ( } - CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_NotifyLogFactory_i::obtain_pull_supplier ( ) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h index 587648e575ade..2e709068e8838 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h @@ -48,7 +48,7 @@ class TAO_NotifyLog_Serv_Export TAO_NotifyLogFactory_i : //= Initialization and termination code. /// Constructor - default. - TAO_NotifyLogFactory_i (void); + TAO_NotifyLogFactory_i (); /// Constructor. TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf); @@ -81,20 +81,20 @@ class TAO_NotifyLog_Serv_Export TAO_NotifyLogFactory_i : // = Methods from CosNotifyChannelAdmin::ConsumerAdmin. - CosNotifyChannelAdmin::AdminID MyID (void); + CosNotifyChannelAdmin::AdminID MyID (); - CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void); + CosNotifyChannelAdmin::EventChannel_ptr MyChannel (); - CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void); + CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (); - CosNotifyFilter::MappingFilter_ptr priority_filter (void); + CosNotifyFilter::MappingFilter_ptr priority_filter (); void priority_filter (CosNotifyFilter::MappingFilter_ptr); - CosNotifyFilter::MappingFilter_ptr lifetime_filter (void); + CosNotifyFilter::MappingFilter_ptr lifetime_filter (); void lifetime_filter (CosNotifyFilter::MappingFilter_ptr); - CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (void); - CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (void); + CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (); + CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (); CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier ( CosNotifyChannelAdmin::ProxyID proxy_id); @@ -107,18 +107,18 @@ class TAO_NotifyLog_Serv_Export TAO_NotifyLogFactory_i : CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID& id); - CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void); + CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (); - CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void); + CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (); - void destroy (void); + void destroy (); /// CosNotifyComm::NotifySubscribe. void subscription_change (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed); /// CosNotification::QoSAdmin. - CosNotification::QoSProperties* get_qos (void); + CosNotification::QoSProperties* get_qos (); void set_qos (const CosNotification::QoSProperties&); void validate_qos (const CosNotification::QoSProperties&, CosNotification::NamedPropertyRangeSeq_out); @@ -127,8 +127,8 @@ class TAO_NotifyLog_Serv_Export TAO_NotifyLogFactory_i : CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr); void remove_filter (CosNotifyFilter::FilterID); CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID); - CosNotifyFilter::FilterIDSeq* get_all_filters (void); - void remove_all_filters (void); + CosNotifyFilter::FilterIDSeq* get_all_filters (); + void remove_all_filters (); protected: virtual CORBA::RepositoryId diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 725c4952af79f..1aead3245ab7e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -10,7 +10,6 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification ( : TAO_LogNotification (), event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec)) { - CosNotifyComm::PushSupplier_var objref = this->_this (); ACE_ASSERT (!CORBA::is_nil (objref.in ())); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index 808a17206f1ed..bc753492b4ac3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -48,7 +48,7 @@ class TAO_NotifyLog_Serv_Export TAO_NotifyLogNotification : TAO_NotifyLogNotification (CosNotifyChannelAdmin::EventChannel_ptr); /// Destructor. - ~TAO_NotifyLogNotification (void); + ~TAO_NotifyLogNotification (); protected: // = Helper methods @@ -66,7 +66,7 @@ class TAO_NotifyLog_Serv_Export TAO_NotifyLogNotification : const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); /// Send the event on the event channel. virtual void send_notification (const CORBA::Any& any); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index 3cf48ab02342a..6a5084418550a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -15,7 +15,6 @@ TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb, notify_factory_ (CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf)), poa_ (PortableServer::POA::_duplicate (poa)) { - CosNotifyChannelAdmin::ChannelID channel_id; CosNotification::QoSProperties initial_qos; @@ -92,7 +91,6 @@ TAO_NotifyLog_i::destroy () void TAO_NotifyLog_i::activate () { - CosNotifyChannelAdmin::AdminID adminid = 0; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = CosNotifyChannelAdmin::OR_OP; diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index 84fbe8cea0d68..514a8e7286f00 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -73,29 +73,29 @@ class TAO_NotifyLog_Serv_Export TAO_NotifyLog_i : /// Destroy the log object and all contained records. void - destroy (void); + destroy (); /// Activate the NotifyLog. void - activate (void); + activate (); // = Methods from CosNotifyChannelAdmin::EventChannel. CosNotifyFilter::Filter_ptr - get_filter (void); + get_filter (); void set_filter (CosNotifyFilter::Filter_ptr filter); CosNotifyChannelAdmin::EventChannelFactory_ptr - MyFactory (void); + MyFactory (); CosNotifyChannelAdmin::ConsumerAdmin_ptr - default_consumer_admin (void); + default_consumer_admin (); CosNotifyChannelAdmin::SupplierAdmin_ptr - default_supplier_admin (void); + default_supplier_admin (); CosNotifyFilter::FilterFactory_ptr - default_filter_factory (void); + default_filter_factory (); CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, @@ -112,18 +112,18 @@ class TAO_NotifyLog_Serv_Export TAO_NotifyLog_i : get_supplieradmin (CosNotifyChannelAdmin::AdminID id); CosNotifyChannelAdmin::AdminIDSeq* - get_all_consumeradmins (void); + get_all_consumeradmins (); CosNotifyChannelAdmin::AdminIDSeq* - get_all_supplieradmins (void); + get_all_supplieradmins (); CosNotification::AdminProperties* - get_admin (void); + get_admin (); void set_admin (const CosNotification::AdminProperties& admin); CosNotification::QoSProperties* - get_qos (void); + get_qos (); void set_qos (const CosNotification::QoSProperties&); @@ -132,10 +132,10 @@ class TAO_NotifyLog_Serv_Export TAO_NotifyLog_i : // = Methods from DsEventLogAdmin::EventLog. CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void); + for_consumers (); CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void); + for_suppliers (); private: /// The PushConsumer that consumes the events and stores them diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index a20179e0a8902..f6ae27f78d8a6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -48,7 +48,6 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events) this->log_->write_recordlist (recList); - } void diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h index fb46ecdf537fe..a8baebcb5dc30 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h @@ -58,14 +58,14 @@ class TAO_RTEventLog_Serv_Export TAO_Rtec_LogConsumer :public virtual POA_RtecEv TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log); /// Destructor. - ~TAO_Rtec_LogConsumer (void); + ~TAO_Rtec_LogConsumer (); /// Connect to RTEventLog. void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); private: /// Disconnect from EventLog. - void disconnect_push_consumer (void); + void disconnect_push_consumer (); /// This method will call TAO_Log_i::log() to write /// the event to the Log. diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h index 7b017277f5d22..d513e0e3b2755 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h @@ -52,7 +52,7 @@ class TAO_RTEventLog_Serv_Export TAO_RTEventLogFactory_i : //= Initialization and termination code. /// Constructor. - TAO_RTEventLogFactory_i (void); + TAO_RTEventLogFactory_i (); /// Destructor. ~TAO_RTEventLogFactory_i (); @@ -65,7 +65,7 @@ class TAO_RTEventLog_Serv_Export TAO_RTEventLogFactory_i : /// Activate this servant RTEventLogAdmin::EventLogFactory_ptr - activate (void); + activate (); /// Used to create a RTEventLog. RTEventLogAdmin::EventLog_ptr create ( diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index bbcc5c060af67..4aab236323b9f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -25,7 +25,6 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification ( : TAO_LogNotification (), event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec)) { - obtainProxyConsumer (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h index b7b58b6b1dae5..4c88e83e4f87c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h @@ -51,17 +51,17 @@ class TAO_RTEventLog_Serv_Export TAO_RTEventLogNotification : TAO_RTEventLogNotification (RtecEventChannelAdmin::EventChannel_ptr); /// Destructor. - ~TAO_RTEventLogNotification (void); + ~TAO_RTEventLogNotification (); /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); protected: // = Helper methods /// Used to connect this PushSupplier to the EventChannel /// that will log these events. - void obtainProxyConsumer (void); + void obtainProxyConsumer (); // Send the event on the event channel. virtual void send_notification (const CORBA::Any& any); diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index c63d99d4e41ae..661eed9e4f8cd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -29,7 +29,6 @@ TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb, poa_ (PortableServer::POA::_duplicate (poa)), log_poa_ (PortableServer::POA::_duplicate (log_poa)) { - TAO_EC_Event_Channel_Attributes attr (poa_.in(), poa_.in()); ACE_NEW_THROW_EX (this->event_channel_, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h index cbc5897acfa1a..8da3b060a2616 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h @@ -73,15 +73,15 @@ class TAO_RTEventLog_Serv_Export TAO_RTEventLog_i : virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id); /// Destroy the log object and all contained records. - void destroy (void); + void destroy (); /// Activate the RTEventLog. - void activate (void); + void activate (); // = The RtecEventChannelAdmin::EventChannel interface methods. - RtecEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void); + RtecEventChannelAdmin::ConsumerAdmin_ptr for_consumers (); - RtecEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void); + RtecEventChannelAdmin::SupplierAdmin_ptr for_suppliers (); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp index 2266e5903fad8..7314bc1c34e14 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp @@ -23,7 +23,7 @@ TAO_Bindings_Iterator::TAO_Bindings_Iterator ( } template -TAO_Bindings_Iterator::~TAO_Bindings_Iterator (void) +TAO_Bindings_Iterator::~TAO_Bindings_Iterator () { delete hash_iter_; @@ -157,7 +157,7 @@ TAO_Bindings_Iterator::next_n ( } template void -TAO_Bindings_Iterator::destroy (void) +TAO_Bindings_Iterator::destroy () { // Check to make sure this object is still valid. if (this->destroyed_) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index 22d6ac41ac983..99f7ecfc70cf6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -58,10 +58,10 @@ class TAO_Bindings_Iterator : public virtual POA_CosNaming::BindingIterator PortableServer::POA_ptr poa); /// Destructor. - ~TAO_Bindings_Iterator (void); + ~TAO_Bindings_Iterator (); /// Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); // = Idl methods. @@ -78,7 +78,7 @@ class TAO_Bindings_Iterator : public virtual POA_CosNaming::BindingIterator CosNaming::BindingList_out bl); /// This operation destroys the iterator. - void destroy (void); + void destroy (); // = Helper method. @@ -117,13 +117,7 @@ class TAO_Bindings_Iterator : public virtual POA_CosNaming::BindingIterator TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Naming/Bindings_Iterator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Bindings_Iterator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_BINDINGS_ITERATOR_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index c3250e3e6f47c..e619665c582e9 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -41,7 +41,7 @@ class TAO_Naming_Serv_Export TAO_IntId { public: /// Constructor. - TAO_IntId (void); + TAO_IntId (); /// Constructor. TAO_IntId (CORBA::Object_ptr obj, @@ -51,7 +51,7 @@ class TAO_Naming_Serv_Export TAO_IntId TAO_IntId (const TAO_IntId & rhs); /// Destructor. - ~TAO_IntId (void); + ~TAO_IntId (); /// Assignment operator (does copy memory). void operator= (const TAO_IntId & rhs); @@ -121,10 +121,10 @@ class TAO_Naming_Serv_Export TAO_ExtId // = Accessors /// Return id_ in a const char * format. - const char * id (void); + const char * id (); /// Return kind_ in a const char * format. - const char * kind (void); + const char * kind (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp index 4a3c0bafc58ca..8d86516f2a98e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp @@ -314,7 +314,6 @@ void TAO_FT_Naming_Manager::set_default_properties ( const PortableGroup::Properties & props) { - this->properties_support_.set_default_properties (props); //@@ validate properties? } @@ -364,7 +363,6 @@ TAO_FT_Naming_Manager::set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Properties & overrides) { - TAO::PG_Object_Group * group = 0; if (this->group_factory_.find_group (object_group, group)) { @@ -451,7 +449,6 @@ TAO_FT_Naming_Manager::add_member ( if (this->group_factory_.find_group (object_group, group)) { try { - group->add_member (the_location, member); } @@ -464,7 +461,6 @@ TAO_FT_Naming_Manager::add_member ( } result = group->reference (); - } else { @@ -567,7 +563,6 @@ PortableGroup::ObjectGroupId TAO_FT_Naming_Manager::get_object_group_id ( PortableGroup::ObjectGroup_ptr object_group) { - if (CORBA::is_nil (object_group)) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -661,7 +656,6 @@ TAO_FT_Naming_Manager::get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location) { - if (CORBA::is_nil (object_group)) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -743,7 +737,6 @@ TAO_FT_Naming_Manager::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id) { - PortableGroup::ObjectGroupId group_id = 0; if (factory_creation_id >>= group_id) { diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h index b57c6786a030b..182737db5d7ea 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h @@ -107,7 +107,6 @@ class TAO_FtNaming_Export TAO_FT_Naming_Manager * Methods required by the PortableGroup::PropertyManager interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); @@ -167,7 +166,6 @@ class TAO_FtNaming_Export TAO_FT_Naming_Manager * interface. */ //@{ - /// Create a member using the load balancer ObjectGroupManager, and /// add the created object to the ObjectGroup. virtual PortableGroup::ObjectGroup_ptr create_member ( @@ -230,7 +228,6 @@ class TAO_FtNaming_Export TAO_FT_Naming_Manager * Methods required by the PortableGroup::GenericFactory interface. */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out @@ -284,7 +281,7 @@ class TAO_FtNaming_Export TAO_FT_Naming_Manager void set_global_strategy (const ACE_TCHAR *strat_name); /// Destructor. - ~TAO_FT_Naming_Manager (void); + ~TAO_FT_Naming_Manager (); private: /// A utility to ensure we can access the latest object reference for @@ -321,7 +318,6 @@ class TAO_FtNaming_Export TAO_FT_Naming_Manager * and Random are supported. */ //@{ - /// The "RoundRobin" load balancing strategy. TAO_FT_Round_Robin round_robin_; /// The "Random" load balancing strategy. diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp index ae18aa384f88b..82966a9794518 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp @@ -163,7 +163,6 @@ TAO_FT_Naming_Replication_Manager::svc () } try { - this->orb_->run (); } catch (const CORBA::SystemException &ex) @@ -349,7 +348,6 @@ TAO_FT_Naming_Replication_Manager::send_context_update (const ACE_CString & name void TAO_FT_Naming_Replication_Manager::send_registration (bool use_combo_refs) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG((LM_INFO, diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h index 6bf7d63ff8a0f..a841cff7d9e54 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h @@ -70,12 +70,12 @@ class TAO_FT_Naming_Replication_Manager : public ACE_Task_Base TAO_FT_Naming_Replication_Manager (TAO_FT_Naming_Server &owner); - virtual ~TAO_FT_Naming_Replication_Manager(void); + virtual ~TAO_FT_Naming_Replication_Manager(); virtual int svc (); virtual int handle_exception (ACE_HANDLE ); - void stop (void); + void stop (); void send_context_update (const ACE_CString &ctx, FT_Naming::ChangeType update); void send_objgrp_update (PortableGroup::ObjectGroupId id, @@ -88,8 +88,8 @@ class TAO_FT_Naming_Replication_Manager : public ACE_Task_Base void send_registration (bool use_combo); bool update_peer_registration (); - bool peer_available (void); - char * ior (void); + bool peer_available (); + char * ior (); private: Replica_var me_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp index b9bd3c43792e0..91496594ddd8f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp @@ -126,7 +126,6 @@ TAO_FT_Naming_Server::update_info_i () void TAO_FT_Naming_Server::update_info (FT_Naming::UpdateInfoSeq &infos) { - CORBA::ULong count = infos.length(); FT_Naming::UpdateInfo* guts = infos.get_buffer(true); FT_Naming::UpdateInfoSeq_var block = 0; @@ -322,7 +321,6 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int, ACE_TCHAR *[], CORBA::O this->naming_manager_.initialize (this->orb_.in (), this->naming_manager_poa_.in ()); - } catch (const CORBA::Exception& ex) { @@ -412,7 +410,6 @@ TAO_FT_Naming_Server::init_replication_pairing () void TAO_FT_Naming_Server::no_replica () { - if (this->server_role_ == BACKUP) { this->recover_iors (); @@ -931,7 +928,6 @@ TAO_FT_Naming_Server::combine_iors (FT_Naming::EntityKind kind, CORBA::Object_pt } else { - this->assign (combo, false, iorm->add_profiles (peer, this->iors_[local].ref_.in ())); } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h index 98c8d1492f8bc..e24e86bfcae2b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h @@ -85,11 +85,11 @@ class TAO_FtNaming_Export TAO_FT_Naming_Server : public TAO_Naming_Server /// Returns 0 on successful pairing with peer. /// Returns 1 if peer IOR file is present, but peer is not responding /// Returns -1 if pairing is not possible. - void init_replication_pairing (void); + void init_replication_pairing (); - void no_replica (void); + void no_replica (); - // TAO_FTNS_Notifier ¬ifier (void); + // TAO_FTNS_Notifier ¬ifier (); /// Overridden parse operation. Only allows options supported by the FT_Naming_Server /// and adds options for the object group manager @@ -104,7 +104,7 @@ class TAO_FtNaming_Export TAO_FT_Naming_Server : public TAO_Naming_Server /// Factory method to create a naming context factory for use with /// the -f option. virtual TAO_Persistent_Naming_Context_Factory * - persistent_naming_context_factory (void); + persistent_naming_context_factory (); /// Returns the IOR of the replication manager. char* replicator_ior (); @@ -148,7 +148,7 @@ class TAO_FtNaming_Export TAO_FT_Naming_Server : public TAO_Naming_Server IOR_ARRAY_SIZE }; - int recover_iors (void); + int recover_iors (); /// The object that implements the ObjectGroupManager, PropertyManager, /// and GenericFactory interfaces. diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp index d9637040909c9..b1fbdc028a05b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp @@ -50,7 +50,6 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n) // Get the locations of the object group members and we will use them to // do the load balancing try { - // Make sure object is an object group. // We will return the object reference all the way back out to the client // if not diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h index 8a6251771c039..4d793870ecbb3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h @@ -60,7 +60,6 @@ class TAO_FtNaming_Export TAO_FT_Persistent_Naming_Context : protected: static TAO_FT_Naming_Manager *naming_manager_impl_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp index 93023f53754ee..a7e0034a1f9fa 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp @@ -54,7 +54,6 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n) CORBA::Object_var resolved_ref = TAO_Storable_Naming_Context::resolve(n); try { - // Make sure object is an object group. // We will return the object reference as is all the way back // out to the client if not diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h index cbd60eff80ab1..84f16595d3077 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h @@ -80,13 +80,13 @@ class TAO_FtNaming_Export TAO_FT_Storable_Naming_Context : */ virtual void stale (bool is_stale); - virtual bool stale (void); + virtual bool stale (); /** * An internal utility used to signal that this context was updated. * Check the last_changed_ attribute for the time of the write. */ - void context_written (void); + void context_written (); /** * An internal callback invoked by the File_Open_Lock_and_Check @@ -96,11 +96,9 @@ class TAO_FtNaming_Export TAO_FT_Storable_Naming_Context : virtual bool is_obsolete (time_t stored_time); protected: - static TAO_FT_Naming_Manager *naming_manager_; bool stale_; TAO_FT_Naming_Replication_Manager *replicator_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h index 84ea1bcefac15..0777beee44e40 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h @@ -47,7 +47,7 @@ class TAO_FtNaming_Export TAO_FT_Storable_Naming_Context_Factory : /// this class goes out of scope, its hash_map remains in persistent storage. virtual ~TAO_FT_Storable_Naming_Context_Factory () = default; - TAO_FT_Naming_Replication_Manager * replicator (void); + TAO_FT_Naming_Replication_Manager * replicator (); /// Factory method for creating an implementation object for naming contexts. /// If an existing naming context implementation is being rebuilt, diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp index 3bd9059c4cafe..800b09cbb2f44 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp @@ -40,7 +40,6 @@ NS_group_svc::determine_policy_string (const ACE_TCHAR *policy, int NS_group_svc::set_orb( CORBA::ORB_ptr orb) { - this->orb_ = CORBA::ORB::_duplicate (orb); if (CORBA::is_nil (this->orb_.in ())) @@ -59,7 +58,6 @@ NS_group_svc::set_orb( CORBA::ORB_ptr orb) int NS_group_svc::set_naming_manager (FT_Naming::NamingManager_ptr nm) { - this->naming_manager_ = FT_Naming::NamingManager::_duplicate (nm); if (CORBA::is_nil (this->naming_manager_.in ())) @@ -77,7 +75,6 @@ NS_group_svc::set_naming_manager (FT_Naming::NamingManager_ptr nm) int NS_group_svc::set_name_context( CosNaming::NamingContextExt_ptr nc) { - this->name_service_ = CosNaming::NamingContextExt::_duplicate (nc); if (CORBA::is_nil (this->name_service_.in ())) @@ -235,7 +232,6 @@ NS_group_svc::group_bind (const ACE_TCHAR* group_name, try { - PortableGroup::ObjectGroup_var group_var = this->naming_manager_->get_object_group_ref_from_name (ACE_TEXT_ALWAYS_CHAR(group_name)); @@ -254,7 +250,6 @@ NS_group_svc::group_bind (const ACE_TCHAR* group_name, CosNaming::Name_var name = this->name_service_->to_name ( str.in() ); this->name_service_->rebind (name.in(), group_var.in()); - } catch (const CosNaming::NamingContextExt::InvalidName& ) { @@ -370,7 +365,6 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path) } catch (const CORBA::Exception& ) { - if (TAO_debug_level > 2) { ORBSVCS_ERROR ((LM_ERROR, @@ -390,7 +384,6 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path) int NS_group_svc::group_list () { - // KCS: The group list is independent of locations. I created a new operation in the // naming manager IDL to support requesting the group list - which is a list of names @@ -435,7 +428,6 @@ NS_group_svc::display_load_policy_group(FT_Naming::LoadBalancingStrategyValue st display_label)); if ( list->length () > 0 ) { - for (unsigned int i = 0; i < list->length (); ++i) { CORBA::String_var s = CORBA::string_dup (list[i]); @@ -621,7 +613,6 @@ NS_group_svc::member_add (const ACE_TCHAR* group_name, group_var = this->naming_manager_->add_member (group_var.in(), location_name, ior_var.in()); - } catch (const PortableGroup::ObjectGroupNotFound&) { @@ -841,7 +832,6 @@ NS_group_svc::member_show (const ACE_TCHAR* group_name, } catch (const PortableGroup::ObjectGroupNotFound&) { - if (TAO_debug_level > 2) { ORBSVCS_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h index f39b02dc0bb59..47d139210bddc 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h @@ -66,7 +66,7 @@ class TAO_FtNaming_Intf_Export NS_group_svc * * @return 0 on success, -1 on failure, -2 on bad argument. */ - int group_list (void); + int group_list (); /** * The naming service shall provide a command line utility to modify the load diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index 100612561c02a..58b71530eb129 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -25,12 +25,8 @@ # pragma warning (disable : 4250) #endif /* _MSC_VER */ -// Note: 'interface' has been defined as struct on WinCE platform and -// gives a compiler error. This undef has been found harmless on -// Windows and solaris platforms; however, if this generates -// error, then proper ifdef must be added around following block. #if defined (interface) -#undef interface +# undef interface #endif // interface TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -48,15 +44,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Naming_Serv_Export TAO_Bindings_Map { - public: - /// Destructor. - virtual ~TAO_Bindings_Map (void); + virtual ~TAO_Bindings_Map (); /// Return current number of entries (name bindings) in the /// underlying hash map. - virtual size_t current_size (void) = 0; + virtual size_t current_size () = 0; /** * Add a binding with the specified parameters to the table. @@ -94,7 +88,6 @@ class TAO_Naming_Serv_Export TAO_Bindings_Map const char * kind, CORBA::Object_ptr & obj, CosNaming::BindingType &type) = 0; - }; /** @@ -122,20 +115,20 @@ class TAO_Naming_Serv_Export TAO_Hash_Naming_Context :public TAO_Naming_Context_ void interface (TAO_Naming_Context *i); /// Destructor. - virtual ~TAO_Hash_Naming_Context (void); + virtual ~TAO_Hash_Naming_Context (); // = Accessors. /// Get the pointer to our interface. - TAO_Naming_Context *interface (void); + TAO_Naming_Context *interface (); /// Returns true if this Naming Context is a root Naming Context for /// the server, and false otherwise. - int root (void); + int root (); /// Returns true if this context had operation invoked on /// it, and false otherwise. - int destroyed (void); + int destroyed (); // = CosNaming::NamingContext idl interface methods. @@ -208,12 +201,12 @@ class TAO_Naming_Serv_Export TAO_Hash_Naming_Context :public TAO_Naming_Context_ * NOTE: after is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ - virtual void destroy (void); + virtual void destroy (); /// Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); - TAO_SYNCH_RW_MUTEX &lock (void); + TAO_SYNCH_RW_MUTEX &lock (); protected: // = Helper method used by other methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h index e09e93c265dae..545608747affb 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h @@ -39,7 +39,7 @@ class TAO_Naming_Export TAO_Naming_Client { public: /// Default constructor. - TAO_Naming_Client (void); + TAO_Naming_Client (); /** * Look for a Naming Service for a period of @a timeout using @@ -49,7 +49,7 @@ class TAO_Naming_Export TAO_Naming_Client int init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout = 0); /// Destructor. - ~TAO_Naming_Client (void); + ~TAO_Naming_Client (); /// Returns a pointer to the root Naming Context. CosNaming::NamingContext_ptr operator-> () const; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index 11858f0ece8d4..2d0f3187ff19e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -166,7 +166,6 @@ TAO_Naming_Context::to_string (const CosNaming::Name &n) // Stringify the name for (i=0; i < n.length (); ++i) { - // Stringify Id // const char *id = n[i].id.in (); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index 3a89382918a21..4b011f7bf15fe 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -49,7 +49,7 @@ class TAO_Naming_Serv_Export TAO_Naming_Context : TAO_Naming_Context (TAO_Naming_Context_Impl *impl); /// Destructor. - ~TAO_Naming_Context (void); + ~TAO_Naming_Context (); // = CosNaming::NamingContext idl interface methods. @@ -131,7 +131,7 @@ class TAO_Naming_Serv_Export TAO_Naming_Context : * NOTE: after is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ - virtual void destroy (void); + virtual void destroy (); /** * Returns at most the requested number of bindings in @@ -180,7 +180,7 @@ class TAO_Naming_Serv_Export TAO_Naming_Context : void stale (bool value); /// Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); private: enum Hint @@ -226,7 +226,6 @@ class TAO_Naming_Serv_Export TAO_Naming_Context : const char *sn); protected: - /// A concrete implementor of the NamingContext functions. TAO_Naming_Context_Impl *impl_; }; @@ -242,11 +241,9 @@ class TAO_Naming_Serv_Export TAO_Naming_Context : */ class TAO_Naming_Serv_Export TAO_Naming_Context_Impl { - public: - /// Destructor. - virtual ~TAO_Naming_Context_Impl (void); + virtual ~TAO_Naming_Context_Impl (); // = CosNaming::NamingContext idl interface methods. @@ -308,7 +305,7 @@ class TAO_Naming_Serv_Export TAO_Naming_Context_Impl * same naming server in which the operation was invoked. The * context is not bound. */ - virtual CosNaming::NamingContext_ptr new_context (void) = 0; + virtual CosNaming::NamingContext_ptr new_context () = 0; /** * This operation creates a new context and binds it to the name @@ -326,7 +323,7 @@ class TAO_Naming_Serv_Export TAO_Naming_Context_Impl * NOTE: after is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ - virtual void destroy (void) = 0; + virtual void destroy () = 0; /** * Returns at most the requested number of bindings in @@ -339,7 +336,7 @@ class TAO_Naming_Serv_Export TAO_Naming_Context_Impl CosNaming::BindingIterator_out &bi) = 0; /// Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void) = 0; + virtual PortableServer::POA_ptr _default_POA () = 0; /** * Set the stale flag for replicated persistence support. @@ -350,7 +347,7 @@ class TAO_Naming_Serv_Export TAO_Naming_Context_Impl * Query if the the implementation is stale for replicated * persistence support. */ - virtual bool stale (void); + virtual bool stale (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 31cf92cecab51..38c54893402ab 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -79,7 +79,6 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]) { - if (this->naming_server_ == 0) { ORBSVCS_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index d6017c77eeab3..c6634e80d49b3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -572,7 +572,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, // Initialize Persistent Naming Service. // { - // Create Naming Context Implementation Factory to be used for the creation of // naming contexts by the TAO_Persistent_Context_Index TAO_Persistent_Naming_Context_Factory *naming_context_factory = @@ -608,7 +607,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, TAO_ROOT_NAMING_CONTEXT, context_size); this->assign (size_t(ROOT), false, new_context.in()); - } #if !defined (CORBA_E_MICRO) @@ -787,7 +785,6 @@ TAO_Naming_Server::fini () { if (!CORBA::is_nil (this->ns_poa_.in ())) this->ns_poa_->destroy (1, 1); - } catch (const CORBA::Exception&) { @@ -908,7 +905,6 @@ TAO_Naming_Server::bundle_at(size_t ndx) const } - int TAO_Naming_Server::write(size_t ndx) const { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h index a01b6ba4aaf52..58645108b884a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h @@ -128,10 +128,10 @@ class TAO_Naming_Serv_Export TAO_Naming_Server virtual int fini (); /// Destructor. - virtual ~TAO_Naming_Server (void); + virtual ~TAO_Naming_Server (); /// Returns the IOR of the naming service. - char * naming_service_ior (void); + char * naming_service_ior (); /// Returns a for the root Naming Context. CosNaming::NamingContext_ptr operator-> () const; @@ -188,7 +188,7 @@ class TAO_Naming_Serv_Export TAO_Naming_Server * the -f option. */ virtual TAO_Persistent_Naming_Context_Factory * - persistent_naming_context_factory (void); + persistent_naming_context_factory (); /// The ior_multicast event handler. TAO_IOR_Multicast *ior_multicast_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp index babe95ecbab71..09f4e02918cc5 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp @@ -24,7 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_NS_Node) template -ACE_NS_Node::~ACE_NS_Node (void) +ACE_NS_Node::~ACE_NS_Node () { } @@ -85,7 +85,7 @@ ACE_Unbounded_List::insert_tail (const T &item) } template void -ACE_Unbounded_List::reset (void) +ACE_Unbounded_List::reset () { ACE_TRACE ("reset"); @@ -125,7 +125,7 @@ ACE_Unbounded_List::copy_nodes (const ACE_Unbounded_List &us) } template void -ACE_Unbounded_List::delete_nodes (void) +ACE_Unbounded_List::delete_nodes () { ACE_NS_Node *curr = this->head_->next_; @@ -147,7 +147,7 @@ ACE_Unbounded_List::delete_nodes (void) } template -ACE_Unbounded_List::~ACE_Unbounded_List (void) +ACE_Unbounded_List::~ACE_Unbounded_List () { // ACE_TRACE ("ACE_Unbounded_List::~ACE_Unbounded_List"); @@ -246,14 +246,14 @@ ACE_Unbounded_List::remove (const T &item) } template ACE_Unbounded_List_Iterator -ACE_Unbounded_List::begin (void) +ACE_Unbounded_List::begin () { // ACE_TRACE ("ACE_Unbounded_List::begin"); return ACE_Unbounded_List_Iterator (*this); } template ACE_Unbounded_List_Iterator -ACE_Unbounded_List::end (void) +ACE_Unbounded_List::end () { // ACE_TRACE ("ACE_Unbounded_List::end"); return ACE_Unbounded_List_Iterator (*this, 1); @@ -277,7 +277,7 @@ ACE_Unbounded_List_Iterator::ACE_Unbounded_List_Iterator (ACE_Unbounded_List< } template int -ACE_Unbounded_List_Iterator::advance (void) +ACE_Unbounded_List_Iterator::advance () { // ACE_TRACE ("ACE_Unbounded_List_Iterator::advance"); this->current_ = this->current_->next_; @@ -285,7 +285,7 @@ ACE_Unbounded_List_Iterator::advance (void) } template int -ACE_Unbounded_List_Iterator::first (void) +ACE_Unbounded_List_Iterator::first () { // ACE_TRACE ("ACE_Unbounded_List_Iterator::first"); this->current_ = this->set_->head_->next_; @@ -326,9 +326,9 @@ ACE_Unbounded_List_Iterator::operator++ (int) } template ACE_Unbounded_List_Iterator& -ACE_Unbounded_List_Iterator::operator++ (void) +ACE_Unbounded_List_Iterator::operator++ () { - // ACE_TRACE ("ACE_Unbounded_List_Iterator::operator++ (void)"); + // ACE_TRACE ("ACE_Unbounded_List_Iterator::operator++ ()"); // prefix operator @@ -337,7 +337,7 @@ ACE_Unbounded_List_Iterator::operator++ (void) } template T& -ACE_Unbounded_List_Iterator::operator* (void) +ACE_Unbounded_List_Iterator::operator* () { //ACE_TRACE ("ACE_Unbounded_List_Iterator::operator*"); T *retv = 0; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h index df514f3a72a3f..2538197dee286 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h @@ -44,7 +44,7 @@ class ACE_NS_Node friend class ACE_Unbounded_List; friend class ACE_Unbounded_List_Iterator; - ~ACE_NS_Node (void); + ~ACE_NS_Node (); private: ACE_NS_Node (const T &i, ACE_NS_Node *n); @@ -76,11 +76,11 @@ class ACE_Unbounded_List_Iterator /// Move forward by one element in the List. Returns 0 when all the /// items in the List have been seen, else 1. - int advance (void); + int advance (); /// Move to the first element in the List. Returns 0 if the /// List is empty, else 1. - int first (void); + int first (); /// Returns 1 when all items have been seen, else 0. int done () const; @@ -94,10 +94,10 @@ class ACE_Unbounded_List_Iterator ACE_Unbounded_List_Iterator operator++ (int); /// Prefix advance. - ACE_Unbounded_List_Iterator& operator++ (void); + ACE_Unbounded_List_Iterator& operator++ (); /// Returns a reference to the interal element is pointing to. - T& operator* (void); + T& operator* (); /// Check if two iterators point to the same position bool operator== (const ACE_Unbounded_List_Iterator &) const; @@ -144,7 +144,7 @@ class ACE_Unbounded_List void operator= (const ACE_Unbounded_List &); /// Destructor. - ~ACE_Unbounded_List (void); + ~ACE_Unbounded_List (); // = Check boundary conditions. @@ -177,11 +177,11 @@ class ACE_Unbounded_List void dump () const; /// Reset the to be empty. - void reset (void); + void reset (); // = STL-styled unidirectional iterator factory. - ACE_Unbounded_List_Iterator begin (void); - ACE_Unbounded_List_Iterator end (void); + ACE_Unbounded_List_Iterator begin (); + ACE_Unbounded_List_Iterator end (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -192,7 +192,7 @@ class ACE_Unbounded_List int insert_tail (const T &item); /// Delete all the nodes in the List. - void delete_nodes (void); + void delete_nodes (); /// Copy nodes into this set. void copy_nodes (const ACE_Unbounded_List &); @@ -209,13 +209,7 @@ class ACE_Unbounded_List TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Naming/Naming_Service_Container.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Naming_Service_Container.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* NS_CONTAINERS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 896f31bc96f11..d042436d0883c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -144,7 +144,6 @@ TAO_Persistent_Context_Index::init (size_t context_size) // CASE 1:there are no Naming Contexts registered. We need to create // one. { - this->root_context_ = TAO_Persistent_Naming_Context::make_new_context (poa_.in (), TAO_ROOT_NAMING_CONTEXT, @@ -222,7 +221,6 @@ TAO_Persistent_Context_Index::recreate_all () // If this is the root Naming Context, take a note of it. if (context_impl->root ()) this->root_context_= result._retn (); - } while (index_iter->advance ()); return 0; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index 82aba1c6c65d4..dda89d4974aff 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -99,7 +99,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Context_Index * not deleted, since we want it to keep the state of the Naming * Service until the next run. */ - ~TAO_Persistent_Context_Index (void); + ~TAO_Persistent_Context_Index (); // = Methods for adding/removing entries. @@ -117,14 +117,14 @@ class TAO_Naming_Serv_Export TAO_Persistent_Context_Index // = Accessors. /// Return allocator. - ACE_Allocator *allocator (void); + ACE_Allocator *allocator (); /// Return orb pointer. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// Return a pointer to the root Naming Context (returns a copy - must be /// deallocated by the user). - CosNaming::NamingContext_ptr root_context (void); + CosNaming::NamingContext_ptr root_context (); private: /// Helper for the method. Iterates over , and diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index e2d89857f97c6..69bcbc2698634 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -41,7 +41,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_IntId { public: /// Constructor. - TAO_Persistent_IntId (void); + TAO_Persistent_IntId (); /// Constructor. TAO_Persistent_IntId (char * obj_ref, @@ -51,7 +51,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_IntId TAO_Persistent_IntId (const TAO_Persistent_IntId & rhs); /// Destructor. - ~TAO_Persistent_IntId (void); + ~TAO_Persistent_IntId (); /// Assignment operator. void operator= (const TAO_Persistent_IntId & rhs); @@ -83,7 +83,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_ExtId { public: /// Constructor. - TAO_Persistent_ExtId (void); + TAO_Persistent_ExtId (); /// Constructor. TAO_Persistent_ExtId (const char *id, @@ -93,7 +93,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_ExtId TAO_Persistent_ExtId (const TAO_Persistent_ExtId & rhs); /// Destructor. - ~TAO_Persistent_ExtId (void); + ~TAO_Persistent_ExtId (); // = Assignment and comparison methods. @@ -122,8 +122,8 @@ class TAO_Naming_Serv_Export TAO_Persistent_ExtId // Accessors. - const char * id (void); - const char * kind (void); + const char * id (); + const char * kind (); }; /** @@ -143,7 +143,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Index_IntId { public: /// Constructor. - TAO_Persistent_Index_IntId (void); + TAO_Persistent_Index_IntId (); /// Constructor. TAO_Persistent_Index_IntId (ACE_UINT32 *counter, @@ -154,7 +154,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Index_IntId TAO_Persistent_Index_IntId (const TAO_Persistent_Index_IntId & rhs); /// Destructor. - ~TAO_Persistent_Index_IntId (void); + ~TAO_Persistent_Index_IntId (); /// Assignment operator (does copy memory). void operator= (const TAO_Persistent_Index_IntId & rhs); @@ -186,7 +186,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Index_ExtId { public: /// Constructor. - TAO_Persistent_Index_ExtId (void); + TAO_Persistent_Index_ExtId (); /// Constructor. TAO_Persistent_Index_ExtId (const char *poa_id); @@ -195,7 +195,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Index_ExtId TAO_Persistent_Index_ExtId (const TAO_Persistent_Index_ExtId & rhs); /// Destructor. - ~TAO_Persistent_Index_ExtId (void); + ~TAO_Persistent_Index_ExtId (); // = Assignment and comparison methods. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index ca8c730042676..deb839039e8ba 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -178,7 +178,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Naming_Context : public TAO_Hash_Nam ACE_UINT32 *counter = 0); /// Destructor. - virtual ~TAO_Persistent_Naming_Context (void); + virtual ~TAO_Persistent_Naming_Context (); // = Utility methods. /** @@ -200,7 +200,7 @@ class TAO_Naming_Serv_Export TAO_Persistent_Naming_Context : public TAO_Hash_Nam * same naming server in which the operation was invoked. The * context is not bound. */ - virtual CosNaming::NamingContext_ptr new_context (void); + virtual CosNaming::NamingContext_ptr new_context (); /** * Returns at most the requested number of bindings @a how_many in diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp index 771c2bed9c216..bbb96410dba9a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Constructor. TAO_Persistent_Naming_Context_Factory::TAO_Persistent_Naming_Context_Factory () { - } /// Destructor. Does not deallocate the hash map: if an instance of diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 9b113af97106c..abb5b1edd81a4 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -307,7 +307,6 @@ bool TAO_Storable_Naming_Context:: File_Open_Lock_and_Check::object_obsolete () { - // Query the underlying context if it is obsolete with respect // to the provided file last-changed time return (context_->is_obsolete (fl_->last_changed ())); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h index 62735014be375..ef6222589ed46 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h @@ -37,7 +37,7 @@ class TAO_Naming_Serv_Export TAO_Storable_IntId { public: /// Constructor. - TAO_Storable_IntId (void); + TAO_Storable_IntId (); /// Constructor. TAO_Storable_IntId (/* in */ const char * ior, @@ -47,7 +47,7 @@ class TAO_Naming_Serv_Export TAO_Storable_IntId TAO_Storable_IntId (const TAO_Storable_IntId & rhs); /// Destructor. - ~TAO_Storable_IntId (void); + ~TAO_Storable_IntId (); /// Assignment operator. void operator= (const TAO_Storable_IntId & rhs); @@ -65,7 +65,7 @@ class TAO_Naming_Serv_Export TAO_Storable_ExtId { public: /// Constructor. - TAO_Storable_ExtId (void); + TAO_Storable_ExtId (); /// Constructor. TAO_Storable_ExtId (/* in */ const char *id, @@ -75,7 +75,7 @@ class TAO_Naming_Serv_Export TAO_Storable_ExtId TAO_Storable_ExtId (const TAO_Storable_ExtId & rhs); /// Destructor. - ~TAO_Storable_ExtId (void); + ~TAO_Storable_ExtId (); // = Assignment and comparison methods. @@ -105,9 +105,8 @@ class TAO_Naming_Serv_Export TAO_Storable_ExtId // Accessors. // follow the mapping rules! - const char * id (void); - const char * kind (void); - + const char * id (); + const char * kind (); }; @@ -132,19 +131,19 @@ class TAO_Naming_Serv_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map TAO_Storable_Bindings_Map (size_t hash_table_size, CORBA::ORB_ptr orb); /// Destructor. - virtual ~TAO_Storable_Bindings_Map (void); + virtual ~TAO_Storable_Bindings_Map (); // = Accessors. /// Get a reference to the underlying hash map. - HASH_MAP &map (void); + HASH_MAP &map (); /// Return the size of the underlying hash table. - size_t total_size (void); + size_t total_size (); /// Return current number of entries (name bindings) in the /// underlying hash map. - virtual size_t current_size (void); + virtual size_t current_size (); // = Name bindings manipulation methods. @@ -188,7 +187,6 @@ class TAO_Naming_Serv_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map CosNaming::BindingType &type); private: - /// Helper: factors common code from and . int shared_bind (const char *id, const char *kind, @@ -200,7 +198,6 @@ class TAO_Naming_Serv_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map HASH_MAP map_; CORBA::ORB_var orb_; - }; /** @@ -231,7 +228,7 @@ class TAO_Naming_Serv_Export TAO_Storable_Naming_Context : public TAO_Hash_Namin size_t hash_table_size = ACE_DEFAULT_MAP_SIZE); /// Destructor. - virtual ~TAO_Storable_Naming_Context (void); + virtual ~TAO_Storable_Naming_Context (); // = Utility methods. /** @@ -267,7 +264,7 @@ class TAO_Naming_Serv_Export TAO_Storable_Naming_Context : public TAO_Hash_Namin * same naming server in which the operation was invoked. The * context is not bound. */ - virtual CosNaming::NamingContext_ptr new_context (void); + virtual CosNaming::NamingContext_ptr new_context (); /** * Returns at most the requested number of bindings in @@ -345,15 +342,14 @@ class TAO_Naming_Serv_Export TAO_Storable_Naming_Context : public TAO_Hash_Namin * NOTE: after is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ - virtual void destroy (void); + virtual void destroy (); protected: - /** * A helper function to ensure the current object was not destroyed by raising * an exception if it was. Uses the lock as a Reader. */ - void verify_not_destroyed (void); + void verify_not_destroyed (); /** * A helper function to validate the name argument and return a final context @@ -368,7 +364,7 @@ class TAO_Naming_Serv_Export TAO_Storable_Naming_Context : public TAO_Hash_Namin * This will have been done after the file is closed. Check the * last_changed_ attribute for the time of the write. */ - virtual void context_written (void); + virtual void context_written (); /** * An internal callback invoked by the File_Open_Lock_and_Check @@ -433,7 +429,6 @@ class TAO_Naming_Serv_Export File_Open_Lock_and_Check : public TAO::Storable_File_Guard { public: - /// Constructor File_Open_Lock_and_Check (TAO_Storable_Naming_Context * context, Method_Type method_type, @@ -442,15 +437,14 @@ public TAO::Storable_File_Guard ~File_Open_Lock_and_Check (); protected: - /// Check if the guarded object is current with the last /// update which could have been performed independently of /// the owner of this object. - virtual bool object_obsolete (void); + virtual bool object_obsolete (); /// Mark the object as current with respect to the /// file to which it was persisted. - virtual void mark_object_current (void); + virtual void mark_object_current (); /// Mark the time at which the object was modified and virtual void set_object_last_changed (const time_t & time); @@ -467,10 +461,9 @@ public TAO::Storable_File_Guard private: /// Default constructor - File_Open_Lock_and_Check(void); + File_Open_Lock_and_Check(); TAO_Storable_Naming_Context * context_; - }; // end of embedded class File_Open_Lock_and_Check friend class File_Open_Lock_and_Check; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp index f4f20070e8120..b98b23b428ca0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp @@ -40,7 +40,6 @@ TAO_Storable_Naming_Context_Activator::incarnate ( const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa) { - // Make sure complete initialization has been done ACE_ASSERT (persistence_factory_ != 0); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h index 934790c6548d8..9ace464e04da7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h @@ -44,7 +44,7 @@ class TAO_Naming_Serv_Export TAO_Storable_Naming_Context_Factory /// Destructor. Does not deallocate the hash map: if an instance of /// this class goes out of scope, its hash_map remains in persistent storage. - virtual ~TAO_Storable_Naming_Context_Factory (void); + virtual ~TAO_Storable_Naming_Context_Factory (); /// Factory method for creating an implementation object for naming contexts. /// If an existing naming context implementation is being rebuilt, the map diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp index 05a80e2065118..ec3195f1a1fd9 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp @@ -274,7 +274,6 @@ TAO_Storable_Naming_Context_ReaderWriter::read_global (TAO_NS_Persistence_Global } global.counter(counter); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h index b2f20ec58af58..5bd4a7ebc8a37 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h @@ -36,7 +36,6 @@ class TAO_NS_Persistence_Global; class TAO_Storable_Naming_Context_ReaderWriter { public: - TAO_Storable_Naming_Context_ReaderWriter (TAO::Storable_Base & stream); int read (TAO_Storable_Naming_Context & context); @@ -47,7 +46,6 @@ class TAO_Storable_Naming_Context_ReaderWriter void read_global (TAO_NS_Persistence_Global & global); private: - void write_header (const TAO_NS_Persistence_Header & header); void read_header (TAO_NS_Persistence_Header & header); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 0836bd4313931..4f725cbb11e78 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_stdio.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index b3f7fa3db5be6..5bf39fd6f0315 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -43,19 +43,19 @@ class TAO_Naming_Serv_Export TAO_Transient_Bindings_Map : public TAO_Bindings_Ma TAO_Transient_Bindings_Map (size_t hash_table_size); /// Destructor. - virtual ~TAO_Transient_Bindings_Map (void); + virtual ~TAO_Transient_Bindings_Map (); // = Accessors. /// Get a reference to the underlying hash map. - HASH_MAP &map (void); + HASH_MAP &map (); /// Return the size of the underlying hash table. - size_t total_size (void); + size_t total_size (); /// Return current number of entries (name bindings) in the /// underlying hash map. - virtual size_t current_size (void); + virtual size_t current_size (); // = Name bindings manipulation methods. @@ -100,7 +100,6 @@ class TAO_Naming_Serv_Export TAO_Transient_Bindings_Map : public TAO_Bindings_Ma CosNaming::BindingType &type); private: - /// Helper: factors common code from and . int shared_bind (const char *id, const char *kind, @@ -138,7 +137,7 @@ class TAO_Naming_Serv_Export TAO_Transient_Naming_Context : public TAO_Hash_Nami = ACE_DEFAULT_MAP_SIZE); /// Destructor. - virtual ~TAO_Transient_Naming_Context (void); + virtual ~TAO_Transient_Naming_Context (); // = Utility methods. /** @@ -159,7 +158,7 @@ class TAO_Naming_Serv_Export TAO_Transient_Naming_Context : public TAO_Hash_Nami * same naming server in which the operation was invoked. The * context is not bound. */ - virtual CosNaming::NamingContext_ptr new_context (void); + virtual CosNaming::NamingContext_ptr new_context (); /** * Returns at most the requested number of bindings in @@ -172,7 +171,6 @@ class TAO_Naming_Serv_Export TAO_Transient_Naming_Context : public TAO_Hash_Nami CosNaming::BindingIterator_out &bi); protected: - /// Counter used for generation of POA ids for children Naming /// Contexts. ACE_UINT32 counter_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 0ad5f026dc35e..d369a3af82ebc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -62,7 +62,6 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent) this->proxy_container_.reset (proxy_container); this->proxy_container().init (); - } void @@ -223,5 +222,4 @@ TAO_Notify_Admin::validate () } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h index ae81025fe23dd..accd1590bc8e1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h @@ -57,14 +57,14 @@ class TAO_Notify_Serv_Export TAO_Notify_Admin : public TAO_Notify::Topology_Pare bool experienced_timeout); /// Access Admin FilterAdmin. - TAO_Notify_FilterAdmin& filter_admin (void); + TAO_Notify_FilterAdmin& filter_admin (); /// Set Filter operator void filter_operator ( CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator); /// Access Filter operator - CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator (void); + CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator (); /// Obtain the Admin's subscribed types. void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types); @@ -72,12 +72,12 @@ class TAO_Notify_Serv_Export TAO_Notify_Admin : public TAO_Notify::Topology_Pare TAO_Notify_EventChannel * event_channel () const; /// Shutdown - virtual int shutdown (void); + virtual int shutdown (); virtual void save_persistent (TAO_Notify::Topology_Saver& saver); virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id, const TAO_Notify::NVPList& attrs); - virtual void reconnect (void); + virtual void reconnect (); virtual void validate (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl index db6dd43b5bf9f..e83f0799973b0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl @@ -10,7 +10,7 @@ TAO_Notify_Admin::event_channel () const ACE_INLINE TAO_Notify_FilterAdmin& -TAO_Notify_Admin::filter_admin (void) +TAO_Notify_Admin::filter_admin () { return this->filter_admin_; } @@ -22,7 +22,7 @@ TAO_Notify_Admin::filter_operator (CosNotifyChannelAdmin::InterFilterGroupOperat } ACE_INLINE CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_Admin::filter_operator (void) +TAO_Notify_Admin::filter_operator () { return this->filter_operator_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h index 79b5819ec454f..5040b44ac20aa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h @@ -40,7 +40,7 @@ class TAO_Notify_Serv_Export TAO_Notify_AdminProperties public: typedef ACE_Strong_Bound_Ptr Ptr; /// Constructor - TAO_Notify_AdminProperties (void); + TAO_Notify_AdminProperties (); /// Destructor virtual ~TAO_Notify_AdminProperties (); @@ -58,21 +58,21 @@ class TAO_Notify_Serv_Export TAO_Notify_AdminProperties const TAO_Notify_Property_Boolean& reject_new_events () const; // = Non-const accessors - TAO_Notify_Property_Long & max_global_queue_length (void); - TAO_Notify_Property_Long & max_consumers (void); - TAO_Notify_Property_Long & max_suppliers (void); - TAO_Notify_Property_Boolean & reject_new_events (void); + TAO_Notify_Property_Long & max_global_queue_length (); + TAO_Notify_Property_Long & max_consumers (); + TAO_Notify_Property_Long & max_suppliers (); + TAO_Notify_Property_Boolean & reject_new_events (); - CORBA::Long& global_queue_length (void); - TAO_SYNCH_MUTEX& global_queue_lock (void); - TAO_SYNCH_CONDITION& global_queue_not_full (void); + CORBA::Long& global_queue_length (); + TAO_SYNCH_MUTEX& global_queue_lock (); + TAO_SYNCH_CONDITION& global_queue_not_full (); - TAO_Notify_Atomic_Property_Long& consumers (void); - TAO_Notify_Atomic_Property_Long& suppliers (void); + TAO_Notify_Atomic_Property_Long& consumers (); + TAO_Notify_Atomic_Property_Long& suppliers (); // = Helper method /// Returns true if Queue is full - CORBA::Boolean queue_full (void); + CORBA::Boolean queue_full (); protected: // @@ Pradeep can you explain why there is any maximum for these diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl index 7ef751cc024d0..c35e3bf674870 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl @@ -8,7 +8,7 @@ TAO_Notify_AdminProperties::max_global_queue_length () const } ACE_INLINE TAO_Notify_Property_Long& -TAO_Notify_AdminProperties::max_global_queue_length (void) +TAO_Notify_AdminProperties::max_global_queue_length () { return this->max_global_queue_length_; } @@ -20,7 +20,7 @@ TAO_Notify_AdminProperties::max_consumers () const } ACE_INLINE TAO_Notify_Property_Long& -TAO_Notify_AdminProperties::max_consumers (void) +TAO_Notify_AdminProperties::max_consumers () { return this->max_consumers_; } @@ -32,7 +32,7 @@ TAO_Notify_AdminProperties::max_suppliers () const } ACE_INLINE TAO_Notify_Property_Long& -TAO_Notify_AdminProperties::max_suppliers (void) +TAO_Notify_AdminProperties::max_suppliers () { return this->max_suppliers_; } @@ -44,37 +44,37 @@ TAO_Notify_AdminProperties::reject_new_events () const } ACE_INLINE TAO_Notify_Property_Boolean& -TAO_Notify_AdminProperties::reject_new_events (void) +TAO_Notify_AdminProperties::reject_new_events () { return this->reject_new_events_; } ACE_INLINE CORBA::Long& -TAO_Notify_AdminProperties::global_queue_length (void) +TAO_Notify_AdminProperties::global_queue_length () { return this->global_queue_length_; } ACE_INLINE TAO_SYNCH_MUTEX& -TAO_Notify_AdminProperties::global_queue_lock (void) +TAO_Notify_AdminProperties::global_queue_lock () { return this->global_queue_lock_; } ACE_INLINE TAO_SYNCH_CONDITION& -TAO_Notify_AdminProperties::global_queue_not_full(void) +TAO_Notify_AdminProperties::global_queue_not_full() { return this->global_queue_not_full_; } ACE_INLINE TAO_Notify_Atomic_Property_Long& -TAO_Notify_AdminProperties::consumers (void) +TAO_Notify_AdminProperties::consumers () { return this->consumers_; } ACE_INLINE TAO_Notify_Atomic_Property_Long& -TAO_Notify_AdminProperties::suppliers (void) +TAO_Notify_AdminProperties::suppliers () { return this->suppliers_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h index 92043029904bf..11b9c28a74ed2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h @@ -11,7 +11,6 @@ //#define DEBUG_MEMORY_USE #if defined(_MSC_VER) && defined (_DEBUG) && defined (DEBUG_MEMORY_USE) namespace CRT{ - /// \brief dump heap allocation stats /// /// This works only on microsoft/windows compilers diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h index a0877cc5bee35..c3cdf00cbbc3e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h @@ -77,7 +77,6 @@ class TAO_Notify_Serv_Export TAO_Notify_AnyEvent_No_Copy : public TAO_Notify_Eve virtual TAO_Notify_Event * copy () const; protected: - // This must be a pointer rather than a reference, because the derived // class needs to redirect it to a new copy const CORBA::Any* event_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index e5f29255b3f0f..1d2b83ce29dca 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -38,7 +38,7 @@ class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushConsumer friend class TAO_Notify_Builder; public: /// Constructor - TAO_Notify_CosEC_ProxyPushConsumer (void); + TAO_Notify_CosEC_ProxyPushConsumer (); /// Destructor virtual ~TAO_Notify_CosEC_ProxyPushConsumer (); @@ -55,10 +55,10 @@ class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushConsumer virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: /// Release - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 31456ab5d1357..f4fc3f72dee3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -16,7 +16,6 @@ TAO_Notify_CosEC_ProxyPushSupplier::~TAO_Notify_CosEC_ProxyPushSupplier () void TAO_Notify_CosEC_ProxyPushSupplier::release () { - delete this; //@@ inform factory } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h index 3657bc830e082..19b4522650617 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h @@ -43,7 +43,7 @@ class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushSupplier friend class TAO_Notify_Builder; public: /// Constructor - TAO_Notify_CosEC_ProxyPushSupplier (void); + TAO_Notify_CosEC_ProxyPushSupplier (); /// Destructor virtual ~TAO_Notify_CosEC_ProxyPushSupplier (); @@ -61,7 +61,7 @@ class TAO_Notify_Serv_Export TAO_Notify_CosEC_ProxyPushSupplier private: /// Release - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index 425e4f150bc51..0d6730ff9d994 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyPushConsumer friend class TAO_Notify_Builder; public: /// Constructor - TAO_Notify_ProxyPushConsumer (void); + TAO_Notify_ProxyPushConsumer (); /// Destructor virtual ~TAO_Notify_ProxyPushConsumer (); @@ -54,17 +54,17 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyPushConsumer protected: ///= CosNotifyChannelAdmin::ProxyPushConsumer methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void); + virtual CosNotifyChannelAdmin::ProxyType MyType (); virtual void push (const CORBA::Any & data); virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: /// Release - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index a20b22359f3fb..2ac03308b09d3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -110,5 +110,4 @@ TAO_Notify_ProxyPushSupplier::configure( } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h index 28291efd0f2db..af9df23e8f843 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h @@ -45,7 +45,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyPushSupplier friend class TAO_Notify_Builder; public: /// Constructor - TAO_Notify_ProxyPushSupplier (void); + TAO_Notify_ProxyPushSupplier (); /// Destructor virtual ~TAO_Notify_ProxyPushSupplier (); @@ -57,7 +57,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyPushSupplier virtual void configure(TAO_Notify_ConsumerAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id); // = Interface methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void); + virtual CosNotifyChannelAdmin::ProxyType MyType (); virtual void connect_any_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer); @@ -66,7 +66,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyPushSupplier private: /// TAO_Notify_Destroy_Callback methods - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h index 6af79236b79e6..1a03411b4a9a9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h @@ -55,15 +55,14 @@ class TAO_Notify_Serv_Export TAO_Notify_PushConsumer : public TAO_Notify_Consume TAO_Notify_Consumer* old_consumer); protected: - - virtual CORBA::Object_ptr get_consumer (void); + virtual CORBA::Object_ptr get_consumer (); /// The Consumer CosEventComm::PushConsumer_var push_consumer_; private: /// TAO_Notify_Destroy_Callback methods. - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h index ccb3d90c259ad..efff6bcbe5f3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h @@ -43,15 +43,14 @@ class TAO_Notify_Serv_Export TAO_Notify_PushSupplier : public TAO_Notify_Supplie virtual ACE_CString get_ior () const; protected: - - virtual CORBA::Object_ptr get_supplier (void); + virtual CORBA::Object_ptr get_supplier (); /// The Supplier CosEventComm::PushSupplier_var push_supplier_; private: /// TAO_Notify_Destroy_Callback methods - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp index 34098fab019a6..0d1ff9bd3a747 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp @@ -4,7 +4,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Bit_Vector::Bit_Vector() : size_(0) , first_set_bit_(0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h index 2408b2e918f07..e23a1fd771340 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /// \brief Simple bit vector. /// /// Written to support block allocation from persistent storage. @@ -43,7 +42,6 @@ class TAO_Notify_Serv_Export Bit_Vector BPW_LOG_2 = 5 }; public: - /// The constructor. Bit_Vector(); /// The destructor. @@ -70,7 +68,6 @@ class TAO_Notify_Serv_Export Bit_Vector size_t first_set_bit_; size_t first_cleared_bit_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 8721836d7e6de..d92430161ad67 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -361,5 +361,4 @@ TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable* met } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h index e3c51285da5f5..c7c04d1cac53e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h @@ -62,17 +62,17 @@ class TAO_Notify_Serv_Export TAO_Notify_Buffering_Strategy const ACE_Time_Value *abstime); /// Shutdown - void shutdown (void); + void shutdown (); /// Provide the time value of the oldest event in the queue. - ACE_Time_Value oldest_event (void); + ACE_Time_Value oldest_event (); /// This interface allows tracking of the queue size class TAO_Notify_Serv_Export Tracker { public: - Tracker (void); - virtual ~Tracker (void); + Tracker (); + virtual ~Tracker (); virtual void update_queue_count (size_t count) = 0; virtual void count_queue_overflow (bool local_overflow, bool global_overflow) = 0; void register_child (Tracker * child); @@ -85,7 +85,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Buffering_Strategy void set_tracker (Tracker* tracker); private: - /// Apply the Order Policy and queue. return -1 on error. int queue (TAO_Notify_Method_Request_Queueable* method_request); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp index 4ba1ea9207d35..f7071a9edf301 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp @@ -90,7 +90,6 @@ class TAO_Notify_Proxy_Builder_T return proxy; } - }; // define the ProxyConsumer Builders. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index cb371343c37c7..e3d1907496a08 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h @@ -43,7 +43,7 @@ class TAO_Notify_Object; class TAO_Notify_Serv_Export TAO_Notify_Builder { public: - TAO_Notify_Builder (void); + TAO_Notify_Builder (); virtual ~TAO_Notify_Builder (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index 3df0b42586494..bacb92f417fda 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -40,7 +40,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Consumer : public TAO_Notify_Peer , public ACE_Event_Handler // to support timer { - public: /// Status returned from dispatch attempts enum DispatchStatus { @@ -52,7 +51,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Consumer }; public: - typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr; /// Constructor @@ -62,14 +60,14 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr; virtual ~TAO_Notify_Consumer (); /// This method sigantures deliberately match the RefCounting methods required for ESF Proxy - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcnt (); + CORBA::ULong _decr_refcnt (); /// Access Specific Proxy. - TAO_Notify_ProxySupplier* proxy_supplier (void); + TAO_Notify_ProxySupplier* proxy_supplier (); /// Access Base Proxy. - virtual TAO_Notify_Proxy* proxy (void); + virtual TAO_Notify_Proxy* proxy (); /// Dispatch Event to consumer void deliver (TAO_Notify_Method_Request_Event * request); @@ -87,19 +85,19 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr; DispatchStatus dispatch_batch (const CosNotification::EventBatch& batch); /// Dispatch the pending events - void dispatch_pending (void); + void dispatch_pending (); /// Is the connection suspended? - CORBA::Boolean is_suspended (void); + CORBA::Boolean is_suspended (); /// Suspend Connection - void suspend (void); + void suspend (); /// Resume Connection - void resume (void); + void resume (); /// Shutdown the consumer - virtual void shutdown (void); + virtual void shutdown (); /// On reconnect we need to move events from the old consumer /// to the new one @@ -120,13 +118,12 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr; /// /// The estimate does not include events queued at the admin level which /// have not been passed to this consumer for delivery yet. - size_t pending_count (void); + size_t pending_count (); protected: - /// This method is called by the is_alive() method. It should provide /// the connected consumer or nil if there is none. - virtual CORBA::Object_ptr get_consumer (void) = 0; + virtual CORBA::Object_ptr get_consumer () = 0; typedef ACE_Unbounded_Queue Request_Queue; @@ -161,7 +158,7 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr; const CosNotification::EventTypeSeq& removed); /// Get the shared Proxy Lock - TAO_SYNCH_MUTEX* proxy_lock (void); + TAO_SYNCH_MUTEX* proxy_lock (); protected: virtual int handle_timeout (const ACE_Time_Value& current_time, @@ -172,7 +169,7 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr; void schedule_timer (bool is_error = false); /// Cancel timer - void cancel_timer (void); + void cancel_timer (); ///= Protected Data Members protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl index 474fe1e02298b..e241c7cbb4367 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl @@ -10,19 +10,19 @@ TAO_Notify_Consumer::pending_events() } ACE_INLINE CORBA::Boolean -TAO_Notify_Consumer::is_suspended (void) +TAO_Notify_Consumer::is_suspended () { return this->is_suspended_; } ACE_INLINE void -TAO_Notify_Consumer::suspend (void) +TAO_Notify_Consumer::suspend () { this->is_suspended_ = 1; } ACE_INLINE size_t -TAO_Notify_Consumer::pending_count (void) +TAO_Notify_Consumer::pending_count () { return this->pending_events_->size(); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 56b93b5206fc0..881d397d4ca1e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -43,7 +43,6 @@ TAO_Notify_ConsumerAdmin::get_admin_type_name () const } - TAO_Notify_ConsumerAdmin::~TAO_Notify_ConsumerAdmin () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index dbc7ab8725bfb..3ba2c54517eaa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -41,7 +41,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin : public: typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_ConsumerAdmin > Ptr; /// Constructor - TAO_Notify_ConsumerAdmin (void); + TAO_Notify_ConsumerAdmin (); /// Destructor virtual ~TAO_Notify_ConsumerAdmin (); @@ -50,8 +50,8 @@ class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin : void init (TAO_Notify_EventChannel *ec); /// ServantBase refcount methods. - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual void _add_ref (); + virtual void _remove_ref (); virtual const char * get_admin_type_name () const; @@ -65,7 +65,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin : size_t position); /// TAO_Notify_Container_T requires a destroy method - virtual void destroy (void); + virtual void destroy (); protected: TAO_Notify::Topology_Object *load_proxy ( @@ -80,23 +80,23 @@ class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin : const CosNotification::QoSProperties & initial_qos); /// = CosNotifyChannelAdmin::ConsumerAdmin methods - virtual CosNotifyChannelAdmin::AdminID MyID (void); + virtual CosNotifyChannelAdmin::AdminID MyID (); - virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void); + virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (); - virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void); + virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (); - virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (void); + virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (); virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter); - virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (void); + virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (); virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter); - virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (void); + virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (); - virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (void); + virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (); virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id); @@ -108,7 +108,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin : obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id); - virtual ::CosNotification::QoSProperties * get_qos (void); + virtual ::CosNotification::QoSProperties * get_qos (); virtual void set_qos (const CosNotification::QoSProperties & qos); @@ -124,18 +124,17 @@ class TAO_Notify_Serv_Export TAO_Notify_ConsumerAdmin : virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter); - virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void); + virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (); - virtual void remove_all_filters (void); + virtual void remove_all_filters (); - virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void); + virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (); - virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void); + virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (); private: - /// Release this object. - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp index 0e7c3617a1f1e..ac31053b5493b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp @@ -23,7 +23,7 @@ TAO_Notify_Container_T::Destroyer::work (TYPE* type) } template -TAO_Notify_Container_T::TAO_Notify_Container_T (void) +TAO_Notify_Container_T::TAO_Notify_Container_T () : collection_ (0) { } @@ -35,7 +35,7 @@ TAO_Notify_Container_T::~TAO_Notify_Container_T () } template void -TAO_Notify_Container_T::shutdown (void) +TAO_Notify_Container_T::shutdown () { TAO_ESF_Shutdown_Proxy shutdown_worker; @@ -43,7 +43,7 @@ TAO_Notify_Container_T::shutdown (void) } template void -TAO_Notify_Container_T::destroy (void) +TAO_Notify_Container_T::destroy () { Destroyer destroyer; this->collection_->for_each (&destroyer); @@ -62,7 +62,7 @@ TAO_Notify_Container_T::remove (TYPE* type) } template void -TAO_Notify_Container_T::init (void) +TAO_Notify_Container_T::init () { // get the factory TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index 54b6bd38fb513..b0cc870fae75a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -31,15 +31,14 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T { typedef TAO_ESF_Proxy_Collection COLLECTION; public: - /// Constructor - TAO_Notify_Container_T (void); + TAO_Notify_Container_T (); /// Destructor virtual ~TAO_Notify_Container_T (); /// Init this object. - void init (void); + void init (); /// Insert object to this container. virtual void insert (TYPE* type); @@ -48,13 +47,13 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T virtual void remove (TYPE* type); /// Shutdown - virtual void shutdown (void); + virtual void shutdown (); /// Call destroy on each contained object - virtual void destroy (void); + virtual void destroy (); /// Collection - COLLECTION* collection (void); + COLLECTION* collection (); protected: /// The collection data structure that we add objects to. @@ -74,13 +73,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Container_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Container_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Container_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl index 5a1c4a268cf98..1133b56d995ee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_INLINE typename TAO_Notify_Container_T::COLLECTION* -TAO_Notify_Container_T:: collection (void) +TAO_Notify_Container_T:: collection () { return this->collection_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h index 6bb7d7f993d47..2c4136e708dde 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h @@ -28,7 +28,7 @@ class TAO_Notify_Serv_Export TAO_Notify_CosNotify_Initializer { public: /// Constructor - TAO_Notify_CosNotify_Initializer (void); + TAO_Notify_CosNotify_Initializer (); }; static TAO_Notify_CosNotify_Initializer TAO_Notify_CosNotify_initializer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index f5e9f05863ecd..a73425037ab33 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -331,7 +331,6 @@ TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb) } this->init_i2 (orb, TAO_Notify_PROPERTIES::instance()->dispatching_orb()); - } else { diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h index f1c0781b4c8c9..1509d8e294904 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h @@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_CosNotify_Service : public TAO_Notify_Service { public: /// Constructor - TAO_CosNotify_Service (void); + TAO_CosNotify_Service (); /// Destructor virtual ~TAO_CosNotify_Service (); @@ -68,12 +68,11 @@ class TAO_Notify_Serv_Export TAO_CosNotify_Service : public TAO_Notify_Service virtual void init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb); private: - /// Create the Factory for Notify objects. - virtual TAO_Notify_Factory* create_factory (void); + virtual TAO_Notify_Factory* create_factory (); /// Create the Builder for Notify objects. - virtual TAO_Notify_Builder* create_builder (void); + virtual TAO_Notify_Builder* create_builder (); /// Set thread options on @a qos. void set_threads (CosNotification::QoSProperties &qos, int threads); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h index 6f2084f7412d2..a92de9f4a3fcf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h @@ -28,7 +28,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_Factory : public TAO_Notify_Fact { public: /// Constructor - TAO_Notify_Default_Factory (void); + TAO_Notify_Default_Factory (); /// Destructor virtual ~TAO_Notify_Default_Factory (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp index 3bec07b367b40..94592d57ea7ff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -21,7 +21,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /////////////////// // Delivery_Request Delivery_Request::Delivery_Request (const Routing_Slip_Ptr & routing_slip, size_t request_id) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h index 1117bda47e908..aa677a677911c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h @@ -20,7 +20,6 @@ class TAO_Notify_ProxySupplier; namespace TAO_Notify { - // Forward declarations of TAO_Notify classes/pointers/collections declared // in this header class Delivery_Request; @@ -120,7 +119,6 @@ class TAO_Notify_Serv_Export Delivery_Request ACE_CDR::Octet delivery_type_; IdVec destination_id_; }; - } // namespace TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 63a375d912041..417c6ae8d8735 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -93,7 +93,6 @@ TAO_Notify_Constraint_Expr::release () } - TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (PortableServer::POA_ptr poa, const char *constraint_grammar, const TAO_Notify_Object::ID& id) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index 9f48f5d80313e..b59bf46cc6dfc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -35,10 +35,9 @@ class TAO_Notify_ETCL_Filter; class TAO_Notify_Constraint_Expr : public TAO_Notify::Topology_Object { public: - friend class TAO_Notify_ETCL_Filter; - TAO_Notify_Constraint_Expr (void); + TAO_Notify_Constraint_Expr (); virtual ~TAO_Notify_Constraint_Expr (); void save_persistent ( @@ -56,7 +55,7 @@ class TAO_Notify_Constraint_Expr : public TAO_Notify::Topology_Object private: /// Release this object. - virtual void release (void); + virtual void release (); // = DESCRIPTION // Structure for associating ConstraintInfo with an interpreter. @@ -84,7 +83,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter const TAO_Notify_Object::ID& id); /// Destructor - virtual ~TAO_Notify_ETCL_Filter (void); + virtual ~TAO_Notify_ETCL_Filter (); virtual void save_persistent (TAO_Notify::Topology_Saver& saver); void load_attrs(const TAO_Notify::NVPList& attrs); @@ -92,7 +91,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter CORBA::Long id, const TAO_Notify::NVPList& attrs); protected: - virtual char * constraint_grammar (void); + virtual char * constraint_grammar (); virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list); @@ -101,11 +100,11 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list); - virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void); + virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (); - virtual void remove_all_constraints (void); + virtual void remove_all_constraints (); - virtual void destroy (void); + virtual void destroy (); virtual CORBA::Boolean match (const CORBA::Any & filterable_data); @@ -117,12 +116,11 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter virtual void detach_callback (CosNotifyFilter::CallbackID callback); - virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void); + virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (); private: - /// Release this object. - virtual void release (void); + virtual void release (); void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq); void add_constraint_i (const CosNotifyFilter::ConstraintInfo& constraint, @@ -131,7 +129,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_Filter TAO_Notify_Constraint_Expr* add_constraint_i (CosNotifyFilter::ConstraintID cnstr_id); - void remove_all_constraints_i (void); + void remove_all_constraints_i (); /// Lock to serialize access to data members. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index a5daa3611b991..7040b2eb878fd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -29,7 +29,6 @@ TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory () } this->filters_.unbind_all (); - } CosNotifyFilter::FilterFactory_ptr @@ -320,5 +319,4 @@ TAO_Notify_ETCL_FilterFactory::find_filter_id (CosNotifyFilter::Filter_ptr filte } - ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 9cbe025e2257c..6f0086bd3cd7e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -42,7 +42,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory : { public: /// Constructor - TAO_Notify_ETCL_FilterFactory (void); + TAO_Notify_ETCL_FilterFactory (); /// Destructor virtual ~TAO_Notify_ETCL_FilterFactory (); @@ -52,7 +52,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory : virtual CosNotifyFilter::FilterFactory_ptr create ( PortableServer::POA_ptr filter_poa); - virtual void destroy (void); + virtual void destroy (); ///= CosNotifyFilter::FilterFactory methods @@ -82,7 +82,6 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory : protected: - CosNotifyFilter::Filter_ptr create_filter (const char *constraint_grammar, const TAO_Notify_Object::ID& id, @@ -92,7 +91,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory : CosNotifyFilter::Filter_ptr find_filter (const TAO_Notify_Object::ID& id); /// Release this object. - virtual void release (void); + virtual void release (); /// The POA in which to activate the Filters. PortableServer::POA_var filter_poa_; @@ -106,7 +105,6 @@ class TAO_Notify_Serv_Export TAO_Notify_ETCL_FilterFactory : FILTERMAP filters_; TAO_SYNCH_MUTEX mtx_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index 8a7a61cf6808d..398f95d1d9e81 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -47,7 +47,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Event // Codes to distinguish marshaled events in persistent storage enum {MARSHAL_ANY=1,MARSHAL_STRUCTURED=2}; /// Constructor - TAO_Notify_Event (void); + TAO_Notify_Event (); /// Destructor virtual ~TAO_Notify_Event (); @@ -122,7 +122,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Event /// Return a pointer to a copy of this event on the heap virtual TAO_Notify_Event* copy () const = 0; - virtual void release (void); + virtual void release (); mutable Ptr clone_; bool is_on_heap_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index 35445ee3fcf5c..4301182362cb8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -627,5 +627,4 @@ TAO_Notify_EventChannel::validate () } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index f77ff8334f957..498032c2783d3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -54,7 +54,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannel typedef CosNotifyChannelAdmin::ChannelIDSeq_var SEQ_VAR; /// Constructor - TAO_Notify_EventChannel (void); + TAO_Notify_EventChannel (); /// Destructor virtual ~TAO_Notify_EventChannel (); @@ -74,8 +74,8 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannel void remove (TAO_Notify_SupplierAdmin* supplier_admin); /// ServantBase refcount methods. - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual void _add_ref (); + virtual void _remove_ref (); // TAO_Notify::Topology_Parent @@ -83,7 +83,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannel virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id, const TAO_Notify::NVPList& attrs); - virtual void reconnect (void); + virtual void reconnect (); virtual void validate (); virtual TAO_Notify_Object::ID get_id () const {return id();} @@ -97,11 +97,11 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannel bool experienced_timeout); /// Shutdown - virtual int shutdown (void); + virtual int shutdown (); virtual void load_attrs(const TAO_Notify::NVPList& attrs); /// TAO_Notify_Container_T requires a destroy method - virtual void destroy (void); + virtual void destroy (); /// This is public to allow TAO_MonitorConsumerAdmin access. virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr @@ -136,11 +136,11 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannel virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory (); - virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (void); + virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (); - virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (void); + virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (); - virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (void); + virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (); virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id); @@ -148,24 +148,24 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannel virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id); - virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (void); + virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (); - virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (void); + virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (); - virtual ::CosNotification::QoSProperties * get_qos (void); + virtual ::CosNotification::QoSProperties * get_qos (); virtual void set_qos (const CosNotification::QoSProperties & qos); virtual void validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos); - virtual ::CosNotification::AdminProperties * get_admin (void); + virtual ::CosNotification::AdminProperties * get_admin (); virtual void set_admin (const CosNotification::AdminProperties & admin); - virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void); + virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (); - virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void); + virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (); private: TAO_Notify_ConsumerAdmin_Container& ca_container(); @@ -181,7 +181,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannel CosNotifyFilter::FilterFactory_var default_filter_factory_; TAO_Notify_FilterFactory * default_filter_factory_servant_; - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index d14af24693cab..9541518d2b1b1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -55,7 +55,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_EventChannelFactory > Ptr; /// Constructor - TAO_Notify_EventChannelFactory (void); + TAO_Notify_EventChannelFactory (); /// Init the factory void init (PortableServer::POA_ptr poa); @@ -64,8 +64,8 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory virtual ~TAO_Notify_EventChannelFactory (); /// = ServantBase Methods - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual void _add_ref (); + virtual void _remove_ref (); /// Remove @a channel from the virtual void remove (TAO_Notify_EventChannel* channel); @@ -85,7 +85,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory /// Use the registered Topology_Factory to create a loader, and /// load the topology. If no Topology_Factory is registered /// then nothing will be loaded. - void load_topology (void); + void load_topology (); /// Use the passed in saver factory to generate topology saver objects. /// Does not take ownership. @@ -96,23 +96,23 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory virtual bool is_persistent () const; virtual void save_persistent (TAO_Notify::Topology_Saver& saver); - virtual bool change_to_parent (void); + virtual bool change_to_parent (); virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id, const TAO_Notify::NVPList& attrs); - CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (void); - virtual void reconnect (void); + CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (); + virtual void reconnect (); virtual void validate (); /// at shutdown time, this causes the validator thread to exit. - void stop_validator (void); + void stop_validator (); /// Handle change notifications - bool handle_change (void); + bool handle_change (); - void load_event_persistence (void); + void load_event_persistence (); - virtual void save_topology (void); + virtual void save_topology (); TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position); TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position); @@ -120,14 +120,13 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory virtual TAO_Notify_Object::ID get_id () const; private: - /// = Data Members /// = NotifyExt methods - virtual void destroy (void); + virtual void destroy (); /// shutdown - virtual int shutdown (void); + virtual int shutdown (); virtual NotifyExt::ReconnectionRegistry::ReconnectionID register_callback ( @@ -136,7 +135,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory virtual void unregister_callback ( NotifyExt::ReconnectionRegistry::ReconnectionID id); - virtual CORBA::Boolean is_alive (void); + virtual CORBA::Boolean is_alive (); protected: /// = CosNotifyChannelAdmin Methods @@ -145,7 +144,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory const CosNotification::AdminProperties & initial_admin, CosNotifyChannelAdmin::ChannelID_out id); - virtual ::CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels (void); + virtual ::CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels (); virtual ::CosNotifyChannelAdmin::EventChannel_ptr get_event_channel ( CosNotifyChannelAdmin::ChannelID id); @@ -171,7 +170,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory Routing_Slip_Set routing_slip_restart_set_; /// Release this object. - virtual void release (void); + virtual void release (); ACE_Auto_Ptr validate_client_task_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index cb8d189001db3..6dfd218088443 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -140,7 +140,6 @@ bool TAO_Notify_EventType::init(const TAO_Notify::NVPList& attrs) result = true; } return result; - } // TAO_Notify::Topology_Object diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index b91b3fae43380..767fcfa60ca08 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -34,7 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventType : public TAO_Notify::Topology_ { public: /// Constructor - TAO_Notify_EventType (void); + TAO_Notify_EventType (); TAO_Notify_EventType (const char* domain_name, const char* type_name); TAO_Notify_EventType (const CosNotification::EventType& event_type); // Constructor @@ -58,7 +58,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventType : public TAO_Notify::Topology_ bool operator!=(const TAO_Notify_EventType& notify_event_type) const; /// Return the special event type. - static TAO_Notify_EventType special (void); + static TAO_Notify_EventType special (); /// Is this the special event (accept everything). CORBA::Boolean is_special () const; @@ -77,14 +77,13 @@ class TAO_Notify_Serv_Export TAO_Notify_EventType : public TAO_Notify::Topology_ virtual void save_persistent (TAO_Notify::Topology_Saver& saver); protected: - friend class TAO_Notify_Constraint_Interpreter; /// Init this object. void init_i (const char* domain_name, const char* type_name); /// Recompute the hash value. - void recompute_hash (void); + void recompute_hash (); bool domain_is_wildcard (const char* domain) const; bool type_is_wildcard (const char* type) const; diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h index 5ecbd009ffc3e..f832e1b0b21bf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h @@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventTypeSeq public: /// Constructor - TAO_Notify_EventTypeSeq (void); + TAO_Notify_EventTypeSeq (); TAO_Notify_EventTypeSeq (const CosNotification::EventTypeSeq& event_type_seq); TAO_Notify_EventTypeSeq (const TAO_Notify_EventTypeSeq & rhs); TAO_Notify_EventTypeSeq & operator = (const TAO_Notify_EventTypeSeq & rhs); @@ -73,8 +73,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventTypeSeq const TAO_Notify::NVPList& attrs); private: - - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index 10844c15661d5..517733dbc0940 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -55,7 +55,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Event_Manager : public TAO_Notify_Refcou public: typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Event_Manager > Ptr; /// Constructor - TAO_Notify_Event_Manager (void); + TAO_Notify_Event_Manager (); /// Destructor virtual ~TAO_Notify_Event_Manager (); @@ -63,10 +63,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Event_Manager : public TAO_Notify_Refcou void release(); /// Init - void init (void); + void init (); /// Init - void shutdown (void); + void shutdown (); /// Connect ProxySupplier void connect (TAO_Notify_ProxySupplier* proxy_supplier); @@ -81,8 +81,8 @@ class TAO_Notify_Serv_Export TAO_Notify_Event_Manager : public TAO_Notify_Refcou void disconnect (TAO_Notify_ProxyConsumer* proxy_consumer); /// Map accessors. - TAO_Notify_Consumer_Map& consumer_map (void); - TAO_Notify_Supplier_Map& supplier_map (void); + TAO_Notify_Consumer_Map& consumer_map (); + TAO_Notify_Supplier_Map& supplier_map (); /// Offer change received on . void offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp index 4703cff577348..da4ebceab06d3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_Notify_Event_Map_Entry_T::TAO_Notify_Event_Map_Entry_T (void) +TAO_Notify_Event_Map_Entry_T::TAO_Notify_Event_Map_Entry_T () : collection_ (0), count_ (0), usage_count_ (1) { } @@ -26,7 +26,7 @@ TAO_Notify_Event_Map_Entry_T::~TAO_Notify_Event_Map_Entry_T () } template void -TAO_Notify_Event_Map_Entry_T::init (void) +TAO_Notify_Event_Map_Entry_T::init () { TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h index d143715a3a0e2..1f412726da8b5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h @@ -39,13 +39,13 @@ class TAO_Notify_Event_Map_Entry_T : private ACE_Copy_Disabled typedef TAO_ESF_Proxy_Collection COLLECTION; /// Constructor - TAO_Notify_Event_Map_Entry_T (void); + TAO_Notify_Event_Map_Entry_T (); /// Destructor - ~TAO_Notify_Event_Map_Entry_T (void); + ~TAO_Notify_Event_Map_Entry_T (); /// Init - Allocates collection - void init (void); + void init (); /// Connect void connected (PROXY* proxy); @@ -54,17 +54,17 @@ class TAO_Notify_Event_Map_Entry_T : private ACE_Copy_Disabled void disconnected (PROXY* proxy); /// Collection accessor - COLLECTION* collection (void); + COLLECTION* collection (); /// Count accessor - int count (void); + int count (); ///= Reference counting methods. // Incr the ref count. - CORBA::ULong _incr_refcnt (void); + CORBA::ULong _incr_refcnt (); // Decr the ref count. This object is destroyed when the count is 0. - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _decr_refcnt (); protected: /// The Collection @@ -83,13 +83,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Event_Map_Entry_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Event_Map_Entry_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Event_Map_Entry_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl index b472c831377c2..4417f2df506e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl @@ -3,24 +3,24 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_INLINE typename TAO_Notify_Event_Map_Entry_T::COLLECTION* -TAO_Notify_Event_Map_Entry_T::collection (void) { +TAO_Notify_Event_Map_Entry_T::collection () { return collection_; } template ACE_INLINE int -TAO_Notify_Event_Map_Entry_T::count (void) +TAO_Notify_Event_Map_Entry_T::count () { return this->count_; } template ACE_INLINE CORBA::ULong -TAO_Notify_Event_Map_Entry_T::_incr_refcnt (void) +TAO_Notify_Event_Map_Entry_T::_incr_refcnt () { return ++this->usage_count_; } template ACE_INLINE CORBA::ULong -TAO_Notify_Event_Map_Entry_T::_decr_refcnt (void) +TAO_Notify_Event_Map_Entry_T::_decr_refcnt () { return --this->usage_count_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp index 09478a46c013d..9b414efb76941 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp @@ -14,10 +14,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_Notify_Event_Map_T::TAO_Notify_Event_Map_T (void) +TAO_Notify_Event_Map_T::TAO_Notify_Event_Map_T () :proxy_count_ (0) { - } template @@ -26,7 +25,7 @@ TAO_Notify_Event_Map_T::~TAO_Notify_Event_Map_T () } template void -TAO_Notify_Event_Map_T::init (void) +TAO_Notify_Event_Map_T::init () { this->broadcast_entry_.init (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 8a9a026f93d9a..5c2c50ecfe967 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -32,18 +32,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template class TAO_Notify_Event_Map_T { - public: typedef TAO_Notify_Event_Map_Entry_T ENTRY; /// Constructor - TAO_Notify_Event_Map_T (void); + TAO_Notify_Event_Map_T (); /// Destructor ~TAO_Notify_Event_Map_T (); /// Init - void init (void); + void init (); /// Connect a PROXY void connect (PROXY* proxy); @@ -66,19 +65,19 @@ class TAO_Notify_Event_Map_T ENTRY* find (const TAO_Notify_EventType& event_type); /// Find the default broadcast list. - typename ENTRY::COLLECTION* broadcast_collection (void); + typename ENTRY::COLLECTION* broadcast_collection (); /// Find the update list. This is all the PROXYS connected to this Map. - typename ENTRY::COLLECTION* updates_collection (void); + typename ENTRY::COLLECTION* updates_collection (); /// Release the usage count on this entry. void release (ENTRY* entry); /// Access all the event types available - const TAO_Notify_EventTypeSeq& event_types (void); + const TAO_Notify_EventTypeSeq& event_types (); /// Access number of proxys connected in all. - int proxy_count (void); + int proxy_count (); protected: /// The Map that stores eventtype to entry mapping. @@ -106,13 +105,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Event_Map_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Event_Map_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Event_Map_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_EVENT_MAP_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl index 9332d886aced2..94554016bffbb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl @@ -48,25 +48,25 @@ TAO_Notify_Event_Map_T::release (ENTRY* entry) } template ACE_INLINE typename TAO_Notify_Event_Map_Entry_T::COLLECTION* -TAO_Notify_Event_Map_T::broadcast_collection (void) +TAO_Notify_Event_Map_T::broadcast_collection () { return this->broadcast_entry_.collection (); } template ACE_INLINE typename TAO_Notify_Event_Map_Entry_T::COLLECTION* -TAO_Notify_Event_Map_T::updates_collection (void) +TAO_Notify_Event_Map_T::updates_collection () { return this->updates_entry_.collection (); } template ACE_INLINE int -TAO_Notify_Event_Map_T::proxy_count (void) +TAO_Notify_Event_Map_T::proxy_count () { return this->proxy_count_; } template ACE_INLINE const TAO_Notify_EventTypeSeq& -TAO_Notify_Event_Map_T::event_types (void) +TAO_Notify_Event_Map_T::event_types () { return this->event_types_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h index dd2c770b435f3..c2207438b3f14 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h @@ -33,14 +33,12 @@ namespace TAO_Notify class TAO_Notify_Serv_Export Event_Persistence_Strategy: public ACE_Service_Object { public: - // get the current factory, creating it if necessary virtual Event_Persistence_Factory * get_factory () = 0; // release the current factory so a new one can be created virtual void reset () = 0; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index 9ab170a5295ff..b30ffbb825c9c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -36,13 +36,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin : public TAO_Notify::Topology_Object { - public: /// Constructor - TAO_Notify_FilterAdmin (void); + TAO_Notify_FilterAdmin (); /// Destructor - virtual ~TAO_Notify_FilterAdmin (void); + virtual ~TAO_Notify_FilterAdmin (); // = match operation on all the filters /// See if any of the filters match. @@ -58,9 +57,9 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter); - virtual CosNotifyFilter::FilterIDSeq * get_all_filters (void); + virtual CosNotifyFilter::FilterIDSeq * get_all_filters (); - virtual void remove_all_filters (void); + virtual void remove_all_filters (); // TAO_Notify::Topology_Object @@ -74,7 +73,7 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin private: typedef ACE_Hash_Map_Manager FILTER_LIST; - virtual void release (void); + virtual void release (); /// Mutex to serialize access to data members. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h index d6652dd152632..62d581e63ba60 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h @@ -32,12 +32,11 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterFactory : public ACE_Service_Object, public TAO_Notify::Topology_Object { public: - /// Factory method to create a FilterFactory reference /// The Factory is activated in the default POA. The filters created are activated in the . virtual CosNotifyFilter::FilterFactory_ptr create ( PortableServer::POA_ptr filter_poa) = 0; - virtual void destroy (void) = 0; + virtual void destroy () = 0; virtual TAO_Notify_Object::ID get_filter_id (CosNotifyFilter::Filter_ptr filter) = 0; virtual CosNotifyFilter::Filter_ptr get_filter (const TAO_Notify_Object::ID& id) = 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp index f4225943a3af9..2b4e9bd9b1969 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_Notify_Find_Worker_T::TAO_Notify_Find_Worker_T (void) +TAO_Notify_Find_Worker_T::TAO_Notify_Find_Worker_T () :id_ (0), result_ (0) { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index 0f22e06f52a49..b7b68c0abc279 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -35,7 +35,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Find_Worker_T : public TAO_ESF_Workermtx_, 0); return ++seed_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h index d8a1ba1ffad3d..8698a7124fa73 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h @@ -36,11 +36,11 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request { public: /// Destructor. - virtual ~TAO_Notify_Method_Request (void); + virtual ~TAO_Notify_Method_Request (); /// Execute the Request - virtual int execute (void) = 0; - virtual TAO_Notify_Method_Request_Queueable* copy (void) = 0; + virtual int execute () = 0; + virtual TAO_Notify_Method_Request_Queueable* copy () = 0; }; /***********************************************************************/ @@ -60,7 +60,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Queueable TAO_Notify_Method_Request_Queueable(); TAO_Notify_Method_Request_Queueable(const TAO_Notify_Event * event); - virtual TAO_Notify_Method_Request_Queueable* copy (void); + virtual TAO_Notify_Method_Request_Queueable* copy (); void init (const TAO_Notify_Event * event); /// The creation time of the event to which this request corresponds. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h index 0e24d3fb53c82..083ed21d80887 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h @@ -74,7 +74,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch protected: /// Execute the dispatch operation. - int execute_i (void); + int execute_i (); protected: /// The Proxy @@ -115,7 +115,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_Queueable virtual ~TAO_Notify_Method_Request_Dispatch_Queueable (); /// Execute the Request - virtual int execute (void); + virtual int execute (); private: TAO_Notify_Event::Ptr event_var_; @@ -144,10 +144,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Dispatch_No_Copy virtual ~TAO_Notify_Method_Request_Dispatch_No_Copy (); /// Execute the Request - virtual int execute (void); + virtual int execute (); /// Create a copy of this method request - virtual TAO_Notify_Method_Request_Queueable* copy (void); + virtual TAO_Notify_Method_Request_Queueable* copy (); }; /*****************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h index 5d52cc0334ef3..fdc0895dadedf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h @@ -55,7 +55,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Event bool should_retry (); protected: - /// The Event const TAO_Notify_Event * event_; @@ -89,7 +88,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Event_Queueable virtual ~TAO_Notify_Method_Request_Event_Queueable (); /// satisfy the pure virtual method. Should never be called. - virtual int execute (void); + virtual int execute (); private: TAO_Notify_Event::Ptr event_var_; }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 264f4ede97cfb..30af7a40e4663 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -155,7 +155,6 @@ TAO_Notify_Method_Request_Lookup::unmarshal ( } } return result; - } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h index 60ed941594e30..004cfd69492bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -39,7 +39,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup , public TAO_Notify_Method_Request_Event { public: - /// an arbitrary code (Octet) to identify this type of request in persistent storage enum {persistence_code = 2}; @@ -60,13 +59,12 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup TAO_Notify_Method_Request_Lookup (const TAO_Notify::Delivery_Request_Ptr& delivery, TAO_Notify_ProxyConsumer * proxy); /// Execute the dispatch operation. - int execute_i (void); + int execute_i (); ///= TAO_ESF_Worker method virtual void work (TAO_Notify_ProxySupplier* proxy_supplier); protected: - /// The Proxy TAO_Notify_ProxyConsumer* proxy_consumer_; }; @@ -97,7 +95,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_Queueable virtual ~TAO_Notify_Method_Request_Lookup_Queueable (); /// Execute the Request - virtual int execute (void); + virtual int execute (); private: TAO_Notify_Event::Ptr event_var_; @@ -125,10 +123,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup_No_Copy virtual ~TAO_Notify_Method_Request_Lookup_No_Copy (); /// Execute the Request - virtual int execute (void); + virtual int execute (); /// Create a copy of this object. - virtual TAO_Notify_Method_Request_Queueable* copy (void); + virtual TAO_Notify_Method_Request_Queueable* copy (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h index d30cd2dfb9549..8665360a5e194 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h @@ -37,10 +37,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Shutdown : public TAO_Not virtual ~TAO_Notify_Method_Request_Shutdown (); /// Create a copy of this object. - TAO_Notify_Method_Request_Queueable* copy (void); + TAO_Notify_Method_Request_Queueable* copy (); /// Execute the Request - virtual int execute (void); + virtual int execute (); private: // Task to shutdown diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h index db70c6eea231d..db876a4728c60 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h @@ -46,7 +46,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates virtual ~TAO_Notify_Method_Request_Updates (); /// Execute the Request - virtual int execute (void); + virtual int execute (); }; /*****************************************************************************/ @@ -74,10 +74,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_No_Copy virtual ~TAO_Notify_Method_Request_Updates_No_Copy (); /// Create a copy of this object. - virtual TAO_Notify_Method_Request_Queueable* copy (void); + virtual TAO_Notify_Method_Request_Queueable* copy (); /// Execute the Request - virtual int execute (void); + virtual int execute (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h index 57074f426fb42..f68ba7554acff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h @@ -44,7 +44,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_T virtual ~TAO_Notify_Method_Request_Updates_T (); /// Execute the Request - int execute_i (void); + int execute_i (); protected: /// Update Added @@ -63,13 +63,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Method_Request_Updates_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Method_Request_Updates_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Method_Request_Updates_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl index 7c185eca11d22..c4cfefc11f189 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_INLINE int -TAO_Notify_Method_Request_Updates_T::execute_i (void) +TAO_Notify_Method_Request_Updates_T::execute_i () { if (this->proxy_->has_shutdown ()) return 0; // If we were shutdown while waiting in the queue, return with no action. diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h index 5a1457bab058a..a34dd62bcf23b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h @@ -21,7 +21,7 @@ class TAO_Notify_MC_Export TAO_NS_Control { public: /// This is here due to virtual functions. - virtual ~TAO_NS_Control (void); + virtual ~TAO_NS_Control (); /// Return the name of this control object. const ACE_CString& name () const; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h index 23d3eeadc0a96..e99e21d80cd3b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h @@ -39,10 +39,10 @@ class TAO_Notify_MC_Export TAO_Control_Registry }; /// Return the singleton instance of the registry - static TAO_Control_Registry* instance (void); + static TAO_Control_Registry* instance (); /// Empty out the map of objects - ~TAO_Control_Registry (void); + ~TAO_Control_Registry (); /// Adds an object to the map. /// Throws Map_Error if the object is null or if there @@ -57,7 +57,7 @@ class TAO_Notify_MC_Export TAO_Control_Registry bool remove (const ACE_CString& name); /// Returns a list of names stored in the registry - const NameList& names (void); + const NameList& names (); /// Gets an object from the map /// Returns the object if it is successfully located. diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h index 86f21431161d4..7998cd8974d70 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h @@ -33,7 +33,7 @@ class TAO_Dynamic_Statistic : public Monitor_Base /// method is expected to call the receive base class method. This /// method isn't pure virtual in Monitor_Base, but we reintroduce /// it here to force all subclasses to implement it. - virtual void update (void) = 0; + virtual void update () = 0; protected: TYPE* interf_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h index 60c9758d24627..f12d4b426b8ec 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h @@ -22,7 +22,7 @@ class TAO_Notify_MC_Export TAO_MonitorManager : public ACE_Service_Object { public: /// Perform member initialization - TAO_MonitorManager (void); + TAO_MonitorManager (); virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (); @@ -30,20 +30,20 @@ class TAO_Notify_MC_Export TAO_MonitorManager : public ACE_Service_Object /// Start the ORB task which includes initializtion of the ORB, /// creation of the monitor servant and activation. /// If run is called more than once, it will silently perform a no-op. - int run (void); + int run (); /// This will call the run() method. - virtual int resume (void); + virtual int resume (); /// Get the dynamic instance of the TAO_MonitorManager and /// shut it down - static void shutdown (void); + static void shutdown (); private: class ORBTask: public ACE_Task_Base { public: - ORBTask (void); + ORBTask (); virtual int svc (); TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h index 779db3ac50f74..b2cab713a74dc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h @@ -34,7 +34,7 @@ class TAO_Notify_MC_Export NotificationServiceMonitor_i NotificationServiceMonitor_i (CORBA::ORB_ptr orb = 0); /// Get a list of statistic names - virtual Monitor::NameList* get_statistic_names (void); + virtual Monitor::NameList* get_statistic_names (); /// Get the data from a single statistic virtual Monitor::Data* @@ -68,7 +68,7 @@ class TAO_Notify_MC_Export NotificationServiceMonitor_i virtual void remove_supplieradmin (const char* name); /// Call shutdown() on the ORB if one was provided during construction - virtual void shutdown (void); + virtual void shutdown (); private: void send_control_command (const char* name, const char* cmd); diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h index 7bcbc93b87951..85267b8eb5d81 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h @@ -29,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_MC_Ext_Export TAO_MC_Notify_Service: public TAO_CosNotify_Service { public: - virtual ~TAO_MC_Notify_Service (void); + virtual ~TAO_MC_Notify_Service (); protected: virtual void init_i (CORBA::ORB_ptr orb); @@ -38,7 +38,7 @@ class TAO_Notify_MC_Ext_Export TAO_MC_Notify_Service: public TAO_CosNotify_Servi CosNotifyChannelAdmin::EventChannelFactory_ptr factory); private: - virtual TAO_Notify_Factory* create_factory (void); + virtual TAO_Notify_Factory* create_factory (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp index 5d9275a1412e6..e599a5491cc0b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp @@ -247,7 +247,6 @@ TAO_MonitorConsumerAdmin::remove () } - TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h index 37ef14ab0b635..da16b21f07106 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h @@ -40,10 +40,10 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorConsumerAdmin { public: /// Construct a monitor supplier admin. - TAO_MonitorConsumerAdmin (void); + TAO_MonitorConsumerAdmin (); /// Remove the statistics for this event channel. - virtual ~TAO_MonitorConsumerAdmin (void); + virtual ~TAO_MonitorConsumerAdmin (); /// Register our statistic and control objects. void register_stats_controls (TAO_MonitorEventChannel* mec, @@ -63,7 +63,7 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorConsumerAdmin TAO_MonitorEventChannel* get_ec () const; - const ACE_CString & stat_name (void)const; + const ACE_CString & stat_name () const; /// Receive the queue count and store the approximated queue size in @@ -72,11 +72,10 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorConsumerAdmin virtual void count_queue_overflow (bool local_overflow, bool global_overflow); - virtual void destroy (void); + virtual void destroy (); private: - - virtual void remove (void); + virtual void remove (); ACE_CString stat_name_; ACE_CString queue_size_stat_name_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h index bbf50f478753f..646932ea06848 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h @@ -45,7 +45,7 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorEventChannel TAO_MonitorEventChannel (const char* name); /// Remove the statistics for this event channel. - ~TAO_MonitorEventChannel (void); + ~TAO_MonitorEventChannel (); /// Return the name of this event channel. const ACE_CString& name () const; @@ -110,7 +110,7 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorEventChannel TAO_Notify_ThreadPool_Task* get_threadpool_task ( CosNotifyChannelAdmin::AdminID id); size_t calculate_queue_size (bool count); - double get_oldest_event (void); + double get_oldest_event (); void determine_slowest_consumer (Monitor_Control_Types::NameList* names); bool destroy_consumer (CosNotifyChannelAdmin::ProxyID id); bool destroy_supplier (CosNotifyChannelAdmin::ProxyID id); diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h index 311fb73d097ce..fe512ec569617 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h @@ -32,7 +32,7 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorEventChannelFactory TAO_MonitorEventChannelFactory (const char* name); /// Remove the factory name from the factory names statistic - ~TAO_MonitorEventChannelFactory (void); + ~TAO_MonitorEventChannelFactory (); /// Create a named event channel and associate various statistic /// objects with it in the statistic registry @@ -70,8 +70,8 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorEventChannelFactory public: Unbinder (Map& map, const ACE_CString& name); - ~Unbinder (void); - void release (void); + ~Unbinder (); + void release (); private: Map& map_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp index 2bc12122e6dc2..b4d36658e6b6e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_MonitorProxySupplier_T::TAO_MonitorProxySupplier_T (void) +TAO_MonitorProxySupplier_T::TAO_MonitorProxySupplier_T () : queue_item_stat_name_ () , overflow_stat_name_ () , queue_item_count_ (0) @@ -28,7 +28,7 @@ TAO_MonitorProxySupplier_T::TAO_MonitorProxySupplier_T (void) } template -TAO_MonitorProxySupplier_T::~TAO_MonitorProxySupplier_T (void) +TAO_MonitorProxySupplier_T::~TAO_MonitorProxySupplier_T () { if (this->admin_ != 0) { @@ -146,7 +146,7 @@ TAO_MonitorProxySupplier_T::configure( template ACE_CString & -TAO_MonitorProxySupplier_T::queue_item_stat_name(void) +TAO_MonitorProxySupplier_T::queue_item_stat_name() { return this->queue_item_stat_name_; } @@ -154,7 +154,7 @@ TAO_MonitorProxySupplier_T::queue_item_stat_name(void) template ACE_CString & -TAO_MonitorProxySupplier_T::overflow_stat_name(void) +TAO_MonitorProxySupplier_T::overflow_stat_name() { return this->overflow_stat_name_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h index 3ca80ef6ee442..48906d3255483 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h @@ -41,10 +41,10 @@ class TAO_MonitorProxySupplier_T { public: /// Construct a monitor supplier admin - TAO_MonitorProxySupplier_T (void); + TAO_MonitorProxySupplier_T (); /// Remove the statistics for this event channel - virtual ~TAO_MonitorProxySupplier_T (void); + virtual ~TAO_MonitorProxySupplier_T (); /// Configure the statistics after construction /// @param admin the parent admin for this proxy @@ -58,10 +58,10 @@ class TAO_MonitorProxySupplier_T virtual void count_queue_overflow (bool local_overflow, bool global_overflow); /// Access to Statistics Name - ACE_CString & queue_item_stat_name (void); + ACE_CString & queue_item_stat_name (); /// Access to Statistics Name - ACE_CString & overflow_stat_name (void); + ACE_CString & overflow_stat_name (); private: ACE_CString base_stat_name_; @@ -77,14 +77,7 @@ class TAO_MonitorProxySupplier_T TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp" -#pragma implementation ("MonitorProxySupplier_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif // TAO_HAS_MONITOR_FRAMEWORK == 1 diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h index 568e731f16e8d..c780647e8178d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h @@ -23,10 +23,10 @@ class TAO_Notify_MC_Ext_Export TAO_MonitorSupplierAdmin: { public: /// Construct a monitor supplier admin - TAO_MonitorSupplierAdmin (void); + TAO_MonitorSupplierAdmin (); /// Remove the statistics for this event channel - ~TAO_MonitorSupplierAdmin (void); + ~TAO_MonitorSupplierAdmin (); /// Register our statistic and control objects void register_stats_controls (TAO_MonitorEventChannel* mec, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index 51748c154a7bc..3102babfcc891 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -37,10 +37,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Constraint_Interpreter : public ETCL_Interpreter { public: - TAO_Notify_Constraint_Interpreter (void); + TAO_Notify_Constraint_Interpreter (); /// Destructor - virtual ~TAO_Notify_Constraint_Interpreter (void); + virtual ~TAO_Notify_Constraint_Interpreter (); /** * This method builds an expression tree representing the diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index 664061b9b38d2..0e5e5680b8e17 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Constraint_Visitor { public: /// Constructor. - TAO_Notify_Constraint_Visitor (void); + TAO_Notify_Constraint_Visitor (); /// Put the event data into our hash map. int bind_structured_event (const CosNotification::StructuredEvent &s_event); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h index 894fd60a041a6..a9fe48f25a1ea 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h @@ -34,8 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_CO_Factory public: /// Helper function to register the default factory into the service /// configurator. - static int init_svc (void); - + static int init_svc (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h index 3bfa6e95452e7..e222ca1496dc0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -31,10 +31,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_Serv_Export TAO_Notify_Default_Collection_Factory { public: - /// Helper function to register the default factory into the service /// configurator. - static int init_svc (void); + static int init_svc (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h index ea0474a021c65..0d8aa7ac2724e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h @@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_EMO_Factory public: /// Helper function to register the default factory into the service /// configurator. - static int init_svc (void); + static int init_svc (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h index b5cc7b4373c53..ce23da5d868bb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h @@ -33,7 +33,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Default_POA_Factory public: /// Helper function to register the default factory into the service /// configurator. - static int init_svc (void); + static int init_svc (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index 8f5b994ecb4f7..4132736d22982 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -49,7 +49,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Object : public TAO_Notify_Refcountable typedef CORBA::Long ID; /// Destructor - virtual ~TAO_Notify_Object (void); + virtual ~TAO_Notify_Object (); /// This Object's ID ID id () const; @@ -63,45 +63,45 @@ class TAO_Notify_Serv_Export TAO_Notify_Object : public TAO_Notify_Refcountable CORBA::Long id); /// Deactivate - void deactivate (void); + void deactivate (); /// Have we been shutdown. returns true if shutdown. - bool has_shutdown (void); + bool has_shutdown (); void execute_task (TAO_Notify_Method_Request& method_request); /// Get CORBA Ref. - CORBA::Object_ptr ref (void); + CORBA::Object_ptr ref (); /// Set the QoS Properties. virtual void set_qos (const CosNotification::QoSProperties & qos); /// Get the QoS Properties. - CosNotification::QoSProperties* get_qos (void); + CosNotification::QoSProperties* get_qos (); bool find_qos_property_value ( const char * name, CosNotification::PropertyValue & value)const; /// Obtain the Timer manager associated with this object. - virtual TAO_Notify_Timer* timer (void); + virtual TAO_Notify_Timer* timer (); /// Accessor for the Event Manager - TAO_Notify_Event_Manager& event_manager (void); + TAO_Notify_Event_Manager& event_manager (); /// Shutdown. Returns 1 if the shutdown was already run once before. - virtual int shutdown (void); + virtual int shutdown (); /// Load our attributes. Each derived type should call the superclass /// load first before loading its own attributes. virtual void load_attrs(const TAO_Notify::NVPList& attrs); /// Allow access to the underlying worker task. - TAO_Notify_Worker_Task* get_worker_task (void); + TAO_Notify_Worker_Task* get_worker_task (); protected: /// Constructor - TAO_Notify_Object (void); + TAO_Notify_Object (); /// Init this object with data from . void initialize (TAO_Notify_Object* parent); @@ -116,13 +116,13 @@ class TAO_Notify_Serv_Export TAO_Notify_Object : public TAO_Notify_Refcountable void set_primary_as_proxy_poa(); /// Accessor for the proxy_poa_ - TAO_Notify_POA_Helper* proxy_poa (void); + TAO_Notify_POA_Helper* proxy_poa (); /// Accessor for the object_poa_ - TAO_Notify_POA_Helper* object_poa (void); + TAO_Notify_POA_Helper* object_poa (); /// Get the POA assigned to us. - TAO_Notify_POA_Helper* poa (void); + TAO_Notify_POA_Helper* poa (); // Sets the admin properties void set_event_manager(TAO_Notify_Event_Manager* event_manager); @@ -131,7 +131,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Object : public TAO_Notify_Refcountable void set_admin_properties(TAO_Notify_AdminProperties* admin_properties); /// Accessor for the Admin Properties - TAO_Notify_AdminProperties& admin_properties (void); + TAO_Notify_AdminProperties& admin_properties (); /// Notification that can be overridden by subclasses to be informed that /// have been modified. @@ -161,24 +161,22 @@ class TAO_Notify_Serv_Export TAO_Notify_Object : public TAO_Notify_Refcountable void set_poa (TAO_Notify_POA_Helper* object_poa); /// Shutdown the current worker task and delete it if we own it. - void shutdown_worker_task (void); + void shutdown_worker_task (); /// Shutdown the current proxy poa. - void destroy_proxy_poa (void); + void destroy_proxy_poa (); /// Shutdown the current object poa. - void destroy_object_poa (void); + void destroy_object_poa (); /// Shutdown the current poa. - void destroy_poa (void); + void destroy_poa (); protected: - /// The mutex to serialize access to state variables. TAO_SYNCH_MUTEX lock_; private: - /// The POA in which the object is activated. TAO_Notify_POA_Helper* poa_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl index 0e1b720c43cab..951731f3c98a5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl @@ -47,25 +47,25 @@ TAO_Notify_Object::set_primary_as_proxy_poa() } ACE_INLINE TAO_Notify_POA_Helper* -TAO_Notify_Object::poa (void) +TAO_Notify_Object::poa () { return this->poa_; } ACE_INLINE TAO_Notify_POA_Helper* -TAO_Notify_Object::object_poa (void) +TAO_Notify_Object::object_poa () { return this->object_poa_; } ACE_INLINE TAO_Notify_POA_Helper* -TAO_Notify_Object::proxy_poa (void) +TAO_Notify_Object::proxy_poa () { return this->proxy_poa_; } ACE_INLINE bool -TAO_Notify_Object::has_shutdown (void) +TAO_Notify_Object::has_shutdown () { return this->shutdown_; } @@ -78,14 +78,14 @@ TAO_Notify_Object::set_admin_properties( TAO_Notify_AdminProperties* admin_prope } ACE_INLINE TAO_Notify_Event_Manager& -TAO_Notify_Object::event_manager (void) +TAO_Notify_Object::event_manager () { ACE_ASSERT( this->event_manager_.get() != 0 ); return *this->event_manager_; } ACE_INLINE TAO_Notify_AdminProperties& -TAO_Notify_Object::admin_properties (void) +TAO_Notify_Object::admin_properties () { ACE_ASSERT( this->admin_properties_.get() != 0 ); return *this->admin_properties_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h index 171baa9e3e501..3f0451ce7a044 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h @@ -34,7 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled { public: /// Default Constructor - TAO_Notify_POA_Helper (void); + TAO_Notify_POA_Helper (); /// Create a new PortableServer::POA. void init (PortableServer::POA_ptr parent_poa, const char* poa_name); @@ -52,10 +52,10 @@ class TAO_Notify_Serv_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled virtual ~TAO_Notify_POA_Helper (); /// Get underlying POA - PortableServer::POA_ptr poa (void); + PortableServer::POA_ptr poa (); /// Destroy underlying POA. - void destroy (void); + void destroy (); /// Activate Object, the POA will assign an ID and return its value. CORBA::Object_ptr activate (PortableServer::Servant servant, @@ -76,7 +76,7 @@ class TAO_Notify_Serv_Export TAO_Notify_POA_Helper : private ACE_Copy_Disabled CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant) const; /// Generate a unique id for each POA created. - ACE_CString get_unique_id (void); + ACE_CString get_unique_id (); protected: /// Set default POA policies. diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl index 8679b91e6e2e9..24301c3cc8c61 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableServer::POA_ptr -TAO_Notify_POA_Helper::poa (void) +TAO_Notify_POA_Helper::poa () { return this->poa_.in (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index 31590d5984e46..32e1996dc14f0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -36,21 +36,21 @@ class TAO_Notify_Serv_Export TAO_Notify_Peer public: typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Peer > Ptr; /// Constructor - TAO_Notify_Peer (void); + TAO_Notify_Peer (); /// Destructor virtual ~TAO_Notify_Peer (); /// This method sigantures deliberately match the RefCounting methods /// required for ESF Proxy - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcnt (); + CORBA::ULong _decr_refcnt (); /// Shutdown the peer. - virtual void shutdown (void); + virtual void shutdown (); /// Access Proxy. - virtual TAO_Notify_Proxy* proxy (void) = 0; + virtual TAO_Notify_Proxy* proxy () = 0; // Dispatch updates virtual void dispatch_updates (const TAO_Notify_EventTypeSeq & added, @@ -60,7 +60,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Peer virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties); /// Handle dispatch exceptions. - void handle_dispatch_exception (void); + void handle_dispatch_exception (); /// Retrieve the ior of this peer virtual ACE_CString get_ior () const = 0; @@ -72,7 +72,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Peer private: /// Release - virtual void release (void) = 0; + virtual void release () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 316f93a140a87..f319745bcf6df 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -13,7 +13,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Persistent_Callback::~Persistent_Callback() { } @@ -29,7 +28,6 @@ Persistent_Storage_Block::Persistent_Storage_Block(const size_t block_number, { ACE_NEW(this->data_, unsigned char[this->block_size_]); ACE_OS::memset(this->data_, 0, this->block_size_); - } Persistent_Storage_Block::Persistent_Storage_Block( diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h index d6b32f7d70cef..0f8454dc2223d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /// \brief An interface to allow callbacks on completion of persistent storage /// requests. class TAO_Notify_Serv_Export Persistent_Callback @@ -197,7 +196,6 @@ class TAO_Notify_Serv_Export Persistent_File_Allocator bool thread_active_; ACE_SYNCH_CONDITION wake_up_thread_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index 8b7738439c52e..566806c76825f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -39,83 +39,83 @@ class TAO_Notify_Serv_Export TAO_Notify_Properties { public: /// Constructor - TAO_Notify_Properties (void); + TAO_Notify_Properties (); /// Destructor ~TAO_Notify_Properties (); /// Return a singleton instance of this class. - static TAO_Notify_Properties * instance (void); + static TAO_Notify_Properties * instance (); - static void close (void); + static void close (); // = Property Accessors - TAO_Notify_Factory* factory (void); + TAO_Notify_Factory* factory (); void factory (TAO_Notify_Factory* factory); - TAO_Notify_Builder* builder (void); + TAO_Notify_Builder* builder (); void builder (TAO_Notify_Builder* builder); - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); void orb (CORBA::ORB_ptr orb); - CORBA::ORB_ptr dispatching_orb (void); + CORBA::ORB_ptr dispatching_orb (); void dispatching_orb (CORBA::ORB_ptr dispatching_orb); - PortableServer::POA_ptr default_poa (void); + PortableServer::POA_ptr default_poa (); void default_poa (PortableServer::POA_ptr default_poa); - CORBA::Boolean asynch_updates (void); + CORBA::Boolean asynch_updates (); void asynch_updates (CORBA::Boolean asynch_updates); - bool allow_reconnect (void); + bool allow_reconnect (); void allow_reconnect (bool b); - bool validate_client (void); + bool validate_client (); void validate_client (bool b); - ACE_Time_Value validate_client_delay (void); + ACE_Time_Value validate_client_delay (); void validate_client_delay (ACE_Time_Value b); - ACE_Time_Value validate_client_interval (void); + ACE_Time_Value validate_client_interval (); void validate_client_interval (ACE_Time_Value b); // Turn on/off update messages. - CORBA::Boolean updates (void); + CORBA::Boolean updates (); void updates (CORBA::Boolean updates); - bool separate_dispatching_orb (void); + bool separate_dispatching_orb (); void separate_dispatching_orb (bool b); // The QoS Property that must be applied to each newly created Event Channel - const CosNotification::QoSProperties& default_event_channel_qos_properties (void); + const CosNotification::QoSProperties& default_event_channel_qos_properties (); // Set the default EC QoS Property. void default_event_channel_qos_properties (const CosNotification::QoSProperties &ec_qos); // The QoS Property that must be applied to each newly created Supplier Admin - const CosNotification::QoSProperties& default_supplier_admin_qos_properties (void); + const CosNotification::QoSProperties& default_supplier_admin_qos_properties (); // Set the default SA QoS Property. void default_supplier_admin_qos_properties (const CosNotification::QoSProperties &sa_qos); // The QoS Property that must be applied to each newly created Consumer Admin - const CosNotification::QoSProperties& default_consumer_admin_qos_properties (void); + const CosNotification::QoSProperties& default_consumer_admin_qos_properties (); // Set the default CA QoS Property. void default_consumer_admin_qos_properties (const CosNotification::QoSProperties &ca_qos); // The QoS Property that must be applied to each newly created Proxy Supplier - const CosNotification::QoSProperties& default_proxy_supplier_qos_properties (void); + const CosNotification::QoSProperties& default_proxy_supplier_qos_properties (); // Set the default PS QoS Property. void default_proxy_supplier_qos_properties (const CosNotification::QoSProperties &ps_qos); // The QoS Property that must be applied to each newly created Proxy Consumer - const CosNotification::QoSProperties& default_proxy_consumer_qos_properties (void); + const CosNotification::QoSProperties& default_proxy_consumer_qos_properties (); // Set the default PC QoS Property. void default_proxy_consumer_qos_properties (const CosNotification::QoSProperties &pc_qos); - CosNotifyChannelAdmin::InterFilterGroupOperator defaultConsumerAdminFilterOp (void); + CosNotifyChannelAdmin::InterFilterGroupOperator defaultConsumerAdminFilterOp (); void defaultConsumerAdminFilterOp (CosNotifyChannelAdmin::InterFilterGroupOperator op); - CosNotifyChannelAdmin::InterFilterGroupOperator defaultSupplierAdminFilterOp (void); + CosNotifyChannelAdmin::InterFilterGroupOperator defaultSupplierAdminFilterOp (); void defaultSupplierAdminFilterOp (CosNotifyChannelAdmin::InterFilterGroupOperator op); protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl index 75072336efc50..c0ce10c65f75f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Notify_Factory* -TAO_Notify_Properties::factory (void) +TAO_Notify_Properties::factory () { return this->factory_; } @@ -14,7 +14,7 @@ TAO_Notify_Properties::factory (TAO_Notify_Factory* factory) } ACE_INLINE TAO_Notify_Builder* -TAO_Notify_Properties::builder (void) +TAO_Notify_Properties::builder () { return this->builder_; } @@ -26,13 +26,13 @@ TAO_Notify_Properties::builder (TAO_Notify_Builder* builder) } ACE_INLINE CORBA::ORB_ptr -TAO_Notify_Properties::orb (void) +TAO_Notify_Properties::orb () { return CORBA::ORB::_duplicate (orb_.in ()); } ACE_INLINE CORBA::ORB_ptr -TAO_Notify_Properties::dispatching_orb (void) +TAO_Notify_Properties::dispatching_orb () { return CORBA::ORB::_duplicate (dispatching_orb_.in ()); } @@ -50,7 +50,7 @@ TAO_Notify_Properties::dispatching_orb (CORBA::ORB_ptr dispatching_orb) } ACE_INLINE PortableServer::POA_ptr -TAO_Notify_Properties::default_poa (void) +TAO_Notify_Properties::default_poa () { return PortableServer::POA::_duplicate (this->default_poa_.in ()); } @@ -62,7 +62,7 @@ TAO_Notify_Properties::default_poa (PortableServer::POA_ptr default_poa) } ACE_INLINE CORBA::Boolean -TAO_Notify_Properties::asynch_updates (void) +TAO_Notify_Properties::asynch_updates () { return this->asynch_updates_; } @@ -74,7 +74,7 @@ TAO_Notify_Properties::asynch_updates (CORBA::Boolean asynch_updates) } ACE_INLINE bool -TAO_Notify_Properties::allow_reconnect (void) +TAO_Notify_Properties::allow_reconnect () { return this->allow_reconnect_; } @@ -86,7 +86,7 @@ TAO_Notify_Properties::allow_reconnect (bool b) } ACE_INLINE bool -TAO_Notify_Properties::validate_client (void) +TAO_Notify_Properties::validate_client () { return this->validate_client_; } @@ -98,7 +98,7 @@ TAO_Notify_Properties::validate_client (bool b) } ACE_INLINE ACE_Time_Value -TAO_Notify_Properties::validate_client_delay (void) +TAO_Notify_Properties::validate_client_delay () { return this->validate_client_delay_; } @@ -110,7 +110,7 @@ TAO_Notify_Properties::validate_client_delay (ACE_Time_Value b) } ACE_INLINE ACE_Time_Value -TAO_Notify_Properties::validate_client_interval (void) +TAO_Notify_Properties::validate_client_interval () { return this->validate_client_interval_; } @@ -123,7 +123,7 @@ TAO_Notify_Properties::validate_client_interval (ACE_Time_Value b) ACE_INLINE bool -TAO_Notify_Properties::separate_dispatching_orb (void) +TAO_Notify_Properties::separate_dispatching_orb () { return this->separate_dispatching_orb_; } @@ -135,7 +135,7 @@ TAO_Notify_Properties::separate_dispatching_orb (bool b) } ACE_INLINE CORBA::Boolean -TAO_Notify_Properties::updates (void) +TAO_Notify_Properties::updates () { return this->updates_; } @@ -147,7 +147,7 @@ TAO_Notify_Properties::updates (CORBA::Boolean updates) } ACE_INLINE const CosNotification::QoSProperties& -TAO_Notify_Properties::default_event_channel_qos_properties (void) +TAO_Notify_Properties::default_event_channel_qos_properties () { return this->ec_qos_; } @@ -159,7 +159,7 @@ TAO_Notify_Properties::default_event_channel_qos_properties (const CosNotificati } ACE_INLINE const CosNotification::QoSProperties& -TAO_Notify_Properties::default_supplier_admin_qos_properties (void) +TAO_Notify_Properties::default_supplier_admin_qos_properties () { return this->sa_qos_; } @@ -171,7 +171,7 @@ TAO_Notify_Properties::default_supplier_admin_qos_properties (const CosNotificat } ACE_INLINE const CosNotification::QoSProperties& -TAO_Notify_Properties::default_consumer_admin_qos_properties (void) +TAO_Notify_Properties::default_consumer_admin_qos_properties () { return this->ca_qos_; } @@ -183,7 +183,7 @@ TAO_Notify_Properties::default_consumer_admin_qos_properties (const CosNotificat } ACE_INLINE const CosNotification::QoSProperties& -TAO_Notify_Properties::default_proxy_supplier_qos_properties (void) +TAO_Notify_Properties::default_proxy_supplier_qos_properties () { return this->ps_qos_; } @@ -195,7 +195,7 @@ TAO_Notify_Properties::default_proxy_supplier_qos_properties (const CosNotificat } ACE_INLINE const CosNotification::QoSProperties& -TAO_Notify_Properties::default_proxy_consumer_qos_properties (void) +TAO_Notify_Properties::default_proxy_consumer_qos_properties () { return this->pc_qos_; } @@ -207,7 +207,7 @@ TAO_Notify_Properties::default_proxy_consumer_qos_properties (const CosNotificat } ACE_INLINE CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_Properties::defaultConsumerAdminFilterOp (void) +TAO_Notify_Properties::defaultConsumerAdminFilterOp () { return this->defaultConsumerAdminFilterOp_; } @@ -220,7 +220,7 @@ TAO_Notify_Properties::defaultConsumerAdminFilterOp (CosNotifyChannelAdmin::Inte ACE_INLINE CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_Properties::defaultSupplierAdminFilterOp (void) +TAO_Notify_Properties::defaultSupplierAdminFilterOp () { return this->defaultSupplierAdminFilterOp_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h index e392cf2909d32..544993394a0ff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h @@ -34,7 +34,7 @@ class TAO_Notify_Serv_Export TAO_Notify_PropertySeq { public: /// Constructor - TAO_Notify_PropertySeq (void); + TAO_Notify_PropertySeq (); /// Destructor ~TAO_Notify_PropertySeq (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp index b22c6be82d508..2c0d25b1576e3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp @@ -34,7 +34,6 @@ TAO_Notify_PropertyBase_T::TAO_Notify_PropertyBase_T ( value_ (rhs.value_), valid_ (rhs.valid_) { - } template diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index 987171f885776..284bac2ae8b86 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -68,7 +68,7 @@ class TAO_Notify_PropertyBase_T CORBA::Boolean is_valid () const; /// Invalidate this property's value. - void invalidate (void); + void invalidate (); protected: /// The Property name. @@ -153,13 +153,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Property_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Property_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Property_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROPERTY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl index 17130a3a9699c..88c3d9c181bba 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl @@ -33,7 +33,7 @@ TAO_Notify_PropertyBase_T::operator!= (const TYPE &rhs) const } template ACE_INLINE void -TAO_Notify_PropertyBase_T:: invalidate (void) +TAO_Notify_PropertyBase_T:: invalidate () { this->valid_ = 0; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index 9a2ab7a4e8c11..bc803700021fb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h @@ -43,7 +43,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Proxy typedef CosNotifyChannelAdmin::ProxyIDSeq_var SEQ_VAR; /// Constructor - TAO_Notify_Proxy (void); + TAO_Notify_Proxy (); /// Destructor virtual ~TAO_Notify_Proxy (); @@ -57,7 +57,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Proxy CORBA::Long id); /// Deactivate - void deactivate (void); + void deactivate (); /// Obtain the Proxy's subscribed types. void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types); @@ -73,13 +73,13 @@ class TAO_Notify_Serv_Export TAO_Notify_Proxy const TAO_Notify_EventTypeSeq& removed); /// Have updates been turned off. - CORBA::Boolean updates_off (void); + CORBA::Boolean updates_off (); /// Destroy this object. - virtual void destroy (void) = 0; + virtual void destroy () = 0; /// Access our Peer. - virtual TAO_Notify_Peer* peer (void) = 0; + virtual TAO_Notify_Peer* peer () = 0; /// Implement the Obtain Types. virtual CosNotification::EventTypeSeq* obtain_types ( @@ -106,7 +106,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Proxy virtual void validate () = 0; protected: - /// Filter Administration TAO_Notify_FilterAdmin filter_admin_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl index f8f1b5da453a8..c83aa74129959 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_Notify_Proxy::updates_off (void) +TAO_Notify_Proxy::updates_off () { return this->updates_off_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index ca388ef578c00..2230a958c20f4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -39,10 +39,10 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer public: typedef TAO_Notify_Refcountable_Guard_T Ptr; /// Constructor - TAO_Notify_ProxyConsumer (void); + TAO_Notify_ProxyConsumer (); /// Destructor - virtual ~TAO_Notify_ProxyConsumer (void); + virtual ~TAO_Notify_ProxyConsumer (); /// init: overrides Topology_Object method virtual void init (TAO_Notify::Topology_Parent * topology_parent); @@ -51,26 +51,26 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer void connect (TAO_Notify_Supplier* supplier); /// Disconnect - void disconnect (void); + void disconnect (); /// Shutdown (TAO_Notify_Container_T method) - virtual int shutdown (void); + virtual int shutdown (); /// Destroy this object. - virtual void destroy (void); + virtual void destroy (); /// Return true if connected bool is_connected () const; /// The SA parent. - TAO_Notify_SupplierAdmin& supplier_admin (void); + TAO_Notify_SupplierAdmin& supplier_admin (); ACE_Time_Value last_ping() const; void last_ping(const ACE_Time_Value& tv); protected: /// Access the Supplier - TAO_Notify_Supplier* supplier (void); + TAO_Notify_Supplier* supplier (); /// Accept an event from the Supplier void push_i (TAO_Notify_Event * event); @@ -91,8 +91,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer ACE_Auto_Ptr supplier_; /// Access our Peer. - virtual TAO_Notify_Peer* peer (void); - + virtual TAO_Notify_Peer* peer (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl index 5f9deb58c82b0..6172c6e0928a3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl @@ -8,13 +8,13 @@ TAO_Notify_ProxyConsumer::is_connected () const } ACE_INLINE TAO_Notify_Supplier* -TAO_Notify_ProxyConsumer::supplier (void) +TAO_Notify_ProxyConsumer::supplier () { return this->supplier_.get(); } ACE_INLINE TAO_Notify_SupplierAdmin& -TAO_Notify_ProxyConsumer::supplier_admin (void) +TAO_Notify_ProxyConsumer::supplier_admin () { ACE_ASSERT( this->supplier_admin_.get() != 0 ); return *this->supplier_admin_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp index 3b329e4723aa3..4c3ad93164f86 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_Notify_ProxyConsumer_T::TAO_Notify_ProxyConsumer_T (void) +TAO_Notify_ProxyConsumer_T::TAO_Notify_ProxyConsumer_T () { } @@ -26,7 +26,7 @@ TAO_Notify_ProxyConsumer_T::admin_types_changed (const CosNotifica } template CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_ProxyConsumer_T::MyAdmin (void) +TAO_Notify_ProxyConsumer_T::MyAdmin () { CosNotifyChannelAdmin::SupplierAdmin_var ret; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h index 1da12d3d6818b..97bc3f8109c3a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h @@ -32,7 +32,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T { public: /// Constructor - TAO_Notify_ProxyConsumer_T (void); + TAO_Notify_ProxyConsumer_T (); /// Destructor ~TAO_Notify_ProxyConsumer_T (); @@ -41,7 +41,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T virtual void admin_types_changed (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed); - virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void); + virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (); virtual CosNotification::EventTypeSeq * obtain_subscription_types ( CosNotifyChannelAdmin::ObtainInfoMode mode); @@ -50,18 +50,11 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer_T const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ); - }; TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/ProxyConsumer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ProxyConsumer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROXYCONSUMER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index a49ec312c7b08..fa49f9d135fa3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier : public virtual TAO_Notif public: typedef TAO_Notify_Refcountable_Guard_T Ptr; /// Constructor - TAO_Notify_ProxySupplier (void); + TAO_Notify_ProxySupplier (); /// Destructor virtual ~TAO_Notify_ProxySupplier (); @@ -50,16 +50,16 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier : public virtual TAO_Notif /// Connect void connect (TAO_Notify_Consumer* consumer); /// Disconnect - void disconnect (void); + void disconnect (); /// Dispatch Event to consumer virtual void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request); /// Override TAO_Notify_Container_T::shutdown method - virtual int shutdown (void); + virtual int shutdown (); /// Destroy this object. - virtual void destroy (void); + virtual void destroy (); /// Destroy this object, but also indicate if it is due to a timeout or /// not. @@ -72,10 +72,10 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier : public virtual TAO_Notif bool is_connected () const; /// Access the Consumer - TAO_Notify_Consumer* consumer (void); + TAO_Notify_Consumer* consumer (); /// The CA parent. - TAO_Notify_ConsumerAdmin& consumer_admin (void); + TAO_Notify_ConsumerAdmin& consumer_admin (); private: ///= Data Members. @@ -86,7 +86,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ProxySupplier : public virtual TAO_Notif TAO_Notify_Consumer::Ptr consumer_; /// Access our Peer. - virtual TAO_Notify_Peer* peer (void); + virtual TAO_Notify_Peer* peer (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl index 7f7d079890ab7..df3d2ba141cec 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl @@ -8,13 +8,13 @@ TAO_Notify_ProxySupplier::is_connected () const } ACE_INLINE TAO_Notify_Consumer* -TAO_Notify_ProxySupplier::consumer (void) +TAO_Notify_ProxySupplier::consumer () { return this->consumer_.get(); } ACE_INLINE TAO_Notify_ConsumerAdmin& -TAO_Notify_ProxySupplier::consumer_admin (void) +TAO_Notify_ProxySupplier::consumer_admin () { ACE_ASSERT( this->consumer_admin_.get() != 0 ); return *this->consumer_admin_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp index f65acbbb9c84b..8b0bce3640621 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_Notify_ProxySupplier_T::TAO_Notify_ProxySupplier_T (void) +TAO_Notify_ProxySupplier_T::TAO_Notify_ProxySupplier_T () : is_suspended_ (0) { } @@ -96,7 +96,7 @@ TAO_Notify_ProxySupplier_T::subscription_change (const CosNotifica } template void -TAO_Notify_ProxySupplier_T::suspend_connection (void) +TAO_Notify_ProxySupplier_T::suspend_connection () { { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -113,7 +113,7 @@ TAO_Notify_ProxySupplier_T::suspend_connection (void) } template void -TAO_Notify_ProxySupplier_T::resume_connection (void) +TAO_Notify_ProxySupplier_T::resume_connection () { { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -129,7 +129,7 @@ TAO_Notify_ProxySupplier_T::resume_connection (void) } template CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_ProxySupplier_T::MyAdmin (void) +TAO_Notify_ProxySupplier_T::MyAdmin () { CosNotifyChannelAdmin::ConsumerAdmin_var ret; @@ -143,7 +143,7 @@ TAO_Notify_ProxySupplier_T::MyAdmin (void) /***************************** UNIMPLEMENTED METHODS***************************************/ template CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ProxySupplier_T::priority_filter (void) +TAO_Notify_ProxySupplier_T::priority_filter () { throw CORBA::NO_IMPLEMENT (); } @@ -155,7 +155,7 @@ TAO_Notify_ProxySupplier_T::priority_filter (CosNotifyFilter::Mapp } template CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ProxySupplier_T::lifetime_filter (void) +TAO_Notify_ProxySupplier_T::lifetime_filter () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h index ac288d54fe81e..1b0ba52617d48 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h @@ -31,7 +31,7 @@ class TAO_Notify_ProxySupplier_T : public virtual TAO_Notify_Proxy_T -TAO_Notify_Proxy_T::TAO_Notify_Proxy_T (void) +TAO_Notify_Proxy_T::TAO_Notify_Proxy_T () { // Any object that is used by the POA gets a reference count of 1 at construction this->_incr_refcnt(); @@ -18,19 +18,19 @@ TAO_Notify_Proxy_T::~TAO_Notify_Proxy_T () } template PortableServer::Servant -TAO_Notify_Proxy_T::servant (void) +TAO_Notify_Proxy_T::servant () { return this; } template void -TAO_Notify_Proxy_T::_add_ref (void) +TAO_Notify_Proxy_T::_add_ref () { this->_incr_refcnt (); } template void -TAO_Notify_Proxy_T::_remove_ref (void) +TAO_Notify_Proxy_T::_remove_ref () { this->_decr_refcnt (); } @@ -42,7 +42,7 @@ TAO_Notify_Proxy_T::validate_event_qos (const CosNotification::QoS } template CosNotification::QoSProperties* -TAO_Notify_Proxy_T::get_qos (void) +TAO_Notify_Proxy_T::get_qos () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -101,7 +101,7 @@ TAO_Notify_Proxy_T::get_filter (CosNotifyFilter::FilterID filter) } template CosNotifyFilter::FilterIDSeq* -TAO_Notify_Proxy_T::get_all_filters (void) +TAO_Notify_Proxy_T::get_all_filters () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -110,7 +110,7 @@ TAO_Notify_Proxy_T::get_all_filters (void) } template void -TAO_Notify_Proxy_T::remove_all_filters (void) +TAO_Notify_Proxy_T::remove_all_filters () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h index ab905b368b49c..2223c35d375b2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h @@ -34,17 +34,17 @@ class TAO_Notify_Proxy_T : public SERVANT_TYPE, public virtual TAO_Notify_Proxy { public: /// Constructor - TAO_Notify_Proxy_T (void); + TAO_Notify_Proxy_T (); /// Destructor ~TAO_Notify_Proxy_T (); /// Implements TAO_Notify_Object::servant method. - virtual PortableServer::Servant servant (void); + virtual PortableServer::Servant servant (); /// ServantBase refcount methods. - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual void _add_ref (); + virtual void _remove_ref (); virtual void validate_event_qos ( const CosNotification::QoSProperties & required_qos, @@ -103,13 +103,7 @@ TAO_Notify_Proxy_T; TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Proxy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Proxy_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROXY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h index 201628c5b8238..aa0fbb523366e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h @@ -33,10 +33,10 @@ class TAO_Notify_Serv_Export TAO_Notify_QoSProperties : public TAO_Notify_Proper { public: /// Constructor - TAO_Notify_QoSProperties (void); + TAO_Notify_QoSProperties (); /// Destructor - virtual ~TAO_Notify_QoSProperties (void); + virtual ~TAO_Notify_QoSProperties (); /// Return 0 on success, 1 if unsupported properties were detected and -1 on error. int init (const CosNotification::PropertySeq& prop_seq, CosNotification::PropertyErrorSeq& err_seq); @@ -67,17 +67,17 @@ class TAO_Notify_Serv_Export TAO_Notify_QoSProperties : public TAO_Notify_Proper const TAO_Notify_Property_Time& blocking_policy() const; // The non-const accessors are used during topology load - TAO_Notify_Property_Short& event_reliability (void); - TAO_Notify_Property_Short& connection_reliability (void); - TAO_Notify_Property_Short& priority (void); - TAO_Notify_Property_Time& timeout (void); - TAO_Notify_Property_Boolean& stop_time_supported (void); - TAO_Notify_Property_Long& maximum_batch_size (void); - TAO_Notify_Property_Time& pacing_interval (void); - TAO_Notify_Property_Long& max_events_per_consumer (void); - TAO_Notify_Property_Short& discard_policy(void); - TAO_Notify_Property_Short& order_policy(void); - TAO_Notify_Property_Time& blocking_policy(void); + TAO_Notify_Property_Short& event_reliability (); + TAO_Notify_Property_Short& connection_reliability (); + TAO_Notify_Property_Short& priority (); + TAO_Notify_Property_Time& timeout (); + TAO_Notify_Property_Boolean& stop_time_supported (); + TAO_Notify_Property_Long& maximum_batch_size (); + TAO_Notify_Property_Time& pacing_interval (); + TAO_Notify_Property_Long& max_events_per_consumer (); + TAO_Notify_Property_Short& discard_policy(); + TAO_Notify_Property_Short& order_policy(); + TAO_Notify_Property_Time& blocking_policy(); protected: /// Return 1 if is unsupported. diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl index db79570bce6b2..510e5b7d8afe2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl @@ -92,67 +92,67 @@ TAO_Notify_QoSProperties::blocking_policy() const ACE_INLINE TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::event_reliability(void) +TAO_Notify_QoSProperties::event_reliability() { return this->event_reliability_; } ACE_INLINE TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::connection_reliability(void) +TAO_Notify_QoSProperties::connection_reliability() { return this->connection_reliability_; } ACE_INLINE TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::priority(void) +TAO_Notify_QoSProperties::priority() { return this->priority_; } ACE_INLINE TAO_Notify_Property_Time& -TAO_Notify_QoSProperties::timeout(void) +TAO_Notify_QoSProperties::timeout() { return this->timeout_; } ACE_INLINE TAO_Notify_Property_Boolean& -TAO_Notify_QoSProperties::stop_time_supported(void) +TAO_Notify_QoSProperties::stop_time_supported() { return this->stop_time_supported_; } ACE_INLINE TAO_Notify_Property_Long& -TAO_Notify_QoSProperties::maximum_batch_size (void) +TAO_Notify_QoSProperties::maximum_batch_size () { return this->maximum_batch_size_; } ACE_INLINE TAO_Notify_Property_Time& -TAO_Notify_QoSProperties::pacing_interval (void) +TAO_Notify_QoSProperties::pacing_interval () { return this->pacing_interval_; } ACE_INLINE TAO_Notify_Property_Long& -TAO_Notify_QoSProperties::max_events_per_consumer (void) +TAO_Notify_QoSProperties::max_events_per_consumer () { return this->max_events_per_consumer_; } ACE_INLINE TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::discard_policy(void) +TAO_Notify_QoSProperties::discard_policy() { return this->discard_policy_; } ACE_INLINE TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::order_policy(void) +TAO_Notify_QoSProperties::order_policy() { return this->order_policy_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h index 09c91139f80ee..c1c44446beb68 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h @@ -29,7 +29,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_Builder : public TAO_Notify_Builder { public: /// Constructor - TAO_Notify_RT_Builder (void); + TAO_Notify_RT_Builder (); /// Destructor virtual ~TAO_Notify_RT_Builder (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h index 76f83c53632fc..0286a1ff4f9b3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h @@ -29,7 +29,7 @@ class TAO_RT_Notify_Export TAO_RT_Notify_Service : public TAO_CosNotify_Service { public: /// Constructor - TAO_RT_Notify_Service (void); + TAO_RT_Notify_Service (); /// Destructor ~TAO_RT_Notify_Service (); @@ -42,10 +42,10 @@ class TAO_RT_Notify_Export TAO_RT_Notify_Service : public TAO_CosNotify_Service virtual void init_i (CORBA::ORB_ptr orb); /// Create the Factory for RT Notify objects. - virtual TAO_Notify_Factory* create_factory (void); + virtual TAO_Notify_Factory* create_factory (); /// Creates the Builder for RT Notify objects. - virtual TAO_Notify_Builder* create_builder (void); + virtual TAO_Notify_Builder* create_builder (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h index 2c0d9458a5da0..624015376f640 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h @@ -30,7 +30,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_POA_Helper : public TAO_Notify_POA_Help { public: /// Destructor - ~TAO_Notify_RT_POA_Helper (void); + ~TAO_Notify_RT_POA_Helper (); /// Create a new PortableServer::POA. /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread pool policy is applied to the new POA. diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h index f1549a4596c7c..7881aebb5fb8e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h @@ -29,18 +29,18 @@ class TAO_RT_Notify_Export TAO_Notify_RT_Properties { public: /// Constructor - TAO_Notify_RT_Properties (void); + TAO_Notify_RT_Properties (); /// Destructor ~TAO_Notify_RT_Properties (); /// Return singleton instance of this class. - static TAO_Notify_RT_Properties * instance (void); + static TAO_Notify_RT_Properties * instance (); - RTCORBA::RTORB_ptr rt_orb (void); + RTCORBA::RTORB_ptr rt_orb (); void rt_orb (RTCORBA::RTORB_ptr rt_orb); - RTCORBA::Current_ptr current (void); + RTCORBA::Current_ptr current (); void current (RTCORBA::Current_ptr current); protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl index 3316151861f2a..30fa294de8207 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE RTCORBA::RTORB_ptr -TAO_Notify_RT_Properties::rt_orb (void) +TAO_Notify_RT_Properties::rt_orb () { return RTCORBA::RTORB::_duplicate (rt_orb_.in ()); } @@ -14,7 +14,7 @@ TAO_Notify_RT_Properties::rt_orb (RTCORBA::RTORB_ptr rt_orb) } ACE_INLINE RTCORBA::Current_ptr -TAO_Notify_RT_Properties::current (void) +TAO_Notify_RT_Properties::current () { return RTCORBA::Current::_duplicate (current_.in()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index b1e3488ab5e73..3e775ab64b3a6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Random_File::Random_File() : block_size_(512) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h index 4eefacf39be04..0ffb9e321c2c0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h @@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /** * \brief A random file class. * @@ -83,7 +82,6 @@ class TAO_Notify_Serv_Export Random_File : public ACE_FILE size_t block_size_; mutable TAO_SYNCH_MUTEX lock_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h index 1abb78b8df9f8..db8570672e2e4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h @@ -34,32 +34,32 @@ class TAO_Notify_Serv_Export TAO_Notify_Reactive_Task { public: /// Constructor - TAO_Notify_Reactive_Task (void); + TAO_Notify_Reactive_Task (); /// Destructor - virtual ~TAO_Notify_Reactive_Task (void); + virtual ~TAO_Notify_Reactive_Task (); /// Init the reactive task. - void init (void); + void init (); /// Shutdown task - virtual void shutdown (void); + virtual void shutdown (); /// Exec the request. virtual void execute (TAO_Notify_Method_Request& method_request); /// The object used by clients to register timers. This method returns a Reactor based Timer. - virtual TAO_Notify_Timer* timer (void); + virtual TAO_Notify_Timer* timer (); /// Returns NULL. - virtual TAO_Notify_Buffering_Strategy* buffering_strategy (void); + virtual TAO_Notify_Buffering_Strategy* buffering_strategy (); private: /// The timer. TAO_Notify_Timer_Reactor::Ptr timer_; /// Release - virtual void release (void); + virtual void release (); }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl index cc4ef7e45c591..892a8011b22b1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Notify_Buffering_Strategy* -TAO_Notify_Reactive_Task::buffering_strategy (void) +TAO_Notify_Reactive_Task::buffering_strategy () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h index a60ab30879e07..79e1e603c62e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h @@ -39,13 +39,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Reconnect_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reconnect_Worker_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h index 230f74326416a..03689fc674f22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h @@ -48,7 +48,6 @@ namespace TAO_Notify ACE_SYNCH_NULL_MUTEX> Reconnection_Registry_Type; public: - /// Constructor Reconnection_Registry (Topology_Parent & parent); @@ -65,7 +64,7 @@ namespace TAO_Notify /// void unregister_callback (::NotifyExt::ReconnectionRegistry::ReconnectionID id); - CORBA::Boolean is_alive (void); + CORBA::Boolean is_alive (); ////////////////////// // During topology save @@ -81,7 +80,7 @@ namespace TAO_Notify void send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory); private: - void release (void); + void release (); Reconnection_Registry_Type reconnection_registry_; ::NotifyExt::ReconnectionRegistry::ReconnectionID highest_id_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h index f3c96c621d857..379dd7155586f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h @@ -61,7 +61,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Refcountable typedef TAO_Notify_Refcountable_Guard_T Ptr; /// Constructor - TAO_Notify_Refcountable (void); + TAO_Notify_Refcountable (); /// Destructor /// public for stack allocated instances @@ -69,8 +69,8 @@ class TAO_Notify_Serv_Export TAO_Notify_Refcountable /// This method signatures deliberately match the RefCounting methods required for ESF Proxy /// Public for bridge implementations and various guard classes - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcnt (); + CORBA::ULong _decr_refcnt (); #if (TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0) static void diagnostic_dump( const char* title = 0 ); @@ -78,7 +78,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Refcountable private: /// The release method is called when the refcount reaches 0. - virtual void release (void) = 0; + virtual void release () = 0; /// Use a signed counter so that we can more easily detect /// boundary conditions such as too many _decr_refcnt() calls. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h index fc1eb795058df..cdbeabfad9f4a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h @@ -73,13 +73,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Refcountable_Guard_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Refcountable_Guard_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Refcountable_Guard_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h index e32670b14f321..ffc5466e11aaf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h @@ -36,7 +36,6 @@ class TAO_Notify_Method_Request_Queueable; namespace TAO_Notify { - class Routing_Slip_Persistence_Manager; // Forward declarations of TAO_Notify classes/pointers/collections @@ -77,7 +76,7 @@ class TAO_Notify_Serv_Export Routing_Slip : public Persistent_Callback void set_rspm (Routing_Slip_Persistence_Manager * rspm); - void reconnect (void); + void reconnect (); /// Destructor (should be private but that inspires compiler wars) virtual ~Routing_Slip (); @@ -232,7 +231,6 @@ class TAO_Notify_Serv_Export Routing_Slip : public Persistent_Callback static Routing_Slip_Queue persistent_queue_; }; - } // namespace TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index 7d76533d46be7..6ae29fe6bb99f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -8,7 +8,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Routing_Slip_Persistence_Manager::Routing_Slip_Persistence_Manager( Standard_Event_Persistence_Factory* factory) : removed_(false) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h index c458f30d069ac..919cb08ae580d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h @@ -130,7 +130,7 @@ class TAO_Notify_Serv_Export Routing_Slip_Persistence_Manager }; Block_Header(Header_Type type); - virtual ~Block_Header (void); + virtual ~Block_Header (); virtual size_t extract_header(Persistent_Storage_Block& psb, size_t offset = 0); virtual size_t put_header(Persistent_Storage_Block& psb, @@ -255,7 +255,6 @@ class TAO_Notify_Serv_Export Routing_Slip_Persistence_Manager ACE_Message_Block * event_mb_; ACE_Message_Block * routing_slip_mb_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h index 754cd9c72cdaf..9e02aa5add383 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h @@ -84,7 +84,6 @@ namespace TAO_Notify TAO_SYNCH_MUTEX internals_; size_t active_; Queue queue_; - }; } // namespace diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h index 241e3df615f63..5cabef722fc22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h @@ -50,13 +50,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Save_Persist_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Save_Persist_Worker_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp index 8b394884503c0..9ab3162b23d89 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template -TAO_Notify_Seq_Worker_T::TAO_Notify_Seq_Worker_T (void) +TAO_Notify_Seq_Worker_T::TAO_Notify_Seq_Worker_T () { } @@ -27,7 +27,6 @@ TAO_Notify_Seq_Worker_T::create (CONTAINER &container) container.collection ()->for_each (this); return this->seq_._retn (); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index f0de98edcd8e6..5153b642c2921 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -38,7 +38,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Seq_Worker_T public: /// Constructor - TAO_Notify_Seq_Worker_T (void); + TAO_Notify_Seq_Worker_T (); /// Create a SEQ SEQ* create (CONTAINER& container); @@ -57,13 +57,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Seq_Worker_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Seq_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Seq_Worker_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_SEQ_WORKER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index 33e2f07b2cc0b..84d6802684d31 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -39,7 +39,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushConsumer friend class TAO_Notify_Builder; public: /// Constructor - TAO_Notify_SequenceProxyPushConsumer (void); + TAO_Notify_SequenceProxyPushConsumer (); /// Destructor virtual ~TAO_Notify_SequenceProxyPushConsumer (); @@ -57,17 +57,17 @@ class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushConsumer ///= Protected Methods //= interface methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void); + virtual CosNotifyChannelAdmin::ProxyType MyType (); virtual void connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier); virtual void push_structured_events (const CosNotification::EventBatch & notifications); - virtual void disconnect_sequence_push_consumer (void); + virtual void disconnect_sequence_push_consumer (); private: /// TAO_Notify_Destroy_Callback methods - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h index 4d277a370d0f3..fcc8aa31c2a3e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h @@ -45,7 +45,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushSupplier public: /// Constructor - TAO_Notify_SequenceProxyPushSupplier (void); + TAO_Notify_SequenceProxyPushSupplier (); /// Destructor virtual ~TAO_Notify_SequenceProxyPushSupplier (); @@ -59,7 +59,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushSupplier virtual void configure(TAO_Notify_ConsumerAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id); /// = Servant methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void); + virtual CosNotifyChannelAdmin::ProxyType MyType (); virtual void connect_sequence_push_consumer ( CosNotifyComm::SequencePushConsumer_ptr push_consumer @@ -69,7 +69,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SequenceProxyPushSupplier ); /// TAO_Notify_Destroy_Callback methods - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h index 1d5b3a70076b3..2ff7297e9d397 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h @@ -71,15 +71,14 @@ class TAO_Notify_Serv_Export TAO_Notify_SequencePushConsumer virtual void reconnect_from_consumer (TAO_Notify_Consumer* old_consumer); protected: - - virtual CORBA::Object_ptr get_consumer (void); + virtual CORBA::Object_ptr get_consumer (); /// The Consumer CosNotifyComm::SequencePushConsumer_var push_consumer_; private: /// TAO_Notify_Destroy_Callback methods. - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h index 26bdd19cb1e9f..24c60ab574620 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h @@ -40,14 +40,13 @@ class TAO_Notify_Serv_Export TAO_Notify_SequencePushSupplier : public TAO_Notify void init (CosNotifyComm::SequencePushSupplier_ptr push_supplier); /// TAO_Notify_Destroy_Callback methods - virtual void release (void); + virtual void release (); /// Retrieve the ior of this peer virtual ACE_CString get_ior () const; protected: - - virtual CORBA::Object_ptr get_supplier (void); + virtual CORBA::Object_ptr get_supplier (); /// The Supplier CosNotifyComm::SequencePushSupplier_var push_supplier_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index ce9a97a64ceb6..4dbac747c3e69 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -52,11 +52,11 @@ class TAO_Notify_Serv_Export TAO_Notify_Service : public ACE_Service_Object { public: /// Destructor. - virtual ~TAO_Notify_Service (void); + virtual ~TAO_Notify_Service (); /// Load an implementation of the TAO_Notify_Service based on which /// implementations are loaded. - static TAO_Notify_Service* load_default (void); + static TAO_Notify_Service* load_default (); /// Init the service from configurator virtual int init (int argc, ACE_TCHAR *argv[]) = 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index a9834a5c602a5..877339272d20c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Standard_Event_Persistence::Standard_Event_Persistence () : filename_ (ACE_TEXT ("__PERSISTENT_EVENT__.DB")) , block_size_ (512) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h index aca08885310e0..a91576fc88011 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h @@ -29,7 +29,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_StructuredProxyPushSupplier : { public: /// Constructor - TAO_Notify_RT_StructuredProxyPushSupplier (void); + TAO_Notify_RT_StructuredProxyPushSupplier (); /// Destructor ~TAO_Notify_RT_StructuredProxyPushSupplier (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index 8836af68ee3b2..420f6bce8693f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -132,5 +132,4 @@ TAO_Notify_StructuredProxyPushConsumer::configure( } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index 21ac1c2cd3ba5..175ddf44cf239 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -40,7 +40,7 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushConsumer public: /// Constructor - TAO_Notify_StructuredProxyPushConsumer (void); + TAO_Notify_StructuredProxyPushConsumer (); /// Destructor virtual ~TAO_Notify_StructuredProxyPushConsumer (); @@ -51,9 +51,8 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushConsumer virtual void configure(TAO_Notify_SupplierAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id); protected: - // = interface methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void); + virtual CosNotifyChannelAdmin::ProxyType MyType (); virtual void connect_structured_push_supplier ( CosNotifyComm::StructuredPushSupplier_ptr push_supplier @@ -70,9 +69,8 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushConsumer private: - /// Release - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index 2df948724bbc3..c46d36a3a3276 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -46,7 +46,7 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushSupplier public: /// Constructor - TAO_Notify_StructuredProxyPushSupplier (void); + TAO_Notify_StructuredProxyPushSupplier (); /// Destructor virtual ~TAO_Notify_StructuredProxyPushSupplier (); @@ -57,7 +57,7 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushSupplier /// = Servant methods // = interface methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void); + virtual CosNotifyChannelAdmin::ProxyType MyType (); virtual void connect_structured_push_consumer ( CosNotifyComm::StructuredPushConsumer_ptr push_consumer @@ -71,9 +71,8 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredProxyPushSupplier virtual void configure(TAO_Notify_ConsumerAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id); private: - /// Release - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h index 5d34c6a604300..b66e71b6815a1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h @@ -61,15 +61,14 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredPushConsumer : public TAO_Noti protected: - - virtual CORBA::Object_ptr get_consumer (void); + virtual CORBA::Object_ptr get_consumer (); /// The Consumer CosNotifyComm::StructuredPushConsumer_var push_consumer_; private: /// Release - virtual void release (void); + virtual void release (); /// Connection valid flag int connection_valid; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index dceff67a466db..456d8e1a095ed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -43,15 +43,14 @@ class TAO_Notify_Serv_Export TAO_Notify_StructuredPushSupplier : public TAO_Noti virtual ACE_CString get_ior () const; protected: - - virtual CORBA::Object_ptr get_supplier (void); + virtual CORBA::Object_ptr get_supplier (); /// The Supplier CosNotifyComm::StructuredPushSupplier_var push_supplier_; private: /// Release - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index 880df5e42ed37..e3f8c4bb8199a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -39,17 +39,16 @@ class TAO_Notify_Serv_Export TAO_Notify_Supplier : public TAO_Notify_Peer virtual ~TAO_Notify_Supplier (); /// Access Specific Proxy. - TAO_Notify_ProxyConsumer* proxy_consumer (void); + TAO_Notify_ProxyConsumer* proxy_consumer (); /// Access Base Proxy. - virtual TAO_Notify_Proxy* proxy (void); + virtual TAO_Notify_Proxy* proxy (); - virtual CORBA::Object_ptr get_supplier (void) = 0; + virtual CORBA::Object_ptr get_supplier () = 0; bool is_alive (bool allow_nil_supplier); protected: - /// Dispatch updates implementation. virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl index e1b2c45f8c3c1..8fcf89281488b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Notify_ProxyConsumer* -TAO_Notify_Supplier::proxy_consumer (void) +TAO_Notify_Supplier::proxy_consumer () { return this->proxy_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index bb23585e87c55..71d6b038e0025 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -42,7 +42,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_SupplierAdmin > Ptr; /// Constructor - TAO_Notify_SupplierAdmin (void); + TAO_Notify_SupplierAdmin (); /// Destructor virtual ~TAO_Notify_SupplierAdmin (); @@ -51,8 +51,8 @@ class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin void init (TAO_Notify_EventChannel *ec); /// ServantBase refcount methods. - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual void _add_ref (); + virtual void _remove_ref (); virtual const char * get_admin_type_name () const; @@ -66,10 +66,9 @@ class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin size_t position); /// TAO_Notify_Container_T requires a destroy method - virtual void destroy (void); + virtual void destroy (); protected: - TAO_Notify::Topology_Object *load_proxy ( CORBA::Long id, CosNotifyChannelAdmin::ClientType ctype, @@ -83,15 +82,15 @@ class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin const CosNotification::QoSProperties & initial_qos); /// = CosNotifyChannelAdmin::SupplierAdmin methods - virtual CosNotifyChannelAdmin::AdminID MyID (void); + virtual CosNotifyChannelAdmin::AdminID MyID (); - virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void); + virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (); - virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void); + virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (); - virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (void); + virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (); - virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (void); + virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (); virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer ( CosNotifyChannelAdmin::ProxyID proxy_id); @@ -106,7 +105,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id); - virtual ::CosNotification::QoSProperties* get_qos (void); + virtual ::CosNotification::QoSProperties* get_qos (); virtual void set_qos (const CosNotification::QoSProperties& qos); @@ -125,9 +124,9 @@ class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin virtual ::CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter); - virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void); + virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (); - virtual void remove_all_filters (void); + virtual void remove_all_filters (); virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (); @@ -135,7 +134,7 @@ class TAO_Notify_Serv_Export TAO_Notify_SupplierAdmin private: /// Release - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h index 58fe638e208b4..42684e8445cab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h @@ -44,7 +44,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task public: /// Constructor - TAO_Notify_ThreadPool_Task (void); + TAO_Notify_ThreadPool_Task (); /// Destructor virtual ~TAO_Notify_ThreadPool_Task (); @@ -68,10 +68,10 @@ class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task virtual void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties); /// The object used by clients to register timers. - virtual TAO_Notify_Timer* timer (void); + virtual TAO_Notify_Timer* timer (); /// Provide access to the underlying buffering strategy - TAO_Notify_Buffering_Strategy* buffering_strategy (void); + TAO_Notify_Buffering_Strategy* buffering_strategy (); protected: /// Task svc @@ -79,7 +79,7 @@ class TAO_Notify_Serv_Export TAO_Notify_ThreadPool_Task private: /// Release - virtual void release (void); + virtual void release (); /// The buffering strategy to use. ACE_Auto_Ptr< TAO_Notify_Buffering_Strategy > buffering_strategy_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h index a5965725620a6..2360c3dfd93ed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h @@ -35,10 +35,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Timer_Queue > Ptr; /// Constructor - TAO_Notify_Timer_Queue (void); + TAO_Notify_Timer_Queue (); /// Destructor - virtual ~TAO_Notify_Timer_Queue (void); + virtual ~TAO_Notify_Timer_Queue (); /// Schedule a timer virtual long schedule_timer (ACE_Event_Handler *handler, @@ -49,7 +49,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer virtual int cancel_timer (long timer_id); /// Get the native impl. - ACE_Timer_Queue& impl (void); + ACE_Timer_Queue& impl (); protected: /// The Timer Queue @@ -57,7 +57,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Timer_Queue : public TAO_Notify_Timer private: /// Release - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h index 3146b11006b37..28c9454f642fa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h @@ -35,7 +35,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Timer_Reactor > Ptr; /// Constructor - TAO_Notify_Timer_Reactor (void); + TAO_Notify_Timer_Reactor (); /// Destructor virtual ~TAO_Notify_Timer_Reactor (); @@ -54,7 +54,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Timer_Reactor : public TAO_Notify_Timer private: /// Release - virtual void release (void); + virtual void release (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h index def15cc274961..393212d1a4315 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h @@ -32,7 +32,6 @@ namespace CORBA namespace TAO_Notify { - /// A forward declaration. class Topology_Object; @@ -69,9 +68,8 @@ class TAO_Notify_Serv_Export Topology_Loader * vary based on the type of loader, so we can't include it in the * interface. */ - virtual void close (void); + virtual void close (); }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h index de3803bc12b86..214f306bfd469 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h @@ -55,7 +55,7 @@ namespace TAO_Notify { public: /// Destructor. - virtual ~Topology_Savable (void); + virtual ~Topology_Savable (); /// Save our state to a Topology_Saver. /// @@ -92,8 +92,7 @@ namespace TAO_Notify /// to any external objects with whom we were interacting. We should /// call the reconnect() method on all of our children to give them /// the chance to do the same. - virtual void reconnect (void); - + virtual void reconnect (); }; /// \brief Base class for Persistent Topology Objects. @@ -150,7 +149,7 @@ namespace TAO_Notify /// /// see also Topology_Parent::child_change () /// \return false if save will never happen - bool self_change (void); + bool self_change (); /// \brief pointer to our topological parent /// @@ -160,7 +159,7 @@ namespace TAO_Notify /// \brief Handle details of propagating change /// /// \return false if save will never happen - bool send_change (void); + bool send_change (); /// \brief Handle details of propagating change /// for a deleted object. @@ -175,7 +174,7 @@ namespace TAO_Notify /// (top level of tree) /// private virtual because this should only be called from send_change() /// \return false if save will never happen - virtual bool change_to_parent (void); + virtual bool change_to_parent (); protected: /// true if this object changed since last save_persistent @@ -198,9 +197,8 @@ namespace TAO_Notify /// Called by a child that has changed. /// A child calls this method to report that it has changed. /// \return false if save will never happen - bool child_change (void); + bool child_change (); }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl index 024c8483f0e46..1c496a22c4404 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl @@ -12,7 +12,7 @@ namespace TAO_Notify ACE_INLINE bool - Topology_Parent::child_change (void) + Topology_Parent::child_change () { this->children_changed_ = true; return send_change (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h index 93707f71c003f..6331ef754690e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h @@ -34,7 +34,6 @@ namespace TAO_Notify class TAO_Notify_Serv_Export Topology_Saver { public: - /// The destructor. virtual ~Topology_Saver (); @@ -95,7 +94,7 @@ namespace TAO_Notify * vary based on the type of saver, so we can't include it in the * interface. */ - virtual void close (void); + virtual void close (); }; } // namespace TAO_Notify diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h index 62739cd5965c9..5ab23c46bfaac 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h @@ -43,7 +43,6 @@ class TAO_Notify_Serv_Export TAO_Notify_validate_client_Task : public ACE_Task { public: - typedef TAO_Condition CONDITION; /// Constructor. It does not assume ownership of the @@ -53,11 +52,11 @@ class TAO_Notify_Serv_Export TAO_Notify_validate_client_Task TAO_Notify_EventChannelFactory *ecf); /// destructor... - virtual ~TAO_Notify_validate_client_Task (void); + virtual ~TAO_Notify_validate_client_Task (); virtual int svc (); - void shutdown (void); + void shutdown (); private: /// The delay of first time validate. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h index b25fa1d876d30..ac4cb88da1b28 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h @@ -39,13 +39,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Validate_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Validate_Worker_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h index 9a66ed58ade08..38f349a5618a3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h @@ -41,7 +41,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcount typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Worker_Task > Ptr; /// Constructor - TAO_Notify_Worker_Task (void); + TAO_Notify_Worker_Task (); /// Update QoS Properties. virtual void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties); @@ -51,10 +51,10 @@ class TAO_Notify_Serv_Export TAO_Notify_Worker_Task : public TAO_Notify_Refcount virtual void execute (TAO_Notify_Method_Request& method_request) = 0; /// Shutdown task - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; /// The object used by clients to register timers. - virtual TAO_Notify_Timer* timer (void) = 0; + virtual TAO_Notify_Timer* timer () = 0; protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h index 76094b3092810..b4d535c045e30 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h @@ -71,7 +71,6 @@ class XML_Loader : public ACEXML_DefaultHandler , public Topology_Loader /// If false, then we're just checking syntax of topology file. bool live_; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h index 71ee9911ba1e7..6308768b7f545 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h @@ -24,7 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /** * \brief Save Notification Service Topology to an XML file. */ @@ -53,7 +52,7 @@ class XML_Saver : public Topology_Saver virtual void end_object (CORBA::Long id, const ACE_CString& type); - virtual void close (void); + virtual void close (); private: void backup_file_name (ACE_TCHAR * file_path, size_t nfile); @@ -72,9 +71,7 @@ class XML_Saver : public Topology_Saver /// A string consisting of spaces that is our current indentation level. ACE_CString indent_; - }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h index a567b11a3ac6a..952862c35a791 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h @@ -72,7 +72,6 @@ namespace TAO_Notify size_t backup_count_; bool timestamp_; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp index 562589821473d..20b70b75e1784 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp @@ -69,15 +69,9 @@ namespace namespace TAO_PG { - - Fragments_Cleanup_Strategy::~Fragments_Cleanup_Strategy () - { - } - void Time_Bound_Fragments_Cleanup_Strategy::cleanup ( - TAO_UIPMC_Mcast_Transport::Packets_Map &packets - ) + TAO_UIPMC_Mcast_Transport::Packets_Map &packets) { // bound_ is in milliseconds. ACE_Time_Value const delay (0, 1000 * this->bound_); @@ -115,8 +109,7 @@ namespace TAO_PG void Number_Bound_Fragments_Cleanup_Strategy::cleanup ( - TAO_UIPMC_Mcast_Transport::Packets_Map &packets - ) + TAO_UIPMC_Mcast_Transport::Packets_Map &packets) { int const current_size = static_cast (packets.current_size ()); @@ -166,8 +159,7 @@ namespace TAO_PG void Memory_Bound_Fragments_Cleanup_Strategy::cleanup ( - TAO_UIPMC_Mcast_Transport::Packets_Map &packets - ) + TAO_UIPMC_Mcast_Transport::Packets_Map &packets) { // First we need to calculate the size of packets. Since we anyway run // this loop we can also cleanup broken packets. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h index adec27c657373..5f085240713b4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_PG { - /** * @class Fragments_Cleanup_Strategy * @@ -45,7 +44,7 @@ namespace TAO_PG Fragments_Cleanup_Strategy (int bound); /// The destructor - virtual ~Fragments_Cleanup_Strategy (void); + virtual ~Fragments_Cleanup_Strategy () = default; /// Sub-classes must implement these methods virtual void cleanup (TAO_UIPMC_Mcast_Transport::Packets_Map &) = 0; @@ -99,7 +98,6 @@ namespace TAO_PG virtual void cleanup (TAO_UIPMC_Mcast_Transport::Packets_Map &packets); }; - } // namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h index 0c03bdcdea35f..3f4bf31e76a1d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h @@ -54,7 +54,6 @@ class TAO_PortableGroup_Export TAO_GOA : virtual PortableServer::ObjectId * create_id_for_reference ( CORBA::Object_ptr the_ref); - virtual PortableGroup::IDs * reference_to_ids ( CORBA::Object_ptr the_ref); @@ -100,25 +99,25 @@ class TAO_PortableGroup_Export TAO_GOA : #endif /* TAO_HAS_MINIMUM_POA == 0 */ - char * the_name (void); + char * the_name (); - PortableServer::POA_ptr the_parent (void); + PortableServer::POA_ptr the_parent (); - PortableServer::POAList *the_children (void); + PortableServer::POAList *the_children (); - PortableServer::POAManager_ptr the_POAManager (void); + PortableServer::POAManager_ptr the_POAManager (); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::AdapterActivator_ptr the_activator (void); + PortableServer::AdapterActivator_ptr the_activator (); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); void set_servant (PortableServer::Servant servant); @@ -148,7 +147,7 @@ class TAO_PortableGroup_Export TAO_GOA : CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid); - CORBA::OctetSeq *id (void); + CORBA::OctetSeq *id (); // End standard POA interface methods. @@ -161,13 +160,12 @@ class TAO_PortableGroup_Export TAO_GOA : TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter); - virtual ~TAO_GOA (void); + virtual ~TAO_GOA (); // Used to force the initialization of the code. - static int Initializer (void); + static int Initializer (); protected: - /// Template method for creating new POA's of this type. virtual TAO_Root_POA *new_POA (const String &name, PortableServer::POAManager_ptr poa_manager, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h index fc271b1cbb5f6..609aa9b90a0d4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h @@ -23,18 +23,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - class TAO_PortableGroup_Export MIOP_Loader { - public: + public: /// Used to force the insertion of UIPMC_Factory in the service /// configurator. - static int Initializer (void); + static int Initializer (); }; static int Requires_MIOP_Initializer = MIOP_Loader::Initializer (); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp index 92743a6b5b838..76c647eaeba0f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp @@ -14,10 +14,6 @@ TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator () this->factories_[0].id = CORBA::string_dup ("org.omg.PortableGroup.Factories"); } -TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator () -{ -} - void TAO_PG_Default_Property_Validator::validate_property ( const PortableGroup::Properties & props) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index 9a221e91879c2..7c2681d0d166c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -34,12 +34,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_PortableGroup_Export TAO_PG_Default_Property_Validator { public: - /// Constructor. - TAO_PG_Default_Property_Validator (void); + TAO_PG_Default_Property_Validator (); /// Destructor - virtual ~TAO_PG_Default_Property_Validator (void); + virtual ~TAO_PG_Default_Property_Validator () = default; /// Validate the given properties. Throw an exception when the /// first invalid property is encountered. The remaining properties @@ -52,7 +51,6 @@ class TAO_PortableGroup_Export TAO_PG_Default_Property_Validator virtual void validate_criteria (const PortableGroup::Properties & criteria); private: - /** * @name Pre-initialize property Names. * @@ -66,7 +64,6 @@ class TAO_PortableGroup_Export TAO_PG_Default_Property_Validator PortableGroup::Name membership_; PortableGroup::Name factories_; //@} - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index f5c5784338879..4f46abd4cfc3b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -169,7 +169,6 @@ void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr // and create a ior string this->ior_ = this->orb_->object_to_string (this->this_obj_.in ()); - } int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb) @@ -505,7 +504,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( PortableGroup::FactoryInfo & info = infos[nInfo]; if (info.the_location == location) { - ORBSVCS_ERROR((LM_INFO, "%s: Unregister_factory_by_location: Removing: [%d] %s@%s\n", this->identity_.c_str(), diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index 042cb69528bc5..fae1f62b20884 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -71,7 +71,7 @@ namespace TAO PG_FactoryRegistry (const char * name = "FactoryRegistry"); /// virtual Destructor - virtual ~PG_FactoryRegistry (void); + virtual ~PG_FactoryRegistry (); /** * Parse command line arguments. @@ -97,7 +97,7 @@ namespace TAO * Prepare to exit. * @return zero for success; nonzero is process return code for failure. */ - int fini (void); + int fini (); /** * Processing to happen when the ORB's event loop is idle. @@ -120,7 +120,7 @@ namespace TAO //////////////////////////////// // override servant base methods - virtual void _remove_ref (void); + virtual void _remove_ref (); ////////////////// // CORBA interface @@ -159,7 +159,6 @@ namespace TAO /////////////// // Data Members private: - /** * A human-readable string to distinguish this from other Notifiers. */ @@ -217,7 +216,6 @@ namespace TAO int linger_; RegistryType registry_; - }; } // namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h index 9d4edb7506a77..c37ddad820bf2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h @@ -44,7 +44,6 @@ struct TAO_PG_Factory_Node /// FactoryCreationId assigned to the member. PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id; - }; typedef ACE_Array_Base TAO_PG_Factory_Set; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index 7822541953222..2d5ed96137641 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -26,7 +26,6 @@ TAO_PG_GenericFactory::TAO_PG_GenericFactory ( TAO_PG_GenericFactory::~TAO_PG_GenericFactory () { - TAO_PG_Factory_Map::iterator end = this->factory_map_.end (); for (TAO_PG_Factory_Map::iterator i = this->factory_map_.begin (); i != end; @@ -134,7 +133,6 @@ TAO_PG_GenericFactory::create_object ( if (this->factory_map_.bind (fcid, factory_set) != 0) throw PortableGroup::ObjectNotCreated (); - } // Allocate a new FactoryCreationId for use as an "out" parameter. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index efa4adb6c077d..691c142f1a439 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -49,19 +49,17 @@ class TAO_PortableGroup_Export TAO_PG_GenericFactory : public virtual PortableGroup::GenericFactory { public: - /// Constructor. TAO_PG_GenericFactory (TAO_PG_ObjectGroupManager & object_group_map, TAO_PG_PropertyManager & property_manager); /// Destructor. - ~TAO_PG_GenericFactory (void); + ~TAO_PG_GenericFactory (); /** * @name TAO_LoadBalancer::GenericFactory methods */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out @@ -135,7 +133,6 @@ class TAO_PortableGroup_Export TAO_PG_GenericFactory const CORBA::Boolean propagate_member_already_present); private: - /// Populate the object group being created. Called when the /// infrastructure-controlled membership style is used for the /// object group being created. @@ -176,7 +173,6 @@ class TAO_PortableGroup_Export TAO_PG_GenericFactory PortableGroup::MinimumNumberMembersValue & minimum_number_members); private: - /// Reference to the POA used to create object group references. PortableServer::POA_var poa_; @@ -213,7 +209,6 @@ class TAO_PortableGroup_Export TAO_PG_GenericFactory /// Lock used to synchronize access to the factory creation id /// index (i.e. next_fcid_). TAO_SYNCH_MUTEX lock_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 7d9d138d90eb2..dfe9833f702b1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -241,9 +241,7 @@ int TAO::PG_Group_Factory::find_group_with_name (const char* target_group_name, // If the group has the group name in the property // const char* a_group_name = a_group->get_name (); - if (a_group_name != 0 && - ACE_OS::strcmp (target_group_name, - a_group_name) == 0) + if (a_group_name != 0 && ACE_OS::strcmp (target_group_name, a_group_name) == 0) { // This is the group we were looking for group_target = a_group; result = 1; @@ -293,7 +291,6 @@ int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroup_ptr object_ } - PortableGroup::ObjectGroups * TAO::PG_Group_Factory::groups_at_location ( const PortableGroup::Location & the_location) @@ -359,7 +356,6 @@ TAO::PG_Group_Factory::set_object_group_storable_factory ( ACE_NEW_THROW_EX (this->list_store_, TAO::PG_Group_List_Store (*this->storable_factory_), CORBA::NO_MEMORY ()); - } TAO::PG_Group_Factory::Group_Map & @@ -430,7 +426,6 @@ TAO::PG_Group_Factory::get_group_map () } this->groups_read_ = true; - } } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index 1882b79b9b83d..7b628e5da0bd7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -73,7 +73,6 @@ namespace TAO TAO_SYNCH_MUTEX> Group_Map_Iterator; public: - /// Constructor. PG_Group_Factory (); @@ -85,16 +84,13 @@ namespace TAO PortableServer::POA_ptr poa, PortableGroup::FactoryRegistry_ptr factory_registry); - TAO::PG_Object_Group * create_group ( const char * type_id, const PortableGroup::Criteria & the_criteria, const TAO::PG_Property_Set_var & typeid_properties); - void delete_group (PortableGroup::ObjectGroup_ptr object_group); - void delete_group (PortableGroup::ObjectGroupId group_id); PortableGroup::ObjectGroups * @@ -105,8 +101,7 @@ namespace TAO * return all groups in the factory */ PortableGroup::ObjectGroups * - all_groups (void); - + all_groups (); /** * insert existing group. Take ownership @@ -167,7 +162,6 @@ namespace TAO void set_object_group_storable_factory (TAO::Storable_Factory * factory); protected: - /** * Factory function to create a storable object object from * scratch. @@ -199,7 +193,6 @@ namespace TAO PG_Group_List_Store * list_store_; private: - CORBA::ORB_var orb_; /// Reference to the POA used to create object group references. @@ -225,7 +218,6 @@ namespace TAO // Lazily read groups from store bool groups_read_; Storable_Factory * storable_factory_; - }; } // namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h index d92406e959542..ad666863a4ddd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h @@ -46,7 +46,6 @@ class TAO_PG_ObjectGroupManager; class TAO_PG_Group_Guard { public: - /// Constructor. TAO_PG_Group_Guard (TAO_PG_GenericFactory & generic_factory, TAO_PG_Factory_Set & factory_set, @@ -54,13 +53,12 @@ class TAO_PG_Group_Guard const PortableServer::ObjectId & oid); /// Destructor. - ~TAO_PG_Group_Guard (void); + ~TAO_PG_Group_Guard (); /// Relinquish cleanup responsibility. - void release (void); + void release (); private: - /// Reference to the infrastructure TAO_PG_GenericFactory that /// created the below TAO_PG_Factory_Set. TAO_PG_GenericFactory & generic_factory_; @@ -81,7 +79,6 @@ class TAO_PG_Group_Guard /// Flag that dictates whether or not the destructor will perform /// cleanup. bool released_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h index af459a00a1171..f4f4e138bfb96 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h @@ -38,12 +38,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_PortableGroup_Export TAO_PG_Location_Equal_To { public: - /// Perform a string comparison on each of the sequence elements in /// the given locations. int operator() (const PortableGroup::Location &lhs, const PortableGroup::Location &rhs) const; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index a30b2ed23894d..85da067093024 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -33,9 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_PortableGroup_Export TAO_PG_Location_Hash { - public: - /// Creates a hash based on all of elements of the given Location CORBA::ULong operator() (const PortableGroup::Location &) const; }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h index 2cf15e7146c77..97f2b4e189456 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h @@ -53,7 +53,6 @@ struct TAO_PG_MemberInfo * given location, this equality operator will return true. */ bool operator== (const TAO_PG_MemberInfo & rhs) const; - }; typedef ACE_Unbounded_Set TAO_PG_MemberInfo_Set; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index 4e6a370c8299c..6c4d6bf450345 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_PortableGroup_Export TAO_PG_Null_Property_Validator { public: - /// Validate the given properties. /** * This particular implementation performs no validation @@ -47,7 +46,6 @@ class TAO_PortableGroup_Export TAO_PG_Null_Property_Validator * whatsoever. */ void validate_criteria (const PortableGroup::Properties & criteria); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 72065e982b1c2..b1ffb6120b623 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -74,7 +74,6 @@ TAO_PG_ObjectGroupManager::add_member ( the_location, member, check_type_id); - } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 6d664195c2556..a78ea1a1c8b67 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -46,12 +46,11 @@ class TAO_PortableGroup_Export TAO_PG_ObjectGroupManager : public virtual POA_PortableGroup::ObjectGroupManager { public: - /// Constructor. - TAO_PG_ObjectGroupManager (void); + TAO_PG_ObjectGroupManager (); /// Destructor. - ~TAO_PG_ObjectGroupManager (void); + ~TAO_PG_ObjectGroupManager (); /** * @name PortableGroup::ObjectGroupManager methods @@ -60,7 +59,6 @@ class TAO_PortableGroup_Export TAO_PG_ObjectGroupManager * interface. */ //@{ - /// Create a member and add it to the given object group. virtual PortableGroup::ObjectGroup_ptr create_member ( PortableGroup::ObjectGroup_ptr object_group, @@ -199,7 +197,6 @@ class TAO_PortableGroup_Export TAO_PG_ObjectGroupManager void validate_members (CORBA::ORB_ptr orb, const TimeBase::TimeT& timeout); protected: - /// Underlying and non-locking implementation of the add_member() /// and _tao_add_member() methods in this class. PortableGroup::ObjectGroup_ptr add_member_i ( @@ -249,7 +246,6 @@ class TAO_PortableGroup_Export TAO_PG_ObjectGroupManager TAO_PG_ObjectGroup_Array * groups); private: - /// Help function to get active or inactive member infos. TAO_PG_MemberInfo_Set get_members (bool is_alive); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h index 628d75e9fa26f..38e929f385fb5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h @@ -40,7 +40,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL struct TAO_PG_ObjectGroup_Map_Entry { public: - /// The RepositoryId corresponding to all Members in the /// ObjectGroup. CORBA::String_var type_id; @@ -64,7 +63,6 @@ struct TAO_PG_ObjectGroup_Map_Entry /// Properties used when creating this object group, in addition to /// those set dynamically after the creation. PortableGroup::Properties properties; - }; /// ObjectId hash map typedef. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h index 292e338d13a0d..dd70623c5c599 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h @@ -29,7 +29,7 @@ class TAO_PortableGroup_Export TAO_PG_Object_Adapter_Factory : public TAO_Object { public: /// Constructor - TAO_PG_Object_Adapter_Factory (void); + TAO_PG_Object_Adapter_Factory (); /// Create adapter. virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 0e72012e8a109..39951ceb8f25e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -55,9 +55,7 @@ namespace TAO */ class TAO_PortableGroup_Export PG_Object_Group { - protected: - // Information about an object group member struct MemberInfo { @@ -177,7 +175,6 @@ namespace TAO PortableGroup::InitialNumberMembersValue get_initial_number_members () const; - /** * @@TODO DOC */ @@ -232,7 +229,7 @@ namespace TAO /** * @@TODO DOC */ - virtual PortableGroup::Locations * locations_of_members (void); + virtual PortableGroup::Locations * locations_of_members (); /** * @@TODO DOC @@ -244,12 +241,12 @@ namespace TAO /** * @@TODO DOC */ - virtual void initial_populate (void); + virtual void initial_populate (); /** * @@TODO DOC */ - virtual void minimum_populate (void); + virtual void minimum_populate (); /** @@ -266,23 +263,21 @@ namespace TAO virtual void set_name (const char* group_name); - virtual const char* get_name (void); + virtual const char* get_name (); ///////////////////////// // Implementation methods private: - int increment_version (); - void distribute_iogr (void); + void distribute_iogr (); void create_members (size_t count); protected: - virtual PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member); - void clear_members_map (void); + void clear_members_map (); ///////////////////////// // Forbidden methods @@ -295,15 +290,12 @@ namespace TAO ///////////////// // Static Methods public: - /////////////// // Static Data private: - /////////////// // Data Members private: - /** * Protect internal state. */ @@ -313,12 +305,10 @@ namespace TAO CORBA::ORB_var orb_; private: - /// Where to find the factories for replicas. PortableGroup::FactoryRegistry_var factory_registry_; protected: - // The object group manipulator TAO::PG_Object_Group_Manipulator & manipulator_; @@ -373,7 +363,6 @@ namespace TAO PortableGroup::InitialNumberMembersValue initial_number_members_; PortableGroup::MinimumNumberMembersValue minimum_number_members_; PortableGroup::FactoryInfos group_specific_factories_; - }; } // namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp index c8b22ae18cc04..88a6fb0b363b9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp @@ -25,10 +25,6 @@ TAO::PG_Object_Group_Manipulator::PG_Object_Group_Manipulator () { } -TAO::PG_Object_Group_Manipulator::~PG_Object_Group_Manipulator () -{ -} - void TAO::PG_Object_Group_Manipulator::allocate_ogid (PortableGroup::ObjectGroupId & ogid) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_ogid_); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 7096e29d64c2a..e5cb7fe7f6819 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class TAO::PG_Object_Group_Manipulator * @@ -40,12 +39,11 @@ namespace TAO class TAO_PortableGroup_Export PG_Object_Group_Manipulator { public: - /// Constructor. PG_Object_Group_Manipulator (); /// Destructor. - ~PG_Object_Group_Manipulator (); + ~PG_Object_Group_Manipulator () = default; /** * Initializes the group creator. @@ -87,7 +85,6 @@ namespace TAO PortableGroup::ObjectGroup_ptr member) const; private: - /** * Allocate an ogid for a new object group */ @@ -100,7 +97,6 @@ namespace TAO convert_ogid_to_oid (PortableGroup::ObjectGroupId ogid) const; private: - /// The orb CORBA::ORB_var orb_; @@ -115,7 +111,6 @@ namespace TAO /// Next ogid to be allocated. PortableGroup::ObjectGroupId next_ogid_; - }; } //namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp index 8d3ebffb5ae62..21953ce862120 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp @@ -37,11 +37,9 @@ namespace namespace TAO { - class Object_Group_File_Guard : public TAO::Storable_File_Guard { public: - Object_Group_File_Guard ( TAO::PG_Object_Group_Storable & object_group, Method_Type method_type); @@ -67,10 +65,8 @@ namespace TAO virtual TAO::Storable_Base * create_stream (const char * mode); private: - TAO::PG_Object_Group_Storable & object_group_; }; - } TAO::Object_Group_File_Guard::Object_Group_File_Guard ( @@ -153,7 +149,6 @@ TAO::Object_Group_File_Guard::~Object_Group_File_Guard () // Notify if persistent store was updated. if (object_group_.write_occurred_) object_group_.state_written (); - } catch (const TAO::Storable_Exception &se) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h index a526b1e52f628..0aa09da87ebd1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h @@ -46,11 +46,7 @@ namespace TAO class TAO_PortableGroup_Export PG_Object_Group_Storable : public PG_Object_Group { - - ///////////////////// - // Construct/Destruct public: - /** * This constructor is suitable for creating an object group from * scratch. @@ -80,11 +76,7 @@ namespace TAO /// Destructor ~PG_Object_Group_Storable (); - ///////////////// - // public methods - public: - /** * Indicate that this object group is to be permanently * destroyed. During destruction the persistent store @@ -119,14 +111,14 @@ namespace TAO const char * type_id, const PortableGroup::Criteria & the_criteria); - virtual PortableGroup::Locations * locations_of_members (void); + virtual PortableGroup::Locations * locations_of_members (); virtual CORBA::Object_ptr get_member_reference ( const PortableGroup::Location & the_location); - virtual void initial_populate (void); + virtual void initial_populate (); - virtual void minimum_populate (void); + virtual void minimum_populate (); virtual int has_member_at (const PortableGroup::Location & location ); @@ -134,12 +126,11 @@ namespace TAO virtual void set_name (const char* group_name); - virtual const char* get_name (void); + virtual const char* get_name (); virtual PortableGroup::ObjectGroupId get_object_group_id () const; private: - ///////////////////////// // Forbidden methods PG_Object_Group_Storable (); @@ -160,7 +151,6 @@ namespace TAO time_t last_changed_; protected: - bool loaded_from_stream_; bool destroyed_; @@ -171,7 +161,7 @@ namespace TAO /** * Signals that this context was updated. */ - virtual void state_written (void); + virtual void state_written (); /** * A callback invoked by the object group file guard @@ -185,7 +175,6 @@ namespace TAO TAO_SYNCH_MUTEX lock_; friend class Object_Group_File_Guard; - }; } // namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp index 590c5faa2d7b0..6aa0a31d5fe90 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp @@ -10,24 +10,16 @@ //============================================================================= #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" - #if ! defined (__ACE_INLINE__) #include "orbsvcs/PortableGroup/PG_Properties_Encoder.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -////////// -// Properties_Encoder TAO_PG::Properties_Encoder::Properties_Encoder () { } -TAO_PG::Properties_Encoder::~Properties_Encoder () -{ -} - - void TAO_PG::Properties_Encoder::add ( const char * name, const PortableGroup::Value & value) @@ -36,8 +28,7 @@ void TAO_PG::Properties_Encoder::add ( values_.push_back(nv); } -void TAO_PG::Properties_Encoder::encode ( - PortableGroup::Properties * property_set) const +void TAO_PG::Properties_Encoder::encode (PortableGroup::Properties * property_set) const { ACE_ASSERT (property_set != 0); CORBA::ULong const count = static_cast (values_.size()); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index 9c8cb300bcaad..d22360e43a905 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -64,7 +64,7 @@ namespace TAO_PG Properties_Encoder (); /// standard destructor - ~Properties_Encoder (); + ~Properties_Encoder () = default; /** * add a name/value property to the Properties_Encoder. @@ -78,12 +78,11 @@ namespace TAO_PG void encode (PortableGroup::Properties * property_set) const; private: - Properties_Encoder (const Properties_Encoder & rhs); - Properties_Encoder & operator = (const Properties_Encoder & rhs); + Properties_Encoder (const Properties_Encoder & rhs) = delete; + Properties_Encoder & operator = (const Properties_Encoder & rhs) = delete; private: NamedValueVec values_; }; - } //namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp index 1239590d611c6..701dceeb1ee03 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::PG_Properties_Support::PG_Properties_Support () { - TAO::PG_Property_Set *props; + TAO::PG_Property_Set *props = nullptr; ACE_NEW_THROW_EX (props, TAO::PG_Property_Set (), CORBA::NO_MEMORY()); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h index 2307a500f86b0..1db783c17dd3a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h @@ -92,7 +92,7 @@ namespace TAO * resource leaks. * @returns a newly allocated PortableGroup::Properties. */ - PortableGroup::Properties * get_default_properties (void); + PortableGroup::Properties * get_default_properties (); /** * Undefine default properties that appear in props. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index ac1236795b9a8..b6b7bc593b1ba 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -49,7 +49,6 @@ class TAO_PortableGroup_Export TAO_PG_PropertyManager : public virtual POA_PortableGroup::PropertyManager { public: - /// Constructor. TAO_PG_PropertyManager (TAO_PG_ObjectGroupManager & object_group_manager); @@ -60,7 +59,6 @@ class TAO_PortableGroup_Export TAO_PG_PropertyManager * interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); @@ -122,14 +120,12 @@ class TAO_PortableGroup_Export TAO_PG_PropertyManager ACE_Null_Mutex> Type_Prop_Table; private: - /// Remove properties "to_be_removed" from the given list of /// properties. void remove_properties (const PortableGroup::Properties & to_be_removed, PortableGroup::Properties &properties); private: - /// Table that maps ObjectId to Object Group related information. TAO_PG_ObjectGroupManager & object_group_manager_; @@ -148,7 +144,6 @@ class TAO_PortableGroup_Export TAO_PG_PropertyManager * @todo Strategize the validator, or use template policies. */ TAO_PG_Default_Property_Validator property_validator_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index bf18a767a8aa3..4554afdc79302 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -164,7 +164,6 @@ void TAO::PG_Property_Set::set_property ( } - void TAO::PG_Property_Set::export_properties(PortableGroup::Properties & property_set) const { ValueMap merged_values; @@ -211,7 +210,6 @@ void TAO::PG_Property_Set::merge_properties (ValueMap & merged_values) const } - int TAO::PG_Property_Set::find ( const ACE_CString & key, const PortableGroup::Value *& pValue) const diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index 9eb1f8647da63..4d51d5451a13d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - class PG_Property_Set; typedef ACE_Refcounted_Auto_Ptr PG_Property_Set_var; @@ -62,11 +61,10 @@ namespace TAO ACE_SYNCH_NULL_MUTEX> ValueMapIterator; public: - /** * constructor: empty set with no defaults. */ - PG_Property_Set (void); + PG_Property_Set (); /** * constructor @@ -149,13 +147,12 @@ namespace TAO //////////////////// // Forbidden methods private: - PG_Property_Set(const PG_Property_Set & rhs); - PG_Property_Set & operator = (const PG_Property_Set & rhs); + PG_Property_Set(const PG_Property_Set & rhs) = delete; + PG_Property_Set & operator = (const PG_Property_Set & rhs) = delete; /////////////// // Data Members private: - /** * Protect internal state. */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h index 728addb72e7a0..c7d4c69625fe6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h @@ -37,8 +37,8 @@ namespace TAO int find (const PG_Property_Set & decoder, const ACE_CString & key, TYPE & value) { int result = 0; - const PortableGroup::Value * any = 0; - if ( decoder.find (key, any)) + const PortableGroup::Value * any = nullptr; + if (decoder.find (key, any)) { result = ((*any) >>= value); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h index 5df8e585c27b7..c4d6577eabc14 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -46,7 +46,6 @@ namespace TAO_PG TAO_PortableGroup_Export void override_properties ( const PortableGroup::Properties & overrides, PortableGroup::Properties &properties); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp index 80a0e8106a790..a30099fa6c7c4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp @@ -3,10 +3,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher () -{ -} - TAO_Root_POA * TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, PortableServer::POAManager_ptr poa_manager, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h index 21dd42c133dd7..01b36d080afc3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h @@ -33,7 +33,7 @@ class TAO_PortableGroup_Export TAO_PG_Servant_Dispatcher : public TAO_Servant_Dispatcher { public: - virtual ~TAO_PG_Servant_Dispatcher (void); + virtual ~TAO_PG_Servant_Dispatcher () = default; /// Pre_invoke remote request. void pre_invoke_remote_request (TAO_Root_POA &poa, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp index 4d365eb44e124..698b3ae661f34 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp @@ -52,7 +52,6 @@ namespace TAO i != 0; i = i->cont ()) { - ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); buf += i->length (); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h index 8a948085fef78..2bcd35e02b87b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h @@ -32,8 +32,7 @@ namespace TAO */ class TAO_PortableGroup_Export PG_Utils { - public: - + public: /// Set tagged component for the object group static CORBA::Boolean set_tagged_component ( PortableGroup::ObjectGroup *ior, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index 8b73a3b75d4de..0fd9d95ce5d85 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -12,14 +12,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry () -{ -} - TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry () { // Free the memory for the endpoints. - Entry *entry; + Entry *entry = nullptr; Acceptor_Registry_Iterator iter (this->registry_); while (iter.next (entry)) @@ -30,12 +26,11 @@ TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry () } } - void TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile, TAO_ORB_Core &orb_core) { - Entry *entry; + Entry *entry = nullptr; if (this->find (profile, entry) == 1) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h index 81e171a7f58e2..481d154b35310 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h @@ -45,7 +45,6 @@ namespace CORBA class TAO_PortableGroup_Export TAO_PortableGroup_Acceptor_Registry { public: - /** * @struct Entry * @@ -64,22 +63,21 @@ class TAO_PortableGroup_Export TAO_PortableGroup_Acceptor_Registry }; /// Default constructor. - TAO_PortableGroup_Acceptor_Registry (void); + TAO_PortableGroup_Acceptor_Registry () = default; /// Default destructor. - ~TAO_PortableGroup_Acceptor_Registry (void); + ~TAO_PortableGroup_Acceptor_Registry (); /// Open an acceptor based on a tagged profile. void open (const TAO_Profile* profile, TAO_ORB_Core &orb_core); /// Close all open acceptors. - int close_all (void); + int close_all (); typedef ACE_Unbounded_Queue Acceptor_Registry; typedef ACE_Unbounded_Queue_Iterator Acceptor_Registry_Iterator; protected: - /// Helper function to open a group acceptor. void open_i (const TAO_Profile* profile, TAO_ORB_Core &orb_core, @@ -90,7 +88,6 @@ class TAO_PortableGroup_Export TAO_PortableGroup_Acceptor_Registry Entry *&entry); private: - // The acceptor registry should not be copied. TAO_PortableGroup_Acceptor_Registry ( const TAO_PortableGroup_Acceptor_Registry&); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h index fc8c91bc8838e..000541022075a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h @@ -42,13 +42,13 @@ class TAO_PortableGroup_Export TAO_PortableGroup_Loader { public: /// Constructor. - TAO_PortableGroup_Loader (void); + TAO_PortableGroup_Loader (); /// Initialize the PortableGroup loader hooks. virtual int init (int argc, ACE_TCHAR *[]); /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index 3cd596fe5f1a0..996bb70da88fd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -38,10 +38,9 @@ class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); + void pre_init (PortableInterceptor::ORBInitInfo_ptr info) override; + void post_init (PortableInterceptor::ORBInitInfo_ptr info) override; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp index 4e2c4c5dfe6c1..fe0b73857d354 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp @@ -7,10 +7,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher () -{ -} - void PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, TAO_ServerRequest &request, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h index 2b8e1988ef066..4b1c3ad9cec1d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h @@ -38,25 +38,22 @@ class TAO_PortableGroup_Export PortableGroup_Request_Dispatcher friend class TAO_GOA; public: - /// Destructor. - virtual ~PortableGroup_Request_Dispatcher (void); + ~PortableGroup_Request_Dispatcher () override = default; /** * Dispatch a request. */ - virtual void dispatch (TAO_ORB_Core *orb_core, - TAO_ServerRequest &request, - CORBA::Object_out forward_to); + void dispatch (TAO_ORB_Core *orb_core, + TAO_ServerRequest &request, + CORBA::Object_out forward_to) override; private: - /// Hash map containing the GroupId->ObjectKey mappings. TAO_Portable_Group_Map group_map_; /// Registry for all of the group (multicast) acceptors. TAO_PortableGroup_Acceptor_Registry acceptor_registry_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index 8d40234ec16ff..3aaf30692958c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -5,11 +5,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -/// Constructor. -TAO_Portable_Group_Map::TAO_Portable_Group_Map () -{ -} - /// Destructor. TAO_Portable_Group_Map::~TAO_Portable_Group_Map () { @@ -36,8 +31,7 @@ TAO_Portable_Group_Map::~TAO_Portable_Group_Map () void TAO_Portable_Group_Map::add_groupid_objectkey_pair ( PortableGroup::TagGroupTaggedComponent *group_id, - const TAO::ObjectKey &key - ) + const TAO::ObjectKey &key) { ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index ce80324fe64bf..7831a49f79f1e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -40,7 +40,6 @@ class TAO_ServerRequest; class TAO_PortableGroup_Export TAO_GroupId_Hash { public: - /// Returns hash value. u_long operator () (const PortableGroup::TagGroupTaggedComponent *id) const; }; @@ -55,7 +54,6 @@ class TAO_PortableGroup_Export TAO_GroupId_Hash class TAO_PortableGroup_Export TAO_GroupId_Equal_To { public: - /// Returns 1 if equal. int operator () (const PortableGroup::TagGroupTaggedComponent *lhs, const PortableGroup::TagGroupTaggedComponent *rhs) const; @@ -69,7 +67,6 @@ class TAO_PortableGroup_Export TAO_GroupId_Equal_To class TAO_PortableGroup_Export TAO_Portable_Group_Map { public: - /** * @struct Map_Entry * @@ -85,10 +82,10 @@ class TAO_PortableGroup_Export TAO_Portable_Group_Map }; /// Constructor. - TAO_Portable_Group_Map (); + TAO_Portable_Group_Map () = default; /// Destructor. - ~TAO_Portable_Group_Map (void); + ~TAO_Portable_Group_Map (); /// Add a GroupId->ObjectKey mapping to the map. /// This function takes ownership of the memory pointed to be group_id diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/README b/TAO/orbsvcs/orbsvcs/PortableGroup/README index df4f8896fc3c3..652fdc2efd824 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/README +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/README @@ -1,11 +1,9 @@ - - This directory contains an implementation of the MIOP specification for TAO. This currently includes: - . The UIPMC (Unreliable IP multicast) Pluggable Protocol - . The PortableGroup extensions to the POA - . Request dispatch hooks to TAO to dispatch based on GroupID +. The UIPMC (Unreliable IP multicast) Pluggable Protocol +. The PortableGroup extensions to the POA +. Request dispatch hooks to TAO to dispatch based on GroupID For examples on how to use MIOP, see $TAO_ROOT/orbsvcs/tests/Miop. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h index da7ae5f6567af..5ab7b942067c2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h @@ -50,14 +50,14 @@ class TAO_PortableGroup_Export TAO_UIPMC_Acceptor : public TAO_Acceptor const char *listener_interfaces); /// Destructor. - ~TAO_UIPMC_Acceptor (void); + ~TAO_UIPMC_Acceptor (); /// @@ Helper method for the implementation repository, should go /// away const ACE_INET_Addr& address () const; /// Returns the array of endpoints in this acceptor - const ACE_INET_Addr *endpoints (void); + const ACE_INET_Addr *endpoints (); /** * The TAO_Acceptor methods, check the documentation in @@ -74,12 +74,12 @@ class TAO_PortableGroup_Export TAO_UIPMC_Acceptor : public TAO_Acceptor int version_major, int version_minor, const char *options = 0); - virtual int close (void); + virtual int close (); virtual int create_profile (const TAO::ObjectKey &object_key, TAO_MProfile &mprofile, CORBA::Short priority); virtual int is_collocated (const TAO_Endpoint *endpoint); - virtual CORBA::ULong endpoint_count (void); + virtual CORBA::ULong endpoint_count (); virtual int object_key (IOP::TaggedProfile &profile, TAO::ObjectKey &key); @@ -104,7 +104,6 @@ class TAO_PortableGroup_Export TAO_UIPMC_Acceptor : public TAO_Acceptor char *&host); protected: - /** * Implement the common part of the open*() methods. This method is * virtual to allow a derived class implementation to be invoked diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl index 9ecf57d37c764..bc609a306467c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl @@ -16,7 +16,7 @@ TAO_UIPMC_Acceptor::address () const } ACE_INLINE const ACE_INET_Addr * -TAO_UIPMC_Acceptor::endpoints (void) +TAO_UIPMC_Acceptor::endpoints () { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h index a0992d8de03ff..b95a2407a90e5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h @@ -50,9 +50,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : public TAO_UIPMC_SVC_HANDLER, public TAO_Connection_Handler { - public: - TAO_UIPMC_Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. arg parameter is used by the Acceptor to pass the @@ -61,7 +59,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : /// Destructor. - ~TAO_UIPMC_Connection_Handler (void); + ~TAO_UIPMC_Connection_Handler (); //@{ /** @name Connection Handler overloads @@ -76,8 +74,8 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : //@{ /** @name Event Handler overloads */ - virtual int resume_handler (void); - virtual int close_connection (void); + virtual int resume_handler (); + virtual int close_connection (); virtual int handle_input (ACE_HANDLE); virtual int handle_output (ACE_HANDLE); virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); @@ -87,7 +85,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : //@} /// Add ourselves to Cache. - int add_transport_to_cache (void); + int add_transport_to_cache (); /// Set Diff-Serv codepoint on outgoing packets. int set_dscp_codepoint (CORBA::Boolean set_network_priority); @@ -106,7 +104,6 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : // UIPMC Additions - End protected: - // UIPMC Additions - Begin // This is always the remote address @@ -121,7 +118,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : /** * @name TAO_Connection Handler overloads */ - virtual int release_os_resources (void); + virtual int release_os_resources (); virtual int handle_write_ready (const ACE_Time_Value *timeout); //@} @@ -130,7 +127,6 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : int set_tos (int tos); private: - /// Stores the type of service value. int dscp_codepoint_; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 7dfe87e1e9568..4190aed901005 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -21,10 +21,6 @@ TAO_UIPMC_Connector::TAO_UIPMC_Connector () { } -TAO_UIPMC_Connector::~TAO_UIPMC_Connector () -{ -} - int TAO_UIPMC_Connector::open (TAO_ORB_Core *orb_core) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index 5b2371230eab6..d3cb494798399 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -40,15 +40,15 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connector : public TAO_Connector { public: /// Constructor. - TAO_UIPMC_Connector (void); + TAO_UIPMC_Connector (); /// Destructor. - ~TAO_UIPMC_Connector (void); + ~TAO_UIPMC_Connector () = default; // = The TAO_Connector methods, please check the documentation on // Transport_Connector.h int open (TAO_ORB_Core *orb_core); - int close (void); + int close (); TAO_Profile *create_profile (TAO_InputCDR& cdr); virtual int check_prefix (const char *endpoint); @@ -64,7 +64,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connector : public TAO_Connector TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout = 0); - virtual TAO_Profile * make_profile (void); + virtual TAO_Profile * make_profile (); /// Cancel the passed cvs handler from the connector virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp index 24d0573bb7d4c..be41a60928022 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp @@ -9,6 +9,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" +#include #if !defined (__ACE_INLINE__) # include "orbsvcs/PortableGroup/UIPMC_Endpoint.inl" @@ -25,7 +26,6 @@ TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint () next_ (0), preferred_if_() { - this->uint_ip_addr (0u); } TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (const ACE_INET_Addr &addr) @@ -40,21 +40,6 @@ TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (const ACE_INET_Addr &addr) this->object_addr (addr); } -// Use of this ctr must be avoided -TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (const CORBA::Octet class_d_address[4], - CORBA::UShort port) - : TAO_Endpoint (IOP::TAG_UIPMC), - port_ (port), - preferred_path_ (), - next_ (0), - preferred_if_() -{ - for (int i = 0; i<4; i++) - this->class_d_address_[i] = class_d_address[i]; - - this->update_object_addr (); -} - TAO_UIPMC_Endpoint::~TAO_UIPMC_Endpoint () { delete this->next_; @@ -68,7 +53,6 @@ TAO_UIPMC_Endpoint::object_addr (const ACE_INET_Addr &addr) addr.get_host_addr (tmp, sizeof tmp); this->host_ = CORBA::string_dup (tmp); this->object_addr_.set (addr); - this->uint_ip_addr (addr.get_ip_address ()); } const char * @@ -120,11 +104,11 @@ TAO_UIPMC_Endpoint::next () TAO_Endpoint * TAO_UIPMC_Endpoint::duplicate () { - TAO_UIPMC_Endpoint *endpoint = 0; + TAO_UIPMC_Endpoint *endpoint = nullptr; ACE_NEW_RETURN (endpoint, TAO_UIPMC_Endpoint (this->object_addr_), - 0); + nullptr); return endpoint; } @@ -135,12 +119,12 @@ TAO_UIPMC_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) const TAO_UIPMC_Endpoint *endpoint = dynamic_cast (other_endpoint); - if (endpoint == 0) - return 0; + if (endpoint == nullptr) + return false; return (this->port_ == endpoint->port_ - && ACE_OS::strcmp (this->host (), endpoint->host ()) == 0); + && std::strcmp (this->host (), endpoint->host ()) == 0); } CORBA::ULong @@ -183,31 +167,29 @@ TAO_UIPMC_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) && this->object_addr_.get_type () == AF_INET6) { latest->preferred_if_ = CORBA::string_dup (preferred[i].c_str() + 3); - latest->preferred_path_.host = (const char *) 0; + latest->preferred_path_.host = static_cast (0); if (TAO_debug_level > 3) ORBSVCS_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - TAO_UIPMC_Endpoint::preferred_interfaces, setting network interface name <%s>" - " as preferred path for [%s] \n", + "TAO (%P|%t) - TAO_UIPMC_Endpoint::preferred_interfaces, setting network interface name <%C>" + " as preferred path for [%C] \n", latest->preferred_if_.in(), this->host_.in ())); } else #endif /* ACE_HAS_IPV6 */ { - latest->preferred_path_.host = - CORBA::string_dup (preferred[i].c_str()); + latest->preferred_path_.host = CORBA::string_dup (preferred[i].c_str()); if (TAO_debug_level > 3) ORBSVCS_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - TAO_UIPMC_Endpoint::preferred_interfaces, adding path [%s]" - " as preferred local address for [%s] \n", + "TAO (%P|%t) - TAO_UIPMC_Endpoint::preferred_interfaces, adding path [%C]" + " as preferred local address for [%C] \n", latest->preferred_path_.host.in(), this->host_.in ())); } ++i; if (i < count) { - TAO_Endpoint *tmp_ep = - latest->duplicate (); + TAO_Endpoint *tmp_ep = latest->duplicate (); latest->next_ = dynamic_cast (tmp_ep); if (!latest->next_) { @@ -223,8 +205,7 @@ TAO_UIPMC_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) !oc->orb_params ()->enforce_pref_interfaces ()) { TAO_Endpoint *tmp_ep = latest->duplicate (); - latest->next_ = - dynamic_cast (tmp_ep); + latest->next_ = dynamic_cast (tmp_ep); if (!latest->next_) { delete tmp_ep; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h index 81aab15f534d6..81e57b96ceb8f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h @@ -40,33 +40,29 @@ class TAO_PortableGroup_Export TAO_UIPMC_Endpoint : public TAO_Endpoint { public: /// Default constructor. - TAO_UIPMC_Endpoint (void); + TAO_UIPMC_Endpoint (); /// Constructor. TAO_UIPMC_Endpoint (const ACE_INET_Addr &addr); - /// Constructor. @@ Frank - deprecate this. - TAO_UIPMC_Endpoint (const CORBA::Octet class_d_address[4], - CORBA::UShort port); - /// Destructor. - ~TAO_UIPMC_Endpoint (void); + ~TAO_UIPMC_Endpoint (); // = Implementation of abstract TAO_Endpoint methods. See // Endpoint.h for their documentation. - virtual TAO_Endpoint *next (void); + virtual TAO_Endpoint *next (); virtual int addr_to_string (char *buffer, size_t length); /// Makes a copy of this TAO_Endpoint. - virtual TAO_Endpoint *duplicate (void); + virtual TAO_Endpoint *duplicate (); /// Return true if this endpoint is equivalent to @a other_endpoint. Two /// endpoints are equivalent if their port and host are the same. CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint); /// Return a hash value for this object. - CORBA::ULong hash (void); + CORBA::ULong hash (); // Allocates memory and returns a copy of @@ -88,7 +84,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Endpoint : public TAO_Endpoint /// Set the port number. CORBA::UShort port (CORBA::UShort p); //@@ Frank - deprecate this. - //TAO_UIPMC_Connection_Handler *&hint (void); + //TAO_UIPMC_Connection_Handler *&hint (); // Access to our . /// Do we have a preferred local network interface set for this target? bool is_preferred_network () const; @@ -105,17 +101,6 @@ class TAO_PortableGroup_Export TAO_UIPMC_Endpoint : public TAO_Endpoint const char *preferred_if () const; private: - - /// Helper methods for getting and setting the IP address. @@ Vadym - deprecate these. - ACE_UINT32 uint_ip_addr () const; - void uint_ip_addr (ACE_UINT32 ip_addr); - - /// Helper method to update the cached object address. @@ Vadym - deprecate this. - void update_object_addr (void); - - /// IP Multicast address. @@ Frank - deprecate this. - CORBA::Octet class_d_address_[4]; - /// String representing the host address. CORBA::String_var host_; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl index d44dee9b2fc79..e931de0314c50 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl @@ -7,7 +7,6 @@ TAO_UIPMC_Endpoint::object_addr () const return this->object_addr_; } - ACE_INLINE CORBA::UShort TAO_UIPMC_Endpoint::port () const { @@ -20,33 +19,6 @@ TAO_UIPMC_Endpoint::port (CORBA::UShort p) return this->port_ = p; } - -ACE_INLINE ACE_UINT32 -TAO_UIPMC_Endpoint::uint_ip_addr () const -{ - return (((ACE_UINT32)this->class_d_address_[0] << 24) | - ((ACE_UINT32)this->class_d_address_[1] << 16) | - ((ACE_UINT32)this->class_d_address_[2] << 8) | - ((ACE_UINT32)this->class_d_address_[3])); -} - -ACE_INLINE void -TAO_UIPMC_Endpoint::uint_ip_addr (ACE_UINT32 ip_addr) -{ - this->class_d_address_[0] = (CORBA::Char)(ip_addr >> 24); - this->class_d_address_[1] = (CORBA::Char)((ip_addr >> 16) & 0xff); - this->class_d_address_[2] = (CORBA::Char)((ip_addr >> 8) & 0xff); - this->class_d_address_[3] = (CORBA::Char)(ip_addr & 0xff); -} - -ACE_INLINE void -TAO_UIPMC_Endpoint::update_object_addr (void) -{ - this->object_addr_.set (this->port_, - this->uint_ip_addr ()); -} - - ACE_INLINE const char* TAO_UIPMC_Endpoint::preferred_if () const { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp index a520483be08c2..4b257e5675160 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -21,10 +21,6 @@ TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory () { } -TAO_UIPMC_Protocol_Factory::~TAO_UIPMC_Protocol_Factory () -{ -} - int TAO_UIPMC_Protocol_Factory::match_prefix (const ACE_CString &prefix) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h index aa6b81270987e..56e62305d6ca6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h @@ -31,8 +31,8 @@ class TAO_Connector; class TAO_PortableGroup_Export TAO_UIPMC_Protocol_Factory : public TAO_Protocol_Factory { public: - TAO_UIPMC_Protocol_Factory (void); - virtual ~TAO_UIPMC_Protocol_Factory (void); + TAO_UIPMC_Protocol_Factory (); + virtual ~TAO_UIPMC_Protocol_Factory () = default; // = Service Configurator hooks. /// Dynamic linking hook @@ -49,8 +49,8 @@ class TAO_PortableGroup_Export TAO_UIPMC_Protocol_Factory : public TAO_Protocol_ virtual char options_delimiter () const; // = Check Protocol_Factory.h for a description of these methods. - virtual TAO_Acceptor *make_acceptor (void); - virtual TAO_Connector *make_connector (void); + virtual TAO_Acceptor *make_acceptor (); + virtual TAO_Connector *make_connector (); virtual int requires_explicit_endpoint () const; private: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h index 6f5cdb32aa67f..149e933831fc3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h @@ -58,7 +58,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Mcast_Connection_Handler : TAO_UIPMC_Mcast_Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. - ~TAO_UIPMC_Mcast_Connection_Handler (void); + ~TAO_UIPMC_Mcast_Connection_Handler (); //@{ /** @name Connection Handler overloads @@ -73,8 +73,8 @@ class TAO_PortableGroup_Export TAO_UIPMC_Mcast_Connection_Handler : //@{ /** @name Event Handler overloads */ - virtual int resume_handler (void); - virtual int close_connection (void); + virtual int resume_handler (); + virtual int close_connection (); virtual int handle_input (ACE_HANDLE); virtual int handle_output (ACE_HANDLE); virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); @@ -84,7 +84,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Mcast_Connection_Handler : //@} /// Add ourselves to Cache. - int add_transport_to_cache (void); + int add_transport_to_cache (); // UIPMC Additions - Begin const ACE_INET_Addr &addr () const; @@ -120,7 +120,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Mcast_Connection_Handler : /** * @name TAO_Connection Handler overloads */ - virtual int release_os_resources (void); + virtual int release_os_resources (); virtual int handle_write_ready (const ACE_Time_Value *timeout); //@} }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h index 5a2236c3e1d6e..8c0a23f208692 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h @@ -57,7 +57,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Mcast_Transport : public TAO_Transport TAO_ORB_Core *orb_core); /// Default destructor. - ~TAO_UIPMC_Mcast_Transport (void); + ~TAO_UIPMC_Mcast_Transport (); /// Look for the documentation in Transport.h. virtual int handle_input (TAO_Resume_Handle &rh, @@ -69,8 +69,8 @@ class TAO_PortableGroup_Export TAO_UIPMC_Mcast_Transport : public TAO_Transport * These are implementations of template methods declared by TAO_Transport. */ //@{ - virtual ACE_Event_Handler *event_handler_i (void); - virtual TAO_Connection_Handler *connection_handler_i (void); + virtual ACE_Event_Handler *event_handler_i (); + virtual TAO_Connection_Handler *connection_handler_i (); /// Write the complete Message_Block chain to the connection. /// Shouldn't ever be called on the server side. @@ -84,7 +84,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Mcast_Transport : public TAO_Transport size_t, ACE_Time_Value const *); - virtual int register_handler (void); + virtual int register_handler (); public: /// @@TODO: These methods IMHO should have more meaningful diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 3724b0ab006c5..1f6b612aaeb46 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -65,30 +65,6 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const ACE_INET_Addr &addr, this->addressing_mode_ = default_addressing_mode_; } -TAO_UIPMC_Profile::TAO_UIPMC_Profile (const CORBA::Octet class_d_address[4], - CORBA::UShort port, - TAO_ORB_Core *orb_core) - : TAO_Profile (IOP::TAG_UIPMC, - orb_core, - TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, - TAO_DEF_GIOP_MINOR)) - , endpoint_ (class_d_address, port) - , tagged_profile_ () - , group_id_ (0) - , ref_version_ (0) - , has_ref_version_ (false) -{ - // The default for component version is 1.0. - this->component_version_.major = 1; - this->component_version_.minor = 0; - - this->addressing_mode_ = default_addressing_mode_; -} - -TAO_UIPMC_Profile::~TAO_UIPMC_Profile () -{ -} - int TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index d15514aa6bdac..5556e6073b2f5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -54,7 +54,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Profile : public TAO_Profile virtual char object_key_delimiter () const; /// Return the char string prefix. - static const char *prefix (void); + static const char *prefix (); /// Profile constructor, default. Used when the profile contents /// are not yet known or when it is being decoded from an IOR. @@ -65,13 +65,8 @@ class TAO_PortableGroup_Export TAO_UIPMC_Profile : public TAO_Profile TAO_UIPMC_Profile (const ACE_INET_Addr &addr, TAO_ORB_Core *orb_core); - /// Profile constructor. @@ Vadym - deprecate this. - TAO_UIPMC_Profile (const CORBA::Octet class_d_address[4], - CORBA::UShort port, - TAO_ORB_Core *orb_core); - /// Destructor is to be called only through _decr_refcnt. - ~TAO_UIPMC_Profile (void); + ~TAO_UIPMC_Profile () = default; /// Template methods. Please see tao/Profile.h for documentation. @@ -81,12 +76,12 @@ class TAO_PortableGroup_Export TAO_UIPMC_Profile : public TAO_Profile virtual int decode (TAO_InputCDR &cdr); virtual void parse_string (const char *string); virtual char * to_string () const; - virtual int encode_endpoints (void); + virtual int encode_endpoints (); virtual void encodeAddressInfo (TAO_OutputCDR &stream) const; - virtual TAO_Endpoint *endpoint (void); + virtual TAO_Endpoint *endpoint (); virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); - virtual IOP::TaggedProfile &create_tagged_profile (void); + virtual IOP::TaggedProfile &create_tagged_profile (); virtual void request_target_specifier ( TAO_Target_Specification &target_spec, TAO_Target_Specification::TAO_Target_Address r); @@ -104,11 +99,11 @@ class TAO_PortableGroup_Export TAO_UIPMC_Profile : public TAO_Profile protected: /// Template methods, please see documentation in tao/Profile.h virtual int decode_profile (TAO_InputCDR& cdr); - virtual int decode_endpoints (void); + virtual int decode_endpoints (); virtual void parse_string_i (const char *); virtual void create_profile_body (TAO_OutputCDR &cdr) const; virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); - virtual void update_cached_group_component (void); + virtual void update_cached_group_component (); protected: /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index d7a8006d3dfd8..6f226adc68ca6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -35,10 +35,6 @@ TAO_UIPMC_Transport::TAO_UIPMC_Transport ( this->uuid_hash_ = uuid.to_string ()->hash (); } -TAO_UIPMC_Transport::~TAO_UIPMC_Transport () -{ -} - ACE_Event_Handler * TAO_UIPMC_Transport::event_handler_i () { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h index b24819232382d..04d2ca0309283 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h @@ -44,7 +44,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Transport : public TAO_Transport TAO_ORB_Core *orb_core); /// Default destructor. - ~TAO_UIPMC_Transport (void); + ~TAO_UIPMC_Transport () = default; protected: /** @name Overridden Template Methods @@ -52,9 +52,8 @@ class TAO_PortableGroup_Export TAO_UIPMC_Transport : public TAO_Transport * These are implementations of template methods declared by TAO_Transport. */ //@{ - - virtual ACE_Event_Handler *event_handler_i (void); - virtual TAO_Connection_Handler *connection_handler_i (void); + virtual ACE_Event_Handler *event_handler_i (); + virtual TAO_Connection_Handler *connection_handler_i (); /// Write the complete Message_Block chain to the connection. virtual ssize_t send (iovec *iov, int iovcnt, @@ -66,7 +65,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Transport : public TAO_Transport size_t len, ACE_Time_Value const *s = 0); - virtual int register_handler (void); + virtual int register_handler (); public: /// @@TODO: These methods IMHO should have more meaningful diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp index c0d9b19aa45bb..b6a253e0096ce 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp @@ -8,7 +8,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_PG { - UIPMC_Recv_Packet_Cleanup_Guard::UIPMC_Recv_Packet_Cleanup_Guard ( TAO_UIPMC_Mcast_Transport *transport ) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h index 821082e9cda99..b796f6b7c3d39 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h @@ -26,7 +26,6 @@ class TAO_UIPMC_Mcast_Transport; namespace TAO_PG { - /** * @class UIPMC_Recv_Packet_Cleanup_Guard * @@ -37,7 +36,7 @@ namespace TAO_PG public: UIPMC_Recv_Packet_Cleanup_Guard (TAO_UIPMC_Mcast_Transport *transport); - ~UIPMC_Recv_Packet_Cleanup_Guard (void); + ~UIPMC_Recv_Packet_Cleanup_Guard (); private: TAO_UIPMC_Mcast_Transport *transport_; @@ -52,9 +51,9 @@ namespace TAO_PG { public: /// Constructs a new recv packet. - UIPMC_Recv_Packet (void); + UIPMC_Recv_Packet (); - ~UIPMC_Recv_Packet (void); + ~UIPMC_Recv_Packet (); /// Adds a new fragment to the packet and if it fails marks the packet /// as broken. @@ -97,7 +96,6 @@ namespace TAO_PG ACE_SYNCH_NULL_MUTEX> Fragments_Map; Fragments_Map fragments_; }; - } // namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp index 1c6f19f8f9817..6fd7e787584a1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp @@ -10,10 +10,6 @@ TAO_UIPMC_Wait_Never::TAO_UIPMC_Wait_Never (TAO_Transport *transport) { } -TAO_UIPMC_Wait_Never::~TAO_UIPMC_Wait_Never () -{ -} - int TAO_UIPMC_Wait_Never::register_handler () { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h index 8d5624add137f..df8a1b39bd5b0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h @@ -31,22 +31,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_PortableGroup_Export TAO_UIPMC_Wait_Never : public TAO_Wait_Strategy { - public: - /// Constructor. TAO_UIPMC_Wait_Never (TAO_Transport *transport); - - /// Destructor. - virtual ~TAO_UIPMC_Wait_Never (void); + ~TAO_UIPMC_Wait_Never () override = default; // = Documented in TAO_Wait_Strategy. - virtual int sending_request (TAO_ORB_Core *orb_core, - TAO_Message_Semantics msg_semantics); - virtual int wait (ACE_Time_Value *max_wait_time, - TAO_Synch_Reply_Dispatcher &rd); - virtual int register_handler (void); - virtual bool non_blocking () const; - virtual bool can_process_upcalls () const; + int sending_request (TAO_ORB_Core *orb_core, + TAO_Message_Semantics msg_semantics) override; + int wait (ACE_Time_Value *max_wait_time, + TAO_Synch_Reply_Dispatcher &rd) override; + int register_handler () override; + bool non_blocking () const override; + bool can_process_upcalls () const override; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h index ed8084de762c4..3f74cdeb86a81 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h @@ -48,12 +48,11 @@ class TAO_PortableGroup_Export TAO_MIOP_Resource_Factory : public ACE_Service_Object { public: - /// Constructor. - TAO_MIOP_Resource_Factory (void); + TAO_MIOP_Resource_Factory (); /// Destructor. - virtual ~TAO_MIOP_Resource_Factory (void); + virtual ~TAO_MIOP_Resource_Factory (); /** * @name Service Configurator Hooks diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index dacf841dea07e..44597e3f6006e 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -15,7 +15,6 @@ #include "ace/OS_NS_string.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // = Methods to deal with ACE_Hash_Map_Manager. @@ -491,7 +490,6 @@ TAO_PropertySet::define_property (const char *property_name, CORBA::Boolean TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) { - // If the sequence is empty, no constraints. if (this->allowed_property_types_.length () == 0) return 1; diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index e057cbf5925e8..f96232753fe6b 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -42,7 +42,7 @@ class TAO_Property_Serv_Export CosProperty_Hash_Key // Key for the Hash Table. The EXT_ID of the // ACE_Hash_Map_Manager. public: - CosProperty_Hash_Key (void); + CosProperty_Hash_Key (); // Default constructor. CosProperty_Hash_Key (const char * &name); @@ -54,7 +54,7 @@ class TAO_Property_Serv_Export CosProperty_Hash_Key CosProperty_Hash_Key (const CosProperty_Hash_Key &hash_key); // Copy constructor. - virtual ~CosProperty_Hash_Key (void); + virtual ~CosProperty_Hash_Key (); // Destructor. virtual bool operator == (const CosProperty_Hash_Key &hash_key) const; @@ -64,7 +64,6 @@ class TAO_Property_Serv_Export CosProperty_Hash_Key // The function that computes a hash value. // private: - CosPropertyService::PropertyName_var pname_; // Storage pointer. }; @@ -75,7 +74,7 @@ class TAO_Property_Serv_Export CosProperty_Hash_Value // This will be the value part in the Hash_Table. The INT_ID of // the ACE_Hash_Map_Manager. public: - CosProperty_Hash_Value (void); + CosProperty_Hash_Value (); // Default constructor. CosProperty_Hash_Value (const CORBA::Any &any, @@ -85,11 +84,10 @@ class TAO_Property_Serv_Export CosProperty_Hash_Value CosProperty_Hash_Value (const CosProperty_Hash_Value &hash_value); // Copy constructor. - virtual ~CosProperty_Hash_Value (void); + virtual ~CosProperty_Hash_Value (); // Destructor. //private: - CORBA::Any pvalue_; // property value. @@ -112,14 +110,14 @@ class TAO_Property_Serv_Export TAO_PropertySetFactory : public virtual POA_CosP // = DESCRIPTION // The object may be created with some predfined properties. public: - TAO_PropertySetFactory (void); + TAO_PropertySetFactory (); // Constructor. - virtual ~TAO_PropertySetFactory (void); + virtual ~TAO_PropertySetFactory (); // Destructor. virtual CosPropertyService::PropertySet_ptr - create_propertyset (void); + create_propertyset (); // Returns a new TAO_PropertySet object. "The property set returned // will *not* have any initial properties." @@ -156,14 +154,14 @@ class TAO_Property_Serv_Export TAO_PropertySetDefFactory : public virtual POA_Co // = DESCRIPTION // The object creation may be done with some predefined properties. public: - TAO_PropertySetDefFactory(void); + TAO_PropertySetDefFactory(); // Constructor. - virtual ~TAO_PropertySetDefFactory (void); + virtual ~TAO_PropertySetDefFactory (); // Destructor. virtual CosPropertyService::PropertySetDef_ptr - create_propertysetdef (void); + create_propertysetdef (); // Returns a new TAO_PropertySetDef object. virtual CosPropertyService::PropertySetDef_ptr @@ -198,7 +196,7 @@ class TAO_Property_Serv_Export TAO_PropertySet : public virtual POA_CosProperty friend class TAO_PropertiesIterator; /// Default constructor. - TAO_PropertySet (void); + TAO_PropertySet (); TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, const CosPropertyService::Properties allowed_properties); @@ -211,7 +209,7 @@ class TAO_Property_Serv_Export TAO_PropertySet : public virtual POA_CosProperty const CORBA::ULong number_of_allowed_propertydefs); // PropertySetDef's construction needs this. - virtual ~TAO_PropertySet (void); + virtual ~TAO_PropertySet (); // Destructor function. virtual void define_property (const char *property_name, @@ -223,7 +221,7 @@ class TAO_Property_Serv_Export TAO_PropertySet : public virtual POA_CosProperty virtual void define_properties (const CosPropertyService::Properties &nproperties); // Define a sequence of properties at a time. - virtual CORBA::ULong get_number_of_properties (void); + virtual CORBA::ULong get_number_of_properties (); // Get the number of properties that are currently defined in the // PropertySet. @@ -253,7 +251,7 @@ class TAO_Property_Serv_Export TAO_PropertySet : public virtual POA_CosProperty virtual void delete_properties (const CosPropertyService::PropertyNames &property_names); // Delete all the these properties from this property set. - virtual CORBA::Boolean delete_all_properties (void); + virtual CORBA::Boolean delete_all_properties (); // Delete everything from this property set. virtual CORBA::Boolean is_property_defined (const char *property_name); @@ -318,7 +316,7 @@ class TAO_Property_Serv_Export TAO_PropertySetDef : public virtual POA_CosProper // provide more client access and control of the characteristics // (metadata) of a PropertySet. public: - TAO_PropertySetDef (void); + TAO_PropertySetDef (); // Constructor. TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types, @@ -328,7 +326,7 @@ class TAO_Property_Serv_Export TAO_PropertySetDef : public virtual POA_CosProper TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs); // This is also for the factory. - virtual ~TAO_PropertySetDef (void); + virtual ~TAO_PropertySetDef (); // Destructor. virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types); @@ -411,10 +409,10 @@ class TAO_Property_Serv_Export TAO_PropertyNamesIterator TAO_PropertyNamesIterator (TAO_PropertySet &property_set); // Constructor. - virtual ~TAO_PropertyNamesIterator (void); + virtual ~TAO_PropertyNamesIterator (); // Destructor. - virtual void reset (void); + virtual void reset (); // The reset operation resets the position in an iterator to the // first property name, if one exists. @@ -432,7 +430,7 @@ class TAO_Property_Serv_Export TAO_PropertyNamesIterator // with at most the how_many number of names. A return of false // signifies no more items in the iterator. - virtual void destroy (void); + virtual void destroy (); // Destroys the iterator. private: typedef ACE_Hash_Map_Manager @@ -467,10 +465,10 @@ class TAO_Property_Serv_Export TAO_PropertiesIterator TAO_PropertiesIterator (TAO_PropertySet &property_set); // Constructor. - virtual ~TAO_PropertiesIterator (void); + virtual ~TAO_PropertiesIterator (); // Destructor. - virtual void reset (void); + virtual void reset (); // Resets the position in an iterator to the first property, if one exists. virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty); @@ -487,7 +485,7 @@ class TAO_Property_Serv_Export TAO_PropertiesIterator // at most the how_many number of properties. A return of false // signifies no more items in the iterator. - virtual void destroy (void); + virtual void destroy (); // Destroys the iterator. private: diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index 39f3b8e1dc789..ca57772158a8a 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -175,7 +175,7 @@ class TAO_RTSched_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Sched * of scheduled priorities. All scheduled priorities range from 0 * to the number returned, inclusive. */ - virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void); + virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (); virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h index 7a7e5de736de2..ed17883317878 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h @@ -48,12 +48,12 @@ namespace TAO typedef TAO_Accept_Strategy TAO_IIOP_SSL_ACCEPT_STRATEGY; /// Constructor. - IIOP_SSL_Acceptor (void); + IIOP_SSL_Acceptor (); /// Destructor. - ~IIOP_SSL_Acceptor (void); + ~IIOP_SSL_Acceptor (); - virtual int close (void); + virtual int close (); private: /// The concrete acceptor, as a pointer to it's base class. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index 4c300069df18c..f0a4d3c4b8469 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class IIOP_SSL_Connection_Handler * @@ -47,14 +46,12 @@ namespace TAO class IIOP_SSL_Connection_Handler : public TAO_IIOP_Connection_Handler { public: - /// Constructor. IIOP_SSL_Connection_Handler (ACE_Thread_Manager* t = 0); IIOP_SSL_Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. - ~IIOP_SSL_Connection_Handler (void); - + ~IIOP_SSL_Connection_Handler (); }; // **************************************************************** @@ -78,16 +75,14 @@ namespace TAO class Null_SSL_State_Guard { public: - /// Constructor that sets up the null TSS SSL state. Null_SSL_State_Guard (TAO::SSLIOP::Current_ptr current, int &result); /// Destructor that restores the previous TSS SSL state. - ~Null_SSL_State_Guard (void); + ~Null_SSL_State_Guard (); private: - /// The SSLIOP::Current implementation that was previously /// associated with the current thread and invocation. /** @@ -102,9 +97,7 @@ namespace TAO /// Flag that specifies whether or not setup of the SSLIOP::Current /// object completed for the current thread and invocation. bool setup_done_; - }; - } // End TAO namespace. TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl index 667237bbdacad..c51daa4f59711 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl @@ -20,7 +20,7 @@ TAO::Null_SSL_State_Guard::Null_SSL_State_Guard ( } ACE_INLINE -TAO::Null_SSL_State_Guard::~Null_SSL_State_Guard (void) +TAO::Null_SSL_State_Guard::~Null_SSL_State_Guard () { // Restore the previous TSS SSL state. this->current_->teardown (this->previous_current_impl_, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index 3c06e02904ef2..53aafa75c65e3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -41,18 +41,16 @@ namespace TAO class IIOP_SSL_Connector : public TAO_IIOP_Connector { public: - /// Constructor. - IIOP_SSL_Connector (void); + IIOP_SSL_Connector (); /// Destructor. - ~IIOP_SSL_Connector (void); + ~IIOP_SSL_Connector (); int open (TAO_ORB_Core *orb_core); - int close (void); + int close (); public: - typedef TAO_Connect_Concurrency_Strategy CONNECT_CONCURRENCY_STRATEGY; @@ -68,7 +66,6 @@ namespace TAO BASE_CONNECTOR; protected: - /** * @name The TAO_Connector Methods * @@ -85,14 +82,12 @@ namespace TAO //@} private: - /// Our connect strategy CONNECT_STRATEGY connect_strategy_; /// The connector initiating connection requests for IIOP_SSL. BASE_CONNECTOR base_connector_; }; - } // End TAO namespace. TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h index 1a31541d446e6..9610fc16d8d51 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h @@ -60,7 +60,7 @@ namespace TAO TAO_ORB_Core *orb_core); /// Default destructor. - ~IIOP_SSL_Transport (void); + ~IIOP_SSL_Transport (); /** @name Overridden Template Methods * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h index 996dc77930294..baaa1dd427bbb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h @@ -34,7 +34,6 @@ namespace TAO { namespace SSLIOP { - /** * @class Accept_Strategy * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index 7d212d7f03303..9aec1e2df1fb8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -626,7 +626,6 @@ TAO::SSLIOP::Acceptor::parse_options_i (int &argc, ACE_CString ** argv) for (int j = i; j <= argc-1; j++) argv[j] = argv[j+1]; argv[argc] = temp; - } return 0; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index 6a60f33a322ef..dfa877b7a3b2c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -51,7 +51,7 @@ namespace TAO bool check_host); /// Destructor. - ~Acceptor (void); + ~Acceptor (); typedef TAO_Strategy_Acceptor BASE_ACCEPTOR; typedef TAO_Creation_Strategy CREATION_STRATEGY; @@ -75,7 +75,7 @@ namespace TAO int version_major, int version_minor, const char *options = 0); - virtual int close (void); + virtual int close (); virtual int create_profile (const TAO::ObjectKey &object_key, TAO_MProfile &mprofile, CORBA::Short priority); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h index 73fce84efc9af..0ccf7f7cefaaf 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h @@ -66,7 +66,7 @@ namespace TAO * interface. */ //@{ - virtual char * context_id (void); + virtual char * context_id (); virtual SecurityLevel3::Principal * client_principal (); @@ -82,13 +82,13 @@ namespace TAO virtual SecurityLevel3::OwnCredentials_ptr parent_credentials (); - virtual CORBA::Boolean client_authentication (void); + virtual CORBA::Boolean client_authentication (); - virtual CORBA::Boolean target_authentication (void); + virtual CORBA::Boolean target_authentication (); - virtual CORBA::Boolean confidentiality (void); + virtual CORBA::Boolean confidentiality (); - virtual CORBA::Boolean integrity (void); + virtual CORBA::Boolean integrity (); //@} protected: @@ -97,7 +97,7 @@ namespace TAO * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~ClientCredentials (void); + ~ClientCredentials (); private: /// Reference to the OpenSSL @c SSL data structure associated diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h index 5838e7579f7f2..757f3944cecb9 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h @@ -56,7 +56,7 @@ namespace TAO Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. - ~Connection_Handler (void); + ~Connection_Handler (); /** * @name Connection Handler overloads @@ -74,8 +74,8 @@ namespace TAO //@{ /** @name Event Handler overloads */ - virtual int resume_handler (void); - virtual int close_connection (void); + virtual int resume_handler (); + virtual int close_connection (); virtual int handle_input (ACE_HANDLE); virtual int handle_output (ACE_HANDLE); virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); @@ -85,7 +85,7 @@ namespace TAO //@} /// Add ourselves to cache. - int add_transport_to_cache (void); + int add_transport_to_cache (); /// Process the @a listen_list. int process_listen_point_list (IIOP::ListenPointList &listen_list); @@ -103,14 +103,14 @@ namespace TAO /// Return true if the host name matches the name/domain in the peer /// certificate. - bool check_host (void); + bool check_host (); protected: //@{ /** * @name TAO_Connection Handler overloads */ - virtual int release_os_resources (void); + virtual int release_os_resources (); virtual void pos_io_hook (int & return_value); virtual int handle_write_ready (const ACE_Time_Value *timeout); //@} @@ -146,7 +146,7 @@ namespace TAO int &result); /// Destructor that tears down the TSS SSL state. - ~State_Guard (void); + ~State_Guard (); private: /// Pointer to the connection handler currently handling the diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl index 55ac19b0d06a4..4957a8cf31b39 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl @@ -17,7 +17,7 @@ TAO::SSLIOP::State_Guard::State_Guard ( } ACE_INLINE -TAO::SSLIOP::State_Guard::~State_Guard (void) +TAO::SSLIOP::State_Guard::~State_Guard () { this->handler_->teardown_ssl_state (this->previous_current_impl_, this->setup_done_); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 458198a14c7b1..50a2d07f3fdc9 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -257,7 +257,6 @@ TAO::SSLIOP::Connector::make_secure_profile () } - TAO_Profile * TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint, size_t &len) { @@ -513,13 +512,11 @@ TAO::SSLIOP::Connector::ssliop_connect ( ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect,") ACE_TEXT ("wait for completion failed\n"))); - } } } else { - bool make_new_connection = (found == TAO::Transport_Cache_Manager::CACHE_FOUND_NONE) || (found == TAO::Transport_Cache_Manager::CACHE_FOUND_BUSY @@ -527,7 +524,6 @@ TAO::SSLIOP::Connector::ssliop_connect ( if (make_new_connection) { - if (TAO_debug_level > 4) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ") @@ -764,7 +760,6 @@ TAO::SSLIOP::Connector::ssliop_connect ( } svc_handler_auto_ptr.release (); - } else // not making new connection { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index c553948bbfbb4..89c05b99db50f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -63,7 +63,7 @@ namespace TAO */ //@{ virtual int open (TAO_ORB_Core *orb_core); - virtual int close (void); + virtual int close (); virtual TAO_Transport *connect (TAO::Profile_Transport_Resolver *r, TAO_Transport_Descriptor_Interface *desc, ACE_Time_Value *timeout); @@ -82,12 +82,12 @@ namespace TAO * @see @c TAO_Connector */ //@{ - virtual TAO_Profile * make_profile (void); + virtual TAO_Profile * make_profile (); virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); //@} /// SSL-specific profile - TAO_Profile * make_secure_profile (void); + TAO_Profile * make_secure_profile (); /// IIOP-specific connection establishment. /** diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index d468ae1ac5988..be0e0e189a776 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -72,13 +72,13 @@ namespace TAO * interface. */ //@{ - virtual char * creds_id (void); + virtual char * creds_id (); - virtual SecurityLevel3::CredentialsType creds_type (void) = 0; + virtual SecurityLevel3::CredentialsType creds_type () = 0; virtual SecurityLevel3::CredentialsUsage creds_usage (); - virtual TimeBase::UtcT expiry_time (void); + virtual TimeBase::UtcT expiry_time (); virtual SecurityLevel3::CredentialsState creds_state (); @@ -95,7 +95,7 @@ namespace TAO * @note Caller owns the returned object. Use a * TAO::SSLIOP::X509_var. */ - ::X509 *x509 (void); + ::X509 *x509 (); //@} /// Return a pointer to the underlying private key. @@ -105,7 +105,7 @@ namespace TAO * @note Caller owns the returned object. Use a * TAO::SSLIOP::EVP_PKEY_var. */ - ::EVP_PKEY *evp (void); + ::EVP_PKEY *evp (); //@} bool operator== (const SSLIOP_Credentials &rhs); @@ -117,7 +117,7 @@ namespace TAO static SSLIOP::Credentials_ptr _narrow (CORBA::Object_ptr obj); - static SSLIOP::Credentials_ptr _nil (void) + static SSLIOP::Credentials_ptr _nil () { return (SSLIOP::Credentials_ptr) 0; } @@ -130,7 +130,7 @@ namespace TAO * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~SSLIOP_Credentials (void); + ~SSLIOP_Credentials (); protected: /// Reference to the X.509 certificate associated with this SSLIOP diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl index df5f0ced92cd8..46b74d1b0d5fd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl @@ -2,14 +2,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ::X509 * -TAO::SSLIOP_Credentials::x509 (void) +TAO::SSLIOP_Credentials::x509 () { return TAO::SSLIOP::OpenSSL_traits< ::X509 >::_duplicate (this->x509_.in ()); } ACE_INLINE ::EVP_PKEY * -TAO::SSLIOP_Credentials::evp (void) +TAO::SSLIOP_Credentials::evp () { return TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::_duplicate (this->evp_.in ()); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h index c0e216cc12076..7187d87a58812 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h @@ -70,13 +70,13 @@ namespace TAO * interface. */ //@{ - virtual char * acquisition_method (void); + virtual char * acquisition_method (); virtual SecurityLevel3::AcquisitionStatus current_status (); - virtual CORBA::ULong nth_iteration (void); + virtual CORBA::ULong nth_iteration (); - virtual CORBA::Any * get_continuation_data (void); + virtual CORBA::Any * get_continuation_data (); virtual SecurityLevel3::AcquisitionStatus continue_acquisition ( const CORBA::Any & acquisition_arguments); @@ -84,7 +84,7 @@ namespace TAO virtual SecurityLevel3::OwnCredentials_ptr get_credentials ( CORBA::Boolean on_list); - virtual void destroy (void); + virtual void destroy (); //@} protected: @@ -93,12 +93,12 @@ namespace TAO * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~CredentialsAcquirer (void); + ~CredentialsAcquirer (); private: /// Verify that this CredentialsAcquirer object is still valid, /// i.e. hasn't been destroyed. - void check_validity (void); + void check_validity (); /// Create an OpenSSL X.509 certificate data structure. static ::X509 * make_X509 (const ::SSLIOP::File &certificate); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index dc39617d0f553..1a4fa1cdaa027 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -86,7 +86,7 @@ namespace TAO * @return @c true if the current execution context is not * within a SSL session. */ - virtual CORBA::Boolean no_context (void); + virtual CORBA::Boolean no_context (); /// Set the TSS slot ID assigned to this object. void tss_slot (size_t slot); @@ -111,7 +111,7 @@ namespace TAO static Current_ptr _narrow (CORBA::Object_ptr obj); - static Current_ptr _nil (void) + static Current_ptr _nil () { return (Current_ptr)0; } @@ -121,13 +121,13 @@ namespace TAO protected: /// Destructor - ~Current (void); + ~Current (); /// Set the TSS SSLIOP::Current implementation. int implementation (Current_Impl *impl); /// Return the TSS SSLIOP::Current implementation. - Current_Impl *implementation (void); + Current_Impl *implementation (); private: Current (const Current &) = delete; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl index 870554d3e0ddd..b721a43215d10 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl @@ -17,7 +17,7 @@ TAO::SSLIOP::Current::implementation (TAO::SSLIOP::Current_Impl *impl) } ACE_INLINE TAO::SSLIOP::Current_Impl * -TAO::SSLIOP::Current::implementation (void) +TAO::SSLIOP::Current::implementation () { if (this->orb_core_ == 0) return 0; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h index b3e99fdb0a1c5..188de270816fd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h @@ -68,7 +68,6 @@ namespace TAO }; typedef OpenSSL_st_var< ::EVP_PKEY > EVP_PKEY_var; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index ac09e5b1cab4a..bb1747d0efddf 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -293,7 +293,6 @@ TAO_SSLIOP_Endpoint::set_sec_attrs (::Security::QOP q, - TAO_SSLIOP_Synthetic_Endpoint::~TAO_SSLIOP_Synthetic_Endpoint () { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index b82328f752e5e..22940d963c991 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -58,7 +58,7 @@ namespace TAO TAO_IIOP_Endpoint *iiop_endp); /// Destructor. - virtual ~TAO_SSLIOP_Endpoint (void); + virtual ~TAO_SSLIOP_Endpoint (); /// Need to have an assignment operator since the SSLIOP_Profile class /// may have to reorder its list of endpoints based on filtering by diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl index bdcb30639af7c..7dcc6aee327cd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl @@ -35,7 +35,7 @@ TAO_SSLIOP_Endpoint::iiop_endpoint (TAO_IIOP_Endpoint *iiop_endpoint, } ACE_INLINE const ::SSLIOP::SSL & -TAO_SSLIOP_Endpoint::ssl_component (void)const +TAO_SSLIOP_Endpoint::ssl_component () const { return this->ssl_component_; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 13a3d95679a2c..4d6ccfd6e509d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -718,7 +718,6 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) { if (ssl_ctx->private_key (private_key_path.in(), private_key_type) != 0) { - ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Unable to set ") ACE_TEXT ("SSL private key ") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index aa19cfd95f4ff..ba514b4ccc770 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -40,7 +40,6 @@ namespace TAO { namespace SSLIOP { - /** * @class Protocol_Factory * @@ -53,12 +52,11 @@ namespace TAO : public TAO_Protocol_Factory { public: - /// Constructor. - Protocol_Factory (void); + Protocol_Factory (); /// Destructor. - virtual ~Protocol_Factory (void); + virtual ~Protocol_Factory (); // = Service Configurator hooks. /// Dynamic linking hook @@ -75,12 +73,11 @@ namespace TAO virtual char options_delimiter () const; // = Check Protocol_Factory.h for a description of these methods. - virtual TAO_Acceptor * make_acceptor (void); - virtual TAO_Connector * make_connector (void); + virtual TAO_Acceptor * make_acceptor (); + virtual TAO_Connector * make_connector (); virtual int requires_explicit_endpoint () const; private: - /// Parse an X509 file path, which is expected to looks like: /// ::= ':' /// ::= 'PEM' | 'ASN1' @@ -103,7 +100,7 @@ namespace TAO static ACE_CString pem_passwd_; /// Create and register the SSLIOP ORB initializer. - int register_orb_initializer (void); + int register_orb_initializer (); /// Default quality-of-protection settings for the SSLIOP /// pluggable protocol. @@ -118,7 +115,6 @@ namespace TAO ACE_Time_Value timeout_; bool check_host_; - }; } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index 12617d2179c8e..317b38cba0372 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -78,9 +78,9 @@ namespace TAO * PortableInterceptor::ServerRequestInterceptor interface. */ //@{ - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri); @@ -104,7 +104,7 @@ namespace TAO * Protected destructor to force deallocation by the reference * counting mechanism. */ - ~Server_Invocation_Interceptor (void); + ~Server_Invocation_Interceptor (); private: /** diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h index 24dbbc2d4eb99..998608bc1a1f0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h @@ -69,21 +69,20 @@ namespace TAO class OpenSSL_st_var { public: - /** * @name Constructors * * Constructors. */ //@{ - OpenSSL_st_var (void); + OpenSSL_st_var (); OpenSSL_st_var (T * st); OpenSSL_st_var (OpenSSL_st_var const & v); OpenSSL_st_var (T const & st); //@} /// Destructor - ~OpenSSL_st_var (void); + ~OpenSSL_st_var (); /** * @name Assignment operators. @@ -97,22 +96,20 @@ namespace TAO //@} T const * operator-> () const; - T* operator-> (void); + T* operator-> (); operator const T& () const; operator T& (); T* in () const; - T*& inout (void); - T*& out (void); - T* _retn (void); + T*& inout (); + T*& out (); + T* _retn (); T* ptr () const; private: - /// The OpenSSL structure whose reference count is managed. T * st_; - }; } // End SSLIOP namespace. } // End TAO namespace. @@ -124,13 +121,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) # include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation ("SSLIOP_OpenSSL_st_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl index 06691af598065..c1507de8ef3a8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl @@ -38,7 +38,7 @@ TAO::SSLIOP::release (T * st) // ------------------------------------------------------------------- template ACE_INLINE -TAO::SSLIOP::OpenSSL_st_var::OpenSSL_st_var (void) +TAO::SSLIOP::OpenSSL_st_var::OpenSSL_st_var () : st_ (0) { } @@ -63,7 +63,7 @@ TAO::SSLIOP::OpenSSL_st_var::OpenSSL_st_var (T const & st) } template ACE_INLINE -TAO::SSLIOP::OpenSSL_st_var::~OpenSSL_st_var (void) +TAO::SSLIOP::OpenSSL_st_var::~OpenSSL_st_var () { TAO::SSLIOP::OpenSSL_traits::release (this->st_); // TAO::SSLIOP::release (this->st_); @@ -109,7 +109,7 @@ TAO::SSLIOP::OpenSSL_st_var::operator-> () const } template ACE_INLINE T * -TAO::SSLIOP::OpenSSL_st_var::operator-> (void) +TAO::SSLIOP::OpenSSL_st_var::operator-> () { return this->st_; } @@ -133,13 +133,13 @@ TAO::SSLIOP::OpenSSL_st_var::in () const } template ACE_INLINE T *& -TAO::SSLIOP::OpenSSL_st_var::inout (void) +TAO::SSLIOP::OpenSSL_st_var::inout () { return this->st_; } template ACE_INLINE T *& -TAO::SSLIOP::OpenSSL_st_var::out (void) +TAO::SSLIOP::OpenSSL_st_var::out () { TAO::SSLIOP::OpenSSL_traits::release (this->st_); this->st_ = 0; @@ -147,7 +147,7 @@ TAO::SSLIOP::OpenSSL_st_var::out (void) } template ACE_INLINE T * -TAO::SSLIOP::OpenSSL_st_var::_retn (void) +TAO::SSLIOP::OpenSSL_st_var::_retn () { // Yield ownership of the OpenSSL structure. T * st = this->st_; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index be7540ea0a633..35b27ccfeb37b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -31,7 +31,6 @@ TAO::SSLIOP::OwnCredentials_ptr TAO::SSLIOP::OwnCredentials::_nil () { return (OwnCredentials *) 0; - } SecurityLevel3::CredentialsType diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h index 4b180f5f005f8..866a332d8fd98 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h @@ -60,7 +60,7 @@ namespace TAO OwnCredentials (::X509 *cert, ::EVP_PKEY *evp); static OwnCredentials_ptr _duplicate (OwnCredentials_ptr obj); - static OwnCredentials_ptr _nil (void); + static OwnCredentials_ptr _nil (); static OwnCredentials_ptr _narrow (CORBA::Object_ptr obj); /** @@ -70,7 +70,7 @@ namespace TAO * interface. */ //@{ - SecurityLevel3::CredentialsType creds_type (void); + SecurityLevel3::CredentialsType creds_type (); //@} /** @@ -84,7 +84,7 @@ namespace TAO virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor (); - virtual void release_credentials (void); + virtual void release_credentials (); //@} protected: @@ -93,7 +93,7 @@ namespace TAO * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~OwnCredentials (void); + ~OwnCredentials (); }; } // End SSLIOP namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h index 92e01b7822078..87fcf32105d8e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // { // namespace SSLIOP // { - /** * @class Profile * @@ -75,8 +74,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // = Please see Profile.h for the documentation of these methods. virtual int decode (TAO_InputCDR& cdr); - virtual int encode_endpoints (void); - virtual TAO_Endpoint *endpoint (void); + virtual int encode_endpoints (); + virtual TAO_Endpoint *endpoint (); /** * Override parse_string() from the base class to update the SSL @@ -110,7 +109,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~TAO_SSLIOP_Profile (void); + ~TAO_SSLIOP_Profile (); /// Profile equivalence template method. /** @@ -130,7 +129,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * but sadly others pay the price (of footprint) under * normal operations. */ - int decode_tagged_endpoints (void); + int decode_tagged_endpoints (); /** * Head of this profile's list of endpoints. This endpoint is diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h index edd3480a24fcc..78f6dfd8ce8b5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h @@ -74,7 +74,6 @@ namespace TAO }; typedef OpenSSL_st_var< ::SSL > SSL_var; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index b67de885b0c28..83bddb9283577 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -60,7 +60,7 @@ namespace TAO * interface. */ //@{ - virtual char * context_id (void); + virtual char * context_id (); virtual SecurityLevel3::Principal * client_principal (); @@ -76,19 +76,19 @@ namespace TAO virtual SecurityLevel3::OwnCredentials_ptr parent_credentials (); - virtual CORBA::Boolean client_authentication (void); + virtual CORBA::Boolean client_authentication (); - virtual CORBA::Boolean target_authentication (void); + virtual CORBA::Boolean target_authentication (); - virtual CORBA::Boolean confidentiality (void); + virtual CORBA::Boolean confidentiality (); - virtual CORBA::Boolean integrity (void); + virtual CORBA::Boolean integrity (); - virtual CORBA::Boolean target_embodied (void); + virtual CORBA::Boolean target_embodied (); - virtual CORBA::Boolean target_endorsed (void); + virtual CORBA::Boolean target_endorsed (); - virtual void release (void); + virtual void release (); //@} }; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index e9df6979bb0bc..966da1897ca6c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -188,7 +188,6 @@ TAO::SSLIOP::Transport::tear_listen_point_list (TAO_InputCDR &cdr) } - void TAO::SSLIOP::Transport::set_bidir_context_info ( TAO_Operation_Details &opdetails) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h index 05fd173c5cd35..a5e2d04110112 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h @@ -63,7 +63,7 @@ namespace TAO TAO_ORB_Core *orb_core); /// Default destructor. - ~Transport (void); + ~Transport (); /// Overload of the handle_input () in the TAO_Transport /// class. This is required to set up the state guard. The @@ -79,8 +79,8 @@ namespace TAO * TAO_Transport. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); - virtual TAO_Connection_Handler *connection_handler_i (void); + virtual ACE_Event_Handler * event_handler_i (); + virtual TAO_Connection_Handler *connection_handler_i (); /// Write the complete Message_Block chain to the connection. virtual ssize_t send (iovec *iov, int iovcnt, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h index 0b3250f746875..30f60e1496142 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h @@ -72,7 +72,6 @@ namespace TAO }; typedef OpenSSL_st_var< ::X509 > X509_var; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index f80cd66be75d8..debf683265240 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -8,7 +8,6 @@ #include "orbsvcs/Sched/Config_Scheduler.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Config_Scheduler::ACE_Config_Scheduler () @@ -161,7 +160,6 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority) { - if (impl->priority (handle, priority, p_subpriority, p_priority) == -1) { ORBSVCS_ERROR ((LM_ERROR, @@ -185,7 +183,6 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, RtecScheduler::Dependency_Type_t dependency_type) { - RtecScheduler::RT_Info* rt_info = 0; switch (impl->lookup_rt_info (handle, rt_info)) { @@ -220,7 +217,6 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies) { - // Initialize the scheduler implementation. impl->init (minimum_priority, maximum_priority); @@ -425,7 +421,6 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::OS_Priority& priority, RtecScheduler::Dispatching_Type_t & d_type) { - if (impl->dispatch_configuration (p_priority, priority, d_type) == -1) { ORBSVCS_ERROR ((LM_ERROR, @@ -440,7 +435,6 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::Preemption_Priority_t ACE_Config_Scheduler::last_scheduled_priority () { - RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue (); if (priority < 0) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index 38aab1e781d12..4caa6059e8f7c 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -33,9 +33,8 @@ class TAO_RTSched_Export ACE_Config_Scheduler // distributed with the EC. { public: - - ACE_Config_Scheduler (void); - virtual ~ACE_Config_Scheduler (void); + ACE_Config_Scheduler (); + virtual ~ACE_Config_Scheduler (); virtual RtecScheduler::handle_t create (const char * entry_point); @@ -82,7 +81,7 @@ class TAO_RTSched_Export ACE_Config_Scheduler // provide the thread priority and queue type for the given priority level virtual RtecScheduler::Preemption_Priority_t - last_scheduled_priority (void); + last_scheduled_priority (); // Returns the last priority number assigned to an operation in the // schedule. // The number returned is one less than the total number of @@ -161,7 +160,6 @@ class TAO_RTSched_Export ACE_Config_Scheduler private: - #if defined (TAO_USES_STRATEGY_SCHEDULER) // trait for the scheduler implementation base class @@ -210,7 +208,6 @@ class TAO_RTSched_Export ACE_Config_Scheduler // implementation base class pointer BaseSchedImplType* impl; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index f1844bed135c7..50fa3272b9fde 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -19,7 +19,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////// @@ -27,11 +26,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////// // compare the DFS finish times of two task entries, order higher time *first* -#if defined (ACE_HAS_WINCE) -int _cdecl compare_entry_finish_times (const void *first, const void *second) -#else extern "C" int compare_entry_finish_times (const void *first, const void *second) -#endif // ACE_HAS_WINCE { // sort blank entries to the end if (! first) @@ -308,7 +303,6 @@ ACE_DynScheduler::register_task (RT_Info *rt_info, handle_t &handle) // = registers a task. - ACE_DynScheduler::status_t ACE_DynScheduler::get_rt_info (Object_Name name, RT_Info* &rtinfo) @@ -357,7 +351,6 @@ ACE_DynScheduler::get_rt_info (Object_Name name, - int ACE_DynScheduler::priority ( const RtecScheduler::handle_t handle, RtecScheduler::OS_Priority &priority, @@ -487,14 +480,12 @@ void ACE_DynScheduler::export_to_file (RT_Info& info, FILE* file) (void) ACE_OS::fprintf (file, "%s, %d\n", (const char*)tmp.entry_point, info.dependencies[i].number_of_calls); - } (void) ACE_OS::fprintf (file, "# end calls\n%d\n%d\n\n", info.priority, info.preemption_subpriority); - } @@ -1286,7 +1277,6 @@ ACE_DynScheduler::calculate_utilization_params () } - void ACE_DynScheduler::update_priority_level_params () { @@ -1412,7 +1402,6 @@ ACE_DynScheduler::relate_task_entries () ACE_DynScheduler::status_t ACE_DynScheduler::relate_task_entries_recurse (long &time, Task_Entry &entry) { - // may have entered at a non-root node previously, so this does // not necessarily indicate a cycle in the dependency graph if (entry.dfs_status () != Task_Entry::NOT_VISITED) @@ -1827,7 +1816,6 @@ ACE_DynScheduler::create_timeline () Dispatch_Entry *rescheduled_entry; while (reschedule_queue.is_empty () == 0) { - if (reschedule_queue.dequeue_head (rescheduled_entry) < 0) { status = ST_BAD_INTERNAL_POINTER; @@ -1916,7 +1904,6 @@ ACE_DynScheduler::create_timeline () // Create a timeline. - ACE_DynScheduler::status_t ACE_DynScheduler::output_dispatch_priorities (const char *filename) { @@ -1944,7 +1931,6 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename) ACE_DynScheduler::status_t ACE_DynScheduler::output_dispatch_priorities (FILE *file) { - u_long dispatch_count = 0; u_long i = 0; for (i = 0; i < dispatch_entry_count_; ++i) diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index d5b383829f86e..665fdfbb5cea3 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -41,7 +41,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTSched_Export ACE_DynScheduler { public: - ////////////////////////////// // public type declarations // ////////////////////////////// @@ -107,7 +106,6 @@ class TAO_RTSched_Export ACE_DynScheduler }; - ///////////////////////////// // public member functions // ///////////////////////////// @@ -264,7 +262,6 @@ class TAO_RTSched_Export ACE_DynScheduler Dispatching_Type & d_type); protected: - //////////////////////////////// // protected member functions // //////////////////////////////// @@ -282,7 +279,7 @@ class TAO_RTSched_Export ACE_DynScheduler ACE_Unbounded_Set &anomaly_set); /// = store assigned information back into the RT_Infos - virtual status_t store_assigned_info (void); + virtual status_t store_assigned_info (); // = Set the minimum priority value. void minimum_priority_queue (const Preemption_Priority minimum_priority_queue_number); @@ -380,7 +377,6 @@ class TAO_RTSched_Export ACE_DynScheduler ACE_Ordered_MultiSet *timeline_; private: - /////////////////////////////// // private type declarations // /////////////////////////////// @@ -424,11 +420,11 @@ class TAO_RTSched_Export ACE_DynScheduler status_t output_dispatch_priorities (FILE *file); // = Set up the task entry data structures - status_t setup_task_entries (void); + status_t setup_task_entries (); // = Relate the task entries according to the // dependencies of the underlying RT_Infos - status_t relate_task_entries (void); + status_t relate_task_entries (); // recursively traverse dependency graph, relating // task entries and performing DFS start/end marking @@ -440,13 +436,13 @@ class TAO_RTSched_Export ACE_DynScheduler ACE_CString & unresolved_remotes); // checks for cycles in the dependency graph - status_t check_dependency_cycles (void); + status_t check_dependency_cycles (); // recursion used to check for cycles in the dependency graph status_t check_dependency_cycles_recurse (Task_Entry &entry); // = Aggregate the scheduling parameters of the threads - status_t aggregate_thread_parameters (void); + status_t aggregate_thread_parameters (); // = recursion over oneway dependencies used to aggregate thread parameters status_t aggregate_oneways_recurse (Task_Entry &entry); @@ -538,7 +534,6 @@ class TAO_RTSched_Export ACE_DynScheduler u_long min_dispatch_id_; u_long max_dispatch_id_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index b50d9381218b2..09c2cb01284ee 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -19,7 +19,6 @@ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /////////////////////////// @@ -168,7 +167,6 @@ TAO_RT_Info_Ex::enabled_state () } - ////////////////////////////// // struct TAO_RT_Info_Tuple // ////////////////////////////// @@ -444,7 +442,6 @@ register_tuples (TAO_RT_Info_Tuple ** tuple_ptr_array, - // Accessor for original RT_Info data. TAO_RT_Info_Ex & @@ -582,7 +579,6 @@ fwd_dfs_status (TAO_Reconfig_Scheduler_Entry::DFS_Status ds) } - // Accessor for DFS traversal status of the node. TAO_Reconfig_Scheduler_Entry::DFS_Status @@ -1196,7 +1192,6 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s, } - // Compares two RT_Info entries by priority alone. Returns -1 if the // first one is higher, 0 if they're the same, and 1 if the second one is higher. diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h index 8986356c5415b..68e1021b5bd9b 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h @@ -111,7 +111,6 @@ struct TAO_RTSched_Export TAO_RT_Info_Tuple class TAO_RTSched_Export TAO_Reconfig_Scheduler_Entry { public: - // Info for DFS traversal, topological sort of call graph. enum DFS_Status {NOT_VISITED, VISITED, FINISHED}; @@ -140,7 +139,7 @@ class TAO_RTSched_Export TAO_Reconfig_Scheduler_Entry long &tuple_count); /// Accessor for stored original RT_Info data. - TAO_RT_Info_Ex & orig_rt_info_data (void); + TAO_RT_Info_Ex & orig_rt_info_data (); /// Mutator for stored original RT_Info data. void orig_rt_info_data (TAO_RT_Info_Ex &data); @@ -305,7 +304,6 @@ class TAO_RTSched_Export TAO_Reconfig_Scheduler_Entry */ private: - /** * Stores the values of operation characteristics as they were specified * in the most recent call to the Reconfig_Scheduler's set () method. @@ -402,13 +400,11 @@ class TAO_RTSched_Export TAO_Reconfig_Scheduler_Entry class TAO_RTSched_Export TAO_Reconfig_Sched_Entry_Visitor { public: - /// Destructor. - virtual ~TAO_Reconfig_Sched_Entry_Visitor (void); + virtual ~TAO_Reconfig_Sched_Entry_Visitor (); /// Visit a Reconfig Scheduler Entry. virtual int visit (TAO_Reconfig_Scheduler_Entry &) = 0; - }; @@ -422,7 +418,6 @@ class TAO_RTSched_Export TAO_RSE_Reset_Visitor : // prior to the first DFS traversal for topological sorting. { public: - /// Constructor. TAO_RSE_Reset_Visitor (); @@ -446,13 +441,11 @@ class TAO_RTSched_Export TAO_RSE_Reset_Visitor : class TAO_RTSched_Export TAO_RT_Info_Tuple_Visitor { public: - /// Destructor. - virtual ~TAO_RT_Info_Tuple_Visitor (void); + virtual ~TAO_RT_Info_Tuple_Visitor (); /// Visit a RT_Info tuple. virtual int visit (TAO_RT_Info_Tuple &) = 0; - }; /** @@ -466,7 +459,6 @@ class TAO_RTSched_Export TAO_RT_Info_Tuple_Visitor class TAO_RTSched_Export TAO_Reconfig_Sched_Strategy_Base { public: - /// Ordering function to compare the DFS finish times of /// two RT_Info_Tuples static int comp_tuple_finish_times (const void *first, const void *second); @@ -509,7 +501,6 @@ class TAO_RTSched_Export TAO_MUF_FAIR_Reconfig_Sched_Strategy // has index 0, the next higher rate has index 1, etc. { public: - /** * Ordering function used to qsort an array of RT_Info_Tuple * pointers into a total ordering. Returns @@ -566,7 +557,6 @@ class TAO_RTSched_Export TAO_RMS_FAIR_Reconfig_Sched_Strategy // order. { public: - /** * Ordering function used to qsort an array of RT_Info_Tuple * pointers into a total ordering. Returns @@ -638,7 +628,6 @@ class TAO_RTSched_Export TAO_RMS_MLF_Reconfig_Sched_Strategy // order. { public: - /** * Ordering function used to qsort an array of RT_Info_Tuple * pointers into a total ordering. Returns diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp index 61ec21234da5f..1b234e9f203de 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -226,7 +226,6 @@ postfix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) } - ///////////////////////// // TAO_RSE_DFS_Visitor // ///////////////////////// @@ -337,7 +336,7 @@ TAO_RSE_SCC_Visitor template int TAO_RSE_SCC_Visitor:: -number_of_cycles (void) +number_of_cycles () { return this->number_of_cycles_; } @@ -348,7 +347,7 @@ number_of_cycles (void) template int TAO_RSE_SCC_Visitor:: -in_a_cycle (void) +in_a_cycle () { return this->in_a_cycle_; } @@ -554,7 +553,7 @@ TAO_RSE_Forward_Propagation_Visitor template int TAO_RSE_Forward_Propagation_Visitor:: -unresolved_locals (void) +unresolved_locals () { return this->unresolved_locals_; } @@ -574,7 +573,7 @@ unresolved_locals (int i) template int TAO_RSE_Forward_Propagation_Visitor:: -unresolved_remotes (void) +unresolved_remotes () { return this->unresolved_remotes_; } @@ -593,7 +592,7 @@ unresolved_remotes (int i) template int TAO_RSE_Forward_Propagation_Visitor:: -thread_specification_errors (void) +thread_specification_errors () { return this->thread_specification_errors_; } diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index 7fcaaa9797afa..f1ae68873a774 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -40,7 +40,6 @@ class TAO_RSE_Dependency_Visitor : // derived classes may call to pass them in. { public: - /// Type of map used for O(1) lookup of RT_Info /// dependency sets by caller or called handle. typedef ACE_Hash_Map_Manager_Ex class TAO_RSE_DFS_Visitor : public TAO_RSE_Dependency_Visitor @@ -119,7 +116,6 @@ class TAO_RSE_DFS_Visitor : // as appropriate according to DFS state markers. { public: - /// Constructor. TAO_RSE_DFS_Visitor (typename TAO_RSE_Dependency_Visitor::DEPENDENCY_SET_MAP & dependency_map, @@ -156,7 +152,6 @@ class TAO_RSE_DFS_Visitor : private: /// Keeps track of DFS start and finish times. int DFS_time_; - }; @@ -172,18 +167,17 @@ class TAO_RSE_SCC_Visitor : // flag cycles in the graph. { public: - /// Constructor. TAO_RSE_SCC_Visitor (typename TAO_RSE_Dependency_Visitor::DEPENDENCY_SET_MAP & dependency_map, typename TAO_RSE_Dependency_Visitor::RT_INFO_MAP & rt_info_map); /// Accessor for number of cycles detected in traversal. - int number_of_cycles (void); + int number_of_cycles (); /// Accessor for whether or not the recursion is within a previously /// detected cycle. - int in_a_cycle (void); + int in_a_cycle (); /// Mutator for whether or not the recursion is within a previously /// detected cycle. @@ -259,14 +253,12 @@ class TAO_RSE_Reverse_Propagation_Visitor : // and its dependants, according to its dependencies. { public: - /// Constructor. TAO_RSE_Reverse_Propagation_Visitor (typename TAO_RSE_Dependency_Visitor::DEPENDENCY_SET_MAP & dependency_map, typename TAO_RSE_Dependency_Visitor::RT_INFO_MAP & rt_info_map); protected: - /** * Propagates aggregate execution time from successor to calling * entry. Returns 1 on success (to prevent recursion on the @@ -275,7 +267,6 @@ class TAO_RSE_Reverse_Propagation_Visitor : virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, const RtecScheduler::Dependency_Info &di); - }; @@ -292,26 +283,25 @@ class TAO_RSE_Forward_Propagation_Visitor : // its dependencies, and the period and threads it specifies. { public: - /// Constructor. TAO_RSE_Forward_Propagation_Visitor (typename TAO_RSE_Dependency_Visitor::DEPENDENCY_SET_MAP & dependency_map, typename TAO_RSE_Dependency_Visitor::RT_INFO_MAP & rt_info_map); /// Accessor for number of nodes with unresolved local dependencies. - int unresolved_locals (void); + int unresolved_locals (); /// Mutator for numberof nodes with unresolved local dependencies. void unresolved_locals (int); /// Accessor for number of nodes with unresolved remote dependencies. - int unresolved_remotes (void); + int unresolved_remotes (); /// Mutator for number of nodes with unresolved remote dependencies. void unresolved_remotes (int); /// Accessor for number of nodes with thread specification errors. - int thread_specification_errors (void); + int thread_specification_errors (); /// Mutator for number of nodes with thread specification errors. void thread_specification_errors (int); @@ -336,7 +326,6 @@ class TAO_RSE_Forward_Propagation_Visitor : const RtecScheduler::Dependency_Info &di); private: - /// Number of nodes with unresolved local dependencies. int unresolved_locals_; @@ -360,7 +349,6 @@ class TAO_RSE_Priority_Visitor : // priority and subpriority boundaries. { public: - /// Constructor. TAO_RSE_Priority_Visitor (RtecScheduler::handle_t handles, TAO_Reconfig_Scheduler_Entry ** entry_ptr_array); @@ -382,7 +370,6 @@ class TAO_RSE_Priority_Visitor : int finish (); private: - /// Pointer to previous tuple in the iteration. TAO_Reconfig_Scheduler_Entry *previous_entry_; @@ -421,7 +408,6 @@ class TAO_Tuple_Admission_Visitor : // whether or not a given operation is critical. { public: - /// Constructor. TAO_Tuple_Admission_Visitor (const CORBA::Double & critical_utilization_threshold, const CORBA::Double & noncritical_utilization_threshold); @@ -453,7 +439,6 @@ class TAO_Tuple_Admission_Visitor : CORBA::Double total_noncritical_utilization (); private: - /// Utilization by critical operations. CORBA::Double critical_utilization_; @@ -486,14 +471,12 @@ class TAO_RSE_Criticality_Propagation_Visitor : // and its dependants, according to its dependencies. { public: - /// Constructor. TAO_RSE_Criticality_Propagation_Visitor (typename TAO_RSE_Dependency_Visitor::DEPENDENCY_SET_MAP & dependency_map, typename TAO_RSE_Dependency_Visitor::RT_INFO_MAP & rt_info_map); protected: - /** * Propagates criticality from successor to calling * entry. Returns 1 on success (to prevent recursion on the @@ -502,18 +485,11 @@ class TAO_RSE_Criticality_Propagation_Visitor : virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, const RtecScheduler::Dependency_Info &di); - }; TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reconfig_Sched_Utils_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_RECONFIG_SCHED_UTILS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index f5735cdb6ee4b..fc548a13ac99d 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -308,7 +308,7 @@ init (int config_count, // Closes the scheduler, releasing all current resources. template void -TAO_Reconfig_Scheduler::close (void) +TAO_Reconfig_Scheduler::close () { #if defined (SCHEDULER_LOGGING) ORBSVCS_DEBUG ((LM_TRACE, @@ -626,7 +626,6 @@ reset (RtecScheduler::handle_t handle, } - template void TAO_Reconfig_Scheduler:: @@ -1159,7 +1158,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */, // If everything is already up to date, we're done. if (SCHED_ALL_STABLE == stability_flags_) { - // Must always provide a value for an out parameter ACE_NEW_THROW_EX (anomalies, RtecScheduler::Scheduling_Anomaly_Set (0), @@ -1173,7 +1171,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */, if ((this->stability_flags_ & SCHED_PROPAGATION_NOT_STABLE) || (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE)) { - #if defined (SCHEDULER_LOGGING) ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, this->rt_info_count_, @@ -1437,7 +1434,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, template RtecScheduler::Preemption_Priority_t TAO_Reconfig_Scheduler:: -last_scheduled_priority (void) +last_scheduled_priority () { #if defined (SCHEDULER_LOGGING) ORBSVCS_DEBUG ((LM_TRACE, @@ -1857,7 +1854,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende number_of_calls, dependency_type, enabled); - } @@ -2176,7 +2172,7 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key, // has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_, template void TAO_Reconfig_Scheduler:: -dfs_traverse_i (void) +dfs_traverse_i () { #if defined (SCHEDULER_LOGGING) ORBSVCS_DEBUG ((LM_TRACE, @@ -2209,12 +2205,11 @@ dfs_traverse_i (void) } - // Sorts an array of RT_info handles in topological order, then // checks for loops, marks unresolved remote dependencies. template void TAO_Reconfig_Scheduler:: -detect_cycles_i (void) +detect_cycles_i () { #if defined (SCHEDULER_LOGGING) ORBSVCS_DEBUG ((LM_TRACE, @@ -2258,7 +2253,7 @@ detect_cycles_i (void) template void TAO_Reconfig_Scheduler:: -perform_admission_i (void) +perform_admission_i () { #if defined (SCHEDULER_LOGGING) ORBSVCS_DEBUG ((LM_TRACE, @@ -2318,7 +2313,7 @@ perform_admission_i (void) template void TAO_Reconfig_Scheduler:: -crit_dfs_traverse_i (void) +crit_dfs_traverse_i () { #if defined (SCHEDULER_LOGGING) ORBSVCS_DEBUG ((LM_TRACE, @@ -2352,7 +2347,7 @@ crit_dfs_traverse_i (void) template void TAO_Reconfig_Scheduler:: -propagate_criticalities_i (void) +propagate_criticalities_i () { #if defined (SCHEDULER_LOGGING) ORBSVCS_DEBUG ((LM_TRACE, @@ -2394,7 +2389,7 @@ propagate_criticalities_i (void) // Propagates periods, sets total frame size. template void TAO_Reconfig_Scheduler:: -propagate_characteristics_i (void) +propagate_characteristics_i () { #if defined (SCHEDULER_LOGGING) ORBSVCS_DEBUG ((LM_TRACE, @@ -2433,7 +2428,7 @@ propagate_characteristics_i (void) // Sets last scheduled priority. template void TAO_Reconfig_Scheduler:: -assign_priorities_i (void) +assign_priorities_i () { int i; #if defined (SCHEDULER_LOGGING) @@ -2577,7 +2572,7 @@ assign_priorities_i (void) template void TAO_Reconfig_Scheduler:: -refresh_tuple_ptr_array_i (void) +refresh_tuple_ptr_array_i () { #if defined (SCHEDULER_LOGGING) ORBSVCS_DEBUG ((LM_TRACE, @@ -2808,7 +2803,7 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array, template void TAO_Reconfig_Scheduler:: -compute_utilization_i (void) +compute_utilization_i () { TAO_RSE_Utilization_Visitor util_visitor; for (int i = 0; i < this->rt_info_count_; ++i) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index 96758db6f260f..cf97c6a068aa1 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -42,7 +42,6 @@ class TAO_Reconfig_Scheduler : // { public: - /// Type of map used for O(1) lookup of RT_Infos by their handles. typedef ACE_Hash_Map_Manager_Exrt_info ()->entry_point); unresolved_remotes += ACE_CString (string_buffer); - } // Check for and warn about unresolved local dependencies in diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 0033bc0613a9c..bb29121d49da0 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -43,7 +43,6 @@ class Dispatch_Proxy_Iterator; class TAO_RTSched_Export Dispatch_Entry_Link { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -71,13 +70,11 @@ class TAO_RTSched_Export Dispatch_Entry_Link Dispatch_Entry &dispatch_entry () const; private: - /// Dispatch entry to which the smart pointer refers. Dispatch_Entry &dispatch_entry_; }; - /** * @class Task_Entry * @@ -88,7 +85,6 @@ class TAO_RTSched_Export Dispatch_Entry_Link class TAO_RTSched_Export Task_Entry { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -188,7 +184,6 @@ class TAO_RTSched_Export Task_Entry u_long effective_execution_time () const; private: - // Prohibits calls of the given type: currently used to enforce // the notion that two-way calls to disjunctive or conjunctive // RT_Infos do not have any defined meaning, and thus should be @@ -280,7 +275,6 @@ class TAO_RTSched_Export Task_Entry // Set of links to Task Entries which call this entry. ACE_Unbounded_Set callers_; - }; @@ -288,7 +282,6 @@ class TAO_RTSched_Export Task_Entry class TAO_RTSched_Export Task_Entry_Link { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -319,7 +312,6 @@ class TAO_RTSched_Export Task_Entry_Link Task_Entry &called () const; private: - // the number of calls of the operation CORBA::Long number_of_calls_; @@ -344,7 +336,6 @@ class TAO_RTSched_Export Task_Entry_Link class TAO_RTSched_Export Dispatch_Entry { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -440,7 +431,6 @@ class TAO_RTSched_Export Dispatch_Entry // stores a pointer to the original dispatch entry if this // is a dispatch generated by expanding the original frame Dispatch_Entry *original_dispatch_; - }; /** @@ -458,7 +448,6 @@ class TAO_RTSched_Export Dispatch_Entry class TAO_RTSched_Export Dispatch_Proxy_Iterator { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -530,7 +519,6 @@ class TAO_RTSched_Export Dispatch_Proxy_Iterator private: - /// the number of calls corresponding to each actual dispatch u_long number_of_calls_; @@ -551,11 +539,9 @@ class TAO_RTSched_Export Dispatch_Proxy_Iterator }; - class TAO_RTSched_Export TimeLine_Entry { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -594,7 +580,6 @@ class TAO_RTSched_Export TimeLine_Entry bool operator < (const TimeLine_Entry&) const; private: - // the dispatch entry to which the time slice corresponds Dispatch_Entry &dispatch_entry_; @@ -607,13 +592,11 @@ class TAO_RTSched_Export TimeLine_Entry // next and previous priority time slices for this dispatch entry TimeLine_Entry *next_; TimeLine_Entry *prev_; - }; class TAO_RTSched_Export TimeLine_Entry_Link { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -635,10 +618,8 @@ class TAO_RTSched_Export TimeLine_Entry_Link bool operator < (const TimeLine_Entry_Link&) const; private: - /// the underlying entry TimeLine_Entry &entry_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 456d98d885d70..8c5718ea40ae6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -16,7 +16,6 @@ #include "ace/Lock_Adapter_T.h" - /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// // class Scheduler static members @@ -229,14 +228,12 @@ void ACE_Scheduler::export_to_file (RT_Info& info, FILE* file) (void) ACE_OS::fprintf (file, "%s, %d\n", (const char*)tmp.entry_point, info.dependencies[i].number_of_calls); - } (void) ACE_OS::fprintf (file, "# end dependencies\n%d\n%d\n\n", info.priority, info.preemption_subpriority); - } int diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index cb64989590cb0..9ffced104f86d 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -167,7 +167,6 @@ class TAO_RTSched_Export ACE_Scheduler Config_Info* &config_info) = 0; - // = Computes the schedule. /// This actually generates the files. virtual status_t diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp index eb2db77c5e906..eaa44622deb34 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp @@ -13,7 +13,6 @@ #include "ace/OS_NS_stdio.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /////////////////////////////////////////////////////////////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h index b007c81109e5c..cf5cbd75de796 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h @@ -93,7 +93,7 @@ class TAO_RTSched_Export Scheduler_Generic : public ACE_Scheduler /** * Set to 1 if priority values increase with increasing priority, - * such as on Solaris and Win32, or 0 if they decrease, such as on + * such as on Win32, or 0 if they decrease, such as on * VxWorks. */ int increasing_priority_; diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index c1bb16f71c550..9421340692ff9 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -15,15 +15,11 @@ // Helper function type definition for sort // ////////////////////////////////////////////// -#if defined (ACE_HAS_WINCE) -typedef int (_cdecl* COMP_FUNC) (const void*, const void*); -#else // This is awkward, but it makes MSVC++ happy. extern "C" { typedef int (*COMP_FUNC) (const void*, const void*); } -#endif // ACE_HAS_WINCE /////////////////////////////////////////////////// // class ACE_Strategy_Scheduler member functions // @@ -578,7 +574,6 @@ ACE_Strategy_Scheduler::schedule_timeline_entry ( } - //////////////////////////////////////////////////////////////////// // class template ACE_Strategy_Scheduler_Factory member functions // //////////////////////////////////////////////////////////////////// @@ -600,7 +595,6 @@ ACE_Strategy_Scheduler_Factory::create (RtecScheduler::Preemption_Prio } - ///////////////////////////////////////////////////////////////// // abstract base class ACE_Scheduler_Strategy member functions // ///////////////////////////////////////////////////////////////// @@ -697,7 +691,6 @@ ACE_Scheduler_Strategy::minimum_critical_priority () } - ///////////////////////////////////////////////////////////////////////// // class ACE_MUF_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// @@ -857,7 +850,6 @@ ACE_MUF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) - ///////////////////////////////////////////////////////////////////////// // class ACE_RMS_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// @@ -989,7 +981,6 @@ ACE_RMS_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) } - ///////////////////////////////////////////////////////////////////////// // class ACE_MLF_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// @@ -1123,7 +1114,6 @@ ACE_MLF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) } - ///////////////////////////////////////////////////////////////////////// // class ACE_EDF_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h index e6976130dc995..fcdd9eaa8edde 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h @@ -37,7 +37,6 @@ class TAO_RTSched_Export ACE_Strategy_Scheduler : public ACE_DynScheduler { // public interface public: - /// = Constructor. ACE_Strategy_Scheduler (ACE_Scheduler_Strategy &strategy); @@ -60,7 +59,6 @@ class TAO_RTSched_Export ACE_Strategy_Scheduler : public ACE_DynScheduler virtual Preemption_Priority minimum_critical_priority (); private: - /// = Schedules a dispatch entry into the timeline being created. virtual status_t schedule_timeline_entry (Dispatch_Entry &dispatch_entry, ACE_Unbounded_Queue @@ -77,7 +75,6 @@ class TAO_RTSched_Export ACE_Strategy_Scheduler : public ACE_DynScheduler }; - //////////////////////////////////////// // Factory for strategized schedulers // //////////////////////////////////////// @@ -94,7 +91,6 @@ template class ACE_Strategy_Scheduler_Factory { public: - /// = Constructs and returns a scheduler strategized with /// an instance of the the parameterized strategy type. static ACE_Strategy_Scheduler * create (RtecScheduler::Preemption_Priority_t minimum_critical_priority); @@ -117,12 +113,11 @@ class ACE_Strategy_Scheduler_Factory class TAO_RTSched_Export ACE_Scheduler_Strategy { public: - /// = Constructor. ACE_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); /// Destructor. - virtual ~ACE_Scheduler_Strategy (void); + virtual ~ACE_Scheduler_Strategy (); /** * = Compares two dispatch entries in strategy specific high to low @@ -168,7 +163,6 @@ class TAO_RTSched_Export ACE_Scheduler_Strategy dispatch_type (const Dispatch_Entry &entry) = 0; protected: - /** * = Compares two dispatch entries using the specific priority, dynamic * subpriority, and static subpriority method definitions provided by @@ -188,7 +182,6 @@ class TAO_RTSched_Export ACE_Scheduler_Strategy }; - /** * @class ACE_MUF_Scheduler_Strategy * @@ -200,7 +193,6 @@ class TAO_RTSched_Export ACE_Scheduler_Strategy class TAO_RTSched_Export ACE_MUF_Scheduler_Strategy : public ACE_Scheduler_Strategy { public: - /// = Constructor. ACE_MUF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -231,7 +223,6 @@ class TAO_RTSched_Export ACE_MUF_Scheduler_Strategy : public ACE_Scheduler_Strat dispatch_type (const Dispatch_Entry &entry); protected: - /** * = Returns a dynamic subpriority value at the current time for * the given timeline entry: if the operation has @@ -252,13 +243,8 @@ class TAO_RTSched_Export ACE_MUF_Scheduler_Strategy : public ACE_Scheduler_Strat const Dispatch_Entry &second_entry); private: - // = Comparison function to pass to qsort: calls instance ()->sort_comp (). -#if defined (ACE_HAS_WINCE) - static int _cdecl sort_function (void *arg1, void *arg2); -#else static int sort_function (void *arg1, void *arg2); -#endif // ACE_HAS_WINCE /// Instance of the strategy. static ACE_MUF_Scheduler_Strategy *instance_; @@ -276,7 +262,6 @@ class TAO_RTSched_Export ACE_MUF_Scheduler_Strategy : public ACE_Scheduler_Strat class TAO_RTSched_Export ACE_RMS_Scheduler_Strategy : public ACE_Scheduler_Strategy { public: - /// = Constructor. ACE_RMS_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -307,7 +292,6 @@ class TAO_RTSched_Export ACE_RMS_Scheduler_Strategy : public ACE_Scheduler_Strat dispatch_type (const Dispatch_Entry &entry); protected: - /// = Just returns 0: all operations have /// the same dynamic subpriority value. virtual long dynamic_subpriority (Dispatch_Entry &entry, @@ -320,17 +304,14 @@ class TAO_RTSched_Export ACE_RMS_Scheduler_Strategy : public ACE_Scheduler_Strat const Dispatch_Entry &second_entry); private: - /// = Comparison function to pass to qsort: calls instance ()->sort_comp (). static int sort_function (void *arg1, void *arg2); /// = Instance of the strategy. static ACE_RMS_Scheduler_Strategy *instance_; - }; - /** * @class ACE_MLF_Scheduler_Strategy * @@ -342,7 +323,6 @@ class TAO_RTSched_Export ACE_RMS_Scheduler_Strategy : public ACE_Scheduler_Strat class TAO_RTSched_Export ACE_MLF_Scheduler_Strategy : public ACE_Scheduler_Strategy { public: - /// = Constructor. ACE_MLF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -366,7 +346,6 @@ class TAO_RTSched_Export ACE_MLF_Scheduler_Strategy : public ACE_Scheduler_Strat dispatch_type (const Dispatch_Entry &entry); protected: - /** * = Returns a dynamic subpriority value at the current time for * the given timeline entry: if the operation has @@ -387,13 +366,11 @@ class TAO_RTSched_Export ACE_MLF_Scheduler_Strategy : public ACE_Scheduler_Strat const Dispatch_Entry &second_entry); private: - /// = Comparison function to pass to qsort: calls instance ()->sort_comp (). static int sort_function (void *arg1, void *arg2); /// = Instance of the strategy static ACE_MLF_Scheduler_Strategy *instance_; - }; @@ -408,7 +385,6 @@ class TAO_RTSched_Export ACE_MLF_Scheduler_Strategy : public ACE_Scheduler_Strat class TAO_RTSched_Export ACE_EDF_Scheduler_Strategy : public ACE_Scheduler_Strategy { public: - /// = Default constructor. ACE_EDF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -433,7 +409,6 @@ class TAO_RTSched_Export ACE_EDF_Scheduler_Strategy : public ACE_Scheduler_Strat dispatch_type (const Dispatch_Entry &entry); protected: - /** * = Returns a dynamic subpriority value at the current time for the * given timeline entry: if the operation has non-negative @@ -455,13 +430,11 @@ class TAO_RTSched_Export ACE_EDF_Scheduler_Strategy : public ACE_Scheduler_Strat const Dispatch_Entry &second_entry); private: - /// = Comparison function to pass to qsort: calls instance ()->sort_comp (). static int sort_function (void *arg1, void *arg2); /// = Instance of the strategy. static ACE_EDF_Scheduler_Strategy *instance_; - }; @@ -476,7 +449,6 @@ class TAO_RTSched_Export ACE_EDF_Scheduler_Strategy : public ACE_Scheduler_Strat class TAO_RTSched_Export ACE_Criticality_Scheduler_Strategy : public ACE_Scheduler_Strategy { public: - /// = Constructor. ACE_Criticality_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -507,7 +479,6 @@ class TAO_RTSched_Export ACE_Criticality_Scheduler_Strategy : public ACE_Schedul dispatch_type (const Dispatch_Entry &entry); protected: - /// = Just returns 0: all operations have /// the same dynamic subpriority value. virtual long dynamic_subpriority (Dispatch_Entry &entry, @@ -520,13 +491,11 @@ class TAO_RTSched_Export ACE_Criticality_Scheduler_Strategy : public ACE_Schedul const Dispatch_Entry &second_entry); private: - /// = Comparison function to pass to qsort: calls instance ()->sort_comp (). static int sort_function (void *arg1, void *arg2); /// = Instance of the strategy. static ACE_Criticality_Scheduler_Strategy *instance_; - }; diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 7c990e8f96875..d7ddddee46776 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -521,7 +521,6 @@ int ACE_Scheduler_Factory::dump_schedule void ACE_Scheduler_Factory::log_scheduling_entry(TAO_Reconfig_Scheduler_Entry * entry, FILE* file) { - if( entry == 0 ) { ACE_OS::fprintf (file, "Entry is NULL"); @@ -596,7 +595,6 @@ void ACE_Scheduler_Factory::log_scheduling_entry(TAO_Reconfig_Scheduler_Entry * log_tuple_subset(entry->prop_tuple_subset(), file); ACE_OS::fprintf(file, "\n }\n}"); - } void ACE_Scheduler_Factory::log_tuple_subset(TUPLE_SET & tuple_subset, @@ -630,7 +628,6 @@ void ACE_Scheduler_Factory::log_tuple_subset(TUPLE_SET & tuple_subset, } else { - ACE_OS::fprintf (file, subset_tuple_format, (*tuple_ptr_ptr)->handle, @@ -670,14 +667,11 @@ ACE_Scheduler_Factory::log_scheduling_entries(TAO_Reconfig_Scheduler_Entry ** en TAO_Reconfig_Scheduler_Entry * entry = entry_ptr_array[index]; log_scheduling_entry(entry, file); - - } ACE_OS::fclose (file); return 0; - } void @@ -722,11 +716,6 @@ ACE_Scheduler_Factory::log_scheduling_tuples( ACE_OS::fclose (file); } -#if defined (HPUX) && !defined (__GNUG__) - // aCC can't handle RtecScheduler::Preemption_Priority_t used as an operator - // name. - typedef CORBA::Long RtecScheduler_Preemption_Priority_t; -#endif /* HPUX && !g++ */ RtecScheduler::Preemption_Priority_t ACE_Scheduler_Factory::preemption_priority () @@ -737,15 +726,8 @@ ACE_Scheduler_Factory::preemption_priority () { ACE_TSS_Type_Adapter *tss = ace_scheduler_factory_data->preemption_priority_; - // egcs 1.0.1 raises an internal compiler error if we implicitly - // call the type conversion operator. So, call it explicitly. -#if defined (HPUX) && !defined (__GNUG__) - const RtecScheduler::Preemption_Priority_t preemption_priority = - static_cast (tss->operator RtecScheduler_Preemption_Priority_t ()); -#else const RtecScheduler::Preemption_Priority_t preemption_priority = static_cast (tss->operator RtecScheduler::Preemption_Priority_t ()); -#endif /* HPUX && !g++ */ return preemption_priority; } else @@ -766,12 +748,7 @@ ACE_Scheduler_Factory::set_preemption_priority return; ace_scheduler_factory_data->preemption_priority_-> -#if defined (HPUX) && !defined (__GNUG__) - // aCC can't handle the typedef. - operator RtecScheduler_Preemption_Priority_t & () = preemption_priority; -#else operator RtecScheduler::Preemption_Priority_t & () = preemption_priority; -#endif /* HPUX && !g++ */ } diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h index 53ed18ce61c11..0c80a8b9bb60d 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h @@ -67,7 +67,6 @@ class TAO_RTSched_Export ACE_Scheduler_Factory */ struct POD_RT_Info { - const char *entry_point; RtecScheduler::handle_t handle; RtecScheduler::Time worst_case_execution_time; @@ -83,7 +82,6 @@ class TAO_RTSched_Export ACE_Scheduler_Factory RtecScheduler::Preemption_Priority_t preemption_priority; CORBA::Long info_type; RtecScheduler::RT_Info_Enabled_Type_t enabled; - }; @@ -159,7 +157,7 @@ class TAO_RTSched_Export ACE_Scheduler_Factory * from main, after resolve_initial_references. */ static int server (RtecScheduler::Scheduler_ptr); - static RtecScheduler::Scheduler_ptr server (void); + static RtecScheduler::Scheduler_ptr server (); /** * This helper function will dump the schedule returned by a @@ -202,7 +200,7 @@ class TAO_RTSched_Export ACE_Scheduler_Factory * the factory is uninitialized, or in a config or runtime mode of * operation. */ - static Factory_Status status (void); + static Factory_Status status (); // = Access the (OS independent) preemption priority of the calling thread. /// Returns (u_int) -1 if the preemption priority hadn't been set. @@ -244,7 +242,6 @@ class TAO_RTSched_Export ACE_Scheduler_Factory static void rt_info_enable_state_default(RtecScheduler::RT_Info_Enabled_Type_t rt_info_enable_state_default); protected: - /** * By default this factory assumes we are runnning a config * run. Calling this method disables that. Since the methods @@ -253,7 +250,7 @@ class TAO_RTSched_Export ACE_Scheduler_Factory * code emitted for the run-time scheduler, automagically disabling * the config_run() when that code is linked in. */ - static int no_config_run (void); + static int no_config_run (); private: static RtecScheduler::Scheduler_ptr server_; @@ -271,7 +268,6 @@ class TAO_RTSched_Export ACE_Scheduler_Factory /// Default rt_info enabled state. (Boeing Extension) static RtecScheduler::RT_Info_Enabled_Type_t rt_info_enable_state_default_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl index 374ebb64e8feb..505e010e20e37 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // operation. ACE_INLINE ACE_Scheduler_Factory::Factory_Status -ACE_Scheduler_Factory::status (void) +ACE_Scheduler_Factory::status () { return status_; } diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h index 8da232ed62bc1..693e3a9db4d29 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h @@ -36,7 +36,6 @@ class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info { public: - /// Construct a helper class instance from values for /// the fields of the IDL struct it wraps. ACE_RT_Info (const char* entry_point, @@ -54,7 +53,6 @@ class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info /// Add a dependency of one RT_Info upon another. int add_dependency(RtecScheduler::handle_t dep, int number_of_calls = 1); - }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index 547502dfee2da..535be94399f5f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -30,7 +30,6 @@ namespace TAO { namespace Security { - /** * @class EstablishTrustPolicy * @@ -54,7 +53,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor EstablishTrustPolicy (const ::Security::EstablishTrust &trust); @@ -62,34 +60,30 @@ namespace TAO * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); //@} /// Return the "establish trust" value associated with this /// policy. - virtual ::Security::EstablishTrust trust (void); + virtual ::Security::EstablishTrust trust (); protected: - /// Destructor /** * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~EstablishTrustPolicy (void); + ~EstablishTrustPolicy (); private: - /// Quality of protection which can be specified for an object /// reference and used to protect messages. ::Security::EstablishTrust const trust_; - }; - } // End Security namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h index 3f1b5bc7ee87d..151c0df99240a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h @@ -51,7 +51,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor QOPPolicy (::Security::QOP qop); @@ -59,34 +58,30 @@ namespace TAO * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); //@} /// Return the Quality-of-Protection value associated with this /// policy. - virtual ::Security::QOP qop (void); + virtual ::Security::QOP qop (); protected: - /// Destructor /** * Protected destructor to enforce proper memory management * through the reference counting mechansim. */ - ~QOPPolicy (void); + ~QOPPolicy (); private: - /// Quality of protection which can be specified for an object /// reference and used to protect messages. ::Security::QOP const qop_; - }; - } // End Security namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 2f20367d33166..ec1cd67695ec5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -177,7 +177,6 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key, // For now we just return the default. return access_decision; - } CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h index 8aab5b872ca7a..99fa61fcb6744 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h @@ -54,8 +54,8 @@ namespace TAO { public: /*! Constructor */ - AccessDecision (void); - ~AccessDecision (void); + AccessDecision (); + ~AccessDecision (); virtual ::CORBA::Boolean access_allowed ( const ::SecurityLevel2::CredentialsList & cred_list, @@ -71,10 +71,10 @@ namespace TAO const char * operation_name, ::CORBA::Boolean collocated_invocation); - virtual ::CORBA::Boolean default_decision (void); + virtual ::CORBA::Boolean default_decision (); virtual void default_decision (::CORBA::Boolean d); - virtual ::CORBA::Boolean default_collocated_decision (void); + virtual ::CORBA::Boolean default_collocated_decision (); virtual void default_collocated_decision (::CORBA::Boolean d); virtual void add_object (const char * orbid, @@ -163,7 +163,6 @@ namespace TAO ::CORBA::Boolean access_allowed_i (OBJECT_KEY& key, const char *operation_name, CORBA::Boolean collocated = false); - }; /** @@ -177,7 +176,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor SecurityManager (/* not sure what's needed yet */); @@ -200,16 +198,14 @@ namespace TAO //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - virtual ~SecurityManager (void); + virtual ~SecurityManager (); private: - /// The ORB-specific SecurityLevel2::PrincipalAuthenticator /// reference. // Except we're not going to have one of these right now @@ -218,7 +214,6 @@ namespace TAO // AccessDecision instance SecurityLevel2::AccessDecision_var access_decision_; }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h index 264096a34e5ec..38512da9fb5c7 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h @@ -46,7 +46,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor ContextEstablishmentPolicy ( SecurityLevel3::CredsDirective creds_directive, @@ -75,33 +74,29 @@ namespace TAO virtual SecurityLevel3::FeatureDirective use_integrity (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~ContextEstablishmentPolicy (void); + ~ContextEstablishmentPolicy (); private: - SecurityLevel3::CredsDirective creds_directive_; SecurityLevel3::OwnCredentialsList creds_list_; SecurityLevel3::FeatureDirective use_client_auth_; SecurityLevel3::FeatureDirective use_target_auth_; SecurityLevel3::FeatureDirective use_confidentiality_; SecurityLevel3::FeatureDirective use_integrity_; - }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h index 3b37c920a2911..7a43e2651138c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h @@ -30,7 +30,6 @@ namespace TAO { namespace SL3 { - /** * @class CredentialsAcquirerFactory * @@ -43,17 +42,14 @@ namespace TAO class TAO_Security_Export CredentialsAcquirerFactory { public: - /// Destructor. - virtual ~CredentialsAcquirerFactory (void); + virtual ~CredentialsAcquirerFactory (); /// Create a TAO::SL3::CredentialsAcquirerFactory. virtual SecurityLevel3::CredentialsAcquirer_ptr make ( TAO::SL3::CredentialsCurator_ptr curator, const CORBA::Any & acquisition_arguments) = 0; - }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index a1f9556ebb669..001dd340523ca 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -111,7 +111,6 @@ TAO::SL3::CredentialsCurator::acquire_credentials ( } throw CORBA::BAD_PARAM (); - } SecurityLevel3::OwnCredentialsList * diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h index 2238cb76330ee..6b0e0806ef627 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h @@ -81,10 +81,10 @@ namespace TAO typedef Credentials_Table::iterator Credentials_Iterator; /// Constructor - CredentialsCurator (void); + CredentialsCurator (); static CredentialsCurator_ptr _duplicate (CredentialsCurator_ptr obj); - static CredentialsCurator_ptr _nil (void); + static CredentialsCurator_ptr _nil (); static CredentialsCurator_ptr _narrow (CORBA::Object_ptr obj); /** @@ -125,16 +125,14 @@ namespace TAO SecurityLevel3::OwnCredentials_ptr credentials); protected: - /// Destructor /** * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~CredentialsCurator (void); + ~CredentialsCurator (); private: - /// Lock used to synchronize access to underlying tables. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h index 315e25f6ac129..54ac5630e5d53 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h @@ -51,7 +51,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor ObjectCredentialsPolicy ( const SecurityLevel3::OwnCredentialsList & creds); @@ -65,29 +64,25 @@ namespace TAO //@{ virtual SecurityLevel3::OwnCredentialsList * creds_list (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~ObjectCredentialsPolicy (void); + ~ObjectCredentialsPolicy (); private: - /// List of POA-specific OwnCredentials. SecurityLevel3::OwnCredentialsList creds_list_; - }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h index 62dccfbe61556..f8930836857aa 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h @@ -33,7 +33,6 @@ namespace TAO { namespace SL3 { - /** * @class olicyFactory * @@ -46,7 +45,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the PolicyFactory Interface * @@ -56,7 +54,6 @@ namespace TAO * sub-classes. */ //@{ - /// Construct a Test::Policy object as a test. virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); @@ -64,7 +61,6 @@ namespace TAO //@} }; - } // End SL3 namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index 4d7d76cb14b96..b88602c2f30da 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -56,7 +56,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor SecurityCurrent (size_t tss_slot, TAO_ORB_Core * oc); @@ -69,7 +68,7 @@ namespace TAO //@{ virtual SecurityLevel3::ClientCredentials_ptr client_credentials (); - virtual CORBA::Boolean request_is_local (void); + virtual CORBA::Boolean request_is_local (); //@} /// Return the TSS slot ID assigned to the "SecurityCurrent" @@ -81,16 +80,14 @@ namespace TAO size_t tss_slot () const; protected: - /// Destructor /** * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~SecurityCurrent (void); + ~SecurityCurrent (); private: - /// Set the thread-specific storage /// SecurityLevel3::SecurityCurrent implementation. /** @@ -103,10 +100,9 @@ namespace TAO * There is no function that places the implementation pointer * in TSS. The underlying security mechanism does that. */ - SecurityCurrent_Impl * implementation (void); + SecurityCurrent_Impl * implementation (); private: - /** * @name Retricted Copying and Assignment * @@ -119,16 +115,13 @@ namespace TAO //@} private: - /// Thread-specific storage slot assigned to this object. const size_t tss_slot_; /// Pointer to the ORB Core corresponding to the ORB with which /// this object is registered. TAO_ORB_Core * const orb_core_; - }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl index a0f7eac384df4..be13aa17e9833 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl @@ -11,7 +11,7 @@ TAO::SL3::SecurityCurrent::tss_slot () const } ACE_INLINE TAO::SL3::SecurityCurrent_Impl * -TAO::SL3::SecurityCurrent::implementation (void) +TAO::SL3::SecurityCurrent::implementation () { TAO::SL3::SecurityCurrent_Impl *impl = static_cast ( diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index a84279855095f..101cc200fca84 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -46,7 +46,7 @@ namespace TAO { public: /// Destructor. - virtual ~SecurityCurrent_Impl (void); + virtual ~SecurityCurrent_Impl (); /** * @name SecurityLevel3::Current Methods @@ -66,7 +66,6 @@ namespace TAO /// Return the unique tag that identifies the concrete subclass. virtual CORBA::ULong tag () const = 0; }; - } // End Security namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h index 29be6b8bf09ca..6954f63476ae9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h @@ -46,7 +46,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor SecurityManager (SecurityLevel3::CredentialsCurator_ptr cc); @@ -77,22 +76,18 @@ namespace TAO //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - virtual ~SecurityManager (void); + virtual ~SecurityManager (); private: - /// The ORB-specific SecurityLevel3::CredentialsCurator /// reference. SecurityLevel3::CredentialsCurator_var credentials_curator_; - }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index a247302d9f092..7feb54267cd81 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -85,11 +85,11 @@ class TAO_Security_Export TAO_Security_Current protected: /// Destructor /// Protected to force allocation on the heap. - ~TAO_Security_Current (void); + ~TAO_Security_Current (); /// Fully initialize this object. This method is used predominantly /// to set the ORB core pointer. - int init (void); + int init (); /// Set the TSS Security::Current implementation. /** @@ -101,7 +101,7 @@ class TAO_Security_Export TAO_Security_Current * There is no function that places the implementation pointer in * TSS. The underlying security mechanism does that. */ - TAO::Security::Current_Impl *implementation (void); + TAO::Security::Current_Impl *implementation (); private: TAO_Security_Current (const TAO_Security_Current &) = delete; diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl index a799af3e79662..d21fe9a72c1e0 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl @@ -8,7 +8,7 @@ TAO_Security_Current::tss_slot () const } ACE_INLINE TAO::Security::Current_Impl * -TAO_Security_Current::implementation (void) +TAO_Security_Current::implementation () { if (this->orb_core_ == 0 && this->init () != 0) return 0; diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index fad2ea9eeb671..b71ac970fd8a0 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -44,9 +44,8 @@ namespace TAO class TAO_Security_Export Current_Impl { public: - /// Destructor. - virtual ~Current_Impl (void); + virtual ~Current_Impl (); /** * @name SecurityLevel1::Current Methods @@ -76,9 +75,7 @@ namespace TAO /// Return the unique tag that identifies the concrete subclass. virtual CORBA::ULong tag () const = 0; - }; - } // End Security namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index 9dd11a9651827..acea74c9755b3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -36,7 +36,6 @@ namespace TAO { namespace Security { - /** * @class PolicyFactory * @@ -49,11 +48,9 @@ namespace TAO public ::CORBA::LocalObject { public: - virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); }; - } // End Security namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h index 6f8d682a82217..3293c4371782a 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h @@ -30,8 +30,8 @@ class TAO_Svc_Utils_Export Shutdown_Functor virtual void operator() (int which_signal) = 0; protected: - Shutdown_Functor (void) {} - virtual ~Shutdown_Functor (void) {} + Shutdown_Functor () {} + virtual ~Shutdown_Functor () {} }; /** diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index aeb74e75716e4..8576177463240 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -109,7 +109,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, } else if (up2 < lb1) { - ACE_NEW_RETURN (tio, TAO_TIO (0, 0), CosTime::OTNoOverlap); diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index 2bfb6946e00f4..1fda2481d346b 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -39,7 +39,7 @@ class TAO_Time_Serv_Export TAO_TIO : public POA_CosTime::TIO TimeBase::TimeT upper); /// Destructor. - ~TAO_TIO (void); + ~TAO_TIO (); /// This is the get method for the attribute time interval. virtual TimeBase::IntervalT time_interval (); @@ -70,7 +70,7 @@ class TAO_Time_Serv_Export TAO_TIO : public POA_CosTime::TIO * time interval in the TIO and time value is the midpoint of the * interval. */ - virtual CosTime::UTO_ptr time (void); + virtual CosTime::UTO_ptr time (); private: /// This attribute returns an IntervalT structure with the values of diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index 2a7f45e1a0fc0..0f564a41b61b1 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -49,11 +49,11 @@ class TAO_Time_Serv_Export TAO_Time_Service_Clerk : public POA_CosTime::TimeServ const IORS& server); /// Destructor. - ~TAO_Time_Service_Clerk (void); + ~TAO_Time_Service_Clerk (); /// This operation returns the global time and an estimate of /// inaccuracy in a UTO. - virtual CosTime::UTO_ptr universal_time (void); + virtual CosTime::UTO_ptr universal_time (); /** * This operation returns the global time in a UTO only if the time @@ -61,7 +61,7 @@ class TAO_Time_Serv_Export TAO_Time_Service_Clerk : public POA_CosTime::TimeServ * operation is not implemented and throws a CORBA::NO_IMPLEMENT * exception, if called. */ - virtual CosTime::UTO_ptr secure_universal_time (void); + virtual CosTime::UTO_ptr secure_universal_time (); /// This creates a new UTO based on the given parameters. virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time, @@ -76,16 +76,16 @@ class TAO_Time_Serv_Export TAO_Time_Service_Clerk : public POA_CosTime::TimeServ TimeBase::TimeT upper); /// Return the globally synchronized time. - virtual CORBA::ULongLong get_time (void); + virtual CORBA::ULongLong get_time (); /// Returns the time displacement factor. - CORBA::Short time_displacement_factor (void); + CORBA::Short time_displacement_factor (); /// Set the TDF. void time_displacement_factor (CORBA::Short); /// Get method for inaccuracy. - TimeBase::InaccuracyT inaccuracy (void); + TimeBase::InaccuracyT inaccuracy (); /// Set method for inaccuracy. void inaccuracy (TimeBase::InaccuracyT inaccuracy); diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index 2a7b5a0fc051a..b18940177c805 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -36,21 +36,21 @@ class TAO_Time_Serv_Export TAO_Time_Service_Server : public POA_CosTime::TimeSer { public: /// Constructor. - TAO_Time_Service_Server (void); + TAO_Time_Service_Server (); /// Destructor. - ~TAO_Time_Service_Server (void); + ~TAO_Time_Service_Server (); /// This operation returns the current system time and an estimate of /// inaccuracy in a UTO. - virtual CosTime::UTO_ptr universal_time (void); + virtual CosTime::UTO_ptr universal_time (); /** * This operation returns the current time in a UTO only if the time * can be guaranteed to have been obtained securely. Currently this operation * is not implemented and throws a CORBA::NO_IMPLEMENT exception, if called. */ - virtual CosTime::UTO_ptr secure_universal_time (void); + virtual CosTime::UTO_ptr secure_universal_time (); /// This creates a new UTO based on the given parameters. virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time, diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 73007d9845b4a..449fec195b3ce 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -152,7 +152,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto) TAO_TIO (uto_time, this->time ()), CORBA::NO_MEMORY ()); - } else { @@ -160,7 +159,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto) TAO_TIO (this->time (), uto_time), CORBA::NO_MEMORY ()); - } } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h index df5b7066692c5..76e1b1faace04 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -46,27 +46,27 @@ class TAO_Time_Serv_Export TAO_UTO : public POA_CosTime::UTO TimeBase::TdfT tdf); /// Destructor. - ~TAO_UTO (void); + ~TAO_UTO (); /// For the readonly attribute