diff options
author | Aaron Ballman <aaron@aaronballman.com> | 2014-08-19 15:55:55 +0000 |
---|---|---|
committer | Aaron Ballman <aaron@aaronballman.com> | 2014-08-19 15:55:55 +0000 |
commit | dd69ef38dba72b08bee83f262fd443743940d2bc (patch) | |
tree | 7efceaf91a1ee1f236c89f129c908ca54739a9ce /clang/lib/Format | |
parent | e4b91dca91ab34958bd3109a7ef2ac528769a283 (diff) | |
download | llvm-dd69ef38dba72b08bee83f262fd443743940d2bc.zip llvm-dd69ef38dba72b08bee83f262fd443743940d2bc.tar.gz llvm-dd69ef38dba72b08bee83f262fd443743940d2bc.tar.bz2 |
C++1y is now C++14!
Changes diagnostic options, language standard options, diagnostic identifiers, diagnostic wording to use c++14 instead of c++1y. It also modifies related test cases to use the updated diagnostic wording.
llvm-svn: 215982
Diffstat (limited to 'clang/lib/Format')
-rw-r--r-- | clang/lib/Format/Format.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 4c18d54..65ee5f4 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -2012,7 +2012,7 @@ LangOptions getFormattingLangOpts(FormatStyle::LanguageStandard Standard) { LangOptions LangOpts; LangOpts.CPlusPlus = 1; LangOpts.CPlusPlus11 = Standard == FormatStyle::LS_Cpp03 ? 0 : 1; - LangOpts.CPlusPlus1y = Standard == FormatStyle::LS_Cpp03 ? 0 : 1; + LangOpts.CPlusPlus14 = Standard == FormatStyle::LS_Cpp03 ? 0 : 1; LangOpts.LineComment = 1; LangOpts.CXXOperatorNames = 1; LangOpts.Bool = 1; |