Merge pull request #2390 from mitza-oci/cxx20

Updates for Visual C++ CI and C++20 compatibility

Author: mitza-oci

.github/workflows/cmake.yml

@@ -24,9 +24,9 @@ jobs:
             CXX: g++-12
             PackageDeps: g++-12
             os: ubuntu-22.04
-          - CC: vs2019
-            CXX: vs2019
-            os: windows-2019
+          - CC: vs2022
+            CXX: vs2022
+            os: windows-2022
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} ${{ matrix.CXX }}
     env:

.github/workflows/windows.yml

@@ -17,59 +17,42 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: VS2019WChar
-            vmimage: windows-2019
-            mpctype: vs2019
+          - name: VS2022WChar
+            vmimage: windows-2022
+            mpctype: vs2022
             BuildPlatform: x64
             BuildConfiguration: Debug
             vcpkgarch: x64-windows
             vcpkglibdir: debug/lib
             vcpkgpackages: '"openssl", {"name": "xerces-c", "features": ["xmlch-wchar"]}, "zlib"'
             OptionalFeatures: uses_wchar=1
-          - name: VS2019Debug64
-            vmimage: windows-2019
-            mpctype: vs2019
-            BuildPlatform: x64
-            BuildConfiguration: Debug
-            vcpkgarch: x64-windows
-            vcpkglibdir: debug/lib
-            vcpkgpackages: '"openssl", "xerces-c", "zlib"'
-          - name: VS2019Release64
-            vmimage: windows-2019
-            mpctype: vs2019
-            BuildPlatform: x64
-            BuildConfiguration: Release
-            vcpkgarch: x64-windows
-            vcpkglibdir: lib
-            vcpkgpackages: '"openssl", "xerces-c", "zlib"'
-          - name: VS2019Debug32
-            vmimage: windows-2019
-            mpctype: vs2019
+          - name: VS2022Debug32
+            vmimage: windows-2022
+            mpctype: vs2022
             BuildPlatform: Win32
             BuildConfiguration: Debug
             vcpkgarch: x86-windows
             vcpkglibdir: debug/lib
             vcpkgpackages: '"openssl", "xerces-c", "zlib"'
-          - name: VS2019Release32
-            vmimage: windows-2019
-            mpctype: vs2019
+          - name: VS2022Release32
+            vmimage: windows-2022
+            mpctype: vs2022
             BuildPlatform: Win32
             BuildConfiguration: Release
             vcpkgarch: x86-windows
             vcpkglibdir: lib
             vcpkgpackages: '"openssl", "xerces-c", "zlib"'
-          - name: VS2019Debug64Cxx17
-            vmimage: windows-2019
-            mpctype: vs2019
+          - name: VS2022Debug64Cxx17
+            vmimage: windows-2022
+            mpctype: vs2022
             BuildPlatform: x64
             BuildConfiguration: Debug
             vcpkgarch: x64-windows
             vcpkglibdir: debug/lib
             vcpkgpackages: '"openssl", "xerces-c", "zlib"'
-            OptionalMpcArgs: -value_template LanguageStandard=stdcpp17
-          - name: VS2019Debug64Cxx20
-            vmimage: windows-2019
-            mpctype: vs2019
+          - name: VS2022Debug64Cxx20
+            vmimage: windows-2022
+            mpctype: vs2022
             BuildPlatform: x64
             BuildConfiguration: Debug
             vcpkgarch: x64-windows
@@ -172,7 +155,7 @@ jobs:
     - name: Build solution TAO/tests/IDL_Test/IDL_Test.sln
       run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/tests/IDL_Test/IDL_Test.sln
   mingw:
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:

TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp

@@ -149,11 +149,13 @@ TAO_SSLIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
       || this->qop_ != endpoint->qop ()
       || this->trust_.trust_in_target != t.trust_in_target
       || this->trust_.trust_in_client != t.trust_in_client
-      || (!CORBA::is_nil (this->credentials_.in ())
-          && !(*this->credentials_.in () == *endpoint->credentials ())))
-  {
-    return 0;
-  }
+      || (!CORBA::is_nil (this->credentials_.in ()) && endpoint->credentials ()
+          && !(*this->credentials_.in () == *static_cast<TAO::SSLIOP_Credentials const*> (endpoint->credentials ()))))
+    // The cast above is needed for some C++20 compilers since overload resolution can consider b == a for a == b,
+    // and apparently the derived-to-base and adding-const implicit conversions result in an ambiguity.
+    {
+      return false;
+    }
 
   // Comparing the underlying iiop endpoints is wrong, as their port
   // numbers often may not make sense. Or may not being used anyway.