Updated for clang
Merge branch 'master' of github.com:project-imas/forced-inlining