[ros-diffs] [greatlrd] 49987: fix a compile issue and scoure code cleanup