-Werror=effc++ now passing