[ros-diffs] [sginsberg] 36964: - Fix DXG 64-bit compilation (fix not entirely correct though)