[geometry] update buffer for gcc compilation (does not accept sort/remove_if on struct defs in member functions)