Fixed build for intel c++ compiler - needs testing across all other compilers including clang++