diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2011-04-22 08:25:24 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2011-04-22 08:25:24 +0000 |
| commit | 9392165a1734cdc89fc58f30dd880a10c176127f (patch) | |
| tree | 6464b54cc9444712156e4a0baf9ab23aebe25bab /clang/lib | |
| parent | e900b10a2929b1ea473a0e28f594613d9a075ed9 (diff) | |
| download | bcm5719-llvm-9392165a1734cdc89fc58f30dd880a10c176127f.tar.gz bcm5719-llvm-9392165a1734cdc89fc58f30dd880a10c176127f.zip | |
For consistency, change suffix from war_ to warn_ for some Microsoft warnings I introduced lately.
llvm-svn: 129986
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Parse/ParseExprCXX.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaExceptionSpec.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp index acfe83a79bb..49d30741190 100644 --- a/clang/lib/Parse/ParseExprCXX.cpp +++ b/clang/lib/Parse/ParseExprCXX.cpp @@ -394,7 +394,7 @@ bool Parser::ParseOptionalCXXScopeSpecifier(CXXScopeSpec &SS, // before 'getAs' and treat this as a dependent template name. unsigned DiagID = diag::err_missing_dependent_template_keyword; if (getLang().Microsoft) - DiagID = diag::war_missing_dependent_template_keyword; + DiagID = diag::warn_missing_dependent_template_keyword; Diag(Tok.getLocation(), DiagID) << II.getName() diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 4e31d03e0e9..e2e43c2912a 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -356,7 +356,7 @@ bool Sema::DiagnoseUnknownTypeName(const IdentifierInfo &II, else if (isDependentScopeSpecifier(*SS)) { unsigned DiagID = diag::err_typename_missing; if (getLangOptions().Microsoft && isMicrosoftMissingTypename(SS)) - DiagID = diag::war_typename_missing; + DiagID = diag::warn_typename_missing; Diag(SS->getRange().getBegin(), DiagID) << (NestedNameSpecifier *)SS->getScopeRep() << II.getName() diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 7d5dc200da0..88193f54642 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -305,7 +305,7 @@ bool Sema::MergeCXXFunctionDecl(FunctionDecl *New, FunctionDecl *Old) { OldParam->getUninstantiatedDefaultArg()); else NewParam->setDefaultArg(OldParam->getInit()); - DiagDefaultParamID = diag::war_param_default_argument_redefinition; + DiagDefaultParamID = diag::warn_param_default_argument_redefinition; Invalid = false; } } diff --git a/clang/lib/Sema/SemaExceptionSpec.cpp b/clang/lib/Sema/SemaExceptionSpec.cpp index 1512a257897..f1033dc8c2f 100644 --- a/clang/lib/Sema/SemaExceptionSpec.cpp +++ b/clang/lib/Sema/SemaExceptionSpec.cpp @@ -102,7 +102,7 @@ bool Sema::CheckEquivalentExceptionSpec(FunctionDecl *Old, FunctionDecl *New) { bool MissingEmptyExceptionSpecification = false; unsigned DiagID = diag::err_mismatched_exception_spec; if (getLangOptions().Microsoft) - DiagID = diag::war_mismatched_exception_spec; + DiagID = diag::warn_mismatched_exception_spec; if (!CheckEquivalentExceptionSpec(PDiag(DiagID), PDiag(diag::note_previous_declaration), @@ -265,7 +265,7 @@ bool Sema::CheckEquivalentExceptionSpec( const FunctionProtoType *New, SourceLocation NewLoc) { unsigned DiagID = diag::err_mismatched_exception_spec; if (getLangOptions().Microsoft) - DiagID = diag::war_mismatched_exception_spec; + DiagID = diag::warn_mismatched_exception_spec; return CheckEquivalentExceptionSpec( PDiag(DiagID), PDiag(diag::note_previous_declaration), |
