fixed errors from upgrading from gcc 4.4 to gcc 4.7
and stricter cpplint.py