[ros-diffs] [cwittich] 32506: fix formatting and msvc build