fix macro renaming bug introduced by earlier merge
Merge branch 'develop' of github.com:USCiLab/cereal into develop