[ros-diffs] [bfreisen] 68696: [HHPCOMP] Apply changes proposed by learn_more which supposedly fix the GCCWin build