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 @@
@@ -181,11 +181,11 @@
- 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 duringmake 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 commandmake -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 yourconfig.h
- file before includingace/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 andplatform_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 underFILES=
in the GNUmakefile. Create a - file calledACE_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 yourbin/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 toconfigure
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 theSOFLAGS
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_Ptrpath_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 ("%s %s>\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