[ros-diffs] [royce] 18627: fix msvc6 template warning