diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/include/clang/Basic/LangOptions.h | 6 | ||||
| -rw-r--r-- | clang/lib/Frontend/PCHReader.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Frontend/PCHWriter.cpp | 2 | ||||
| -rw-r--r-- | clang/tools/clang-cc/clang-cc.cpp | 1 |
4 files changed, 2 insertions, 9 deletions
diff --git a/clang/include/clang/Basic/LangOptions.h b/clang/include/clang/Basic/LangOptions.h index 60f4d084f30..fba474b2f52 100644 --- a/clang/include/clang/Basic/LangOptions.h +++ b/clang/include/clang/Basic/LangOptions.h @@ -32,7 +32,6 @@ public: unsigned Microsoft : 1; // Microsoft extensions. unsigned CPlusPlus : 1; // C++ Support unsigned CPlusPlus0x : 1; // C++0x Support - unsigned NoExtensions : 1; // All extensions are disabled, strict mode. unsigned CXXOperatorNames : 1; // Treat C++ operator names as keywords. unsigned ObjC1 : 1; // Objective-C 1 support enabled. @@ -40,7 +39,6 @@ public: unsigned ObjCNonFragileABI : 1; // Objective-C modern abi enabled unsigned PascalStrings : 1; // Allow Pascal strings - unsigned Boolean : 1; // Allow bool/true/false unsigned WritableStrings : 1; // Allow writable strings unsigned LaxVectorConversions : 1; unsigned Exceptions : 1; // Support exception handling. @@ -103,8 +101,8 @@ public: GNUMode = ImplicitInt = Digraphs = 0; HexFloats = 0; GC = ObjC1 = ObjC2 = ObjCNonFragileABI = 0; - C99 = Microsoft = CPlusPlus = CPlusPlus0x = NoExtensions = 0; - CXXOperatorNames = PascalStrings = Boolean = WritableStrings = 0; + C99 = Microsoft = CPlusPlus = CPlusPlus0x = 0; + CXXOperatorNames = PascalStrings = WritableStrings = 0; Exceptions = NeXTRuntime = Freestanding = NoBuiltin = 0; LaxVectorConversions = 1; HeinousExtensions = 0; diff --git a/clang/lib/Frontend/PCHReader.cpp b/clang/lib/Frontend/PCHReader.cpp index c1cb87bc160..6dd7806d0aa 100644 --- a/clang/lib/Frontend/PCHReader.cpp +++ b/clang/lib/Frontend/PCHReader.cpp @@ -1242,13 +1242,11 @@ bool PCHReader::ParseLanguageOptions( PARSE_LANGOPT_IMPORTANT(Microsoft, diag::warn_pch_microsoft_extensions); PARSE_LANGOPT_IMPORTANT(CPlusPlus, diag::warn_pch_cplusplus); PARSE_LANGOPT_IMPORTANT(CPlusPlus0x, diag::warn_pch_cplusplus0x); - PARSE_LANGOPT_IMPORTANT(NoExtensions, diag::warn_pch_extensions); PARSE_LANGOPT_BENIGN(CXXOperatorName); PARSE_LANGOPT_IMPORTANT(ObjC1, diag::warn_pch_objective_c); PARSE_LANGOPT_IMPORTANT(ObjC2, diag::warn_pch_objective_c2); PARSE_LANGOPT_IMPORTANT(ObjCNonFragileABI, diag::warn_pch_nonfragile_abi); PARSE_LANGOPT_BENIGN(PascalStrings); - PARSE_LANGOPT_BENIGN(Boolean); PARSE_LANGOPT_BENIGN(WritableStrings); PARSE_LANGOPT_IMPORTANT(LaxVectorConversions, diag::warn_pch_lax_vector_conversions); diff --git a/clang/lib/Frontend/PCHWriter.cpp b/clang/lib/Frontend/PCHWriter.cpp index 6b58e250920..cd2021479ff 100644 --- a/clang/lib/Frontend/PCHWriter.cpp +++ b/clang/lib/Frontend/PCHWriter.cpp @@ -478,7 +478,6 @@ void PCHWriter::WriteLanguageOptions(const LangOptions &LangOpts) { Record.push_back(LangOpts.Microsoft); // Microsoft extensions. Record.push_back(LangOpts.CPlusPlus); // C++ Support Record.push_back(LangOpts.CPlusPlus0x); // C++0x Support - Record.push_back(LangOpts.NoExtensions); // All extensions are disabled, strict mode. Record.push_back(LangOpts.CXXOperatorNames); // Treat C++ operator names as keywords. Record.push_back(LangOpts.ObjC1); // Objective-C 1 support enabled. @@ -486,7 +485,6 @@ void PCHWriter::WriteLanguageOptions(const LangOptions &LangOpts) { Record.push_back(LangOpts.ObjCNonFragileABI); // Objective-C modern abi enabled Record.push_back(LangOpts.PascalStrings); // Allow Pascal strings - Record.push_back(LangOpts.Boolean); // Allow bool/true/false Record.push_back(LangOpts.WritableStrings); // Allow writable strings Record.push_back(LangOpts.LaxVectorConversions); Record.push_back(LangOpts.Exceptions); // Support exception handling. diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp index 3d5c70d7c9c..92452ec5be4 100644 --- a/clang/tools/clang-cc/clang-cc.cpp +++ b/clang/tools/clang-cc/clang-cc.cpp @@ -753,7 +753,6 @@ static void InitializeLanguageStandard(LangOptions &Options, LangKind LK, case lang_cxx98: Options.CPlusPlus = 1; Options.CXXOperatorNames = !NoOperatorNames; - Options.Boolean = 1; // FALL THROUGH. case lang_gnu99: case lang_c99: |
