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/SemaInit.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/SemaInit.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index b4ff3c5154a..5fa8486a7f1 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -2958,7 +2958,7 @@ static void TryReferenceInitialization(Sema &S, // // The constructor that would be used to make the copy shall // be callable whether or not the copy is actually done. - if (!S.getLangOptions().CPlusPlus0x && !S.getLangOptions().Microsoft) + if (!S.getLangOptions().CPlusPlus0x && !S.getLangOptions().MicrosoftExt) Sequence.AddExtraneousCopyToTemporary(cv2T2); } @@ -5176,7 +5176,7 @@ static void DiagnoseNarrowingInInitList( bool Constant, const APValue &ConstantValue) { if (Constant) { S.Diag(InitE->getLocStart(), - S.getLangOptions().CPlusPlus0x && !S.getLangOptions().Microsoft + S.getLangOptions().CPlusPlus0x && !S.getLangOptions().MicrosoftExt ? diag::err_init_list_constant_narrowing : diag::warn_init_list_constant_narrowing) << InitE->getSourceRange() @@ -5184,7 +5184,7 @@ static void DiagnoseNarrowingInInitList( << EntityType.getLocalUnqualifiedType(); } else S.Diag(InitE->getLocStart(), - S.getLangOptions().CPlusPlus0x && !S.getLangOptions().Microsoft + S.getLangOptions().CPlusPlus0x && !S.getLangOptions().MicrosoftExt ? diag::err_init_list_variable_narrowing : diag::warn_init_list_variable_narrowing) << InitE->getSourceRange() |
