Added Dmitriy's fix for compilation under llvm-g++