Merge branch 'master' into win32_stat_64

DOCGroup · Jan 31, 2025 · b3a73ed · b3a73ed
2 parents bbf593e + 408bd95
commit b3a73ed
Show file tree

Hide file tree

Showing 966 changed files with 16,146 additions and 11,620 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -36,9 +36,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/face.yml b/.github/workflows/face.yml
@@ -35,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
@@ -23,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-container.yml b/.github/workflows/linux-container.yml
@@ -0,0 +1,56 @@
+name: linux-container
+
+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
+    runs-on: ubuntu-22.04
+    name: alpine-3.18
+    env:
+      ACE_ROOT: ${{ github.workspace }}/ACE
+      TAO_ROOT: ${{ github.workspace }}/TAO
+      MPC_ROOT: ${{ github.workspace }}/MPC
+    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: Write configuation files
+      run: |
+        echo '#include "ace/config-linux.h"' > ${{ env.ACE_ROOT }}/ace/config.h
+        echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' > ${{ env.ACE_ROOT }}/include/makeinclude/platform_macros.GNU
+    - name: Build in container
+      uses: addnab/docker-run-action@v3
+      with:
+        image: alpine:3.18
+        options: -v ${{ github.workspace }}:${{ github.workspace }}
+        run: |
+          apk add --no-cache git bash make g++ perl linux-headers
+          export ACE_ROOT=${{ env.ACE_ROOT }}
+          export TAO_ROOT=${{ env.TAO_ROOT }}
+          export MPC_ROOT=${{ env.MPC_ROOT }}
+          perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/TAO_ACE.mwc -workers 4
+          perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.ACE_ROOT }}/tests/tests.mwc -workers 4
+          perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDL_Test -workers 4
+          perl ${{ env.ACE_ROOT }}/bin/mwc.pl -type gnuace ${{ env.TAO_ROOT }}/tests/IDLv4 -workers 4
+          make -j 6 -C ${{ env.TAO_ROOT }}
+          make -j 6 -C ${{ env.ACE_ROOT }}/tests
+          make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDL_Test
+          make -j 6 -C ${{ env.TAO_ROOT }}/tests/IDLv4
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -24,16 +24,6 @@ jobs:
       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
@@ -58,20 +48,21 @@ jobs:
           - 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-22.04
           - CC: gcc-12
             CXX: g++-12
             PackageDeps: g++-12
-            optional_macros: CCFLAGS+=-std=c++20
+            optional_macros: c++std=c++20
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
             os: ubuntu-22.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
+          - 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-24.04
           - CC: clang-6.0
             CXX: clang++-6.0
             PackageDeps: clang-6.0
@@ -129,6 +120,12 @@ jobs:
             Repo: llvm-toolchain-$(lsb_release -cs)-15
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
             os: ubuntu-22.04
+          - CC: clang-16
+            CXX: clang++-16
+            PackageDeps: clang-16
+            Repo: llvm-toolchain-$(lsb_release -cs)-16
+            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
@@ -177,9 +174,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 }}
@@ -229,7 +226,7 @@ jobs:
       if: matrix.optional_feature != ''
       shell: pwsh
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: cpp
       if: matrix.feature == 'CodeQL'
@@ -245,6 +242,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}
@@ -258,8 +259,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@v2
+      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
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-12]
+        os: [macos-13, macos-14]
         include:
           - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
     runs-on: ${{ matrix.os }}
@@ -30,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 }}
@@ -61,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}
@@ -73,3 +77,8 @@ jobs:
       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
@@ -118,9 +118,9 @@ jobs:
       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 }}
@@ -129,10 +129,9 @@ jobs:
         '{"name": "tao","version-string": "githubaction","dependencies": [ ${{ matrix.vcpkgpackages }} ]}' > vcpkg.json
       shell: pwsh
     - name: Install vcpkg
-      uses: lukka/run-vcpkg@v10
+      uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46
-        appendedCacheKey: ${{ matrix.name }}
+        vcpkgGitCommitId: c82f74667287d3dc386bce81e44964370c91a289
         runVcpkgInstall: true
     - name: create $ACE_ROOT/ace/config.h
       run: |
@@ -165,7 +164,7 @@ jobs:
         perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:TAO_ROOT}/tests/IDL_Test -workers 4 ${{ matrix.OptionalMpcArgs }}
       shell: pwsh
     - name: Setup msbuild
-      uses: microsoft/setup-msbuild@v1
+      uses: microsoft/setup-msbuild@v2
     - name: Build solution TAO/TAO_ACE.sln
       run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln
     - name: Build solution ACE/tests/tests.sln
@@ -188,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
@@ -20,6 +20,7 @@
 
 .depend.*
 GNUmakefile*
+local.mwc
 *.ior
 .obj/
 *.iobj

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
@@ -77,7 +77,7 @@ <h2>Synopsis</h2>
   <li><a href="#eclipse">Working with ACE in Eclipse</a></li>
   <li><a href="#advanced">Advanced Topics</a></li>
   <li><a href="#power">Building from git</a></li>
-</li></ul>
+</ul>
 
 
 <p></p><hr><p>
@@ -329,7 +329,7 @@ <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></
       source tree.  The ACE recursive Makefile scheme needs this information.
       There are several ways to set the ACE_ROOT variable.  For example:
       <blockquote>
-      TSCH/CSH:
+      TCSH/CSH:
       <code>setenv ACE_ROOT /home/cs/faculty/schmidt/ACE_wrappers</code>
       </blockquote>
       <blockquote>
@@ -427,6 +427,9 @@ <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></
   </li>
   <li>If you've set the INSTALL_PREFIX before building, now run
 <blockquote><code>% make install</code></blockquote>
+    <p>An alternative to directly running <code>make install</code> is to use <code>$ACE_ROOT/bin/install_proj.sh</code>
+       which will only install projects that are built (instead of trying to build each one during <code>make install</code>).
+    </p>
   </li>
   <li>If you need to regenerate the <code>ace/Svc_Conf_y.cpp</code> file,
       you'll need to
@@ -675,15 +678,10 @@ <h3><a name="embarcadero">Building and Installing ACE on Windows with Embarcader
       Codeguard support. Should only be used when DEBUG is also set<br>
       <code>set CODEGUARD=1</code><br>
       <br>
-      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<br>
-      <code>set CLASSIC=1</code><br>
-      <br>
-      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.<br>
-      <code>set CPU_FLAG=-6</code><br>
+      Set one of the following environment variable to 1 to select which Embarcadero
+      C++ compiler has to be used. Valid environment variables are <code>BCC32C</code>, <code>BCC64</code>, and <code>BCC64X</code>.
       <br>
+      <code>set BCC64X=1</code><br><br>
       You can then start the build with the command
       <br><code>make -f Makefile.bmak all</code><br>
       <br>
@@ -2474,7 +2472,7 @@ <h2><a name="g++">Compiling ACE with GNU g++</a></h2>
 If you use the GNU GCC g++ compiler please note the following:
 
 <ul>
-  </p></li><li>ACE/TAO needs g++ 4.8 or better. Older versions are not usable anymore<p>
+  </p><li>ACE/TAO needs g++ 4.8 or better. Older versions are not usable anymore<p>
 
   </p></li><li>Make sure to update your gcc <code>config.status</code>
       file.  This file is produced when installing gcc; it specifies

diff --git 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"
@@ -272,7 +271,7 @@ int
 ACEXML_HttpCharStream::send_request ()
 {
   char* path = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (this->url_addr_->get_path_name()));
-  ACE_Auto_Basic_Array_Ptr<char> path_ptr (path);
+  std::unique_ptr<char[]> 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 ()
   ACE_NEW_RETURN (command, char[commandsize], -1);
 
   // Ensure that the <command> memory is deallocated.
-  ACE_Auto_Basic_Array_Ptr<char> cmd_ptr (command);
+  std::unique_ptr<char[]> 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",

diff --git a/ACE/ACEXML/common/URL_Addr.cpp b/ACE/ACEXML/common/URL_Addr.cpp
@@ -5,11 +5,11 @@
 #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 <memory>
 
 ACEXML_URL_Addr::ACEXML_URL_Addr ()
   : path_name_ (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<ACEXML_Char> cleanup_host_name (host_name);
+  std::unique_ptr<ACEXML_Char[]> cleanup_host_name (host_name);
 
   // Get the port number (if any)
   unsigned short port = ACE_DEFAULT_HTTP_PORT;
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ @@
     .depend.*
     GNUmakefile*
+    local.mwc
     *.ior
     .obj/
     *.iobj
@@ Expand Down @@