Log Message:
Fix questionable C++ code instead of using "-ffriend-injection" option
(which might be removed from future GCC versions) to make this build
with GCC 4.1.x.

Patch tested by Thomas 'wiz' Klausner.