rsmith accepted this revision. rsmith added a comment. This revision is now accepted and ready to land.
LGTM with a couple of changes. ================ Comment at: test/Modules/Inputs/merge-using-decls/a.h:25 +#if __cplusplus <= 199711L // C++11 does not allow access declerations template<typename T> struct E : X, T { ---------------- I don't see a reason to `#ifdef` this portion, which should work either way, and likewise for the other change to this file. (The changes to the other header and to the cpp file look fine and appropriate, though.) ================ Comment at: test/SemaCXX/warn-thread-safety-parsing.cpp:1273 +#if __cplusplus <= 199711L + // expected-error@-2 {{invalid use of member 'mu' in static member function}} +#endif ---------------- Please add FIXMEs to this test. These cases are not supposed to be permitted. https://reviews.llvm.org/D21626 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits