amccarth added a comment. This looks fine to me. I just dropped in to add some context on MSVC and __cplusplus: https://blogs.msdn.microsoft.com/vcblog/2018/04/09/msvc-now-correctly-reports-__cplusplus/ Repository: rL LLVM https://reviews.llvm.org/D46164