Make g++* work again; clang still fails.

Signed-off-by: Tamas TEVESZ <ice@extreme.hu>