diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2011-09-17 17:15:52 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2011-09-17 17:15:52 +0000 |
| commit | 0706d203cf4a220b46c5c1d20231c7974fb5acd2 (patch) | |
| tree | ca35441bc87425dfddd61b26c6585cf722f29f48 /clang/lib/Sema/SemaTemplate.cpp | |
| parent | f2b8c854dd3c98ff1d807c0f0a14e0f3529f725f (diff) | |
| download | bcm5719-llvm-0706d203cf4a220b46c5c1d20231c7974fb5acd2.tar.gz bcm5719-llvm-0706d203cf4a220b46c5c1d20231c7974fb5acd2.zip | |
Rename LangOptions::Microsoft to LangOptions::MicrosoftExt to make it clear that this flag must be used only for Microsoft extensions and not emulation; to avoid confusion with the new LangOptions::MicrosoftMode flag.
Many of the code now under LangOptions::MicrosoftExt will eventually be moved under the LangOptions::MicrosoftMode flag.
llvm-svn: 139987
Diffstat (limited to 'clang/lib/Sema/SemaTemplate.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplate.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index f613ebb36c6..341cf4de946 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -424,7 +424,7 @@ bool Sema::DiagnoseTemplateParameterShadow(SourceLocation Loc, Decl *PrevDecl) { assert(PrevDecl->isTemplateParameter() && "Not a template parameter"); // Microsoft Visual C++ permits template parameters to be shadowed. - if (getLangOptions().Microsoft) + if (getLangOptions().MicrosoftExt) return false; // C++ [temp.local]p4: @@ -3370,7 +3370,7 @@ CheckTemplateArgumentAddressOfObjectOrFunction(Sema &S, } } - if (S.getLangOptions().Microsoft && isa<CXXUuidofExpr>(Arg)) { + if (S.getLangOptions().MicrosoftExt && isa<CXXUuidofExpr>(Arg)) { Converted = TemplateArgument(ArgIn); return false; } @@ -4521,7 +4521,7 @@ static bool CheckTemplateSpecializationScope(Sema &S, } if (S.CurContext->isRecord() && !IsPartialSpecialization) { - if (S.getLangOptions().Microsoft) { + if (S.getLangOptions().MicrosoftExt) { // Do not warn for class scope explicit specialization during // instantiation, warning was already emitted during pattern // semantic analysis. |
