update for clang 3.5