Changed unused typedefs to static_assert to appease compiler warnings.
Merge branch 'sam_geo_warnings' into next