Fix MSVC C++20 compilation issues (#9951)

Co-authored-by: Emil Ernerfeldt <[email protected]>

Author: Wumpf

.github/workflows/cpp_matrix_full.json

@@ -5,25 +5,36 @@
             "runs_on": "ubuntu-latest-16-cores",
             "cache_key": "build-linux",
             "extra_env_vars": "RERUN_USE_ASAN=1 RERUN_SET_CXX_VERSION=17 LSAN_OPTIONS=suppressions=.github/workflows/lsan_suppressions.supp",
-            "additional_commands": "pixi run -e cpp cpp-docs"
+            "additional_commands": "pixi run -e cpp cpp-docs",
+            "pr_ci": true
         },
         {
-            "name": "Linux x64, C++20",
+            "name": "Linux x64, C++20 (skipped on PRs)",
             "runs_on": "ubuntu-latest-16-cores",
             "cache_key": "build-linux",
-            "extra_env_vars": "RERUN_USE_ASAN=1 RERUN_SET_CXX_VERSION=20 LSAN_OPTIONS=suppressions=.github/workflows/lsan_suppressions.supp"
+            "extra_env_vars": "RERUN_USE_ASAN=1 RERUN_SET_CXX_VERSION=20 LSAN_OPTIONS=suppressions=.github/workflows/lsan_suppressions.supp",
+            "pr_ci": false
         },
         {
-            "name": "Windows x64",
+            "name": "Windows x64, C++17",
             "runs_on": "windows-latest-8-cores",
             "cache_key": "build-windows",
-            "extra_env_vars": ""
+            "extra_env_vars": "RERUN_SET_CXX_VERSION=17",
+            "pr_ci": true
+        },
+        {
+            "name": "Windows x64, C++20 (skipped on PRs)",
+            "runs_on": "windows-latest-8-cores",
+            "cache_key": "build-windows",
+            "extra_env_vars": "RERUN_SET_CXX_VERSION=20",
+            "pr_ci": false
         },
         {
             "name": "Mac aarch64",
             "runs_on": "macos-15-large",
             "cache_key": "build-macos-arm64",
-            "extra_env_vars": "RERUN_USE_ASAN=1 LSAN_OPTIONS=suppressions=.github/workflows/lsan_suppressions.supp"
+            "extra_env_vars": "RERUN_USE_ASAN=1 LSAN_OPTIONS=suppressions=.github/workflows/lsan_suppressions.supp",
+            "pr_ci": true
         }
     ]
 }

.github/workflows/reusable_checks_cpp.yml

@@ -62,17 +62,23 @@ jobs:
       matrix: ${{ fromJson(needs.matrix_prep.outputs.MATRIX) }}
     runs-on: ${{ matrix.runs_on }}
     steps:
+      # Skipping the entire step would apparently require a separate job, not doing that here.
+      # Instead we keep checking for the `matrix.pr_ci` flag.
+      # See https://stackoverflow.com/questions/77186893/how-can-i-skip-the-whole-job-for-a-matrix-match-in-github-action
       - uses: actions/checkout@v4
+        if: ${{ github.event_name != 'pull_request' || matrix.pr_ci != false }}
         with:
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || '' }}
 
       - uses: prefix-dev/[email protected]
+        if: ${{ github.event_name != 'pull_request' || matrix.pr_ci != false }}
         with:
           pixi-version: v0.41.4
           environments: cpp
 
       - name: Set up Rust
         uses: ./.github/actions/setup-rust
+        if: ${{ github.event_name != 'pull_request' || matrix.pr_ci != false }}
         with:
           cache_key: ${{ matrix.cache_key }}
           # Cache will be produced by `reusable_checks/rs-lints`
@@ -82,26 +88,30 @@ jobs:
 
       # Workaround for ASAN issues on Github images https://github.com/actions/runner-images/issues/9491
       - name: Fix kernel mmap rnd bits
-        if: runner.os == 'Linux'
+        if: ${{ (github.event_name != 'pull_request' || matrix.pr_ci != false) && runner.os == 'Linux' }}
         # Asan in llvm 14 provided in ubuntu 22.04 is incompatible with
         # high-entropy ASLR in much newer kernels that GitHub runners are
         # using leading to random crashes: https://reviews.llvm.org/D148280
         run: sudo sysctl vm.mmap_rnd_bits=28
 
       - name: pixi run -e cpp cpp-clean
+        if: ${{ github.event_name != 'pull_request' || matrix.pr_ci != false }}
         run: pixi run -e cpp cpp-clean
 
       - name: pixi run -e cpp cpp-build-all
+        if: ${{ github.event_name != 'pull_request' || matrix.pr_ci != false }}
         run: ${{ matrix.extra_env_vars }} RERUN_WERROR=ON pixi run -e cpp cpp-build-all
 
       - name: pixi run -e cpp cpp-test
+        if: ${{ github.event_name != 'pull_request' || matrix.pr_ci != false }}
         run: ${{ matrix.extra_env_vars }} RERUN_WERROR=ON pixi run -e cpp cpp-test
 
       - name: pixi run -e cpp cpp-build-all-shared-libs
         if: ${{ inputs.CHANNEL == 'nightly' }}
         run: ${{ matrix.extra_env_vars }} RERUN_WERROR=ON pixi run -e cpp cpp-build-all-shared-libs
 
       - name: additional_commands
+        if: ${{ github.event_name != 'pull_request' || matrix.pr_ci != false }}
         run: ${{ matrix.additional_commands }}
 
   cpp-formatting:

docs/snippets/all/descriptors/descr_builtin_component.cpp

@@ -6,7 +6,10 @@ int main() {
 
     rec.log_static(
         "data",
-        rerun::ComponentBatch::from_loggable(rerun::Position3D(1.0f, 2.0f, 3.0f))
+        rerun::ComponentBatch::from_loggable(
+            rerun::Position3D(1.0f, 2.0f, 3.0f),
+            rerun::Loggable<rerun::Position3D>::Descriptor
+        )
     );
 
     // The tags are indirectly checked by the Rust version (have a look over there for more info).

rerun_cpp/src/rerun/component_batch.hpp

@@ -44,8 +44,7 @@ namespace rerun {
         /// Automatically registers the descriptor the first time it is encountered.
         template <typename T>
         static Result<ComponentBatch> from_loggable(
-            const rerun::Collection<T>& components,
-            const ComponentDescriptor& descriptor = rerun::Loggable<T>::Descriptor
+            const rerun::Collection<T>& components, const ComponentDescriptor& descriptor
         ) {
             static_assert(
                 rerun::is_loggable<T>,
@@ -64,8 +63,7 @@ namespace rerun {
         /// Automatically registers the descriptor the first time it is encountered.
         template <typename T>
         static Result<ComponentBatch> from_loggable(
-            const T& component,
-            const ComponentDescriptor& descriptor = rerun::Loggable<T>::Descriptor
+            const T& component, const ComponentDescriptor& descriptor
         ) {
             // Collection adapter will automatically borrow for single elements, but let's do this explicitly, avoiding the extra hoop.
             const auto collection = Collection<T>::borrow(&component, 1);
@@ -79,8 +77,7 @@ namespace rerun {
         /// Automatically registers the descriptor the first time it is encountered.
         template <typename T>
         static Result<ComponentBatch> from_loggable(
-            const std::optional<T>& component,
-            const ComponentDescriptor& descriptor = rerun::Loggable<T>::Descriptor
+            const std::optional<T>& component, const ComponentDescriptor& descriptor
         ) {
             if (component.has_value()) {
                 return from_loggable(component.value(), descriptor);
@@ -97,7 +94,7 @@ namespace rerun {
         template <typename T>
         static Result<ComponentBatch> from_loggable(
             const std::optional<rerun::Collection<T>>& components,
-            const ComponentDescriptor& descriptor = rerun::Loggable<T>::Descriptor
+            const ComponentDescriptor& descriptor
         ) {
             if (components.has_value()) {
                 return from_loggable(components.value(), descriptor);

rerun_cpp/tests/recording_stream.cpp

@@ -148,10 +148,13 @@ SCENARIO("RecordingStream can be used for logging archetypes and components", TE
 
                 GIVEN("component batches") {
                     auto batch0 = rerun::ComponentBatch::from_loggable<rerun::Position2D>(
-                                      {{1.0, 2.0}, {4.0, 5.0}}
-                    ).value_or_throw();
+                                      {{1.0, 2.0}, {4.0, 5.0}},
+                                      rerun::Loggable<rerun::Position2D>::Descriptor
+                    )
+                                      .value_or_throw();
                     auto batch1 = rerun::ComponentBatch::from_loggable<rerun::Color>(
-                                      {rerun::Color(0xFF0000FF)}
+                                      {rerun::Color(0xFF0000FF)},
+                                      rerun::Loggable<rerun::Color>::Descriptor
                     )
                                       .value_or_throw();
                     THEN("single component batch can be logged") {
@@ -170,10 +173,12 @@ SCENARIO("RecordingStream can be used for logging archetypes and components", TE
                 }
                 GIVEN("component batches wrapped in `rerun::Result`") {
                     auto batch0 = rerun::ComponentBatch::from_loggable<rerun::Position2D>(
-                        {{1.0, 2.0}, {4.0, 5.0}}
+                        {{1.0, 2.0}, {4.0, 5.0}},
+                        rerun::Loggable<rerun::Position2D>::Descriptor
                     );
                     auto batch1 = rerun::ComponentBatch::from_loggable<rerun::Color>(
-                        {rerun::Color(0xFF0000FF)}
+                        {rerun::Color(0xFF0000FF)},
+                        rerun::Loggable<rerun::Color>::Descriptor
                     );
                     THEN("single component batch can be logged") {
                         stream.log("log_archetype-splat", batch0);
@@ -406,7 +411,10 @@ SCENARIO("Recording stream handles serialization failure during logging graceful
             expected_error.code =
                 GENERATE(rerun::ErrorCode::Unknown, rerun::ErrorCode::ArrowStatusCode_TypeError);
 
-            auto batch_result = rerun::ComponentBatch::from_loggable(component);
+            auto batch_result = rerun::ComponentBatch::from_loggable(
+                component,
+                rerun::Loggable<BadComponent>::Descriptor
+            );
 
             THEN("calling log with that batch logs the serialization error") {
                 check_logged_error([&] { stream.log(path, batch_result); }, expected_error.code);