diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2015-05-11 03:57:49 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2015-05-11 03:57:49 +0000 |
| commit | b710a938d6949e113860d81cd1bd0ebc941c8cad (patch) | |
| tree | 78b0b2bcdde08113c19b2a2a6b22b4f3c2678842 /clang/lib/Basic | |
| parent | 30f058aa9d924f0c52aa5207328e9ba6374ce6b4 (diff) | |
| download | bcm5719-llvm-b710a938d6949e113860d81cd1bd0ebc941c8cad.tar.gz bcm5719-llvm-b710a938d6949e113860d81cd1bd0ebc941c8cad.zip | |
Give isCompatibleWithMSVC a better interface
We now use an enum which maps the marketing name (almost always a year)
to the major version number.
llvm-svn: 236967
Diffstat (limited to 'clang/lib/Basic')
| -rw-r--r-- | clang/lib/Basic/IdentifierTable.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp index bd2840db4c7..0a27c6a889d 100644 --- a/clang/lib/Basic/IdentifierTable.cpp +++ b/clang/lib/Basic/IdentifierTable.cpp @@ -157,7 +157,7 @@ static void AddKeyword(StringRef Keyword, // Don't add this keyword under MSVCCompat. if (LangOpts.MSVCCompat && (Flags & KEYNOMS18) && - !LangOpts.isCompatibleWithMSVC(19)) + !LangOpts.isCompatibleWithMSVC(LangOptions::MSVC2015)) return; // Don't add this keyword under OpenCL. diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index b39cd1eea5b..44584c4501d 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -657,7 +657,7 @@ protected: // FIXME We cannot encode the revision information into 32-bits Builder.defineMacro("_MSC_BUILD", Twine(1)); - if (Opts.CPlusPlus11 && Opts.isCompatibleWithMSVC(19)) + if (Opts.CPlusPlus11 && Opts.isCompatibleWithMSVC(LangOptions::MSVC2015)) Builder.defineMacro("_HAS_CHAR16_T_LANGUAGE_SUPPORT", Twine(1)); } |
