FIX: g++ compilation requires two changes

[mrummuka]

Changing clang++ to g++ was not fully documented, as it required changing two files.