[geometry] avoid warnings for member order

[SVN r86541]