[trunk] fixed warning from r2891
[trunk] c++-style comment removed (fixes issue 407)