diff options
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 4 | ||||
| -rw-r--r-- | test/SemaCXX/MicrosoftCompatibility.cpp | 2 | ||||
| -rw-r--r-- | unittests/ASTMatchers/ASTMatchersTest.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 607c37ac03..793337cc5a 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -2530,8 +2530,8 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, Decl *OldD, Scope *S, NewMethod->setTrivial(OldMethod->isTrivial()); // MSVC allows explicit template specialization at class scope: - // 2 CXMethodDecls referring to the same function will be injected. - // We don't want a redeclartion error. + // 2 CXXMethodDecls referring to the same function will be injected. + // We don't want a redeclaration error. bool IsClassScopeExplicitSpecialization = OldMethod->isFunctionTemplateSpecialization() && NewMethod->isFunctionTemplateSpecialization(); diff --git a/test/SemaCXX/MicrosoftCompatibility.cpp b/test/SemaCXX/MicrosoftCompatibility.cpp index 3097b7da10..a914169bb6 100644 --- a/test/SemaCXX/MicrosoftCompatibility.cpp +++ b/test/SemaCXX/MicrosoftCompatibility.cpp @@ -22,7 +22,7 @@ void test() namespace ms_predefined_types { - // ::type_info is predeclared with forward class declartion + // ::type_info is a built-in forward class declaration. void f(const type_info &a); } diff --git a/unittests/ASTMatchers/ASTMatchersTest.cpp b/unittests/ASTMatchers/ASTMatchersTest.cpp index cc13c01fec..e042d54a9a 100644 --- a/unittests/ASTMatchers/ASTMatchersTest.cpp +++ b/unittests/ASTMatchers/ASTMatchersTest.cpp @@ -1479,7 +1479,7 @@ TEST(HasAnyParameter, DoesNotMatchThisPointer) { recordDecl(hasName("X")))))))); } -TEST(HasName, MatchesParameterVariableDeclartions) { +TEST(HasName, MatchesParameterVariableDeclarations) { EXPECT_TRUE(matches("class Y {}; class X { void x(int x) {} };", methodDecl(hasAnyParameter(hasName("x"))))); EXPECT_TRUE(notMatches("class Y {}; class X { void x(int) {} };", |