diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml new file mode 100644 index 0000000000000..9f2b8ae0876ca --- /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@v4 + - name: checkout MPC + uses: actions/checkout@v4 + 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 f67073b915120..f4c14fdec7662 100644 --- a/.github/workflows/face.yml +++ b/.github/workflows/face.yml @@ -11,6 +11,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + jobs: build: strategy: @@ -21,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: @@ -32,9 +35,9 @@ jobs: CXX: ${{ matrix.CXX }} steps: - name: checkout ACE/TAO - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: checkout MPC - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index 42002aeb5926c..67680c480dc51 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -11,6 +11,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + jobs: build: runs-on: ubuntu-latest @@ -20,7 +23,7 @@ jobs: steps: - name: checkout ACE/TAO - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run fuzz run: | perl ${env:ACE_ROOT}/bin/fuzz.pl diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e5a50b5548f8d..c95cc80a0a2a8 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -11,75 +11,79 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + jobs: build: + permissions: + actions: read # for github/codeql-action/init to get workflow details + contents: read # for actions/checkout to fetch code + security-events: write # for github/codeql-action/analyze to upload SARIF results strategy: fail-fast: false matrix: include: - - CC: gcc-4.8 - CXX: g++-4.8 - PackageDeps: g++-4.8 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 - - CC: gcc-6 - CXX: g++-6 - PackageDeps: g++-6 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-18.04 - CC: gcc-7 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 - optional_macros: CCFLAGS+=-std=c++20 + optional_macros: c++std=c++20 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-20.04 - - CC: clang-5.0 - CXX: clang++-5.0 - PackageDeps: clang-5.0 - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU - os: ubuntu-18.04 + os: ubuntu-22.04 + - CC: gcc-12 + CXX: g++-12 + PackageDeps: g++-12 + optional_macros: c++std=c++20 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-22.04 + - CC: gcc-13 + CXX: g++-13 + PackageDeps: g++-13 + optional_macros: c++std=c++20 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + os: ubuntu-22.04 - CC: clang-6.0 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 @@ -104,12 +108,24 @@ jobs: Repo: llvm-toolchain-$(lsb_release -cs)-13 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU os: ubuntu-20.04 + - CC: clang-14 + CXX: clang++-14 + PackageDeps: clang-14 + 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 @@ -117,7 +133,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 @@ -152,17 +168,21 @@ jobs: CXX: ${{ matrix.CXX }} steps: - name: Checkout ACE_TAO - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout MPC - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} - - name: Add apt repo ${{ matrix.Repo }} + - name: Add LLVM apt repo ${{ matrix.Repo }} run: | - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - + 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 != '' + if: startsWith (matrix.Repo, 'llvm-toolchain') + - name: Add PPA apt repo ${{ matrix.Repo }} + run: | + sudo apt-add-repository ${{ matrix.Repo }} + if: startsWith (matrix.Repo, 'ppa:') - name: Add apt packages ${{ matrix.PackageDeps }} run: | sudo apt-get --yes update @@ -200,7 +220,7 @@ jobs: if: matrix.optional_feature != '' shell: pwsh - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v3 with: languages: cpp if: matrix.feature == 'CodeQL' @@ -216,6 +236,10 @@ jobs: run: | perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDL_Test -workers 4 shell: pwsh + - name: Run mwc.pl on $(TAO_ROOT)/tests/IDLv4 + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDLv4 -workers 4 + shell: pwsh - name: Build TAO_ACE workspace run: | make -j 6 -C ${env:TAO_ROOT} @@ -229,8 +253,12 @@ jobs: make -j 6 -C ${env:TAO_ROOT}/tests/IDL_Test shell: pwsh if: matrix.feature != 'CORBA/e micro' + - name: Build TAO/tests/IDLv4 project + run: | + make -j 6 -C ${env:TAO_ROOT}/tests/IDLv4 + shell: pwsh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v3 if: matrix.feature == 'CodeQL' - name: Install TAO_ACE workspace run: | diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index f344f7d66c7e2..91e90be6eb331 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -11,12 +11,15 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + jobs: build: strategy: fail-fast: false matrix: - os: [macos-10.15, macos-11.0] + os: [macos-11, macos-12] include: - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU runs-on: ${{ matrix.os }} @@ -27,9 +30,9 @@ jobs: MPC_ROOT: ${{ github.workspace }}/MPC steps: - name: checkout ACE/TAO - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: checkout MPC - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} @@ -58,6 +61,10 @@ jobs: run: | perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDL_Test -workers 4 shell: pwsh + - name: Run mwc.pl on $(TAO_ROOT)/tests/IDLv4 + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/tests/IDLv4 -workers 4 + shell: pwsh - name: Build TAO_ACE project run: | make -j 6 -C ${env:TAO_ROOT} @@ -66,8 +73,12 @@ jobs: run: | make -j 6 -C ${env:ACE_ROOT}/tests shell: pwsh -# Requires fixing of https://github.com/DOCGroup/ACE_TAO/issues/1525 -# - name: Build TAO/tests/IDL_Test project -# run: | -# make -j 6 -C ${env:TAO_ROOT}/tests/IDL_Test -# shell: pwsh + - name: Build TAO/tests/IDL_Test project + run: | + make -j 6 -C ${env:TAO_ROOT}/tests/IDL_Test + shell: pwsh + - name: Build TAO/tests/IDLv4/maps project + run: | + make -j 6 -C ${env:TAO_ROOT}/tests/IDLv4 + shell: pwsh + diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cf7eb6edeb7b6..b35c6869050cc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -24,7 +24,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: 'openssl xerces-c[xmlch-wchar] zlib' + vcpkgpackages: '"openssl", {"name": "xerces-c", "features": ["xmlch-wchar"]}, "zlib"' OptionalFeatures: uses_wchar=1 - name: VS2019Debug64 vmimage: windows-2019 @@ -33,7 +33,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c zlib + vcpkgpackages: '"openssl", "xerces-c", "zlib"' - name: VS2019Release64 vmimage: windows-2019 mpctype: vs2019 @@ -41,7 +41,7 @@ jobs: BuildConfiguration: Release vcpkgarch: x64-windows vcpkglibdir: lib - vcpkgpackages: openssl xerces-c zlib + vcpkgpackages: '"openssl", "xerces-c", "zlib"' - name: VS2019Debug32 vmimage: windows-2019 mpctype: vs2019 @@ -49,7 +49,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x86-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c zlib + vcpkgpackages: '"openssl", "xerces-c", "zlib"' - name: VS2019Release32 vmimage: windows-2019 mpctype: vs2019 @@ -57,7 +57,7 @@ jobs: BuildConfiguration: Release vcpkgarch: x86-windows vcpkglibdir: lib - vcpkgpackages: openssl xerces-c zlib + vcpkgpackages: '"openssl", "xerces-c", "zlib"' - name: VS2019Debug64Cxx17 vmimage: windows-2019 mpctype: vs2019 @@ -65,7 +65,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c zlib + vcpkgpackages: '"openssl", "xerces-c", "zlib"' OptionalMpcArgs: -value_template LanguageStandard=stdcpp17 - name: VS2019Debug64Cxx20 vmimage: windows-2019 @@ -74,7 +74,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c zlib + vcpkgpackages: '"openssl", "xerces-c", "zlib"' OptionalMpcArgs: -value_template LanguageStandard=stdcpp20 - name: VS2022WChar vmimage: windows-2022 @@ -83,7 +83,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: 'openssl xerces-c[xmlch-wchar] zlib' + vcpkgpackages: '"openssl", {"name": "xerces-c", "features": ["xmlch-wchar"]}, "zlib"' OptionalFeatures: uses_wchar=1 - name: VS2022Debug64 vmimage: windows-2022 @@ -92,7 +92,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c zlib + vcpkgpackages: '"openssl", "xerces-c", "zlib"' - name: VS2022Release64 vmimage: windows-2022 mpctype: vs2022 @@ -100,7 +100,7 @@ jobs: BuildConfiguration: Release vcpkgarch: x64-windows vcpkglibdir: lib - vcpkgpackages: openssl xerces-c zlib + vcpkgpackages: '"openssl", "xerces-c", "zlib"' runs-on: ${{ matrix.vmimage }} name: ${{ matrix.name }} env: @@ -108,27 +108,31 @@ jobs: TAO_ROOT: ${{ github.workspace }}/TAO MPC_ROOT: ${{ github.workspace }}/MPC VCPKG_ROOT: ${{ github.workspace }}/vcpkg - XERCESC_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include - XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} - SSL_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include - SSL_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} - ZLIB_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include - ZLIB_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} + XERCESC_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include + XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} + SSL_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include + SSL_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} + ZLIB_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include + ZLIB_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} + VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkgarch }} + VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed steps: - name: checkout ACE/TAO - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: checkout MPC - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} + - name: create vcpkg.json + run: | + '{"name": "tao","version-string": "githubaction","dependencies": [ ${{ matrix.vcpkgpackages }} ]}' > vcpkg.json + shell: pwsh - name: Install vcpkg - uses: lukka/run-vcpkg@v7 + uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: b86c0c35b88e2bf3557ff49dc831689c2f085090 - vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }} - vcpkgTriplet: ${{ matrix.vcpkgarch }} - appendedCacheKey: ${{ matrix.name }} + vcpkgGitCommitId: c8696863d371ab7f46e213d8f5ca923c4aef2a00 + runVcpkgInstall: true - name: create $ACE_ROOT/ace/config.h run: | '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h @@ -183,9 +187,9 @@ jobs: MPC_ROOT: ${{ github.workspace }}/MPC steps: - name: checkout ACE/TAO - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: checkout MPC - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} diff --git a/.gitignore b/.gitignore index 949cea02040ab..74e9997a0eec6 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ .depend.* GNUmakefile* +local.mwc *.ior .obj/ *.iobj @@ -30,6 +31,7 @@ lib*.so* lib*.dylib *~ ipch/ +*.vsidx /ACE/ace/config.h /ACE/bin/MakeProjectCreator/config/default.features @@ -39,6 +41,7 @@ ipch/ /build /ACE/build /TAO/build +/MPC *.o *.res @@ -46,3 +49,5 @@ ipch/ *.VC.db* *.tds *.*codeanalysis* +read.lock +fileList.bin diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index 277d398efe7d2..22cd80cdeaf4f 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -77,7 +77,7 @@

Synopsis

  • Working with ACE in Eclipse
  • Advanced Topics
  • Building from git
  • - +


    @@ -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, - Tru64, 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

    @@ -330,7 +329,7 @@

    Using the Traditional ACE/GNU Configuration - TSCH/CSH: + TCSH/CSH: setenv ACE_ROOT /home/cs/faculty/schmidt/ACE_wrappers
    @@ -428,6 +427,9 @@

    Using the Traditional ACE/GNU Configuration
  • If you've set the INSTALL_PREFIX before building, now run
    % make install
    +

    An alternative to directly running make install is to use $ACE_ROOT/bin/install_proj.sh + which will only install projects that are built (instead of trying to build each one during make install). +

  • If you need to regenerate the ace/Svc_Conf_y.cpp file, you'll need to @@ -676,15 +678,10 @@

    Building and Installing ACE on Windows with Embarcader Codeguard support. Should only be used when DEBUG is also set
    set CODEGUARD=1

    - By default we are using the clang based compilers. At the moment you - want to compile using the old bcc32 compiler set the CLASIC environment variable
    - set CLASSIC=1
    -
    - Set the environment variable below to build a version of ACE optimized - for a certain CPU. For this there are special compiler flags - (-3/-4/-5/-6), see the Embarcadero help for more info.
    - set CPU_FLAG=-6
    + Set one of the following environment variable to 1 to select which Embarcadero + C++ compiler has to be used. Valid environment variables are BCC32, BCC32C, and BCC64.
    + set BCC32=1
    You can then start the build with the command
    make -f Makefile.bmak all

    @@ -2065,87 +2062,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 @@ -2206,41 +2122,6 @@

    Installation Notes

    maintains this code. In addition, he also maintains a version of FSU pthreads.

    -

  • SGI IRIX 5.x and 6.x

    - - ACE used to build fine using the SGI C++ and GNU GCC compilers - for IRIX 5.x. It has been ported to IRIX 6.x using the SGI - MipsPro 7.1 C++ compiler; be aware that in IRIX 6.2 there is a - number of patches that have to be installed and exceptions - appear to fail with the O32 ABI. Please check the config files - for the details.

    - -

  • OSF/1 3.2 and 4.0 (a.k.a. Digital UNIX 4.0)

    - - The Digital UNIX C++ 5.4 through 5.7 compilers have problems - with ACE's templates. They compile the lib and most of the test - programs, although they warn about template usage. Most tests - run, some dump core. If you use a 5.x version of cxx, be sure - to set the CXX_VER variable to CXX_5, either on your make - command line or in an environment variable. The ACE Makefiles - assume by default that the cxx version is 6.x or later.

    - - CXX 6.0 and 6.1 are much improved over 5.x: V6.0-020, V6.1-025, - and later build all of ACE cleanly. All of the tests in - $(ACE_ROOT)/tests run successfully with CXX 6.0 and CXX 6.1. - Please note that problems have been reported with some versions - of CXX 6.1, notably versions -021 and earlier. It's best to use - V6.1-022 or later.

    - - NOTE: if you use Digital UNIX 4.0f or later, you must - use ace/config-tru64.h instead of - ace/config-osf1-4.0.h. ace/config-tru64.h - can be used for all supported compilers on any version of - Digital UNIX after and include 4.0. And, with 4.0f and later when - using Digital CXX, you must use - include/makeinclude/platform_tru64_cxx.GNU instead of - include/makeinclude/platform_osf1_4.0.GNU.

    -
  • FreeBSD

    FreeBSD is a fast evolving platform. However, it has the @@ -2472,24 +2353,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 @@ -2609,7 +2472,7 @@

    Compiling ACE with GNU g++

    If you use the GNU GCC g++ compiler please note the following:
      -

    • ACE/TAO needs g++ 4.8 or better. Older versions are not usable anymore

      +

    • ACE/TAO needs g++ 4.8 or better. Older versions are not usable anymore

    • Make sure to update your gcc config.status file. This file is produced when installing gcc; it specifies @@ -2621,14 +2484,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 @@ -3039,7 +2894,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..18ea22948fe83 100644 --- a/ACE/ACEXML/common/HttpCharStream.cpp +++ b/ACE/ACEXML/common/HttpCharStream.cpp @@ -1,6 +1,5 @@ #include "ace/ACE.h" #include "ace/ace_wchar.h" -#include "ace/Auto_Ptr.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" #include "ace/Truncate.h" @@ -19,7 +18,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 +29,7 @@ ACEXML_HttpCharStream::ACEXML_HttpCharStream (void) { } -ACEXML_HttpCharStream::~ACEXML_HttpCharStream (void) +ACEXML_HttpCharStream::~ACEXML_HttpCharStream () { this->close (); } @@ -269,10 +268,10 @@ 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); + std::unique_ptr path_ptr (path); size_t commandsize = ACE_OS::strlen (path) + ACE_OS::strlen (this->url_addr_->get_host_name ()) + 20 // Extra @@ -283,7 +282,7 @@ ACEXML_HttpCharStream::send_request (void) ACE_NEW_RETURN (command, char[commandsize], -1); // Ensure that the memory is deallocated. - ACE_Auto_Basic_Array_Ptr cmd_ptr (command); + std::unique_ptr cmd_ptr (command); int bytes = ACE_OS::sprintf (command, "GET %s HTTP/1.0\r\n", path); bytes += ACE_OS::sprintf (&command[bytes], "Host: %s\r\n", @@ -301,7 +300,7 @@ ACEXML_HttpCharStream::send_request (void) int -ACEXML_HttpCharStream::available (void) +ACEXML_HttpCharStream::available () { if (this->stream_ == 0) return -1; @@ -309,7 +308,7 @@ ACEXML_HttpCharStream::available (void) } int -ACEXML_HttpCharStream::close (void) +ACEXML_HttpCharStream::close () { delete[] this->url_; this->url_ = 0; @@ -333,7 +332,7 @@ ACEXML_HttpCharStream::close (void) } int -ACEXML_HttpCharStream::determine_encoding (void) +ACEXML_HttpCharStream::determine_encoding () { if (this->stream_ == 0) return -1; @@ -377,7 +376,7 @@ ACEXML_HttpCharStream::determine_encoding (void) } void -ACEXML_HttpCharStream::rewind (void) +ACEXML_HttpCharStream::rewind () { if (this->stream_ == 0) return; @@ -390,13 +389,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 +430,7 @@ ACEXML_HttpCharStream::get (ACEXML_Char& ch) } int -ACEXML_HttpCharStream::peek (void) +ACEXML_HttpCharStream::peek () { if (this->stream_ == 0) return -1; @@ -469,7 +468,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..f136478a733ef 100644 --- a/ACE/ACEXML/common/URL_Addr.cpp +++ b/ACE/ACEXML/common/URL_Addr.cpp @@ -5,13 +5,13 @@ #endif /* __ACEXML_INLINE__ */ #include "ace/Log_Msg.h" -#include "ace/Auto_Ptr.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_string.h" +#include -ACEXML_URL_Addr::ACEXML_URL_Addr (void) +ACEXML_URL_Addr::ACEXML_URL_Addr () : path_name_ (0), addr_string_ (0), addr_string_len_ (0) @@ -94,7 +94,7 @@ ACEXML_URL_Addr::string_to_addr (const ACEXML_Char* s, ACE_NEW_RETURN (host_name, ACEXML_Char[host_len + 1], -1); ACE_OS::strncpy (host_name, s + http_len, host_len); host_name[host_len] = '\0'; - ACE_Auto_Basic_Array_Ptr cleanup_host_name (host_name); + std::unique_ptr cleanup_host_name (host_name); // Get the port number (if any) unsigned short port = ACE_DEFAULT_HTTP_PORT; @@ -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.cpp b/ACE/ACEXML/common/XML_Codecs.cpp index 3e3860776e5e6..657154f31bc2c 100644 --- a/ACE/ACEXML/common/XML_Codecs.cpp +++ b/ACE/ACEXML/common/XML_Codecs.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- -#include "ace/Auto_Ptr.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" #include "ACEXML/common/XML_Codecs.h" +#include ACEXML_Char* ACEXML_Base64::encode (const ACEXML_Char* input, @@ -17,7 +17,7 @@ ACEXML_Base64::encode (const ACEXML_Char* input, ACE_NEW_RETURN (buf, ACE_Byte[len], 0); - ACE_Auto_Basic_Array_Ptr cleanup_buf (buf); + std::unique_ptr cleanup_buf (buf); for (size_t i = 0; i < len; ++i) buf[i] = (ACE_Byte)input[i]; @@ -59,7 +59,7 @@ ACEXML_Base64::decode (const ACEXML_Char* input, ACE_Byte[len], 0); - ACE_Auto_Basic_Array_Ptr cleanup (buf); + std::unique_ptr cleanup (buf); for (size_t i = 0; i < len; ++i) buf[i] = (ACE_Byte)input[i]; 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..aaae69da8acbd 100644 --- a/ACE/ACEXML/examples/SAXPrint/main.cpp +++ b/ACE/ACEXML/examples/SAXPrint/main.cpp @@ -6,7 +6,6 @@ #include "Print_Handler.h" #include "SAXPrint_Handler.h" #include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" #include "ace/Log_Msg.h" #include "ace/OS_main.h" @@ -115,7 +114,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..bafeedef8d6a0 100644 --- a/ACE/ACEXML/parser/parser/Parser.cpp +++ b/ACE/ACEXML/parser/parser/Parser.cpp @@ -12,6 +12,7 @@ #include "ACEXML/parser/parser/ParserInternals.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" +#include static const ACEXML_Char default_attribute_type[] = ACE_TEXT ("CDATA"); static const ACEXML_Char empty_string[] = { 0 }; @@ -28,7 +29,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 +52,8 @@ ACEXML_Parser::ACEXML_Parser (void) { } -ACEXML_Parser::~ACEXML_Parser (void) +ACEXML_Parser::~ACEXML_Parser () { - } int @@ -203,7 +203,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 +263,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 +307,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; @@ -319,7 +319,7 @@ ACEXML_Parser::parse_external_dtd (void) if (this->validate_) { ACEXML_Char* uri = this->normalize_systemid (systemId); - ACE_Auto_Basic_Array_Ptr cleanup_uri (uri); + std::unique_ptr cleanup_uri (uri); ACEXML_InputSource* ip = 0; if (this->entity_resolver_) { @@ -349,7 +349,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 +396,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 +458,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 +511,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 +562,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 +1004,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 +1042,7 @@ ACEXML_Parser::parse_cdata (void) int -ACEXML_Parser::parse_entity_decl (void) +ACEXML_Parser::parse_entity_decl () { ACEXML_Char nextch = 0; @@ -1169,7 +1169,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 +1228,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 +1262,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 +1274,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 +1334,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 +1452,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 +1547,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 +1611,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 +1665,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 +1902,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 +1996,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) @@ -2092,7 +2092,7 @@ ACEXML_Parser::parse_entity_reference (void) else { ACEXML_Char* uri = this->normalize_systemid (systemId); - ACE_Auto_Basic_Array_Ptr cleanup_uri (uri); + std::unique_ptr cleanup_uri (uri); ACEXML_InputSource* ip = 0; if (this->entity_resolver_) { @@ -2122,7 +2122,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) @@ -2185,7 +2185,7 @@ ACEXML_Parser::parse_PE_reference (void) else if (this->external_entity_ && this->validate_) { ACEXML_Char* uri = this->normalize_systemid (systemId); - ACE_Auto_Basic_Array_Ptr cleanup_uri (uri); + std::unique_ptr cleanup_uri (uri); ACEXML_InputSource* ip = 0; if (this->entity_resolver_) { @@ -2613,7 +2613,6 @@ ACEXML_Parser::getFeature (const ACEXML_Char *name) } - void ACEXML_Parser::setFeature (const ACEXML_Char *name, int boolean_value) { @@ -2683,7 +2682,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 +2700,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 +2721,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 +2755,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 +2801,7 @@ ACEXML_Parser::parse_xml_decl (void) } int -ACEXML_Parser::parse_comment (void) +ACEXML_Parser::parse_comment () { int state = 0; @@ -2827,7 +2826,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 +2872,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..ad3213186a19e 100644 --- a/ACE/ACEXML/parser/parser/Parser.h +++ b/ACE/ACEXML/parser/parser/Parser.h @@ -29,7 +29,6 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Unbounded_Set.h" #include "ace/Containers_T.h" -#include "ace/Auto_Ptr.h" #include "ACEXML/parser/parser/Entity_Manager.h" #include "ACEXML/parser/parser/ParserInternals.h" #include "ACEXML/parser/parser/ParserContext.h" @@ -131,7 +130,6 @@ class ACEXML_PARSER_Export ACEXML_Parser : public ACEXML_XMLReader virtual void setErrorHandler (ACEXML_ErrorHandler *handler); - protected: /** * Parse XML Prolog. @@ -560,7 +558,6 @@ class ACEXML_PARSER_Export ACEXML_Parser : public ACEXML_XMLReader virtual ACEXML_Char peek (); private: - // *** Helper functions for parsing XML /** @@ -841,7 +838,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_7 b/ACE/ChangeLogs/ACE-7_0_7 new file mode 100644 index 0000000000000..f16c91edb43be --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_0_7 @@ -0,0 +1,577 @@ +commit 44e5772d323a1b19bb88b992d0a633b358e991ee +Author: Johnny Willemsen +Date: Wed May 18 14:47:40 2022 +0200 + + Fixed typo + + * ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp: + * ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp: + * ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp: + * ACE/examples/QOS/Change_Sender_TSpec/sender.cpp: + * ACE/examples/QOS/Simple/receiver.cpp: + * ACE/examples/QOS/Simple/sender.cpp: + +commit a58e3e099b9cebd45f84d737f1adadf2e46b499c +Author: Son Dinh +Date: Tue May 10 11:05:27 2022 -0500 + + From review + +commit 5c90e03d58bffc9e5dd0576fb94267025e720224 +Author: Son Dinh +Date: Mon May 9 14:21:13 2022 -0500 + + Return when core files are handled by a dedicated service + +commit 4dbf47e7ba09aad965301d232f52609dd09d3ce4 +Merge: 63e14ff77e1 acdabc7e61d +Author: Adam Mitz +Date: Fri May 6 15:48:23 2022 -0500 + + Merge pull request #1826 from iguessthislldo/igtd/phony-postbuild + + gnuace: Mark `__postbuild__` Target as PHONY + +commit 24225a08a3556ae450c8f8cd89815c085ad8998b +Author: Son Dinh +Date: Wed May 4 16:14:30 2022 -0500 + + From review + +commit 453d79a3d34cd46867613401dced66b001a89cb1 +Author: Son Dinh +Date: Tue May 3 12:05:17 2022 -0500 + + From review + +commit f2f9cae32512a17a58ab853736fcbcd60671f484 +Author: Son Dinh +Date: Fri Apr 29 17:41:07 2022 -0500 + + Choosing debugger is configurable + +commit a334d5c29adbeb3997c8474284cc51b3805fedea +Author: Son Dinh +Date: Fri Apr 29 16:45:38 2022 -0500 + + From review + +commit 5c38ce72996e395e7154432193e3c01bac353b83 +Author: Son Dinh +Date: Fri Apr 29 16:30:31 2022 -0500 + + Add support for macOS & fixed errors + +commit fe2ccd51aabca2023d8781bfda8ed3162a639445 +Author: Son Dinh +Date: Thu Apr 28 18:22:28 2022 -0500 + + Update logs + +commit aeccee26e472d4397b3910727fc777230174a2ac +Author: Son Dinh +Date: Thu Apr 28 18:07:18 2022 -0500 + + Update WaitKill + +commit 78cb035440f146ee3772cf695d7eb3202c897b98 +Author: Son Dinh +Date: Thu Apr 28 17:39:07 2022 -0500 + + Print out stack trace + +commit acdabc7e61d494db0e6b6ce85245df7bf225d7c1 +Author: Fred Hornsey +Date: Mon Apr 25 13:17:30 2022 -0500 + + gnuace: Mark __postbuild__ Target as PHONY + + To prevent it from being created as a file when `make --touch` is used. + +commit b1bd82f99d4f2e5aa199e78fd29e302937797e13 +Author: Steve Huston +Date: Mon Apr 25 20:52:08 2022 +0000 + + Add required operator= instances to match explicit copy ctors + +commit 735c0f60ba0620af930429e3ea12df4e2dd5dbbd +Author: Steve Huston +Date: Mon Apr 25 09:55:16 2022 -0400 + + Restore getpid() result cast to int; resolves compile warning. + +commit 142ad92d0b0394f67d718748d1a7fc5bc5e0bec6 +Author: Steve Huston +Date: Thu Apr 21 17:09:45 2022 +0000 + + Remove tabs + +commit e214db007eba0a7f293e44c3ee2fbbedab38b0c4 +Author: Steve Huston +Date: Thu Apr 21 17:02:57 2022 +0000 + + Replace fallthrough with ACE_FALLTHROUGH + +commit 296d113203ffb70fb8c81c3ce244bf810c17e834 +Author: Steve Huston +Date: Thu Apr 21 14:53:42 2022 +0000 + + Restore pre-PR version from master; my changes did not add value + +commit aca25f19f8e6a38281ea2db2de4c9881b1353168 +Merge: 17b13ace970 2693429c133 +Author: Steve Huston +Date: Thu Apr 21 14:33:04 2022 +0000 + + Merge branch 'master' into debian11-gcc10 + +commit 9bda3c74358d8c5f09bd4d408860484cd7f7ac29 +Author: Son Dinh +Date: Wed Apr 6 13:00:30 2022 -0500 + + Update doc and add argument to SpawnWaitKill + +commit 738090b3f90575ee5801406d4357b003dd544a92 +Author: Son Dinh +Date: Mon Apr 4 17:00:53 2022 -0500 + + Update Kill function + +commit 9ebdc646d2dc45af1c73fd81e2c4dfaae5dcbf34 +Author: Son Dinh +Date: Mon Apr 4 12:31:09 2022 -0500 + + Indicating if a process can self crash and get signal info + +commit bee659a4ec8cb572f009ddd854827d5136d3a231 +Author: Erik Sohns +Date: Sun Apr 10 21:18:28 2022 +0200 + + silence warning about non-virtual dtor + +commit 89a831ce128745b0a7c904c3c3940f7cf2b56971 +Author: Erik Sohns +Date: Sun Apr 10 17:40:51 2022 +0200 + + support modifying the SSL connection context before ssl_connect() is called with it. Allows implementing support for e.g. TLS SNI. + +commit 17b13ace9707518deb2edce9b033f7f626878926 +Author: Steve Huston +Date: Mon Apr 4 15:26:13 2022 +0000 + + Correction for inadvertently replaced default copy constructor with explicit one + +commit 39e6f9d39b63b83c01fc9ae0d016c9d1c5240094 +Author: Steve Huston +Date: Mon Apr 4 15:00:30 2022 +0000 + + Un-tabify + +commit 497d3c7a3ab493c8598a581ce4507ca81c6b32cc +Author: Steve Huston +Date: Mon Apr 4 14:56:19 2022 +0000 + + Move methods to their old place in the file to avert spurious diff + +commit a846e371dfc91c6472ed400c3abbc41292a247bf +Author: Steve Huston +Date: Mon Apr 4 14:47:49 2022 +0000 + + Remove extraneous blank line + +commit 1ffdd13ded89a554f84a5d4d0fd42e8ec4f0d3f2 +Author: Steve Huston +Date: Mon Apr 4 14:44:21 2022 +0000 + + Correct spelling error + +commit ab21cb036ead68d8be6ffafeb22567d42f232c38 +Author: Steve Huston +Date: Mon Apr 4 14:43:59 2022 +0000 + + Fix line splitting + +commit e06cadc3b95a577e6a8bbc94f93dd063710c73a1 +Author: Fabrice Fontaine +Date: Sun Apr 3 15:25:49 2022 +0200 + + ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl + + Fix the following build failure with libressl: + + /home/autobuild/autobuild/instance-10/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:174:7: error: 'BIO_get_init' was not declared in this scope; did you mean 'BIO_set_init'? + 174 | if (BIO_get_init(pBIO) == 0 || p_stream == 0 || buf == 0 || len <= 0) + | ^~~~~~~~~~~~ + | BIO_set_init + + Fixes: + - http://autobuild.buildroot.org/results/386afa88ac9e5e3bb65dddeabf610bb1e9bc4285 + + Signed-off-by: Fabrice Fontaine + +commit 47039208a82664652ca6d8738c638366bbb4e94d +Author: Steve Huston +Date: Fri Apr 1 18:24:14 2022 +0000 + + Remove duplicated copy ctor and assignment operators brought in from Riverace-6.2 branch. + +commit a5480283648adb3ae8214deb830df6ee26ccfa62 +Author: Steve Huston +Date: Fri Apr 1 18:22:17 2022 +0000 + + Replace inadvertently removed change + +commit 58a1a57b1a11121f76e34bd8a443bb026a042b7c +Author: Steve Huston +Date: Fri Apr 1 18:20:17 2022 +0000 + + Remove extraneous ACE_FALLTHROUGH + +commit 232604ca9f6d2ab57046f53f8954d01ff19c2810 +Author: Steve Huston +Date: Thu Mar 31 22:39:42 2022 +0000 + + Move operator= to corret place; per Howard 3/31/2022 + +commit 23aeab853eb30f1803d15a0ffc51c4ad2c8c278e +Author: Steve Huston +Date: Tue Mar 29 20:41:03 2022 +0000 + + Add abspath converter to rc compile to work on linked builds + +commit 297cb477deb10625c5f095f50f4095ac16e9461e +Author: Steve Huston +Date: Tue Mar 29 20:38:56 2022 +0000 + + Add explicit copy constructor per Howard Finer + +commit e04b4e5c0d713026fb58bb580dd8f66a5cd6282a +Author: Steve Huston +Date: Fri Oct 10 21:58:31 2014 +0000 + + Pick up changes from this set: + Commit ad906bbed19 + ChangeLogTag:Thu Oct 9 16:21:38 UTC 2014 Steve Huston + +commit 9b7b7079f31ca77db96bd1e075b52002e894453b +Author: Steve Huston +Date: Sat Mar 19 19:31:27 2022 +0000 + + Add CPP14 and 11 mechanisms to allow fallthrough + +commit 1d031ea873eaf15ef546c1cd08fbe5d63afe8e34 +Author: Steve Huston +Date: Sat Mar 19 19:30:31 2022 +0000 + + Refactor switch to avoid fallthrough and read easier + +commit 039562b6305e44e5792b5aaf4808b0bca12f6443 +Author: Steve Huston +Date: Sat Mar 19 18:01:46 2022 +0000 + + Refactor preproc so ACE_HAS_CPU_SET_T is obeyed + +commit c68ab9eeb399cc93e5663918c6b0957ad7703348 +Author: Steve Huston +Date: Wed Mar 16 20:03:19 2022 -0400 + + Move ACE_Handle_Set copy ctor to inl + +commit de7c57dbeb079dc74ca0844972b1475b88fce52e +Author: Steve Huston +Date: Wed Mar 16 20:02:16 2022 -0400 + + Add ACE_FALLTHROUGH macro that adjusts to c++17 or earlier + +commit b20918731b7339c4f5d1fa4ded6325fab6cfbb90 +Author: Steve Huston +Date: Wed Mar 16 16:47:41 2022 -0400 + + Apply diffs from Howard + +commit b9654cc5f0282de43ecd4fd15c5bcdd84705dcda +Merge: 8dedd23775b a5ca07d8448 +Author: Johnny Willemsen +Date: Mon Mar 28 07:48:33 2022 +0200 + + Merge pull request #1806 from esohns/task_flush_virtual + + make ACE_Task::flush virtual + +commit 17e36960c19c402dc1ab3c3fbf68be3f5c8b62a3 +Author: Vemund Handeland +Date: Sun Mar 27 13:29:04 2022 +0200 + + Add missing memory include + +commit 0258f8170a6e943cf861c01e176955a0c9592544 +Merge: 0842ba4d03d 03a6cf5c202 +Author: Johnny Willemsen +Date: Fri Mar 25 16:02:42 2022 +0100 + + Merge pull request #1807 from jwillemsen/jwi-defaultdelete + + Make use of delete/default/nullptr + +commit 03a6cf5c202a1931c6a66a1e3002be0dac3a2db0 +Author: Johnny Willemsen +Date: Fri Mar 25 14:06:14 2022 +0100 + + Make use of delete/default/nullptr + + * ACE/ace/Configuration.cpp: + * ACE/ace/Configuration.h: + * ACE/ace/Configuration.inl: + * ACE/ace/Configuration_Import_Export.cpp: + * ACE/ace/Configuration_Import_Export.h: + * ACE/ace/Dirent_Selector.h: + +commit a5ca07d8448c53a71fccb4a53403a88a59f9828c +Author: Erik Sohns +Date: Fri Mar 25 12:21:13 2022 +0100 + + make ACE_Task::flush virtual. Note: this call should not be on a hot path. + +commit 1c722f323311567f1528e083b4840bb64a95d87e +Author: Erik Sohns +Date: Tue Mar 22 20:10:06 2022 +0100 + + increase usability of ACE_Stream + +commit 192fa0c41a6f5d4a5c31e049d519b57d30aa1a81 +Merge: ce3b8b760b2 878be948f00 +Author: Johnny Willemsen +Date: Fri Feb 18 15:27:45 2022 +0100 + + Merge pull request #1793 from jwillemsen/jwi-doubledefinecheck + + Cleanup double check + +commit 878be948f00070348299fc14c3b712372c1f7d1d +Author: Johnny Willemsen +Date: Fri Feb 18 09:33:30 2022 +0100 + + Cleanup double check + + * ACE/ace/OS_NS_Thread.inl: + +commit aefa4830967443e6d9cfad62c6720c36d1117ca7 +Author: Sudip Mukherjee +Date: Mon Feb 14 21:33:04 2022 +0000 + + Sync debian/* files for ACE + + Signed-off-by: Sudip Mukherjee + +commit 79c6e76aa604bcc83e2db1608ab1a1af1960141a +Author: Erik Sohns +Date: Wed Feb 9 08:45:33 2022 +0100 + + support thread naming via pthread_setname_np() if available (#1763) + + * added option to use pthread_setname_np() if available + + Co-authored-by: Erik Sohns + +commit 61cf7303a4dd2d48a22134031dce467b0b5d39c6 +Author: Erik Sohns +Date: Wed Feb 9 08:40:56 2022 +0100 + + support subclassing ACE_Stream (#1780) + + * support sub-classing ACE_Stream + + Co-authored-by: Erik Sohns + +commit 0d11899fc5c8ecdd52e12ff98324f085109e329f +Merge: ab053fad273 89a599e2c4d +Author: Johnny Willemsen +Date: Mon Feb 7 17:02:22 2022 +0100 + + Merge pull request #1781 from jwillemsen/jwi-doxygen4 + + Upgrade doxygen config files to the latest version of doxygen + +commit 89a599e2c4d2d3fe65c1dc4078c2e3a910bff326 +Author: Johnny Willemsen +Date: Mon Feb 7 14:30:57 2022 +0100 + + Upgrade doxygen config files to the latest version of doxygen + +commit ab053fad2737cb08dcc1230e9314843612224e40 +Merge: a943c630241 b1f656faa86 +Author: Johnny Willemsen +Date: Sun Feb 6 21:23:17 2022 +0100 + + Merge pull request #1764 from esohns/missing_ctor_initializers + + added some missing ctor initializers + +commit b1f656faa86512791a4fc641748a91e16a5b8d79 +Author: Erik Sohns +Date: Sat Feb 5 11:13:56 2022 +0100 + + Revert "fixed potential leak in out-of-memory situation" + + This reverts commit 3152d6827c3a93a811fe862c93bd36a329e1037a. + +commit 077446ec256623ebd90a12e8d0f3b4557f0d6579 +Author: Erik Sohns +Date: Sat Feb 5 11:07:32 2022 +0100 + + conform with C++11 + +commit a85885d41a8ea2b730fd3de987ac0ee0925d5a5e +Author: Johnny Willemsen +Date: Wed Feb 2 15:44:54 2022 +0100 + + Removed redundant void + +commit b394f19b420212653b828ac72506727913c159fe +Author: Johnny Willemsen +Date: Wed Feb 2 15:41:36 2022 +0100 + + Removed redundant void + + * ACE/ace/Filecache.h: + +commit 6c5166ddd90fb7eb75320f44322162cc5ccc02b1 +Author: Johnny Willemsen +Date: Wed Feb 2 15:40:43 2022 +0100 + + Use nullptr + + * ACE/ace/Timer_Queue_T.h: + +commit 46f2c5a82a96aa222450db61c3de04071074a18b +Author: Johnny Willemsen +Date: Wed Feb 2 15:40:06 2022 +0100 + + Use deleted copy/assignment instead of ACE_Copy_Disabled + + * ACE/ace/Event_Handler_Handle_Timeout_Upcall.cpp: + * ACE/ace/Event_Handler_Handle_Timeout_Upcall.h: + +commit 692708de6220a181c569155bac91c76e7a2f7e14 +Author: Johnny Willemsen +Date: Wed Feb 2 15:36:49 2022 +0100 + + Use nullptr + + * ACE/ace/Node.h: + +commit af15dd3a4ed854d8c1c7a74a5f0b004b5d768be4 +Author: Johnny Willemsen +Date: Wed Feb 2 15:36:37 2022 +0100 + + Use deleted copy/assignment instead of Copy_Disabled + + * ACE/ace/Notification_Queue.cpp: + * ACE/ace/Notification_Queue.h: + +commit 98dcdf61448837f074787eaf47096f05bb2ade28 +Merge: 8d5a781cb31 44e18307771 +Author: Johnny Willemsen +Date: Tue Jan 25 20:29:57 2022 +0100 + + Merge pull request #1773 from jwillemsen/jwi-logging + + Logging changes, updated bczar instructions + +commit 341eb88adc828eef2bbdc5468785224c5315d1b2 +Author: Johnny Willemsen +Date: Fri Jan 21 13:41:15 2022 +0100 + + Remove duplicate semi-colon + +commit a00e497e796b897df46baabad79139219439d162 +Author: Johnny Willemsen +Date: Thu Jan 20 10:18:52 2022 +0100 + + No need to manually create a PR for conda-forge, they have a bot doing that automatically + + * ACE/docs/bczar/bczar.html: + +commit 3092f6ec02e1d9e47c8eb0f08fb5f6f89ece22ae +Author: Johnny Willemsen +Date: Thu Jan 20 10:18:27 2022 +0100 + + Remove ciao-users/ciao-announce from the default list to inform about a release + + * ACE/docs/bczar/bczar.html: + +commit 45c001e0f6affa2fba6f4698e9adb60036599dc1 +Author: Johnny Willemsen +Date: Thu Jan 20 09:52:54 2022 +0100 + + Make x.0.6 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: + * ACE/html/README: + * TAO/NEWS: + +commit 874207d9671c61649e134ae1f5a90ba8b751686b +Merge: 90cf05a0f0a fd284a0a226 +Author: Erik Sohns +Date: Sat Jan 15 18:45:33 2022 +0100 + + Merge branch 'master' of https://github.com/esohns/ACE_TAO into missing_ctor_initializers + +commit 90cf05a0f0a9cddd1a5c385c44546cb8dd2c7b81 +Author: Erik Sohns +Date: Sat Jan 15 18:43:23 2022 +0100 + + added some missing ctor initializations + +commit fd284a0a226f36b48284ff72c345a8a09f9767d6 +Merge: 291fa1d2c50 a8372419d0e +Author: Erik Sohns +Date: Sat Jan 15 18:35:31 2022 +0100 + + Merge branch 'DOCGroup:master' into master + +commit 291fa1d2c50c97858de5596782c28bb9e88c370f +Merge: a12b031aa92 d98b9462f07 +Author: Erik Sohns +Date: Sat Dec 18 22:40:56 2021 +0100 + + Merge branch 'DOCGroup:master' into master + +commit a12b031aa9247ed10816e59fcb1e7f33a947b30c +Merge: 40700d4cc63 c012b2e2c49 +Author: Erik Sohns +Date: Tue Nov 30 21:18:13 2021 +0100 + + Merge branch 'DOCGroup:master' into master + +commit 40700d4cc63c82e5cc35d655ba6fabe115cc1f18 +Merge: adbd935d882 abba742d46e +Author: Erik Sohns +Date: Sat Nov 13 20:51:33 2021 +0100 + + Merge branch 'DOCGroup:master' into master + +commit adbd935d882ca0921b0df38dcedff48fd466a4ab +Merge: c50fbc25f4c 069d2366ec4 +Author: Erik Sohns +Date: Wed Nov 10 19:58:18 2021 +0100 + + Merge branch 'DOCGroup:master' into master + +commit c50fbc25f4ce0422a91e5f41382eca852b53e7d8 +Merge: 3152d6827c3 713b686b403 +Author: Erik Sohns +Date: Sun Oct 17 00:43:02 2021 +0200 + + Merge branch 'DOCGroup:master' into master + +commit 3152d6827c3a93a811fe862c93bd36a329e1037a +Author: Erik Sohns +Date: Mon Oct 4 23:09:52 2021 +0200 + + fixed potential leak in out-of-memory situation diff --git a/ACE/ChangeLogs/ACE-7_0_8 b/ACE/ChangeLogs/ACE-7_0_8 new file mode 100644 index 0000000000000..199225b790030 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_0_8 @@ -0,0 +1,84 @@ +commit 5fd5dddae69d99c336e41bdd3dd7137e79b4f83b +Author: Johnny Willemsen +Date: Tue Jun 28 09:31:45 2022 +0200 + + Minor updates, link to github for notifications and commercial support options + + * ACE/docs/Download.html: + +commit 842114c404a60bc1fa8fd867a506d85ae0c17f43 +Merge: 6c1476eef08 94d132b1738 +Author: Johnny Willemsen +Date: Sat Jun 25 06:49:08 2022 +0200 + + Merge branch 'master' into no_ifdef_anyops_ns + +commit 94d132b173807bb55f8c7481a57a523b4f07ba7e +Merge: 0fd01e75a0b 9fd4f2bd77d +Author: Adam Mitz +Date: Fri Jun 24 15:13:50 2022 -0600 + + Merge pull request #1864 from mitza-oci/g++12 + + GCC 12 + +commit 6c1476eef08213a05f0b2b9b4746d4ff7beda437 +Author: Adam Mitz +Date: Fri Jun 24 15:55:21 2022 -0500 + + Removed ACE_ANY_OPS_USE_NAMESPACE as a compile-time option + +commit 5e9d29efdf8e1654cd19e37edba34c0460521aaf +Author: Adam Mitz +Date: Fri Jun 24 10:48:37 2022 -0500 + + try building on macOS without ACE_ANY_OPS_USE_NAMESPACE + +commit f2fe7927b6894ab38af79cf3c9be760448cf5ee9 +Author: Adam Mitz +Date: Thu Jun 23 22:51:20 2022 -0500 + + -fdelayed-template-parsing workaround for clang no longer needed + +commit 2a37e231fb737e52ac2a7028f7cc1afae3fcc6a4 +Author: chaof +Date: Wed Jun 22 15:53:26 2022 +0800 + + Update Service_Gestalt.cpp + + Fix compiling error resulted from misspelling word std::unique_ptr. + +commit e1f7c3ba17c4f57cc3c624285f7009f4d5145cca +Author: Johnny Willemsen +Date: Tue Jun 14 08:40:39 2022 +0200 + + Removed redundant void + + * ACE/ace/NT_Service.h: + * TAO/tests/MT_Server/test_i.h: + +commit ef9ea413c1a7b869969f175be943cb56cc3ca0ce +Author: Johnny Willemsen +Date: Sat May 21 08:59:07 2022 +0200 + + Update Download.html + +commit 5abccb83ac1da6be99e28832fde74b835b45ebbc +Author: Johnny Willemsen +Date: Sat May 21 08:42:13 2022 +0200 + + Updated for x.0.7 release + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: + +commit 116c58f63888c84be7ae30173eaedc5647f22740 +Author: Johnny Willemsen +Date: Sat May 21 08:38:55 2022 +0200 + + Updated versions + + * 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/ChangeLogs/ACE-7_1_0 b/ACE/ChangeLogs/ACE-7_1_0 new file mode 100644 index 0000000000000..4a00ae7d580c0 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_1_0 @@ -0,0 +1,727 @@ +commit 419b7060685fe7df63f0a91bc64bcaf9848a84fb +Merge: 1a0d76d1c62 adb7bcc177d +Author: Johnny Willemsen +Date: Mon Feb 27 12:14:49 2023 +0100 + + Merge pull request #2056 from jwillemsen/jwi-osmmanredef + + Fix redefinition warnings when using mingw64 with ucrt + +commit 1a0d76d1c6251067df8a2c18816b2316b6950dfa +Merge: 7b119e54bbb 26ed33ba535 +Author: Johnny Willemsen +Date: Mon Feb 27 11:07:53 2023 +0100 + + Merge pull request #2055 from jwillemsen/jwi-curtfix + + Ruby 3.1 ships ucrt which has a 3 param wcstok + +commit adb7bcc177df26ef326fa00148d64aac810abe32 +Author: Johnny Willemsen +Date: Mon Feb 27 10:08:04 2023 +0100 + + Fix redefinition warnings when using mingw64 with ucrt + + * ACE/ace/os_include/sys/os_mman.h: + +commit 26ed33ba535cc904c88c4405f58e7e67343096eb +Author: Johnny Willemsen +Date: Mon Feb 27 08:05:05 2023 +0100 + + Ruby 3.1 ships ucrt which has a 3 param wcstok + + * ACE/ace/config-win32-mingw64.h: + +commit 7b119e54bbbcaeeec03cf2e6e7a3ff889e08fd12 +Merge: c0ef1f6daad 3827363c2df +Author: Johnny Willemsen +Date: Thu Feb 23 09:26:26 2023 +0100 + + Merge pull request #2053 from ffontaine/master + + ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= 3.5.0 + +commit 017929ad88287a15cf7733bc5bacc1782e647a22 +Author: Johnny Willemsen +Date: Wed Feb 22 14:57:09 2023 +0100 + + Set ACE_HAS_CPP20 when C++20 is supported + + * ACE/ace/config-win32-msvc-141.h: + +commit 3827363c2dfe94345cab759b5b968eeec89205b4 +Merge: c5b4f7009b4 4ea44f59178 +Author: Johnny Willemsen +Date: Wed Feb 22 13:32:52 2023 +0100 + + Merge branch 'master' into master + +commit 606a42cd58a161c971723d10713699d922530a28 +Author: Johnny Willemsen +Date: Wed Feb 22 09:10:40 2023 +0100 + + Add define of ACE_WIN32_VC14, before dropping Visual Studio 2015 this was also set for newer Visual Studio versions + + * ACE/ace/config-win32-msvc-141.h: + +commit c5b4f7009b47eac331fb5d20d53366fc99abecf0 +Author: Fabrice Fontaine +Date: Tue Feb 21 14:20:11 2023 +0100 + + ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= 3.5.0 + + Fix the following build failure with libressl >= 3.5.0: + + /tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type + 45 | static BIO_METHOD methods_ACE = + | ^~~~~~~~~~~ + + Fixes: + - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb + + Signed-off-by: Fabrice Fontaine + +commit 06974e568d233fcf8f0550a5ebb9987588928ce3 +Author: Johnny Willemsen +Date: Tue Feb 21 13:23:32 2023 +0100 + + List Visual Studio 2015 EOL + + * ACE/NEWS: + +commit 7ff7378063fb7a2cda02c096a55ec8319a9e7854 +Author: Johnny Willemsen +Date: Tue Feb 21 07:09:31 2023 +0100 + + Update ACE/ace/Global_Macros.h + + Co-authored-by: Fred Hornsey + +commit fd5c368d5c7b26ff2a44446bd215e28ffc07b033 +Author: Johnny Willemsen +Date: Mon Feb 20 16:35:04 2023 +0100 + + Remove clang5 + + * .github/workflows/linux.yml: + * ACE/include/makeinclude/platform_linux_clang.GNU: + +commit 9740e05c8e2f2c906444bf6b4ae01dd24e39cf39 +Author: Johnny Willemsen +Date: Mon Feb 20 16:28:53 2023 +0100 + + Enable C++14 for clang 5/6/7/8 + + * ACE/include/makeinclude/platform_linux_clang.GNU: + +commit 46e095cc536cb302af7bef33c79f3c93977df343 +Author: Johnny Willemsen +Date: Mon Feb 20 15:48:34 2023 +0100 + + Removed Visual Studio 2015 support, lacks C++14 + + * ACE/ace/config-win32-msvc-14.h: + Deleted. + + * ACE/ace/config-win32-msvc-141.h: + * ACE/ace/config-win32-msvc.h: + +commit 7a7f6db56d3a136c765558ace03eda3845d9f3a3 +Author: Johnny Willemsen +Date: Mon Feb 20 15:44:04 2023 +0100 + + ACE/TAO now require C++14 or newer + + * ACE/NEWS: + * ACE/ace/Global_Macros.h: + * ACE/ace/config-win32-msvc-141.h: + * ACE/examples/Logger/Acceptor-server/server_loggerd.cpp: + * ACE/include/makeinclude/platform_linux_clang.GNU: + * ACE/include/makeinclude/platform_macosx_common.GNU: + +commit d19030946af88f57a4b2b29af9228cbbf0386a71 +Author: Johnny Willemsen +Date: Mon Feb 13 18:08:58 2023 +0100 + + Revert one constexpr change + + * ACE/apps/gperf/src/Key_List.cpp: + +commit 90371aba592ff8153762036e2b0d5bd723af4a7d +Author: Johnny Willemsen +Date: Mon Feb 13 17:04:25 2023 +0100 + + Generate some parts as constexpr + + * ACE/apps/gperf/src/Key_List.cpp: + +commit 4db6c4351dfd785f59a9b16122e52eeec44520c0 +Author: Johnny Willemsen +Date: Mon Feb 13 12:30:59 2023 +0100 + + Fixed unresolved exports, more override + + * ACE/protocols/ace/HTBP/HTBP_Addr.cpp: + * ACE/protocols/ace/HTBP/HTBP_Addr.h: + * TAO/tao/PortableServer/Active_Object_Map.cpp: + * TAO/tao/PortableServer/Active_Object_Map.h: + * TAO/tao/PortableServer/Active_Policy_Strategies.h: + * TAO/tao/PortableServer/Active_Policy_Strategies.inl: + * TAO/tao/PortableServer/IdUniquenessStrategy.h: + * TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp: + * TAO/tao/PortableServer/Operation_Table_Binary_Search.h: + * TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h: + * TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp: + * TAO/tao/PortableServer/Operation_Table_Linear_Search.h: + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp: + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h: + * TAO/tao/PortableServer/POA_Current_Factory.cpp: + * TAO/tao/PortableServer/POA_Current_Impl.cpp: + * TAO/tao/PortableServer/POA_Current_Impl.h: + * TAO/tao/PortableServer/POA_Policy_Set.h: + * TAO/tao/PortableServer/ServantRetentionStrategy.h: + +commit 69fbec6c475060cf01a710a3d7ed6e756538858c +Merge: 7e8b94b728b 89a05c65fd6 +Author: Johnny Willemsen +Date: Mon Feb 6 09:21:37 2023 +0100 + + Merge pull request #2046 from jwillemsen/jwinullptrexce + + Use nullptr and make destructor of TAO SystemException default + +commit 89a05c65fd627673f0bcc260b990257dcf30150c +Author: Johnny Willemsen +Date: Fri Feb 3 19:49:52 2023 +0100 + + Use nullptr + + * ACE/ace/Time_Policy.h: + * ACE/ace/Time_Policy.inl: + +commit 7e8b94b728b886d14fc17b6af789e9ba0c50a050 +Merge: 4961b8026b5 ec19b2725b5 +Author: Johnny Willemsen +Date: Thu Feb 2 09:13:03 2023 +0100 + + Merge pull request #2042 from jwillemsen/jwi-cleanupmacros + + Cleanup unused macros + +commit 4961b8026b5c90e2517f27f9d9d5584be6f94ab0 +Merge: 757fd0a5eef 007bcf039e9 +Author: Johnny Willemsen +Date: Thu Feb 2 09:10:49 2023 +0100 + + Merge pull request #2044 from jmccabe/Indent-endif-by-an-extra-space + + Align one endif with its associated if + +commit 757fd0a5eef53e1c9e1a8327eb5d4b34e81d7cb9 +Merge: 107d2bfea7c 7f4365e6544 +Author: Johnny Willemsen +Date: Thu Feb 2 09:09:17 2023 +0100 + + Merge pull request #2043 from jwillemsen/jwi-pharlapcleanup + + Removed pharlap support + +commit 007bcf039e9226a746bffbc0dcffa892c091adbe +Author: John McCabe +Date: Wed Feb 1 16:51:54 2023 +0000 + + Align one endif with its associated if + +commit d90c1cb3964f254cb5e9a0de2d7f620b79750e16 +Author: Johnny Willemsen +Date: Wed Feb 1 16:01:29 2023 +0100 + + Removed left over sun file + +commit 7f4365e65442e6c9d482fa64f808303f1546fe68 +Author: Johnny Willemsen +Date: Wed Feb 1 15:52:25 2023 +0100 + + Fixed cleanup mistake + + * ACE/ace/OS_NS_unistd.inl: + +commit 6198126ce20cc418252f461621c81d19ee2b36e4 +Author: Johnny Willemsen +Date: Wed Feb 1 15:44:33 2023 +0100 + + Removed pharlap support + +commit 1eb5c6564e45cce7980f6bbac7b4b073b806788c +Author: Johnny Willemsen +Date: Wed Feb 1 14:48:42 2023 +0100 + + Removed include + + * ACE/ace/OS_NS_unistd.cpp: + +commit 281078a59a44ca971675b90616f5e35a998bf077 +Author: Johnny Willemsen +Date: Wed Feb 1 14:41:51 2023 +0100 + + Removed os_include headers which don't include any file anymore + +commit 9d3475584970e20117a7a99d3a75fecb521a0da9 +Author: Johnny Willemsen +Date: Wed Feb 1 14:38:17 2023 +0100 + + Further cleanup not used macros + + * ACE/ace/IOStream.h: + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/Profile_Timer.cpp: + * ACE/ace/README: + * ACE/ace/os_include/os_netdb.h: + * ACE/ace/os_include/sys/os_loadavg.h: + * ACE/ace/os_include/sys/os_pstat.h: + +commit 01cb9ff254befab9c674e957a9e063b3c09bcc26 +Author: Johnny Willemsen +Date: Wed Feb 1 10:56:12 2023 +0100 + + Fix + + * ACE/ace/CDR_Stream.inl: + +commit c3e71f69e85deb48d5f3cdba355679da4deffdb3 +Author: Johnny Willemsen +Date: Wed Feb 1 10:51:23 2023 +0100 + + good_bit is a bool and removed some uncessary c-style casts + +commit 980b4296358a1b3f0f3ffde85c2826eeeb240637 +Author: Johnny Willemsen +Date: Wed Jan 18 13:21:32 2023 +0100 + + Fixed warning + + * ACE/ace/OS_NS_Thread.inl: + +commit dfc5c60f27c6ea1f566b1819ebbc3d979c19ffad +Merge: 956dcabf4bd d97b6edbeeb +Author: Johnny Willemsen +Date: Wed Jan 18 10:14:13 2023 +0100 + + Merge pull request #2035 from jwillemsen/jwi-cleanupsolaris + + Cleanup Solaris support + +commit d97b6edbeeb9a007f65e10e069a753bc087e998f +Author: Johnny Willemsen +Date: Tue Jan 17 16:38:01 2023 +0100 + + Updated for release + + * ACE/NEWS: + +commit 956dcabf4bdd4fb3ec1be53c392398b495af27cf +Merge: 016eb1b3caa 461fcfe1d09 +Author: Johnny Willemsen +Date: Tue Jan 17 15:41:34 2023 +0100 + + Merge pull request #2030 from lockhart/rpm_extras_7_0_11 + + Add headers and other source files to the list of files to be installed. + +commit ffbcea5aea4d73a2cb04c4c128662c4672f95d0d +Author: Johnny Willemsen +Date: Tue Jan 17 15:26:19 2023 +0100 + + More cleanup + + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/config-hurd.h: + * ACE/ace/os_include/os_unistd.h: + * ACE/ace/os_include/sys/os_mman.h: + +commit 94724143a88b7ad5b10194690d9d73db3a3b6c54 +Author: Johnny Willemsen +Date: Tue Jan 17 12:43:59 2023 +0100 + + More Sun OS/compiler cleanup + +commit a7f809c172f0a2578ab584920dc02f1e45c06e6d +Author: Johnny Willemsen +Date: Tue Jan 17 12:40:30 2023 +0100 + + More Sun OS/compiler cleanup + +commit 83567bb4eb3abc1133a10a8cd3a97e4dfd1f23f8 +Author: Johnny Willemsen +Date: Tue Jan 17 12:35:36 2023 +0100 + + Removed some unused defines + +commit 5a45b0554cf1649e5f1eddebde2aa22df6c69719 +Author: Johnny Willemsen +Date: Tue Jan 17 12:33:05 2023 +0100 + + More Sun OS/compiler cleanup + +commit e5391a0076f5e370f929b111a8a6ed52ee4cb5da +Author: Johnny Willemsen +Date: Tue Jan 17 12:32:56 2023 +0100 + + More Sun OS/compiler cleanup + +commit 654bdcf1600bc5f2ada5790cb0a6a3418a8cc8d3 +Author: Johnny Willemsen +Date: Tue Jan 17 09:46:42 2023 +0100 + + Fixed cleanup issues + + * ACE/ace/OS_NS_Thread.h: + * ACE/ace/POSIX_Proactor.cpp: + +commit 73bdf800479e53a11143735e48348bb88c527c24 +Author: Johnny Willemsen +Date: Tue Jan 17 09:44:30 2023 +0100 + + Cleanup Solaris support + +commit 016eb1b3caa7b8ba0ff4c479895151eca984c82b +Merge: cf4d1e0117b 3f2b66203cb +Author: Johnny Willemsen +Date: Tue Jan 17 08:30:27 2023 +0100 + + Merge pull request #2034 from jwillemsen/jwi-macrocleanup + + Cleanup several macros which are not set by any config file + +commit 461fcfe1d099e9dc4e10b38ce7b19d922a368869 +Author: lockhart +Date: Mon Jan 16 22:22:39 2023 -0800 + + Update ace-tao.spec + + Need yet more .cpp files from ACE and TAO subsystems to enable a clean build of an external project. + +commit d6c603febcd87d749e3babb7cbe3386cd76a3c18 +Author: lockhart +Date: Mon Jan 16 11:09:08 2023 -0800 + + Update ace-tao.spec + + Tailor previous updates to the list of installed files to remove most duplicates and commented-out lines. + This includes one explicit line for the ESF/ subdirectory since at least one .cpp is needed but does not match the other patterns. + Updates are based on feedback from Johnny W. + +commit 3f2b66203cbef9985486a6e9ce4ef33feb5cfb20 +Author: Johnny Willemsen +Date: Mon Jan 16 18:49:33 2023 +0100 + + Cleanup several macros which are not set by any config file + + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/OS_NS_dirent.inl: + * ACE/ace/OS_NS_sys_stat.inl: + * ACE/ace/OS_NS_time.cpp: + * ACE/ace/OS_NS_time.h: + * ACE/ace/OS_NS_time.inl: + * ACE/ace/OS_NS_unistd.inl: + * ACE/ace/README: + * ACE/ace/TLI.cpp: + * ACE/ace/os_include/os_stropts.h: + * ACE/ace/os_include/sys/os_mman.h: + +commit dcb4692364d4a9175db59b9280dbbd54524bb3ce +Author: Johnny Willemsen +Date: Mon Jan 16 16:45:00 2023 +0100 + + Removed checks for ACE_TEMPLATES_REQUIRE_SOURCE + +commit f25410e018ff6b65ec24df5ba249447f74eb0198 +Author: Johnny Willemsen +Date: Mon Jan 16 15:47:01 2023 +0100 + + Removed AIX support + +commit fd9764555ac1865589fe02dcd8201ab3d91e7030 +Author: Johnny Willemsen +Date: Mon Jan 16 15:46:41 2023 +0100 + + Removed AIX support + +commit a1a1a43595697bb82a040368286340f94b24c122 +Author: Thomas Lockhart +Date: Sun Jan 15 19:45:57 2023 -0800 + + Add headers and other source files to the list of files to be installed. + This includes stubs and skeletons for IDL interfaces and files required to extend interfaces. + This is a superset of files which are known to be required to build external packages. + +commit b2b2abd13518168f2b2930d4dd157d5311dccbe5 +Author: Johnny Willemsen +Date: Sun Jan 15 16:51:22 2023 +0100 + + Removed RTEMS support + +commit 61cab1e92cb345f27ddde5aa78787b9565b81121 +Author: Johnny Willemsen +Date: Sun Jan 15 16:51:08 2023 +0100 + + Removed RTEMS support + +commit d645bf461a41039dda402e1674ed7a6d40620957 +Merge: c9c577ffbe6 098b5aa5257 +Author: Johnny Willemsen +Date: Sun Jan 15 16:14:12 2023 +0100 + + Merge pull request #2028 from jwillemsen/jwi-removehpux + + Remove HPUX support + +commit c9c577ffbe64efca48e6a05add0e0070add7da6d +Merge: 6f36dbed40c 0a572bec884 +Author: Johnny Willemsen +Date: Sun Jan 15 14:04:11 2023 +0100 + + Merge pull request #2027 from jwillemsen/jwi-openvmscleanup + + Removed some OpenVMS code + +commit 098b5aa525738b909ba9bca915cc53c8a5573c20 +Author: Johnny Willemsen +Date: Sun Jan 15 13:53:46 2023 +0100 + + Update FIFO_Test.cpp + +commit b5aeaf20ef9d15d09acb52b4c8ac77762937ae26 +Author: Johnny Willemsen +Date: Sun Jan 15 12:28:28 2023 +0100 + + More cleanup + + * ACE/ace/config-linux-common.h: + * ACE/ace/config-macros.h: + * TAO/TAO_IDL/fe/idl.yy.cpp: + +commit aceac7234ef1ef995de5ade1e4daa27220960fb3 +Author: Johnny Willemsen +Date: Sun Jan 15 11:17:04 2023 +0100 + + More cleanup + + * ACE/ace/README: + * ACE/ace/os_include/sys/os_socket.h: + +commit 041537498bf9bc6cd673518b79b56c152579ac13 +Author: Johnny Willemsen +Date: Sun Jan 15 11:16:01 2023 +0100 + + Fixed cleanup mistakes + + * ACE/ace/os_include/os_pthread.h: + * ACE/ace/os_include/sys/os_socket.h: + +commit da66efe89c66a7997f6728759c196643c3910018 +Author: Johnny Willemsen +Date: Sun Jan 15 11:02:36 2023 +0100 + + Updated NEWS files + +commit b30753f1a1b18c831e89223ec01db66231b5a64a +Author: Johnny Willemsen +Date: Sun Jan 15 11:01:49 2023 +0100 + + Removed HPUX support + +commit 0a572bec8848eabb70c652fffa043ec335f45454 +Author: Johnny Willemsen +Date: Sun Jan 15 10:34:15 2023 +0100 + + Removed some OpenVMS code + + * ACE/ace/SSL/SSL_Context.cpp: + * ACE/ace/Sock_Connect.cpp: + * TAO/TAO-INSTALL.html: + +commit 6f36dbed40cbedb60f2c40376d360c704d7db93b +Merge: f06824b2d9f b488f1ab871 +Author: Johnny Willemsen +Date: Sun Jan 15 10:33:43 2023 +0100 + + Merge pull request #2023 from esohns/issue_2016_move_make_qword + + move ACE_Make_QWORD to OS_NS_macros.h + +commit 54ee4626edad4d98513a330beb2acf4a3a0596b7 +Author: Johnny Willemsen +Date: Sat Jan 14 16:26:19 2023 +0100 + + Removed openvms config files + +commit 9f5b645ee9d959b538c3b26d2b42c20ec0c227be +Author: Johnny Willemsen +Date: Sat Jan 14 12:55:48 2023 +0100 + + Update Process_Manager_Test.cpp + +commit 3a1440fc22d845cc46125af05c5fec96a8090674 +Author: Johnny Willemsen +Date: Sat Jan 14 11:46:06 2023 +0100 + + Update Process_Manager_Test.cpp + +commit 1996ba72caf059aaddc4cc3883fff329cf22dcf9 +Author: Johnny Willemsen +Date: Sat Jan 14 11:37:31 2023 +0100 + + Update os_types.h + +commit 2916b2fa78bc0fdcae44b590af9543245d481e15 +Author: Johnny Willemsen +Date: Sat Jan 14 10:09:54 2023 +0100 + + Removed OpenVMS support + +commit 20da1c5dcbed95befc08ccf258f62c91a16762f4 +Merge: 158938dceab cc5865a9582 +Author: Johnny Willemsen +Date: Sat Jan 14 09:53:44 2023 +0100 + + Merge pull request #2014 from jwillemsen/jwi-doxygen196 + + Upgrade doxygen configuration files to latest doxygen release + +commit b488f1ab8719835737d42ba4658cd18f352d0ad4 +Author: Erik Sohns +Date: Fri Jan 13 17:37:00 2023 +0100 + + move ACE_Make_QWORD to OS_NS_macros.h + +commit f59d4713c14113a6889656296896e9042468ced0 +Author: Johnny Willemsen +Date: Fri Jan 13 16:13:13 2023 +0100 + + Cleanup another not used define + + * ACE/ace/OS_NS_unistd.inl: + +commit a5662cef58b5c9377120dfa4b3a8098113be2594 +Author: Johnny Willemsen +Date: Fri Jan 13 14:27:50 2023 +0100 + + Cleanup workarounds which we don't need anymore + + * ACE/ace/OS_NS_stdlib.cpp: + * ACE/ace/OS_NS_sys_resource.inl: + * ACE/ace/OS_NS_sys_time.inl: + * ACE/ace/OS_NS_unistd.cpp: + * ACE/ace/OS_NS_unistd.inl: + * ACE/ace/os_include/os_errno.h: + * ACE/ace/os_include/os_signal.h: + * ACE/ace/os_include/sys/os_types.h: + +commit cde8fd193652205cf84a9ef5f74775000f0c9807 +Author: Johnny Willemsen +Date: Fri Jan 13 13:53:24 2023 +0100 + + Fixed cleanup error + + * ACE/tests/Proactor_Test_IPV6.cpp: + +commit 3f7247d33935f6451bd13835015cf7bf53b50969 +Author: Johnny Willemsen +Date: Fri Jan 13 13:08:57 2023 +0100 + + Fixed cleanup error + + * ACE/ace/config-win32-common.h: + * ACE/ace/config-win32-msvc.h: + +commit bbb975d6dee09baaad4e2b0425a0afb20b784005 +Author: Johnny Willemsen +Date: Fri Jan 13 12:52:36 2023 +0100 + + Fixed cleanup error + + * ACE/ace/OS_NS_Thread.inl: + +commit d1921e1511f65cd42503e8eeecfd301f5c3358b4 +Author: Johnny Willemsen +Date: Fri Jan 13 12:40:18 2023 +0100 + + Fixed cleanup error + + * ACE/ace/config-macros.h: + +commit 22359d30f11aa48abba5a3ad7bad7bed7489ff5b +Author: Johnny Willemsen +Date: Fri Jan 13 12:36:49 2023 +0100 + + Fixed cleanup mistakes + + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/OS_NS_stdio.inl: + * ACE/tests/Bug_3943_Regression_Test.cpp: + +commit 8f0f05f51c0cf595654a35f9dc47d82809c2268d +Author: Johnny Willemsen +Date: Fri Jan 13 09:58:03 2023 +0100 + + More Windows CE cleanup + +commit 378fbc350bc7d7d940523ac194b646e94caf312d +Author: Johnny Willemsen +Date: Fri Jan 13 09:41:15 2023 +0100 + + Removed Windows CE support + +commit cc5865a958281cb7706a1421a4b96d3becd39c93 +Author: Johnny Willemsen +Date: Thu Jan 12 11:46:29 2023 +0100 + + Upgrade doxygen configuration files to latest doxygen release + +commit 6d4a282d86f0145004ac0cab58371d261abca19b +Author: Johnny Willemsen +Date: Thu Jan 12 11:43:53 2023 +0100 + + Make use of nullptr and delete + + * ACE/ace/ace_wchar.h: + * ACE/ace/ace_wchar.inl: + +commit 6c8071c2b785655696c93a71b9a240705508026f +Author: Johnny Willemsen +Date: Mon Jan 9 16:43:26 2023 +0100 + + Updated OpenDDS url + + * ACE/docs/bczar/bczar.html: + +commit 36c558c30b842c6b6f70b62a8736c35077b2f093 +Author: Chad Elliott +Date: Thu Jan 5 09:55:27 2023 -0600 + + Adds the ability to build ACE core libraries, gperf, and possibly others using CMake. + +commit 6756ee16851ac1daa006f1b30b8987bd03a9c42e +Merge: ec326c77c9a 44d0b213860 +Author: Johnny Willemsen +Date: Mon Dec 19 12:19:34 2022 +0100 + + Merge pull request #2005 from jwillemsen/jwi-x711 + + Make ACE 7.0.11 and TAO 3.0.11 public available + +commit 44d0b213860be8801160f0519c77b648a0316033 +Author: Johnny Willemsen +Date: Mon Dec 19 12:18:46 2022 +0100 + + Make ACE 7.0.11 and TAO 3.0.11 public available + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/ACE/ChangeLogs/ACE-7_1_1 b/ACE/ChangeLogs/ACE-7_1_1 new file mode 100644 index 0000000000000..e8f3d9e80b69d --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_1_1 @@ -0,0 +1,352 @@ +commit ce3d80c7193755025f34d5b20e608517b5e84664 +Author: Johnny Willemsen +Date: Wed Jun 28 09:20:42 2023 +0200 + + Update NEWS + +commit a65d91cdc463e7cf6cf509138956b2d38c5e5727 +Merge: 90c46e2c3be 395f5e53709 +Author: Justin Wilson +Date: Tue Jun 27 09:21:17 2023 -0500 + + Merge pull request #2080 from jrw972/port0-ace-lacks-getservbyname + + `ACE_INET_Addr::set` errantly succeeds when ACE_LACKS_GETSERVBYNAME + +commit 3579743a175b284e56d12064e8437f1f51f3a9a5 +Author: Johnny Willemsen +Date: Fri Jun 23 08:16:13 2023 +0200 + + Make more members const + + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + +commit 77d104dfe850c53aa4395cedad65fe635bf1d13e +Author: Adam Mitz +Date: Thu Jun 22 21:32:51 2023 -0500 + + shm_addr_table_ needs to be initialized after max_segments_ is known + +commit 395f5e53709aa2bee45de13d66e5a0706cf82dad +Author: Justin R. Wilson +Date: Wed Jun 21 11:28:26 2023 -0500 + + `ACE_INET_Addr::set` errantly succeeds when ACE_LACKS_GETSERVBYNAME + + Problem + ------- + + Calling `set("1.2.3.4")` on an ACE_INET_Addr eventually tries to part + it as a port name. When `ACE_LACKS_GETSERVBYNAME`, this succeeds + returning port number 0 with the reset address. + + When port names are not expected, this breaks a useful idiom of + parsing addresses that may or may not contain port numbers: + + ACE_INET_Addr addr; + if (addr.set(x) == 0) { + // Success, address contained a port number + } else if (addr.set(u_short(0), x) == 0) { + // Success, address did not contain a port number. + } else { + // Fail + } + + Solution + -------- + + Return -1 for the port number when `ACE_LACKS_GETSERVBYNAME`. + +commit 3b4af688618b118f84a6e6e63630415668fe80aa +Author: Johnny Willemsen +Date: Tue Jun 20 13:01:41 2023 +0200 + + Add fix to ACE_Shared_Memory_Pool + + * ACE/NEWS: + +commit 49fe3a9ff8e07ba85f6a87179a48f6b4651850e7 +Merge: d971b4b29ea 32ea782b6cf +Author: Johnny Willemsen +Date: Tue Jun 20 08:06:02 2023 +0200 + + Merge branch 'master' into jwi-shmem + +commit d971b4b29eaadcd6cb65e1f0665ea174c0df4b4b +Author: Johnny Willemsen +Date: Tue Jun 20 08:05:44 2023 +0200 + + Update ACE/ace/Shared_Memory_Pool.cpp + + Co-authored-by: Adam Mitz + +commit 9821bb3bb8bcb78ced6fab55aaff9501b0ad9157 +Author: Johnny Willemsen +Date: Mon Jun 19 16:20:36 2023 +0200 + + Doxygen fix + + * ACE/ace/Malloc_T.h: + +commit 62ef18910774b1fac1d61a93752b6209ebb22674 +Author: Johnny Willemsen +Date: Mon Jun 19 16:11:00 2023 +0200 + + Layout change + + * ACE/ace/Malloc_T.cpp: + +commit 117bcac2bf19155a7bf535a7ee20fc67042fa364 +Author: Johnny Willemsen +Date: Mon Jun 19 16:07:05 2023 +0200 + + No need for a base_shm_id when we change the cleanup + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + +commit ec7265778d3c83f28171a92a720452e70a155f65 +Author: Johnny Willemsen +Date: Mon Jun 19 14:43:28 2023 +0200 + + Use std::strcmp + + * ACE/ace/Malloc_T.cpp: + +commit a2566cf5e0cc39ec85231f26c39447d70ccff2f6 +Author: Johnny Willemsen +Date: Mon Jun 19 14:43:17 2023 +0200 + + Document return values + + * ACE/ace/Malloc_T.h: + +commit 22cf00e2a6cebbad7587ab85b873b02388bac82d +Author: Johnny Willemsen +Date: Sat Jun 17 19:25:39 2023 +0200 + + Use as egrep is obsolescent + +commit d7c2886ae5c93e52f787e7b2758112353d5c45c1 +Merge: 63cb68e694e 9b773291b4c +Author: Johnny Willemsen +Date: Fri Jun 16 10:22:37 2023 +0200 + + Merge branch 'jwi-shmem' of https://github.com/DOCGroup/ACE_TAO into jwi-shmem + +commit 63cb68e694e9b942516c8480c5241574485d5500 +Author: Johnny Willemsen +Date: Fri Jun 16 10:22:17 2023 +0200 + + Make used_ again an int, not cause some unexpected interoperability with older ACE versions + + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + +commit 9b773291b4c1ed20b2783f8e0b4af9da7a9bf68a +Author: Johnny Willemsen +Date: Thu Jun 15 14:11:35 2023 +0200 + + Removed empty lines + + * ACE/tests/SV_Shared_Memory_Test.cpp: + +commit 680dcb6dc233f5e9d807de2f0e2421a702c958ac +Author: Johnny Willemsen +Date: Thu Jun 15 14:11:25 2023 +0200 + + Fixed typo + + * ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp: + +commit 1e43fa6691d8b12ca12f58a2f54f972dd796fa11 +Author: Johnny Willemsen +Date: Thu Jun 15 13:28:29 2023 +0200 + + Removed debug lines + + * ACE/ace/Shared_Memory_Pool.cpp: + +commit c2c58f6805ee69ab70912d4b6463c466bc502ac2 +Author: Johnny Willemsen +Date: Thu Jun 15 13:24:29 2023 +0200 + + Reworked the shared memory pool implementation in order to detach from shared memory segments when we don't use them anymore. At the moment the memory pool is destroyed also let the OS release all resources + + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + +commit 6c593fc0986a8398b1c2fa1bb9069986a962dd5d +Author: Johnny Willemsen +Date: Thu Jun 15 11:24:12 2023 +0200 + + Call shmdt when we only need to release the shared memory + + * ACE/ace/Malloc_T.cpp: + * ACE/ace/Malloc_T.inl: + * ACE/ace/Mem_Map.cpp: + * ACE/ace/Shared_Memory.h: + * ACE/ace/Shared_Memory_MM.h: + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + +commit 483414737903481da9cf63b58ed3eb6c57f4d0f9 +Author: Johnny Willemsen +Date: Thu Jun 15 11:23:39 2023 +0200 + + Use nullptr + + * ACE/ace/MMAP_Memory_Pool.cpp: + +commit 1b6da609c0e15725dba3aa70ac097117f9d5769f +Author: Johnny Willemsen +Date: Thu Jun 15 08:14:42 2023 +0200 + + Layout changes + + * ACE/ace/SV_Shared_Memory.h: + +commit ab3b192fcda5715a0c92e5627acdeb4e8f71911c +Merge: 874ceda869d 2d267693fc0 +Author: Johnny Willemsen +Date: Fri Apr 7 12:37:51 2023 +0200 + + Merge pull request #2069 from jwillemsen/jwi-mqtest + + Test simplifications + +commit 2d267693fc0c39c56fac87d7f2b6ce00885942a9 +Merge: aef8140bea1 9729442488f +Author: Johnny Willemsen +Date: Fri Apr 7 08:27:27 2023 +0200 + + Merge branch 'master' into jwi-mqtest + +commit d1eab7db50121338cf719a4a4fddce59414487b4 +Author: Johnny Willemsen +Date: Fri Apr 7 08:27:03 2023 +0200 + + Fixed trailing whitespace + + * ACE/tests/Message_Queue_Test_Ex.cpp: + +commit aef8140bea1a6fc2d58631e2ad16f81a5f447018 +Author: Johnny Willemsen +Date: Fri Apr 7 08:26:23 2023 +0200 + + Test changes + + * ACE/tests/Message_Queue_Test_Ex.cpp: + * ACE/tests/Message_Queue_Test_Ex.h: + +commit a78936549748c2dbb9e751d4d21baa532228f1df +Author: Johnny Willemsen +Date: Fri Apr 7 08:23:22 2023 +0200 + + Update Message_Queue_Test_Ex.cpp + +commit a3a7c2a50383ebf00534c28014704ce57e092821 +Merge: 5625244fd7b b50aba0fdce +Author: Erik Sohns +Date: Thu Apr 6 11:09:11 2023 +0200 + + Merge branch 'master' into message_queue_ex_get_queue + +commit 5625244fd7bb77bafabce28fdec790f51ef50080 +Author: Erik Sohns +Date: Thu Apr 6 11:08:34 2023 +0200 + + more review comments + +commit 761e24b54d7fda41ed58a6e2f41ba905e43bf3d9 +Merge: 3e44fb91cf7 9e18d338ec5 +Author: Erik Sohns +Date: Wed Apr 5 17:37:54 2023 +0200 + + Merge branch 'message_queue_ex_get_queue' of https://github.com/esohns/ACE_TAO into message_queue_ex_get_queue + +commit 3e44fb91cf724aeb48b38169482a4878de316afc +Author: Erik Sohns +Date: Wed Apr 5 17:37:23 2023 +0200 + + integrated review comments + +commit e1432d22fcf52f941e587e8e8b5f291d5a08ff9c +Author: Johnny Willemsen +Date: Wed Mar 29 15:55:22 2023 +0200 + + Mention that nullptr should be used + + * ACE/bin/fuzz.pl: + +commit a1480384cc3233889d1f043fcd428c627843d272 +Author: Johnny Willemsen +Date: Fri Mar 3 11:05:30 2023 +0100 + + Add space to resolve compiler warnings on condaforge + + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/OS_NS_unistd.inl: + +commit ed1a2e35ca124c5697f32527ad286e22e9f5877b +Author: Johnny Willemsen +Date: Fri Mar 3 09:38:39 2023 +0100 + + Make ACE 7.1.0 and TAO 3.1.0 public available + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + +commit 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 +Merge: 8b6ad82dc91 8ab31e3e5bb +Author: Erik Sohns +Date: Sun Jan 22 17:38:34 2023 +0100 + + Merge branch 'master' into message_queue_ex_get_queue + +commit 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc +Author: Erik Sohns +Date: Mon Jan 9 19:38:43 2023 +0100 + + 0 --> NULL --> nullptr + +commit e24acc256b9af44bda969d392ec46ddfec28c5a5 +Merge: 22be043fb46 a667874d6a6 +Author: Erik Sohns +Date: Mon Jan 9 19:13:15 2023 +0100 + + Merge branch 'message_queue_ex_get_queue' of https://github.com/esohns/ACE_TAO into message_queue_ex_get_queue + +commit 22be043fb46aff505eea86e66fe19bf5249f1ad3 +Author: Erik Sohns +Date: Mon Jan 9 19:12:43 2023 +0100 + + address some static code analysis issues + +commit a667874d6a61052c898deeb6f393ac33973af68f +Merge: a905022c2d5 1d0c1af12a5 +Author: Erik Sohns +Date: Mon Jan 9 18:13:08 2023 +0100 + + Merge branch 'master' into message_queue_ex_get_queue + +commit a905022c2d552261e6d60c497140b5ff7669dd4d +Author: Erik Sohns +Date: Mon Jan 9 18:02:05 2023 +0100 + + added API comments and unit test case as requested + +commit e4bf4867d9a36e7b155cd9358c97811ce599f16c +Author: Erik Sohns +Date: Sat Jan 7 19:52:20 2023 +0100 + + removed constness + +commit 65a391a415e559663c43077b90b70de225b1d7ea +Author: Erik Sohns +Date: Sat Jan 7 16:43:24 2023 +0100 + + support accessing the underlying queue (e.g. for iteration) diff --git a/ACE/ChangeLogs/ACE-7_1_2 b/ACE/ChangeLogs/ACE-7_1_2 new file mode 100644 index 0000000000000..70aafbf8e59c8 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_1_2 @@ -0,0 +1,550 @@ +commit 0fd00449a56ea10787ab9ddc1691030b4843fd79 +Author: Johnny Willemsen +Date: Mon Oct 30 07:51:55 2023 +0100 + + Update file + + * ACE/NEWS: + +commit efc29cab7d36fd23b9d97670baedfb06d562154a +Merge: 1389db66793 9a2c01c0c06 +Author: Johnny Willemsen +Date: Fri Oct 27 15:30:28 2023 +0200 + + Merge pull request #2153 from jwillemsen/jwi-qnx710 + + Improve support for QNX 7.1 + +commit 1389db66793ac511812c051e8bdcf9e6f4fdb5cb +Merge: a935e6e549e 95a9b900ed8 +Author: Johnny Willemsen +Date: Fri Oct 27 13:21:57 2023 +0200 + + Merge pull request #2152 from jwillemsen/jwi-platformlinux + + Removed work arounds for ancient compilers + +commit 9a2c01c0c06b3402b7ed4ae44fa300673ee9473b +Author: Johnny Willemsen +Date: Fri Oct 27 11:30:55 2023 +0200 + + Cleanup support for ancient QNX versions + + * ACE/ace/config-qnx.h: + * ACE/ace/os_include/sys/os_select.h: + +commit d7cf8b9108027afea673c901cd106c1f208e141b +Author: Johnny Willemsen +Date: Fri Oct 27 11:22:23 2023 +0200 + + Mention QNX + + * ACE/NEWS: + +commit 4c57b10a4a13235df38deab47bb054e5e238e08e +Author: Johnny Willemsen +Date: Fri Oct 27 11:21:05 2023 +0200 + + More cleanup + + * ACE/ace/config-qnx.h: + +commit 95a9b900ed81d3a63f73d5e0623b44cd8d8fb087 +Author: Johnny Willemsen +Date: Fri Oct 27 11:19:31 2023 +0200 + + Remove not used code + + * ACE/include/makeinclude/platform_gcc_clang_common.GNU: + +commit fcb92bed3cbe5b88f1f3f7d0cc21073948f354c5 +Author: Johnny Willemsen +Date: Fri Oct 27 11:18:16 2023 +0200 + + Removed work arounds for ancient compilers + + * ACE/include/makeinclude/platform_linux.GNU: + +commit 5413f3b3d622dab07f46171fd86b7654ab684f1c +Author: Johnny Willemsen +Date: Fri Oct 27 11:17:48 2023 +0200 + + We don't need several defines anymore with QNX 7.1 + + * ACE/ace/config-qnx.h: + +commit 19972d265bb5fab4209f4bee21ecabb89bb2c832 +Author: Johnny Willemsen +Date: Fri Oct 27 10:39:01 2023 +0200 + + Updates for QNX 7.1 + + * ACE/ace/config-qnx.h: + +commit 2c1fa440731455b69c4fe4cda641062b790572c8 +Author: Johnny Willemsen +Date: Mon Oct 23 17:07:39 2023 +0200 + + Fixed incorrect preprocessor define check + + * ACE/examples/APG/Timers/Timers.cpp: + +commit 51e1e2c4835cf779efadc04b5737f7cf0722a9be +Merge: 1affc2bd31c 7c292a3308a +Author: Adam Mitz +Date: Fri Oct 6 13:26:25 2023 -0500 + + Merge pull request #2133 from nickwilliams-zaxiom/add_gitignores + + Add missing and update .gitignore files to prevent untracked files Git status + +commit 17441ba819710ed7d2c0fff34646fdcd16758c72 +Author: Adam Mitz +Date: Thu Oct 5 14:43:09 2023 -0500 + + macOS: sizeof long double is different on ARM64 + + https://developer.apple.com/documentation/xcode/writing-arm64-code-for-apple-platforms#Handle-data-types-and-data-alignment-properly + +commit cf82dac8e00b36ad5d7cd854dba81b7ee6f60c14 +Author: Adam Mitz +Date: Wed Oct 4 19:11:00 2023 +0000 + + platform_linux: avoid errors when tcl/tk packages are not installed + + Scoreboard scripts parse these as errors + .: cannot open /usr/lib/tkConfig.sh: No such file + +commit 7c292a3308a512192d3dc4be996b505f1c187238 +Author: Nick Williams +Date: Thu Sep 28 18:43:16 2023 -0500 + + Add update_gitignore.sh helper command + +commit c85e45ef3c5c3f17fe183b5eca15c0ec882c940c +Author: Nick Williams +Date: Thu Sep 28 15:07:20 2023 -0500 + + Review feedback + +commit 82ce7eb58fcd540ef8d3a95dc1682bb7333c850b +Merge: 3989eaefd4a 8785d6f1291 +Author: Johnny Willemsen +Date: Tue Sep 19 17:03:51 2023 +0200 + + Merge branch 'jwi-sockdgram' of https://github.com/jwillemsen/ATCD into jwi-sockdgram + +commit 3989eaefd4ac1331a2f0d5f0270e4a16df283f95 +Author: Johnny Willemsen +Date: Tue Sep 19 17:03:43 2023 +0200 + + Layout/nullptr changes + + * ACE/ace/SOCK_Dgram.cpp: + +commit 8785d6f1291ee2daef154de4be1d17a11ca5b369 +Merge: 1f9ea6a45c9 c210fe1a590 +Author: Johnny Willemsen +Date: Tue Sep 19 16:22:38 2023 +0200 + + Merge branch 'master' into jwi-sockdgram + +commit 1f9ea6a45c90ae380175763f0ec624cebaaf395a +Author: Johnny Willemsen +Date: Tue Sep 19 15:30:03 2023 +0200 + + Use nullptr/std::addressof + + * ACE/ace/SOCK_Dgram.cpp: + +commit 1e2da3173a498909230f3f12617e663c5aa20190 +Author: Johnny Willemsen +Date: Tue Sep 19 13:49:41 2023 +0200 + + Remove not needed line + + * ACE/include/makeinclude/platform_qnx_gcc.GNU: + +commit 6e12e496b800fdc27588ba72948210508366a25e +Merge: cb3fa988846 ef21d60a273 +Author: Johnny Willemsen +Date: Tue Sep 19 13:15:40 2023 +0200 + + Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into jwi-qnx + +commit cb3fa988846cd7a3e7f4a8cc3f615d8efaf25c16 +Author: Johnny Willemsen +Date: Tue Sep 19 12:18:38 2023 +0200 + + QNX changes + + * ACE/include/makeinclude/platform_qnx_gcc.GNU: + +commit 5547c0465b8a6abef7caad1b5f961b6d0a73f9c8 +Author: Johnny Willemsen +Date: Tue Sep 19 09:32:54 2023 +0200 + + Embarcadero C++ Builder fixes + + * ACE/ace/config-win32-borland.h: + +commit 3acac498f88eb0c53e529106cdc29d370b413daa +Author: Johnny Willemsen +Date: Fri Sep 15 16:27:19 2023 +0200 + + Add support for c++std in platform_macros.GNU + + * .github/workflows/linux.yml: + * ACE/NEWS: + * ACE/include/makeinclude/platform_gcc_clang_common.GNU: + +commit 0e37c17462d26d73fcd89ad12687fd1a497397ba +Author: Johnny Willemsen +Date: Fri Sep 15 10:11:10 2023 +0200 + + Removed support for c++11=1, we require C++14 as minimum + + * ACE/include/makeinclude/platform_gcc_clang_common.GNU: + * ACE/include/makeinclude/platform_linux_clang.GNU: + * ACE/include/makeinclude/platform_linux_icc.GNU: + * ACE/include/makeinclude/platform_qnx_gcc.GNU: + +commit 4e5ea5306a40b13182f46af92b364a610f14db9c +Author: Johnny Willemsen +Date: Fri Sep 15 09:15:06 2023 +0200 + + Removed gcc 4 workaround for C++11, we require C++14 as minimum + + * ACE/include/makeinclude/platform_g++_common.GNU: + +commit f5dd3c0f41aea5ac4dc2a2fc27faba3532c83a41 +Author: Johnny Willemsen +Date: Mon Sep 11 09:10:10 2023 +0200 + + Updated documentation for new Embarcadero C++ Builder compiler selection + + * ACE/ACE-INSTALL.html: + +commit a8ea1c4c8f7c50107e668237508b8b62ee88ff86 +Author: Johnny Willemsen +Date: Thu Sep 7 14:27:17 2023 +0200 + + Embarcadero C++ Builder changes + + * ACE/ace/config-win32-borland.h: + +commit 86a1759fe86a61b243bca480459ff6c9fb376dd3 +Merge: 7afc280d75f d636e1c235d +Author: Johnny Willemsen +Date: Tue Sep 5 10:22:36 2023 +0200 + + Merge pull request #2115 from jwillemsen/jwi-reorderdefines + + Reorder defines + +commit d636e1c235db6f510393e49284d449f1dd4a3c01 +Author: Johnny Willemsen +Date: Tue Sep 5 09:33:27 2023 +0200 + + Reorder defines + + * ACE/ace/OS_NS_sys_stat.h: + +commit 4e006ad5b3c805794256e2d683c56489d972037c +Author: Johnny Willemsen +Date: Sun Sep 3 09:16:00 2023 +0200 + + Document change + + * ACE/NEWS: + +commit 552b2a809408d9b78d44547c5d30b378ad6bb813 +Author: Johnny Willemsen +Date: Sun Sep 3 09:02:45 2023 +0200 + + Include changes memory + +commit 6771ed92528428c275f2b7a6a6da8278dd2454e9 +Author: Johnny Willemsen +Date: Sat Sep 2 21:33:14 2023 +0200 + + Update BufferedStreamBuffer.h + +commit eaf09c218662e8a9e7a5c1b9047721729258645b +Author: Johnny Willemsen +Date: Sat Sep 2 21:17:49 2023 +0200 + + Update HTBP_Session.cpp + +commit 292335d6048ac7a54e2339271da8de5af9ecd194 +Author: Johnny Willemsen +Date: Sat Sep 2 20:22:40 2023 +0200 + + Use std::unique_ptr + * ACE/ACEXML/parser/parser/Parser.cpp: + * ACE/apps/JAWS/server/HTTP_Server.cpp: + * ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp: + * ACE/protocols/ace/INet/HTTPS_Context.h: + * ACE/protocols/ace/INet/HTTPS_SessionFactory.cpp: + * ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp: + * ACE/protocols/ace/RMCast/Socket.cpp: + * ACE/protocols/ace/RMCast/Socket.h: + * ACE/protocols/examples/INet/FTP_Simple_exec.cpp: + * ACE/protocols/examples/INet/HTTP_Simple_exec.cpp: + * ACE/tests/Bug_3539_Regression_Test.cpp: + * TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp: + * TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h: + * TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h: + * TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h: + * TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h: + * TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp: + * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp: + * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: + * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h: + * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp: + * TAO/orbsvcs/orbsvcs/Notify/Admin.h: + * TAO/orbsvcs/orbsvcs/Notify/Consumer.h: + * TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp: + * TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp: + * TAO/tests/Bug_3524_Regression/test_i.cpp: + * TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h: + * TAO/tests/Storable/Savable.cpp: + +commit 9ce21b61b18044fc217190c9c65f03d05ee9c96f +Merge: babc33f87ea e6e9ef49456 +Author: Johnny Willemsen +Date: Sat Sep 2 20:20:21 2023 +0200 + + Merge branch 'jwi-autoptrcpp17_cleanup' of https://github.com/jwillemsen/ATCD into jwi-autoptrcpp17_cleanup + +commit babc33f87eacaff8b45ec09e666cee482937c901 +Author: Johnny Willemsen +Date: Sat Sep 2 20:20:11 2023 +0200 + + Get rid of ACE_Auto_Array_Ptr + + * ACE/Kokyu/Default_Dispatcher_Impl.h: + * ACE/ace/Sock_Connect.cpp: + * ACE/ace/TLI.cpp: + * ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp: + * ACE/examples/C++NPv2/TP_Logging_Server.h: + * ACE/examples/Reactor/TP_Reactor/client.cpp: + * ACE/protocols/ace/HTBP/HTBP_Channel.cpp: + * ACE/protocols/ace/HTBP/HTBP_Session.cpp: + * ACE/protocols/ace/INet/BidirStreamBuffer.h: + * ACE/protocols/ace/INet/BufferedStreamBuffer.h: + * ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp: + * ACE/protocols/ace/RMCast/Link.cpp: + * ACE/tests/CDR_Test.cpp: + * ACE/tests/Reactor_Performance_Test.cpp: + * TAO/examples/Simple/grid/Grid_i.cpp: + * TAO/examples/Simple/grid/Grid_i.h: + * TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp: + * TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp: + * TAO/tests/Oneway_Send_Timeouts/Client.cpp: + +commit e6e9ef494569e7cbe9653e5ea29de235830a22d1 +Author: Johnny Willemsen +Date: Sat Sep 2 17:22:28 2023 +0200 + + Update Svc_Conf_Lexer.cpp + +commit ed54a767da647199e7238d3f9eabe4ca9f22bde3 +Author: Johnny Willemsen +Date: Sat Sep 2 16:37:49 2023 +0200 + + C++17 removes std::auto_ptr so we don't provide the ACE auto_ptr templates anymore with C++17, use std::unique_ptr as replacement. Updated a lot of examples/tests to not use any ACE auto pointer templates but just std::unique_ptr + + * ACE/ACEXML/common/HttpCharStream.cpp: + * ACE/ACEXML/common/URL_Addr.cpp: + * ACE/ACEXML/common/XML_Codecs.cpp: + * ACE/ACEXML/examples/SAXPrint/main.cpp: + * ACE/ACEXML/parser/parser/Parser.cpp: + * ACE/ACEXML/parser/parser/Parser.h: + * ACE/Kokyu/Default_Dispatcher_Impl.cpp: + * ACE/Kokyu/Kokyu_defs.h: + * ACE/Kokyu/tests/DSRT_MIF/MIF.cpp: + * ACE/ace/ACE.cpp: + * ACE/ace/Auto_Functor.h: + * ACE/ace/Auto_Ptr.cpp: + * ACE/ace/Auto_Ptr.h: + * ACE/ace/Auto_Ptr.inl: + * ACE/ace/CDR_Stream.cpp: + * ACE/ace/DLL_Manager.cpp: + * ACE/ace/Log_Msg.h: + * ACE/ace/Pagefile_Memory_Pool.cpp: + * ACE/ace/Proactor.cpp: + * ACE/ace/Refcounted_Auto_Ptr.h: + * ACE/ace/SOCK_SEQPACK_Acceptor.cpp: + * ACE/ace/SOCK_SEQPACK_Association.cpp: + * ACE/ace/SString.h: + * ACE/ace/Service_Gestalt.cpp: + * ACE/ace/Sock_Connect.cpp: + * ACE/ace/Svc_Conf_Lexer.cpp: + * ACE/ace/TLI.cpp: + * ACE/ace/UUID.cpp: + * ACE/ace/config-win32-msvc-142.h: + * ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp: + * ACE/apps/JAWS/clients/Caching/URL_Properties.cpp: + * ACE/apps/JAWS/server/JAWS_IO.cpp: + * ACE/apps/gperf/src/Key_List.cpp: + * ACE/bin/main2TMAIN.pl: + * ACE/docs/exceptions.html: + * ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp: + * ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp: + * ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp: + * ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp: + * ACE/examples/Threads/future1.cpp: + * ACE/examples/Threads/future2.cpp: + * ACE/examples/Web_Crawler/HTTP_URL.cpp: + * ACE/include/makeinclude/platform_linux_icc.GNU: + * ACE/netsvcs/lib/Name_Handler.cpp: + * ACE/tests/CDR_File_Test.cpp: + * ACE/tests/CDR_Test.cpp: + * ACE/tests/Codecs_Test.cpp: + * ACE/tests/Compiler_Features_09_Test.cpp: + * ACE/tests/Conn_Test.cpp: + * ACE/tests/Future_Set_Test.cpp: + * ACE/tests/Future_Test.cpp: + * ACE/tests/Log_Msg_Test.cpp: + * ACE/tests/Logging_Strategy_Test.cpp: + * ACE/tests/Message_Queue_Test_Ex.cpp: + * ACE/tests/Reactor_Fairness_Test.cpp: + * ACE/tests/Reactor_Performance_Test.cpp: + * ACE/tests/Reactor_Timer_Test.cpp: + * ACE/tests/Refcounted_Auto_Ptr_Test.cpp: + * ACE/tests/SString_Test.cpp: + * ACE/tests/UUID_Test.cpp: + * TAO/docs/events_tutorial.html: + * TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html: + * TAO/examples/Borland/ChatClientWnd.cpp: + * TAO/examples/Borland/ChatClientWnd.h: + * TAO/examples/Load_Balancing/Load_Balancer_i.cpp: + * TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h: + * TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp: + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp: + * TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp: + * TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp: + * TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp: + * TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp: + * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: + * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp: + * TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp: + * TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp: + * TAO/orbsvcs/orbsvcs/Notify/EventChannel.h: + * TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp: + * TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h: + * TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h: + * TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp: + * TAO/orbsvcs/orbsvcs/Notify/Object.cpp: + * TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp: + * TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h: + * TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp: + * TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp: + * TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp: + * TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h: + * TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp: + * TAO/tao/Acceptor_Registry.cpp: + * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl: + * TAO/tao/DynamicAny/DynAnyUtils_T.cpp: + * TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp: + * TAO/tao/IIOP_Acceptor.cpp: + * TAO/tao/IIOP_Connector.cpp: + * TAO/tao/LocateRequest_Invocation.cpp: + * TAO/tao/Messaging/ExceptionHolder_i.cpp: + * TAO/tao/ORB_Core.cpp: + * TAO/tao/PortableServer/Active_Object_Map.cpp: + * TAO/tao/PortableServer/Object_Adapter.cpp: + * TAO/tao/PortableServer/Root_POA.cpp: + * TAO/tao/RTCORBA/Thread_Pool.cpp: + * TAO/tao/Strategies/SCIOP_Acceptor.cpp: + * TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp: + * TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp: + +commit 066b98de2b3436fd4013619c31bcb2b7fd1e0839 +Author: Johnny Willemsen +Date: Fri Sep 1 14:25:21 2023 +0200 + + CHeck if value is not defined before defining it here in ACE + + * ACE/ace/os_include/os_fcntl.h: + +commit 00641fb1cae6ebe41544c2cdad884e7e96661c79 +Author: Johnny Willemsen +Date: Fri Sep 1 14:24:55 2023 +0200 + + Layout change + + * ACE/ace/Auto_Ptr.h: + +commit 0aaf6c9bc26251ce66e2446b9cc6c82f634fc920 +Author: Johnny Willemsen +Date: Fri Sep 1 14:24:42 2023 +0200 + + Fixed comment after endif + + * ACE/ace/os_include/sys/os_types.h: + +commit 6c256ad581fa75de4ccd3bbabb5a117b0c374112 +Author: Johnny Willemsen +Date: Mon Aug 28 09:36:49 2023 +0200 + + Update Auto_Ptr.h + +commit e09f240025d1e876504d2e2faf1de3a4ffaed405 +Author: ClausKlein +Date: Wed Aug 23 19:21:00 2023 +0200 + + This does NOT compile with c++17 or newer! + +commit b192a376446da1af90f068873b147c0b1fe25e29 +Author: ClausKlein +Date: Tue Aug 22 18:12:19 2023 +0200 + + Replace std::unary_function<> with std::function<> + + (deprecated in C++11) and removed in C++17 + + Add missing #include + + Make the hack clear: + respect review comment + ace/Auto_Ptr.h must still include + +commit f2ee1640940bf46f155352adf34f0bdbbcc6e8e0 +Author: Johnny Willemsen +Date: Wed Jun 28 12:02:01 2023 +0200 + + Make ACE 7.1.1 and TAO 3.1.1 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: 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..5b007663fd0db 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) { @@ -37,7 +36,7 @@ Default_Dispatcher_Impl::init_i (const Dispatcher_Attributes& attrs) //ACE_DEBUG ((LM_DEBUG, "after new on task array\n" )); tasks_.reset(tasks_array); - //ACE_DEBUG ((LM_DEBUG, "task array auto_ptr set\n" )); + //ACE_DEBUG ((LM_DEBUG, "task array unique_ptr set\n" )); ConfigInfoSet& config_set = const_cast (attrs.config_info_set_); @@ -53,8 +52,8 @@ Default_Dispatcher_Impl::init_i (const Dispatcher_Attributes& attrs) Dispatcher_Task (*config, ACE_Thread_Manager::instance()), -1); - std::unique_ptr tmp_task_auto_ptr (task); - tasks_[i++] = std::move(tmp_task_auto_ptr); + std::unique_ptr tmp_task_unique_ptr (task); + tasks_[i++] = std::move(tmp_task_unique_ptr); } this->thr_creation_flags_ = attrs.thread_creation_flags (); diff --git a/ACE/Kokyu/Default_Dispatcher_Impl.h b/ACE/Kokyu/Default_Dispatcher_Impl.h index 350c88d179d8f..ec17f76c713e4 100644 --- a/ACE/Kokyu/Default_Dispatcher_Impl.h +++ b/ACE/Kokyu/Default_Dispatcher_Impl.h @@ -49,7 +49,7 @@ namespace Kokyu private: typedef std::unique_ptr Dispatcher_Task_Auto_Ptr; - ACE_Auto_Array_Ptr tasks_; + std::unique_ptr tasks_; int ntasks_; ConfigInfoSet curr_config_info_; int activated_; @@ -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..1eaedcb803f00 100644 --- a/ACE/Kokyu/Kokyu_defs.h +++ b/ACE/Kokyu/Kokyu_defs.h @@ -10,7 +10,6 @@ #include /**/ "ace/pre.h" #include "ace/Containers_T.h" #include "ace/Time_Value.h" -#include "ace/Auto_Ptr.h" #include "ace/Message_Block.h" #include "ace/Sched_Params.h" #include "ace/Malloc_Allocator.h" @@ -174,7 +173,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..c4da2b46de56c 100644 --- a/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp +++ b/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp @@ -1,5 +1,4 @@ #include "ace/ACE.h" -#include "ace/Auto_Ptr.h" #include "ace/Task.h" #include "ace/Sched_Params.h" #include "ace/Atomic_Op.h" @@ -46,7 +45,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 +56,7 @@ class MyTask : public ACE_Task_Base exec_duration_ (exec_duration) {} - int svc (void); + int svc (); private: ACE_Barrier& barrier_; @@ -68,7 +66,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 36148b3debe54..086505e0814aa 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -1,6 +1,77 @@ +USER VISIBLE CHANGES BETWEEN ACE-7.1.2 and ACE-7.1.3 +==================================================== + +USER VISIBLE CHANGES BETWEEN ACE-7.1.1 and ACE-7.1.2 +==================================================== + +. C++17 removed std::auto_ptr, updated ACE/TAO to not + use std::auto_ptr anymore and also not provide our + own auto_ptr. With C++17 ACE doesn't provide ACE_Auto_Ptr, + ACE_Auto_Basic_Ptr, ACE_Auto_Basic_Array_Ptr, ACE_Auto_Array_Ptr, + and ACE_auto_ptr_reset anymore, just use std::unique_ptr + +. Add c++std which can be used in the platform_macros.GNU + to set the C++ revision to be used (results in -std= flag) + +. Improve support for QNX 7.1 + +. Embarcadero C++ Builder enhancements + +USER VISIBLE CHANGES BETWEEN ACE-7.1.0 and ACE-7.1.1 +==================================================== + +. Fixed shared memory leak by ACE_Shared_Memory_Pool + +. Fixed ACE_INET_Addr::set when ACE_LACKS_GETSERVBYNAME has + been defined + +USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0 +===================================================== + +. Removed support for Windows CE, OpenVMS, HPUX, AIX, RTEMS, + Pharlap, Solaris, and Visual Studio 2015 + +. ACE/TAO now require C++14 or newer + +USER VISIBLE CHANGES BETWEEN ACE-7.0.10 and ACE-7.0.11 +====================================================== + +. 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 +==================================================== + +. Minor changes + USER VISIBLE CHANGES BETWEEN ACE-7.0.6 and ACE-7.0.7 ==================================================== +. Minor changes + USER VISIBLE CHANGES BETWEEN ACE-7.0.5 and ACE-7.0.6 ==================================================== diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 616aa21006078..6d753ec3bbe4a 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.6 + ACE VERSION: 7.1.2 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/ACE/README b/ACE/README index 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 16d2dd3f2c8e3..4750de3b01afe 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 7.0.6, released Thu Jan 20 09:26:53 CET 2022 +This is ACE version 7.1.2, released Mon Oct 30 07:57:01 CET 2023 If you have any problems with or questions about ACE, please open a issue or discussion on the ACE_TAO github project at diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 329696a58c8f7..7971232741118 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -2,7 +2,6 @@ #include "ace/Basic_Types.h" #include "ace/Handle_Set.h" -#include "ace/Auto_Ptr.h" #include "ace/SString.h" #include "ace/Version.h" #include "ace/Message_Block.h" @@ -48,10 +47,9 @@ namespace ACE // Are we debugging ACE? // Keeps track of whether we're in some global debug mode. - char debug_; + bool debug_ = false; } - int ACE::out_of_handles (int error) { @@ -60,9 +58,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 || @@ -70,11 +65,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. @@ -167,7 +157,7 @@ ACE::debug () //FUZZ: disable check_for_ace_log_categories static const char *debug = ACE_OS::getenv ("ACE_DEBUG"); //FUZZ: enable check_for_ace_log_categories - return (ACE::debug_ != 0) ? ACE::debug_ : (debug != 0 ? (*debug != '0') : false); + return (ACE::debug_) ? ACE::debug_ : (debug != 0 ? (*debug != '0') : false); } void @@ -224,10 +214,7 @@ ACE::select (int width, int ACE::terminate_process (pid_t pid) { -#if defined (ACE_HAS_PHARLAP) - ACE_UNUSED_ARG (pid); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) // Create a handle for the given process id. ACE_HANDLE process_handle = ::OpenProcess (PROCESS_TERMINATE, @@ -248,7 +235,7 @@ ACE::terminate_process (pid_t pid) } #else return ACE_OS::kill (pid, 9); -#endif /* ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } int @@ -2343,11 +2330,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') @@ -2384,11 +2367,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; @@ -2922,7 +2901,6 @@ ACE::gcd (u_long x, u_long y) return x; } - /// Calculates the minimum enclosing frame size for the given values. u_long ACE::minimum_frame_size (u_long period1, u_long period2) @@ -2966,7 +2944,6 @@ ACE::minimum_frame_size (u_long period1, u_long period2) } } - u_long ACE::is_prime (const u_long n, const u_long min_factor, @@ -3370,7 +3347,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 30513946040a9..eb03fc776f43a 100644 --- a/ACE/ace/ARGV.h +++ b/ACE/ace/ARGV.h @@ -61,7 +61,7 @@ class ACE_ARGV_Queue_Entry_T /// We need this destructor to keep some compilers from complaining. /// It's just a no-op, however. - ~ACE_ARGV_Queue_Entry_T (); + ~ACE_ARGV_Queue_Entry_T () = default; /// Dump the state of this object. void dump () const; @@ -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/ARGV.inl b/ACE/ace/ARGV.inl index 43dfa8cf77070..9788893eb7718 100644 --- a/ACE/ace/ARGV.inl +++ b/ACE/ace/ARGV.inl @@ -29,12 +29,6 @@ ACE_ARGV_Queue_Entry_T::ACE_ARGV_Queue_Entry_T (const ACE_ARGV_Queue_ // No-op } -template ACE_INLINE -ACE_ARGV_Queue_Entry_T::~ACE_ARGV_Queue_Entry_T () -{ - // No-op just to keep some compilers happy... -} - // Return the number of args template ACE_INLINE int diff --git a/ACE/ace/ATM_Acceptor.cpp b/ACE/ace/ATM_Acceptor.cpp index 1b9a03a1962a4..d9bd51330708a 100644 --- a/ACE/ace/ATM_Acceptor.cpp +++ b/ACE/ace/ATM_Acceptor.cpp @@ -18,12 +18,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Acceptor) -ACE_ATM_Acceptor::ACE_ATM_Acceptor (void) +ACE_ATM_Acceptor::ACE_ATM_Acceptor () { ACE_TRACE ("ACE_ATM_Acceptor::ACE_ATM_Acceptor"); } -ACE_ATM_Acceptor::~ACE_ATM_Acceptor (void) +ACE_ATM_Acceptor::~ACE_ATM_Acceptor () { ACE_TRACE ("ACE_ATM_Acceptor::~ACE_ATM_Acceptor"); } diff --git a/ACE/ace/ATM_Acceptor.inl b/ACE/ace/ATM_Acceptor.inl index 55a7b1807d271..9d040d69e00a8 100644 --- a/ACE/ace/ATM_Acceptor.inl +++ b/ACE/ace/ATM_Acceptor.inl @@ -27,7 +27,7 @@ ACE_ATM_Acceptor::ACE_ATM_Acceptor (const ACE_Addr &remote_sap, ACE_INLINE int -ACE_ATM_Acceptor::close (void) +ACE_ATM_Acceptor::close () { #if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM) return (acceptor_.close()); diff --git a/ACE/ace/ATM_Connector.cpp b/ACE/ace/ATM_Connector.cpp index 3c866fbdc4044..b02a4435b4d24 100644 --- a/ACE/ace/ATM_Connector.cpp +++ b/ACE/ace/ATM_Connector.cpp @@ -13,7 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Connector) -ACE_ATM_Connector::ACE_ATM_Connector (void) +ACE_ATM_Connector::ACE_ATM_Connector () { ACE_TRACE ("ACE_ATM_Connector::ACE_ATM_Connector"); } @@ -21,7 +21,6 @@ ACE_ATM_Connector::ACE_ATM_Connector (void) // Actively connect and produce a new ACE_ATM_Stream if things go well... // Connect the to the , waiting up to // amount of time if necessary. - int ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, const ACE_ATM_Addr &remote_sap, diff --git a/ACE/ace/ATM_Params.inl b/ACE/ace/ATM_Params.inl index 57376a0caf487..ceacb86d055cd 100644 --- a/ACE/ace/ATM_Params.inl +++ b/ACE/ace/ATM_Params.inl @@ -40,7 +40,7 @@ ACE_ATM_Params::ACE_ATM_Params (int rw_flag, // Default dtor. ACE_INLINE -ACE_ATM_Params::~ACE_ATM_Params (void) +ACE_ATM_Params::~ACE_ATM_Params () { ACE_TRACE ("ACE_ATM_Params::~ACE_ATM_Params"); } @@ -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 d17c9426406a1..be1e78ad596a7 100644 --- a/ACE/ace/Active_Map_Manager_T.h +++ b/ACE/ace/Active_Map_Manager_T.h @@ -57,7 +57,7 @@ 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/Active_Map_Manager_T.inl b/ACE/ace/Active_Map_Manager_T.inl index 5e7cec0d0ff2a..a33946310f41f 100644 --- a/ACE/ace/Active_Map_Manager_T.inl +++ b/ACE/ace/Active_Map_Manager_T.inl @@ -236,11 +236,6 @@ ACE_Active_Map_Manager::ACE_Active_Map_Manager (size_t size, { } -template ACE_INLINE -ACE_Active_Map_Manager::~ACE_Active_Map_Manager () -{ -} - template ACE_INLINE int ACE_Active_Map_Manager::open (size_t length, ACE_Allocator *alloc) diff --git a/ACE/ace/Addr.cpp b/ACE/ace/Addr.cpp index b1685851c494c..0d49376317497 100644 --- a/ACE/ace/Addr.cpp +++ b/ACE/ace/Addr.cpp @@ -28,10 +28,6 @@ ACE_Addr::ACE_Addr (int type, int size) : { } -ACE_Addr::~ACE_Addr () -{ -} - void * ACE_Addr::get_addr () const { diff --git a/ACE/ace/Addr.h b/ACE/ace/Addr.h index bfdea64446ddb..22a614eb3142b 100644 --- a/ACE/ace/Addr.h +++ b/ACE/ace/Addr.h @@ -34,7 +34,7 @@ class ACE_Export ACE_Addr ACE_Addr (int type = -1, int size = -1); /// Destructor. - virtual ~ACE_Addr (); + virtual ~ACE_Addr () = default; // = Get/set the size of the address. 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 2a30df8d017bb..eff953ef89abe 100644 --- a/ACE/ace/Asynch_Acceptor.cpp +++ b/ACE/ace/Asynch_Acceptor.cpp @@ -23,18 +23,18 @@ 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) { } template -ACE_Asynch_Acceptor::~ACE_Asynch_Acceptor (void) +ACE_Asynch_Acceptor::~ACE_Asynch_Acceptor () { // Close down the listen socket if (this->listen_handle_ != ACE_INVALID_HANDLE) @@ -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 d2e571b5b3840..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,18 +20,12 @@ 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) { } -template -ACE_Asynch_Connector::~ACE_Asynch_Connector (void) -{ - //this->asynch_connect_.close (); -} - template int ACE_Asynch_Connector::open (bool pass_addresses, ACE_Proactor *proactor, @@ -173,7 +167,7 @@ ACE_Asynch_Connector::validate_connection } template int -ACE_Asynch_Connector::cancel (void) +ACE_Asynch_Connector::cancel () { return this->asynch_connect_.cancel (); } @@ -224,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 1777cd0c904f7..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,10 +45,10 @@ 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 (void); + virtual ~ACE_Asynch_Connector () = default; /** * This opens asynch connector @@ -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 6584abfc4e807..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_; @@ -840,7 +839,7 @@ class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream private: /// Here just to provide an dummy implementation, since the /// one auto generated by MSVC is flagged as infinitely recursive - void operator= (Result &) {}; + void operator= (Result &) {} }; private: void operator= (const ACE_Asynch_Write_File &) = delete; @@ -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); @@ -1650,15 +1648,15 @@ class ACE_Export ACE_Handler class ACE_Export Proxy { public: - Proxy (ACE_Handler *handler) : handler_ (handler) {}; - void reset (void) { this->handler_ = 0; }; - ACE_Handler *handler (void) { return this->handler_; }; + Proxy (ACE_Handler *handler) : handler_ (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 931d3f8417932..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. @@ -269,6 +267,7 @@ class ACE_Export ACE_Atomic_Op ACE_Atomic_Op (int c); ACE_Atomic_Op (const ACE_Atomic_Op &c); ACE_Atomic_Op &operator= (int rhs); + ACE_Atomic_Op &operator= (const ACE_Atomic_Op &rhs); }; template<> @@ -280,6 +279,7 @@ class ACE_Export ACE_Atomic_Op ACE_Atomic_Op (unsigned int c); ACE_Atomic_Op (const ACE_Atomic_Op &c); ACE_Atomic_Op &operator= (unsigned int rhs); + ACE_Atomic_Op &operator= (const ACE_Atomic_Op &rhs); }; // If we have built in atomic op, use that, the assignment operator @@ -293,6 +293,7 @@ class ACE_Export ACE_Atomic_Op ACE_Atomic_Op (long c); ACE_Atomic_Op (const ACE_Atomic_Op &c); ACE_Atomic_Op &operator= (long rhs); + ACE_Atomic_Op &operator= (const ACE_Atomic_Op &rhs); }; template<> @@ -318,6 +319,7 @@ class ACE_Export ACE_Atomic_Op ACE_Atomic_Op (long long c); ACE_Atomic_Op (const ACE_Atomic_Op &c); ACE_Atomic_Op &operator= (long long rhs); + ACE_Atomic_Op &operator= (const ACE_Atomic_Op &c); }; template<> @@ -329,6 +331,7 @@ class ACE_Export ACE_Atomic_Op ACE_Atomic_Op (unsigned long long c); ACE_Atomic_Op (const ACE_Atomic_Op &c); ACE_Atomic_Op &operator= (unsigned long long rhs); + ACE_Atomic_Op &operator= (const ACE_Atomic_Op &c); }; #endif /* !__powerpc__ */ @@ -342,6 +345,7 @@ class ACE_Export ACE_Atomic_Op ACE_Atomic_Op (short c); ACE_Atomic_Op (const ACE_Atomic_Op &c); ACE_Atomic_Op &operator= (short rhs); + ACE_Atomic_Op &operator= (const ACE_Atomic_Op &c); }; template<> @@ -353,6 +357,7 @@ class ACE_Export ACE_Atomic_Op ACE_Atomic_Op (unsigned short c); ACE_Atomic_Op (const ACE_Atomic_Op &c); ACE_Atomic_Op &operator= (unsigned short rhs); + ACE_Atomic_Op &operator= (const ACE_Atomic_Op &c); }; #endif @@ -366,6 +371,7 @@ class ACE_Export ACE_Atomic_Op ACE_Atomic_Op (bool c); ACE_Atomic_Op (const ACE_Atomic_Op &c); ACE_Atomic_Op &operator= (bool rhs); + ACE_Atomic_Op &operator= (const ACE_Atomic_Op &c); }; #endif diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl index c00cbd306604a..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_; } @@ -444,6 +412,14 @@ ACE_Atomic_Op::operator= (int rhs) return *this; } +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (const ACE_Atomic_Op &rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + ACE_INLINE ACE_Atomic_Op::ACE_Atomic_Op () : @@ -471,6 +447,14 @@ ACE_Atomic_Op::operator= (unsigned int rhs) return *this; } +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (const ACE_Atomic_Op &rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + ACE_INLINE ACE_Atomic_Op::ACE_Atomic_Op () : ACE_Atomic_Op_GCC() @@ -497,6 +481,14 @@ ACE_Atomic_Op::operator= (long rhs) return *this; } +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (const ACE_Atomic_Op &rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + ACE_INLINE ACE_Atomic_Op::ACE_Atomic_Op () : ACE_Atomic_Op_GCC () @@ -560,6 +552,14 @@ ACE_Atomic_Op::operator= (long long rhs) return *this; } +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (const ACE_Atomic_Op &rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + ACE_INLINE ACE_Atomic_Op::ACE_Atomic_Op () : ACE_Atomic_Op_GCC () @@ -585,6 +585,15 @@ ACE_Atomic_Op::operator= (unsigned long lo ACE_Atomic_Op_GCC::operator= (rhs); return *this; } + +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (const ACE_Atomic_Op &rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + #endif /* !__powerpc__ */ #if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_2) @@ -614,6 +623,14 @@ ACE_Atomic_Op::operator= (short rhs) return *this; } +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (const ACE_Atomic_Op &rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + ACE_INLINE ACE_Atomic_Op::ACE_Atomic_Op () : ACE_Atomic_Op_GCC () @@ -639,6 +656,14 @@ ACE_Atomic_Op::operator= (unsigned short rhs) ACE_Atomic_Op_GCC::operator= (rhs); return *this; } + +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (const ACE_Atomic_Op &rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} #endif #if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_1) @@ -667,6 +692,14 @@ ACE_Atomic_Op::operator= (bool rhs) ACE_Atomic_Op_GCC::operator= (rhs); return *this; } + +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (const ACE_Atomic_Op &rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} #endif #endif /* ACE_HAS_GCC_ATOMIC_BUILTINS==1 */ 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.cpp b/ACE/ace/Auto_Event.cpp index 52024445aa635..721df5c2f9581 100644 --- a/ACE/ace/Auto_Event.cpp +++ b/ACE/ace/Auto_Event.cpp @@ -1,9 +1,5 @@ #include "ace/Auto_Event.h" -#if !defined (__ACE_INLINE__) -#include "ace/Auto_Event.inl" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_HAS_ALLOC_HOOKS) # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ diff --git a/ACE/ace/Auto_Event.h b/ACE/ace/Auto_Event.h index d2eaed880332b..c71e46c17be6e 100644 --- a/ACE/ace/Auto_Event.h +++ b/ACE/ace/Auto_Event.h @@ -51,7 +51,7 @@ class ACE_Auto_Event_T : public ACE_Event_T #endif /* ACE_HAS_WCHAR */ /// Default dtor. - virtual ~ACE_Auto_Event_T (); + virtual ~ACE_Auto_Event_T () = default; /// Dump the state of an object. void dump () const; @@ -92,17 +92,7 @@ class ACE_Auto_Event : ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (__ACE_INLINE__) -#include "ace/Auto_Event.inl" -#endif /* __ACE_INLINE__ */ - -#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_Event.inl b/ACE/ace/Auto_Event.inl deleted file mode 100644 index a8add6194f6e6..0000000000000 --- a/ACE/ace/Auto_Event.inl +++ /dev/null @@ -1,10 +0,0 @@ -// -*- C++ -*- -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -template -ACE_INLINE -ACE_Auto_Event_T::~ACE_Auto_Event_T () -{ -} - -ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Auto_Functor.h b/ACE/ace/Auto_Functor.h index 7e75ae7b6a838..278db800b1e23 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 @@ -59,49 +59,47 @@ class Auto_Functor typedef Functor functor_type; /// Constructor - explicit Auto_Functor (X * p = 0, - Functor functor = Functor()); // throw() + explicit Auto_Functor (X * p = nullptr, + 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 = nullptr); // 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 +108,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.cpp b/ACE/ace/Auto_Ptr.cpp index 09028186a67c1..88fab8cbc58e4 100644 --- a/ACE/ace/Auto_Ptr.cpp +++ b/ACE/ace/Auto_Ptr.cpp @@ -3,6 +3,8 @@ #include "ace/Auto_Ptr.h" +#if !defined (ACE_HAS_CPP17) + #if defined (ACE_HAS_ALLOC_HOOKS) # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ @@ -18,4 +20,6 @@ ACE_ALLOC_HOOK_DEFINE_Tt(ACE_Auto_Basic_Array_Ptr) ACE_END_VERSIONED_NAMESPACE_DECL +#endif /* ACE_HAS_CPP17 */ + #endif /* ACE_AUTO_PTR_CPP */ diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h index 01236ce8198ff..4c4d97d2e013a 100644 --- a/ACE/ace/Auto_Ptr.h +++ b/ACE/ace/Auto_Ptr.h @@ -21,6 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +// C++17 removed std::auto_ptr<>, so also disable the ACE versions when +// using C++17. +#if !defined (ACE_HAS_CPP17) + #if defined (_MSC_VER) // Suppress warning e.g. "return type for // 'ACE_Auto_Array_Pointer::operator ->' is 'type *' (i.e., not a UDT @@ -44,7 +48,7 @@ class ACE_Auto_Basic_Ptr public: typedef X element_type; - explicit ACE_Auto_Basic_Ptr (X * p = 0) : p_ (p) {} + explicit ACE_Auto_Basic_Ptr (X * p = nullptr) : p_ (p) {} ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr & ap); ACE_Auto_Basic_Ptr &operator= (ACE_Auto_Basic_Ptr & rhs); @@ -54,7 +58,7 @@ class ACE_Auto_Basic_Ptr X &operator *() const; X *get () const; X *release (); - void reset (X * p = 0); + void reset (X * p = nullptr); /// Dump the state of an object. void dump () const; @@ -69,7 +73,7 @@ class ACE_Auto_Basic_Ptr ACE_END_VERSIONED_NAMESPACE_DECL #if !defined (ACE_LACKS_AUTO_PTR) -#include +# include using std::auto_ptr; #else /* !ACE_LACKS_AUTO_PTR */ @@ -180,8 +184,7 @@ class ACE_Auto_Array_Ptr : public ACE_Auto_Basic_Array_Ptr */ template inline void -ACE_auto_ptr_reset (AUTO_PTR_TYPE & ap, - PTR_TYPE * p) +ACE_auto_ptr_reset (AUTO_PTR_TYPE & ap, PTR_TYPE * p) { ap.reset (p); } @@ -192,18 +195,14 @@ 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. # pragma warning(pop) #endif /* _MSC_VER */ +#endif /* ACE_HAS_CPP17 */ + #include /**/ "ace/post.h" #endif /* ACE_AUTO_PTR_H */ diff --git a/ACE/ace/Auto_Ptr.inl b/ACE/ace/Auto_Ptr.inl index e349e3202f70c..6657f5e20013d 100644 --- a/ACE/ace/Auto_Ptr.inl +++ b/ACE/ace/Auto_Ptr.inl @@ -1,6 +1,8 @@ // -*- C++ -*- #include "ace/Global_Macros.h" +#if !defined (ACE_HAS_CPP17) + #if defined (ACE_HAS_ALLOC_HOOKS) # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ @@ -42,7 +44,7 @@ ACE_Auto_Basic_Ptr::release () { ACE_TRACE ("ACE_Auto_Basic_Ptr::release"); X *old = this->p_; - this->p_ = 0; + this->p_ = nullptr; return old; } @@ -175,3 +177,5 @@ ACE_Auto_Array_Ptr::operator->() const } ACE_END_VERSIONED_NAMESPACE_DECL + +#endif /* ACE_HAS_CPP17 */ 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 a406cab3ce978..3b736a149420b 100644 --- a/ACE/ace/Bound_Ptr.h +++ b/ACE/ace/Bound_Ptr.h @@ -39,7 +39,7 @@ class ACE_Bound_Ptr_Counter ACE_ALLOC_HOOK_DECLARE; ACE_Bound_Ptr_Counter (long init_obj_ref_count = 0); - ~ACE_Bound_Ptr_Counter (); + ~ACE_Bound_Ptr_Counter () = default; /// Create a ACE_Bound_Ptr_Counter and initialize the /// reference count to indicate ownership by a strong pointer. @@ -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/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl index 17ffe620f71dd..5dd1c8b06aae1 100644 --- a/ACE/ace/Bound_Ptr.inl +++ b/ACE/ace/Bound_Ptr.inl @@ -121,11 +121,6 @@ ACE_Bound_Ptr_Counter::ACE_Bound_Ptr_Counter (long init_obj_ref_count) { } -template inline -ACE_Bound_Ptr_Counter::~ACE_Bound_Ptr_Counter () -{ -} - template inline ACE_Strong_Bound_Ptr::ACE_Strong_Bound_Ptr (X *p) : counter_ (COUNTER::create_strong ()), 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..29cc5ac9a7693 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; } @@ -43,7 +43,7 @@ ACE_SizeCDR::write_octet (ACE_CDR::Octet x) ACE_INLINE ACE_CDR::Boolean ACE_SizeCDR::write_boolean (ACE_CDR::Boolean x) { - return (ACE_CDR::Boolean) this->write_octet (x ? (ACE_CDR::Octet) 1 : (ACE_CDR::Octet) 0); + return this->write_octet (x ? (ACE_CDR::Octet) 1 : (ACE_CDR::Octet) 0); } ACE_INLINE ACE_CDR::Boolean @@ -184,7 +184,7 @@ ACE_SizeCDR::write_wchar_array (const ACE_CDR::WChar* x, if (ACE_OutputCDR::wchar_maxbytes () == 0) { errno = EACCES; - return (ACE_CDR::Boolean) (this->good_bit_ = false); + return (this->good_bit_ = false); } if (ACE_OutputCDR::wchar_maxbytes () == sizeof (ACE_CDR::WChar)) return this->write_array (x, @@ -305,98 +305,98 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Char x) { ss.write_char (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Short x) { ss.write_short (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::UShort x) { ss.write_ushort (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Long x) { ss.write_long (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::ULong x) { ss.write_ulong (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::LongLong x) { ss.write_longlong (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::ULongLong x) { ss.write_ulonglong (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::LongDouble x) { ss.write_longdouble (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Float x) { ss.write_float (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_CDR::Double x) { ss.write_double (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::Fixed &x) { ss.write_fixed (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::Char *x) { ss.write_string (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const ACE_CDR::WChar *x) { ss.write_wstring (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const std::string& x) { ss.write_string (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } #if !defined(ACE_LACKS_STD_WSTRING) @@ -404,7 +404,7 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, const std::wstring& x) { ss.write_wstring (x); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } #endif @@ -413,28 +413,28 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_boolean x) { ss.write_boolean (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_char x) { ss.write_char (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_wchar x) { ss.write_wchar (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_octet x) { ss.write_octet (x.val_); - return (ACE_CDR::Boolean) ss.good_bit (); + return ss.good_bit (); } ACE_INLINE ACE_CDR::Boolean @@ -448,8 +448,7 @@ operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_string x) } ss.write_string (len, x.val_); - return - (ACE_CDR::Boolean) (ss.good_bit () && (!x.bound_ || len <= x.bound_)); + return (ss.good_bit () && (!x.bound_ || len <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean @@ -463,8 +462,7 @@ operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_wstring x) } ss.write_wstring (len, x.val_); - return - (ACE_CDR::Boolean) (ss.good_bit () && (!x.bound_ || len <= x.bound_)); + return (ss.good_bit () && (!x.bound_ || len <= x.bound_)); } diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index 1691daec28385..b3f3dcf3db2ec 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -1,7 +1,7 @@ #include "ace/CDR_Stream.h" #include "ace/SString.h" -#include "ace/Auto_Ptr.h" #include "ace/Truncate.h" +#include #if !defined (__ACE_INLINE__) # include "ace/CDR_Stream.inl" @@ -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 (); } @@ -1530,7 +1530,7 @@ ACE_InputCDR::read_string (ACE_CDR::Char *&x) 0); #endif /* ACE_HAS_ALLOC_HOOKS */ - ACE_Auto_Basic_Array_Ptr safe_data (x); + std::unique_ptr safe_data (x); if (this->read_char_array (x, len)) { @@ -1563,10 +1563,10 @@ ACE_InputCDR::read_string (ACE_CDR::Char *&x) ACE_CDR::Boolean ACE_InputCDR::read_string (ACE_CString &x) { - ACE_CDR::Char * data = 0; + ACE_CDR::Char * data = nullptr; if (this->read_string (data)) { - ACE_Auto_Basic_Array_Ptr safe_data (data); + std::unique_ptr safe_data (data); x = data; return true; } @@ -1604,7 +1604,7 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x) // the memory is allocated. if (len > 0 && len <= this->length ()) { - ACE_Auto_Basic_Array_Ptr safe_data; + std::unique_ptr safe_data; if (static_cast (this->major_version_) == 1 && static_cast (this->minor_version_) == 2) @@ -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 (); } @@ -2347,10 +2346,6 @@ ACE_InputCDR::unregister_monitor (void) // -------------------------------------------------------------- -ACE_Char_Codeset_Translator::~ACE_Char_Codeset_Translator () -{ -} - ACE_CDR::Boolean ACE_Char_Codeset_Translator::read_string (ACE_InputCDR &cdr, std::string &x) @@ -2364,10 +2359,6 @@ ACE_Char_Codeset_Translator::read_string (ACE_InputCDR &cdr, // -------------------------------------------------------------- -ACE_WChar_Codeset_Translator::~ACE_WChar_Codeset_Translator () -{ -} - #if !defined(ACE_LACKS_STD_WSTRING) ACE_CDR::Boolean ACE_WChar_Codeset_Translator::read_wstring (ACE_InputCDR &cdr, diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h index a7eb2acecd969..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_; @@ -1180,7 +1179,7 @@ class ACE_Export ACE_InputCDR class ACE_Export ACE_Char_Codeset_Translator { public: - virtual ~ACE_Char_Codeset_Translator (); + virtual ~ACE_Char_Codeset_Translator () = default; /// Read a single character from the stream, converting from the /// stream codeset to the native codeset @@ -1288,7 +1287,7 @@ class ACE_Export ACE_Char_Codeset_Translator class ACE_Export ACE_WChar_Codeset_Translator { public: - virtual ~ACE_WChar_Codeset_Translator (); + virtual ~ACE_WChar_Codeset_Translator () = default; virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR&, ACE_CDR::WChar&) = 0; @@ -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/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl index 5f0a55da6809a..cbfa8203fb647 100644 --- a/ACE/ace/CDR_Stream.inl +++ b/ACE/ace/CDR_Stream.inl @@ -413,7 +413,7 @@ ACE_OutputCDR::write_wchar_array (const ACE_CDR::WChar* x, if (ACE_OutputCDR::wchar_maxbytes_ == 0) { errno = EACCES; - return (ACE_CDR::Boolean) (this->good_bit_ = false); + return (this->good_bit_ = false); } if (ACE_OutputCDR::wchar_maxbytes_ == sizeof (ACE_CDR::WChar)) @@ -742,7 +742,7 @@ ACE_InputCDR::read_boolean (ACE_CDR::Boolean& x) ACE_CDR::Octet tmp = 0; (void) this->read_octet (tmp); x = tmp ? true : false; - return (ACE_CDR::Boolean) this->good_bit_; + return this->good_bit_; } ACE_INLINE ACE_CDR::Boolean @@ -1271,114 +1271,110 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Char x) { os.write_char (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Short x) { os.write_short (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::UShort x) { os.write_ushort (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Long x) { os.write_long (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::ULong x) { os.write_ulong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::LongLong x) { os.write_longlong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::ULongLong x) { os.write_ulonglong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::LongDouble x) { os.write_longdouble (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Float x) { os.write_float (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Double x) { os.write_double (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::Fixed &x) { os.write_fixed (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::Char *x) { os.write_string (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::WChar *x) { os.write_wstring (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_string x) { - ACE_CDR::ULong const len = - static_cast (x.val_.size ()); + ACE_CDR::ULong const len = static_cast (x.val_.size ()); os.write_string (len, x.val_.c_str ()); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } #if !defined(ACE_LACKS_STD_WSTRING) ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_std_wstring x) { - ACE_CDR::ULong const len = - static_cast (x.val_.size ()); + ACE_CDR::ULong const len = static_cast (x.val_.size ()); os.write_wstring (len, x.val_.c_str ()); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } #endif @@ -1386,7 +1382,7 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const std::string& x) { os.write_string (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } #if !defined(ACE_LACKS_STD_WSTRING) @@ -1394,7 +1390,7 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const std::wstring& x) { os.write_wstring (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } #endif @@ -1403,28 +1399,28 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_boolean x) { (void) os.write_boolean (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_char x) { os.write_char (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wchar x) { os.write_wchar (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_octet x) { os.write_octet (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean @@ -1438,8 +1434,7 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x) } os.write_string (len, x.val_); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean @@ -1453,22 +1448,21 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wstring x) } os.write_wstring (len, x.val_); - return - (ACE_CDR::Boolean) (os.good_bit () && (!x.bound_ || len <= x.bound_)); + return (os.good_bit () && (!x.bound_ || len <= x.bound_)); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_uint8 x) { os.write_uint8 (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_int8 x) { os.write_int8 (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } // **************************************************************** diff --git a/ACE/ace/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 971b2d8b9da0d..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 -ACE_Cache_Map_Iterator::~ACE_Cache_Map_Iterator (void) -{ -} - ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_CACHE_MAP_MANAGER_T_CPP */ diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h index 6a75854df2429..ce8016af06eea 100644 --- a/ACE/ace/Cache_Map_Manager_T.h +++ b/ACE/ace/Cache_Map_Manager_T.h @@ -98,14 +98,14 @@ class ACE_Cache_Map_Manager /// Close down a 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_; @@ -258,7 +257,7 @@ class ACE_Cache_Map_Iterator /// Copy constructor. ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator &rhs); - virtual ~ACE_Cache_Map_Iterator (void); + virtual ~ACE_Cache_Map_Iterator () = default; // = Iteration methods. @@ -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; @@ -331,7 +330,7 @@ class ACE_Cache_Map_Reverse_Iterator /// Copy constructor. ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator &rhs); - ~ACE_Cache_Map_Reverse_Iterator (void); + ~ACE_Cache_Map_Reverse_Iterator () = default; // = Iteration methods. @@ -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 84c276a7b8446..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_; } @@ -153,11 +153,6 @@ ACE_Cache_Map_Reverse_Iterator ACE_INLINE -ACE_Cache_Map_Reverse_Iterator::~ACE_Cache_Map_Reverse_Iterator (void) -{ -} - template ACE_INLINE ACE_Cache_Map_Reverse_Iterator & ACE_Cache_Map_Reverse_Iterator::operator= (const ACE_Cache_Map_Reverse_Iterator &rhs) { @@ -187,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; @@ -204,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; @@ -235,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 7987655b4d1ca..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_); @@ -574,11 +572,6 @@ ACE_Bounded_Cached_Connect_Strategy -ACE_Bounded_Cached_Connect_Strategy::~ACE_Bounded_Cached_Connect_Strategy(void) -{ -} - template int ACE_Bounded_Cached_Connect_Strategy::find_or_create_svc_handler_i @@ -593,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 1ab9fe8e5404b..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; @@ -223,7 +223,7 @@ class ACE_Bounded_Cached_Connect_Strategy int delete_lock = 0); /// Destructor - virtual ~ACE_Bounded_Cached_Connect_Strategy (void); + virtual ~ACE_Bounded_Cached_Connect_Strategy () = default; /// 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.cpp b/ACE/ace/Capabilities.cpp index 43cd9c95ee84d..4efd172c886a0 100644 --- a/ACE/ace/Capabilities.cpp +++ b/ACE/ace/Capabilities.cpp @@ -13,10 +13,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_CapEntry::~ACE_CapEntry () -{ -} - ACE_Capabilities::ACE_Capabilities () : caps_ () { diff --git a/ACE/ace/Capabilities.h b/ACE/ace/Capabilities.h index 3529ec6c81ba6..a5364e4ac7ba5 100644 --- a/ACE/ace/Capabilities.h +++ b/ACE/ace/Capabilities.h @@ -40,7 +40,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_CapEntry { public: - virtual ~ACE_CapEntry (void); + virtual ~ACE_CapEntry () = default; protected: enum @@ -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_Attributes.h b/ACE/ace/Condition_Attributes.h index ef89629acf721..f3016d4b2d2ea 100644 --- a/ACE/ace/Condition_Attributes.h +++ b/ACE/ace/Condition_Attributes.h @@ -71,7 +71,7 @@ class ACE_Export ACE_Condition_Attributes_T ACE_Condition_Attributes_T (int type = ACE_DEFAULT_SYNCH_TYPE); /// Destructor - ~ACE_Condition_Attributes_T (); + ~ACE_Condition_Attributes_T () = default; private: void operator= (const ACE_Condition_Attributes_T &) = delete; diff --git a/ACE/ace/Condition_Attributes.inl b/ACE/ace/Condition_Attributes.inl index 4fb4f788b3e78..2c9764127c836 100644 --- a/ACE/ace/Condition_Attributes.inl +++ b/ACE/ace/Condition_Attributes.inl @@ -29,9 +29,4 @@ ACE_Condition_Attributes_T::ACE_Condition_Attributes_ #endif } -ACE_INLINE -ACE_Condition_Attributes_T::~ACE_Condition_Attributes_T () -{ -} - ACE_END_VERSIONED_NAMESPACE_DECL 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..a902e263c4a2d 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 @@ -403,7 +401,7 @@ ACE_Configuration::operator!= (const ACE_Configuration& rhs) const ////////////////////////////////////////////////////////////////////////////// -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) +#if defined (ACE_WIN32) static constexpr int ACE_DEFAULT_BUFSIZE = 256; @@ -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, @@ -1034,7 +1020,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, return result; } -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ /////////////////////////////////////////////////////////////// @@ -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..436ee3bf0ad92 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. @@ -407,7 +407,7 @@ class ACE_Export ACE_Configuration ACE_Configuration_Section_Key root_; }; -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) +#if defined (ACE_WIN32) /** * @class ACE_Section_Key_Win32 @@ -524,18 +524,17 @@ 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); const u_long security_access_; }; -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ // ACE_Allocator version @@ -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..a6f0574334bf8 100644 --- a/ACE/ace/DLL_Manager.cpp +++ b/ACE/ace/DLL_Manager.cpp @@ -1,6 +1,5 @@ #include "ace/DLL_Manager.h" -#include "ace/Auto_Ptr.h" #include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/Framework_Component.h" @@ -12,6 +11,7 @@ #include "ace/Guard_T.h" #include "ace/OS_NS_dlfcn.h" #include "ace/OS_NS_string.h" +#include ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -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) @@ -281,16 +243,12 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, bool ignore_errors, ACE_TStri ACE_TRACE ("ACE_DLL_Handle::symbol"); ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); - ACE_Auto_Array_Ptr auto_name (ACE::ldname (sym_name)); + std::unique_ptr auto_name (ACE::ldname (sym_name)); // handle_ can be invalid especially when ACE_DLL_Handle resigned ownership // 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..0fe3d4a608b1f 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_; } @@ -245,7 +245,7 @@ ACE_Future_Rep::attach (ACE_Future_Observer *observer, if (this->value_ == 0) result = this->observer_collection_.insert (observer); else - observer->update (caller); + observer->update (caller); return result; } @@ -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..5520938f01c88 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -57,9 +57,9 @@ # define ACE_SET_BITS(WORD, BITS) (WORD |= (BITS)) # define ACE_CLR_BITS(WORD, BITS) (WORD &= ~(BITS)) -#if !defined (ACE_HAS_CPP11) -# error ACE/TAO require C++11 compliance, please upgrade your compiler and/or fix the platform configuration for your environment -#endif /* !ACE_HAS_CPP11 */ +#if !defined (ACE_HAS_CPP14) +# error ACE/TAO require C++14 compliance, please upgrade your compiler and/or fix the platform configuration for your environment +#endif #define ACE_UNIMPLEMENTED_FUNC(f) f = delete; @@ -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 505b52a8ef501..25a1fb5d74fb7 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -1,5 +1,4 @@ // Defines the Internet domain address family address format. - #include "ace/INET_Addr.h" #if !defined (__ACE_INLINE__) @@ -50,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 @@ -140,7 +131,6 @@ ACE_INET_Addr::is_ip_equal (const ACE_INET_Addr &sap) const return this->get_ip_address () == sap.get_ip_address(); } - u_long ACE_INET_Addr::hash () const { @@ -454,8 +444,7 @@ ACE_INET_Addr::set (u_short port_number, return 0; } -// Helper function to get a port number from a port name. - +/// Helper function to get a port number from a port name. static int get_port_number_from_name (const char port_name[], const char protocol[]) { @@ -479,12 +468,11 @@ static int get_port_number_from_name (const char port_name[], } // We try to resolve port number from its name. + port_number = -1; #if defined (ACE_LACKS_GETSERVBYNAME) - port_number = 0; ACE_UNUSED_ARG (port_name); ACE_UNUSED_ARG (protocol); #else - port_number = -1; servent sentry; ACE_SERVENT_DATA buf; servent *sp = ACE_OS::getservbyname_r (port_name, @@ -986,7 +974,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) @@ -1012,7 +999,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..6acbb0687ad7a 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,26 +367,12 @@ 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) // These are necessary in case somebody wants to derive from us and // override one of these with a custom approach. -# if defined (ACE_LACKS_CHAR_RIGHT_SHIFTS) -#define GET_FUNC_SET0(MT,CODE,CODE2) \ - GET_PROT(MT,short &,CODE) \ - GET_PROT(MT,u_short &,CODE) \ - GET_PROT(MT,int &,CODE) \ - GET_PROT(MT,u_int &,CODE) \ - GET_PROT(MT,long &,CODE) \ - GET_PROT(MT,u_long &,CODE) \ - GET_PROT(MT,float &,CODE) \ - GET_PROT(MT,double &,CODE) \ - inline virtual MT& operator>>(__omanip_ func) CODE2 \ - inline virtual MT& operator>>(__manip_ func) CODE2 -# else #define GET_FUNC_SET0(MT,CODE,CODE2) \ GET_PROT(MT,short &,CODE) \ GET_PROT(MT,u_short &,CODE) \ @@ -424,7 +388,6 @@ typedef ostream& (*__omanip_)(ostream&); GET_PROT(MT,u_char *,CODE) \ inline virtual MT& operator>>(__omanip_ func) CODE2 \ inline virtual MT& operator>>(__manip_ func) CODE2 -# endif #define PUT_FUNC_SET0(MT,CODE,CODE2) \ PUT_PROT(MT,short,CODE) \ @@ -443,10 +406,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 +415,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 c2eae90691bbc..88357cf0215e1 100644 --- a/ACE/ace/Intrusive_Auto_Ptr.h +++ b/ACE/ace/Intrusive_Auto_Ptr.h @@ -48,7 +48,7 @@ class ACE_Intrusive_Auto_Ptr { protected: /// Used to define a proper boolean conversion for "if (sp) ..." - static void unspecified_bool(ACE_Intrusive_Auto_Ptr***){}; + static void unspecified_bool(ACE_Intrusive_Auto_Ptr***){} typedef void (*unspecified_bool_type)(ACE_Intrusive_Auto_Ptr***); public: @@ -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..ca7decd224b22 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) 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_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..570711e99dc11 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) # 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, @@ -1326,10 +1313,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { errno = ACE::map_errno (this->errnum ()); ACE_TCHAR *lpMsgBuf = 0; - - // PharLap can't do FormatMessage, so try for socket - // error. -# if !defined (ACE_HAS_PHARLAP) ACE_TEXT_FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_MAX_WIDTH_MASK | FORMAT_MESSAGE_FROM_SYSTEM, @@ -1341,7 +1324,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, (ACE_TCHAR *) &lpMsgBuf, 0, 0); -# endif /* ACE_HAS_PHARLAP */ // If we don't get a valid response from // , we'll assume this is a @@ -1408,11 +1390,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 +1473,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 +1503,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)); @@ -1546,10 +1516,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { errno = ACE::map_errno (this->errnum ()); ACE_TCHAR *lpMsgBuf = 0; - - // PharLap can't do FormatMessage, so try for socket - // error. -# if !defined (ACE_HAS_PHARLAP) ACE_TEXT_FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_MAX_WIDTH_MASK | FORMAT_MESSAGE_FROM_SYSTEM, @@ -1561,7 +1527,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, (ACE_TCHAR *) &lpMsgBuf, 0, 0); -# endif /* ACE_HAS_PHARLAP */ // If we don't get a valid response from // , we'll assume this is a @@ -1713,11 +1678,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 +1692,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 +1767,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 +1803,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 +1811,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 +1837,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 +1869,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 +1912,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 +2485,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 +2910,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..ebbac05573a03 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 *); @@ -662,7 +657,7 @@ class ACE_Export ACE_Log_Msg /// passed "true" for the delete_ostream argument to msg_ostream). /// If we are reference counting, this points to a shared count that will /// be deleted when it reaches zero. Since we want optional but shared - /// ownership neither std::auto_ptr nor ACE_Strong_Bound_Ptr have the right + /// ownership neither std::unique_ptr nor ACE_Strong_Bound_Ptr have the right /// semantics. *Bound_Ptr also doesn't take advantage of Atomic_Op. typedef ACE_Atomic_Op Atomic_ULong; Atomic_ULong *ostream_refcount_; 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_Addr.cpp b/ACE/ace/MEM_Addr.cpp index 1e021a27debda..518736b083ca3 100644 --- a/ACE/ace/MEM_Addr.cpp +++ b/ACE/ace/MEM_Addr.cpp @@ -59,7 +59,7 @@ ACE_MEM_Addr::initialize_local (u_short port_number) return -1; this->external_.set (port_number, name); - this->internal_.set (port_number, ACE_TEXT ("localhost")); + this->internal_.set (port_number, ACE_LOCALHOST); return 0; } 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..9379622941555 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, @@ -330,7 +322,6 @@ ACE_MMAP_Memory_Pool::map_file (size_t map_size) // Ask operating system for more shared memory, increasing the mapping // accordingly. Note that this routine assumes that the appropriate // locks are held when it is called. - void * ACE_MMAP_Memory_Pool::acquire (size_t nbytes, size_t &rounded_bytes) 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..8f1467423601a 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -13,6 +13,7 @@ #include "ace/ACE.h" #include "ace/OS_NS_string.h" +#include ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -427,7 +428,6 @@ ACE_Malloc_T::free (void *ptr) // rounding...). Depending on the type of (i.e., shared // vs. local) subsequent calls from other processes will only // initialize the control block pointer. - template int ACE_Malloc_T::open () { @@ -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_); @@ -587,7 +577,6 @@ ACE_Malloc_T::~ACE_Malloc_T () } // Clean up the resources allocated by ACE_Malloc_T. - template int ACE_Malloc_T::remove () { @@ -611,7 +600,7 @@ ACE_Malloc_T::remove () // Also notice that we are leaving the decision of removing // the pool to users so they can map to the same mmap file // again. - this->cb_ptr_ = 0; + this->cb_ptr_ = nullptr; return result; } @@ -792,7 +781,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 (; @@ -844,16 +832,15 @@ ACE_Malloc_T::shared_find (const char *name) ACE_TRACE ("ACE_Malloc_T::shared_find"); #endif /* !ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ - if (this->cb_ptr_ == 0) - return 0; + if (!this->cb_ptr_) + return nullptr; ACE_SEH_TRY { for (NAME_NODE *node = this->cb_ptr_->name_head_; node != 0; node = node->next_) - if (ACE_OS::strcmp (node->name (), - name) == 0) + if (std::strcmp (node->name (), name) == 0) return node; } ACE_SEH_EXCEPT (this->memory_pool_.seh_selector (GetExceptionInformation ())) @@ -866,11 +853,11 @@ template int ACE_Malloc_T::shared_bind (const char *name, void *pointer) { - if (this->cb_ptr_ == 0) + if (!this->cb_ptr_) return -1; // Combine the two allocations into one to avoid overhead... - NAME_NODE *new_node = 0; + NAME_NODE *new_node = nullptr; ACE_ALLOCATOR_RETURN (new_node, (NAME_NODE *) @@ -1002,7 +989,7 @@ ACE_Malloc_T::unbind (const char *name, void * curr != 0; curr = curr->next_) { - if (ACE_OS::strcmp (curr->name (), name) == 0) + if (std::strcmp (curr->name (), name) == 0) { pointer = (char *) curr->pointer_; @@ -1138,8 +1125,7 @@ ACE_Malloc_LIFO_Iterator_T::advance () return this->curr_ != 0; while (this->curr_ != 0 - && ACE_OS::strcmp (this->name_, - this->curr_->name ()) != 0) + && std::strcmp (this->name_, this->curr_->name ()) != 0) this->curr_ = this->curr_->next_; return this->curr_ != 0; @@ -1234,8 +1220,7 @@ ACE_Malloc_FIFO_Iterator_T::advance () return this->curr_ != 0; while (this->curr_ != 0 - && ACE_OS::strcmp (this->name_, - this->curr_->name ()) != 0) + && std::strcmp (this->name_, this->curr_->name ()) != 0) this->curr_ = this->curr_->prev_; return this->curr_ != 0; diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h index e7c28760a8cfd..62775b798cbdb 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 @@ -486,6 +486,9 @@ class ACE_Malloc_T int ref_counter (); /// Release ref counter. + /// @retval 0 Success + /// @retval -1 Failure due to missing control block + /// @retval >0 Memory not release because refcount is not zero int release (int close = 0); /// Releases resources allocated by this object. @@ -881,13 +884,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/Malloc_T.inl b/ACE/ace/Malloc_T.inl index 8a8d939c97290..c66d0edfc69c5 100644 --- a/ACE/ace/Malloc_T.inl +++ b/ACE/ace/Malloc_T.inl @@ -58,12 +58,14 @@ template ACE_INLINE int ACE_Malloc_T::release (int close) { ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1); - if (this->cb_ptr_ != 0) + if (this->cb_ptr_ != nullptr) { int const retv = --this->cb_ptr_->ref_counter_; if (close) - this->memory_pool_.release (0); + { + this->memory_pool_.release (0); + } if (retv == 0) { @@ -109,9 +111,7 @@ ACE_Malloc_T::protect (ssize_t len, } template ACE_INLINE int -ACE_Malloc_T::protect (void *addr, - size_t len, - int flags) +ACE_Malloc_T::protect (void *addr, size_t len, int flags) { ACE_TRACE ("ACE_Malloc_T::protect"); return this->memory_pool_.protect (addr, len, flags); 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..47ae0955ae9b9 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 */ @@ -248,7 +246,6 @@ ACE_Mem_Map::ACE_Mem_Map () } // Map a file specified by FILE_NAME. - ACE_Mem_Map::ACE_Mem_Map (const ACE_TCHAR *file_name, size_t len, int flags, @@ -281,7 +278,6 @@ ACE_Mem_Map::ACE_Mem_Map (const ACE_TCHAR *file_name, // Map a file from an open file descriptor HANDLE. This function will // lookup the length of the file if it is not given. - ACE_Mem_Map::ACE_Mem_Map (ACE_HANDLE handle, size_t len, int prot, 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..6ff89561fa5d8 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 @@ -693,6 +691,13 @@ ACE_Message_Queue_Ex::set_time_pol this->queue_.set_time_policy (rhs); } +template +ACE_Message_Queue & +ACE_Message_Queue_Ex::queue () +{ + return this->queue_; +} + template ACE_Message_Queue_Iterator::ACE_Message_Queue_Iterator (ACE_Message_Queue &q) : queue_ (q) diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h index bc49d81d80b0f..f4be9145dde9e 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 @@ -1395,6 +1385,11 @@ class ACE_Message_Queue_Ex /// Dump the state of an object. virtual void dump () const; + /// Support access to the underlying . Note that + /// manipulating the lower level queue directly may be hazardous (, but + /// necessary in some scenarios); be sure to lock the queue first. + ACE_Message_Queue &queue (); + /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1571,13 +1566,7 @@ class ACE_Message_Queue_Ex_N : public ACE_Message_Queue_Ex= max_messages_; } size_t -ACE_Message_Queue_Vx::high_water_mark (void) +ACE_Message_Queue_Vx::high_water_mark () { ACE_TRACE ("ACE_Message_Queue_Vx::high_water_mark"); ACE_NOTSUP_RETURN ((size_t) -1); @@ -158,7 +157,7 @@ ACE_Message_Queue_Vx::high_water_mark (size_t) } size_t -ACE_Message_Queue_Vx::low_water_mark (void) +ACE_Message_Queue_Vx::low_water_mark () { ACE_TRACE ("ACE_Message_Queue_Vx::low_water_mark"); // Don't need to guard, because this is fixed. @@ -174,21 +173,21 @@ ACE_Message_Queue_Vx::low_water_mark (size_t) } size_t -ACE_Message_Queue_Vx::message_bytes (void) +ACE_Message_Queue_Vx::message_bytes () { ACE_TRACE ("ACE_Message_Queue_Vx::message_bytes"); ACE_NOTSUP_RETURN ((size_t) -1); } size_t -ACE_Message_Queue_Vx::message_length (void) +ACE_Message_Queue_Vx::message_length () { ACE_TRACE ("ACE_Message_Queue_Vx::message_length"); ACE_NOTSUP_RETURN ((size_t) -1); } size_t -ACE_Message_Queue_Vx::message_count (void) +ACE_Message_Queue_Vx::message_count () { ACE_TRACE ("ACE_Message_Queue_Vx::message_count"); // Don't need to guard, because this is a system call. @@ -211,14 +210,14 @@ ACE_Message_Queue_Vx::message_length (size_t) } int -ACE_Message_Queue_Vx::signal_enqueue_waiters (void) +ACE_Message_Queue_Vx::signal_enqueue_waiters () { // No-op. return 0; } int -ACE_Message_Queue_Vx::signal_dequeue_waiters (void) +ACE_Message_Queue_Vx::signal_dequeue_waiters () { // No-op. return 0; diff --git a/ACE/ace/Message_Queue_Vx.h b/ACE/ace/Message_Queue_Vx.h index 527801a53bb99..a8833945b531d 100644 --- a/ACE/ace/Message_Queue_Vx.h +++ b/ACE/ace/Message_Queue_Vx.h @@ -74,28 +74,28 @@ class ACE_Export ACE_Message_Queue_Vx: public ACE_Message_Queue ACE_Notification_Strategy * = 0); /// Close down the message queue and release all resources. - virtual int close (void); + virtual int close (); /// Close down the message queue and release all resources. - virtual ~ACE_Message_Queue_Vx (void); + virtual ~ACE_Message_Queue_Vx (); // = Queue statistic methods. /** * Number of total bytes on the queue, i.e., sum of the message * block sizes. */ - virtual size_t message_bytes (void); + virtual size_t message_bytes (); /** * Number of total length on the queue, i.e., sum of the message * block lengths. */ - virtual size_t message_length (void); + virtual size_t message_length (); /** * Number of total messages on the queue. */ - virtual size_t message_count (void); + virtual size_t message_count (); // = Manual changes to these stats (used when queued message blocks // change size or lengths). @@ -114,13 +114,13 @@ class ACE_Export ACE_Message_Queue_Vx: public ACE_Message_Queue // = Flow control routines /// Get high watermark. - virtual size_t high_water_mark (void); + virtual size_t high_water_mark (); /// Set high watermark. virtual void high_water_mark (size_t hwm); /// Get low watermark. - virtual size_t low_water_mark (void); + virtual size_t low_water_mark (); /// Set low watermark. virtual void low_water_mark (size_t lwm); @@ -164,10 +164,10 @@ class ACE_Export ACE_Message_Queue_Vx: public ACE_Message_Queue // = Check the boundary conditions (assumes locks are held). /// True if queue is full, else false. - virtual bool is_full_i (void); + virtual bool is_full_i (); /// True if queue is empty, else false. - virtual bool is_empty_i (void); + virtual bool is_empty_i (); // = Implementation of public / methods above. @@ -181,13 +181,13 @@ class ACE_Export ACE_Message_Queue_Vx: public ACE_Message_Queue virtual int wait_not_empty_cond (ACE_Time_Value *tv); /// Inform any threads waiting to enqueue that they can procede. - virtual int signal_enqueue_waiters (void); + virtual int signal_enqueue_waiters (); /// Inform any threads waiting to dequeue that they can procede. - virtual int signal_dequeue_waiters (void); + virtual int signal_dequeue_waiters (); /// Access the underlying msgQ. - MSG_Q_ID msgq (void); + MSG_Q_ID msgq (); private: ACE_Message_Queue_Vx (const ACE_Message_Queue_Vx &) = delete; @@ -204,10 +204,6 @@ class ACE_Export ACE_Message_Queue_Vx: public ACE_Message_Queue /// Maximum message size, in bytes. int max_message_length_; - - /// Native message queue options. - int options_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Message_Queue_Vx.inl b/ACE/ace/Message_Queue_Vx.inl index e54c62f6f233c..0e51325650f67 100644 --- a/ACE/ace/Message_Queue_Vx.inl +++ b/ACE/ace/Message_Queue_Vx.inl @@ -3,9 +3,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_VXWORKS) // Specialization to use native VxWorks Message Queues. - ACE_INLINE MSG_Q_ID -ACE_Message_Queue_Vx::msgq (void) +ACE_Message_Queue_Vx::msgq () { // Hijack the tail_ field to store the MSG_Q_ID. return static_cast ( 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..af05fb8929ca9 100644 --- a/ACE/ace/Msg_WFMO_Reactor.cpp +++ b/ACE/ace/Msg_WFMO_Reactor.cpp @@ -1,6 +1,6 @@ #include "ace/Msg_WFMO_Reactor.h" -#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) +#if defined (ACE_WIN32) #if !defined (__ACE_INLINE__) #include "ace/Msg_WFMO_Reactor.inl" @@ -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; @@ -78,4 +78,4 @@ ACE_Msg_WFMO_Reactor::poll_remaining_handles (DWORD slot) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/Msg_WFMO_Reactor.h b/ACE/ace/Msg_WFMO_Reactor.h index 6adb3d5d433b6..835edb595134d 100644 --- a/ACE/ace/Msg_WFMO_Reactor.h +++ b/ACE/ace/Msg_WFMO_Reactor.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) +#if defined (ACE_WIN32) #include "ace/WFMO_Reactor.h" @@ -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 @@ -111,7 +111,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Msg_WFMO_Reactor.inl" #endif /* __ACE_INLINE__ */ -#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */ +#endif /* ACE_WIN32 */ #include /**/ "ace/post.h" #endif /* ACE_MSG_WFMO_REACTOR_H */ diff --git a/ACE/ace/Msg_WFMO_Reactor.inl b/ACE/ace/Msg_WFMO_Reactor.inl index ee73e6118123e..cf6a280996c58 100644 --- a/ACE/ace/Msg_WFMO_Reactor.inl +++ b/ACE/ace/Msg_WFMO_Reactor.inl @@ -1,5 +1,5 @@ // -*- C++ -*- -#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) +#if defined (ACE_WIN32) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -29,4 +29,4 @@ ACE_Msg_WFMO_Reactor::alertable_handle_events (ACE_Time_Value *how_long) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/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..66c8432ce10ad 100644 --- a/ACE/ace/NT_Service.cpp +++ b/ACE/ace/NT_Service.cpp @@ -1,5 +1,5 @@ #include "ace/config-all.h" -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) +#if defined (ACE_WIN32) #include "ace/NT_Service.h" @@ -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) { @@ -613,4 +610,4 @@ ACE_NT_Service::wait_for_service_state (DWORD desired_state, ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h index 9308dbbe17f30..f931d0fbd55d4 100644 --- a/ACE/ace/NT_Service.h +++ b/ACE/ace/NT_Service.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) +#if defined (ACE_WIN32) #include "ace/ACE.h" #include "ace/OS_Log_Msg_Attributes.h" @@ -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 @@ -196,13 +196,13 @@ class ACE_Export ACE_NT_Service : public ACE_Task * error, 0 on success. This just affects the SCM and registry - the * can and will keep running fine if it is already running. */ - int remove (void); + int remove (); /// Sets the startup type for the service. Returns -1 on error, 0 on success. int startup (DWORD startup); /// Returns the current startup type. - DWORD startup (void); + DWORD startup (); // = Methods to control ACE_Log_Msg behavior in the service. @@ -216,7 +216,7 @@ class ACE_Export ACE_NT_Service : public ACE_Task * call this function just before calling the StartServiceCtrlDispatcher * function. */ - void capture_log_msg_attributes (void); + void capture_log_msg_attributes (); /** * Set the ACE_Log_Msg attributes in the current thread to those saved @@ -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 @@ -429,7 +429,7 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc, \ #include "ace/NT_Service.inl" #endif /* __ACE_INLINE__ */ -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ +#endif /* ACE_WIN32 */ #include /**/ "ace/post.h" diff --git a/ACE/ace/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_Proxy.cpp b/ACE/ace/Name_Proxy.cpp index 13110923bd719..b4d5f702b959c 100644 --- a/ACE/ace/Name_Proxy.cpp +++ b/ACE/ace/Name_Proxy.cpp @@ -2,8 +2,6 @@ #include "ace/Log_Category.h" #include "ace/os_include/arpa/os_inet.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL void @@ -15,43 +13,35 @@ ACE_Name_Proxy::dump () const ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->connector_.dump (); this->peer_.dump (); - ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("reactor_ = %x"), this->reactor_)); ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } -// Default constructor. - +/// Default constructor. ACE_Name_Proxy::ACE_Name_Proxy () - : reactor_ (0) { ACE_TRACE ("ACE_Name_Proxy::ACE_Name_Proxy"); } -// Establish binding with the ACE_Name Server at remote_addr. - +/// Establish binding with the ACE_Name Server at remote_addr. int ACE_Name_Proxy::open (const ACE_INET_Addr &remote_addr, ACE_Synch_Options& options) { ACE_TRACE ("ACE_Name_Proxy::open"); - ACE_Time_Value *timeout = 0; + ACE_Time_Value *timeout {}; if (options[ACE_Synch_Options::USE_TIMEOUT]) timeout = const_cast (options.time_value ()); // Initiate the connection. - return this->connector_.connect (this->peer_, - remote_addr, - timeout); + return this->connector_.connect (this->peer_, remote_addr, timeout); } -// Establish binding with the ACE_Name Server at remote_addr. - +/// Establish binding with the ACE_Name Server at remote_addr. ACE_Name_Proxy::ACE_Name_Proxy ( const ACE_INET_Addr &remote_addr, ACE_Synch_Options& options) - : reactor_ (0) { ACE_TRACE ("ACE_Name_Proxy::ACE_Name_Proxy"); if (this->open (remote_addr, options) == -1 @@ -61,9 +51,8 @@ ACE_Name_Proxy::ACE_Name_Proxy ( ACE_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy"))); } -// Obtain underlying handle. - -/* VIRTUAL */ ACE_HANDLE +/// Obtain underlying handle. +ACE_HANDLE ACE_Name_Proxy::get_handle () const { ACE_TRACE ("ACE_Name_Proxy::get_handle"); @@ -74,8 +63,8 @@ int ACE_Name_Proxy::request_reply (ACE_Name_Request &request) { ACE_TRACE ("ACE_Name_Proxy::request_reply"); - void *buffer; - ssize_t length = request.encode (buffer); + void *buffer {}; + ssize_t const length = request.encode (buffer); if (length == -1) ACELIB_ERROR_RETURN ((LM_ERROR, @@ -84,7 +73,6 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) -1); // Transmit request via a blocking send. - if (this->peer_.send_n (buffer, length) != length) ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), @@ -95,7 +83,6 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) ACE_Name_Reply reply; // Receive reply via blocking read. - if (this->peer_.recv_n (&reply, sizeof reply) == -1) ACELIB_ERROR_RETURN ((LM_ERROR, @@ -116,8 +103,8 @@ int ACE_Name_Proxy::send_request (ACE_Name_Request &request) { ACE_TRACE ("ACE_Name_Proxy::send_request"); - void *buffer; - ssize_t length = request.encode (buffer); + void *buffer {}; + ssize_t const length = request.encode (buffer); if (length == -1) ACELIB_ERROR_RETURN ((LM_ERROR, @@ -126,7 +113,6 @@ ACE_Name_Proxy::send_request (ACE_Name_Request &request) -1); // Transmit request via a blocking send. - else if (this->peer_.send_n (buffer, length) != length) ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), @@ -166,7 +152,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) } // Transform the length into host byte order. - ssize_t length = ACE_NTOHL (reply.length ()); + ssize_t const length = ACE_NTOHL (reply.length ()); // Receive the rest of the request message. // @@ beware of blocking read!!!. @@ -195,8 +181,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) return 0; } -// Close down the connection to the server. - +/// Close down the connection to the server. ACE_Name_Proxy::~ACE_Name_Proxy () { ACE_TRACE ("ACE_Name_Proxy::~ACE_Name_Proxy"); diff --git a/ACE/ace/Name_Proxy.h b/ACE/ace/Name_Proxy.h index 93ac6d6c6086b..88483796343c1 100644 --- a/ACE/ace/Name_Proxy.h +++ b/ACE/ace/Name_Proxy.h @@ -46,7 +46,7 @@ class ACE_Export ACE_Name_Proxy : public ACE_Event_Handler { public: /// Default constructor. - ACE_Name_Proxy (void); + ACE_Name_Proxy (); // = Establish a binding with the ACE_Name Server. ACE_Name_Proxy (const ACE_INET_Addr &remote_addr, // Address of ACE_Name Server. @@ -70,7 +70,7 @@ class ACE_Export ACE_Name_Proxy : public ACE_Event_Handler virtual ACE_HANDLE get_handle () const; /// Close down the connection to the server. - virtual ~ACE_Name_Proxy (void); + virtual ~ACE_Name_Proxy (); /// Dump the state of the object; void dump () const; @@ -82,9 +82,6 @@ class ACE_Export ACE_Name_Proxy : public ACE_Event_Handler /// Connection to ACE_Name Server peer. ACE_SOCK_Stream peer_; - /// Pointer to ACE_Reactor (used if we are run in "reactive-mode"). - ACE_Reactor *reactor_; - private: ACE_Name_Proxy (const ACE_Name_Proxy &) = delete; ACE_Name_Proxy &operator= (const ACE_Name_Proxy &) = delete; 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/Null_Barrier.h b/ACE/ace/Null_Barrier.h index fc4ec18c576a7..c2654097896d8 100644 --- a/ACE/ace/Null_Barrier.h +++ b/ACE/ace/Null_Barrier.h @@ -25,17 +25,17 @@ class ACE_Null_Barrier /// Initialize the barrier to synchronize threads. ACE_Null_Barrier (unsigned int, const char * = 0, - void * = 0) {}; + void * = 0) {} /// Default dtor. ~ACE_Null_Barrier () = default; /// Block the caller until all threads have called and /// then allow all the caller threads to continue in parallel. - int wait () { return 0; }; + int wait () { return 0; } /// Dump the state of an object. - void dump () const {}; + void dump () const {} /// Declare the dynamic allocation hooks. //ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Null_Condition.h b/ACE/ace/Null_Condition.h index db68b6c0e0a48..8f699a1988e36 100644 --- a/ACE/ace/Null_Condition.h +++ b/ACE/ace/Null_Condition.h @@ -64,7 +64,7 @@ class ACE_Condition /// Returns 0. int broadcast () {return 0;} - ACE_Null_Mutex &mutex () {return this->mutex_;}; + ACE_Null_Mutex &mutex () {return this->mutex_;} /// Dump the state of an object. void dump () const {} 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 2057584ae7236..1dff5ccf076a1 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,17 +1463,11 @@ 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 . . . - int const ticks_per_sec = ::sysClkRateGet (); + _Vx_freq_t const ticks_per_sec = ::sysClkRateGet (); int const ticks = msec_timeout * ticks_per_sec / ACE_ONE_SECOND_IN_MSECS; result = ::semTake (cv->sema_.sema_, ticks); # else @@ -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_) { @@ -2210,7 +2159,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m, // expects). ACE_Time_Value relative_time = timeout.to_relative_time (); - int ticks_per_sec = ::sysClkRateGet (); + _Vx_freq_t const ticks_per_sec = ::sysClkRateGet (); int ticks = relative_time.sec() * ticks_per_sec + relative_time.usec () * ticks_per_sec / ACE_ONE_SECOND_IN_USECS; @@ -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_) { @@ -2553,7 +2496,7 @@ namespace { { const int result = attributes ? ACE_OS::cond_init (&evtdata->condition_, *attributes, name, arg) : - ACE_OS::cond_init (&evtdata->condition_, type, name, arg); + ACE_OS::cond_init (&evtdata->condition_, (short) type, name, arg); if (result != 0) return result; @@ -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 @@ -2618,16 +2552,6 @@ ACE_OS::event_init (ACE_event_t *event, if (type == USYNC_PROCESS) { const char *name_p = name; -# if defined (ACE_SHM_OPEN_REQUIRES_ONE_SLASH) - char adj_name[MAXPATHLEN]; - if (name[0] != '/') - { - adj_name[0] = '/'; - ACE_OS::strsncpy (&adj_name[1], name, MAXPATHLEN-1); - name_p = adj_name; - } -# endif /* ACE_SHM_OPEN_REQUIRES_ONE_SLASH */ - bool owner = false; // Let's see if the shared memory entity already exists. ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name_p), @@ -3056,72 +2980,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 +3118,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,51 +3159,19 @@ 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) - - // PharLap ETS can act on the current thread - it can set the - // quantum also, unlike Win32. All this only works on the RT - // version. -# if defined (ACE_HAS_PHARLAP_RT) - if (id != ACE_SELF) - ACE_NOTSUP_RETURN (-1); - -# if !defined (ACE_PHARLAP_LABVIEW_RT) - if (sched_params.quantum() != ACE_Time_Value::zero) - EtsSetTimeSlice (sched_params.quantum().msec()); -# endif - -# else - - if (sched_params.quantum () != ACE_Time_Value::zero) - { - // I don't know of a way to set the quantum on Win32. - errno = EINVAL; - return -1; - } - -# endif /* ACE_HAS_PHARLAP_RT */ - +#elif defined (ACE_WIN32) if (sched_params.scope () == ACE_SCOPE_THREAD) { // Setting the REALTIME_PRIORITY_CLASS on Windows is almost always // a VERY BAD THING. This include guard will allow people // to easily disable this feature in ACE. - // It won't work at all for Pharlap since there's no SetPriorityClass. -#if !defined (ACE_HAS_PHARLAP) && \ - !defined (ACE_DISABLE_WIN32_INCREASE_PRIORITY) +#if !defined (ACE_DISABLE_WIN32_INCREASE_PRIORITY) // Set the priority class of this process to the REALTIME process class // _if_ the policy is ACE_SCHED_FIFO. Otherwise, set to NORMAL. if (!::SetPriorityClass (::GetCurrentProcess (), @@ -3358,10 +3191,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } else if (sched_params.scope () == ACE_SCOPE_PROCESS) { - -# if defined (ACE_HAS_PHARLAP_RT) - ACE_NOTSUP_RETURN (-1); -# else HANDLE hProcess = ::OpenProcess (PROCESS_SET_INFORMATION, FALSE, @@ -3389,8 +3218,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } ::CloseHandle (hProcess); return 0; -#endif /* ACE_HAS_PHARLAP_RT */ - } else { @@ -3417,132 +3244,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 +3435,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 +3495,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 +3517,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 +3584,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 +3616,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 +3632,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 +3649,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 +3664,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 +3671,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 +3807,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 +3829,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 +4104,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 +4111,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 +4205,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 +4261,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 +4275,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); @@ -4921,9 +4463,9 @@ spa (FUNCPTR entry, ...) 0, 0, 0, 0, 0, 0, 0, 0); va_end (pvar); - // ::taskSpawn () returns the taskID on success: return 0 instead if - // successful - return ret > 0 ? 0 : -1; + // ::taskSpawn () returns TASK_ID_ERROR on + // error + return ret == ACE_VX_TASK_ID_ERROR ? -1 : 0; } #endif /* !ACE_LACKS_VA_FUNCTIONS */ @@ -4995,8 +4537,6 @@ add_to_argv (ACE_VX_USR_ARG_T& argc, char** argv, int max_args, char* string) } } -#if !defined (ACE_LACKS_VA_FUNCTIONS) - // This global function can be used from the VxWorks shell to pass // arguments to a C main () function. // @@ -5044,7 +4584,7 @@ spae (FUNCPTR entry, ...) // ::taskSpawn () returns the taskID on success: return 0 instead if // successful - return ret > 0 ? 0 : -1; + return ret == ACE_VX_TASK_ID_ERROR ? -1 : 0; } // This global function can be used from the VxWorks shell to pass @@ -5084,14 +4624,13 @@ spaef (FUNCPTR entry, ...) for (i = argc; i < ACE_MAX_ARGS; ++i) argv[i] = 0; - int ret = entry (argc, argv); + int const ret = entry (argc, argv); va_end (pvar); // Return the return value of the invoked ace_main routine. return ret; } -#endif /* !ACE_LACKS_VA_FUNCTIONS */ // This global function can be used from the VxWorks shell to pass // arguments to and run a main () function (i.e. ace_main). @@ -5144,12 +4683,12 @@ 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 the taskID on success: return _vx_call_rc instead if + // ::taskSpawn () returns TASK_ID_ERROR on failure: return _vx_call_rc instead if // successful - return ret > 0 ? _vx_call_rc : 255; + return ret == ACE_VX_TASK_ID_ERROR ? 255 : _vx_call_rc; } #if defined(ACE_AS_STATIC_LIBS) && defined (ACE_VXWORKS_DEBUGGING_HELPER) 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 f2e806c59308c..e20c7077f8863 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); @@ -2362,10 +2095,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) if (expired) error = ETIME; - -# if defined (ACE_LACKS_COND_TIMEDWAIT_RESET) - tv = tv.now (); -# endif /* ACE_LACKS_COND_TIMEDWAIT_RESET */ } if (result != -2) @@ -2410,11 +2139,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); @@ -2444,9 +2169,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) if (result == 0) { -# if defined (ACE_LACKS_COND_TIMEDWAIT_RESET) - tv = tv.now (); -# endif /* ACE_LACKS_COND_TIMEDWAIT_RESET */ --s->count_; } @@ -2455,7 +2177,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,85 +2210,13 @@ 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 // the system call expects). ACE_Time_Value relative_time = tv.to_relative_time (); - int ticks_per_sec = ::sysClkRateGet (); + _Vx_freq_t const ticks_per_sec = ::sysClkRateGet (); int ticks = relative_time.sec () * ticks_per_sec + relative_time.usec () * ticks_per_sec / ACE_ONE_SECOND_IN_USECS; @@ -2586,7 +2235,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 +2331,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 +2418,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 +2446,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 +2458,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,35 +2485,14 @@ 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) - policy = ACE_SCHED_FIFO; -# else - 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 ()); + DWORD const priority_class = ::GetPriorityClass (::GetCurrentProcess ()); if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR) ACE_FAIL_RETURN (-1); - policy = - (priority_class == - REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER; -# endif /* ACE_HAS_PHARLAP */ - + policy = (priority_class == REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER; return 0; # elif defined (ACE_HAS_VXTHREADS) return ::taskPriorityGet (ht_id, &priority); @@ -2885,7 +2500,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 +2524,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 +2579,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 +2624,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 +2639,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 +2659,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 +2685,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 +2693,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 +2706,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 +2728,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 +2784,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 +2818,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 +2864,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 +2933,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 +2976,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 +2987,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 +3003,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 +3012,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 +3076,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 +3095,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 +3109,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 +3123,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 +3131,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 +3179,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 +3222,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 +3297,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 +3310,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..058f4cb2ba9f6 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -8,10 +8,6 @@ #include "ace/os_include/os_fcntl.h" #include "ace/os_include/os_string.h" -#if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) -# include "ace/OS_NS_stdio.h" -#endif - #if defined (ACE_USES_ASM_SYMBOL_IN_DLSYM) # include "ace/OS_Memory.h" # include "ace/OS_NS_string.h" @@ -40,22 +36,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,15 +59,12 @@ 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 # elif defined (ACE_WIN32) static ACE_TCHAR buf[128]; -# if defined (ACE_HAS_PHARLAP) - ACE_OS::sprintf (buf, "error code %d", GetLastError()); -# else ACE_TEXT_FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, 0, ::GetLastError (), @@ -95,7 +72,6 @@ ACE_OS::dlerror () buf, sizeof buf / sizeof buf[0], 0); -# endif /* ACE_HAS_PHARLAP */ return buf; # else ACE_NOTSUP_RETURN (0); @@ -133,8 +109,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 +156,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 +180,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..49f658e5c5e97 100644 --- a/ACE/ace/OS_NS_netdb.cpp +++ b/ACE/ace/OS_NS_netdb.cpp @@ -5,10 +5,6 @@ # include "ace/OS_NS_netdb.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ -#if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) -# include "ace/OS_NS_stdio.h" -#endif - #include "ace/os_include/net/os_if.h" #include "ace/Global_Macros.h" #include "ace/OS_NS_arpa_inet.h" @@ -34,12 +30,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,8 +39,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_HAS_PHARLAP) +#if defined (ACE_WIN32) /** Define a structure for use with the netbios routine */ struct ADAPTERSTAT { @@ -102,87 +91,6 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) } } return 0; -# else -# if defined (ACE_HAS_PHARLAP_RT) - DEVHANDLE ip_dev = (DEVHANDLE)0; - EK_TCPIPCFG *devp = 0; - size_t i; - ACE_TCHAR dev_name[16]; - - for (i = 0; i < 10; i++) - { - // Ethernet. - ACE_OS::snprintf (dev_name, 16, "ether%d", i); - ip_dev = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev != 0) - break; - } - if (ip_dev == 0) - return -1; - devp = EtsTCPGetDeviceCfg (ip_dev); - if (devp == 0) - return -1; - ACE_OS::memcpy (node->node, - &devp->EthernetAddress[0], - 6); - return 0; -# else - ACE_UNUSED_ARG (node); - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ -# endif /* ACE_HAS_PHARLAP */ -#elif defined (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 +471,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 +479,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..f3268c7ac1d8a 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -39,7 +39,6 @@ ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock, case SEEK_CUR: { LARGE_INTEGER offset; -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) LARGE_INTEGER distance; distance.QuadPart = 0; if (!::SetFilePointerEx (lock->handle_, @@ -50,18 +49,6 @@ ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock, ACE_OS::set_errno_to_last_error (); return; } -# else - offset.LowPart = ::SetFilePointer (lock->handle_, - 0, - &offset.HighPart, - FILE_CURRENT); - if (offset.LowPart == INVALID_SET_FILE_POINTER && - ::GetLastError() != NO_ERROR) - { - ACE_OS::set_errno_to_last_error (); - return; - } -# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ # if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 start += offset.QuadPart; @@ -364,10 +351,6 @@ ACE_OS::cuserid (char *user, size_t maxlen) ::remCurIdGet (user, 0); return user; } -#elif defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (user); - ACE_UNUSED_ARG (maxlen); - ACE_NOTSUP_RETURN (0); #elif defined (ACE_WIN32) BOOL const result = GetUserNameA (user, (u_long *) &maxlen); if (result == FALSE) @@ -458,11 +441,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 +478,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 +507,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 +585,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 +609,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 +768,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,14 +824,7 @@ ACE_OS::rename (const char *old_name, ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_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) +# elif defined (ACE_WIN32) // NT4 (and up) provides a way to rename/move a file with similar semantics // to what's usually done on UNIX - if there's an existing file with // it is removed before the file is renamed/moved. The @@ -881,7 +839,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,12 +853,7 @@ ACE_OS::rename (const wchar_t *old_name, ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_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) +# elif defined (ACE_WIN32) // NT4 (and up) provides a way to rename/move a file with similar semantics // to what's usually done on UNIX - if there's an existing file with // it is removed before the file is renamed/moved. The @@ -917,14 +870,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 +886,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 +1051,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 +1130,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..87cffd62937b8 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -40,20 +40,11 @@ ACE_OS::mmap (void *addr, const ACE_TCHAR *file_mapping_name) { ACE_OS_TRACE ("ACE_OS::mmap"); -#if !defined (ACE_WIN32) || defined (ACE_HAS_PHARLAP) +#if !defined (ACE_WIN32) ACE_UNUSED_ARG (file_mapping_name); -#endif /* !defined (ACE_WIN32) || defined (ACE_HAS_PHARLAP) */ +#endif /* !defined (ACE_WIN32) */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) - -# if defined(ACE_HAS_WINCE) - ACE_UNUSED_ARG (addr); - if (ACE_BIT_ENABLED (flags, MAP_FIXED)) // not supported - { - errno = EINVAL; - return MAP_FAILED; - } -# else +#if defined (ACE_WIN32) 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, @@ -178,7 +149,7 @@ ACE_OS::mmap (void *addr, ACE_UNUSED_ARG (file_mapping); ACE_UNUSED_ARG (sa); ACE_NOTSUP_RETURN (MAP_FAILED); -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } // Implements simple read/write control for pages. Affects a page if @@ -190,7 +161,7 @@ ACE_INLINE int ACE_OS::mprotect (void *addr, size_t len, int prot) { ACE_OS_TRACE ("ACE_OS::mprotect"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) DWORD dummy; // Sigh! return ::VirtualProtect(addr, len, prot, &dummy) ? 0 : -1; #elif !defined (ACE_LACKS_MPROTECT) @@ -200,16 +171,15 @@ ACE_OS::mprotect (void *addr, size_t len, int prot) ACE_UNUSED_ARG (len); ACE_UNUSED_ARG (prot); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } ACE_INLINE int ACE_OS::msync (void *addr, size_t len, int sync) { ACE_OS_TRACE ("ACE_OS::msync"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) ACE_UNUSED_ARG (sync); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FlushViewOfFile (addr, len), ace_result_), int, -1); #elif !defined (ACE_LACKS_MSYNC) return ::msync ((ACE_MMAP_TYPE) addr, len, sync); @@ -218,7 +188,7 @@ ACE_OS::msync (void *addr, size_t len, int sync) ACE_UNUSED_ARG (len); ACE_UNUSED_ARG (sync); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ } ACE_INLINE int @@ -264,10 +234,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_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 60404b85e12dc..3b53035a77771 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -400,13 +400,6 @@ ACE_OS::recvfrom (ACE_HANDLE handle, } else { -# if defined (ACE_HAS_PHARLAP) - // Pharlap ETS (at least to v13) returns a legit address but doesn't - // include the sin_zero[8] bytes in the count. Correct for this here. - if (addrlen != 0 && addr != 0 && - *addrlen == 8 && addr->sa_family == AF_INET) - *addrlen = sizeof(sockaddr_in); -# endif /* ACE_HAS_PHARLAP */ return result; } #else /* non Win32 */ @@ -1062,8 +1055,10 @@ ACE_OS::if_freenameindex (struct if_nameindex *ptr) #ifdef ACE_LACKS_IF_NAMEINDEX ACE_UNUSED_ARG (ptr); #else - if (ptr != 0) + if (ptr) + { ::if_freenameindex (ptr); + } #endif /* ACE_LACKS_IF_NAMEINDEX */ } diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h index 4fdc51b28983e..fa044aa1dcc4b 100644 --- a/ACE/ace/OS_NS_sys_stat.h +++ b/ACE/ace/OS_NS_sys_stat.h @@ -32,13 +32,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -# if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 \ - && defined (ACE_WIN32) -# if defined (__BORLANDC__) -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) +# if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined (ACE_WIN32) +# if defined (_MSC_VER) typedef struct _stat64 ACE_stat; # define ACE_STAT_FUNC_NAME ::_stat64 # define ACE_WSTAT_FUNC_NAME ::_wstat64 @@ -46,6 +41,10 @@ typedef struct _stat64 ACE_stat; typedef struct _stati64 ACE_stat; # define ACE_STAT_FUNC_NAME ::_stati64 # define ACE_WSTAT_FUNC_NAME ::_wstati64 +# elif defined (__BORLANDC__) +typedef struct stati64 ACE_stat; +# define ACE_STAT_FUNC_NAME ::_stati64 +# define ACE_WSTAT_FUNC_NAME ::_wstati64 # else typedef struct stat ACE_stat; # define ACE_STAT_FUNC_NAME ::stat @@ -53,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 @@ -66,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); @@ -119,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 b8f7c9fc829db..b3a7d38e142ef 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) @@ -64,13 +59,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 @@ -128,11 +118,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 */ } @@ -153,12 +139,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); @@ -175,17 +156,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 */ @@ -207,45 +183,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) @@ -253,40 +197,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..8d4da8dbddd84 100644 --- a/ACE/ace/OS_NS_sys_utsname.cpp +++ b/ACE/ace/OS_NS_sys_utsname.cpp @@ -41,21 +41,7 @@ ACE_OS::uname (ACE_utsname *name) # endif SYSTEM_INFO sinfo; -# if defined (ACE_HAS_PHARLAP) - // PharLap doesn't do GetSystemInfo. What's really wanted is the - // CPU architecture, so we can get that with EtsGetSystemInfo. Fill - // in what's wanted in the SYSTEM_INFO structure, and carry on. Note - // that the CPU type values in EK_KERNELINFO have the same values - // are the ones defined for SYSTEM_INFO. - EK_KERNELINFO ets_kern; - EK_SYSTEMINFO ets_sys; - EtsGetSystemInfo (&ets_kern, &ets_sys); - sinfo.wProcessorLevel = static_cast (ets_kern.CpuType); - sinfo.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; - sinfo.dwProcessorType = ets_kern.CpuType * 100 + 86; -# else ::GetSystemInfo(&sinfo); -# endif /* ACE_HAS_PHARLAP */ const char* unknown = "???"; @@ -164,8 +150,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 81b634f9899ab..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,55 +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; - - if(pTz.DaylightBias!=0) - res->tm_isdst = 1; - else - res->tm_isdst = 1; - - 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 @@ -295,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..145a34d3b4337 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -11,7 +11,6 @@ #include "ace/OS_Memory.h" #include "ace/OS_NS_Thread.h" #include "ace/Object_Manager_Base.h" -#include "ace/os_include/sys/os_pstat.h" #if defined (ACE_HAS_SYSCTL) # include "ace/os_include/sys/os_sysctl.h" #endif /* ACE_HAS_SYSCTL */ @@ -52,10 +51,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 +62,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 +92,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 +254,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 +296,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 +312,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); @@ -404,9 +379,7 @@ ACE_OS::num_processors () { ACE_OS_TRACE ("ACE_OS::num_processors"); -#if defined (ACE_HAS_PHARLAP) - return 1; -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return sys_info.dwNumberOfProcessors; @@ -422,12 +395,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 @@ -438,9 +405,7 @@ ACE_OS::num_processors_online () { ACE_OS_TRACE ("ACE_OS::num_processors_online"); -#if defined (ACE_HAS_PHARLAP) - return 1; -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); long active_processors = 0; @@ -476,12 +441,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 +751,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 +856,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 +873,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 e65fb47f70858..83f77073575ce 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 */ @@ -97,11 +79,11 @@ ACE_INLINE long ACE_OS::getpagesize () { ACE_OS_TRACE ("ACE_OS::getpagesize"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return (long) sys_info.dwPageSize; -#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 @@ -390,16 +356,9 @@ ACE_OS::ftruncate (ACE_HANDLE handle, ACE_OFF_T offset) { ACE_OS_TRACE ("ACE_OS::ftruncate"); #if defined (ACE_WIN32) -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) LARGE_INTEGER loff; loff.QuadPart = offset; if (::SetFilePointerEx (handle, loff, 0, FILE_BEGIN)) -# else - if (::SetFilePointer (handle, - offset, - 0, - FILE_BEGIN) != INVALID_SET_FILE_POINTER) -# endif ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetEndOfFile (handle), ace_result_), int, -1); else ACE_FAIL_RETURN (-1); @@ -414,11 +373,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 +386,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]; @@ -554,19 +505,7 @@ ACE_INLINE int ACE_OS::hostname (char name[], size_t maxnamelen) { ACE_OS_TRACE ("ACE_OS::hostname"); -#if defined (ACE_HAS_PHARLAP) - // PharLap only can do net stuff with the RT version. -# if defined (ACE_HAS_PHARLAP_RT) - // @@This is not at all reliable... requires ethernet and BOOTP to be used. - // A more reliable way is to go thru the devices w/ EtsTCPGetDeviceCfg until - // a legit IP address is found, then get its name w/ gethostbyaddr. - ACE_SOCKCALL_RETURN (gethostname (name, maxnamelen), int, SOCKET_ERROR); -# else - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (maxnamelen); - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ -#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) +#if defined (ACE_VXWORKS) return ::gethostname (name, maxnamelen); #elif defined (ACE_WIN32) if (::gethostname (name, ACE_Utils::truncate_cast (maxnamelen)) == 0) @@ -590,7 +529,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) return -1; #elif defined (ACE_LACKS_GETHOSTNAME) ACE_NOTSUP_RETURN (-1); -#else /* ACE_HAS_PHARLAP */ +#else /* ACE_VXWORKS */ ACE_utsname host_info; if (ACE_OS::uname (&host_info) == -1) @@ -600,18 +539,18 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_OS::strsncpy (name, host_info.nodename, maxnamelen); return 0; } -#endif /* ACE_HAS_PHARLAP */ +#endif /* ACE_VXWORKS */ } #if defined (ACE_HAS_WCHAR) 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 +561,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 */ @@ -729,7 +668,6 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) return ::lseek64 (handle, offset, whence); #elif defined (ACE_HAS_LLSEEK) # if defined (ACE_WIN32) -# ifndef ACE_LACKS_WIN32_SETFILEPOINTEREX LARGE_INTEGER distance, new_file_pointer; distance.QuadPart = offset; @@ -738,22 +676,6 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) (::SetFilePointerEx (handle, distance, &new_file_pointer, whence) ? new_file_pointer.QuadPart : static_cast (-1)); -# else - LARGE_INTEGER l_offset; - l_offset.QuadPart = offset; - LONG low_offset = l_offset.LowPart; - LONG high_offset = l_offset.HighPart; - - l_offset.LowPart = ::SetFilePointer (handle, - low_offset, - &high_offset, - whence); - if (l_offset.LowPart == INVALID_SET_FILE_POINTER && - GetLastError () != NO_ERROR) - return static_cast (-1); - l_offset.HighPart = high_offset; - return l_offset.QuadPart; -# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ # else return ::llseek (handle, offset, whence); # endif /* WIN32 */ @@ -780,7 +702,7 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len) ssize_t result; # if defined (ACE_HAS_CHARPTR_SOCKOPT) - ACE_OSCALL (::read (handle, static_cast (buf), len), ssize_t, -result); + ACE_OSCALL (::read (handle, static_cast (buf), len), ssize_t, result); # else ACE_OSCALL (::read (handle, buf, len), ssize_t, result); # endif /* ACE_HAS_CHARPTR_SOCKOPT */ @@ -1097,18 +1019,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 @@ -1117,33 +1031,16 @@ ACE_OS::truncate (const ACE_TCHAR *filename, { ACE_OS_TRACE ("ACE_OS::truncate"); #if defined (ACE_WIN32) - ACE_HANDLE handle = ACE_OS::open (filename, - O_WRONLY, - ACE_DEFAULT_FILE_PERMS); + ACE_HANDLE handle = ACE_OS::open (filename, O_WRONLY, ACE_DEFAULT_FILE_PERMS); -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) LARGE_INTEGER loffset; loffset.QuadPart = offset; -#else - LONG low_offset = ACE_LOW_PART(offset); - LONG high_offset = ACE_HIGH_PART(offset); -#endif if (handle == ACE_INVALID_HANDLE) - ACE_FAIL_RETURN (-1); - -# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX) - else if (::SetFilePointerEx (handle, - loffset, - 0, - FILE_BEGIN)) -# else - else if (::SetFilePointer (handle, - low_offset, - &high_offset, - FILE_BEGIN) != INVALID_SET_FILE_POINTER - || GetLastError () == NO_ERROR) -# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ + { + ACE_FAIL_RETURN (-1); + } + else if (::SetFilePointerEx (handle, loffset, 0, FILE_BEGIN)) { BOOL result = ::SetEndOfFile (handle); ::CloseHandle (handle); @@ -1214,20 +1111,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 +1126,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 b04ebec525dd0..b536f8d1a3fc9 100644 --- a/ACE/ace/Pagefile_Memory_Pool.cpp +++ b/ACE/ace/Pagefile_Memory_Pool.cpp @@ -6,7 +6,6 @@ #endif /* __ACE_INLINE__ */ #include "ace/Log_Category.h" -#include "ace/Auto_Ptr.h" #include "ace/RW_Thread_Mutex.h" #include "ace/OS_NS_sys_mman.h" #include "ace/OS_NS_string.h" @@ -19,14 +18,9 @@ #include "ace/Based_Pointer_Repository.h" #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)\ +#if defined (ACE_WIN32) +#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 +49,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 @@ -91,10 +81,6 @@ ACE_Pagefile_Memory_Pool::ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_sto ACE_TEXT ("_")); } -ACE_Pagefile_Memory_Pool::~ACE_Pagefile_Memory_Pool (void) -{ -} - void * ACE_Pagefile_Memory_Pool::acquire (size_t nbytes, size_t &rounded_bytes) @@ -187,7 +173,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 @@ -230,7 +216,6 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, // Create file mapping, if not yet done if (object_handle_ == 0) { -#if !defined (ACE_LACKS_WIN32_SECURITY_DESCRIPTORS) // Allow access by all users. SECURITY_ATTRIBUTES sa; SECURITY_DESCRIPTOR sd; @@ -243,7 +228,6 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, sa.nLength = sizeof (SECURITY_ATTRIBUTES); sa.lpSecurityDescriptor = &sd; sa.bInheritHandle = FALSE; -#endif /* ACE_LACKS_WIN32_SECURITY_DESCRIPTORS */ // Get an object handle to the named reserved memory object. DWORD size_high; @@ -258,11 +242,7 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, object_handle_ = ACE_TEXT_CreateFileMapping (INVALID_HANDLE_VALUE, -#if !defined (ACE_LACKS_WIN32_SECURITY_DESCRIPTORS) &sa, -#else - 0, -#endif /* !ACE_LACKS_WIN32_SECURITY_DESCRIPTORS */ PAGE_READWRITE | SEC_RESERVE, size_high, size_low, @@ -382,4 +362,4 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h index 49f20b47880c8..4e8d4af8315b4 100644 --- a/ACE/ace/Pagefile_Memory_Pool.h +++ b/ACE/ace/Pagefile_Memory_Pool.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) #include "ace/ACE.h" #include "ace/os_include/sys/os_mman.h" @@ -66,7 +66,7 @@ class ACE_Export ACE_Pagefile_Memory_Pool const OPTIONS *options = 0); /// Destructor - virtual ~ACE_Pagefile_Memory_Pool (void); + virtual ~ACE_Pagefile_Memory_Pool () = default; /// Ask system for initial chunk of shared memory. void *init_acquire (size_t nbytes, @@ -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: /** @@ -190,7 +190,7 @@ class ACE_Export ACE_Pagefile_Memory_Pool ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ #if defined (__ACE_INLINE__) #include "ace/Pagefile_Memory_Pool.inl" diff --git a/ACE/ace/Pagefile_Memory_Pool.inl b/ACE/ace/Pagefile_Memory_Pool.inl index e6b2919d873f3..46734e75ba72a 100644 --- a/ACE/ace/Pagefile_Memory_Pool.inl +++ b/ACE/ace/Pagefile_Memory_Pool.inl @@ -1,5 +1,5 @@ // -*- C++ -*- -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -48,4 +48,4 @@ ACE_Pagefile_Memory_Pool::base_addr () const ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 &7 !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/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 a6a9874e3099f..dc6aa4c7ddf6f 100644 --- a/ACE/ace/Pipe.cpp +++ b/ACE/ace/Pipe.cpp @@ -91,17 +91,22 @@ ACE_Pipe::open (int buffer_size) # endif /* ACE_WIN32 */ // Bind listener to any port and then find out what the port was. - if (acceptor.open (local_any) == -1 - || acceptor.get_local_addr (my_addr) == -1) - result = -1; + if (acceptor.open (local_any) == -1 || acceptor.get_local_addr (my_addr) == -1) + { + result = -1; + } 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) - result = -1; + else if (connector.connect (writer, sv_addr) == -1) + { + result = -1; + } else if (acceptor.accept (reader) == -1) { writer.close (); @@ -223,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..061bcb930aaaa 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -4,14 +4,13 @@ // This only works on Win32 platforms and on Unix platforms with aio // calls. -#include "ace/Auto_Ptr.h" #include "ace/Proactor_Impl.h" #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 +335,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 +436,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 +1134,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 +1153,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 6d36c2a7be754..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)) @@ -406,8 +321,8 @@ ACE_Process::spawn (ACE_Process_Options &options) # endif /* ACE_LACKS_SETPGID */ # if !defined (ACE_LACKS_SETREGID) - if (options.getrgid () != (uid_t) -1 - || options.getegid () != (uid_t) -1) + if (options.getrgid () != (gid_t) -1 + || options.getegid () != (gid_t) -1) if (ACE_OS::setregid (options.getrgid (), options.getegid ()) == -1) { @@ -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), @@ -836,8 +747,8 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, stderr_ (ACE_INVALID_HANDLE), ruid_ ((uid_t) -1), euid_ ((uid_t) -1), - rgid_ ((uid_t) -1), - egid_ ((uid_t) -1), + rgid_ ((gid_t) -1), + egid_ ((gid_t) -1), #endif /* ACE_WIN32 */ handle_inheritance_ (true), set_handles_called_ (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 2df5ac5a37e04..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; @@ -347,12 +342,12 @@ class ACE_Export ACE_Process_Options int setreugid (const ACE_TCHAR* user); void setruid (uid_t id); void seteuid (uid_t id); - void setrgid (uid_t id); - void setegid (uid_t id); + void setrgid (gid_t id); + void setegid (gid_t id); uid_t getruid () const; uid_t geteuid () const; - uid_t getrgid () const; - uid_t getegid () const; + gid_t getrgid () const; + gid_t getegid () const; /** * Get the inherit_environment flag. @@ -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_; @@ -418,14 +410,13 @@ class ACE_Export ACE_Process_Options // These should be set to -1 to leave unchanged (default). uid_t ruid_; uid_t euid_; - uid_t rgid_; - uid_t egid_; + gid_t rgid_; + gid_t egid_; #endif /* ACE_WIN32 */ /// 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 a029eb661e9c7..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 @@ -291,13 +271,13 @@ ACE_Process_Options::seteuid (uid_t id) } ACE_INLINE void -ACE_Process_Options::setrgid (uid_t id) +ACE_Process_Options::setrgid (gid_t id) { this->rgid_ = id; } ACE_INLINE void -ACE_Process_Options::setegid (uid_t id) +ACE_Process_Options::setegid (gid_t id) { this->egid_ = id; } @@ -314,13 +294,13 @@ ACE_Process_Options::geteuid () const return this->euid_; } -ACE_INLINE uid_t +ACE_INLINE gid_t ACE_Process_Options::getrgid () const { return this->rgid_; } -ACE_INLINE uid_t +ACE_INLINE gid_t ACE_Process_Options::getegid () const { return this->egid_; @@ -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..dbfe197d690c0 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,99 +57,13 @@ 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 ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage) { ACE_TRACE ("ACE_Profile_Timer::elapsed_rusage"); -# if !defined (ACE_HAS_LIMITED_RUSAGE_T) // integral shared memory size usage.ru_ixrss = this->end_usage_.ru_ixrss - this->last_usage_.ru_ixrss; @@ -215,9 +109,6 @@ ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage) this->subtract (usage.ru_stime, this->end_usage_.ru_stime, this->last_usage_.ru_stime); -# else - ACE_UNUSED_ARG(usage); -# endif /* ACE_HAS_LIMITED_RUSAGE_T */ } void @@ -255,7 +146,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 +160,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 +174,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 +285,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 +324,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 c60e71641811f..9419f19c50594 100644 --- a/ACE/ace/Profile_Timer.h +++ b/ACE/ace/Profile_Timer.h @@ -54,17 +54,17 @@ class ACE_Export ACE_Profile_Timer typedef ACE_Rusage Rusage; /// Default constructor. Clears all time values to 0. - ACE_Profile_Timer (void); + ACE_Profile_Timer (); /// Shutdown the timer. - ~ACE_Profile_Timer (void); + ~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 3b52d41954fd5..f4be327fac877 100644 --- a/ACE/ace/Profile_Timer.inl +++ b/ACE/ace/Profile_Timer.inl @@ -3,40 +3,13 @@ #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 (void) -{ - ACE_TRACE ("ACE_Profile_Timer::start"); - return ACE_OS::ioctl (this->proc_handle_, - PIOCUSAGE, - &this->begin_usage_); -} - -ACE_INLINE int -ACE_Profile_Timer::stop (void) -{ - 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 ACE_INLINE int -ACE_Profile_Timer::start (void) +ACE_Profile_Timer::start () { ACE_TRACE ("ACE_Profile_Timer::start"); this->begin_time_ = ACE_OS::gettimeofday (); @@ -46,7 +19,7 @@ ACE_Profile_Timer::start (void) } ACE_INLINE int -ACE_Profile_Timer::stop (void) +ACE_Profile_Timer::stop () { ACE_TRACE ("ACE_Profile_Timer::stop"); this->last_time_ = this->end_time_; @@ -59,19 +32,19 @@ ACE_Profile_Timer::stop (void) ACE_END_VERSIONED_NAMESPACE_DECL -# endif /* ACE_HAS_PRUSAGE_T */ +# endif /* ACE_HAS_GETRUSAGE */ #elif defined (ACE_WIN32) ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Profile_Timer::~ACE_Profile_Timer (void) +ACE_Profile_Timer::~ACE_Profile_Timer () { } ACE_INLINE int -ACE_Profile_Timer::start (void) +ACE_Profile_Timer::start () { ACE_TRACE ("ACE_Profile_Timer::start"); # if defined (ACE_HAS_GETRUSAGE) @@ -83,7 +56,7 @@ ACE_Profile_Timer::start (void) } ACE_INLINE int -ACE_Profile_Timer::stop (void) +ACE_Profile_Timer::stop () { ACE_TRACE ("ACE_Profile_Timer::stop"); this->timer_.stop (); @@ -101,7 +74,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_Profile_Timer::start (void) +ACE_Profile_Timer::start () { ACE_TRACE ("ACE_Profile_Timer::start"); this->timer_.start (); @@ -109,7 +82,7 @@ ACE_Profile_Timer::start (void) } ACE_INLINE int -ACE_Profile_Timer::stop (void) +ACE_Profile_Timer::stop () { ACE_TRACE ("ACE_Profile_Timer::stop"); this->timer_.stop (); @@ -117,10 +90,10 @@ ACE_Profile_Timer::stop (void) } ACE_INLINE -ACE_Profile_Timer::~ACE_Profile_Timer (void) +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 e0cf882a00bae..eb25e0dda7896 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,25 +175,12 @@ 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() - destructor (e.g., LynxOS). ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS Platform/compiler supports Win32 structural exceptions ACE_HAS_4_4BSD_SENDMSG_RECVMSG Platform has BSD 4.4 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 @@ -218,26 +193,6 @@ ACE_HAS_BIG_FD_SET Compiler/platform has typedef ACE_HAS_BROKEN_ACCEPT_ADDR Platform can't correctly deal with a NULL addr to accept() (e.g, VxWorks < 6.9). -ACE_HAS_BROKEN_DGRAM_SENDV Platform sendv() does not work - properly with datagrams, - i.e. it fails when the iovec - size is IOV_MAX. -ACE_HAS_BROKEN_MAP_FAILED Platform doesn't cast MAP_FAILED - to a void *. -ACE_HAS_BROKEN_MSG_H Platform headers don't support - prototypes -ACE_HAS_BROKEN_MMAP_H HP/UX does not wrap the - mmap(2) header files with - extern "C". -ACE_HAS_BROKEN_NESTED_TEMPLATES MSVC has trouble with defining - STL containers for nested - structs and classes -ACE_HAS_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 +209,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 +223,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 +252,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 +259,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,11 +268,6 @@ ACE_HAS_NONSTATIC_OBJECT_MANAGER Causes the ACE_Object_Manager a static (global) instance. ACE_HAS_THR_KEYDELETE Platform supports thr_keydelete (e.g,. UNIXWARE) -ACE_HAS_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) with GLibc including new NPTL (Native POSIX Thread Library). @@ -335,8 +277,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 +291,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 +310,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 +340,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 +352,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 +382,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,15 +401,13 @@ 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 extended signals ACE_HAS_SIGSUSPEND Platform supports sigsuspend() ACE_HAS_SIGISMEMBER_BUG Platform has bug with - sigismember() (HP/UX 11). + sigismember() ACE_HAS_SIGNAL_OBJECT_AND_WAIT Platform supports the Win32 SignalObjectAndWait() function (WinNT 4.0 and beyond). @@ -499,9 +417,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 +429,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 @@ -535,49 +445,21 @@ ACE_HAS_STRNLEN Platform supports strnlen(3). ACE_HAS_STREAMS Platform supports STREAMS ACE_HAS_STREAM_PIPES Platform supports STREAM pipes ACE_HAS_STRICT Use the STRICT compilation mode on Win32. -ACE_HAS_STRUCT_NETDB_DATA Compiler/platform has strange - hostent API for socket *_r() - calls -ACE_HAS_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) ACE_HAS_SYS_FILIO_H Platform provides header -ACE_HAS_SYS_LOADAVG_H Compiler/platform contains the - file. -ACE_HAS_SYS_PSTAT_H Compiler/platform contains the - file. ACE_HAS_SYS_SOCKIO_H Compiler/platform provides the sockio.h file ACE_HAS_SYS_SYSCALL_H Compiler/platform contains the file. -ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA Compiler's template - instantiation mechanism - supports the use of "#pragma - instantiate". Edison Design - Group compilers, e.g., SGI C++ - and Green Hills 1.8.8 and - later, support this. ACE_HAS_TEMPLATE_TYPEDEFS Compiler implements templates that support typedefs inside of classes used as formal @@ -597,7 +479,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 +493,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 @@ -631,9 +509,6 @@ ACE_HAS_UALARM Platform supports ualarm() ACE_HAS_UCONTEXT_T Platform supports ucontext_t (which is used in the extended signal API). -ACE_HAS_UNION_WAIT The wait() system call takes a - (union wait *) rather than int - * ACE_HAS_VALGRIND Running with valgrind ACE_HAS_VERBOSE_NOTSUP Prints out console message in ACE_NOTSUP. Useful for @@ -649,8 +524,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 +594,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 @@ -742,12 +612,6 @@ ACE_LACKS_OPENDIR Platform lacks opendir and the opendir emulation must be used ACE_LACKS_READDIR Platform lacks readdir and the readdir emulation must be used -ACE_LACKS_COND_TIMEDWAIT_RESET pthread_cond_timedwait does - *not* reset the time argument - when the lock is acquired. -ACE_LACKS_CONST_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 +622,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(). @@ -791,9 +654,6 @@ ACE_LACKS_LINEBUFFERED_STREAMBUF Platform lacks streambuf ACE_LACKS_LSTAT Platform lacks the lstat() function. ACE_LACKS_MADVISE Platform lacks madvise() (e.g., Linux) -ACE_LACKS_MALLOC_H Platform lacks malloc.h -ACE_LACKS_MEMORY_H Platform lacks memory.h (e.g., - VxWorks) ACE_LACKS_MKFIFO Platform lacks mkfifo() e.g., VxWorks, pSoS, and WinNT. ACE_LACKS_MKTEMP Platform lacks the mktemp() function. @@ -808,10 +668,6 @@ ACE_LACKS_MPROTECT The platform doesn't have LYNX)) ACE_LACKS_MSG_ACCRIGHTS Platform defines ACE_HAS_MSG, but lacks msg_accrights{,len}. -ACE_LACKS_MSG_WFMO Platform lacks - MsgWaitForMultipleObjects - (only needs to be defined when - ACE_WIN32 is also defined). ACE_LACKS_MSYNC Platform lacks msync() (e.g., Linux) ACE_LACKS_MUTEXATTR_PSHARED Platform lacks @@ -827,8 +683,6 @@ ACE_LACKS_NETDB_REENTRANT_FUNCTIONS Platform does not support getservbyname_r). ACE_LACKS_NEW_H OS doesn't have, or we don't want to use, new.h. -ACE_LACKS_NULL_PTHREAD_STATUS OS requires non-null status pointer - for ::pthread_join (). ACE_LACKS_PERFECT_MULTICAST_FILTERING Platform lacks IGMPv3 "perfect" filtering of multicast dgrams at the socket level. If == 1, ACE_SOCK_Dgram_Mcast will bind @@ -836,8 +690,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 @@ -849,8 +701,6 @@ ACE_LACKS_PTHREAD_THR_SIGSETMASK Platform lacks ACE_LACKS_PUTENV_PROTOTYPE Platform/compiler lacks the putenv() prototype (e.g., LynxOS) -ACE_LACKS_PWD_REENTRANT_FUNCTIONS Platform lacks getpwnam_r() - methods (e.g., SGI 6.2). ACE_LACKS_QSORT Compiler/platform lacks the standard C library qsort() function @@ -861,9 +711,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 (). @@ -894,8 +741,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() @@ -938,17 +783,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 @@ -956,15 +790,6 @@ ACE_LACKS_TIMESPEC_T Platform does not define struct timespec. ACE_LACKS_TRUNCATE Platform doesn't have truncate() (e.g., vxworks) -ACE_LACKS_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. -ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS Compiler does not have - operator>> (istream &, u_char *) or - operator>> (istream &, signed char *) ACE_LACKS_UCONTEXT_H Platform lacks the ucontext.h file ACE_LACKS_UMASK Platform lacks umask function @@ -976,31 +801,16 @@ ACE_LACKS_UNIX_DOMAIN_SOCKETS ACE platform has no UNIX domain sockets ACE_LACKS_UNIX_SIGNALS Platform lacks full signal support (e.g., Win32). -ACE_LACKS_UNSIGNEDLONGLONG_T Compiler/platform does not - support the unsigned long - long datatype. ACE_LACKS_UTSNAME_T Platform lacks struct utsname (e.g., Win32 and VxWorks) ACE_LACKS_UNAME Platform lacks uname calls ACE_LACKS_WAIT The platform lacks wait ACE_LACKS_WIN32_GETPROCESSTIMES The Windows platform doesn't have GetProcessTimes(). -ACE_LACKS_WIN32_MOVEFILEEX The Windows platform doesn't have - MoveFileEx(). -ACE_LACKS_WIN32_SECURITY_DESCRIPTORS The Windows platform doesn't have - security descriptor support. ACE_LACKS_WRITEV Platform doesn't define writev, so use our own - -ACE_NEEDS_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 @@ -1012,10 +822,6 @@ ACE_NO_WIN32_LEAN_AND_MEAN If this is set, then ACE does not code that uses non-lean Win32 facilities such as COM. -ACE_SHM_OPEN_REQUIRES_ONE_SLASH The path specified on shm_open() must - have a leading, single slash and not - have any other slashes. - ACE_WSTRING_HAS_USHORT_SUPPORT If a platform has wchar_t as a separate type, then ACE_WString doesn't have a @@ -1091,13 +897,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: ---------------------------- @@ -1116,15 +915,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: --------------------- @@ -1140,10 +930,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 @@ -1154,9 +940,6 @@ ACE_LACKS_T_ERRNO: Used In: ace/OS.h - HPUX: - set it. - Notes: if set, adds: extern int t_errno; @@ -1168,9 +951,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 @@ -1195,13 +975,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: ------------------ @@ -1216,10 +989,6 @@ ACE_HAS_PRUSAGE_T: an interval. This stuff is highly non-portable. - HPUX: - don't set - - ACE_HAS_SEMUN: -------------- @@ -1234,14 +1003,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: --------------------- @@ -1254,12 +1015,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: ---------------- @@ -1271,11 +1026,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: ----------------- @@ -1298,10 +1048,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: ---------------- @@ -1313,10 +1059,6 @@ ACE_HAS_STREAMS: Notes: if defined, includes - HPUX: - don't set. - no SYS V.4 streams. - ACE_HAS_STREAM_PIPES: --------------------- @@ -1339,10 +1081,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: ----------------------------- @@ -1355,12 +1093,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: -------------------------- @@ -1375,16 +1107,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: ------------ @@ -1396,19 +1118,6 @@ ACE_HAS_POLL: #include /**/ #endif /* ACE_HAS_POLL */ -ACE_USE_POLL_IMPLEMENTATION: ------------------- - - Used in: - ace/OS.h - - Notes: - Use the poll() event demultiplexor rather than select(). - - HPUX: - set it. - - ACE_HAS_SVR4_SIGNAL_T: ---------------------- @@ -1427,26 +1136,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: -------------------- @@ -1467,12 +1156,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: -------------------------- @@ -1515,30 +1198,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: ----------------- @@ -1552,22 +1211,6 @@ ACE_HAS_TIUSER_H: Solaris: in conjunction with t_bind, t_accept, etc.. transport layer. - HPUX: - don't set. - - -ACE_USE_POLL_IMPLEMENTATION: ----------------------------- - - Used in: - libsrc/Reactor/Reactor.i - include/Event_Handler.h - ace/OS.h - include/Reactor.h - - Notes: - in the reactor, use poll instead of select. In general, - good thing to have set. ACE_USES_GPROF: ---------------------------- 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..d75cf7d83547d 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) 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 */ } void diff --git a/ACE/ace/Recyclable.cpp b/ACE/ace/Recyclable.cpp index 0b975675059c7..7ab58bb08cf56 100644 --- a/ACE/ace/Recyclable.cpp +++ b/ACE/ace/Recyclable.cpp @@ -1,12 +1,9 @@ #include "ace/Recyclable.h" - #if !defined (__ACE_INLINE__) #include "ace/Recyclable.inl" #endif /* __ACE_INLINE __ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Recyclable::ACE_Recyclable (ACE_Recyclable_State initial_state) @@ -14,8 +11,4 @@ ACE_Recyclable::ACE_Recyclable (ACE_Recyclable_State initial_state) { } -ACE_Recyclable::~ACE_Recyclable () -{ -} - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Recyclable.h b/ACE/ace/Recyclable.h index 3ffe4bed86543..da2dad0e3d31b 100644 --- a/ACE/ace/Recyclable.h +++ b/ACE/ace/Recyclable.h @@ -48,7 +48,7 @@ class ACE_Export ACE_Recyclable { public: /// Destructor. - virtual ~ACE_Recyclable (); + virtual ~ACE_Recyclable () = default; /// Get the recyclable bit ACE_Recyclable_State recycle_state () const; @@ -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 2129741655f9d..e2cb12072b260 100644 --- a/ACE/ace/Refcounted_Auto_Ptr.h +++ b/ACE/ace/Refcounted_Auto_Ptr.h @@ -13,8 +13,8 @@ #include /**/ "ace/pre.h" -#include "ace/Auto_Ptr.h" #include "ace/Atomic_Op.h" +#include #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +29,7 @@ template class ACE_Refcounted_Auto_Ptr; /** * @class ACE_Refcounted_Auto_Ptr * - * @brief This class implements support for a reference counted auto_ptr. + * @brief This class implements support for a reference counted unique_ptr. * Assigning or copying instances of an ACE_Refcounted_Auto_Ptr * will automatically increment the reference count. When the last * instance that references a ACE_Refcounted_Auto_Ptr instance is @@ -45,13 +45,13 @@ template class ACE_Refcounted_Auto_Ptr { /// Used to define a proper boolean conversion for "if (sp) ..." - static void unspecified_bool(ACE_Refcounted_Auto_Ptr***){}; + static void unspecified_bool(ACE_Refcounted_Auto_Ptr***){} typedef void (*unspecified_bool_type)(ACE_Refcounted_Auto_Ptr***); public: /// Constructor that initializes an ACE_Refcounted_Auto_Ptr to /// the specified pointer value. - explicit ACE_Refcounted_Auto_Ptr (X *p = 0); + explicit ACE_Refcounted_Auto_Ptr (X *p = nullptr); /// Copy constructor binds the new ACE_Refcounted_Auto_Ptr to the /// representation object referenced by @a r. @@ -98,7 +98,7 @@ class ACE_Refcounted_Auto_Ptr /// Releases the current pointer value and then sets a new /// pointer value specified by @a p. - void reset (X *p = 0); + void reset (X *p = nullptr); /// Get the pointer value. X *get () const; @@ -168,14 +168,14 @@ class ACE_Refcounted_Auto_Ptr_Rep static void detach (ACE_Refcounted_Auto_Ptr_Rep *&rep); /// Pointer to the result. - ACE_Auto_Basic_Ptr ptr_; + std::unique_ptr ptr_; /// Reference count. mutable ACE_Atomic_Op ref_count_; private: // = Constructor and destructor private. - ACE_Refcounted_Auto_Ptr_Rep (X *p = 0); + ACE_Refcounted_Auto_Ptr_Rep (X *p = nullptr); ~ACE_Refcounted_Auto_Ptr_Rep (); }; @@ -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..cc98d8033955a 100644 --- a/ACE/ace/Registry.cpp +++ b/ACE/ace/Registry.cpp @@ -1,6 +1,6 @@ #include "ace/Registry.h" -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) +#if defined (ACE_WIN32) # include "ace/os_include/os_netdb.h" # include "ace/OS_NS_unistd.h" @@ -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) @@ -1120,4 +1113,4 @@ ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h index 893d4ec9b68d2..f58f1a9808fa1 100644 --- a/ACE/ace/Registry.h +++ b/ACE/ace/Registry.h @@ -19,8 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) -// This only works on registry-capable Win32 platforms. +#if defined (ACE_WIN32) #include "ace/Containers.h" #include "ace/SString.h" @@ -42,7 +41,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Registry { public: - /// International string struct ACE_Export Name_Component { @@ -74,7 +72,7 @@ class ACE_Export ACE_Registry struct ACE_Export Binding { /// Empty (default) constructor - Binding (void); + Binding (); /// Constructor /// (Name version) @@ -98,10 +96,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 +187,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 +326,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 +346,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 +369,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 +417,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 +427,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 +455,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 +468,7 @@ class ACE_Export ACE_Registry Binding_List &list) = 0; /// Reset state - void reset (void); + void reset (); protected: /// Pointer to parent iterator @@ -522,7 +519,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 (); }; }; @@ -555,6 +552,6 @@ class ACE_Export ACE_Predefined_Naming_Contexts ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ +#endif /* ACE_WIN32 */ #include /**/ "ace/post.h" #endif /* ACE_REGISTRY_H */ diff --git a/ACE/ace/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.cpp b/ACE/ace/Reverse_Lock_T.cpp index eac8be2976b1d..047e921520ff9 100644 --- a/ACE/ace/Reverse_Lock_T.cpp +++ b/ACE/ace/Reverse_Lock_T.cpp @@ -13,11 +13,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template -ACE_Reverse_Lock::~ACE_Reverse_Lock () -{ -} - // Explicitly destroy the lock. template int ACE_Reverse_Lock::remove () diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h index 4cf546c6148fd..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. @@ -79,7 +78,7 @@ class ACE_Reverse_Lock : public ACE_Lock /// Destructor. If was not passed in by the user, it will be /// deleted. - virtual ~ACE_Reverse_Lock (); + virtual ~ACE_Reverse_Lock () = default; // = Lock accessors. /// Release the lock. @@ -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.h b/ACE/ace/SOCK.h index 91ac4878cbdcc..ba9526d5c50ac 100644 --- a/ACE/ace/SOCK.h +++ b/ACE/ace/SOCK.h @@ -120,7 +120,7 @@ class ACE_Export ACE_SOCK : public ACE_IPC_SAP * operator delete() from being called through a base class ACE_SOCK * pointer/reference. */ - ~ACE_SOCK (); + ~ACE_SOCK () = default; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SOCK.inl b/ACE/ace/SOCK.inl index 6d55989b218a1..0af7a80cef25c 100644 --- a/ACE/ace/SOCK.inl +++ b/ACE/ace/SOCK.inl @@ -3,12 +3,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE -ACE_SOCK::~ACE_SOCK () -{ - // ACE_TRACE ("ACE_SOCK::~ACE_SOCK"); -} - ACE_INLINE int ACE_SOCK::set_option (int level, int option, 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..100181430254c 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -145,9 +145,7 @@ ACE_SOCK_Dgram::shared_open (const ACE_Addr &local, #endif /* ACE_HAS_IPV6 */ ) { - if (ACE::bind_port (this->get_handle (), - INADDR_ANY, - protocol_family) == -1) + if (ACE::bind_port (this->get_handle (), INADDR_ANY, protocol_family) == -1) error = true; } } @@ -180,9 +178,7 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local, flags, reuse_addr) == -1) return -1; - else if (this->shared_open (local, - protocol_family, - ipv6_only) == -1) + else if (this->shared_open (local, protocol_family, ipv6_only) == -1) return -1; else return 0; @@ -210,15 +206,10 @@ ACE_SOCK_Dgram::open (const ACE_Addr &local, #endif /* ACE_HAS_IPV6 */ } - if (ACE_SOCK::open (SOCK_DGRAM, - protocol_family, - protocol, - reuse_addr) == -1) + if (ACE_SOCK::open (SOCK_DGRAM, protocol_family, protocol, reuse_addr) == -1) return -1; else - return this->shared_open (local, - protocol_family, - ipv6_only); + return this->shared_open (local, protocol_family, ipv6_only); } // Here's the general-purpose constructor used by a connectionless @@ -301,14 +292,11 @@ ACE_SOCK_Dgram::send (const iovec iov[], send_msg.msg_controllen = 0; #endif - return ACE_OS::sendmsg (this->get_handle (), - &send_msg, - flags); + return ACE_OS::sendmsg (this->get_handle (), &send_msg, flags); } // Recv an iovec of size N to ADDR as a datagram (connectionless // version). - ssize_t ACE_SOCK_Dgram::recv (iovec iov[], int n, @@ -323,12 +311,12 @@ ACE_SOCK_Dgram::recv (iovec iov[], #define ACE_USE_MSG_CONTROL union control_buffer { cmsghdr control_msg_header; -#if defined (IP_RECVDSTADDR) +#if defined (IP_RECVDSTADDR) && !defined (ACE_HAS_NONCONST_CMSG_SPACE) u_char padding[ACE_CMSG_SPACE (sizeof (in_addr))]; -#elif defined (IP_PKTINFO) +#elif defined (IP_PKTINFO) && !defined (ACE_HAS_NONCONST_CMSG_SPACE) u_char padding[ACE_CMSG_SPACE (sizeof (in_pktinfo))]; #endif -#if defined (ACE_HAS_IPV6) +#if defined (ACE_HAS_IPV6) && !defined (ACE_HAS_NONCONST_CMSG_SPACE) u_char padding6[ACE_CMSG_SPACE (sizeof (in6_pktinfo))]; #endif } cbuf; @@ -346,16 +334,14 @@ ACE_SOCK_Dgram::recv (iovec iov[], recv_msg.msg_namelen = addr.get_size (); #ifdef ACE_USE_MSG_CONTROL - recv_msg.msg_control = to_addr ? &cbuf : 0; + recv_msg.msg_control = to_addr ? std::addressof(cbuf) : nullptr; recv_msg.msg_controllen = to_addr ? sizeof (cbuf) : 0; #elif !defined ACE_LACKS_SENDMSG - recv_msg.msg_accrights = 0; + recv_msg.msg_accrights = nullptr; recv_msg.msg_accrightslen = 0; #endif - ssize_t status = ACE_OS::recvmsg (this->get_handle (), - &recv_msg, - flags); + ssize_t const status = ACE_OS::recvmsg (this->get_handle (), std::addressof(recv_msg), flags); addr.set_size (recv_msg.msg_namelen); addr.set_type (((sockaddr_in *) addr.get_addr())->sin_family); @@ -363,7 +349,7 @@ ACE_SOCK_Dgram::recv (iovec iov[], if (to_addr) { this->get_local_addr (*to_addr); if (to_addr->get_type() == AF_INET) { -#if defined (IP_RECVDSTADDR) || defined (IP_PKTINFO) +#if (defined (IP_RECVDSTADDR) || defined (IP_PKTINFO)) && !defined (ACE_HAS_NONCONST_CMSG_SPACE) for (cmsghdr *ptr = ACE_CMSG_FIRSTHDR (&recv_msg); ptr; ptr = ACE_CMSG_NXTHDR (&recv_msg, ptr)) { #if defined (IP_RECVDSTADDR) if (ptr->cmsg_level == IPPROTO_IP && ptr->cmsg_type == IP_RECVDSTADDR) { @@ -383,7 +369,7 @@ ACE_SOCK_Dgram::recv (iovec iov[], } #endif } -#if defined (ACE_HAS_IPV6) && defined (IPV6_PKTINFO) +#if defined (ACE_HAS_IPV6) && defined (IPV6_PKTINFO) && !defined (ACE_HAS_NONCONST_CMSG_SPACE) else if (to_addr->get_type() == AF_INET6) { for (cmsghdr *ptr = ACE_CMSG_FIRSTHDR (&recv_msg); ptr; ptr = ACE_CMSG_NXTHDR (&recv_msg, ptr)) { if (ptr->cmsg_level == IPPROTO_IPV6 && ptr->cmsg_type == IPV6_PKTINFO) { @@ -404,8 +390,8 @@ ACE_SOCK_Dgram::recv (iovec iov[], #else /* ACE_HAS_MSG */ -// Send an iovec of size N to ADDR as a datagram (connectionless -// version). +/// Send an iovec of size N to ADDR as a datagram (connectionless +/// version). ssize_t ACE_SOCK_Dgram::send (const iovec iov[], int n, @@ -419,8 +405,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 +466,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; @@ -489,7 +475,7 @@ ACE_SOCK_Dgram::recv (iovec iov[], #endif length += iov[i].iov_len; - char *buf = 0; + char *buf = nullptr; #if defined (ACE_HAS_ALLOCA) buf = alloca (length); @@ -511,9 +497,7 @@ ACE_SOCK_Dgram::recv (iovec iov[], char *ptr = buf; int copyn = length; - for (i = 0; - i < n && copyn > 0; - i++) + for (i = 0; i < n && copyn > 0; i++) { ACE_OS::memcpy (iov[i].iov_base, ptr, // iov_len is int on some platforms, size_t on others @@ -614,9 +598,7 @@ ACE_SOCK_Dgram::set_nic (const ACE_TCHAR *net_if, { ACE_INET_Addr addr (static_cast (0)); ip_mreq send_mreq; - if (this->make_multicast_ifaddr (&send_mreq, - addr, - net_if) == -1) + if (this->make_multicast_ifaddr (&send_mreq, addr, net_if) == -1) { if (!ipv6_mif_set) return -1; @@ -768,9 +750,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, ACE_TRACE ("ACE_SOCK_Dgram::make_multicast_ifaddr6"); ipv6_mreq lmreq; // Scratch copy. - ACE_OS::memset (&lmreq, - 0, - sizeof (lmreq)); + ACE_OS::memset (&lmreq, 0, sizeof (lmreq)); #if defined (ACE_WIN32) || !defined (ACE_LACKS_IF_NAMETOINDEX) if (net_if != 0) @@ -782,7 +762,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, (if_ix = ACE_OS::atoi (net_if)) > 0; ULONG bufLen = 15000; // Initial size as per Microsoft - char *buf = 0; + char *buf = nullptr; ACE_NEW_RETURN (buf, char[bufLen], -1); DWORD dwRetVal = 0; ULONG iterations = 0; 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 167038394719b..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); + ~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 429afa82e6044..359d06896352a 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.inl +++ b/ACE/ace/SOCK_Dgram_Bcast.inl @@ -4,12 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Bcast_Node::~ACE_Bcast_Node (void) -{ -} - -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 57075df696ea3..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 @@ -626,10 +625,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, { size_t nr_unsubscribed = 0; # if defined(ACE_LINUX) - - struct if_nameindex *intf; - - intf = ACE_OS::if_nameindex (); + struct if_nameindex *intf = ACE_OS::if_nameindex (); if (intf == 0) return -1; @@ -694,8 +690,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, } return 1; - - } else { @@ -746,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.cpp b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp index cacf3b076a81d..98e368550f539 100644 --- a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp +++ b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp @@ -1,6 +1,5 @@ #include "ace/SOCK_SEQPACK_Acceptor.h" -#include "ace/Auto_Ptr.h" #include "ace/Log_Category.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" @@ -280,7 +279,9 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa local_inet_addr.sin_port = 0; } else - local_inet_addr = *reinterpret_cast (local_sap.get_addr ()); + { + local_inet_addr = *reinterpret_cast (local_sap.get_addr ()); + } // A port number of 0 means that the user is requesting that the // operating system choose an arbitrary, unused port. Since some @@ -410,9 +411,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sa local_sap.get_size ()) == -1) error = 1; - if (error != 0 - || ACE_OS::listen (this->get_handle (), - backlog) == -1) + if (error != 0 || ACE_OS::listen (this->get_handle (), backlog) == -1) { error = 1; this->close (); @@ -449,9 +448,7 @@ ACE_SOCK_SEQPACK_Acceptor::open (const ACE_Addr &local_sap, reuse_addr) == -1) return -1; else - return this->shared_open (local_sap, - protocol_family, - backlog); + return this->shared_open (local_sap, protocol_family, backlog); } ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, 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..73841eea7a47c 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.cpp +++ b/ACE/ace/SOCK_SEQPACK_Association.cpp @@ -1,9 +1,9 @@ #include "ace/SOCK_SEQPACK_Association.h" -#include "ace/Auto_Ptr.h" #include "ace/Log_Category.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" +#include #if !defined (__ACE_INLINE__) #include "ace/SOCK_SEQPACK_Association.inl" @@ -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; @@ -147,10 +143,10 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz */ - // The array of sockaddr_in will be stored in an ACE_Auto_Array_Ptr, + // The array of sockaddr_in will be stored in an std::unique_ptr, // which causes dynamically-allocated memory to be released as soon - // as the ACE_Auto_Array_Ptr goes out of scope. - ACE_Auto_Array_Ptr addr_structs; + // as the std::unique_ptr goes out of scope. + std::unique_ptr addr_structs; // Allocate memory for this array. Return -1 if the memory cannot // be allocated. (This activity requires a temporary variable---a @@ -290,10 +286,10 @@ ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &si */ - // The array of sockaddr_in will be stored in an ACE_Auto_Array_Ptr, + // The array of sockaddr_in will be stored in an std::unique_ptr, // which causes dynamically-allocated memory to be released as soon - // as the ACE_Auto_Array_Ptr goes out of scope. - ACE_Auto_Array_Ptr addr_structs; + // as the std::unique_ptr goes out of scope. + std::unique_ptr addr_structs; // Allocate memory for this array. Return -1 if the memory cannot // be allocated. (This activity requires a temporary variable---a 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.cpp b/ACE/ace/SPIPE_Addr.cpp index e0c6e681cf908..cd91eaf27f51e 100644 --- a/ACE/ace/SPIPE_Addr.cpp +++ b/ACE/ace/SPIPE_Addr.cpp @@ -100,7 +100,6 @@ ACE_SPIPE_Addr::set (const ACE_TCHAR *addr, } else { - if (ACE_OS::strncmp (addr, ACE_TEXT ("localhost"), ACE_OS::strlen ("localhost")) == 0) 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..2822fa82b5344 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) // 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. @@ -145,11 +143,11 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, } } } -#else /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#else /* ACE_WIN32 */ handle = ACE::handle_timed_open (timeout, remote_sap.get_path_name (), flags, perms, sa); -#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP || ACE_HAS_WINCE */ +#endif /* !ACE_WIN32 */ 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..0317ccbd12c95 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" @@ -41,7 +41,7 @@ extern "C" #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) static BIO_METHOD methods_ACE = { BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, @@ -68,14 +68,14 @@ static BIO_METHOD methods_ACE = #else static BIO_METHOD* methods_ACE; # define BIO_set_num(b, val) -#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ +#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) BIO * const pBIO = BIO_new (&methods_ACE); #else if (!methods_ACE) diff --git a/ACE/ace/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.h b/ACE/ace/SString.h index 70031e5293b91..1473c2dee2632 100644 --- a/ACE/ace/SString.h +++ b/ACE/ace/SString.h @@ -269,8 +269,8 @@ typedef ACE_CString ACE_TString; * Keeps a pointer to a string and deallocates it (using * ) on its destructor. * If you need to delete using "delete[]" the - * ACE_Auto_Array_Ptr is your choice. - * The class plays the same role as auto_ptr<> + * std::unique_ptr is your choice. + * The class plays the same role as unique_ptr<> */ class ACE_Export ACE_Auto_String_Free { 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..ccdc71116522a 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, @@ -50,29 +50,29 @@ class ACE_Export ACE_SV_Shared_Memory ACE_SV_Shared_Memory (ACE_HANDLE internal_id, int flags = 0); - int open (key_t external_id, - size_t size, - int create = ACE_SV_Shared_Memory::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS); + int open (key_t external_id, + size_t size, + int create = ACE_SV_Shared_Memory::ACE_OPEN, + int perms = ACE_DEFAULT_FILE_PERMS); - int open_and_attach (key_t external_id, - size_t size, - int create = ACE_SV_Shared_Memory::ACE_OPEN, - int perms = ACE_DEFAULT_FILE_PERMS, - void *virtual_addr = 0, - int flags = 0); + int open_and_attach (key_t external_id, + size_t size, + int create = ACE_SV_Shared_Memory::ACE_OPEN, + int perms = ACE_DEFAULT_FILE_PERMS, + void *virtual_addr = 0, + int flags = 0); /// Attach this shared memory segment. - int attach (void *virtual_addr = 0, int flags = 0); + 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); + int control (int cmd, void *buf); // = Segment-related info. void *get_segment_ptr () const; 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 458b9f40c07ad..84eba7b747f10 100644 --- a/ACE/ace/Select_Reactor.h +++ b/ACE/ace/Select_Reactor.h @@ -45,13 +45,13 @@ class ACE_Export ACE_Guard< ACE_Reactor_Token_T > public: ACE_Guard (ACE_Reactor_Token_T &) {} ACE_Guard (ACE_Reactor_Token_T &, int) {} - ~ACE_Guard () = default + ~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 9e6a83e7c1cb3..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)); @@ -420,6 +420,7 @@ ACE_Select_Reactor_T::open { ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Select_Reactor_T::open, ") ACE_TEXT ("notification pipe open failed"))); result = -1; } @@ -556,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)); @@ -605,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 (); @@ -769,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) @@ -983,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 @@ -1215,7 +1215,6 @@ ACE_Select_Reactor_T::dispatch_io_set if (this->state_changed_) { - handle_iter.reset_state (); this->state_changed_ = false; } @@ -1385,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 (); @@ -1469,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"); @@ -1499,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 202676b4ba4ea..049c997fc2e49 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -5,7 +5,6 @@ #include "ace/Service_Manager.h" #include "ace/Service_Types.h" #include "ace/Containers.h" -#include "ace/Auto_Ptr.h" #include "ace/Reactor.h" #include "ace/Thread_Manager.h" #include "ace/DLL.h" @@ -123,7 +122,6 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard () } - // ---------------------------------------- ACE_Service_Gestalt::Processed_Static_Svc:: @@ -174,7 +172,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 +287,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 +336,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 +346,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 +604,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 +818,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); @@ -944,7 +930,7 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[]) #else ACE_DLL dll; - std::unqiue_ptr xml_svc_conf (this->get_xml_svc_conf (dll)); + std::unique_ptr xml_svc_conf (this->get_xml_svc_conf (dll)); if (xml_svc_conf.get () == 0) return -1; @@ -984,7 +970,6 @@ ACE_Service_Gestalt::init_svc_conf_file_queue () #endif return 0; - } /* init_svc_conf_file_queue () */ @@ -1087,7 +1072,6 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], ACE_OS::fclose(fp); else add_default = false; - } } @@ -1171,7 +1155,6 @@ ACE_Service_Gestalt::process_commandline_directives () } return result; - } /* process_commandline_directives () */ @@ -1249,7 +1232,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 +1259,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.cpp b/ACE/ace/Shared_Memory.cpp index d4dc85070872a..037569a454eca 100644 --- a/ACE/ace/Shared_Memory.cpp +++ b/ACE/ace/Shared_Memory.cpp @@ -1,7 +1,5 @@ #include "ace/Shared_Memory.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Shared_Memory::~ACE_Shared_Memory () diff --git a/ACE/ace/Shared_Memory.h b/ACE/ace/Shared_Memory.h index f5d9b3cc3d003..b0ada658936ba 100644 --- a/ACE/ace/Shared_Memory.h +++ b/ACE/ace/Shared_Memory.h @@ -8,7 +8,6 @@ */ //========================================================================== - #ifndef ACE_SHARED_MEMORY_H #define ACE_SHARED_MEMORY_H @@ -33,16 +32,16 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This is a very simple-minded wrapper, i.e., it really is only * useful for allocating large contiguous chunks of shared * memory. For a much more sophisticated version, please check - * out the class. + * out the ACE_Malloc class. */ 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.cpp b/ACE/ace/Shared_Memory_MM.cpp index feeba844ea979..2b255a38a5ef7 100644 --- a/ACE/ace/Shared_Memory_MM.cpp +++ b/ACE/ace/Shared_Memory_MM.cpp @@ -20,8 +20,7 @@ ACE_Shared_Memory_MM::dump () const #endif /* ACE_HAS_DUMP */ } -// Creates a shared memory segment of SIZE bytes. - +/// Creates a shared memory segment of SIZE bytes. ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (ACE_HANDLE handle, size_t length, int prot, @@ -47,25 +46,21 @@ ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (const ACE_TCHAR *file_name, ACE_TRACE ("ACE_Shared_Memory_MM::ACE_Shared_Memory_MM"); } -// The "do-nothing" constructor. - +/// The "do-nothing" constructor. ACE_Shared_Memory_MM::ACE_Shared_Memory_MM () { ACE_TRACE ("ACE_Shared_Memory_MM::ACE_Shared_Memory_MM"); } -// The overall size of the segment. - +/// The overall size of the segment. size_t ACE_Shared_Memory_MM::get_segment_size () const { ACE_TRACE ("ACE_Shared_Memory_MM::get_segment_size"); - // This cast is legit since the original length in open() is an int. return this->shared_memory_.size (); } -// Unmaps the shared memory segment. - +/// Unmaps the shared memory segment. int ACE_Shared_Memory_MM::remove () { @@ -73,8 +68,7 @@ ACE_Shared_Memory_MM::remove () return shared_memory_.remove (); } -// Closes (unmaps) the shared memory segment. - +/// Closes (unmaps) the shared memory segment. int ACE_Shared_Memory_MM::close () { diff --git a/ACE/ace/Shared_Memory_MM.h b/ACE/ace/Shared_Memory_MM.h index 58bad1585b9c5..1fdbf3afb7759 100644 --- a/ACE/ace/Shared_Memory_MM.h +++ b/ACE/ace/Shared_Memory_MM.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef ACE_SHARED_MALLOC_MM_H #define ACE_SHARED_MALLOC_MM_H #include /**/ "ace/pre.h" @@ -36,7 +35,7 @@ class ACE_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory { public: /// Default constructor. - ACE_Shared_Memory_MM (void); + ACE_Shared_Memory_MM (); /// Constructor. ACE_Shared_Memory_MM (ACE_HANDLE handle, @@ -77,17 +76,17 @@ 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. virtual void *malloc (size_t size = 0); /// Free a chuck of memory allocated by - /// . + /// ACE_Shared_Memory_MM::malloc. virtual int free (void *p); /// Return the size of the shared memory segment. diff --git a/ACE/ace/Shared_Memory_MM.inl b/ACE/ace/Shared_Memory_MM.inl index caad381e9e8ca..bc00197951acf 100644 --- a/ACE/ace/Shared_Memory_MM.inl +++ b/ACE/ace/Shared_Memory_MM.inl @@ -1,8 +1,7 @@ // -*- C++ -*- ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// Return the name of file that is mapped (if any). - +/// Return the name of file that is mapped (if any). ACE_INLINE const ACE_TCHAR * ACE_Shared_Memory_MM::filename () const { diff --git a/ACE/ace/Shared_Memory_Pool.cpp b/ACE/ace/Shared_Memory_Pool.cpp index 42bf78718ea6f..10e3ba4c06700 100644 --- a/ACE/ace/Shared_Memory_Pool.cpp +++ b/ACE/ace/Shared_Memory_Pool.cpp @@ -1,10 +1,7 @@ -// Shared_Memory_Pool.cpp #include "ace/Shared_Memory_Pool.h" #include "ace/OS_NS_sys_shm.h" #include "ace/Log_Category.h" - - #if !defined (ACE_LACKS_SYSV_SHMEM) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -44,20 +41,18 @@ ACE_Shared_Memory_Pool::in_use (ACE_OFF_T &offset, ACE_NOTSUP_RETURN (-1); #else offset = 0; - SHM_TABLE *st = reinterpret_cast (this->base_addr_); + SHM_TABLE *st = reinterpret_cast (this->shm_addr_table_[0]); shmid_ds buf; - for (counter = 0; - counter < this->max_segments_ && st[counter].used_ == 1; - counter++) + for (counter = 0; counter < this->max_segments_ && st[counter].used_ == 1; counter++) { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::in_use, %p\n"), ACE_TEXT ("shmctl")), -1); offset += buf.shm_segsz; - // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::in_use, segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } return 0; #endif @@ -75,17 +70,14 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr, ACE_NOTSUP_RETURN (-1); #else offset = 0; - SHM_TABLE *st = reinterpret_cast (this->base_addr_); + SHM_TABLE *st = reinterpret_cast (this->shm_addr_table_[0]); shmid_ds buf; - for (counter = 0; - counter < this->max_segments_ - && st[counter].used_ == 1; - counter++) + for (counter = 0; counter < this->max_segments_ && st[counter].used_ == 1; counter++) { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::find_seg, %p\n"), ACE_TEXT ("shmctl")), -1); offset += buf.shm_segsz; @@ -93,13 +85,13 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr, // If segment 'counter' starts at a location greater than the // place we are searching for. We then decrement the offset to // the start of counter-1. (flabar@vais.net) - if (((ptrdiff_t) offset + (ptrdiff_t) (this->base_addr_)) > (ptrdiff_t) searchPtr) + if (((ptrdiff_t) offset + (ptrdiff_t) (this->shm_addr_table_[0])) > (ptrdiff_t) searchPtr) { --counter; offset -= buf.shm_segsz; return 0; } - // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::find_seg, segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } return 0; @@ -112,44 +104,53 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, { ACE_TRACE ("ACE_Shared_Memory_Pool::commit_backing_store_name"); + if (this->shm_addr_table_[0] == nullptr) + { + ACELIB_ERROR_RETURN ((LM_ERROR, + "ACE_Shared_Memory_Pool::commit_backing_store_name, base address is zero\n"), + -1); + } + size_t counter; - SHM_TABLE *st = reinterpret_cast (this->base_addr_); + SHM_TABLE *st = reinterpret_cast (this->shm_addr_table_[0]); if (this->in_use (offset, counter) == -1) return -1; if (counter == this->max_segments_) - ACELIB_ERROR_RETURN ((LM_ERROR, - "exceeded max number of segments = %d, base = %u, offset = %u\n", - counter, - this->base_addr_, - static_cast(offset)), - -1); + { + ACELIB_ERROR_RETURN ((LM_ERROR, + "ACE_Shared_Memory_Pool::commit_backing_store_name, exceeded max number of segments = %d, base = %u, offset = %u\n", + counter, + this->shm_addr_table_[0], + static_cast(offset)), + -1); + } else { - int shmid = ACE_OS::shmget (st[counter].key_, - rounded_bytes, - this->file_perms_ | IPC_CREAT | IPC_EXCL); + int const shmid = ACE_OS::shmget (st[counter].key_, + rounded_bytes, + this->file_perms_ | IPC_CREAT | IPC_EXCL); if (shmid == -1) ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::commit_backing_store_name, %p\n"), ACE_TEXT ("shmget")), -1); st[counter].shmid_ = shmid; st[counter].used_ = 1; - void *address = (void *) (((char *) this->base_addr_) + offset); - void *shmem = ACE_OS::shmat (st[counter].shmid_, - (char *) address, - 0); + void *address = (void *) (((char *) this->shm_addr_table_[0]) + offset); + void *shmem = ACE_OS::shmat (st[counter].shmid_, (char *) address, 0); if (shmem != address) ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("(%P|%t) %p, shmem = %u, address = %u\n"), + ACE_TEXT("(%P|%t) ACE_Shared_Memory_Pool::commit_backing_store_name, %p, shmem = %u, address = %u\n"), ACE_TEXT("shmat"), shmem, address), -1); + + shm_addr_table_[counter] = shmem; } return 0; } @@ -167,25 +168,26 @@ ACE_Shared_Memory_Pool::handle_signal (int, siginfo_t *siginfo, ucontext_t *) if (siginfo == 0) return -1; - ACE_OFF_T offset; - // Make sure that the pointer causing the problem is within the // range of the backing store. - // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::handle_signal, si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + ACE_OFF_T offset; size_t counter = 0; if (this->in_use (offset, counter) == -1) { ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::handle_signal, %p\n"), ACE_TEXT ("in_use"))); } else if (!(siginfo->si_code == SEGV_MAPERR - && siginfo->si_addr < (((char *) this->base_addr_) + offset) - && siginfo->si_addr >= ((char *) this->base_addr_))) + && siginfo->si_addr < (((char *) this->shm_addr_table_[0]) + offset) + && siginfo->si_addr >= ((char *) this->shm_addr_table_[0]))) { ACELIB_ERROR_RETURN ((LM_ERROR, - "(%P|%t) address %u out of range\n", - siginfo->si_addr), + "(%P|%t) ACE_Shared_Memory_Pool::handle_signal, address %u out of range, base = %u, offset = %u\n", + siginfo->si_addr, + this->shm_addr_table_[0], + static_cast(offset)), -1); } @@ -193,22 +195,21 @@ ACE_Shared_Memory_Pool::handle_signal (int, siginfo_t *siginfo, ucontext_t *) // proper range. Therefore there is a segment out there that the // pointer wants to point into. Find the segment that someone else // has used and attach to it (flabar@vais.net) - counter = 0; // ret value to get shmid from the st table. if (this->find_seg (siginfo->si_addr, offset, counter) == -1) ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::handle_signal, %p\n"), ACE_TEXT ("in_use")), -1); - void *address = (void *) (((char *) this->base_addr_) + offset); - SHM_TABLE *st = reinterpret_cast (this->base_addr_); + void *address = (void *) (((char *) this->shm_addr_table_[0]) + offset); + SHM_TABLE *st = reinterpret_cast (this->shm_addr_table_[0]); void *shmem = ACE_OS::shmat (st[counter].shmid_, (char *) address, 0); if (shmem != address) ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("(%P|%t) %p, shmem = %u, address = %u\n"), + ACE_TEXT("(%P|%t) ACE_Shared_Memory_Pool::handle_signal, %p, shmem = %u, address = %u\n"), ACE_TEXT("shmat"), shmem, address), @@ -225,23 +226,18 @@ ACE_Shared_Memory_Pool::handle_signal (int, siginfo_t *siginfo, ucontext_t *) ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool ( const ACE_TCHAR *backing_store_name, const OPTIONS *options) - : base_addr_ (0), - file_perms_ (ACE_DEFAULT_FILE_PERMS), - max_segments_ (ACE_DEFAULT_MAX_SEGMENTS), - minimum_bytes_ (0), - segment_size_ (ACE_DEFAULT_SEGMENT_SIZE) + : file_perms_ (options ? options->file_perms_ : ACE_DEFAULT_FILE_PERMS), + max_segments_ (options ? options->max_segments_ : ACE_DEFAULT_MAX_SEGMENTS), + minimum_bytes_ (options ? options->minimum_bytes_ : 0), + segment_size_ (options ? options->segment_size_ : ACE_DEFAULT_SEGMENT_SIZE), + shm_addr_table_ (std::make_unique (this->max_segments_)) { ACE_TRACE ("ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool"); - // Only change the defaults if != 0. + // Only change the defaults if options != nullptr. if (options) { - this->base_addr_ = - reinterpret_cast (const_cast (options->base_addr_)); - this->max_segments_ = options->max_segments_; - this->file_perms_ = options->file_perms_; - this->minimum_bytes_ = options->minimum_bytes_; - this->segment_size_ = options->segment_size_; + this->shm_addr_table_[0] = reinterpret_cast (const_cast (options->base_addr_)); } #ifndef ACE_HAS_SYSV_IPC @@ -251,65 +247,64 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool ( { // Convert the string into a number that is used as the segment // key. - int segment_key = 0; #if !defined (ACE_LACKS_SSCANF) - int result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (backing_store_name), - "%d", - &segment_key); + int const result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (backing_store_name), + "%d", + &segment_key); #else - int result = 0; + int const result = 0; #endif /* ACE_LACKS_SSCANF */ if (result == 0 || result == EOF) - // The conversion to a number failed so hash with crc32 - // ACE::crc32 is also used in . - this->base_shm_key_ = - (key_t) ACE::crc32 (ACE_TEXT_ALWAYS_CHAR (backing_store_name)); + { + // The conversion to a number failed so hash with crc32 + // ACE::crc32 is also used in . + this->base_shm_key_ = (key_t) ACE::crc32 (ACE_TEXT_ALWAYS_CHAR (backing_store_name)); + } else - this->base_shm_key_ = segment_key; + { + this->base_shm_key_ = segment_key; + } if (this->base_shm_key_ == IPC_PRIVATE) - // Make sure that the segment can be shared between unrelated - // processes. - this->base_shm_key_ = ACE_DEFAULT_SHM_KEY; + { + // Make sure that the segment can be shared between unrelated + // processes. + this->base_shm_key_ = ACE_DEFAULT_SHM_KEY; + } } else this->base_shm_key_ = ACE_DEFAULT_SHM_KEY; #endif // ACE_HAS_SYSV_IPC if (this->signal_handler_.register_handler (SIGSEGV, this) == -1) - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Sig_Handler::register_handler"))); -} - -ACE_Shared_Memory_Pool::~ACE_Shared_Memory_Pool () -{ + { + ACELIB_ERROR ((LM_ERROR, + ACE_TEXT ("ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool, %p\n"), + ACE_TEXT ("ACE_Sig_Handler::register_handler"))); + } } -// Ask system for more shared memory. - +/// Ask system for more shared memory. void * -ACE_Shared_Memory_Pool::acquire (size_t nbytes, - size_t &rounded_bytes) +ACE_Shared_Memory_Pool::acquire (size_t nbytes, size_t &rounded_bytes) { ACE_TRACE ("ACE_Shared_Memory_Pool::acquire"); rounded_bytes = this->round_up (nbytes); - // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::acquire, acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); ACE_OFF_T offset; if (this->commit_backing_store_name (rounded_bytes, offset) == -1) - return 0; + return nullptr; - // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); - return ((char *) this->base_addr_) + offset; + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::acquire, acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + return ((char *) this->shm_addr_table_[0]) + offset; } -// Ask system for initial chunk of shared memory. - +/// Ask system for initial chunk of shared memory. void * ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, size_t &rounded_bytes, @@ -317,14 +312,13 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, { ACE_TRACE ("ACE_Shared_Memory_Pool::init_acquire"); - ACE_OFF_T shm_table_offset = ACE::round_to_pagesize (sizeof (SHM_TABLE)); + ACE_OFF_T const shm_table_offset = ACE::round_to_pagesize (sizeof (SHM_TABLE)); rounded_bytes = this->round_up (nbytes > (size_t) this->minimum_bytes_ ? nbytes : (size_t) this->minimum_bytes_); // Acquire the semaphore to serialize initialization and prevent // race conditions. - int shmid = ACE_OS::shmget (this->base_shm_key_, rounded_bytes + shm_table_offset, this->file_perms_ | IPC_CREAT | IPC_EXCL); @@ -332,7 +326,7 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, { if (errno != EEXIST) ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::init_acquire, %p\n"), ACE_TEXT ("shmget")), 0); first_time = 0; @@ -341,43 +335,40 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, if (shmid == -1) ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("(%P|%t) ACE_Shared_Memory_Pool::init_acquire, %p\n"), ACE_TEXT ("shmget")), 0); - // This implementation doesn't care if we don't get the key we - // want... - this->base_addr_ = - ACE_OS::shmat (shmid, - reinterpret_cast (this->base_addr_), - 0); - if (this->base_addr_ == reinterpret_cast (-1)) - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("(%P|%t) %p, base_addr = %u\n"), - ACE_TEXT("shmat"), - this->base_addr_), - 0); + // This implementation doesn't care if we don't get the key we want... + this->shm_addr_table_[0] = ACE_OS::shmat (shmid, reinterpret_cast (this->shm_addr_table_[0]), 0); + + if (this->shm_addr_table_[0] == reinterpret_cast (-1)) + { + ACELIB_ERROR_RETURN ((LM_ERROR, + ACE_TEXT("(%P|%t) ACE_Shared_Memory_Pool::init_acquire, %p, base_addr = %u\n"), + ACE_TEXT("shmat"), + this->shm_addr_table_[0]), + 0); + } } else { first_time = 1; - // This implementation doesn't care if we don't get the key we - // want... - this->base_addr_ = - ACE_OS::shmat (shmid, - reinterpret_cast (this->base_addr_), - 0); - if (this->base_addr_ == reinterpret_cast (-1)) - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("(%P|%t) %p, base_addr = %u\n"), - ACE_TEXT("shmat"), - this->base_addr_), 0); + // This implementation doesn't care if we don't get the key we want... + this->shm_addr_table_[0] = ACE_OS::shmat (shmid, reinterpret_cast (this->shm_addr_table_[0]), 0); + + if (this->shm_addr_table_[0] == reinterpret_cast (-1)) + { + ACELIB_ERROR_RETURN ((LM_ERROR, + ACE_TEXT("(%P|%t) ACE_Shared_Memory_Pool::init_acquire, %p, base_addr = %u\n"), + ACE_TEXT("shmat"), + this->shm_addr_table_[0]), 0); + } - SHM_TABLE *st = reinterpret_cast (this->base_addr_); + SHM_TABLE *st = reinterpret_cast (this->shm_addr_table_[0]); st[0].key_ = this->base_shm_key_; st[0].shmid_ = shmid; - st[0].used_ = 1; for (size_t counter = 1; // Skip over the first entry... @@ -389,27 +380,61 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, #endif st[counter].shmid_ = 0; st[counter].used_ = 0; + shm_addr_table_[counter] = nullptr; } } - return (void *) (((char *) this->base_addr_) + shm_table_offset); + return (void *) (((char *) this->shm_addr_table_[0]) + shm_table_offset); } -// Instruct the memory pool to release all of its resources. - +/// Instruct the memory pool to release all of its resources. int -ACE_Shared_Memory_Pool::release (int) +ACE_Shared_Memory_Pool::release (int destroy) { ACE_TRACE ("ACE_Shared_Memory_Pool::release"); int result = 0; - SHM_TABLE *st = reinterpret_cast (this->base_addr_); - for (size_t counter = 0; - counter < this->max_segments_ && st[counter].used_ == 1; - counter++) - if (ACE_OS::shmctl (st[counter].shmid_, IPC_RMID, 0) == -1) - result = -1; + // At the moment we have attached any segments we have to release/destroy these + if (this->shm_addr_table_[0]) + { + // The shared memory table is store in segment[0] + SHM_TABLE *st = reinterpret_cast (this->shm_addr_table_[0]); + + // Detach the mapped shared memory segments in reverse order. + // We store the shared memory table in segment[0], so we have to destroy that + // as last + size_t counter = this->max_segments_; + while (counter > 0) + { + --counter; + + // Get the shared memory id and used flag on the stack as we can't read the shared memory + // anymore after we detached it + int const shmid = st[counter].shmid_; + int const used = st[counter].used_; + + // When we have an address attached for this segment we have to detach it + if (this->shm_addr_table_[counter]) + { + if (ACE_OS::shmdt (this->shm_addr_table_[counter]) == -1) + { + result = -1; + } + this->shm_addr_table_[counter] = nullptr; + } + + // When the segment is used and we are asked to destroy it we instruct the + // OS to release it + if (destroy == 1 && used == 1) + { + if (ACE_OS::shmctl (shmid, IPC_RMID, 0) == -1) + { + result = -1; + } + } + } + } return result; } @@ -446,12 +471,11 @@ void * ACE_Shared_Memory_Pool::base_addr () const { ACE_TRACE ("ACE_Shared_Memory_Pool::base_addr"); - return this->base_addr_; + return this->shm_addr_table_[0]; } -// Implement the algorithm for rounding up the request to an -// appropriate chunksize. - +/// Implement the algorithm for rounding up the request to an +/// appropriate chunksize. size_t ACE_Shared_Memory_Pool::round_up (size_t nbytes) { diff --git a/ACE/ace/Shared_Memory_Pool.h b/ACE/ace/Shared_Memory_Pool.h index 58c1210ad5527..5ee73766426cd 100644 --- a/ACE/ace/Shared_Memory_Pool.h +++ b/ACE/ace/Shared_Memory_Pool.h @@ -26,6 +26,7 @@ #include "ace/Event_Handler.h" #include "ace/Sig_Handler.h" #include "ace/os_include/sys/os_mman.h" +#include ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -83,10 +84,10 @@ class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler typedef ACE_Shared_Memory_Pool_Options OPTIONS; /// Initialize the pool. - ACE_Shared_Memory_Pool (const ACE_TCHAR *backing_store_name = 0, - const OPTIONS *options = 0); + ACE_Shared_Memory_Pool (const ACE_TCHAR *backing_store_name = nullptr, + const OPTIONS *options = nullptr); - virtual ~ACE_Shared_Memory_Pool (void); + virtual ~ACE_Shared_Memory_Pool () = default; /// Ask system for initial chunk of local memory. virtual void *init_acquire (size_t nbytes, @@ -99,14 +100,13 @@ class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler * semaphore that ensures proper serialization of Memory_Pool * initialization across processes. */ - virtual void *acquire (size_t nbytes, - size_t &rounded_bytes); + virtual void *acquire (size_t nbytes, size_t &rounded_bytes); /// Instruct the memory pool to release all of its resources. virtual int release (int destroy = 1); /// Sync the memory region to the backing store starting at - /// @c this->base_addr_. + /// @c shm_addr_table_[0]. virtual int sync (ssize_t len = -1, int flags = MS_SYNC); /// Sync the memory region to the backing store starting at @a addr. @@ -114,7 +114,7 @@ class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler /** * Change the protection of the pages of the mapped region to @a prot - * starting at @c this->base_addr_ up to @a len bytes. If @a len == -1 + * starting at @c shm_addr_table_[0] up to @a len bytes. If @a len == -1 * then change protection of all pages in the mapped region. */ virtual int protect (ssize_t len = -1, int prot = PROT_RDWR); @@ -123,7 +123,7 @@ class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler /// starting at @a addr up to @a len bytes. virtual int protect (void *addr, size_t len, int prot = PROT_RDWR); - /// Return the base address of this memory pool, 0 if base_addr + /// Return the base address of this memory pool, nullptr if shm_addr_table_[0] /// never changes. virtual void *base_addr () const; @@ -146,50 +146,47 @@ class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler virtual int commit_backing_store_name (size_t rounded_bytes, ACE_OFF_T &offset); - /// Keeps track of all the segments being used. + /// Keeps track of all the segments being used. The shared memory + /// table is stored in the first shared memory segment struct SHM_TABLE { - /// Shared memory segment key. + /// Shared memory segment key key_t key_; - /// Shared memory segment internal id. + /// Shared memory segment internal id int shmid_; - /// Is the segment currently used.; + /// Is the segment currently used int used_; }; - /** - * Base address of the shared memory segment. If this has the value - * of 0 then the OS is free to select any address, otherwise this - * value is what the OS must try to use to map the shared memory - * segment. - */ - void *base_addr_; - /// File permissions to use when creating/opening a segment. - size_t file_perms_; + size_t const file_perms_; - /// Number of shared memory segments in the table. - size_t max_segments_; + /// Number of shared memory segments in the SHM_TABLE table. + size_t const max_segments_; - /// What the minimim bytes of the initial segment should be. - ACE_OFF_T minimum_bytes_; + /// What the minimum bytes of the initial segment should be. + ACE_OFF_T const minimum_bytes_; /// Shared memory segment size. - size_t segment_size_; + size_t const segment_size_; /// Base shared memory key for the segment. key_t base_shm_key_; + /// Small table with the addresses of the shared memory segments mapped + /// into this address space. We need these addresses to call shmdt at + /// the release. + std::unique_ptr const shm_addr_table_; + /// Find the segment that contains the @a searchPtr virtual int find_seg (const void *const searchPtr, ACE_OFF_T &offset, size_t &counter); /// Determine how much memory is currently in use. - virtual int in_use (ACE_OFF_T &offset, - size_t &counter); + virtual int in_use (ACE_OFF_T &offset, size_t &counter); /// Handles SIGSEGV. ACE_Sig_Handler signal_handler_; diff --git a/ACE/ace/Shared_Memory_SV.cpp b/ACE/ace/Shared_Memory_SV.cpp index aec9559e2f442..03e3069b92f94 100644 --- a/ACE/ace/Shared_Memory_SV.cpp +++ b/ACE/ace/Shared_Memory_SV.cpp @@ -31,8 +31,7 @@ ACE_Shared_Memory_SV::ACE_Shared_Memory_SV (key_t id, ACE_TRACE ("ACE_Shared_Memory_SV::ACE_Shared_Memory_SV"); } -// The overall size of the segment. - +/// The overall size of the segment. size_t ACE_Shared_Memory_SV::get_segment_size () const { @@ -42,8 +41,7 @@ ACE_Shared_Memory_SV::get_segment_size () const return this->shared_memory_.get_segment_size (); } -// Removes the shared memory segment. - +/// Removes the shared memory segment. int ACE_Shared_Memory_SV::remove () { @@ -51,8 +49,7 @@ ACE_Shared_Memory_SV::remove () return shared_memory_.remove (); } -// Closes (detaches) the shared memory segment. - +/// Closes (detaches) the shared memory segment. int ACE_Shared_Memory_SV::close () { diff --git a/ACE/ace/Shared_Memory_SV.h b/ACE/ace/Shared_Memory_SV.h index 1578e2a69976c..4b5f09ca357ff 100644 --- a/ACE/ace/Shared_Memory_SV.h +++ b/ACE/ace/Shared_Memory_SV.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef ACE_SHARED_MALLOC_SV_H #define ACE_SHARED_MALLOC_SV_H #include /**/ "ace/pre.h" @@ -41,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, @@ -57,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/Shared_Memory_SV.inl b/ACE/ace/Shared_Memory_SV.inl index ae7fbc6e263c1..6571736c4d50d 100644 --- a/ACE/ace/Shared_Memory_SV.inl +++ b/ACE/ace/Shared_Memory_SV.inl @@ -17,9 +17,8 @@ ACE_Shared_Memory_SV::open (key_t id, } // The "do-nothing" constructor. - ACE_INLINE -ACE_Shared_Memory_SV::ACE_Shared_Memory_SV (void) +ACE_Shared_Memory_SV::ACE_Shared_Memory_SV () { ACE_TRACE ("ACE_Shared_Memory_SV::ACE_Shared_Memory_SV"); } 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..ae3ce1ace0f32 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -2,16 +2,10 @@ #include "ace/INET_Addr.h" #include "ace/Log_Category.h" #include "ace/Handle_Set.h" -#include "ace/Auto_Ptr.h" #include "ace/SString.h" #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 +16,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,16 +29,7 @@ const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_IN const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT; #endif /* ACE_VXWORKS <= 0x670 && __RTP__ && ACE_HAS_IPV6 */ -#if defined (ACE_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) +#if defined (ACE_WIN32) # include "ace/OS_NS_stdio.h" #endif @@ -58,18 +40,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 +52,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 +80,6 @@ namespace // Does this box have ipv6 turned on? int ace_ipv6_enabled = -1; - } #else /* ACE_HAS_IPV6 */ # define SIOCGIFCONF_CMD SIOCGIFCONF @@ -228,7 +196,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 +209,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,187 +437,6 @@ 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) - // PharLap ETS has its own kernel routines to rummage through the device - // configs and extract the interface info, but only for Pharlap RT. -# if !defined (ACE_HAS_PHARLAP_RT) - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ - - // Locate all of the IP devices in the system, saving a DEVHANDLE - // for each. Then allocate the ACE_INET_Addrs needed and fetch all - // the IP addresses. To locate the devices, try the available - // device name roots and increment the device number until the - // kernel says there are no more of that type. - const size_t ACE_MAX_ETS_DEVICES = 64; // Arbitrary, but should be enough. - DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES]; - EK_TCPIPCFG *devp = 0; - size_t i, j; - ACE_TCHAR dev_name[16]; - - count = 0; - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // Ethernet. - ACE_OS::sprintf (dev_name, - "ether%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // SLIP. - ACE_OS::sprintf (dev_name, - "sl%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // PPP. - ACE_OS::sprintf (dev_name, - "ppp%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - - if (count > 0) - ACE_NEW_RETURN (addrs, - ACE_INET_Addr[count], - -1); - else - addrs = 0; - - for (i = 0, j = 0; i < count; i++) - { - devp = EtsTCPGetDeviceCfg (ip_dev[i]); - if (devp != 0) - { - addrs[j].set (0, - devp->nwIPAddress, - 0); // Already in net order. - ++j; - } - // There's no call to close the DEVHANDLE. - } - - count = j; - if (count == 0 && addrs != 0) - { - delete [] addrs; - addrs = 0; - } - - return 0; - - -# else - // All non-CE, non-Pharlap Windows. Must support Winsock2. - int i, n_interfaces, status; INTERFACE_INFO info[64]; @@ -766,8 +553,6 @@ get_ip_interfaces_win32 (size_t &count, } return 0; - -# endif /* ACE_HAS_WINCE */ } #elif defined (ACE_HAS_GETIFADDRS) @@ -846,258 +631,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 +650,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. @@ -1150,7 +680,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) -1); ACE_OS::memset (ifs, 0, num_ifs * sizeof (struct IFREQ)); - ACE_Auto_Array_Ptr p_ifs (ifs); + std::unique_ptr p_ifs (ifs); if (p_ifs.get() == 0) { @@ -1232,7 +762,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 +774,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 +819,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) ++count; } ACE_OS::freeaddrinfo (res0); - } ACE_OS::fclose (fp); } @@ -1311,7 +840,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 +853,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 +926,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 +938,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 +971,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 +993,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..3c408d5e0249d 100644 --- a/ACE/ace/Svc_Conf_Lexer.cpp +++ b/ACE/ace/Svc_Conf_Lexer.cpp @@ -18,7 +18,7 @@ #include "ace/os_include/os_ctype.h" #if !defined (__GNUG__) -# include "ace/Auto_Ptr.h" +# include #endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -34,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL # define ACE_TEMPORARY_STRING(X,SIZE) \ char* X = 0; \ char X ## buf[ACE_YY_BUF_SIZE]; \ - ACE_Auto_Ptr X ## bufp (0); \ + std::unique_ptr X ## bufp (nullptr); \ if (SIZE > ACE_YY_BUF_SIZE) { \ X ## bufp.reset (new char[SIZE]); \ X = X ## bufp.get (); \ @@ -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_Handler #if defined (ACE_HAS_TLI) @@ -27,28 +26,9 @@ ACE_TLI::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_TLI::ACE_TLI (void) +ACE_TLI::ACE_TLI () { ACE_TRACE ("ACE_TLI::ACE_TLI"); -#if defined (ACE_HAS_SVR4_TLI) -// Solaris 2.4 ACE_TLI option handling is broken. Thus, we must do -// the memory allocation ourselves... Thanks to John P. Hearn -// (jph@ccrl.nj.nec.com) for the help. - - this->so_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 +42,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 +72,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 @@ -128,7 +99,7 @@ ACE_TLI::set_option (int level, int option, void *optval, int optlen) # if (_XOPEN_SOURCE - 0 >= 500) std::unique_ptr req_opt_buf_p (reinterpret_cast (req.opt.buf)); # else - ACE_Auto_Array_Ptr req_opt_buf_p (req.opt.buf); + std::unique_ptr req_opt_buf_p (req.opt.buf); # endif /* XPG5 vs XPG4 */ struct t_opthdr *opthdr = reinterpret_cast (req.opt.buf); @@ -136,7 +107,7 @@ ACE_TLI::set_option (int level, int option, void *optval, int optlen) # if (_XOPEN_SOURCE - 0 >= 500) std::unique_ptr ret_opt_buf_p (reinterpret_cast (ret.opt.buf)); # else - ACE_Auto_Array_Ptr ret_opt_buf_p (ret.opt.buf); + std::unique_ptr ret_opt_buf_p (ret.opt.buf); # endif /* XPG5 vs XPG4 */ req.flags = T_NEGOTIATE; @@ -147,39 +118,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 @@ -193,7 +138,7 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen) # if (_XOPEN_SOURCE - 0 >= 500) std::unique_ptr req_opt_buf_p (reinterpret_cast (req.opt.buf)); # else - ACE_Auto_Array_Ptr req_opt_buf_p (req.opt.buf); + std::unique_ptr req_opt_buf_p (req.opt.buf); # endif /* XPG5 vs XPG4 */ struct t_opthdr *opthdr = reinterpret_cast (req.opt.buf); @@ -201,7 +146,7 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen) # if (_XOPEN_SOURCE - 0 >= 500) std::unique_ptr ret_opt_buf_p (reinterpret_cast (ret.opt.buf)); # else - ACE_Auto_Array_Ptr ret_opt_buf_p (ret.opt.buf); + std::unique_ptr ret_opt_buf_p (ret.opt.buf); # endif /* XPG5 vs XPG4 */ req.flags = T_CURRENT; @@ -226,41 +171,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 efd7d43c6fca3..af13d17b733ce 100644 --- a/ACE/ace/TSS_T.h +++ b/ACE/ace/TSS_T.h @@ -235,11 +235,11 @@ class ACE_TSS_Type_Adapter /// TYPE conversion. Inlined here so that it should _always_ be /// inlined. - operator TYPE () const { return value_; }; + operator TYPE () const { return value_; } /// TYPE & conversion. Inlined here so that it should _always_ be /// inlined. - operator TYPE &() { return value_; }; + operator TYPE &() { return value_; } private: /// The wrapped value. @@ -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.h b/ACE/ace/Time_Policy.h index b50d0594a4de8..41a42eb1c39e0 100644 --- a/ACE/ace/Time_Policy.h +++ b/ACE/ace/Time_Policy.h @@ -108,7 +108,7 @@ class ACE_Dynamic_Time_Policy_Base; // forward decl class ACE_Export ACE_Delegating_Time_Policy { public: - ACE_Delegating_Time_Policy (ACE_Dynamic_Time_Policy_Base const * delegate = 0); + ACE_Delegating_Time_Policy (ACE_Dynamic_Time_Policy_Base const * delegate = nullptr); /// Return the current time according to this policy ACE_Time_Value_T operator()() const; diff --git a/ACE/ace/Time_Policy.inl b/ACE/ace/Time_Policy.inl index f057ed3a0f714..52fe49f1f27c9 100644 --- a/ACE/ace/Time_Policy.inl +++ b/ACE/ace/Time_Policy.inl @@ -76,7 +76,7 @@ ACE_Delegating_Time_Policy::set_gettimeofday (ACE_Time_Value (*)()) ACE_INLINE void ACE_Delegating_Time_Policy::set_delegate (ACE_Dynamic_Time_Policy_Base const * delegate) { - if (delegate != 0) + if (delegate) { this->delegate_ = delegate; } diff --git a/ACE/ace/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.h b/ACE/ace/Time_Value.h index dd2871bd4ee95..84314af79918f 100644 --- a/ACE/ace/Time_Value.h +++ b/ACE/ace/Time_Value.h @@ -124,7 +124,7 @@ class ACE_Export ACE_Time_Value std::chrono::microseconds const usec { std::chrono::duration_cast( duration % std::chrono::seconds (1))}; - this->set (s.count (), ACE_Utils::truncate_cast(usec.count ())); + this->set (ACE_Utils::truncate_cast(s.count ()), ACE_Utils::truncate_cast(usec.count ())); } /// Converts from ACE_Time_Value format into milliseconds format. 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.cpp b/ACE/ace/UUID.cpp index b481c53e3013a..9f57dbe0f8c4f 100644 --- a/ACE/ace/UUID.cpp +++ b/ACE/ace/UUID.cpp @@ -12,7 +12,7 @@ #include "ace/OS_NS_netdb.h" #include "ace/OS_NS_unistd.h" #include "ace/ACE.h" -#include "ace/Auto_Ptr.h" +#include ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -64,7 +64,7 @@ namespace ACE_Utils // Get a buffer exactly the correct size. Use the nil UUID as a // gauge. Don't forget the trailing nul. - ACE_Auto_Array_Ptr auto_clean; + std::unique_ptr auto_clean; size_t UUID_STRING_LENGTH = 36 + thr_id_.length () + pid_.length (); char *buf = 0; 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 8a880da6b1eed..6d049177827ce 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -3,8 +3,8 @@ // This is file was automatically generated by $ACE_ROOT/bin/make_release.py #define ACE_MAJOR_VERSION 7 -#define ACE_MINOR_VERSION 0 -#define ACE_MICRO_VERSION 6 -#define ACE_VERSION "7.0.6" -#define ACE_VERSION_CODE 0x70006 +#define ACE_MINOR_VERSION 1 +#define ACE_MICRO_VERSION 2 +#define ACE_VERSION "7.1.2" +#define ACE_VERSION_CODE 0x70102 #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..cf935f9dd45b5 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,64 +1758,11 @@ 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) { -# if defined (ACE_HAS_PHARLAP) - // PharLap doesn't implement WaitForMultipleObjectsEx, and doesn't - // do async I/O, so it's not needed in this case anyway. - result = ::WaitForMultipleObjects (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), - this->atomic_wait_array_, - TRUE, - timeout); - - if (result != WAIT_IO_COMPLETION) - break; - -# else result = ::WaitForMultipleObjectsEx (sizeof this->atomic_wait_array_ / sizeof (ACE_HANDLE), this->atomic_wait_array_, TRUE, @@ -1825,8 +1771,6 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, if (result != WAIT_IO_COMPLETION) break; - -# endif /* ACE_HAS_PHARLAP */ } switch (result) @@ -1844,7 +1788,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 @@ -1854,22 +1797,11 @@ ACE_WFMO_Reactor::wait_for_multiple_events (int timeout, // Wait for any of handles_ to be active, or until timeout expires. // If is enabled allow asynchronous completion of // ReadFile and WriteFile operations. - -#if defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) - // PharLap doesn't do async I/O and doesn't implement - // WaitForMultipleObjectsEx, so use WaitForMultipleObjects. - ACE_UNUSED_ARG (alertable); - return ::WaitForMultipleObjects (this->handler_rep_.max_handlep1 (), - this->handler_rep_.handles (), - FALSE, - timeout); -#else return ::WaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (), this->handler_rep_.handles (), FALSE, timeout, alertable); -#endif /* ACE_HAS_PHARLAP */ } DWORD @@ -1921,16 +1853,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 +2192,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 +2294,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 +2313,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 +2500,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 +2630,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 +2650,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 584dc2f762bfe..0000000000000 --- a/ACE/ace/config-WinCE.h +++ /dev/null @@ -1,218 +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_LACKS_MALLOC_H // We do have malloc.h, but don't use it. - -#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-conftest.h b/ACE/ace/config-face-conftest.h index 17285562e35bd..422384f0b8a0d 100644 --- a/ACE/ace/config-face-conftest.h +++ b/ACE/ace/config-face-conftest.h @@ -42,7 +42,6 @@ #define ACE_LACKS_IFREQ #define ACE_LACKS_IP_MREQ #define ACE_LACKS_ISCTYPE -#define ACE_LACKS_MEMORY_H #define ACE_LACKS_SELECT // safetyBase headers are missing select() #define ACE_LACKS_SETENV #define ACE_LACKS_SIGINFO_H 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-freebsd.h b/ACE/ace/config-freebsd.h index 0c1fa8e7c56ff..ceef9fc2a902b 100644 --- a/ACE/ace/config-freebsd.h +++ b/ACE/ace/config-freebsd.h @@ -43,7 +43,6 @@ #define ACE_HAS_POSIX_TIME #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS #define ACE_HAS_RTLD_LAZY_V -#define ACE_HAS_SEMUN #define ACE_HAS_SIGISMEMBER_BUG #define ACE_HAS_SIGSUSPEND #define ACE_HAS_SIGWAIT @@ -70,7 +69,6 @@ #define ACE_LACKS_ISCTYPE #define ACE_LACKS_ITOW #define ACE_LACKS_LOG2 -#define ACE_LACKS_MALLOC_H #define ACE_LACKS_MUTEXATTR_PSHARED #define ACE_LACKS_SIGINFO_H #define ACE_LACKS_SI_ADDR @@ -183,6 +181,14 @@ enum schedparam_policy { # define ACE_HAS_VOID_UNSETENV #endif +#if (__FreeBSD_version >= 800025) +# define ACE_HAS_CPUSET_T +#endif + +#if (__FreeBSD_version < 1200059) +# define ACE_HAS_SEMUN +#endif + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index 2bcdde43e74b3..b4c8068873469 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -14,21 +14,25 @@ #define ACE_CC_MINOR_VERSION __GNUC_MINOR__ #define ACE_CC_BETA_VERSION (0) -#define ACE_TEMPLATES_REQUIRE_SOURCE - -#if __cplusplus >= 201103L -# define ACE_HAS_CPP11 -# define ACE_FALLTHROUGH [[gnu::fallthrough]] -#endif -#if __cplusplus >= 201402L -# define ACE_HAS_CPP14 -# define ACE_FALLTHROUGH [[gnu::fallthrough]] +#if __cplusplus >= 202002L +# define ACE_HAS_CPP20 #endif #if __cplusplus >= 201703L # define ACE_HAS_CPP17 +# define ACE_FALLTHROUGH [[fallthrough]] #endif -#if __cplusplus >= 202002L -# define ACE_HAS_CPP20 +#if __cplusplus >= 201402L +# define ACE_HAS_CPP14 +#endif +#if __cplusplus >= 201103L +# define ACE_HAS_CPP11 +# if !defined (ACE_FALLTHROUGH) +# if __GNUC__ >= 7 +# define ACE_FALLTHROUGH [[gnu::fallthrough]] +# else +# define ACE_FALLTHROUGH +# endif +# endif #endif #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) 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 7c48856e50f04..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 @@ -85,7 +84,6 @@ #define ACE_LACKS_MKSTEMP #define ACE_LACKS_MPROTECT #define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_PIPE #define ACE_LACKS_RLIMIT #define ACE_LACKS_RECVMSG #define ACE_LACKS_RWLOCK_T @@ -132,8 +130,6 @@ /***** Not tied to standards AFAIK ****/ #define ACE_LACKS_MADVISE /* paging optimization not needed with INTEGRITY */ -#define ACE_LACKS_MALLOC_H /* netbsd's just includes stdlib.h */ -#define ACE_LACKS_MEMORY_H /* netbsd's just includes string.h */ #define ACE_LACKS_INTTYPES_H #define ACE_LACKS_SYS_RESOURCE_H #define ACE_LACKS_SYS_WAIT_H 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 c761d094dc029..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 @@ -60,8 +58,6 @@ #define ACE_NEEDS_SCHED_H -#define ACE_LACKS_MALLOC_H - #define ACE_HAS_ALT_CUSERID // Platform supports POSIX timers via struct timespec. diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index 87a11e41419bd..3bb2f73a9918b 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -16,7 +16,7 @@ #endif /* ! __ACE_INLINE__ */ #if !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 16 +# define ACE_SIZEOF_LONG_DOUBLE __SIZEOF_LONG_DOUBLE__ #endif // ACE_SIZEOF_LONG_DOUBLE #if defined (__GNUG__) @@ -91,8 +91,6 @@ #define ACE_NEEDS_SCHED_H -#define ACE_LACKS_MALLOC_H - #define ACE_HAS_ALT_CUSERID // Platform supports POSIX timers via struct timespec. diff --git a/ACE/ace/config-macosx-lion.h b/ACE/ace/config-macosx-lion.h index 746374ea5c8e4..77c7671ce5b6a 100644 --- a/ACE/ace/config-macosx-lion.h +++ b/ACE/ace/config-macosx-lion.h @@ -3,10 +3,6 @@ #include "ace/config-macosx-leopard.h" -#ifdef __clang__ -# define ACE_ANY_OPS_USE_NAMESPACE -#endif /* __clang__ */ - #if defined (__x86_64__) # define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld" # define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h index 22226b2310597..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 @@ -55,9 +53,6 @@ #define ACE_NEEDS_SCHED_H -// Use of is deprecated. -#define ACE_LACKS_MALLOC_H - #define ACE_HAS_ALT_CUSERID // Platform supports POSIX timers via struct timespec. diff --git a/ACE/ace/config-macosx-snowleopard.h b/ACE/ace/config-macosx-snowleopard.h index 553056a9a21a6..3aaa8c03e888d 100644 --- a/ACE/ace/config-macosx-snowleopard.h +++ b/ACE/ace/config-macosx-snowleopard.h @@ -3,10 +3,6 @@ #include "ace/config-macosx-leopard.h" -#ifdef __clang__ -#define ACE_ANY_OPS_USE_NAMESPACE -#endif - #define ACE_LACKS_UCONTEXT_H #endif // ACE_CONFIG_MACOSX_SNOWLEOPARD_H diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h index d5ae403ac84a6..88fe5c24f8c1e 100644 --- a/ACE/ace/config-macosx-tiger.h +++ b/ACE/ace/config-macosx-tiger.h @@ -9,7 +9,7 @@ #endif /* ! __ACE_INLINE__ */ #if !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 16 +# define ACE_SIZEOF_LONG_DOUBLE __SIZEOF_LONG_DOUBLE__ #endif // ACE_SIZEOF_LONG_DOUBLE #if defined (__GNUG__) @@ -76,8 +76,6 @@ #define ACE_NEEDS_SCHED_H -#define ACE_LACKS_MALLOC_H - #define ACE_HAS_ALT_CUSERID // Platform supports POSIX timers via struct timespec. diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 35f7dae962e53..ac57a80e0b3eb 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)) # 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 e4e5071c80d48..0000000000000 --- a/ACE/ace/config-openvms.h +++ /dev/null @@ -1,183 +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_MALLOC_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-pharlap.h b/ACE/ace/config-pharlap.h deleted file mode 100644 index dbc933bc574db..0000000000000 --- a/ACE/ace/config-pharlap.h +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- C++ -*- */ -// This configuration file is for use with the PharLap Realtime ETS Kernel. -// It has been tested with PharLap TNT Embedded ToolSuite version 9.1. - -#ifndef ACE_CONFIG_PHARLAP_H -#define ACE_CONFIG_PHARLAP_H -#include /**/ "ace/pre.h" - -#define ACE_HAS_PHARLAP -// Some features are only available with the Realtime edition of ETS. -// Assume that if using ACE, the realtime version is also being used, but -// allow it to be turned off as well. -#ifndef ACE_HAS_PHARLAP_RT -# define ACE_HAS_PHARLAP_RT -#else -# if (ACE_HAS_PHARLAP_RT == 0) -# undef ACE_HAS_PHARLAP_RT -# endif -#endif - -// Fortunately, PharLap ETS offers much of the Win32 API. But it's still on -// Winsock 1.1 -#define ACE_HAS_WINSOCK2 0 -#define ACE_HAS_WINSOCK1 1 - -// The TSS implementation doesn't pass muster on the TSS_Test, but it works -// well with ACE's TSS emulation. -#define ACE_HAS_TSS_EMULATION - -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_TCP_NODELAY -#define ACE_LACKS_MSG_WFMO -#define ACE_LACKS_WIN32_MOVEFILEEX -#define ACE_LACKS_WIN32_REGISTRY -#define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS -#define ACE_LACKS_WIN32_SERVICES -#define ACE_LACKS_WIN32_SETFILEPOINTEREX - -// There's no host table, by default. So using "localhost" won't work. -// If your system does have the ability to use "localhost" and you want to, -// define it before including this file. -#if !defined (ACE_LOCALHOST) -# define ACE_LOCALHOST "127.0.0.1" -#endif /* ACE_LOCALHOST */ - -// The normal Windows default stack size doesn't hold for ETS. Set what you -// want explicitly. -#if !defined (ACE_DEFAULT_THREAD_STACKSIZE) -# define ACE_DEFAULT_THREAD_STACKSIZE (1024*1024) -#endif /* ACE_DEFAULT_THREAD_STACKSIZE */ - -// Don't know how to get the page size at execution time. This is most likely -// the correct value. -#define ACE_PAGE_SIZE 4096 - -#if defined (ACE_HAS_PHARLAP_RT) -# define ACE_HAS_IP_MULTICAST - // ETS winsock doesn't define IP level socket options -//# define IP_TOS 8 -#endif /* ACE_HAS_PHARLAP_RT */ - -// Let the config-win32.h file do its thing -#undef ACE_CONFIG_H -#include "ace/config-win32.h" -// Now remove things that desktop/server Windows has but Pharlap ETS doesn't. -#undef ACE_HAS_INTERLOCKED_EXCHANGEADD -#undef ACE_HAS_WCHAR - -// PharLap's exports apparantly define LockFile, but it's documented as -// unsupported. LockFileEx is not present. -#define ACE_LACKS_FILELOCKS - -#include /**/ -#if defined (ACE_HAS_PHARLAP_RT) -# include /**/ -#define ACE_LACKS_IP_ADD_MEMBERSHIP -#endif /* ACE_HAS_PHARLAP_RT */ - -// Although IN_CLASSD is defined in both winsock.h and winsock2.h, it ends -// up undefined for Pharlap ETS builds. If this is the case, set things up -// so nothing looks like class D. -#if !defined (IN_CLASSD) -# define IN_CLASSD(i) (0) -#endif - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_PHARLAP_H */ diff --git a/ACE/ace/config-posix-nonetworking.h b/ACE/ace/config-posix-nonetworking.h index 23e33eccc2dc0..f30d7fef73771 100644 --- a/ACE/ace/config-posix-nonetworking.h +++ b/ACE/ace/config-posix-nonetworking.h @@ -16,7 +16,6 @@ # define ACE_LACKS_NET_IF_H # define ACE_LACKS_SYSLOG_H # define ACE_LACKS_SYS_UN_H -# define ACE_LACKS_MEMORY_H # define ACE_LACKS_SYS_SYSCTL_H # define ACE_LACKS_NETINET_TCP_H diff --git a/ACE/ace/config-qnx.h b/ACE/ace/config-qnx.h index 64c5e9f280e6f..d2983756575c4 100644 --- a/ACE/ace/config-qnx.h +++ b/ACE/ace/config-qnx.h @@ -13,8 +13,6 @@ # error "Could not detect QNX version from macro _NTO_VERSION" #endif -#define _POSIX_C_SOURCE 199506 - // The following defines the Neutrino compiler. // gcc should know to call g++ as necessary #ifdef __GNUC__ @@ -25,19 +23,6 @@ #include "ace/config-g++-common.h" -// /usr/nto/include/float.h defines -// FLT_MAX_EXP 127 -// DBL_MAX_EXP 1023 -// ace expects 128 & 1024 respectively -// to set the following macros in ace/Basic_Types.h -// These macros are: -#define ACE_SIZEOF_DOUBLE 8 -#define ACE_SIZEOF_FLOAT 4 - -// At least qnx 6.3.2 uses a void return for unsetenv -// This assumes that older versions do too. -#define ACE_HAS_VOID_UNSETENV - ///////////////////////////////////////////////////////////////// // Definition of the features that are available. // @@ -113,18 +98,13 @@ // // ACE_LACKS Section ///////////////////////////////////////////////////////////////// -#define ACE_LACKS_CONST_TIMESPEC_PTR #define ACE_LACKS_LINEBUFFERED_STREAMBUF #define ACE_LACKS_MADVISE // Multicast_Tests reports for NTO 621 frames from unsubscribed groups #define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SO_SNDBUF -#define ACE_LACKS_SO_RCVBUF #define ACE_LACKS_STREAM_MODULES #define ACE_LACKS_STROPTS_H #define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYSCALL #define ACE_LACKS_SYSV_SHMEM #define ACE_LACKS_SYS_SHM_H #define ACE_LACKS_TIMESPEC_T @@ -134,18 +114,32 @@ #define ACE_HAS_SYSCTL #define ACE_HAS_SIGACTION_CONSTP2 1 #define ACE_LACKS_PTHREAD_SCOPE_PROCESS - -#if _NTO_VERSION < 650 -# define ACE_LACKS_NFDBITS -# define ACE_LACKS_FD_MASK -# define ACE_LACKS_SYS_MSG_H -# define ACE_LACKS_ALPHASORT -# define ACE_LACKS_STRPTIME -# define ACE_LACKS_POLL_H +#define ACE_HAS_POLL 1 +#define ACE_HAS_WCHAR 1 +#define ACE_HAS_XPG4_MULTIBYTE_CHAR 1 + +#if _NTO_VERSION < 710 +# define ACE_LACKS_CONST_TIMESPEC_PTR +# define ACE_LACKS_RWLOCK_T +# define ACE_LACKS_SO_SNDBUF +# define ACE_LACKS_SO_RCVBUF +# define ACE_LACKS_SYSCALL +# define ACE_LACKS_ITOW +# define ACE_LACKS_WCSICMP +# define ACE_LACKS_WCSNICMP +# define ACE_LACKS_WCSDUP +# define ACE_LACKS_STD_WSTRING +// /usr/nto/include/float.h defines +// FLT_MAX_EXP 127 +// DBL_MAX_EXP 1023 +// ace expects 128 & 1024 respectively +// to set the following macros in ace/Basic_Types.h +// These macros are: +# define ACE_SIZEOF_DOUBLE 8 +# define ACE_SIZEOF_FLOAT 4 +# define _POSIX_C_SOURCE 199506 #else -# define ACE_HAS_POLL 1 -# define ACE_HAS_WCHAR 1 -# define ACE_HAS_XPG4_MULTIBYTE_CHAR 1 +# define ACE_HAS_NONCONST_CMSG_SPACE #endif #define ACE_LACKS_ISCTYPE @@ -162,13 +156,6 @@ #define ACE_SIZEOF_WCHAR 4 -// No prototypes -#define ACE_LACKS_ITOW -#define ACE_LACKS_WCSICMP -#define ACE_LACKS_WCSNICMP -#define ACE_LACKS_WCSDUP -#define ACE_LACKS_STD_WSTRING - #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # define ACE_HAS_THREADS # define ACE_HAS_PTHREADS @@ -177,7 +164,6 @@ # define ACE_HAS_PTHREAD_GETCONCURRENCY #endif /* ACE_MT_SAFE */ - // The default value of FD_SETSIZE is 32, but actually x86 NTO // supports by default at least 1000 descriptors in fd_set. #if defined( FD_SETSIZE ) @@ -185,5 +171,8 @@ #endif #define FD_SETSIZE 1000 +#define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld" +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_QNX_H */ 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 deleted file mode 100644 index 517e743d1d83f..0000000000000 --- a/ACE/ace/config-suncc-common.h +++ /dev/null @@ -1,49 +0,0 @@ -// -*- C++ -*- -#ifndef ACE_SUNCC_COMMON_H -#define ACE_SUNCC_COMMON_H -#include /**/ "ace/pre.h" - -# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS -# define ACE_HAS_THR_C_DEST 1 -# define ACE_LACKS_SWAB -#if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0 -# undef ACE_HAS_CUSTOM_EXPORT_MACROS -#else -# ifndef ACE_HAS_CUSTOM_EXPORT_MACROS -# define ACE_HAS_CUSTOM_EXPORT_MACROS -# endif /* !ACE_HAS_CUSTOM_EXPORT_MACROS */ -# define ACE_Proper_Export_Flag __attribute__ ((visibility("default"))) -# define ACE_Proper_Import_Flag -# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T -# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE ; -# define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T -# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE; -#endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ - -#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) -# define ACE_SIZEOF_LONG_DOUBLE 12 -#endif /* i386 */ - -#if defined (i386) || defined (__i386__) - // If running an Intel, assume that it's a Pentium so that - // ACE_OS::gethrtime () can use the RDTSC instruction. If running a - // 486 or lower, be sure to comment this out. (If not running an - // Intel CPU, this #define will not be seen because of the i386 - // protection, so it can be ignored.) -# define ACE_HAS_PENTIUM -#endif /* i386 */ - -#if !defined (ACE_LACKS_PRAGMA_ONCE) - // We define it with a -D with make depend. -# define ACE_LACKS_PRAGMA_ONCE -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -// Solaris Studio 12.4 implements symbol lookup correctly. -#if defined (__SUNPRO_CC) && (__SUNPRO_CC >= 0x5130) -#define ACE_ANY_OPS_USE_NAMESPACE -#endif - -#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 99b12cbc634fc..0000000000000 --- a/ACE/ace/config-sunos5.10.h +++ /dev/null @@ -1,67 +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 - -// Solaris Studio 12.4 implements symbol lookup correctly. -#if defined (__SUNPRO_CC) && (__SUNPRO_CC >= 0x5130) -#define ACE_ANY_OPS_USE_NAMESPACE -#endif - -#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 cc2ba11caff3a..0000000000000 --- a/ACE/ace/config-sunos5.5.h +++ /dev/null @@ -1,338 +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) - // string.h and memory.h conflict for memchr definitions -# define ACE_LACKS_MEMORY_H - // 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 new file mode 100644 index 0000000000000..3b1bfed81b668 --- /dev/null +++ b/ACE/ace/config-vxworks22.03.h @@ -0,0 +1,13 @@ +/* -*- C++ -*- */ +// The following configuration file is designed to work for VxWorks +// 22.03 platforms using one of these compilers: +// 1) The llvm compiler that is shipped with VxWorks 22.03 + +#ifndef ACE_CONFIG_VXWORKS_22_03_H +#define ACE_CONFIG_VXWORKS_22_03_H +#include /**/ "ace/pre.h" + +#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 eff24fbdec237..91983c3f2d609 100644 --- a/ACE/ace/config-vxworks6.4.h +++ b/ACE/ace/config-vxworks6.4.h @@ -24,14 +24,6 @@ # define ACE_LACKS_STD_WSTRING #endif -#if !defined (__RTP__) - // Fix for wrong typedef of time_t in kernel mode - #ifndef _TIME_T - #define _TIME_T - typedef long time_t; - #endif -#endif - #if ! defined (__ACE_INLINE__) # define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ @@ -50,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 @@ -132,8 +121,6 @@ #define ACE_LACKS_GETIPNODEBYNAME_IPV6 #define ACE_LACKS_LSTAT #define ACE_LACKS_MADVISE -#define ACE_LACKS_MALLOC_H -#define ACE_LACKS_MEMORY_H #define ACE_LACKS_MKFIFO #define ACE_LACKS_MKSTEMP #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS diff --git a/ACE/ace/config-vxworks6.8.h b/ACE/ace/config-vxworks6.8.h index 56d805d0864f4..58fd16af2dad3 100644 --- a/ACE/ace/config-vxworks6.8.h +++ b/ACE/ace/config-vxworks6.8.h @@ -14,7 +14,6 @@ #include "ace/config-vxworks6.7.h" - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_6_8_H */ diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 794b12963043f..3502742130d23 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" @@ -60,7 +64,6 @@ #define ACE_HAS_DIRENT #define ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS -#define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1 #define ACE_LACKS_TERMIOS_H #define ACE_LACKS_NETINET_TCP_H @@ -99,7 +102,12 @@ #define ACE_HAS_WREWINDDIR #define ACE_LACKS_STRRECVFD -#define ACE_USES_EXPLICIT_STD_NAMESPACE + +#if !defined (__MINGW64__) +# define ACE_USES_EXPLICIT_STD_NAMESPACE +# define ACE_LACKS_PID_T +# define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1 +#endif #if defined (ACE_HAS_BCC64) # define ACE_HAS_TIME_T_LONG_MISMATCH @@ -110,7 +118,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" @@ -156,12 +163,23 @@ # define ACE_NEEDS_DL_UNDERSCORE #endif -#define ACE_ANY_OPS_USE_NAMESPACE #define ACE_HAS_BUILTIN_BSWAP16 #define ACE_HAS_BUILTIN_BSWAP32 #define ACE_HAS_BUILTIN_BSWAP64 #define ACE_LACKS_INLINE_ASSEMBLY -#define ACE_LACKS_PID_T + +#if defined(__MINGW64__) +# define ACE_LACKS_GID_T +# undef ACE_LACKS_USECONDS_T +# define ACE_HAS_POSIX_TIME +# define ACE_LACKS_TIMESPEC_T +# define ACE_LACKS_UID_T +# define ACE_LACKS_GMTIME_R +# define ACE_LACKS_LOCALTIME_R +# define ACE_LACKS_NLINK_T +# define ACE_HAS_3_PARAM_WCSTOK +# define ACE_LACKS_STRPTIME +#endif #if __cplusplus >= 201103L # define ACE_HAS_CPP11 @@ -178,4 +196,3 @@ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_BORLAND_H */ - diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index a22eb51989a4b..7e433c02da6dc 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) # pragma comment(lib, "wsock32.lib") # endif /* _MSC_VER */ @@ -549,21 +488,16 @@ # define ACE_HAS_IP_MULTICAST #endif /* ACE_HAS_WINSOCK2 */ -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_INTERLOCKED_EXCHANGEADD -#endif - -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#define ACE_HAS_INTERLOCKED_EXCHANGEADD -# if _WIN32_WINNT >= 0x400 -# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT -# endif +#if _WIN32_WINNT >= 0x400 +# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT +#endif // If CancelIO is undefined get the updated sp2-sdk from MS -# define ACE_HAS_CANCEL_IO -# define ACE_HAS_WIN32_OVERLAPPED_IO -# define ACE_HAS_WIN32_NAMED_PIPES -#endif /* !defined (ACE_HAS_WINCE) && !ACE_HAS_PHARLAP */ +#define ACE_HAS_CANCEL_IO +#define ACE_HAS_WIN32_OVERLAPPED_IO +#define ACE_HAS_WIN32_NAMED_PIPES #if !defined (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION) # define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH @@ -596,9 +530,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 +541,15 @@ # define ACE_DISABLES_THREAD_LIBRARY_CALLS 0 #endif /* ACE_DISABLES_THREAD_LIBRARY_CALLS */ -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) -# define ACE_HAS_LOG_MSG_NT_EVENT_LOG -#endif /* !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */ +#define ACE_HAS_LOG_MSG_NT_EVENT_LOG -#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-mingw64.h b/ACE/ace/config-win32-mingw64.h index f7414ebda543a..1d378aa1e233b 100644 --- a/ACE/ace/config-win32-mingw64.h +++ b/ACE/ace/config-win32-mingw64.h @@ -128,5 +128,10 @@ #define ACE_DLL_PREFIX ACE_TEXT ("lib") +#if defined(_UCRT) +# define ACE_HAS_3_PARAM_WCSTOK +#endif + + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MINGW64_H */ diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h deleted file mode 100644 index 866c45f6dd2e0..0000000000000 --- a/ACE/ace/config-win32-msvc-14.h +++ /dev/null @@ -1,152 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-14.h - * - * @brief Microsoft Visual C++ 14.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 2015. - * - * @note Do not include this file directly, include config-win32.h instead. - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_14_H -#define ACE_CONFIG_WIN32_MSVC_14_H -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#ifndef ACE_WIN32_VC14 -# define ACE_WIN32_VC14 -#endif - -// Windows' timeval is non-conformant (defined in terms of long instead of -// time_t) and VC8 changed time_t to a 64-bit value even when compiling a -// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few -// things for this compiler. See Time_Value.h for complete details. -#if !defined (_USE_32BIT_TIME_T) -# define ACE_HAS_TIME_T_LONG_MISMATCH -#endif - -#define ACE_HAS_ITOA - -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#if defined (ACE_HAS_WINCE) -# define ACE_FILENO_EQUIVALENT ::_fileno -#else -# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) -#endif - -// 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_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 - -#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) -# define ACE_HAS_INTRINSIC_BYTESWAP -#endif - -#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 - -// Platform support linebuffered streaming is broken -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -// ace/iostream.h does not work with the standard cpp library (yet). -#if !defined (ACE_USES_OLD_IOSTREAMS) -# define ACE_LACKS_ACE_IOSTREAM -#endif /* ! ACE_USES_OLD_IOSTREAMS */ - -// There are too many instances of this warning to fix it right now. -// Maybe in the future. - -// Disable warning of using Microsoft Extension. -#pragma warning(disable:4231) - -// 'class1' : inherits 'class2::member' via dominance -#pragma warning(disable:4250) - -// 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) -# 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 - -// Windows Vista and Windows Server 2008 and newer do have native condition -// variables, but this is commented out because the support in ACE hasn't -// been completed -// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) -// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE -// # undef ACE_LACKS_COND_T -// #endif - -#define ACE_HAS_POSIX_TIME 1 -#define ACE_LACKS_TIMESPEC_T 1 - -// According to MS the Visual Studio 2015 C-runtime has a -// C99 compliant vsnprintf/vsnwprintf, this is a change compared to -// previous versions -#define ACE_HAS_C99_VSNPRINTF -#define ACE_HAS_C99_VSNWPRINTF - -// Visual Studio 2015 has 3 parameter wcstok -#define ACE_HAS_3_PARAM_WCSTOK - -// Visual Studio 2015 has adequate C++11 support -#define ACE_HAS_CPP11 - -#define ACE_PUTENV_EQUIVALENT ::_putenv -#define ACE_TEMPNAM_EQUIVALENT ::_tempnam -#define ACE_STRDUP_EQUIVALENT ::_strdup -#define ACE_MKDIR_EQUIVALENT ::_mkdir -#define ACE_ACCESS_EQUIVALENT ::_access -#define ACE_CHDIR_EQUIVALENT ::_chdir -#define ACE_RMDIR_EQUIVALENT ::_rmdir -#define ACE_GETCWD_EQUIVALENT ::_getcwd -#define ACE_SWAB_EQUIVALENT ::_swab -#define ACE_UNLINK_EQUIVALENT ::_unlink - -#define ACE_HAS_STRNLEN -#define ACE_HAS_WCSNLEN - -#define ACE_LACKS_STRUCT_DIR -#define ACE_LACKS_OPENDIR -#define ACE_LACKS_CLOSEDIR -#define ACE_LACKS_READDIR - -#define ACE_LACKS_MODE_T -#define ACE_LACKS_PID_T - -#define ACE_LACKS_NLINK_T -#define ACE_LACKS_UID_T -#define ACE_LACKS_GID_T - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_14_H */ diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h index c6376395d1342..60de5347739fd 100644 --- a/ACE/ace/config-win32-msvc-141.h +++ b/ACE/ace/config-win32-msvc-141.h @@ -19,11 +19,116 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ +#ifndef ACE_WIN32_VC14 +# define ACE_WIN32_VC14 +#endif #ifndef ACE_WIN32_VC141 # define ACE_WIN32_VC141 #endif -#include "ace/config-win32-msvc-14.h" +// Windows' timeval is non-conformant (defined in terms of long instead of +// time_t) and VC8 changed time_t to a 64-bit value even when compiling a +// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few +// things for this compiler. See Time_Value.h for complete details. +#if !defined (_USE_32BIT_TIME_T) +# define ACE_HAS_TIME_T_LONG_MISMATCH +#endif + +#define ACE_HAS_ITOA + +#define ACE_ITOA_EQUIVALENT ::_itoa +#define ACE_STRCASECMP_EQUIVALENT ::_stricmp +#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp +#define ACE_WCSDUP_EQUIVALENT ::_wcsdup +#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) + +#define ACE_HAS_SIG_ATOMIC_T + +#define ACE_LACKS_STRPTIME + +#define ACE_HAS_INTRIN_H +#define ACE_HAS_INTRINSIC_INTERLOCKED + +#define ACE_HAS_INTRINSIC_BYTESWAP + +#define ACE_LACKS_STRRECVFD + +// Platform provides ACE_TLI function prototypes. +// For Win32, this is not really true, but saves a lot of hassle! +#define ACE_HAS_TLI_PROTOTYPES + +// Platform support linebuffered streaming is broken +#define ACE_LACKS_LINEBUFFERED_STREAMBUF + +// ace/iostream.h does not work with the standard cpp library (yet). +#if !defined (ACE_USES_OLD_IOSTREAMS) +# define ACE_LACKS_ACE_IOSTREAM +#endif /* ! ACE_USES_OLD_IOSTREAMS */ + +// There are too many instances of this warning to fix it right now. +// Maybe in the future. + +// Disable warning of using Microsoft Extension. +#pragma warning(disable:4231) + +// 'class1' : inherits 'class2::member' via dominance +#pragma warning(disable:4250) + +#if !defined (ACE_HAS_TR24731_2005_CRT) +# define ACE_HAS_TR24731_2005_CRT +#endif + +// A template can not be exported. Only an instantiation may be exported. +#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + +// Windows Vista and Windows Server 2008 and newer do have native condition +// variables, but this is commented out because the support in ACE hasn't +// been completed +// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) +// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE +// # undef ACE_LACKS_COND_T +// #endif + +#define ACE_HAS_POSIX_TIME 1 +#define ACE_LACKS_TIMESPEC_T 1 + +// According to MS the Visual Studio 2015 C-runtime has a +// C99 compliant vsnprintf/vsnwprintf, this is a change compared to +// previous versions +#define ACE_HAS_C99_VSNPRINTF +#define ACE_HAS_C99_VSNWPRINTF + +// Visual Studio 2015 has 3 parameter wcstok +#define ACE_HAS_3_PARAM_WCSTOK + +// Visual Studio 2015 has adequate C++11 support +#define ACE_HAS_CPP11 + +#define ACE_PUTENV_EQUIVALENT ::_putenv +#define ACE_TEMPNAM_EQUIVALENT ::_tempnam +#define ACE_STRDUP_EQUIVALENT ::_strdup +#define ACE_MKDIR_EQUIVALENT ::_mkdir +#define ACE_ACCESS_EQUIVALENT ::_access +#define ACE_CHDIR_EQUIVALENT ::_chdir +#define ACE_RMDIR_EQUIVALENT ::_rmdir +#define ACE_GETCWD_EQUIVALENT ::_getcwd +#define ACE_SWAB_EQUIVALENT ::_swab +#define ACE_UNLINK_EQUIVALENT ::_unlink + +#define ACE_HAS_STRNLEN +#define ACE_HAS_WCSNLEN + +#define ACE_LACKS_STRUCT_DIR +#define ACE_LACKS_OPENDIR +#define ACE_LACKS_CLOSEDIR +#define ACE_LACKS_READDIR + +#define ACE_LACKS_MODE_T +#define ACE_LACKS_PID_T + +#define ACE_LACKS_NLINK_T +#define ACE_LACKS_UID_T +#define ACE_LACKS_GID_T #if _MSVC_LANG >= 201402L # define ACE_HAS_CPP14 @@ -33,5 +138,9 @@ # define ACE_HAS_CPP17 #endif /* _MSVC_LANG >= 201703L */ +#if _MSVC_LANG >= 202002L +# define ACE_HAS_CPP20 +#endif /* _MSVC_LANG >= 202002L */ + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_141_H */ diff --git a/ACE/ace/config-win32-msvc-142.h b/ACE/ace/config-win32-msvc-142.h index daed397225952..157b4acb48099 100644 --- a/ACE/ace/config-win32-msvc-142.h +++ b/ACE/ace/config-win32-msvc-142.h @@ -29,9 +29,5 @@ # define ACE_HAS_CPP20 #endif /* _MSVC_LANG >= 202002L */ -#ifdef ACE_HAS_CPP17 -# define ACE_LACKS_AUTO_PTR -#endif - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_142_H */ diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index c1cdeb85277f9..e467bf0230b9b 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) @@ -44,8 +39,6 @@ # include "ace/config-win32-msvc-142.h" #elif (_MSC_VER >= 1910) # include "ace/config-win32-msvc-141.h" -#elif (_MSC_VER >= 1900) -# include "ace/config-win32-msvc-14.h" #else # error This version of Microsoft Visual C++ is not supported. #endif @@ -54,13 +47,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/netinet/os_in.h b/ACE/ace/os_include/netinet/os_in.h index f71e757532b05..a9bca3fe2f8e1 100644 --- a/ACE/ace/os_include/netinet/os_in.h +++ b/ACE/ace/os_include/netinet/os_in.h @@ -41,11 +41,9 @@ extern "C" #endif /* !ACE_LACKS_NETINET_IN_H */ -# if defined (ACE_HAS_PHARLAP_RT) -# define ACE_IPPROTO_TCP SOL_SOCKET -# elif !defined (ACE_IPPROTO_TCP) +# if !defined (ACE_IPPROTO_TCP) # define ACE_IPPROTO_TCP IPPROTO_TCP -# endif /* ACE_HAS_PHARLAP_RT */ +# endif /* !ACE_IPPROTO_TCP */ # if !defined (ACE_HAS_IP_MULTICAST) && defined (ACE_LACKS_IP_ADD_MEMBERSHIP) // Even if ACE_HAS_IP_MULTICAST is not defined, if IP_ADD_MEMBERSHIP diff --git a/ACE/ace/os_include/os_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_fcntl.h b/ACE/ace/os_include/os_fcntl.h index 542a72e9f674e..f8b3de5687148 100644 --- a/ACE/ace/os_include/os_fcntl.h +++ b/ACE/ace/os_include/os_fcntl.h @@ -36,17 +36,37 @@ extern "C" #endif /* __cplusplus */ #if defined (__BORLANDC__) +# if !defined (_O_CREAT) # define _O_CREAT O_CREAT -# define _O_EXCL O_EXCL +# endif +# if !defined (_O_EXCL) +# define _O_EXCL O_EXCL +# endif +# if !defined (_O_TRUNC) # define _O_TRUNC O_TRUNC +# endif +# if !defined (_O_TEMPORARY) // 0x0800 is used for O_APPEND. 0x08 looks free. # define _O_TEMPORARY 0x08 /* see fcntl.h */ -# define _O_RDWR O_RDWR +# endif +# if !defined (_O_RDWR) +# define _O_RDWR O_RDWR +# endif +# if !defined (_O_WRONLY) # define _O_WRONLY O_WRONLY +# endif +# if !defined (_O_RDONLY) # define _O_RDONLY O_RDONLY +# endif +# if !defined (_O_APPEND) # define _O_APPEND O_APPEND +# endif +# if !defined (_O_BINARY) # define _O_BINARY O_BINARY -# define _O_TEXT O_TEXT +# endif +# if !defined (_O_TEXT) +# define _O_TEXT O_TEXT +# endif #endif /* __BORLANDC__ */ // defined Win32 specific macros for UNIX platforms 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..189f29b9dbb5e 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 */ @@ -113,24 +127,19 @@ struct servent { # define EAI_OVERFLOW -12 /* Error result from getaddrinfo(): buffer overflow */ #endif -#if defined (ACE_HAS_STRUCT_NETDB_DATA) - typedef char ACE_HOSTENT_DATA[sizeof(struct hostent_data)]; - typedef char ACE_SERVENT_DATA[sizeof(struct servent_data)]; - typedef char ACE_PROTOENT_DATA[sizeof(struct protoent_data)]; -#else -# if !defined ACE_HOSTENT_DATA_SIZE -# define ACE_HOSTENT_DATA_SIZE (4*1024) -# endif /*ACE_HOSTENT_DATA_SIZE */ -# if !defined ACE_SERVENT_DATA_SIZE -# define ACE_SERVENT_DATA_SIZE (4*1024) -# endif /*ACE_SERVENT_DATA_SIZE */ -# if !defined ACE_PROTOENT_DATA_SIZE -# define ACE_PROTOENT_DATA_SIZE (2*1024) -# endif /*ACE_PROTOENT_DATA_SIZE */ - typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE]; - typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE]; - typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE]; -#endif /* ACE_HAS_STRUCT_NETDB_DATA */ +#if !defined ACE_HOSTENT_DATA_SIZE +# define ACE_HOSTENT_DATA_SIZE (4*1024) +#endif /*ACE_HOSTENT_DATA_SIZE */ +#if !defined ACE_SERVENT_DATA_SIZE +# define ACE_SERVENT_DATA_SIZE (4*1024) +#endif /*ACE_SERVENT_DATA_SIZE */ +#if !defined ACE_PROTOENT_DATA_SIZE +# define ACE_PROTOENT_DATA_SIZE (2*1024) +#endif /*ACE_PROTOENT_DATA_SIZE */ + +typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE]; +typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE]; +typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE]; # if !defined(MAXHOSTNAMELEN) # define MAXHOSTNAMELEN HOST_NAME_MAX diff --git a/ACE/ace/os_include/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_loadavg.h b/ACE/ace/os_include/sys/os_loadavg.h deleted file mode 100644 index 6437d7d92354a..0000000000000 --- a/ACE/ace/os_include/sys/os_loadavg.h +++ /dev/null @@ -1,29 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file os_loadavg.h - * - * loadavg functions - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef ACE_OS_INCLUDE_SYS_OS_LOADAVG_H -#define ACE_OS_INCLUDE_SYS_OS_LOADAVG_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_SYS_LOADAVG_H) -# include /**/ -#endif /* ACE_HAS_SYS_LOADAVG_H */ - -#include /**/ "ace/post.h" -#endif /* ACE_OS_INCLUDE_SYS_OS_LOADAVG_H */ diff --git a/ACE/ace/os_include/sys/os_mman.h b/ACE/ace/os_include/sys/os_mman.h index 2f98bf4b79893..8870bf22f5c4b 100644 --- a/ACE/ace/os_include/sys/os_mman.h +++ b/ACE/ace/os_include/sys/os_mman.h @@ -49,22 +49,25 @@ extern "C" # define MAP_FIXED 0 #elif defined (ACE_WIN32) // These two may be used for internal flags soon: -# define MAP_PRIVATE 1 -# define MAP_SHARED 2 -# define MAP_FIXED 4 +# if !defined (MAP_PRIVATE) +# define MAP_PRIVATE 1 +# endif +# if !defined (MAP_SHARED) +# define MAP_SHARED 2 +# endif +# if !defined (MAP_FIXED) +# define MAP_FIXED 4 +# endif // MMAP flags -# define PROT_READ PAGE_READONLY -# define PROT_WRITE PAGE_READWRITE -# define PROT_RDWR PAGE_READWRITE -/* If we can find suitable use for these flags, here they are: -PAGE_WRITECOPY -PAGE_EXECUTE -PAGE_EXECUTE_READ -PAGE_EXECUTE_READWRITE -PAGE_EXECUTE_WRITECOPY -PAGE_GUARD -PAGE_NOACCESS -PAGE_NOCACHE */ +# if !defined (PROT_READ) +# define PROT_READ PAGE_READONLY +# endif +# if !defined (PROT_WRITE) +# define PROT_WRITE PAGE_READWRITE +# endif +# if !defined (PROT_RDWR) +# define PROT_RDWR PAGE_READWRITE +# endif #endif /* !ACE_LACKS_SYS_MMAN_H && !ACE_WIN32*/ # if !defined (ACE_MAP_PRIVATE) @@ -81,9 +84,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 +100,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_pstat.h b/ACE/ace/os_include/sys/os_pstat.h deleted file mode 100644 index 377e83b2e1c94..0000000000000 --- a/ACE/ace/os_include/sys/os_pstat.h +++ /dev/null @@ -1,30 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file os_pstat.h - * - * pstat functions - * - * @author Johnny Willemsen - */ -//============================================================================= - -#ifndef ACE_OS_INCLUDE_SYS_OS_PSTAT_H -#define ACE_OS_INCLUDE_SYS_OS_PSTAT_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_SYS_PSTAT_H) -# include /**/ -# include /**/ -#endif /* ACE_HAS_SYS_PSTAT_H */ - -#include /**/ "ace/post.h" -#endif /* ACE_OS_INCLUDE_SYS_OS_PSTAT_H */ 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_select.h b/ACE/ace/os_include/sys/os_select.h index c9888613f5d92..957a3c808f303 100644 --- a/ACE/ace/os_include/sys/os_select.h +++ b/ACE/ace/os_include/sys/os_select.h @@ -40,15 +40,9 @@ extern "C" { #endif /* __cplusplus */ -#if defined (ACE_LACKS_FD_MASK) - typedef long fd_mask; -#endif /* ACE_LACKS_FD_MASK */ - #if defined (ACE_WIN32) // This will help until we figure out everything: # define NFDBITS 32 /* only used in unused functions... */ -#elif defined (ACE_LACKS_NFDBITS) -# define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */ #endif /* ACE_WIN32 */ #ifdef __cplusplus 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..8a568f53b2f1f 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; @@ -136,7 +119,7 @@ typedef DWORD nlink_t; #if defined (ACE_LACKS_PID_T) typedef int pid_t; -#endif /* ACE_WIN32 */ +#endif /* ACE_LACKS_PID_T */ # if !defined (ACE_INVALID_PID) # define ACE_INVALID_PID ((pid_t) -1) 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..bca4ff1dd549c 100644 --- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp +++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp @@ -7,10 +7,10 @@ #include "Locator_Request_Reply.inl" #endif -#include "ace/Auto_Ptr.h" #include "URL_Properties.h" #include "URL_Array_Helper.h" #include "URL_Locator.h" +#include int ACE_URL_Locator_Request::url_query (const int how, @@ -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"); @@ -265,13 +265,13 @@ ACE_URL_Locator_Request::dump () const if (this->id_.length () > 0) ACE_DEBUG ((LM_DEBUG, "Offer ID: %s\n", - ACE_Auto_Basic_Array_Ptr (this->id_.char_rep ()).get ())); + std::unique_ptr (this->id_.char_rep ()).get ())); else ACE_DEBUG ((LM_DEBUG, "Offer ID: \"\"\n")); if (this->url_.length () > 0) ACE_DEBUG ((LM_DEBUG, "URL: %s\n", - ACE_Auto_Basic_Array_Ptr (this->url_.char_rep ()).get ())); + std::unique_ptr (this->url_.char_rep ()).get ())); else ACE_DEBUG ((LM_DEBUG, "URL: \"\"\n")); @@ -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.cpp b/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp index c571f2a5f4f95..8c1ab1a7444a2 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp +++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp @@ -7,8 +7,8 @@ #include "URL_Properties.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Auto_Ptr.h" #include "URL_Array_Helper.h" +#include size_t ACE_WString_Helper::encode (void *buf, const ACE_WString &wstr) @@ -63,13 +63,13 @@ ACE_URL_Property::dump () const if (this->name_.length () > 0) ACE_DEBUG ((LM_DEBUG, "\n name_: \"%s\"\n", - ACE_Auto_Basic_Array_Ptr (this->name_.char_rep ()).get ())); + std::unique_ptr (this->name_.char_rep ()).get ())); else ACE_DEBUG ((LM_DEBUG, "\n name_: \"\"\n")); if (this->value_.length () > 0) ACE_DEBUG ((LM_DEBUG, " value_: \"%s\"\n", - ACE_Auto_Basic_Array_Ptr (this->value_.char_rep ()).get ())); + std::unique_ptr (this->value_.char_rep ()).get ())); else ACE_DEBUG ((LM_DEBUG, " value_: \"\"\n")); @@ -122,7 +122,7 @@ ACE_URL_Offer::dump () const if (this->url_.length () > 0) ACE_DEBUG ((LM_DEBUG, "\n url_: \"%s\"\n", - ACE_Auto_Basic_Array_Ptr (this->url_.char_rep ()).get ())); + std::unique_ptr (this->url_.char_rep ()).get ())); else ACE_DEBUG ((LM_DEBUG, "\n url_: \"\"\n")); 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 a38ab3c437a8f..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,63 +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 - -#elif defined (IRIX) - -#define FILE_UNIX -#undef FILE_STDIO -#undef DAEMON_UNIX_FORK -#undef DAEMON_UNIX_POOL -#define DAEMON_UNIX_MOBRULE -#define DLL_CAPABLE -#define DLL_DLOPEN -#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 -#define SEM_FLOCK -#define ZERO(ptr,len) memset(ptr,0,len) - #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/nsapi-send.c b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-send.c index 3bb5a41c1e5ee..a3cac43dc81d0 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-send.c +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-send.c @@ -72,11 +72,7 @@ int nsapi_send(pblock *pb, Session *sn, Request *rq) maxindex = sizeof(HEADERS) + filesize; for (index=sizeof(HEADERS); index < (maxindex); index++) /* generate random characters from A-Z */ -#ifdef IRIX - buffer[index] = rand_r() % 26 + 63; -#else buffer[index] = rand() %26 + 63; -#endif /* Send the output */ if (net_write(sn->csd, buffer, sizeof(HEADERS)-1+filesize, 0) == IO_ERROR) 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..4fdd569027032 100644 --- a/ACE/apps/JAWS/server/HTTP_Server.cpp +++ b/ACE/apps/JAWS/server/HTTP_Server.cpp @@ -8,10 +8,10 @@ #include "ace/LOCK_SOCK_Acceptor.h" #include "ace/Proactor.h" #include "ace/Signal.h" -#include "ace/Auto_Ptr.h" #include "JAWS_IO.h" #include "HTTP_Server.h" +#include // class is overkill class JAWS @@ -154,7 +154,7 @@ HTTP_Server::init (int argc, ACE_TCHAR *argv[]) //NOTE: At this point f better not be a NULL pointer, //so please do not change the ACE_NEW_RETURN macros unless //you know what you are doing - ACE_Auto_Ptr factory (f); + std::unique_ptr factory (f); // Choose what concurrency strategy to run. switch (this->strategy_) @@ -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..9699073850bd0 100644 --- a/ACE/apps/JAWS/server/JAWS_IO.cpp +++ b/ACE/apps/JAWS/server/JAWS_IO.cpp @@ -11,15 +11,15 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_stat.h" -#include "ace/Auto_Ptr.h" #include "ace/Basic_Types.h" +#include -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_); } @@ -508,7 +508,7 @@ JAWS_Synch_IO_No_Cache::transmit_file (const char *filename, } char* f = new char[size]; - ACE_Auto_Basic_Array_Ptr file (f); + std::unique_ptr file (f); ACE_OS::read_n (handle, f, size); 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/README b/ACE/apps/drwho/README index 1976a4fc2b8bd..5ebc2a9bf2a58 100644 --- a/ACE/apps/drwho/README +++ b/ACE/apps/drwho/README @@ -115,7 +115,7 @@ or 4802 ? 0:07 mwm % foreach host (`drwho -r -l -w schmidt`) ? echo $host -? rsh $host w | egrep schmidt +? rsh $host w | grep -E schmidt ? end ---------------------------------------- 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..28e82b6447eac 100644 --- a/ACE/apps/gperf/src/Key_List.cpp +++ b/ACE/apps/gperf/src/Key_List.cpp @@ -24,10 +24,10 @@ #include "Key_List.h" #include "Hash_Table.h" #include "ace/Read_Buffer.h" -#include "ace/Auto_Ptr.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" +#include /// Default type for generated code. const char *const Key_List::default_array_type = "char *"; @@ -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; @@ -503,9 +501,8 @@ Key_List::reorder (void) // Outputs the maximum and minimum hash values. Since the list is // already sorted by hash value all we need to do is find the final // item! - void -Key_List::output_min_max (void) +Key_List::output_min_max () { List_Node *temp = 0; for (temp = head; temp->next; temp = temp->next) @@ -559,7 +556,7 @@ Key_List::output_switch (int use_keyword_table) output_keyword_table (); } - ACE_Auto_Basic_Array_Ptr safe_comp_buffer; + std::unique_ptr safe_comp_buffer; char * comp_buffer; List_Node *curr = head; @@ -687,7 +684,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 +769,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 +788,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 +805,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 +903,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 +995,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 +1083,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; @@ -1151,7 +1144,7 @@ Key_List::output_hash_function (void) // Generate the asso_values table. ACE_OS::printf (" static %sunsigned %s asso_values[] =\n {", - option[CONSTANT] ? "const " : "", + option[CONSTANT] ? "constexpr " : "", max_hash_value < ((int) UCHAR_MAX) ? "char" : (max_hash_value < ((int) USHRT_MAX) ? "short" : "int")); #if ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE @@ -1249,7 +1242,6 @@ Key_List::output_hash_function (void) do { - while (--count > key_pos) ACE_OS::printf (" case %d:\n", count); @@ -1310,7 +1302,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) { @@ -1450,7 +1442,7 @@ Key_List::output_lookup_array (void) const char *indent = option[GLOBAL] ? "" : " "; - ACE_OS::printf ("%sstatic %ssigned %s lookup[] =\n%s%s{\n%s", indent, option[CONSTANT] ? "const " : "", + ACE_OS::printf ("%sstatic %ssigned %s lookup[] =\n%s%s{\n%s", indent, option[CONSTANT] ? "constexpr " : "", max <= SCHAR_MAX ? "char" : (max <= SHRT_MAX ? "short" : "int"), indent, indent, option[DEBUGGING] ? "" : " "); @@ -1490,7 +1482,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 +1570,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 +1633,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 +1793,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 +1804,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 +1856,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 +1913,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 +1930,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 +1938,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..e679193cea00d 100644 --- a/ACE/apps/gperf/src/Options.h +++ b/ACE/apps/gperf/src/Options.h @@ -71,12 +71,6 @@ enum Option_Type // g++ doesn't seem to do the right thing with them at the // moment... ;-( -// PharLap ETS defines EOS as well... so if building for ETS, clear out -// their EOS. -#if defined (ACE_HAS_PHARLAP) && defined (EOS) -# undef EOS -#endif /* ACE_HAS_PHARLAP && EOS */ - enum { MAX_KEY_POS = 128 - 1, /**< Max size of each word's key set. */ @@ -100,29 +94,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 +174,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/mkcsregdb/mkcsregdb.cpp b/ACE/apps/mkcsregdb/mkcsregdb.cpp index bb6c427d0d268..afc194e3eb90e 100644 --- a/ACE/apps/mkcsregdb/mkcsregdb.cpp +++ b/ACE/apps/mkcsregdb/mkcsregdb.cpp @@ -248,7 +248,6 @@ csdb_generator::init_output (const char *srcfile) -1); outf_ = ACE_OS::fdopen (fd, "w"); - ACE_OS::fprintf (outf_,"// $ID: $\n"); ACE_OS::fprintf (outf_,"/*\n * Codeset registry DB, generated %s * source: %s\n", ACE_OS::asctime (ACE_OS::localtime(&now)), srcfile); @@ -258,7 +257,7 @@ csdb_generator::init_output (const char *srcfile) ACE_OS::fprintf (outf_," * a text file containing all the desired codeset information, build and run\n"); ACE_OS::fprintf (outf_," * mkcsregdb. The source is in $ACE_ROOT/apps/mkcsregdb. It will generate a new\n"); ACE_OS::fprintf (outf_," * copy of this file, with the registry_db_ array properly initialized.\n */\n"); - ACE_OS::fprintf (outf_,"\n#include \"ace/Codeset_Registry.h\"\n\n%s\n%s\n{\n", + ACE_OS::fprintf (outf_,"\n#include \"ace/Codeset_Registry.h\"\n\nACE_BEGIN_VERSIONED_NAMESPACE_DECL\n\n%s\n%s\n{\n", "ACE_Codeset_Registry::registry_entry const", "ACE_Codeset_Registry::registry_db_[] ="); return 0; @@ -302,7 +301,7 @@ csdb_generator::fini_output (const char *tgt) ACE_OS::sprintf (target,"%s/ace/%s",ace_src_,tgt); if (count_ == 0) write_dummy_entry(); - ACE_OS::fprintf (outf_,"\n};\n\nsize_t const ACE_Codeset_Registry::num_registry_entries_ = %d;\n\n",count_); + ACE_OS::fprintf (outf_,"\n};\n\nsize_t const ACE_Codeset_Registry::num_registry_entries_ = %d;\n\nACE_END_VERSIONED_NAMESPACE_DECL\n",count_); ACE_OS::fclose (outf_); ACE_stat buf; if (ACE_OS::stat (target,&buf) == 0) 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 527828a87395b..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) @@ -731,6 +728,7 @@ endif <%if(postbuild)%> all: __postbuild__ +.PHONY: __postbuild__ <%if(exename)%> __postbuild__: $(VBIN) $(INSTALL) <%else%> diff --git a/ACE/bin/PerlACE/Process_Unix.pm b/ACE/bin/PerlACE/Process_Unix.pm index 66ca6f94c4307..435982c4bb8e8 100644 --- a/ACE/bin/PerlACE/Process_Unix.pm +++ b/ACE/bin/PerlACE/Process_Unix.pm @@ -565,6 +565,197 @@ sub Spawn () return 0; } +sub print_stacktrace_linux +{ + my $self = shift; + + # Get the core file pattern + my $core_pattern_file = "/proc/sys/kernel/core_pattern"; + if (!(-e $core_pattern_file)) { + print STDERR "WARNING: print_stacktrace_linux: Core file pattern $core_pattern_file does not exist\n"; + return; + } + + my $pattern_fh; + if (!open ($pattern_fh, "<", "$core_pattern_file")) { + print STDERR "WARNING: print_stacktrace_linux: Could not open $core_pattern_file: $!\n"; + return; + } + + my $line = <$pattern_fh>; + chomp ($line); + close ($pattern_fh); + + if ($line =~ /\|/) { + print STDERR "WARNING: print_stacktrace_linux: Core files are handled by a separate service. Core pattern: $line\n"; + return; + } + + # Find the core file from the pattern + my $path = "."; + my $pattern; + if ($line =~ /^(.*)\/([^\/]*)$/) { + $path = $1; + $pattern = $2; + } + else { + $pattern = $line; + } + + # If /proc/sys/kernel/core_uses_pid is non-zero and the pattern + # doesn't have %p, then .PID is appended to the core file name. + my $uses_pid_file = "/proc/sys/kernel/core_uses_pid"; + my $uses_pid = 0; + if (!open (my $uses_pid_fh, "<", "$uses_pid_file")) { + print STDERR "WARNING: print_stacktrace_linux: Could not open $uses_pid_file: $!\n"; + } + else { + $line = <$uses_pid_fh>; + chomp ($line); + if ($line ne "" || $line ne "\n") { + $uses_pid = $line; + } + close ($uses_pid_fh); + } + + my $exec_path = $self->Executable (); + + my $exec_name_idx = index ($pattern, "%e"); + if ($exec_name_idx != -1) { + my $exec_name = File::Basename::basename ($exec_path); + # The core file name contains at most 15 characters from the executable name + # (https://man7.org/linux/man-pages/man5/core.5.html). + $exec_name = substr ($exec_name, 0, 15); + substr ($pattern, $exec_name_idx, 2) = $exec_name; + } + + my $hname_idx = index ($pattern, "%h"); + if ($hname_idx != -1) { + substr ($pattern, $hname_idx, 2) = Sys::Hostname::hostname (); + } + + my $pid_idx = index ($pattern, "%p"); + if ($pid_idx != -1) { + substr ($pattern, $pid_idx, 2) = $self->{PROCESS}; + } + elsif ($uses_pid != 0) { + $pattern = $pattern . "." . $self->{PROCESS}; + } + + my $timestamp_idx = index ($pattern, "%t"); + my $core_file_path; + if ($timestamp_idx != -1) { + my $prefix = substr ($pattern, 0, $timestamp_idx); + my $suffix_len = length ($pattern) - $timestamp_idx - 2; + my $suffix = substr ($pattern, $timestamp_idx + 2, $suffix_len); + + # Get the core file with latest timestamp. + my $dh; + if (!opendir ($dh, $path)) { + print STDERR "WARNING: print_stacktrace_linux: Couldn't opendir $path: $!\n"; + return; + } + my @files = grep (/$prefix[0-9]+$suffix/, readdir ($dh)); + my $latest_timestamp; + my $chosen_core_file; + foreach my $file (@files) { + my $timestamp_len = length ($file) - $timestamp_idx - $suffix_len; + my $timestamp = substr ($file, $timestamp_idx, $timestamp_len); + if (!defined $latest_timestamp) { + $latest_timestamp = $timestamp; + $chosen_core_file = $file; + } + elsif ($latest_timestamp < $timestamp) { + $latest_timestamp = $timestamp; + $chosen_core_file = $file; + } + } + closedir ($dh); + if (defined $chosen_core_file) { + $core_file_path = $path . "/" . $chosen_core_file; + } + else { + print STDERR "WARNING: print_stacktrace_linux: Could not determine a core file with timestamp\n"; + return; + } + } + else { + $core_file_path = $path . "/" . $pattern; + } + + my $debugger = "gdb"; + if ($ENV{ACE_TEST_DEBUGGER}) { + $debugger = $ENV{ACE_TEST_DEBUGGER}; + } + $self->print_stacktrace_common($exec_path, $core_file_path, $debugger); +} + +sub print_stacktrace_darwin +{ + my $self = shift; + my $core_file_path = "/cores/core." . $self->{PROCESS}; + + my $debugger = "lldb"; + if ($ENV{ACE_TEST_DEBUGGER}) { + $debugger = $ENV{ACE_TEST_DEBUGGER}; + } + $self->print_stacktrace_common($self->Executable (), $core_file_path, $debugger); +} + +sub print_stacktrace_common +{ + my $self = shift; + my $exec_path = shift; + my $core_file_path = shift; + my $preferred_db = shift; + + if (!(-e $core_file_path)) { + print STDERR "WARNING: print_stacktrace_common: Core file $core_file_path does not exist\n"; + return; + } + if (!defined $preferred_db) { + $preferred_db = "gdb"; + } + my $preferred_cmd; + my $secondary_db; + my $secondary_cmd; + my $gdb_args = " $exec_path -c $core_file_path -ex bt -ex quit"; + my $lldb_args = " $exec_path -c $core_file_path -o bt -o quit"; + + if ($preferred_db =~ /gdb/) { + $preferred_cmd = $preferred_db . $gdb_args; + $secondary_db = "lldb"; + $secondary_cmd = $secondary_db . $lldb_args; + } + elsif ($preferred_db =~ /lldb/) { + $preferred_cmd = $preferred_db . $lldb_args; + $secondary_db = "gdb"; + $secondary_cmd = $secondary_db . $gdb_args; + } + else { + print STDERR "ERROR: print_stacktrace_common: Unknown debugger ($preferred_db) requested\n"; + return; + } + + my $stack_trace; + if (system ("$preferred_db --version") != -1) { + $stack_trace = `$preferred_cmd`; + } + elsif (system ("$secondary_db --version") != -1) { + print STDERR "WARNING: print_stacktrace_common: Failed printing stack trace with $preferred_db. Trying $secondary_db...\n"; + $stack_trace = `$secondary_cmd`; + } + else { + print STDERR "WARNING: print_stacktrace_common: Failed printing stack trace with both $preferred_db and $secondary_db\n"; + } + + if (defined $stack_trace) { + print STDERR "\n======= Begin stack trace of $exec_path from core file $core_file_path =======\n"; + print STDERR $stack_trace; + print STDERR "======= End stack trace =======\n"; + } +} + # The second argument is an optional output argument that, if present, # will be passed to check_return_value function to get the signal number # the process has received, if any, and/or whether there was a core dump. @@ -578,35 +769,63 @@ sub WaitKill ($;$) return 0; } - my $status = $self->TimedWait ($timeout, $opts); + my $has_core; + my %my_opts = (dump_ref => \$has_core); + + if (defined $opts) { + if (defined $opts->{self_crash}) { + $my_opts{self_crash} = $opts->{self_crash}; + } + if (defined $opts->{signal_ref}) { + $my_opts{signal_ref} = $opts->{signal_ref}; + } + } + + my $status = $self->TimedWait ($timeout, \%my_opts); if ($status == -1) { print STDERR "ERROR: $self->{EXECUTABLE} timedout\n"; if ($ENV{ACE_TEST_LOG_STUCK_STACKS}) { - my $debugger = ($^O eq 'darwin') ? 'lldb' : 'gdb'; - my $commands = ($^O eq 'darwin') ? "-o 'bt all'" - : "-ex 'set pagination off' -ex 'thread apply all backtrace'"; + my $debugger = $ENV{ACE_TEST_DEBUGGER}; + if (!defined $debugger) { + $debugger = ($^O eq 'darwin') ? 'lldb' : 'gdb'; + } + + my $commands = ($debugger eq 'gdb') ? + "-ex 'set pagination off' -ex 'thread apply all backtrace'" : "-o 'bt all'"; + print STDERR "\n======= Begin stuck stacks =======\n"; system "$debugger --batch -p $self->{PROCESS} $commands"; + print STDERR "======= End stuck stacks =======\n"; } if ($ENV{ACE_TEST_GENERATE_CORE_FILE}) { system ($^O ne 'darwin') ? "gcore $self->{PROCESS}" - : "lldb -b -p $self->{PROCESS} -o " . - "'process save-core core.$self->{PROCESS}'"; + : "lldb -b -p $self->{PROCESS} -o " . + "'process save-core core.$self->{PROCESS}'"; } $self->Kill (); } + elsif ($status == 255 && $has_core && !$ENV{ACE_TEST_DISABLE_STACK_TRACE}) { + if ($^O eq 'linux') { + $self->print_stacktrace_linux (); + } + elsif ($^O eq 'darwin') { + $self->print_stacktrace_darwin (); + } + } + + if (defined $opts && defined $opts->{dump_ref}) { + ${$opts->{dump_ref}} = $has_core; + } $self->{RUNNING} = 0; return $status; } - # Do a Spawn and immediately WaitKill - sub SpawnWaitKill ($;$) { my $self = shift; 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 a36561af548c5..02fc5f13f4a5a 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.6&/'` + d=`echo $i | sed 's/\.[tz][ai][rp]/-7.1.3&/'` 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 20fb0cf05198a..5600d0d4e9015 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_01_20; else olddate=$3; fi +if test -z $3; then olddate=2023_10_30; else olddate=$3; fi if test -z $ACE_ROOT; then ACE_ROOT=..; fi if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi # diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index f75c1b6d32541..e6b857054b4bf 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -906,7 +906,7 @@ () } if ($disable == 0) { if(/(\(|\)|\s+|=)NULL(\)|\s+|\;|\,)/ and $` !~ /\/\// and $` !~ /\/\*/ and $` !~ /\*\*+/ and $` !~ /\s+\*+\s+/) { - print_error ("$file:$.: NULL found"); + print_error ("$file:$.: NULL found, use nullptr"); } } } diff --git a/ACE/bin/install_proj.mk b/ACE/bin/install_proj.mk new file mode 100644 index 0000000000000..7884d811be2a6 --- /dev/null +++ b/ACE/bin/install_proj.mk @@ -0,0 +1,15 @@ +include $(PROJECT_MAKEFILE) + +POTENTIAL_FILES = $(BIN_UNCHECKED) $(SHLIB_UNCHECKED) $(LIB_UNCHECKED) +ACTUAL_FILES := $(wildcard $(POTENTIAL_FILES)) + +.PHONY: checked-install +ifeq ($(ACTUAL_FILES),) +checked-install: + @echo Skipping $(PROJECT_MAKEFILE:GNUmakefile.%=%), not built +else +.PHONY: checked-install-message +checked-install-message: + @echo Installing $(ACTUAL_FILES) +checked-install: checked-install-message install +endif diff --git a/ACE/bin/install_proj.sh b/ACE/bin/install_proj.sh new file mode 100755 index 0000000000000..468dfe10f76bb --- /dev/null +++ b/ACE/bin/install_proj.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +# ACE's "make install" for an MPC-generated workspace will build all targets that aren't yet built +# This script looks for projects that have been built and installs just those projects +this_dir=$(realpath $(dirname $0)) +for makefile in $(find . -type f -name 'GNUmakefile.*'); do + if grep -q 'GNU Makefile' $makefile; then + echo Checking $makefile + cd $(dirname $makefile) + make -f $this_dir/install_proj.mk PROJECT_MAKEFILE=$(basename $makefile) checked-install "$@" + cd - >/dev/null + fi +done diff --git a/ACE/bin/main2TMAIN.pl b/ACE/bin/main2TMAIN.pl index cf5d26627cb22..f4378668e0f49 100755 --- a/ACE/bin/main2TMAIN.pl +++ b/ACE/bin/main2TMAIN.pl @@ -6,7 +6,7 @@ # You may want to run the "find" command with this script, which maybe # something like this: # -# find . -type f \( -name "*.C" -o -name "*.cc" -o -name "*.c" -o -name "*.cpp" \) -print | xargs $ACE_ROOT/bin/auto_ptr.perl +# find . -type f \( -name "*.C" -o -name "*.cc" -o -name "*.c" -o -name "*.cpp" \) -print | xargs $ACE_ROOT/bin/main2TMAIN.pl # The first three lines above let this script run without specifying the # full path to perl, as long as it is in the user's PATH. diff --git a/ACE/bin/update_gitignore.sh b/ACE/bin/update_gitignore.sh new file mode 100755 index 0000000000000..d23b4e5bf9831 --- /dev/null +++ b/ACE/bin/update_gitignore.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + +cmd="$1" +if [[ "$cmd" == "help" ]] || [[ "$cmd" != "run" && "$cmd" != "dry-run" ]] +then + if [[ "$cmd" != "help" ]] + then + echo "Error: Unrecognized command '$0 $1'" + echo "" + fi + + echo "Usage:" + echo " update_gitignore.sh run" + echo " update_gitignore.sh dry-run" + echo "" + echo "This command finds all untracked and un-git-add-ed files in the repository and adds each file name to " + echo "a '.gitignore' file in the same directory. If a '.gitignore' file does not exist, one will be created. " + echo "Otherwise, the existing '.gitignore' file will be appended to. The 'dry-run' command enables you to " + echo "see a list of all detected file names that will be added to '.gitignore' files without making any " + echo "changes." + echo "" + echo "If the 'run' command does its job properly, running 'dry-run' immediately after should display no " + echo "planned actions." + + if [[ "$cmd" == "help" ]] + then + exit 0 + fi + + exit 1 +fi + +export IFS=$'\n'; + +for line in $(git status --short --untracked-files) +do + if [[ $line == '??'* ]] + then + file="${line:3}" + d="$(dirname "${file}")" + f="$(basename "${file}")" + + if [[ "$cmd" == "run" ]] + then + echo "Ignoring ${f} in ${d}/.gitignore" + echo "${f}" >> "${d}/.gitignore" + else + echo "Will ignore ${f} in ${d}/.gitignore" + fi + fi +done 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/changelog b/ACE/debian/changelog index c1286aaa8b97a..52de558dc5367 100644 --- a/ACE/debian/changelog +++ b/ACE/debian/changelog @@ -1,3 +1,57 @@ +ace (7.1.2+dfsg-2) unstable; urgency=medium + + * Team upload. + * Upload to unstable. + + -- Sudip Mukherjee Wed, 06 Dec 2023 17:28:25 +0000 + +ace (7.1.2+dfsg-1) experimental; urgency=medium + + * Team upload. + + [ Debian Janitor ] + * Set upstream metadata fields: Repository-Browse. + * Fix day-of-week for changelog entries 5.4.7-4, 5.4-3. + + [ Sudip Mukherjee ] + * Update to upstream v7.1.2 + - Sync debian/* files with upstream. + - Use common changelog, MPC/ChangeLog has been removed by upstream. + * Update Standards-Version to 4.6.2 + * Add linitan overrides. + + -- Sudip Mukherjee Fri, 01 Dec 2023 20:51:44 +0000 + +ace (7.0.8+dfsg-2) unstable; urgency=medium + + * Team upload. + * Upload to unstable. + + -- Sudip Mukherjee Fri, 02 Sep 2022 10:31:52 +0100 + +ace (7.0.8+dfsg-1) experimental; urgency=medium + + * Team upload. + * Update to upstream v7.0.8 + - Sync debian/* with upstream. + + -- Sudip Mukherjee Fri, 26 Aug 2022 18:12:01 +0100 + +ace (7.0.7+dfsg-2) unstable; urgency=medium + + * Team upload. + * Upload to unstable. + + -- Sudip Mukherjee Sun, 12 Jun 2022 01:06:07 +0100 + +ace (7.0.7+dfsg-1) experimental; urgency=medium + + * Team upload. + * Update to upstream v7.0.7 + - Sync debian/* with upstream. + + -- Sudip Mukherjee Sun, 29 May 2022 22:45:34 +0100 + ace (7.0.6+dfsg-2) unstable; urgency=medium * Team upload. @@ -908,7 +962,7 @@ ace (5.4.7-4) unstable; urgency=medium Update: Even on i386, cpp-4.0 produces Internal Compiler Errors(ICEs). For this reason, cpp-3.4 will be used instead (but with gcc/g++ 4.0. - -- Konstantinos Margaritis Mon, 4 Oct 2005 03:21:20 +0300 + -- Konstantinos Margaritis Tue, 04 Oct 2005 03:21:20 +0300 ace (5.4.7-3) unstable; urgency=low @@ -1068,7 +1122,7 @@ ace (5.4-3) unstable; urgency=low until 5.4.1 is released (mid-march). Closes: #233890 - -- Konstantinos Margaritis Wed, 28 Feb 2004 15:53:30 +0200 + -- Konstantinos Margaritis Sat, 28 Feb 2004 15:53:30 +0200 ace (5.4-2) unstable; urgency=low diff --git a/ACE/debian/control b/ACE/debian/control index 4e8c73d7a7c6a..e7dd2a1e359e3 100644 --- a/ACE/debian/control +++ b/ACE/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian ACE maintainers Uploaders: Thomas Girard , Johnny Willemsen Build-Depends: debhelper-compat (=13), libssl-dev, libxt-dev (>= 4.3.0), libfltk1.3-dev, tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev Build-Depends-Indep: doxygen, graphviz -Standards-Version: 4.6.0.1 +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/debian/ace.git Vcs-Browser: https://salsa.debian.org/debian/ace Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html @@ -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.6 +Package: libace-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -45,7 +45,7 @@ Description: C++ network programming framework Package: libace-dev Architecture: any Section: libdevel -Depends: libace-7.0.6 (= ${binary:Version}), ${misc:Depends} +Depends: libace-7.1.2 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, pkg-config Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework - development files @@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation This package contains the ACE overview documentation, tutorials, examples, and information regarding upstream development. -Package: libace-ssl-7.0.6 +Package: libace-ssl-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -73,12 +73,12 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. -Package: libace-rmcast-7.0.6 +Package: libace-rmcast-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -92,12 +92,12 @@ Description: ACE reliable multicast library Package: libace-rmcast-dev Architecture: any Section: libdevel -Depends: libace-rmcast-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE reliable multicast library - development files This package contains the header files and static library for the ACE reliable multicast library. -Package: libace-tmcast-7.0.6 +Package: libace-tmcast-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -111,12 +111,12 @@ Description: ACE transactional multicast library Package: libace-tmcast-dev Architecture: any Section: libdevel -Depends: libace-tmcast-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE transactional multicast library - development files This package contains the header files and static library for the ACE transactional multicast library. -Package: libace-htbp-7.0.6 +Package: libace-htbp-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library Package: libace-htbp-dev Architecture: any Section: libdevel -Depends: libace-htbp-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE protocol over HTTP tunneling library - development files This package contains the header files and static library for the ACE HTBP library. -Package: libace-inet-7.0.6 +Package: libace-inet-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -146,15 +146,15 @@ Description: ACE Inet protocol library Package: libace-inet-dev Architecture: any Section: libdevel -Depends: libace-inet-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE Inet protocol library - development files This package contains the header files and static library for the ACE Inet protocol library. -Package: libace-inet-ssl-7.0.6 +Package: libace-inet-ssl-7.1.2 Architecture: any Section: libs -Depends: libace-inet-7.0.6, libace-ssl-7.0.6, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-7.1.2, libace-ssl-7.1.2, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library Package: libace-inet-ssl-dev Architecture: any Section: libdevel -Depends: libace-inet-ssl-7.0.6 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-7.1.2 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SSL-enabled Inet protocol library - development files This package contains the header files and static library for the ACE SSL-enabled Inet protocol library. @@ -180,7 +180,7 @@ Description: ACE perfect hash function generator basically the same options and functionality. ace_gperf simply takes advantage of some of the features provided by the ACE library. -Package: libacexml-7.0.6 +Package: libacexml-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -196,12 +196,12 @@ Package: libacexml-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libacexml-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library - development files This package contains the header files and static library for the ACE XML parsing library. -Package: libace-xml-utils-7.0.6 +Package: libace-xml-utils-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -215,12 +215,12 @@ Package: libace-xml-utils-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libace-xml-utils-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev Description: ACE XML utility classes and methods - development files This package contains the header files and static library for the ACE XML Utils library -Package: libkokyu-7.0.6 +Package: libkokyu-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library Package: libkokyu-dev Architecture: any Section: libdevel -Depends: libkokyu-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE scheduling and dispatching library - development files This package contains the header files and static library for the ACE scheduling and dispatching library. -Package: libace-xtreactor-7.0.6 +Package: libace-xtreactor-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. -Package: libace-tkreactor-7.0.6 +Package: libace-tkreactor-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} Description: ACE-GUI reactor integration for Tk - development files This package contains header files and static library for the ACE-Tk reactor integration. -Package: libace-flreactor-7.0.6 +Package: libace-flreactor-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} +Depends: libace-flreactor-7.1.2 (= ${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.6 +Package: libace-foxreactor-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX Package: libace-foxreactor-dev Architecture: any Section: libdevel -Depends: libace-foxreactor-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FOX - development files This package contains header files and static library for the ACE-FOX reactor integration. @@ -343,7 +343,7 @@ Description: ACE network service implementations files to link the various ACE network services together, either statically or dynamically, and form complete server programs. -Package: libnetsvcs-7.0.6 +Package: libnetsvcs-7.1.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries Package: libnetsvcs-dev Architecture: any Section: libdevel -Depends: libnetsvcs-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE network service implementations - development files ACE network services provide reusable components for common distributed system tasks such as logging, naming, locking, and time diff --git a/ACE/debian/libace-7.1.2.lintian-overrides b/ACE/debian/libace-7.1.2.lintian-overrides new file mode 100644 index 0000000000000..aaf5ba95a9069 --- /dev/null +++ b/ACE/debian/libace-7.1.2.lintian-overrides @@ -0,0 +1 @@ +library-not-linked-against-libc diff --git a/ACE/debian/libacexml-7.1.2.lintian-overrides b/ACE/debian/libacexml-7.1.2.lintian-overrides new file mode 100644 index 0000000000000..aaf5ba95a9069 --- /dev/null +++ b/ACE/debian/libacexml-7.1.2.lintian-overrides @@ -0,0 +1 @@ +library-not-linked-against-libc diff --git a/ACE/debian/mpc-ace.install b/ACE/debian/mpc-ace.install index 81257babeb9e1..5cb9ee2781975 100644 --- a/ACE/debian/mpc-ace.install +++ b/ACE/debian/mpc-ace.install @@ -4,5 +4,4 @@ usr/share/ace/bin/MakeProjectCreator usr/lib/ace/bin ../../MPC/modules usr/lib/ace/MPC ../../MPC/templates usr/lib/ace/MPC ../../MPC/*.pl usr/lib/ace/MPC -../../MPC/ChangeLog usr/lib/ace/MPC ../../bin/PerlACE/*.pm usr/lib/ace/bin/PerlACE diff --git a/ACE/debian/rules b/ACE/debian/rules index 14f7723d0439a..a1da33ba2c31a 100755 --- a/ACE/debian/rules +++ b/ACE/debian/rules @@ -100,12 +100,6 @@ override_dh_auto_clean: override_dh_compress: dh_compress -Xexamples -# ACE+TAO has different changelogs. Use the right one in every package. -override_dh_installchangelogs: - dh_installchangelogs -pmpc-ace MPC/ChangeLog - dh_installchangelogs --remaining-packages \ - ChangeLogs/ACE-$(ACE_MAJOR_VERSION)_$(ACE_MINOR_VERSION)_$(ACE_MICRO_VERSION) - override_dh_fixperms: ifneq (,$(filter libace-doc, $(shell dh_listpackages))) find debian -name '*.pl' | xargs -r sed -i -e '1i#!/usr/bin/perl' diff --git a/ACE/debian/source/lintian-overrides b/ACE/debian/source/lintian-overrides new file mode 100644 index 0000000000000..7920a7d6bb0f0 --- /dev/null +++ b/ACE/debian/source/lintian-overrides @@ -0,0 +1,2 @@ +# line length is 664 characters (>512) +ace source: source-is-missing [docs/bczar/bczar.html] diff --git a/ACE/debian/upstream/metadata b/ACE/debian/upstream/metadata new file mode 100644 index 0000000000000..32655d666e2b4 --- /dev/null +++ b/ACE/debian/upstream/metadata @@ -0,0 +1,2 @@ +--- +Repository-Browse: https://github.com/DOCGroup/ACE_TAO diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html index 9dcb91359cecd..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 */

      @@ -765,8 +751,7 @@

      ACE Software Development Guidelines

    • It's a good idea to specify the include path (with -I) to include any directory which contains files with template - definitions. The Compaq Tru64 cxx -ptv compiler option - may help diagnose missing template instantiation problems.

      + definitions.

    • When referring to member variables and functions, use this->member. This makes it clear to the @@ -810,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. @@ -1189,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.

      @@ -1206,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 f3b8283f882e4..a10c35dd4cfef 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -53,15 +53,13 @@

    Obtaining ACE, TAO, CIAO, and DAnCE

    After downloading a distribution we strongly advice to subscribe at least to -one of the announce -mailing lists to stay informed about new releases and -important updates.

    +release notifications on github to stay informed about new releases.

    Commercial -support and pre-built versions of ACE, TAO, CIAO, and DAnCE are available -from a number of companies.

    +HREF="https://github.com/DOCGroup/ACE_TAO/wiki/ACE-and-TAO-Commercial-support">Commercial +support for ACE, TAO, CIAO, and DAnCE is available +from a number of companies.

    @@ -92,160 +90,160 @@

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

  • 4. TAO_UIPMC_Protocol_Factory

    This factory is located in the TAO_PortableGroup library and - is used with the DIOP and MIOP protocols managing the UDP connectionless - sockets (normally one-way calls only) instead of the standard IIOP TCP/IP - two-way connection based sockets. It accepts the options shown below. - (Any options required should be given + implements the MIOP protocol. It uses the + TAO_MIOP_Resource_Factory to manage UDP connection options + shared with the TAO_DIOP_Protocol_Factory. It accepts its own un-shared + options shown below. (Any options required should be given to the TAO_UIPMC_Protocol_Factory between the two double-quotes at the end of the line as a space separated list; however none are required as all options take default values if not specified.) This factory can be loaded @@ -1910,15 +1909,15 @@

    4. TAO_UIPMC_Protocol_Factory

    -

    5. MIOP_Strategy_Factory

    +

    5. TAO_MIOP_Resource_Factory

    This factory is located in the TAO_PortableGroup library and - uses the TAO_UIPMC_Protocol_Factory (see above) to - manage its UDP sockets, you should also look at that factories configuration - options. The MIOP factory accepts it own options detailed below which - should be specified between the two double-quotes shown here as a space - separated list; however none are required as all options take default - values if not specified. This factory can be loaded dynamically using a - service configurator directive of the form (all on one line): + manages UDP connection options shared between the TAO_DIOP_Protocol_Factory + and the TAO_UIPMC_Protocol_Factory (see above). It + accepts the options detailed below, which should be specified between the + two double-quotes shown here as a space-separated list; however none are + required as all options take default values if not specified. This factory + can be loaded dynamically using a service configurator directive of the + form (all on one line):

    dynamic MIOP_Resource_Factory Service_Object * TAO_PortableGroup:_make_TAO_MIOP_Resource_Factory () ""

    You would normally have to use other service configurator @@ -1931,17 +1930,17 @@

    5. MIOP_Strategy_Factory

    TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
    dynamic MIOP_Resource_Factory Service_Object * TAO_PortableGroup:_make_TAO_MIOP_Resource_Factory () ""

    - Since MIOP uses UDP sockets (which is not a "reliable" transport unlike tcp/ip) - it is easy to configure MIOP in such a way that messages will not actually - reach the servant. The options below are intended to maximize MIOP reliability - but they must be used with care; users of MIOP must understand that large - messages are sent in fragments and they have to be reassembled by the server in - their entirety to be usable by the servant. If even a single data - fragment/packet is lost, the whole message cannot be reconstructed and will be - unusable. There is no way for the servant to even know it has missed such a - MIOP message, and being a one-way protocol, neither will the client be aware - that the message has been lost. Fragments can be lost due to a variety of - reasons: + Since DIOP and MIOP use UDP sockets (which is not a "reliable" transport unlike + TCP/IP), it is easy to configure them in such a way that messages will not + actually reach the servant. The options below are intended to maximize DIOP and + MIOP reliability, but they must be used with care; users of DIOP and MIOP must + understand that large messages are sent in fragments and they have to be + reassembled by the server in their entirety to be usable by the servant. If + even a single data fragment/packet is lost, the whole message cannot be + reconstructed and will be unusable. There is no way for the servant to even + know it has missed such a DIOP or MIOP message, and being a one-way protocol, + neither will the client be aware that the message has been lost. Fragments + can be lost due to a variety of reasons: