Clang 3.4 buildfix