r18840: make these compatible with g++ warnings