Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/reusable-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ on:
type: boolean
default: false
env:
colcon-build-default-cmake-args: ${{ contains(inputs.os-version, 'windows') && '-DCMAKE_CXX_FLAGS_INIT="/WX"' || '-DCMAKE_CXX_FLAGS_INIT="-Werror"' }}
toolset: ${{ inputs.vs-toolset && format('-T {0}', inputs.vs-toolset) || '' }}
defaults:
run:
Expand Down Expand Up @@ -122,7 +123,7 @@ jobs:
colcon_build_args: ${{ inputs.colcon-args }}
colcon_build_args_default: --event-handlers=console_direct+
cmake_args: ${{ inputs.cmake-args }}
cmake_args_default: ${{ env.toolset }}
cmake_args_default: ${{ env.colcon-build-default-cmake-args }} ${{ env.toolset }}
cmake_build_type: ${{ matrix.cmake-build-type }}
workspace: ${{ github.workspace }}

Expand Down
2 changes: 1 addition & 1 deletion test/cdr/SimpleTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2265,7 +2265,7 @@ TEST(CDRTests, DeserializeIntoANonEmptyMapInXCDRv1)
};

std::map<uint16_t, std::string> initialized_map{
{1, "a"}
{static_cast<uint16_t>(1u), "a"}
};

FastBuffer cdr_buffer(buffer, 14);
Expand Down
Loading