Deal with compiler warnings re #9260

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
Merge branch 'feature/9260_load_gsas_instrument_file' into develop