[ros-diffs] [spetreolle] 25505: fix gcc4 build